rename (fix for IDEA-CR-14348)

python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCHideFromStudent.java

@@ -64,7 +64,7 @@ public class CCHideFromStudent extends CCTaskFileActionBase {
         for (FileEditor fileEditor : FileEditorManager.getInstance(myProject).getEditors(myFile)) {
           if (fileEditor instanceof TextEditor) {
             Editor editor = ((TextEditor)fileEditor).getEditor();
-            StudyUtils.drawAllWindows(editor, myTaskFile);
+            StudyUtils.drawAllAnswerPlaceholders(editor, myTaskFile);
           }
         }
       }

python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/actions/placeholder/CCAddAnswerPlaceholder.java

@@ -101,7 +101,7 @@ public class CCAddAnswerPlaceholder extends CCAnswerPlaceholderAction {
       if (answerPlaceholders.contains(myPlaceholder)) {
         answerPlaceholders.remove(myPlaceholder);
         myEditor.getMarkupModel().removeAllHighlighters();
-        StudyUtils.drawAllWindows(myEditor, myTaskFile);
+        StudyUtils.drawAllAnswerPlaceholders(myEditor, myTaskFile);
         EduAnswerPlaceholderPainter.createGuardedBlocks(myEditor, myTaskFile);
       }
     }

python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/actions/placeholder/CCChangePlaceholderVisibility.java

@@ -46,7 +46,7 @@ public abstract class CCChangePlaceholderVisibility extends CCAnswerPlaceholderA
     int length = isVisible() ? placeholder.getTaskText().length() : 0;
     placeholder.setLength(length);
     saveIndent(placeholder, state, !visible);
-    StudyUtils.drawAllWindows(state.getEditor(), state.getTaskFile());
+    StudyUtils.drawAllAnswerPlaceholders(state.getEditor(), state.getTaskFile());
   }
 
   private static void saveIndent(AnswerPlaceholder placeholder, CCState state, boolean visible) {

python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/actions/placeholder/CCDeleteAllAnswerPlaceholdersAction.java

@@ -65,7 +65,7 @@ public class CCDeleteAllAnswerPlaceholdersAction extends DumbAwareAction {
   private static void updateView(@NotNull final Editor editor,
                                  @NotNull final TaskFile taskFile) {
     editor.getMarkupModel().removeAllHighlighters();
-    StudyUtils.drawAllWindows(editor, taskFile);
+    StudyUtils.drawAllAnswerPlaceholders(editor, taskFile);
   }
 
   @Override

python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/actions/placeholder/CCSubtaskPlaceholderAction.java

@@ -36,13 +36,13 @@ public abstract class CCSubtaskPlaceholderAction extends CCAnswerPlaceholderActi
       @Override
       public void undo() throws UnexpectedUndoException {
         undoAction(existingPlaceholder, subtaskIndex, info);
-        StudyUtils.drawAllWindows(editor, taskFile);
+        StudyUtils.drawAllAnswerPlaceholders(editor, taskFile);
       }
 
       @Override
       public void redo() throws UnexpectedUndoException {
         redoAction(existingPlaceholder, subtaskIndex, info);
-        StudyUtils.drawAllWindows(editor, taskFile);
+        StudyUtils.drawAllAnswerPlaceholders(editor, taskFile);
       }
     });
   }

python/educational-core/course-creator/testSrc/com/jetbrains/edu/coursecreator/CCTestCase.java

@@ -123,7 +123,7 @@ public abstract class CCTestCase extends CodeInsightFixtureTestCase {
       taskFile.addAnswerPlaceholder(placeholder);
     }
     taskFile.sortAnswerPlaceholders();
-    StudyUtils.drawAllWindows(myFixture.getEditor(), taskFile);
+    StudyUtils.drawAllAnswerPlaceholders(myFixture.getEditor(), taskFile);
     CCUtils.createResourceFile(file, StudyTaskManager.getInstance(getProject()).getCourse(), file.getParent());
     return file;
   }

