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

EDU-971 Fix NPE: do not try to get task text if we're not in tool window mode

Browse Source
This commit is contained in:
Valentina Kiryushkina
2017-06-07 18:47:39 +03:00
parent d9feab7bbb
commit ba7097379a
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/educational-core/src/com/jetbrains/edu/learning/ui/StudyToolWindow.java
+9 -6
View File
@@ -75,9 +75,6 @@ public abstract class StudyToolWindow extends SimpleToolWindowPanel implements D
}
public void init(@NotNull final Project project, final boolean isToolwindow) {
String taskText = StudyUtils.getTaskText(project);
if (taskText == null) return;
final DefaultActionGroup group = getActionGroup(project);
setActionToolbar(group);
@@ -109,11 +106,17 @@ public abstract class StudyToolWindow extends SimpleToolWindowPanel implements D
TaskFile file = StudyUtils.getSelectedTaskFile(project);
if (file != null) {
VirtualFile taskDir = file.getTask().getTaskDir(project);
setTaskText(taskText, taskDir, project);
String taskText = StudyUtils.getTaskText(project);
if (taskText != null) {
setTaskText(taskText, taskDir, project);
}
}
}
else {
setTaskText(taskText, null, project);
String taskText = StudyUtils.getTaskText(project);
if (taskText != null) {
setTaskText(taskText, null, project);
}
}
}
}
@@ -185,7 +188,7 @@ public abstract class StudyToolWindow extends SimpleToolWindowPanel implements D
return group;
}
public void setTaskText(String text, VirtualFile taskDirectory, Project project) {
public void setTaskText(@NotNull String text, @Nullable VirtualFile taskDirectory, @NotNull Project project) {
if (!EMPTY_TASK_TEXT.equals(text) && StudyTaskManager.getInstance(project).isTurnEditingMode()) {
if (taskDirectory == null) {
LOG.info("Failed to enter editing mode for StudyToolWindow");