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

fix imports after rebase

Browse Source
This commit is contained in:
Ekaterina Tuzova
2017-03-23 14:28:51 +03:00
parent ef6a45017b
commit 852d368934
5 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/CCCheckListener.java
+1 -1
View File
@@ -3,7 +3,7 @@ package com.jetbrains.edu.coursecreator;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.vfs.VirtualFile;
import com.jetbrains.edu.learning.StudyCheckListener;
import com.jetbrains.edu.learning.courseFormat.Task;
import com.jetbrains.edu.learning.courseFormat.tasks.Task;
import org.jetbrains.annotations.NotNull;
public class CCCheckListener implements StudyCheckListener {
python/educational-core/student/src/com/jetbrains/edu/learning/EduPluginConfigurator.java
+3 -2
View File
@@ -16,7 +16,8 @@ import com.jetbrains.edu.learning.actions.*;
import com.jetbrains.edu.learning.core.EduNames;
import com.jetbrains.edu.learning.courseFormat.Course;
import com.jetbrains.edu.learning.courseFormat.Lesson;
import com.jetbrains.edu.learning.courseFormat.Task;
import com.jetbrains.edu.learning.courseFormat.tasks.Task;
import com.jetbrains.edu.learning.courseFormat.tasks.TaskWithSubtasks;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -72,7 +73,7 @@ public interface EduPluginConfigurator {
return false;
}
default void createTestsForNewSubtask(@NotNull Project project, @NotNull Task task) {}
default void createTestsForNewSubtask(@NotNull Project project, @NotNull TaskWithSubtasks task) {}
/**
* Used for code highlighting in Task Description tool window
python/educational-core/student/src/com/jetbrains/edu/learning/StudyCheckListener.java
+1 -1
View File
@@ -2,7 +2,7 @@ package com.jetbrains.edu.learning;
import com.intellij.openapi.extensions.ExtensionPointName;
import com.intellij.openapi.project.Project;
import com.jetbrains.edu.learning.courseFormat.Task;
import com.jetbrains.edu.learning.courseFormat.tasks.Task;
import org.jetbrains.annotations.NotNull;
public interface StudyCheckListener {
python/educational-core/student/src/com/jetbrains/edu/learning/StudyFileEditorManagerListener.java
+4 -3
View File
@@ -5,7 +5,8 @@ import com.intellij.openapi.fileEditor.FileEditorManagerEvent;
import com.intellij.openapi.fileEditor.FileEditorManagerListener;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.vfs.VirtualFile;
import com.jetbrains.edu.learning.courseFormat.Task;
import com.jetbrains.edu.learning.courseFormat.tasks.ChoiceTask;
import com.jetbrains.edu.learning.courseFormat.tasks.Task;
import com.jetbrains.edu.learning.editor.StudyChoiceVariantsPanel;
import com.jetbrains.edu.learning.ui.StudyToolWindow;
import org.jetbrains.annotations.NotNull;
@@ -25,8 +26,8 @@ public class StudyFileEditorManagerListener implements FileEditorManagerListener
Task task = getTask(file);
setTaskText(task, StudyUtils.getTaskDir(file));
if (task != null) {
if (task.isChoiceTask()) {
final StudyChoiceVariantsPanel choicePanel = new StudyChoiceVariantsPanel(task);
if (task instanceof ChoiceTask) {
final StudyChoiceVariantsPanel choicePanel = new StudyChoiceVariantsPanel((ChoiceTask)task);
myToolWindow.setBottomComponent(choicePanel);
}
else {
python/educational-python/Edu-Python/src/com/jetbrains/edu/learning/PyEduPluginConfigurator.java
+3 -2
View File
@@ -18,7 +18,8 @@ import com.jetbrains.edu.coursecreator.settings.CCSettings;
import com.jetbrains.edu.learning.actions.StudyCheckAction;
import com.jetbrains.edu.learning.core.EduNames;
import com.jetbrains.edu.learning.courseFormat.Course;
import com.jetbrains.edu.learning.courseFormat.Task;
import com.jetbrains.edu.learning.courseFormat.tasks.Task;
import com.jetbrains.edu.learning.courseFormat.tasks.TaskWithSubtasks;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -79,7 +80,7 @@ public class PyEduPluginConfigurator implements EduPluginConfigurator {
}
@Override
public void createTestsForNewSubtask(@NotNull Project project, @NotNull Task task) {
public void createTestsForNewSubtask(@NotNull Project project, @NotNull TaskWithSubtasks task) {
VirtualFile taskDir = task.getTaskDir(project);
if (taskDir == null) {
return;