python/educational-core/student/src/com/jetbrains/edu/learning/StudyUtils.java

@@ -348,7 +348,7 @@ public class StudyUtils {
     return null;
   }
 
-  public static void drawAllWindows(Editor editor, TaskFile taskFile) {
+  public static void drawAllAnswerPlaceholders(Editor editor, TaskFile taskFile) {
     editor.getMarkupModel().removeAllHighlighters();
     final Project project = editor.getProject();
     if (project == null) return;

python/educational-core/student/src/com/jetbrains/edu/learning/actions/StudyRefreshTaskFileAction.java

@@ -74,7 +74,7 @@ public class StudyRefreshTaskFileAction extends StudyActionWithShortcut {
     }
     WolfTheProblemSolver.getInstance(project).clearProblems(studyState.getVirtualFile());
     taskFile.setHighlightErrors(false);
-    StudyUtils.drawAllWindows(editor, taskFile);
+    StudyUtils.drawAllAnswerPlaceholders(editor, taskFile);
     EduAnswerPlaceholderPainter.createGuardedBlocks(editor, taskFile);
     ApplicationManager.getApplication().invokeLater(
       () -> IdeFocusManager.getInstance(project).requestFocus(editor.getContentComponent(), true));

python/educational-core/student/src/com/jetbrains/edu/learning/checker/StudyCheckUtils.java

@@ -59,7 +59,7 @@ public class StudyCheckUtils {
       FileEditor fileEditor = FileEditorManager.getInstance(project).getSelectedEditor(virtualFile);
       if (fileEditor instanceof StudyEditor) {
         StudyEditor studyEditor = (StudyEditor)fileEditor;
-        StudyUtils.drawAllWindows(studyEditor.getEditor(), taskFile);
+        StudyUtils.drawAllAnswerPlaceholders(studyEditor.getEditor(), taskFile);
       }
     }
   }

python/educational-core/student/src/com/jetbrains/edu/learning/core/EduUtils.java

@@ -141,7 +141,7 @@ public class EduUtils {
                                                               VirtualFile answerFile,
                                                               VirtualFile parentDir,
                                                               @Nullable Task task,
-                                                              int toSubtaskIndex) {
+                                                              int targetSubtaskIndex) {
 
     VirtualFile studentFile = copyFile(requestor, parentDir, answerFile);
     if (studentFile == null) {
@@ -167,10 +167,10 @@ public class EduUtils {
     taskFile.setTrackLengths(false);
     for (AnswerPlaceholder placeholder : taskFile.getAnswerPlaceholders()) {
       int fromSubtask = task.getActiveSubtaskIndex();
-      placeholder.switchSubtask(project, studentDocument, fromSubtask, toSubtaskIndex);
+      placeholder.switchSubtask(project, studentDocument, fromSubtask, targetSubtaskIndex);
     }
     for (AnswerPlaceholder placeholder : taskFile.getAnswerPlaceholders()) {
-      replaceWithTaskText(project, studentDocument, placeholder, toSubtaskIndex);
+      replaceWithTaskText(project, studentDocument, placeholder, targetSubtaskIndex);
     }
     taskFile.setTrackChanges(true);
     studentDocument.removeDocumentListener(listener);

python/educational-core/student/src/com/jetbrains/edu/learning/editor/StudyEditorFactoryListener.java

@@ -81,7 +81,7 @@ public class StudyEditorFactoryListener implements EditorFactoryListener {
         if (!taskFile.getAnswerPlaceholders().isEmpty()) {
           StudyNavigator.navigateToFirstAnswerPlaceholder(editor, taskFile);
           boolean isStudyProject = EduNames.STUDY.equals(course.getCourseMode());
-          StudyUtils.drawAllWindows(editor, taskFile);
+          StudyUtils.drawAllAnswerPlaceholders(editor, taskFile);
           if (isStudyProject) {
             editor.addEditorMouseListener(new WindowSelectionListener(taskFile));
           }