From 667b5c8f36d79c86ef647fd5f4f20e8af2618c6a Mon Sep 17 00:00:00 2001
From: Dmitry Avdeev <dmitry.avdeev@jetbrains.com>
Date: Mon, 29 Jul 2013 18:30:38 +0400
Subject: [PATCH] fixed JIRA getState()

---
 .../tasks-core/src/com/intellij/tasks/jira/JiraTask.java   | 4 +++-
 .../src/com/intellij/tasks/jira/model/JiraIssue.java       | 7 ++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/plugins/tasks/tasks-core/src/com/intellij/tasks/jira/JiraTask.java b/plugins/tasks/tasks-core/src/com/intellij/tasks/jira/JiraTask.java
index c83bdf56723c..cbab1c877fa5 100644
--- a/plugins/tasks/tasks-core/src/com/intellij/tasks/jira/JiraTask.java
+++ b/plugins/tasks/tasks-core/src/com/intellij/tasks/jira/JiraTask.java
@@ -20,6 +20,7 @@ import com.intellij.tasks.*;
 import com.intellij.tasks.jira.model.JiraComment;
 import com.intellij.tasks.jira.model.JiraIssue;
 import com.intellij.tasks.jira.model.JiraIssueType;
+import com.intellij.tasks.jira.model.JiraStatus;
 import com.intellij.util.Function;
 import com.intellij.util.containers.ContainerUtil;
 import icons.TasksIcons;
@@ -100,7 +101,8 @@ class JiraTask extends Task {
 
   @Override
   public TaskState getState() {
-    switch (Integer.parseInt(myJiraIssue.getId())) {
+    JiraStatus status = myJiraIssue.getStatus();
+    switch (Integer.parseInt(status.getId())) {
       case 1:
         return TaskState.OPEN;
       case 3:
diff --git a/plugins/tasks/tasks-core/src/com/intellij/tasks/jira/model/JiraIssue.java b/plugins/tasks/tasks-core/src/com/intellij/tasks/jira/model/JiraIssue.java
index 5c7d03279826..30e21a48f6b9 100644
--- a/plugins/tasks/tasks-core/src/com/intellij/tasks/jira/model/JiraIssue.java
+++ b/plugins/tasks/tasks-core/src/com/intellij/tasks/jira/model/JiraIssue.java
@@ -32,7 +32,7 @@ public class JiraIssue {
    */
   public static final String REQUIRED_RESPONSE_FIELDS = "id,key,summary,description," +
                                                          "created,updated,duedate,resolutiondate" +
-                                                         "assignee,reporter,issuetype,comment";
+                                                         "assignee,reporter,issuetype,comment,status";
 
   private String id;
   private String key;
@@ -109,6 +109,10 @@ public class JiraIssue {
     return fields.comment == null ? ContainerUtil.<JiraComment>emptyList() : fields.comment.getComments();
   }
 
+  public JiraStatus getStatus() {
+    return fields.status;
+  }
+
   public static class Fields {
     private String summary;
     private String description;
@@ -122,5 +126,6 @@ public class JiraIssue {
     private JiraUser reporter;
 
     private JiraIssueType issuetype;
+    private JiraStatus status;
   }
 }