From dfb11597d96d38c4158ebbf2a67bf4dd92724b6a Mon Sep 17 00:00:00 2001 From: Dmitry Avdeev Date: Wed, 31 Jul 2013 15:50:15 +0400 Subject: [PATCH] YouTrack icons are back --- .../src/com/intellij/tasks/impl/LocalTaskImpl.java | 8 ++++++-- .../com/intellij/tasks/youtrack/YouTrackRepository.java | 4 ++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/plugins/tasks/tasks-core/src/com/intellij/tasks/impl/LocalTaskImpl.java b/plugins/tasks/tasks-core/src/com/intellij/tasks/impl/LocalTaskImpl.java index 5c5f3b9752f2..b634d7ab2b3b 100644 --- a/plugins/tasks/tasks-core/src/com/intellij/tasks/impl/LocalTaskImpl.java +++ b/plugins/tasks/tasks-core/src/com/intellij/tasks/impl/LocalTaskImpl.java @@ -254,7 +254,11 @@ public class LocalTaskImpl extends LocalTask { if (customIcon != null) { return IconLoader.getIcon(customIcon, LocalTask.class); } - switch (myType) { + return getIconFromType(myType, isIssue()); + } + + public static Icon getIconFromType(TaskType type, boolean issue) { + switch (type) { case BUG: return TasksIcons.Bug; case EXCEPTION: @@ -263,7 +267,7 @@ public class LocalTaskImpl extends LocalTask { return TasksIcons.Feature; default: case OTHER: - return isIssue() ? TasksIcons.Other : TasksIcons.Unknown; + return issue ? TasksIcons.Other : TasksIcons.Unknown; } } diff --git a/plugins/tasks/tasks-core/src/com/intellij/tasks/youtrack/YouTrackRepository.java b/plugins/tasks/tasks-core/src/com/intellij/tasks/youtrack/YouTrackRepository.java index 4bed263e998c..1ff6d9d594b8 100644 --- a/plugins/tasks/tasks-core/src/com/intellij/tasks/youtrack/YouTrackRepository.java +++ b/plugins/tasks/tasks-core/src/com/intellij/tasks/youtrack/YouTrackRepository.java @@ -6,11 +6,11 @@ import com.intellij.openapi.util.io.StreamUtil; import com.intellij.tasks.*; import com.intellij.tasks.impl.BaseRepository; import com.intellij.tasks.impl.BaseRepositoryImpl; +import com.intellij.tasks.impl.LocalTaskImpl; import com.intellij.util.NullableFunction; import com.intellij.util.containers.ContainerUtil; import com.intellij.util.text.VersionComparatorUtil; import com.intellij.util.xmlb.annotations.Tag; -import icons.TasksIcons; import org.apache.axis.utils.XMLChar; import org.apache.commons.httpclient.HttpClient; import org.apache.commons.httpclient.HttpMethod; @@ -243,7 +243,7 @@ public class YouTrackRepository extends BaseRepositoryImpl { @NotNull @Override public Icon getIcon() { - return TasksIcons.Youtrack; + return LocalTaskImpl.getIconFromType(getType(), isIssue()); } @NotNull