From 6d5a6c6daa7c22f59d8575261d3a1e04da26c314 Mon Sep 17 00:00:00 2001
From: Valentina Kiryushkina <valentina.kiryushkina@jetbrains.com>
Date: Thu, 16 Jun 2016 16:03:43 +0300
Subject: [PATCH] Minor Fix according to review IDEA-CR-11509

---
 .../learning/StudyBasePluginConfigurator.java |  2 +-
 .../jetbrains/edu/learning/StudyUtils.java    | 24 ++++++-------------
 .../stepic/StepicAdaptiveReactionsPanel.java  |  3 ---
 3 files changed, 8 insertions(+), 21 deletions(-)

diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/StudyBasePluginConfigurator.java b/python/educational-core/student/src/com/jetbrains/edu/learning/StudyBasePluginConfigurator.java
index 9fbfb736a5e4..99163eea7916 100644
--- a/python/educational-core/student/src/com/jetbrains/edu/learning/StudyBasePluginConfigurator.java
+++ b/python/educational-core/student/src/com/jetbrains/edu/learning/StudyBasePluginConfigurator.java
@@ -81,7 +81,7 @@ public abstract class StudyBasePluginConfigurator implements StudyPluginConfigur
       }
 
       private void setTaskText(@Nullable final Task task, @Nullable final VirtualFile taskDirectory) {
-        String text = StudyUtils.getTaskTextFromTask(task, taskDirectory);
+        String text = StudyUtils.getTaskTextFromTask(taskDirectory, task);
         if (text == null) {
           toolWindow.setEmptyText(project);
           return;
diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/StudyUtils.java b/python/educational-core/student/src/com/jetbrains/edu/learning/StudyUtils.java
index ea45745a363b..8cedfc1dadfa 100644
--- a/python/educational-core/student/src/com/jetbrains/edu/learning/StudyUtils.java
+++ b/python/educational-core/student/src/com/jetbrains/edu/learning/StudyUtils.java
@@ -442,7 +442,7 @@ public class StudyUtils {
   }
 
   @Nullable
-  public static String getTaskTextFromTask(@Nullable final Task task, @Nullable final VirtualFile taskDirectory) {
+  public static String getTaskTextFromTask(@Nullable final VirtualFile taskDirectory, @Nullable final Task task) {
     if (task == null) {
       return null;
     }
@@ -451,17 +451,17 @@ public class StudyUtils {
       return text;
     }
     if (taskDirectory != null) {
-      final String taskTextFileHtml = getTaskTextFrom(taskDirectory, EduNames.TASK_HTML);
+      final String taskTextFileHtml = getTaskTextFromTaskName(taskDirectory, EduNames.TASK_HTML);
       if (taskTextFileHtml != null) return taskTextFileHtml;
       
-      final String taskTextFileMd = getTaskTextFrom(taskDirectory, EduNames.TASK_MD);
+      final String taskTextFileMd = getTaskTextFromTaskName(taskDirectory, EduNames.TASK_MD);
       if (taskTextFileMd != null) return convertToHtml(taskTextFileMd);      
     }
     return null;
   }
 
   @Nullable
-  private static String getTaskTextFrom(@NotNull VirtualFile taskDirectory, @NotNull String taskTextFilename) {
+  private static String getTaskTextFromTaskName(@NotNull VirtualFile taskDirectory, @NotNull String taskTextFilename) {
     VirtualFile taskTextFile = taskDirectory.findChild(taskTextFilename);
     if (taskTextFile == null) {
       VirtualFile srcDir = taskDirectory.findChild(EduNames.SRC);
@@ -510,7 +510,7 @@ public class StudyUtils {
     }
     final Task task = taskFile.getTask();
     if (task != null) {
-      return getTaskTextFromTask(task, task.getTaskDir(project));
+      return getTaskTextFromTask(task.getTaskDir(project), task);
     }
     return null;
   }
@@ -529,18 +529,8 @@ public class StudyUtils {
   
   @Nullable
   public static Task getCurrentTask(@NotNull final Project project) {
-    VirtualFile[] files = FileEditorManager.getInstance(project).getSelectedFiles();
-    TaskFile taskFile = null;
-    for (VirtualFile file : files) {
-      taskFile = getTaskFile(project, file);
-      if (taskFile != null) {
-        break;
-      }
-    }
-    if (taskFile != null) {
-      return taskFile.getTask();
-    }
-    return null;
+    final TaskFile taskFile = getSelectedTaskFile(project);
+    return taskFile != null ? taskFile.getTask() : null;
   }
 
   public static void updateStudyToolWindow(Project project) {
diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/stepic/StepicAdaptiveReactionsPanel.java b/python/educational-core/student/src/com/jetbrains/edu/learning/stepic/StepicAdaptiveReactionsPanel.java
index 97521b1919c7..04a52dec8e7d 100644
--- a/python/educational-core/student/src/com/jetbrains/edu/learning/stepic/StepicAdaptiveReactionsPanel.java
+++ b/python/educational-core/student/src/com/jetbrains/edu/learning/stepic/StepicAdaptiveReactionsPanel.java
@@ -76,9 +76,6 @@ public class StepicAdaptiveReactionsPanel extends JPanel {
     final FileEditorManagerListener editorManagerListener = new FileEditorManagerListener() {
       @Override
       public void fileOpened(@NotNull FileEditorManager source, @NotNull VirtualFile file) {
-        final com.jetbrains.edu.learning.courseFormat.Task task = StudyUtils.getTaskFromSelectedEditor(myProject);
-        final boolean isEnabled = task != null && task.getStatus() != StudyStatus.Solved;
-        StepicAdaptiveReactionsPanel.this.setEnabledRecursive(isEnabled);
       }
 
       @Override