MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

Minor Fix according to review IDEA-CR-11509

Browse Source
This commit is contained in:
Valentina Kiryushkina
2016-06-17 15:56:42 +03:00
parent 6946ea3f19
commit 6d5a6c6daa
3 changed files with 8 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/educational-core/student/src/com/jetbrains/edu/learning/StudyBasePluginConfigurator.java
+1 -1
View File
@@ -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;
python/educational-core/student/src/com/jetbrains/edu/learning/StudyUtils.java
+7 -17
View File
@@ -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) {
python/educational-core/student/src/com/jetbrains/edu/learning/stepic/StepicAdaptiveReactionsPanel.java
-3
View File
@@ -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