move all the content of student module to educational-core module (EDU-898)

.idea/modules.xml

@@ -253,7 +253,6 @@
       <module fileurl="file://$PROJECT_DIR$/java/structuralsearch-java/structuralsearch-java.iml" filepath="$PROJECT_DIR$/java/structuralsearch-java/structuralsearch-java.iml" group="java" />
       <module fileurl="file://$PROJECT_DIR$/platform/structuralsearch/structuralsearch-tests.iml" filepath="$PROJECT_DIR$/platform/structuralsearch/structuralsearch-tests.iml" group="plugins/structuralsearch" />
       <module fileurl="file://$PROJECT_DIR$/platform/structure-view-impl/structure-view-impl.iml" filepath="$PROJECT_DIR$/platform/structure-view-impl/structure-view-impl.iml" group="platform" />
-      <module fileurl="file://$PROJECT_DIR$/python/educational-core/student/student.iml" filepath="$PROJECT_DIR$/python/educational-core/student/student.iml" group="python/educational/educational-core" />
       <module fileurl="file://$PROJECT_DIR$/python/educational-python/Edu-Python/Edu-Python.iml" filepath="$PROJECT_DIR$/python/educational-python/Edu-Python/Edu-Python.iml" group="python/educational/educational-python" />
       <module fileurl="file://$PROJECT_DIR$/plugins/svn4idea/svn4idea.iml" filepath="$PROJECT_DIR$/plugins/svn4idea/svn4idea.iml" group="plugins/VCS" />
       <module fileurl="file://$PROJECT_DIR$/plugins/svn4idea/svn4idea-tests.iml" filepath="$PROJECT_DIR$/plugins/svn4idea/svn4idea-tests.iml" group="plugins/VCS" />

python/educational-core/course-creator/course-creator.iml

@@ -12,10 +12,10 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="gson" level="project" />
     <orderEntry type="module" module-name="lang-impl" />
-    <orderEntry type="module" module-name="student" />
     <orderEntry type="library" name="Guava" level="project" />
     <orderEntry type="module" module-name="testFramework" scope="TEST" />
     <orderEntry type="module" module-name="openapi" />
     <orderEntry type="library" name="http-client" level="project" />
+    <orderEntry type="module" module-name="educational-core" />
   </component>
 </module>

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

