From 50cebb43338503fe4ab1e5cf9eccd1eb6b393070 Mon Sep 17 00:00:00 2001
From: Evgeny Zakrevsky <evgeny.zakrevsky@jetbrains.com>
Date: Thu, 22 Nov 2012 15:57:25 +0400
Subject: [PATCH] EA-40766 - ISE: JiraTask.getIcon

---
 .../com/intellij/tasks/jira/JiraTask.java     | 25 ++++++++++++-------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/plugins/tasks/jira-connector/src/main/java/com/intellij/tasks/jira/JiraTask.java b/plugins/tasks/jira-connector/src/main/java/com/intellij/tasks/jira/JiraTask.java
index 8009aaac179f..e9eebf17744c 100644
--- a/plugins/tasks/jira-connector/src/main/java/com/intellij/tasks/jira/JiraTask.java
+++ b/plugins/tasks/jira-connector/src/main/java/com/intellij/tasks/jira/JiraTask.java
@@ -26,6 +26,7 @@ import com.intellij.tasks.TaskType;
 import com.intellij.util.Function;
 import com.intellij.util.containers.ContainerUtil;
 import icons.JiraConnectorIcons;
+import icons.TasksIcons;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -38,9 +39,9 @@ import java.util.Locale;
 
 /**
  * @author Dmitry Avdeev
-*/
+ */
 class JiraTask extends Task {
-  
+
   private final JIRAIssue myJiraIssue;
 
   public JiraTask(JIRAIssue jiraIssue) {
@@ -75,8 +76,10 @@ class JiraTask extends Task {
   @NotNull
   public Icon getIcon() {
     String iconUrl = myJiraIssue.getTypeIconUrl();
-    return iconUrl == null ? JiraConnectorIcons.Jira_blue_16 : isClosed() ? CachedIconLoader.getDisabledIcon(iconUrl) : CachedIconLoader
-      .getIcon(iconUrl);
+    final Icon icon = iconUrl == null
+                      ? JiraConnectorIcons.Jira_blue_16
+                      : isClosed() ? CachedIconLoader.getDisabledIcon(iconUrl) : CachedIconLoader.getIcon(iconUrl);
+    return icon != null ? icon : TasksIcons.Other;
   }
 
   @NotNull
@@ -85,13 +88,17 @@ class JiraTask extends Task {
     String type = myJiraIssue.getType();
     if (type == null) {
       return TaskType.OTHER;
-    } else if (type.equals("Bug")) {
+    }
+    else if (type.equals("Bug")) {
       return TaskType.BUG;
-    } else if (type.equals("Exception")) {
+    }
+    else if (type.equals("Exception")) {
       return TaskType.EXCEPTION;
-    } else if (type.equals("New Feature")) {
+    }
+    else if (type.equals("New Feature")) {
       return TaskType.FEATURE;
-    } else {
+    }
+    else {
       return TaskType.OTHER;
     }
   }
@@ -107,7 +114,7 @@ class JiraTask extends Task {
         return TaskState.REOPENED;
       case 5: // resolved
       case 6: // closed
-        return TaskState.RESOLVED; 
+        return TaskState.RESOLVED;
     }
     return null;
   }