@@ -11,7 +11,7 @@ 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.StudyItem;
-import icons.InteractiveLearningIcons;
+import icons.EducationalCoreIcons;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -21,7 +21,7 @@ public class CCCreateLesson extends CCCreateStudyItemActionBase {
   public static final String TITLE = "Create New " + EduNames.LESSON_TITLED;
 
   public CCCreateLesson() {
-    super(EduNames.LESSON_TITLED, TITLE, InteractiveLearningIcons.Lesson);
+    super(EduNames.LESSON_TITLED, TITLE, EducationalCoreIcons.Lesson);
   }
 
   @Nullable

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

@@ -12,7 +12,7 @@ import com.jetbrains.edu.learning.courseFormat.Course;
 import com.jetbrains.edu.learning.courseFormat.Lesson;
 import com.jetbrains.edu.learning.courseFormat.StudyItem;
 import com.jetbrains.edu.learning.courseFormat.tasks.Task;
-import icons.InteractiveLearningIcons;
+import icons.EducationalCoreIcons;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -23,7 +23,7 @@ public class CCCreateTask extends CCCreateStudyItemActionBase {
   public static final String TITLE = "Create New " + EduNames.TASK_TITLED;
 
   public CCCreateTask() {
-    super(EduNames.TASK_TITLED, TITLE, InteractiveLearningIcons.Task);
+    super(EduNames.TASK_TITLED, TITLE, EducationalCoreIcons.Task);
   }
 
 

python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/projectView/CCCourseDirectoryNode.java

@@ -14,7 +14,7 @@ import com.jetbrains.edu.learning.courseFormat.Course;
 import com.jetbrains.edu.learning.courseFormat.Lesson;
 import com.jetbrains.edu.learning.courseFormat.StudyItem;
 import com.jetbrains.edu.learning.projectView.CourseDirectoryNode;
-import icons.InteractiveLearningIcons;
+import icons.EducationalCoreIcons;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -54,6 +54,6 @@ public class CCCourseDirectoryNode extends CourseDirectoryNode {
 
   @Override
   protected void updateImpl(PresentationData data) {
-    updatePresentation(data, myCourse.getName(), JBColor.black, InteractiveLearningIcons.Course, "Course Creation");
+    updatePresentation(data, myCourse.getName(), JBColor.black, EducationalCoreIcons.Course, "Course Creation");
   }
 }

python/educational-core/educational-core.iml

@@ -3,11 +3,34 @@
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/testSrc" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/testData" type="java-test-resource" />
       <excludeFolder url="file://$MODULE_DIR$/.gradle" />
       <excludeFolder url="file://$MODULE_DIR$/gradleBuild" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="http-client" level="project" />
+    <orderEntry type="module" module-name="lang-impl" />
+        <orderEntry type="library" name="gson" level="project" />
+        <orderEntry type="library" name="http-client" level="project" />
+        <orderEntry type="module-library">
+          <library>
+            <CLASSES>
+              <root url="jar://$MODULE_DIR$/lib/twitter4j-core-4.0.4.jar!/" />
+            </CLASSES>
+            <JAVADOC />
+            <SOURCES />
+          </library>
+        </orderEntry>
+        <orderEntry type="module" module-name="platform-api" />
+        <orderEntry type="module" module-name="xml" />
+        <orderEntry type="library" name="markdownj" level="project" />
+        <orderEntry type="library" scope="TEST" name="JUnit4" level="project" />
+        <orderEntry type="module" module-name="testFramework" scope="TEST" />
+        <orderEntry type="module" module-name="testExtensions" scope="TEST" />
+        <orderEntry type="module" module-name="idea-ui" />
+        <orderEntry type="module" module-name="openapi" />
   </component>
 </module>

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

@@ -18,7 +18,7 @@ import com.jetbrains.edu.learning.checker.StudyCheckUtils;
 import com.jetbrains.edu.learning.courseFormat.tasks.Task;
 import com.jetbrains.edu.learning.courseFormat.tasks.TheoryTask;
 import com.jetbrains.edu.learning.editor.StudyEditor;
-import icons.InteractiveLearningIcons;
+import icons.EducationalCoreIcons;
 import org.jetbrains.annotations.NotNull;
 
 import javax.swing.*;
@@ -31,7 +31,7 @@ public abstract class StudyCheckAction extends StudyActionWithShortcut {
 
   public StudyCheckAction() {
     super(getTextWithShortcuts(TEXT),
-          "Check current task", InteractiveLearningIcons.CheckTask);
+          "Check current task", EducationalCoreIcons.CheckTask);
   }
 
   @NotNull

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

@@ -24,12 +24,12 @@ import com.jetbrains.edu.learning.StudyTaskManager;
 import com.jetbrains.edu.learning.StudyUtils;
 import com.jetbrains.edu.learning.core.EduNames;
 import com.jetbrains.edu.learning.core.EduUtils;
-import com.jetbrains.edu.learning.courseFormat.tasks.Task;
 import com.jetbrains.edu.learning.courseFormat.TaskFile;
 import com.jetbrains.edu.learning.courseFormat.UserTest;
+import com.jetbrains.edu.learning.courseFormat.tasks.Task;
 import com.jetbrains.edu.learning.editor.StudyEditor;
 import com.jetbrains.edu.learning.ui.StudyTestContentPanel;
-import icons.InteractiveLearningIcons;
+import icons.EducationalCoreIcons;
 import org.jetbrains.annotations.NotNull;
 
 import javax.swing.*;
@@ -48,7 +48,7 @@ public class StudyEditInputAction extends DumbAwareAction {
   private Map<TabInfo, UserTest> myEditableTabs = new HashMap<>();
 
   public StudyEditInputAction() {
-    super("Watch Test Input", "Watch test input", InteractiveLearningIcons.WatchInput);
+    super("Watch Test Input", "Watch test input", EducationalCoreIcons.WatchInput);
   }
 
   public void showInput(final Project project) {

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

@@ -25,7 +25,10 @@ import com.jetbrains.edu.learning.StudyTaskManager;
 import com.jetbrains.edu.learning.StudyUtils;
 import com.jetbrains.edu.learning.core.EduAnswerPlaceholderPainter;
 import com.jetbrains.edu.learning.core.EduNames;
-import com.jetbrains.edu.learning.courseFormat.*;
+import com.jetbrains.edu.learning.courseFormat.AnswerPlaceholder;
+import com.jetbrains.edu.learning.courseFormat.Course;
+import com.jetbrains.edu.learning.courseFormat.StudyStatus;
+import com.jetbrains.edu.learning.courseFormat.TaskFile;
 import com.jetbrains.edu.learning.courseFormat.tasks.ChoiceTask;
 import com.jetbrains.edu.learning.courseFormat.tasks.Task;
 import com.jetbrains.edu.learning.courseFormat.tasks.TaskWithSubtasks;
@@ -33,7 +36,7 @@ import com.jetbrains.edu.learning.editor.StudyChoiceVariantsPanel;
 import com.jetbrains.edu.learning.editor.StudyEditor;
 import com.jetbrains.edu.learning.navigation.StudyNavigator;
 import com.jetbrains.edu.learning.ui.StudyToolWindow;
-import icons.InteractiveLearningIcons;
+import icons.EducationalCoreIcons;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -48,7 +51,7 @@ public class StudyRefreshTaskFileAction extends StudyActionWithShortcut {
   public StudyRefreshTaskFileAction() {
     super("Reset Task File (" + KeymapUtil.getShortcutText(new KeyboardShortcut(KeyStroke.getKeyStroke(SHORTCUT), null)) + ")",
           "Refresh current task",
-          InteractiveLearningIcons.ResetTaskFile);
+          EducationalCoreIcons.ResetTaskFile);
   }
 
   public static void refresh(@NotNull final Project project) {

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

@@ -22,7 +22,7 @@ import com.jetbrains.edu.learning.courseFormat.Course;
 import com.jetbrains.edu.learning.statistics.EduUsagesCollector;
 import com.jetbrains.edu.learning.ui.StudyHint;
 import com.jetbrains.edu.learning.ui.StudyToolWindow;
-import icons.InteractiveLearningIcons;
+import icons.EducationalCoreIcons;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -35,7 +35,7 @@ public class StudyShowHintAction extends StudyActionWithShortcut {
 
   public StudyShowHintAction() {
     super("Show hint (" + KeymapUtil.getShortcutText(new KeyboardShortcut(KeyStroke.getKeyStroke(SHORTCUT), null)) + ")", "Show hint",
-          InteractiveLearningIcons.ShowHint);
+          EducationalCoreIcons.ShowHint);
   }
 
   public void actionPerformed(@NotNull AnActionEvent e) {