remove redundant plugin educational-core

diff --git a/python/educational-core/course-creator/course-creator.iml b/python/educational-core/course-creator/course-creator.iml
index 2a8dc4ab4f193d01492e85361b06bbf472b744f1..fed8cc4ab07ddcc97294f56b5f6b8e19ad32aac1 100644 (file)
--- a/python/educational-core/course-creator/course-creator.iml
+++ b/python/educational-core/course-creator/course-creator.iml
@@ -11,7 +11,7 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="gson" level="project" />
     <orderEntry type="module" module-name="lang-impl" />
-    <orderEntry type="module" module-name="educational-core" />
     <orderEntry type="library" name="guava-tools" level="project" />
+    <orderEntry type="module" module-name="student" />
   </component>
 </module>
\ No newline at end of file

diff --git a/python/educational-core/course-creator/resources/META-INF/plugin.xml b/python/educational-core/course-creator/resources/META-INF/plugin.xml
index d4778320c08c786cac418f5cc7b2ef40c2f1fea5..131d9f5b46d8376e25b441cc526e1f9fa0442954 100644 (file)
--- a/python/educational-core/course-creator/resources/META-INF/plugin.xml
+++ b/python/educational-core/course-creator/resources/META-INF/plugin.xml
@@ -11,15 +11,8 @@
   <change-notes><![CDATA[
     ]]>
   </change-notes>
-  <!-- please see https://confluence.jetbrains.com/display/IDEADEV/Build+Number+Ranges for description -->
 
-  <!-- please see https://confluence.jetbrains.com/display/IDEADEV/Plugin+Compatibility+with+IntelliJ+Platform+Products
-       on how to target different products -->
-  <!-- uncomment to enable plugin in all products
-  <depends>com.intellij.modules.lang</depends>
-  -->
   <depends>com.intellij.modules.platform</depends>
-  <depends>com.jetbrains.edu.core</depends>
   <depends>com.jetbrains.edu.interactivelearning</depends>
 
   <extensions defaultExtensionNs="com.intellij">

diff --git a/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/CCEditorFactoryListener.java b/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/CCEditorFactoryListener.java
index eeca8d615e0338d100bedcca90d7cb0e4c4a5595..0ecea377388cf35230ba43528f0d82d993f3e910 100644 (file)
--- a/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/CCEditorFactoryListener.java
+++ b/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/CCEditorFactoryListener.java
@@ -9,12 +9,12 @@ import com.intellij.openapi.editor.event.EditorFactoryListener;
 import com.intellij.openapi.fileEditor.FileDocumentManager;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.vfs.VirtualFile;
-import com.jetbrains.edu.EduAnswerPlaceholderDeleteHandler;
-import com.jetbrains.edu.EduAnswerPlaceholderPainter;
-import com.jetbrains.edu.EduDocumentListener;
-import com.jetbrains.edu.EduNames;
-import com.jetbrains.edu.courseFormat.Course;
-import com.jetbrains.edu.courseFormat.TaskFile;
+import com.jetbrains.edu.learning.core.EduAnswerPlaceholderDeleteHandler;
+import com.jetbrains.edu.learning.core.EduAnswerPlaceholderPainter;
+import com.jetbrains.edu.learning.core.EduDocumentListener;
+import com.jetbrains.edu.learning.core.EduNames;
+import com.jetbrains.edu.learning.courseFormat.Course;
+import com.jetbrains.edu.learning.courseFormat.TaskFile;
 import org.jetbrains.annotations.NotNull;
 
 public class CCEditorFactoryListener implements EditorFactoryListener {

diff --git a/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/CCFileDeletedListener.java b/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/CCFileDeletedListener.java
index 36f8da820c2e97c38a9e0850668bbfeb9c4f9e20..1d840f0c594300b38b631eb6ee8f7df3efd884ff 100644 (file)
--- a/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/CCFileDeletedListener.java
+++ b/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/CCFileDeletedListener.java
@@ -5,8 +5,8 @@ import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.openapi.vfs.VirtualFileAdapter;
 import com.intellij.openapi.vfs.VirtualFileEvent;
 import com.intellij.util.Function;
-import com.jetbrains.edu.EduNames;
-import com.jetbrains.edu.courseFormat.*;
+import com.jetbrains.edu.learning.core.EduNames;
+import com.jetbrains.edu.learning.courseFormat.*;
 import org.jetbrains.annotations.NotNull;
 
 class CCFileDeletedListener extends VirtualFileAdapter {

diff --git a/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/CCLessonMoveHandlerDelegate.java b/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/CCLessonMoveHandlerDelegate.java
index 02ac5f12a7e0a70b96bbc8b2ed60d6290755c334..2a1cf8ca77332b243cb08a6dbee2f3d797229b90 100644 (file)
--- a/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/CCLessonMoveHandlerDelegate.java
+++ b/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/CCLessonMoveHandlerDelegate.java
@@ -18,11 +18,11 @@ import com.intellij.psi.PsiReference;
 import com.intellij.refactoring.move.MoveCallback;
 import com.intellij.refactoring.move.MoveHandlerDelegate;
 import com.intellij.util.Function;
-import com.jetbrains.edu.EduNames;
-import com.jetbrains.edu.EduUtils;
-import com.jetbrains.edu.courseFormat.Course;
-import com.jetbrains.edu.courseFormat.Lesson;
-import com.jetbrains.edu.courseFormat.StudyItem;
+import com.jetbrains.edu.learning.core.EduNames;
+import com.jetbrains.edu.learning.core.EduUtils;
+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.coursecreator.ui.CCMoveStudyItemDialog;
 import org.jetbrains.annotations.Nullable;
 

diff --git a/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/CCLessonRenameHandler.java b/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/CCLessonRenameHandler.java
index 52affce86ad54f3ec71c7cc5dda338ce532acb5d..9b29cbafec2e8d9527be3a6fdcb368deadddadd1 100644 (file)
--- a/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/CCLessonRenameHandler.java
+++ b/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/CCLessonRenameHandler.java
@@ -3,9 +3,9 @@ package com.jetbrains.edu.coursecreator;
 import com.intellij.ide.TitledHandler;
 import com.intellij.openapi.project.Project;
 import com.intellij.psi.PsiDirectory;
-import com.jetbrains.edu.EduNames;
-import com.jetbrains.edu.courseFormat.Course;
-import com.jetbrains.edu.courseFormat.Lesson;
+import com.jetbrains.edu.learning.core.EduNames;
+import com.jetbrains.edu.learning.courseFormat.Course;
+import com.jetbrains.edu.learning.courseFormat.Lesson;
 import org.jetbrains.annotations.NotNull;
 
 public class CCLessonRenameHandler extends CCRenameHandler implements TitledHandler {

diff --git a/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/CCProjectComponent.java b/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/CCProjectComponent.java
index 7064cfe0adb10761cdbf4e9629c412d06fd9417d..e5871848ecf1e553fa713d8f3bec95e001dc8802 100644 (file)
--- a/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/CCProjectComponent.java
+++ b/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/CCProjectComponent.java
@@ -13,7 +13,7 @@ import com.intellij.openapi.project.ProjectManager;
 import com.intellij.openapi.startup.StartupManager;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.openapi.vfs.VirtualFileManager;
-import com.jetbrains.edu.courseFormat.Course;
+import com.jetbrains.edu.learning.courseFormat.Course;
 import org.jetbrains.annotations.NotNull;
 
 public class CCProjectComponent implements ProjectComponent {

diff --git a/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/CCProjectService.java b/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/CCProjectService.java
index 6b470682629ead386fbe531c8e27a3f95a721c34..ba98866926717401457e6b90b3d950c9ba97a6be 100644 (file)
--- a/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/CCProjectService.java
+++ b/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/CCProjectService.java
@@ -26,11 +26,11 @@ import com.intellij.openapi.project.Project;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.ui.JBColor;
 import com.intellij.util.xmlb.XmlSerializerUtil;
-import com.jetbrains.edu.EduAnswerPlaceholderPainter;
-import com.jetbrains.edu.EduDocumentListener;
-import com.jetbrains.edu.EduNames;
-import com.jetbrains.edu.EduUtils;
-import com.jetbrains.edu.courseFormat.*;
+import com.jetbrains.edu.learning.core.EduAnswerPlaceholderPainter;
+import com.jetbrains.edu.learning.core.EduDocumentListener;
+import com.jetbrains.edu.learning.core.EduNames;
+import com.jetbrains.edu.learning.core.EduUtils;
+import com.jetbrains.edu.learning.courseFormat.*;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 

diff --git a/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/CCRefactoringElementListenerProvider.java b/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/CCRefactoringElementListenerProvider.java
index 64b3d1ea390da5801ef318f685b2d7a9975946aa..ed9b404e04a540d4fcf046256ca7797ea3d15ab0 100644 (file)
--- a/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/CCRefactoringElementListenerProvider.java
+++ b/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/CCRefactoringElementListenerProvider.java
@@ -22,11 +22,11 @@ import com.intellij.psi.PsiFile;
 import com.intellij.refactoring.listeners.RefactoringElementAdapter;
 import com.intellij.refactoring.listeners.RefactoringElementListener;
 import com.intellij.refactoring.listeners.RefactoringElementListenerProvider;
-import com.jetbrains.edu.EduNames;
-import com.jetbrains.edu.courseFormat.Course;
-import com.jetbrains.edu.courseFormat.Lesson;
-import com.jetbrains.edu.courseFormat.Task;
-import com.jetbrains.edu.courseFormat.TaskFile;
+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.TaskFile;
 import com.jetbrains.edu.coursecreator.actions.CCRunTestsAction;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;

diff --git a/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/CCRenameHandler.java b/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/CCRenameHandler.java
index 99194c20744d7719e89a73fb0b43c904c9652c57..27bd42ca248425a3b2278ae6453a0208bf4463ee 100644 (file)
--- a/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/CCRenameHandler.java
+++ b/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/CCRenameHandler.java
@@ -12,8 +12,8 @@ import com.intellij.psi.PsiDirectory;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiFile;
 import com.intellij.refactoring.rename.RenameHandler;
-import com.jetbrains.edu.courseFormat.Course;
-import com.jetbrains.edu.courseFormat.StudyItem;
+import com.jetbrains.edu.learning.courseFormat.Course;
+import com.jetbrains.edu.learning.courseFormat.StudyItem;
 import org.jetbrains.annotations.NotNull;
 
 public abstract class CCRenameHandler implements RenameHandler {

diff --git a/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/CCTaskMoveHandlerDelegate.java b/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/CCTaskMoveHandlerDelegate.java
index 818b71c36ec5eae07e503a7b018785f1fdc588d2..37cd620bc2e6dccf9e53786777d8a227cd027c67 100644 (file)
--- a/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/CCTaskMoveHandlerDelegate.java
+++ b/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/CCTaskMoveHandlerDelegate.java
@@ -18,12 +18,12 @@ import com.intellij.psi.PsiReference;
 import com.intellij.refactoring.move.MoveCallback;
 import com.intellij.refactoring.move.MoveHandlerDelegate;
 import com.intellij.util.Function;
-import com.jetbrains.edu.EduNames;
-import com.jetbrains.edu.EduUtils;
-import com.jetbrains.edu.courseFormat.Course;
-import com.jetbrains.edu.courseFormat.Lesson;
-import com.jetbrains.edu.courseFormat.StudyItem;
-import com.jetbrains.edu.courseFormat.Task;
+import com.jetbrains.edu.learning.core.EduNames;
+import com.jetbrains.edu.learning.core.EduUtils;
+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.Task;
 import com.jetbrains.edu.coursecreator.ui.CCMoveStudyItemDialog;
 import org.jetbrains.annotations.Nullable;
 

diff --git a/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/CCTaskRenameHandler.java b/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/CCTaskRenameHandler.java
index 23ebfbaf5c82991577184722610324e6c94dea72..0f30a1d689f56fb61f005ec127352076fb6db9db 100644 (file)
--- a/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/CCTaskRenameHandler.java
+++ b/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/CCTaskRenameHandler.java
@@ -3,10 +3,10 @@ package com.jetbrains.edu.coursecreator;
 import com.intellij.ide.TitledHandler;
 import com.intellij.openapi.project.Project;
 import com.intellij.psi.PsiDirectory;
-import com.jetbrains.edu.EduNames;
-import com.jetbrains.edu.courseFormat.Course;
-import com.jetbrains.edu.courseFormat.Lesson;
-import com.jetbrains.edu.courseFormat.Task;
+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 org.jetbrains.annotations.NotNull;
 
 public class CCTaskRenameHandler extends CCRenameHandler implements TitledHandler {

diff --git a/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/CCUtils.java b/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/CCUtils.java
index e392934226058b85f644fef699f61fb6d9c1de5c..65131d0b36ae167fdb33cbe4a5b52351e4080ab0 100644 (file)
--- a/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/CCUtils.java
+++ b/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/CCUtils.java
@@ -18,9 +18,9 @@ import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.openapi.vfs.VirtualFileEvent;
 import com.intellij.psi.PsiDirectory;
 import com.intellij.util.Function;
-import com.jetbrains.edu.EduUtils;
-import com.jetbrains.edu.courseFormat.Course;
-import com.jetbrains.edu.courseFormat.StudyItem;
+import com.jetbrains.edu.learning.core.EduUtils;
+import com.jetbrains.edu.learning.courseFormat.Course;
+import com.jetbrains.edu.learning.courseFormat.StudyItem;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 

diff --git a/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCAddAnswerPlaceholder.java b/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCAddAnswerPlaceholder.java
index fb2cc00f96327fadbb8df6afb21b1bbecfcdae52..791d7fb0efae49949a7713ab5c2248292ba7f748 100644 (file)
--- a/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCAddAnswerPlaceholder.java
+++ b/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCAddAnswerPlaceholder.java
@@ -14,10 +14,10 @@ import com.intellij.psi.PsiDirectory;
 import com.intellij.psi.PsiDocumentManager;
 import com.intellij.psi.PsiFile;
 import com.intellij.ui.JBColor;
-import com.jetbrains.edu.EduAnswerPlaceholderPainter;
-import com.jetbrains.edu.courseFormat.*;
+import com.jetbrains.edu.learning.core.EduAnswerPlaceholderPainter;
 import com.jetbrains.edu.coursecreator.CCProjectService;
 import com.jetbrains.edu.coursecreator.ui.CCCreateAnswerPlaceholderDialog;
+import com.jetbrains.edu.learning.courseFormat.*;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.List;

diff --git a/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCAddAsTaskFile.java b/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCAddAsTaskFile.java
index 28a131367d152acd5576d8d7e721b8c7b791093a..867cc77440b6418f26c779965862097b65258301 100644 (file)
--- a/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCAddAsTaskFile.java
+++ b/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCAddAsTaskFile.java
@@ -7,7 +7,7 @@ import com.intellij.openapi.actionSystem.CommonDataKeys;
 import com.intellij.openapi.actionSystem.Presentation;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.vfs.VirtualFile;
-import com.jetbrains.edu.courseFormat.Task;
+import com.jetbrains.edu.learning.courseFormat.Task;
 import com.jetbrains.edu.coursecreator.CCProjectService;
 
 public class CCAddAsTaskFile extends AnAction {

diff --git a/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCAnswerPlaceholderAction.java b/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCAnswerPlaceholderAction.java
index 9c19f2305bb7793fdcc97b494b8e2291ded5e6d9..48425e247100938014dc46891a205968394bb1b2 100644 (file)
--- a/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCAnswerPlaceholderAction.java
+++ b/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCAnswerPlaceholderAction.java
@@ -8,8 +8,8 @@ import com.intellij.openapi.project.DumbAwareAction;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.psi.PsiFile;
-import com.jetbrains.edu.courseFormat.AnswerPlaceholder;
-import com.jetbrains.edu.courseFormat.TaskFile;
+import com.jetbrains.edu.learning.courseFormat.AnswerPlaceholder;
+import com.jetbrains.edu.learning.courseFormat.TaskFile;
 import com.jetbrains.edu.coursecreator.CCProjectService;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;

diff --git a/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCChangeCourseInfo.java b/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCChangeCourseInfo.java
index c661b98b25520e6fdab8d0914f7b4b58f6eb0e06..28706dae9a72da9a16cce7d84e5f6199e19cba5f 100644 (file)
--- a/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCChangeCourseInfo.java
+++ b/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCChangeCourseInfo.java
@@ -11,7 +11,7 @@ import com.intellij.openapi.project.DumbAwareAction;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.ui.DialogWrapper;
 import com.intellij.psi.PsiDirectory;
-import com.jetbrains.edu.courseFormat.Course;
+import com.jetbrains.edu.learning.courseFormat.Course;
 import com.jetbrains.edu.coursecreator.CCProjectService;
 import com.jetbrains.edu.coursecreator.ui.CCNewProjectPanel;
 import org.jetbrains.annotations.NotNull;

diff --git a/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCCreateCourseArchive.java b/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCCreateCourseArchive.java
index 720a5814584f719e99e06adc9b2b2d61173b6d89..486f3b247c5dc83407f98dbb46bfc8d28009453e 100644 (file)
--- a/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCCreateCourseArchive.java
+++ b/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCCreateCourseArchive.java
@@ -20,12 +20,12 @@ import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.openapi.vfs.VirtualFileManager;
 import com.intellij.util.containers.HashMap;
 import com.intellij.util.io.ZipUtil;
-import com.jetbrains.edu.EduNames;
-import com.jetbrains.edu.EduUtils;
-import com.jetbrains.edu.courseFormat.Course;
-import com.jetbrains.edu.courseFormat.Lesson;
-import com.jetbrains.edu.courseFormat.Task;
-import com.jetbrains.edu.courseFormat.TaskFile;
+import com.jetbrains.edu.learning.core.EduNames;
+import com.jetbrains.edu.learning.core.EduUtils;
+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.TaskFile;
 import com.jetbrains.edu.coursecreator.CCLanguageManager;
 import com.jetbrains.edu.coursecreator.CCProjectService;
 import com.jetbrains.edu.coursecreator.CCUtils;

diff --git a/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCCreateLesson.java b/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCCreateLesson.java
index 958a49c6acc88d0ea8de94fa31299171f10279d3..2353e43c12b11c29707d792f02657333bc8781d8 100644 (file)
--- a/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCCreateLesson.java
+++ b/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCCreateLesson.java
@@ -8,11 +8,11 @@ import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.psi.PsiDirectory;
 import com.intellij.psi.PsiManager;
 import com.intellij.util.Function;
-import com.jetbrains.edu.EduNames;
-import com.jetbrains.edu.courseFormat.Course;
-import com.jetbrains.edu.courseFormat.Lesson;
-import com.jetbrains.edu.courseFormat.StudyItem;
-import icons.EducationalIcons;
+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 org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -22,7 +22,7 @@ public class CCCreateLesson extends CCCreateStudyItemActionBase {
   public static final String TITLE = "Create New " + EduNames.LESSON_TITLED;
 
   public CCCreateLesson() {
-    super(EduNames.LESSON_TITLED, TITLE, EducationalIcons.Lesson);
+    super(EduNames.LESSON_TITLED, TITLE, InteractiveLearningIcons.Lesson);
   }
 
   @Nullable

diff --git a/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCCreateStudyItemActionBase.java b/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCCreateStudyItemActionBase.java
index 185fe106ef1f7f287ee74a6b489d43eb852e31a8..520ce0961a6a13356c97dc421ffca64c3dc4af85 100644 (file)
--- a/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCCreateStudyItemActionBase.java
+++ b/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCCreateStudyItemActionBase.java
@@ -14,9 +14,9 @@ import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.psi.PsiDirectory;
 import com.intellij.util.Function;
-import com.jetbrains.edu.EduUtils;
-import com.jetbrains.edu.courseFormat.Course;
-import com.jetbrains.edu.courseFormat.StudyItem;
+import com.jetbrains.edu.learning.core.EduUtils;
+import com.jetbrains.edu.learning.courseFormat.Course;
+import com.jetbrains.edu.learning.courseFormat.StudyItem;
 import com.jetbrains.edu.coursecreator.CCProjectService;
 import com.jetbrains.edu.coursecreator.CCUtils;
 import com.jetbrains.edu.coursecreator.ui.CCCreateStudyItemDialog;

diff --git a/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCCreateTask.java b/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCCreateTask.java
index 313419b4032adeba73655e74da9c4b4c48cb6cc9..316b06d77c04f21103fac627f346f306ed033c1a 100644 (file)
--- a/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCCreateTask.java
+++ b/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCCreateTask.java
@@ -14,15 +14,15 @@ import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.psi.PsiDirectory;
 import com.intellij.psi.PsiElement;
 import com.intellij.util.Function;
-import com.jetbrains.edu.EduNames;
-import com.jetbrains.edu.EduUtils;
-import com.jetbrains.edu.courseFormat.Course;
-import com.jetbrains.edu.courseFormat.Lesson;
-import com.jetbrains.edu.courseFormat.StudyItem;
-import com.jetbrains.edu.courseFormat.Task;
+import com.jetbrains.edu.learning.core.EduNames;
+import com.jetbrains.edu.learning.core.EduUtils;
+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.Task;
 import com.jetbrains.edu.coursecreator.CCLanguageManager;
 import com.jetbrains.edu.coursecreator.CCUtils;
-import icons.EducationalIcons;
+import icons.InteractiveLearningIcons;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -34,7 +34,7 @@ public class CCCreateTask extends CCCreateStudyItemActionBase {
   public static final String TITLE = "Create New " + EduNames.TASK_TITLED;
 
   public CCCreateTask() {
-    super(EduNames.TASK_TITLED, TITLE, EducationalIcons.Task);
+    super(EduNames.TASK_TITLED, TITLE, InteractiveLearningIcons.Task);
   }
 
 

diff --git a/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCCreateTaskFile.java b/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCCreateTaskFile.java
index 1a04f0f65fc3d874637bda1bad675618abf21745..eb5598625cce8439ad37c84efc2ac464c1d0493c 100644 (file)
--- a/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCCreateTaskFile.java
+++ b/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCCreateTaskFile.java
@@ -19,10 +19,10 @@ import com.intellij.openapi.project.Project;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.psi.PsiDirectory;
 import com.intellij.psi.PsiElement;
-import com.jetbrains.edu.EduNames;
-import com.jetbrains.edu.courseFormat.Course;
-import com.jetbrains.edu.courseFormat.Lesson;
-import com.jetbrains.edu.courseFormat.Task;
+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.coursecreator.CCLanguageManager;
 import com.jetbrains.edu.coursecreator.CCProjectService;
 import com.jetbrains.edu.coursecreator.CCUtils;

diff --git a/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCDeleteAllAnswerPlaceholdersAction.java b/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCDeleteAllAnswerPlaceholdersAction.java
index 68ef87702a4157a41d05f7092baf06f522b84573..55915d05bae4cc10b95046a2904c534bdce9d324 100644 (file)
--- a/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCDeleteAllAnswerPlaceholdersAction.java
+++ b/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCDeleteAllAnswerPlaceholdersAction.java
@@ -14,9 +14,9 @@ import com.intellij.openapi.fileEditor.TextEditor;
 import com.intellij.openapi.project.DumbAwareAction;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.vfs.VirtualFile;
-import com.jetbrains.edu.EduUtils;
-import com.jetbrains.edu.courseFormat.AnswerPlaceholder;
-import com.jetbrains.edu.courseFormat.TaskFile;
+import com.jetbrains.edu.learning.core.EduUtils;
+import com.jetbrains.edu.learning.courseFormat.AnswerPlaceholder;
+import com.jetbrains.edu.learning.courseFormat.TaskFile;
 import com.jetbrains.edu.coursecreator.CCProjectService;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;

diff --git a/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCDeleteAnswerPlaceholder.java b/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCDeleteAnswerPlaceholder.java
index 21dc1385c1a0ef262b340d2b2e7ee03176029340..e385589b32bdcf593dd997e581ac7defb34e17d4 100644 (file)
--- a/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCDeleteAnswerPlaceholder.java
+++ b/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCDeleteAnswerPlaceholder.java
@@ -5,9 +5,9 @@ import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.project.Project;
 import com.intellij.psi.PsiDocumentManager;
 import com.intellij.psi.PsiFile;
-import com.jetbrains.edu.EduAnswerPlaceholderPainter;
-import com.jetbrains.edu.courseFormat.AnswerPlaceholder;
-import com.jetbrains.edu.courseFormat.TaskFile;
+import com.jetbrains.edu.learning.core.EduAnswerPlaceholderPainter;
+import com.jetbrains.edu.learning.courseFormat.AnswerPlaceholder;
+import com.jetbrains.edu.learning.courseFormat.TaskFile;
 import com.jetbrains.edu.coursecreator.CCProjectService;
 import org.jetbrains.annotations.NotNull;
 

diff --git a/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCFromCourseArchive.java b/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCFromCourseArchive.java
index 96bd6911ea79fb7e25e6c32c28ad07b0ee9eff1e..a7c6a91dc52e12210526f5a4c77ef41cb580879e 100644 (file)
--- a/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCFromCourseArchive.java
+++ b/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCFromCourseArchive.java
@@ -22,12 +22,12 @@ import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.openapi.vfs.VirtualFileManager;
 import com.intellij.platform.templates.github.ZipUtil;
-import com.jetbrains.edu.EduDocumentListener;
-import com.jetbrains.edu.EduNames;
-import com.jetbrains.edu.EduUtils;
-import com.jetbrains.edu.courseFormat.*;
+import com.jetbrains.edu.learning.core.EduDocumentListener;
+import com.jetbrains.edu.learning.core.EduNames;
+import com.jetbrains.edu.learning.core.EduUtils;
 import com.jetbrains.edu.coursecreator.CCProjectService;
-import com.jetbrains.edu.oldCourseFormat.OldCourse;
+import com.jetbrains.edu.learning.courseFormat.*;
+import com.jetbrains.edu.learning.oldCourseFormat.OldCourse;
 import org.jetbrains.annotations.NotNull;
 
 import java.io.*;

diff --git a/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCPushCourse.java b/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCPushCourse.java
index 78e8c059659bc2b617632fb8cdde9c6609cbb3aa..78410c9ad3a1beca5375304fac0bf23382ed35f0 100644 (file)
--- a/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCPushCourse.java
+++ b/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCPushCourse.java
@@ -6,9 +6,9 @@ import com.intellij.openapi.actionSystem.CommonDataKeys;
 import com.intellij.openapi.actionSystem.LangDataKeys;
 import com.intellij.openapi.project.DumbAwareAction;
 import com.intellij.openapi.project.Project;
-import com.jetbrains.edu.courseFormat.Course;
+import com.jetbrains.edu.learning.courseFormat.Course;
 import com.jetbrains.edu.coursecreator.CCProjectService;
-import com.jetbrains.edu.stepic.EduStepicConnector;
+import com.jetbrains.edu.learning.stepic.EduStepicConnector;
 import org.jetbrains.annotations.NotNull;
 
 public class CCPushCourse extends DumbAwareAction {

diff --git a/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCPushLesson.java b/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCPushLesson.java
index c5f64883ecc421c7f2ea4f68a0dad185ce694732..068b82bf0b1a34605f87b287d7385bc39849788a 100644 (file)
--- a/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCPushLesson.java
+++ b/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCPushLesson.java
@@ -11,10 +11,10 @@ import com.intellij.openapi.progress.Task;
 import com.intellij.openapi.project.DumbAwareAction;
 import com.intellij.openapi.project.Project;
 import com.intellij.psi.PsiDirectory;
-import com.jetbrains.edu.courseFormat.Course;
-import com.jetbrains.edu.courseFormat.Lesson;
+import com.jetbrains.edu.learning.courseFormat.Course;
+import com.jetbrains.edu.learning.courseFormat.Lesson;
 import com.jetbrains.edu.coursecreator.CCProjectService;
-import com.jetbrains.edu.stepic.EduStepicConnector;
+import com.jetbrains.edu.learning.stepic.EduStepicConnector;
 import org.jetbrains.annotations.NotNull;
 
 public class CCPushLesson extends DumbAwareAction {

diff --git a/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCRunTestsAction.java b/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCRunTestsAction.java
index cb69bf344d4541637e9e77f0b9ea687486f64167..f6982733db5b4e597b4755f3a7cb2b606d9c7ed1 100644 (file)
--- a/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCRunTestsAction.java
+++ b/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCRunTestsAction.java
@@ -30,12 +30,12 @@ import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiFile;
-import com.jetbrains.edu.EduNames;
-import com.jetbrains.edu.EduUtils;
-import com.jetbrains.edu.courseFormat.Course;
-import com.jetbrains.edu.courseFormat.Lesson;
-import com.jetbrains.edu.courseFormat.Task;
-import com.jetbrains.edu.courseFormat.TaskFile;
+import com.jetbrains.edu.learning.core.EduNames;
+import com.jetbrains.edu.learning.core.EduUtils;
+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.TaskFile;
 import com.jetbrains.edu.coursecreator.CCLanguageManager;
 import com.jetbrains.edu.coursecreator.CCProjectService;
 import com.jetbrains.edu.coursecreator.CCUtils;

diff --git a/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCShowAnswerPlaceholderDetails.java b/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCShowAnswerPlaceholderDetails.java
index fa2b93b8902f9b143b8eb5361a3cb3a490d86238..7068c5e1c5723375028a6bdce629de3e4ba1cd43 100644 (file)
--- a/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCShowAnswerPlaceholderDetails.java
+++ b/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCShowAnswerPlaceholderDetails.java
@@ -3,7 +3,7 @@ package com.jetbrains.edu.coursecreator.actions;
 import com.intellij.openapi.project.Project;
 import com.intellij.psi.PsiDirectory;
 import com.intellij.psi.PsiFile;
-import com.jetbrains.edu.courseFormat.AnswerPlaceholder;
+import com.jetbrains.edu.learning.courseFormat.AnswerPlaceholder;
 import com.jetbrains.edu.coursecreator.ui.CCCreateAnswerPlaceholderDialog;
 import org.jetbrains.annotations.NotNull;
 

diff --git a/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCShowPreview.java b/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCShowPreview.java
index 040ae838d62e18e0bc30aa93c6f2b9551e4080a9..f0662db25052a8424954bf5ca55fff6e107f17fc 100644 (file)
--- a/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCShowPreview.java
+++ b/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/actions/CCShowPreview.java
@@ -37,11 +37,11 @@ import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.psi.PsiDirectory;
 import com.intellij.psi.PsiFile;
 import com.intellij.ui.JBColor;
-import com.jetbrains.edu.EduAnswerPlaceholderPainter;
-import com.jetbrains.edu.EduUtils;
-import com.jetbrains.edu.courseFormat.AnswerPlaceholder;
-import com.jetbrains.edu.courseFormat.Course;
-import com.jetbrains.edu.courseFormat.TaskFile;
+import com.jetbrains.edu.learning.core.EduAnswerPlaceholderPainter;
+import com.jetbrains.edu.learning.core.EduUtils;
+import com.jetbrains.edu.learning.courseFormat.AnswerPlaceholder;
+import com.jetbrains.edu.learning.courseFormat.Course;
+import com.jetbrains.edu.learning.courseFormat.TaskFile;
 import com.jetbrains.edu.coursecreator.CCProjectService;
 import com.jetbrains.edu.coursecreator.CCUtils;
 import org.jetbrains.annotations.NotNull;

diff --git a/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/projectView/CCDirectoryNode.java b/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/projectView/CCDirectoryNode.java
index 6cf8acce54e6da92147d3d68ba47e648634f6ccd..551d344e37721c0a589ec5e283ac4c34ed8b31c7 100644 (file)
--- a/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/projectView/CCDirectoryNode.java
+++ b/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/projectView/CCDirectoryNode.java
@@ -6,13 +6,13 @@ import com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode;
 import com.intellij.openapi.project.Project;
 import com.intellij.psi.PsiDirectory;
 import com.intellij.ui.SimpleTextAttributes;
-import com.jetbrains.edu.EduNames;
-import com.jetbrains.edu.EduUtils;
-import com.jetbrains.edu.courseFormat.Course;
-import com.jetbrains.edu.courseFormat.Lesson;
-import com.jetbrains.edu.courseFormat.Task;
+import com.jetbrains.edu.learning.core.EduNames;
+import com.jetbrains.edu.learning.core.EduUtils;
+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.coursecreator.CCProjectService;
-import icons.EducationalIcons;
+import icons.InteractiveLearningIcons;
 import org.jetbrains.annotations.NotNull;
 
 public class CCDirectoryNode extends PsiDirectoryNode {
@@ -35,7 +35,7 @@ public class CCDirectoryNode extends PsiDirectoryNode {
     if (course == null) return;
     if (myProject.getBaseDir().equals(myValue.getVirtualFile())) {
       data.clearText();
-      data.setIcon(EducationalIcons.Course);
+      data.setIcon(InteractiveLearningIcons.Course);
       data.addText(course.getName(), SimpleTextAttributes.REGULAR_ATTRIBUTES);
       data.addText(" (" + valueName + ")", SimpleTextAttributes.GRAYED_ATTRIBUTES);
       return;
@@ -43,7 +43,7 @@ public class CCDirectoryNode extends PsiDirectoryNode {
     final Lesson lesson = course.getLesson(valueName);
     if (lesson != null) {
       data.clearText();
-      data.setIcon(EducationalIcons.Lesson);
+      data.setIcon(InteractiveLearningIcons.Lesson);
       data.addText(lesson.getName(), SimpleTextAttributes.REGULAR_ATTRIBUTES);
       return;
     }
@@ -55,7 +55,7 @@ public class CCDirectoryNode extends PsiDirectoryNode {
           final Task task = parentLesson.getTask(valueName);
           if (task != null) {
             data.clearText();
-            data.setIcon(EducationalIcons.Task);
+            data.setIcon(InteractiveLearningIcons.Task);
             data.addText(task.getName(), SimpleTextAttributes.REGULAR_ATTRIBUTES);
             return;
           }

diff --git a/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/projectView/CCTreeStructureProvider.java b/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/projectView/CCTreeStructureProvider.java
index 3a1c7facaf374685561e7875267863343009c160..d4f39fbefd2f6358c29b48286e522b58f2006228 100644 (file)
--- a/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/projectView/CCTreeStructureProvider.java
+++ b/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/projectView/CCTreeStructureProvider.java
@@ -8,7 +8,7 @@ import com.intellij.openapi.project.DumbAware;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.psi.PsiDirectory;
-import com.jetbrains.edu.EduNames;
+import com.jetbrains.edu.learning.core.EduNames;
 import com.jetbrains.edu.coursecreator.CCProjectService;
 import com.jetbrains.edu.coursecreator.CCUtils;
 import org.jetbrains.annotations.NotNull;

diff --git a/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/ui/CCCreateAnswerPlaceholderDialog.java b/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/ui/CCCreateAnswerPlaceholderDialog.java
index d45574b2f66449bcdd84f097e27c564f56087c01..5f984acf1d95b40fc0308e99912dcf95a62cdf39 100644 (file)
--- a/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/ui/CCCreateAnswerPlaceholderDialog.java
+++ b/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/ui/CCCreateAnswerPlaceholderDialog.java
@@ -4,7 +4,7 @@ import com.intellij.openapi.project.Project;
 import com.intellij.openapi.ui.DialogWrapper;
 import com.intellij.openapi.ui.ValidationInfo;
 import com.intellij.openapi.util.text.StringUtil;
-import com.jetbrains.edu.courseFormat.AnswerPlaceholder;
+import com.jetbrains.edu.learning.courseFormat.AnswerPlaceholder;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 

diff --git a/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/ui/CreateCourseArchiveDialog.java b/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/ui/CreateCourseArchiveDialog.java
index 0707be045e75c8fedb6bd021cecf96852a3fb80e..d1bc4fca34695c254e50c5307c89cb12ed4e9081 100644 (file)
--- a/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/ui/CreateCourseArchiveDialog.java
+++ b/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/ui/CreateCourseArchiveDialog.java
@@ -2,7 +2,7 @@ package com.jetbrains.edu.coursecreator.ui;
 
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.ui.DialogWrapper;
-import com.jetbrains.edu.courseFormat.Course;
+import com.jetbrains.edu.learning.courseFormat.Course;
 import com.jetbrains.edu.coursecreator.CCProjectService;
 import com.jetbrains.edu.coursecreator.actions.CCCreateCourseArchive;
 import org.jetbrains.annotations.NotNull;

diff --git a/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/ui/CreateCourseArchivePanel.java b/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/ui/CreateCourseArchivePanel.java
index 3f22f5950dd54ac5bbc8b39473577ddcfb21aa10..c84a5cdf2b26011ce145f62bcc470cf350b4c5ae 100644 (file)
--- a/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/ui/CreateCourseArchivePanel.java
+++ b/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/ui/CreateCourseArchivePanel.java
@@ -6,7 +6,7 @@ import com.intellij.openapi.fileChooser.FileChooserDescriptorFactory;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.ui.TextFieldWithBrowseButton;
 import com.intellij.openapi.util.io.FileUtil;
-import com.jetbrains.edu.EduNames;
+import com.jetbrains.edu.learning.core.EduNames;
 import org.jetbrains.annotations.NotNull;
 
 import javax.swing.*;

diff --git a/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/ui/CreateTaskFileDialog.java b/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/ui/CreateTaskFileDialog.java
index 1e3aa78a9cc956822a34fbe60e9fc754c1d45579..5c8009296cd83e929e0fed5ed1e8e6170a6320f1 100644 (file)
--- a/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/ui/CreateTaskFileDialog.java
+++ b/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/ui/CreateTaskFileDialog.java
@@ -8,7 +8,7 @@ import com.intellij.openapi.ui.DialogWrapper;
 import com.intellij.ui.DoubleClickListener;
 import com.intellij.ui.ScrollingUtil;
 import com.intellij.ui.components.JBList;
-import com.jetbrains.edu.courseFormat.Course;
+import com.jetbrains.edu.learning.courseFormat.Course;
 import com.jetbrains.edu.coursecreator.CCLanguageManager;
 import com.jetbrains.edu.coursecreator.CCUtils;
 import org.jetbrains.annotations.NotNull;

diff --git a/python/educational-core/educational-core.iml b/python/educational-core/educational-core.iml
index 26234628d69d237bf84ac9a8eadb2bd97e5455dd..8433b9de516e6a25440c7cff214b80b7f98f8fb8 100644 (file)
--- a/python/educational-core/educational-core.iml
+++ b/python/educational-core/educational-core.iml
@@ -8,11 +8,5 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="platform-api" />
-    <orderEntry type="library" name="gson" level="project" />
-    <orderEntry type="module" module-name="core-impl" />
-    <orderEntry type="module" module-name="platform-impl" />
-    <orderEntry type="module" module-name="lang-impl" />
-    <orderEntry type="library" name="http-client" level="project" />
   </component>
 </module>
\ No newline at end of file

diff --git a/python/educational-core/resources/META-INF/plugin.xml b/python/educational-core/resources/META-INF/plugin.xml
deleted file mode 100644 (file)
index eaeac58..0000000
--- a/python/educational-core/resources/META-INF/plugin.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<idea-plugin version="2">
-  <id>com.jetbrains.edu.core</id>
-  <name>Educational utils and Stepic connector plugin</name>
-  <version>2.0.3</version>
-  <idea-version since-build="143.403"/>
-  <description><![CDATA[
-      Language-independent edu utils and stepic connector for Course creator and Student plugins.
-      ]]></description>
-  <vendor>JetBrains</vendor>
-
-  <change-notes><![CDATA[
-
-      ]]>
-  </change-notes>
-
-  <!-- please see http://confluence.jetbrains.net/display/IDEADEV/Plugin+Compatibility+with+IntelliJ+Platform+Products
-       on how to target different products -->
-
-  <depends>com.intellij.modules.lang</depends>
-
-  <project-components>
-
-  </project-components>
-
-  <application-components>
-
-  </application-components>
-
-  <actions>
-
-  </actions>
-
-</idea-plugin>
\ No newline at end of file

diff --git a/python/educational-core/src/icons/EducationalIcons.java b/python/educational-core/src/icons/EducationalIcons.java
deleted file mode 100644 (file)
index 0bdbc2b..0000000
--- a/python/educational-core/src/icons/EducationalIcons.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package icons;
-
-import com.intellij.openapi.util.IconLoader;
-
-import javax.swing.*;
-
-/**
- * NOTE THIS FILE IS AUTO-GENERATED
- * DO NOT EDIT IT BY HAND, run build/scripts/icons.gant instead
- */
-public class EducationalIcons {
-  private static Icon load(String path) {
-    return IconLoader.getIcon(path, EducationalIcons.class);
-  }
-
-  public static final Icon Course = load("/icons/com/jetbrains/edu/learning/Course.png"); // 16x16
-  public static final Icon Lesson = load("/icons/com/jetbrains/edu/learning/Lesson.png"); // 16x16
-  public static final Icon Task = load("/icons/com/jetbrains/edu/learning/Task.png"); // 16x16
-}

diff --git a/python/educational-core/student/resources/META-INF/plugin.xml b/python/educational-core/student/resources/META-INF/plugin.xml
index 823ec10abf07052f4c2bad3aeb917dbc7c833d69..4dfafa9bcc09db32c16b828fb47a6a457b93cc35 100644 (file)
--- a/python/educational-core/student/resources/META-INF/plugin.xml
+++ b/python/educational-core/student/resources/META-INF/plugin.xml
@@ -20,7 +20,6 @@
        on how to target different products -->
 
   <depends>com.intellij.modules.lang</depends>
-  <depends>com.jetbrains.edu.core</depends>
 
   <project-components>
     <component>
@@ -83,8 +82,8 @@
     <applicationConfigurable groupId="tools" instance="com.jetbrains.edu.learning.stepic.StudyConfigurable"
                              id="com.jetbrains.edu.learning.stepic.StudyConfigurable"
                              displayName="Educational"/>
-    <applicationService serviceInterface="com.jetbrains.edu.stepic.StudySettings"
-                        serviceImplementation="com.jetbrains.edu.stepic.StudySettings"/>
+    <applicationService serviceInterface="com.jetbrains.edu.learning.stepic.StudySettings"
+                        serviceImplementation="com.jetbrains.edu.learning.stepic.StudySettings"/>
 
     <toolWindow id="Task Description" anchor="right" factoryClass="com.jetbrains.edu.learning.ui.StudyToolWindowFactory" conditionClass="com.jetbrains.edu.learning.ui.StudyCondition"/>
     <toolWindow id="Course Progress" anchor="left" factoryClass="com.jetbrains.edu.learning.ui.StudyProgressToolWindowFactory" conditionClass="com.jetbrains.edu.learning.ui.StudyCondition"/>

diff --git a/python/educational-core/resources/icons/com/jetbrains/edu/learning/Course.png b/python/educational-core/student/resources/icons/com/jetbrains/edu/learning/Course.png
similarity index 100%
rename from python/educational-core/resources/icons/com/jetbrains/edu/learning/Course.png
rename to python/educational-core/student/resources/icons/com/jetbrains/edu/learning/Course.png

diff --git a/python/educational-core/resources/icons/com/jetbrains/edu/learning/Course@2x.png b/python/educational-core/student/resources/icons/com/jetbrains/edu/learning/Course@2x.png
similarity index 100%
rename from python/educational-core/resources/icons/com/jetbrains/edu/learning/Course@2x.png
rename to python/educational-core/student/resources/icons/com/jetbrains/edu/learning/Course@2x.png

diff --git a/python/educational-core/resources/icons/com/jetbrains/edu/learning/Course@2x_dark.png b/python/educational-core/student/resources/icons/com/jetbrains/edu/learning/Course@2x_dark.png
similarity index 100%
rename from python/educational-core/resources/icons/com/jetbrains/edu/learning/Course@2x_dark.png
rename to python/educational-core/student/resources/icons/com/jetbrains/edu/learning/Course@2x_dark.png

diff --git a/python/educational-core/resources/icons/com/jetbrains/edu/learning/Course_dark.png b/python/educational-core/student/resources/icons/com/jetbrains/edu/learning/Course_dark.png
similarity index 100%
rename from python/educational-core/resources/icons/com/jetbrains/edu/learning/Course_dark.png
rename to python/educational-core/student/resources/icons/com/jetbrains/edu/learning/Course_dark.png

diff --git a/python/educational-core/resources/icons/com/jetbrains/edu/learning/Lesson.png b/python/educational-core/student/resources/icons/com/jetbrains/edu/learning/Lesson.png
similarity index 100%
rename from python/educational-core/resources/icons/com/jetbrains/edu/learning/Lesson.png
rename to python/educational-core/student/resources/icons/com/jetbrains/edu/learning/Lesson.png

diff --git a/python/educational-core/resources/icons/com/jetbrains/edu/learning/Lesson@2x.png b/python/educational-core/student/resources/icons/com/jetbrains/edu/learning/Lesson@2x.png
similarity index 100%
rename from python/educational-core/resources/icons/com/jetbrains/edu/learning/Lesson@2x.png
rename to python/educational-core/student/resources/icons/com/jetbrains/edu/learning/Lesson@2x.png

diff --git a/python/educational-core/resources/icons/com/jetbrains/edu/learning/Task.png b/python/educational-core/student/resources/icons/com/jetbrains/edu/learning/Task.png
similarity index 100%
rename from python/educational-core/resources/icons/com/jetbrains/edu/learning/Task.png
rename to python/educational-core/student/resources/icons/com/jetbrains/edu/learning/Task.png

diff --git a/python/educational-core/resources/icons/com/jetbrains/edu/learning/Task@2x.png b/python/educational-core/student/resources/icons/com/jetbrains/edu/learning/Task@2x.png
similarity index 100%
rename from python/educational-core/resources/icons/com/jetbrains/edu/learning/Task@2x.png
rename to python/educational-core/student/resources/icons/com/jetbrains/edu/learning/Task@2x.png

diff --git a/python/educational-core/resources/icons/com/jetbrains/edu/learning/Task@2x_dark.png b/python/educational-core/student/resources/icons/com/jetbrains/edu/learning/Task@2x_dark.png
similarity index 100%
rename from python/educational-core/resources/icons/com/jetbrains/edu/learning/Task@2x_dark.png
rename to python/educational-core/student/resources/icons/com/jetbrains/edu/learning/Task@2x_dark.png

diff --git a/python/educational-core/resources/icons/com/jetbrains/edu/learning/Task_dark.png b/python/educational-core/student/resources/icons/com/jetbrains/edu/learning/Task_dark.png
similarity index 100%
rename from python/educational-core/resources/icons/com/jetbrains/edu/learning/Task_dark.png
rename to python/educational-core/student/resources/icons/com/jetbrains/edu/learning/Task_dark.png

diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/StudyAnswerPlaceholderExtendWordHandler.java b/python/educational-core/student/src/com/jetbrains/edu/learning/StudyAnswerPlaceholderExtendWordHandler.java
index 95bc425aec9eea65ab7846b8931a9b5853970323..8ebc8f4dadd65bd1bcd2338cb924b18f3b5016fb 100644 (file)
--- a/python/educational-core/student/src/com/jetbrains/edu/learning/StudyAnswerPlaceholderExtendWordHandler.java
+++ b/python/educational-core/student/src/com/jetbrains/edu/learning/StudyAnswerPlaceholderExtendWordHandler.java
@@ -9,8 +9,8 @@ import com.intellij.openapi.util.TextRange;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiFile;
-import com.jetbrains.edu.courseFormat.AnswerPlaceholder;
-import com.jetbrains.edu.courseFormat.TaskFile;
+import com.jetbrains.edu.learning.courseFormat.AnswerPlaceholder;
+import com.jetbrains.edu.learning.courseFormat.TaskFile;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.Collections;

diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/StudyBaseToolWindowConfigurator.java b/python/educational-core/student/src/com/jetbrains/edu/learning/StudyBaseToolWindowConfigurator.java
index 1790b7ecd3eb7b3aad041dca2cd464225f8a21b6..7c118af5bccf6131cc7ff944e50fffc936282fe4 100644 (file)
--- a/python/educational-core/student/src/com/jetbrains/edu/learning/StudyBaseToolWindowConfigurator.java
+++ b/python/educational-core/student/src/com/jetbrains/edu/learning/StudyBaseToolWindowConfigurator.java
@@ -6,8 +6,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.courseFormat.Task;
-import com.jetbrains.edu.courseFormat.TaskFile;
+import com.jetbrains.edu.learning.courseFormat.Task;
+import com.jetbrains.edu.learning.courseFormat.TaskFile;
 import com.jetbrains.edu.learning.actions.*;
 import com.jetbrains.edu.learning.ui.StudyToolWindow;
 import org.jetbrains.annotations.NotNull;

diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/StudyCourseResourceManager.java b/python/educational-core/student/src/com/jetbrains/edu/learning/StudyCourseResourceManager.java
index 893b347c44e8d992b1c03d2f0dd9f553c6830aaf..546d2406bad2ec2ef7b0a9147617e63bde6fbaf6 100644 (file)
--- a/python/educational-core/student/src/com/jetbrains/edu/learning/StudyCourseResourceManager.java
+++ b/python/educational-core/student/src/com/jetbrains/edu/learning/StudyCourseResourceManager.java
@@ -2,7 +2,7 @@ package com.jetbrains.edu.learning;
 
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.vfs.VirtualFile;
-import com.jetbrains.edu.courseFormat.Task;
+import com.jetbrains.edu.learning.courseFormat.Task;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 

diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/StudyMoveDelegate.java b/python/educational-core/student/src/com/jetbrains/edu/learning/StudyMoveDelegate.java
index a0417d7c8a66e42536aa7c61bb9d0b2ba20988aa..e21bb4007af4ac767888d1f5863d0f6f5438700b 100644 (file)
--- a/python/educational-core/student/src/com/jetbrains/edu/learning/StudyMoveDelegate.java
+++ b/python/educational-core/student/src/com/jetbrains/edu/learning/StudyMoveDelegate.java
@@ -8,7 +8,7 @@ import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiReference;
 import com.intellij.refactoring.move.MoveCallback;
 import com.intellij.refactoring.move.MoveHandlerDelegate;
-import com.jetbrains.edu.courseFormat.Course;
+import com.jetbrains.edu.learning.courseFormat.Course;
 import org.jetbrains.annotations.Nullable;
 
 public class StudyMoveDelegate extends MoveHandlerDelegate{

diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/StudyProjectComponent.java b/python/educational-core/student/src/com/jetbrains/edu/learning/StudyProjectComponent.java
index 1dc14d36bb51c33d3501a7d2b8b1e21a837bd329..c14b74c4c3a62f807b00349b0ee57a05c1e19401 100644 (file)
--- a/python/educational-core/student/src/com/jetbrains/edu/learning/StudyProjectComponent.java
+++ b/python/educational-core/student/src/com/jetbrains/edu/learning/StudyProjectComponent.java
@@ -25,12 +25,12 @@ import com.intellij.openapi.wm.ToolWindow;
 import com.intellij.openapi.wm.ToolWindowAnchor;
 import com.intellij.openapi.wm.ToolWindowManager;
 import com.intellij.util.containers.hash.HashMap;
-import com.jetbrains.edu.EduNames;
-import com.jetbrains.edu.EduUtils;
-import com.jetbrains.edu.courseFormat.Course;
-import com.jetbrains.edu.courseFormat.Lesson;
-import com.jetbrains.edu.courseFormat.Task;
-import com.jetbrains.edu.courseFormat.TaskFile;
+import com.jetbrains.edu.learning.core.EduNames;
+import com.jetbrains.edu.learning.core.EduUtils;
+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.TaskFile;
 import com.jetbrains.edu.learning.actions.*;
 import com.jetbrains.edu.learning.editor.StudyEditorFactoryListener;
 import com.jetbrains.edu.learning.ui.StudyProgressToolWindowFactory;

diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/StudyState.java b/python/educational-core/student/src/com/jetbrains/edu/learning/StudyState.java
index 4d2bd1ef99d74f4b26a9dd8d1f15e6157d2af7ca..f4cb42a1340ce5924dc8a10abaa3470f0a35d37b 100644 (file)
--- a/python/educational-core/student/src/com/jetbrains/edu/learning/StudyState.java
+++ b/python/educational-core/student/src/com/jetbrains/edu/learning/StudyState.java
@@ -3,8 +3,8 @@ package com.jetbrains.edu.learning;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.fileEditor.FileDocumentManager;
 import com.intellij.openapi.vfs.VirtualFile;
-import com.jetbrains.edu.courseFormat.Task;
-import com.jetbrains.edu.courseFormat.TaskFile;
+import com.jetbrains.edu.learning.courseFormat.Task;
+import com.jetbrains.edu.learning.courseFormat.TaskFile;
 import com.jetbrains.edu.learning.editor.StudyEditor;
 import org.jetbrains.annotations.Nullable;
 

diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/StudyTaskManager.java b/python/educational-core/student/src/com/jetbrains/edu/learning/StudyTaskManager.java
index c8910edcccac2b293918dd2667fdcc8cdcf7a4ba..6d682f4af732026e68fc77505dea6f972be53754 100644 (file)
--- a/python/educational-core/student/src/com/jetbrains/edu/learning/StudyTaskManager.java
+++ b/python/educational-core/student/src/com/jetbrains/edu/learning/StudyTaskManager.java
@@ -11,10 +11,9 @@ import com.intellij.ui.JBColor;
 import com.intellij.util.Function;
 import com.intellij.util.containers.hash.HashMap;
 import com.intellij.util.xmlb.XmlSerializer;
-import com.jetbrains.edu.EduUtils;
-import com.jetbrains.edu.courseFormat.*;
-import com.jetbrains.edu.learning.courseFormat.UserTest;
-import com.jetbrains.edu.oldCourseFormat.OldCourse;
+import com.jetbrains.edu.learning.core.EduUtils;
+import com.jetbrains.edu.learning.courseFormat.*;
+import com.jetbrains.edu.learning.oldCourseFormat.OldCourse;
 import org.jdom.Element;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;

diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/StudyUtils.java b/python/educational-core/student/src/com/jetbrains/edu/learning/StudyUtils.java
index 0f68f81654ef0180c5f42373e5443dde4e475d22..c967a69244377df20568ed561a80bfd27a8852bc 100644 (file)
--- a/python/educational-core/student/src/com/jetbrains/edu/learning/StudyUtils.java
+++ b/python/educational-core/student/src/com/jetbrains/edu/learning/StudyUtils.java
@@ -36,13 +36,13 @@ import com.intellij.ui.JBColor;
 import com.intellij.ui.awt.RelativePoint;
 import com.intellij.ui.content.Content;
 import com.intellij.util.ui.UIUtil;
-import com.jetbrains.edu.EduAnswerPlaceholderDeleteHandler;
-import com.jetbrains.edu.EduAnswerPlaceholderPainter;
-import com.jetbrains.edu.EduNames;
-import com.jetbrains.edu.EduUtils;
-import com.jetbrains.edu.courseFormat.*;
+import com.jetbrains.edu.learning.core.EduAnswerPlaceholderDeleteHandler;
+import com.jetbrains.edu.learning.core.EduAnswerPlaceholderPainter;
+import com.jetbrains.edu.learning.core.EduNames;
+import com.jetbrains.edu.learning.core.EduUtils;
 import com.jetbrains.edu.learning.checker.StudyExecutor;
 import com.jetbrains.edu.learning.checker.StudyTestRunner;
+import com.jetbrains.edu.learning.courseFormat.*;
 import com.jetbrains.edu.learning.editor.StudyEditor;
 import com.jetbrains.edu.learning.ui.StudyProgressToolWindowFactory;
 import com.jetbrains.edu.learning.ui.StudyToolWindow;

diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/actions/StudyEditInputAction.java b/python/educational-core/student/src/com/jetbrains/edu/learning/actions/StudyEditInputAction.java
index 8b11fb42ffd570a860f5aa6b86d1af849ca282c2..eb8045c10053e3539ce9289674569a943d3b0c22 100644 (file)
--- a/python/educational-core/student/src/com/jetbrains/edu/learning/actions/StudyEditInputAction.java
+++ b/python/educational-core/student/src/com/jetbrains/edu/learning/actions/StudyEditInputAction.java
@@ -20,10 +20,10 @@ import com.intellij.ui.tabs.TabInfo;
 import com.intellij.ui.tabs.TabsListener;
 import com.intellij.ui.tabs.impl.JBEditorTabs;
 import com.intellij.util.PlatformIcons;
-import com.jetbrains.edu.EduNames;
-import com.jetbrains.edu.EduUtils;
-import com.jetbrains.edu.courseFormat.Task;
-import com.jetbrains.edu.courseFormat.TaskFile;
+import com.jetbrains.edu.learning.core.EduNames;
+import com.jetbrains.edu.learning.core.EduUtils;
+import com.jetbrains.edu.learning.courseFormat.Task;
+import com.jetbrains.edu.learning.courseFormat.TaskFile;
 import com.jetbrains.edu.learning.StudyTaskManager;
 import com.jetbrains.edu.learning.StudyUtils;
 import com.jetbrains.edu.learning.courseFormat.UserTest;

diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/actions/StudyFillPlaceholdersAction.java b/python/educational-core/student/src/com/jetbrains/edu/learning/actions/StudyFillPlaceholdersAction.java
index 9e544a2eefde8ae3aa3ae97ae276e63d07aca0ff..e65c8a02bd6d85e96aa3e1e51f7c8afc1a352a47 100644 (file)
--- a/python/educational-core/student/src/com/jetbrains/edu/learning/actions/StudyFillPlaceholdersAction.java
+++ b/python/educational-core/student/src/com/jetbrains/edu/learning/actions/StudyFillPlaceholdersAction.java
@@ -6,8 +6,8 @@ import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.command.CommandProcessor;
 import com.intellij.openapi.editor.Document;
 import com.intellij.openapi.project.Project;
-import com.jetbrains.edu.courseFormat.AnswerPlaceholder;
-import com.jetbrains.edu.courseFormat.TaskFile;
+import com.jetbrains.edu.learning.courseFormat.AnswerPlaceholder;
+import com.jetbrains.edu.learning.courseFormat.TaskFile;
 import com.jetbrains.edu.learning.StudyState;
 import com.jetbrains.edu.learning.StudyUtils;
 import com.jetbrains.edu.learning.editor.StudyEditor;

diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/actions/StudyNextStudyTaskAction.java b/python/educational-core/student/src/com/jetbrains/edu/learning/actions/StudyNextStudyTaskAction.java
index d76308bac77409c128303e6139300e9a8cb48c32..4c8181e87f39f800825285fd2ff6c16e8774e4c0 100644 (file)
--- a/python/educational-core/student/src/com/jetbrains/edu/learning/actions/StudyNextStudyTaskAction.java
+++ b/python/educational-core/student/src/com/jetbrains/edu/learning/actions/StudyNextStudyTaskAction.java
@@ -3,7 +3,7 @@ package com.jetbrains.edu.learning.actions;
 import com.intellij.icons.AllIcons;
 import com.intellij.openapi.actionSystem.KeyboardShortcut;
 import com.intellij.openapi.keymap.KeymapUtil;
-import com.jetbrains.edu.courseFormat.Task;
+import com.jetbrains.edu.learning.courseFormat.Task;
 import com.jetbrains.edu.learning.navigation.StudyNavigator;
 import org.jetbrains.annotations.NotNull;
 

diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/actions/StudyNextWindowAction.java b/python/educational-core/student/src/com/jetbrains/edu/learning/actions/StudyNextWindowAction.java
index a509f57b6bc3afe95f0742860012580a703ec302..14a76cdb9316d3938a93fca3c43f574cbf433108 100644 (file)
--- a/python/educational-core/student/src/com/jetbrains/edu/learning/actions/StudyNextWindowAction.java
+++ b/python/educational-core/student/src/com/jetbrains/edu/learning/actions/StudyNextWindowAction.java
@@ -1,7 +1,7 @@
 package com.jetbrains.edu.learning.actions;
 
 import com.intellij.icons.AllIcons;
-import com.jetbrains.edu.courseFormat.AnswerPlaceholder;
+import com.jetbrains.edu.learning.courseFormat.AnswerPlaceholder;
 import com.jetbrains.edu.learning.StudyUtils;
 import org.jetbrains.annotations.NotNull;
 

diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/actions/StudyPrevWindowAction.java b/python/educational-core/student/src/com/jetbrains/edu/learning/actions/StudyPrevWindowAction.java
index bbdaabd885fe05f649fd292d5eb7ad6f2bd581d3..055f20251acf0e4184d002724fa5ef4286b7e6fb 100644 (file)
--- a/python/educational-core/student/src/com/jetbrains/edu/learning/actions/StudyPrevWindowAction.java
+++ b/python/educational-core/student/src/com/jetbrains/edu/learning/actions/StudyPrevWindowAction.java
@@ -1,6 +1,6 @@
 package com.jetbrains.edu.learning.actions;
 
-import com.jetbrains.edu.courseFormat.AnswerPlaceholder;
+import com.jetbrains.edu.learning.courseFormat.AnswerPlaceholder;
 import com.jetbrains.edu.learning.StudyUtils;
 import icons.InteractiveLearningIcons;
 import org.jetbrains.annotations.NotNull;

diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/actions/StudyPreviousStudyTaskAction.java b/python/educational-core/student/src/com/jetbrains/edu/learning/actions/StudyPreviousStudyTaskAction.java
index 0c3d5b4088ce3533e206dff38ecbe1c42bf795ef..b5e17c0b69aa28fb903e0aa08863519c82c63482 100644 (file)
--- a/python/educational-core/student/src/com/jetbrains/edu/learning/actions/StudyPreviousStudyTaskAction.java
+++ b/python/educational-core/student/src/com/jetbrains/edu/learning/actions/StudyPreviousStudyTaskAction.java
@@ -3,7 +3,7 @@ package com.jetbrains.edu.learning.actions;
 
 import com.intellij.openapi.actionSystem.KeyboardShortcut;
 import com.intellij.openapi.keymap.KeymapUtil;
-import com.jetbrains.edu.courseFormat.Task;
+import com.jetbrains.edu.learning.courseFormat.Task;
 import com.jetbrains.edu.learning.navigation.StudyNavigator;
 import icons.InteractiveLearningIcons;
 import org.jetbrains.annotations.NotNull;

diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/actions/StudyRefreshAnswerPlaceholder.java b/python/educational-core/student/src/com/jetbrains/edu/learning/actions/StudyRefreshAnswerPlaceholder.java
index d8ee72352c4a09444c60c46f6a7e23ba83fddf74..42a7674c384bd40afdb5011bdc0c58dde3457ee6 100644 (file)
--- a/python/educational-core/student/src/com/jetbrains/edu/learning/actions/StudyRefreshAnswerPlaceholder.java
+++ b/python/educational-core/student/src/com/jetbrains/edu/learning/actions/StudyRefreshAnswerPlaceholder.java
@@ -9,8 +9,8 @@ import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.project.DumbAwareAction;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.TextRange;
-import com.jetbrains.edu.courseFormat.AnswerPlaceholder;
-import com.jetbrains.edu.courseFormat.TaskFile;
+import com.jetbrains.edu.learning.courseFormat.AnswerPlaceholder;
+import com.jetbrains.edu.learning.courseFormat.TaskFile;
 import com.jetbrains.edu.learning.StudyState;
 import com.jetbrains.edu.learning.StudyUtils;
 import com.jetbrains.edu.learning.editor.StudyEditor;

diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/actions/StudyRefreshTaskFileAction.java b/python/educational-core/student/src/com/jetbrains/edu/learning/actions/StudyRefreshTaskFileAction.java
index 0cb33f2d04e9ec75d6c7c6a0a11cea8ab0a4caf3..41f8289703306b4df8a28ae783abaa576cfbc4f6 100644 (file)
--- a/python/educational-core/student/src/com/jetbrains/edu/learning/actions/StudyRefreshTaskFileAction.java
+++ b/python/educational-core/student/src/com/jetbrains/edu/learning/actions/StudyRefreshTaskFileAction.java
@@ -20,10 +20,10 @@ import com.intellij.openapi.ui.popup.JBPopupFactory;
 import com.intellij.openapi.util.Disposer;
 import com.intellij.openapi.wm.IdeFocusManager;
 import com.intellij.problems.WolfTheProblemSolver;
-import com.jetbrains.edu.EduAnswerPlaceholderPainter;
-import com.jetbrains.edu.courseFormat.AnswerPlaceholder;
-import com.jetbrains.edu.courseFormat.StudyStatus;
-import com.jetbrains.edu.courseFormat.TaskFile;
+import com.jetbrains.edu.learning.core.EduAnswerPlaceholderPainter;
+import com.jetbrains.edu.learning.courseFormat.AnswerPlaceholder;
+import com.jetbrains.edu.learning.courseFormat.StudyStatus;
+import com.jetbrains.edu.learning.courseFormat.TaskFile;
 import com.jetbrains.edu.learning.StudyState;
 import com.jetbrains.edu.learning.StudyTaskManager;
 import com.jetbrains.edu.learning.StudyUtils;

diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/actions/StudyRunAction.java b/python/educational-core/student/src/com/jetbrains/edu/learning/actions/StudyRunAction.java
index aba8cd2e283a62bc37f22a5b24bb9d6462956677..3bcb11aa2d7ef20d5701701bf588ea96eea8345a 100644 (file)
--- a/python/educational-core/student/src/com/jetbrains/edu/learning/actions/StudyRunAction.java
+++ b/python/educational-core/student/src/com/jetbrains/edu/learning/actions/StudyRunAction.java
@@ -16,9 +16,9 @@ import com.intellij.openapi.project.Project;
 import com.intellij.openapi.projectRoots.Sdk;
 import com.intellij.openapi.util.Disposer;
 import com.intellij.openapi.vfs.VirtualFile;
-import com.jetbrains.edu.EduUtils;
-import com.jetbrains.edu.courseFormat.Task;
-import com.jetbrains.edu.courseFormat.TaskFile;
+import com.jetbrains.edu.learning.core.EduUtils;
+import com.jetbrains.edu.learning.courseFormat.Task;
+import com.jetbrains.edu.learning.courseFormat.TaskFile;
 import com.jetbrains.edu.learning.StudyTaskManager;
 import com.jetbrains.edu.learning.StudyUtils;
 import com.jetbrains.edu.learning.courseFormat.UserTest;

diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/actions/StudyShowHintAction.java b/python/educational-core/student/src/com/jetbrains/edu/learning/actions/StudyShowHintAction.java
index 5d69a3869e02dea7bd4baaf989176c1db2e9cebf..c7c24232da3d444e206d1498611be329a69bae9c 100644 (file)
--- a/python/educational-core/student/src/com/jetbrains/edu/learning/actions/StudyShowHintAction.java
+++ b/python/educational-core/student/src/com/jetbrains/edu/learning/actions/StudyShowHintAction.java
@@ -15,8 +15,8 @@ import com.intellij.openapi.util.Disposer;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiFile;
 import com.intellij.psi.PsiManager;
-import com.jetbrains.edu.courseFormat.AnswerPlaceholder;
-import com.jetbrains.edu.courseFormat.Course;
+import com.jetbrains.edu.learning.courseFormat.AnswerPlaceholder;
+import com.jetbrains.edu.learning.courseFormat.Course;
 import com.jetbrains.edu.learning.StudyState;
 import com.jetbrains.edu.learning.StudyTaskManager;
 import com.jetbrains.edu.learning.StudyUtils;

diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/actions/StudyTaskNavigationAction.java b/python/educational-core/student/src/com/jetbrains/edu/learning/actions/StudyTaskNavigationAction.java
index b4e8d16905f055a753d842e30221e8f567efd967..5406bd01b07e7eaa65fc177c0aabaffbbd7b62e9 100644 (file)
--- a/python/educational-core/student/src/com/jetbrains/edu/learning/actions/StudyTaskNavigationAction.java
+++ b/python/educational-core/student/src/com/jetbrains/edu/learning/actions/StudyTaskNavigationAction.java
@@ -14,9 +14,9 @@ import com.intellij.openapi.wm.ToolWindow;
 import com.intellij.openapi.wm.ToolWindowId;
 import com.intellij.openapi.wm.ToolWindowManager;
 import com.intellij.util.ui.tree.TreeUtil;
-import com.jetbrains.edu.EduNames;
-import com.jetbrains.edu.courseFormat.Task;
-import com.jetbrains.edu.courseFormat.TaskFile;
+import com.jetbrains.edu.learning.core.EduNames;
+import com.jetbrains.edu.learning.courseFormat.Task;
+import com.jetbrains.edu.learning.courseFormat.TaskFile;
 import com.jetbrains.edu.learning.StudyState;
 import com.jetbrains.edu.learning.StudyUtils;
 import com.jetbrains.edu.learning.editor.StudyEditor;

diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/actions/StudyWindowNavigationAction.java b/python/educational-core/student/src/com/jetbrains/edu/learning/actions/StudyWindowNavigationAction.java
index 7c79d3b01060cef3f5aff7580ebbd933c92ff266..0cd803e5a763e3f92cf2fa9e7bf17236bebab218 100644 (file)
--- a/python/educational-core/student/src/com/jetbrains/edu/learning/actions/StudyWindowNavigationAction.java
+++ b/python/educational-core/student/src/com/jetbrains/edu/learning/actions/StudyWindowNavigationAction.java
@@ -7,8 +7,8 @@ import com.intellij.openapi.fileEditor.FileDocumentManager;
 import com.intellij.openapi.project.DumbAwareAction;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.vfs.VirtualFile;
-import com.jetbrains.edu.courseFormat.AnswerPlaceholder;
-import com.jetbrains.edu.courseFormat.TaskFile;
+import com.jetbrains.edu.learning.courseFormat.AnswerPlaceholder;
+import com.jetbrains.edu.learning.courseFormat.TaskFile;
 import com.jetbrains.edu.learning.StudyUtils;
 import com.jetbrains.edu.learning.navigation.StudyNavigator;
 import org.jetbrains.annotations.NotNull;

diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/checker/StudyCheckTask.java b/python/educational-core/student/src/com/jetbrains/edu/learning/checker/StudyCheckTask.java
index 633189f8f5f2066f8ee294d1c9bce8015440ee09..5d332ef3ce31b617d7d848810567748ce77f3bba 100644 (file)
--- a/python/educational-core/student/src/com/jetbrains/edu/learning/checker/StudyCheckTask.java
+++ b/python/educational-core/student/src/com/jetbrains/edu/learning/checker/StudyCheckTask.java
@@ -11,14 +11,14 @@ import com.intellij.openapi.ui.MessageType;
 import com.intellij.openapi.util.Ref;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.openapi.vfs.VirtualFile;
-import com.jetbrains.edu.EduUtils;
-import com.jetbrains.edu.courseFormat.StudyStatus;
-import com.jetbrains.edu.courseFormat.Task;
+import com.jetbrains.edu.learning.core.EduUtils;
+import com.jetbrains.edu.learning.courseFormat.StudyStatus;
+import com.jetbrains.edu.learning.courseFormat.Task;
 import com.jetbrains.edu.learning.StudyState;
 import com.jetbrains.edu.learning.StudyTaskManager;
 import com.jetbrains.edu.learning.StudyUtils;
-import com.jetbrains.edu.stepic.EduStepicConnector;
-import com.jetbrains.edu.stepic.StudySettings;
+import com.jetbrains.edu.learning.stepic.EduStepicConnector;
+import com.jetbrains.edu.learning.stepic.StudySettings;
 import org.jetbrains.annotations.NotNull;
 
 public class StudyCheckTask extends com.intellij.openapi.progress.Task.Backgroundable {

diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/checker/StudyCheckUtils.java b/python/educational-core/student/src/com/jetbrains/edu/learning/checker/StudyCheckUtils.java
index ac6332a5dc58b637efa35ef31f345945d2ca16f0..9fe0ae84ae6bf61c7a2f188cdff3853e07a69c9d 100644 (file)
--- a/python/educational-core/student/src/com/jetbrains/edu/learning/checker/StudyCheckUtils.java
+++ b/python/educational-core/student/src/com/jetbrains/edu/learning/checker/StudyCheckUtils.java
@@ -20,11 +20,11 @@ import com.intellij.openapi.wm.IdeFrame;
 import com.intellij.openapi.wm.WindowManager;
 import com.intellij.openapi.wm.ex.StatusBarEx;
 import com.intellij.openapi.wm.ex.WindowManagerEx;
-import com.jetbrains.edu.EduDocumentListener;
-import com.jetbrains.edu.EduUtils;
-import com.jetbrains.edu.courseFormat.AnswerPlaceholder;
-import com.jetbrains.edu.courseFormat.Task;
-import com.jetbrains.edu.courseFormat.TaskFile;
+import com.jetbrains.edu.learning.core.EduDocumentListener;
+import com.jetbrains.edu.learning.core.EduUtils;
+import com.jetbrains.edu.learning.courseFormat.AnswerPlaceholder;
+import com.jetbrains.edu.learning.courseFormat.Task;
+import com.jetbrains.edu.learning.courseFormat.TaskFile;
 import com.jetbrains.edu.learning.StudyState;
 import com.jetbrains.edu.learning.StudyTaskManager;
 import com.jetbrains.edu.learning.StudyUtils;

diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/checker/StudyExecutor.java b/python/educational-core/student/src/com/jetbrains/edu/learning/checker/StudyExecutor.java
index 69073cfc97dcd395bcf96b14ef2e4c050c65fd62..e07bd515e8295b20d9ff9193d35f931b68a5ff1c 100644 (file)
--- a/python/educational-core/student/src/com/jetbrains/edu/learning/checker/StudyExecutor.java
+++ b/python/educational-core/student/src/com/jetbrains/edu/learning/checker/StudyExecutor.java
@@ -22,7 +22,7 @@ import com.intellij.lang.LanguageExtension;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.projectRoots.Sdk;
 import com.intellij.openapi.vfs.VirtualFile;
-import com.jetbrains.edu.courseFormat.Task;
+import com.jetbrains.edu.learning.courseFormat.Task;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 

diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/checker/StudySmartChecker.java b/python/educational-core/student/src/com/jetbrains/edu/learning/checker/StudySmartChecker.java
index 9a48eba57d58b41299fc08f38c01570d2ea67b7a..7cd660635d8424315146297de30d4d0f777c52b8 100644 (file)
--- a/python/educational-core/student/src/com/jetbrains/edu/learning/checker/StudySmartChecker.java
+++ b/python/educational-core/student/src/com/jetbrains/edu/learning/checker/StudySmartChecker.java
@@ -10,12 +10,12 @@ import com.intellij.openapi.fileEditor.FileDocumentManager;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.TextRange;
 import com.intellij.openapi.vfs.VirtualFile;
-import com.jetbrains.edu.EduDocumentListener;
-import com.jetbrains.edu.EduNames;
-import com.jetbrains.edu.EduUtils;
-import com.jetbrains.edu.courseFormat.AnswerPlaceholder;
-import com.jetbrains.edu.courseFormat.StudyStatus;
-import com.jetbrains.edu.courseFormat.TaskFile;
+import com.jetbrains.edu.learning.core.EduDocumentListener;
+import com.jetbrains.edu.learning.core.EduNames;
+import com.jetbrains.edu.learning.core.EduUtils;
+import com.jetbrains.edu.learning.courseFormat.AnswerPlaceholder;
+import com.jetbrains.edu.learning.courseFormat.StudyStatus;
+import com.jetbrains.edu.learning.courseFormat.TaskFile;
 import com.jetbrains.edu.learning.StudyTaskManager;
 import com.jetbrains.edu.learning.StudyUtils;
 import org.jetbrains.annotations.NotNull;

diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/checker/StudyTestRunner.java b/python/educational-core/student/src/com/jetbrains/edu/learning/checker/StudyTestRunner.java
index 914baab371a797628c438ac97966bd31e3f4a42a..85df8f263eb0c577960c63841dc86cf967d534fc 100644 (file)
--- a/python/educational-core/student/src/com/jetbrains/edu/learning/checker/StudyTestRunner.java
+++ b/python/educational-core/student/src/com/jetbrains/edu/learning/checker/StudyTestRunner.java
@@ -3,7 +3,7 @@ package com.jetbrains.edu.learning.checker;
 import com.intellij.execution.ExecutionException;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.vfs.VirtualFile;
-import com.jetbrains.edu.courseFormat.Task;
+import com.jetbrains.edu.learning.courseFormat.Task;
 import org.jetbrains.annotations.NotNull;
 
 public abstract class StudyTestRunner {protected final Task myTask;

diff --git a/python/educational-core/src/com/jetbrains/edu/EduAnswerPlaceholderDeleteHandler.java b/python/educational-core/student/src/com/jetbrains/edu/learning/core/EduAnswerPlaceholderDeleteHandler.java
similarity index 94%
rename from python/educational-core/src/com/jetbrains/edu/EduAnswerPlaceholderDeleteHandler.java
rename to python/educational-core/student/src/com/jetbrains/edu/learning/core/EduAnswerPlaceholderDeleteHandler.java
index 344f24df325cb59b9510b794108f4f45902be0bc..3b590003e5be11995f7a78504d97950bee1feb6e 100644 (file)
--- a/python/educational-core/src/com/jetbrains/edu/EduAnswerPlaceholderDeleteHandler.java
+++ b/python/educational-core/student/src/com/jetbrains/edu/learning/core/EduAnswerPlaceholderDeleteHandler.java
@@ -1,4 +1,4 @@
-package com.jetbrains.edu;
+package com.jetbrains.edu.learning.core;
 
 import com.intellij.codeInsight.hint.HintManager;
 import com.intellij.openapi.editor.Editor;

diff --git a/python/educational-core/src/com/jetbrains/edu/EduAnswerPlaceholderPainter.java b/python/educational-core/student/src/com/jetbrains/edu/learning/core/EduAnswerPlaceholderPainter.java
similarity index 95%
rename from python/educational-core/src/com/jetbrains/edu/EduAnswerPlaceholderPainter.java
rename to python/educational-core/student/src/com/jetbrains/edu/learning/core/EduAnswerPlaceholderPainter.java
index da2972c440c32dab033c62ed368335aaabc632d5..528b58e26102e2da4e61e10408afd0510be0e637 100644 (file)
--- a/python/educational-core/src/com/jetbrains/edu/EduAnswerPlaceholderPainter.java
+++ b/python/educational-core/student/src/com/jetbrains/edu/learning/core/EduAnswerPlaceholderPainter.java
@@ -1,4 +1,4 @@
-package com.jetbrains.edu;
+package com.jetbrains.edu.learning.core;
 
 import com.intellij.openapi.editor.Document;
 import com.intellij.openapi.editor.Editor;
@@ -9,8 +9,8 @@ import com.intellij.openapi.editor.impl.DocumentImpl;
 import com.intellij.openapi.editor.markup.*;
 import com.intellij.openapi.project.Project;
 import com.intellij.ui.JBColor;
-import com.jetbrains.edu.courseFormat.AnswerPlaceholder;
-import com.jetbrains.edu.courseFormat.TaskFile;
+import com.jetbrains.edu.learning.courseFormat.AnswerPlaceholder;
+import com.jetbrains.edu.learning.courseFormat.TaskFile;
 import org.jetbrains.annotations.NotNull;
 
 import java.awt.*;

diff --git a/python/educational-core/src/com/jetbrains/edu/EduDocumentListener.java b/python/educational-core/student/src/com/jetbrains/edu/learning/core/EduDocumentListener.java
similarity index 96%
rename from python/educational-core/src/com/jetbrains/edu/EduDocumentListener.java
rename to python/educational-core/student/src/com/jetbrains/edu/learning/core/EduDocumentListener.java
index 8e11945089ef500c30638bcaa4adc062616427d6..77e02bb151540e409a20aab1899ac831c8325a5d 100644 (file)
--- a/python/educational-core/src/com/jetbrains/edu/EduDocumentListener.java
+++ b/python/educational-core/student/src/com/jetbrains/edu/learning/core/EduDocumentListener.java
@@ -1,12 +1,12 @@
-package com.jetbrains.edu;
+package com.jetbrains.edu.learning.core;
 
 import com.intellij.openapi.editor.Document;
 import com.intellij.openapi.editor.event.DocumentAdapter;
 import com.intellij.openapi.editor.event.DocumentEvent;
 import com.intellij.openapi.editor.impl.event.DocumentEventImpl;
 import com.intellij.openapi.util.TextRange;
-import com.jetbrains.edu.courseFormat.AnswerPlaceholder;
-import com.jetbrains.edu.courseFormat.TaskFile;
+import com.jetbrains.edu.learning.courseFormat.AnswerPlaceholder;
+import com.jetbrains.edu.learning.courseFormat.TaskFile;
 
 import java.util.ArrayList;
 import java.util.List;

diff --git a/python/educational-core/src/com/jetbrains/edu/EduNames.java b/python/educational-core/student/src/com/jetbrains/edu/learning/core/EduNames.java
similarity index 97%
rename from python/educational-core/src/com/jetbrains/edu/EduNames.java
rename to python/educational-core/student/src/com/jetbrains/edu/learning/core/EduNames.java
index 344f01cc338438147ce1b19346dda1289caaf59c..03c06d19b30d7988a0f0ae97898a7c1d5d2ef17d 100644 (file)
--- a/python/educational-core/src/com/jetbrains/edu/EduNames.java
+++ b/python/educational-core/student/src/com/jetbrains/edu/learning/core/EduNames.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.jetbrains.edu;
+package com.jetbrains.edu.learning.core;
 
 import com.intellij.openapi.util.text.StringUtil;
 import org.jetbrains.annotations.NonNls;

diff --git a/python/educational-core/src/com/jetbrains/edu/EduUtils.java b/python/educational-core/student/src/com/jetbrains/edu/learning/core/EduUtils.java
similarity index 95%
rename from python/educational-core/src/com/jetbrains/edu/EduUtils.java
rename to python/educational-core/student/src/com/jetbrains/edu/learning/core/EduUtils.java
index 4f453c8ab0e73d55263fffb50da559ed83840269..4b4870673a23af97a98b5a34bdcc20c7c53c174c 100644 (file)
--- a/python/educational-core/src/com/jetbrains/edu/EduUtils.java
+++ b/python/educational-core/student/src/com/jetbrains/edu/learning/core/EduUtils.java
@@ -1,4 +1,4 @@
-package com.jetbrains.edu;
+package com.jetbrains.edu.learning.core;
 
 import com.intellij.ide.SaveAndSyncHandler;
 import com.intellij.openapi.actionSystem.AnActionEvent;
@@ -18,9 +18,9 @@ import com.intellij.openapi.vfs.VirtualFileManager;
 import com.intellij.psi.PsiDirectory;
 import com.intellij.util.Function;
 import com.intellij.util.containers.HashMap;
-import com.jetbrains.edu.courseFormat.*;
-import com.jetbrains.edu.oldCourseFormat.OldCourse;
-import com.jetbrains.edu.oldCourseFormat.TaskWindow;
+import com.jetbrains.edu.learning.courseFormat.*;
+import com.jetbrains.edu.learning.oldCourseFormat.OldCourse;
+import com.jetbrains.edu.learning.oldCourseFormat.TaskWindow;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -296,21 +296,21 @@ public class EduUtils {
       course.setCourseDirectory(FileUtil.toSystemIndependentName(updatedCoursePath));
     }
     final ArrayList<Lesson> lessons = new ArrayList<Lesson>();
-    for (com.jetbrains.edu.oldCourseFormat.Lesson oldLesson : oldCourse.lessons) {
+    for (com.jetbrains.edu.learning.oldCourseFormat.Lesson oldLesson : oldCourse.lessons) {
       final Lesson lesson = new Lesson();
       lesson.setName(oldLesson.name);
       lesson.setIndex(oldLesson.myIndex + 1);
 
       final ArrayList<Task> tasks = new ArrayList<Task>();
-      for (com.jetbrains.edu.oldCourseFormat.Task oldTask : oldLesson.taskList) {
+      for (com.jetbrains.edu.learning.oldCourseFormat.Task oldTask : oldLesson.taskList) {
         final Task task = new Task();
         task.setIndex(oldTask.myIndex + 1);
         task.setName(oldTask.name);
         task.setLesson(lesson);
         final HashMap<String, TaskFile> taskFiles = new HashMap<String, TaskFile>();
-        for (Map.Entry<String, com.jetbrains.edu.oldCourseFormat.TaskFile> entry : oldTask.taskFiles.entrySet()) {
+        for (Map.Entry<String, com.jetbrains.edu.learning.oldCourseFormat.TaskFile> entry : oldTask.taskFiles.entrySet()) {
           final TaskFile taskFile = new TaskFile();
-          final com.jetbrains.edu.oldCourseFormat.TaskFile oldTaskFile = entry.getValue();
+          final com.jetbrains.edu.learning.oldCourseFormat.TaskFile oldTaskFile = entry.getValue();
           taskFile.setIndex(oldTaskFile.myIndex);
           taskFile.name = entry.getKey();
 

diff --git a/python/educational-core/src/com/jetbrains/edu/courseFormat/AnswerPlaceholder.java b/python/educational-core/student/src/com/jetbrains/edu/learning/courseFormat/AnswerPlaceholder.java
similarity index 99%
rename from python/educational-core/src/com/jetbrains/edu/courseFormat/AnswerPlaceholder.java
rename to python/educational-core/student/src/com/jetbrains/edu/learning/courseFormat/AnswerPlaceholder.java
index c92c692798df5b57c0226c4fb32169b0dc1623a8..e086091d6d8c4077f875bbebce83c4687d43ec8e 100644 (file)
--- a/python/educational-core/src/com/jetbrains/edu/courseFormat/AnswerPlaceholder.java
+++ b/python/educational-core/student/src/com/jetbrains/edu/learning/courseFormat/AnswerPlaceholder.java
@@ -1,4 +1,4 @@
-package com.jetbrains.edu.courseFormat;
+package com.jetbrains.edu.learning.courseFormat;
 
 import com.google.gson.annotations.Expose;
 import com.google.gson.annotations.SerializedName;

diff --git a/python/educational-core/src/com/jetbrains/edu/courseFormat/AnswerPlaceholderComparator.java b/python/educational-core/student/src/com/jetbrains/edu/learning/courseFormat/AnswerPlaceholderComparator.java
similarity index 90%
rename from python/educational-core/src/com/jetbrains/edu/courseFormat/AnswerPlaceholderComparator.java
rename to python/educational-core/student/src/com/jetbrains/edu/learning/courseFormat/AnswerPlaceholderComparator.java
index f70044e99bcc55e601acac46c9c8af749ef3c478..09926490d8e23f67d7656f4404bdf21546231745 100644 (file)
--- a/python/educational-core/src/com/jetbrains/edu/courseFormat/AnswerPlaceholderComparator.java
+++ b/python/educational-core/student/src/com/jetbrains/edu/learning/courseFormat/AnswerPlaceholderComparator.java
@@ -1,4 +1,4 @@
-package com.jetbrains.edu.courseFormat;
+package com.jetbrains.edu.learning.courseFormat;
 
 import java.util.Comparator;
 

diff --git a/python/educational-core/src/com/jetbrains/edu/courseFormat/Course.java b/python/educational-core/student/src/com/jetbrains/edu/learning/courseFormat/Course.java
similarity index 94%
rename from python/educational-core/src/com/jetbrains/edu/courseFormat/Course.java
rename to python/educational-core/student/src/com/jetbrains/edu/learning/courseFormat/Course.java
index 4c34fe7b9efd710ab289eba3e8067d5be396afc9..5dfbebf0f6097cc2ea83d7ad7ff873193bc741f8 100644 (file)
--- a/python/educational-core/src/com/jetbrains/edu/courseFormat/Course.java
+++ b/python/educational-core/student/src/com/jetbrains/edu/learning/courseFormat/Course.java
@@ -1,13 +1,13 @@
-package com.jetbrains.edu.courseFormat;
+package com.jetbrains.edu.learning.courseFormat;
 
 import com.google.gson.annotations.Expose;
 import com.google.gson.annotations.SerializedName;
 import com.intellij.lang.Language;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.util.Function;
-import com.jetbrains.edu.EduNames;
-import com.jetbrains.edu.EduUtils;
-import com.jetbrains.edu.stepic.CourseInfo;
+import com.jetbrains.edu.learning.core.EduNames;
+import com.jetbrains.edu.learning.core.EduUtils;
+import com.jetbrains.edu.learning.stepic.CourseInfo;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.ArrayList;

diff --git a/python/educational-core/src/com/jetbrains/edu/courseFormat/Lesson.java b/python/educational-core/student/src/com/jetbrains/edu/learning/courseFormat/Lesson.java
similarity index 92%
rename from python/educational-core/src/com/jetbrains/edu/courseFormat/Lesson.java
rename to python/educational-core/student/src/com/jetbrains/edu/learning/courseFormat/Lesson.java
index 368f84a64226252575bcc85fe9f24ca62e7a5b1e..5b2f6acf9f225c032fac5b25dee36d369a7e6db1 100644 (file)
--- a/python/educational-core/src/com/jetbrains/edu/courseFormat/Lesson.java
+++ b/python/educational-core/student/src/com/jetbrains/edu/learning/courseFormat/Lesson.java
@@ -1,10 +1,10 @@
-package com.jetbrains.edu.courseFormat;
+package com.jetbrains.edu.learning.courseFormat;
 
 import com.google.gson.annotations.Expose;
 import com.google.gson.annotations.SerializedName;
 import com.intellij.util.xmlb.annotations.Transient;
-import com.jetbrains.edu.EduNames;
-import com.jetbrains.edu.EduUtils;
+import com.jetbrains.edu.learning.core.EduNames;
+import com.jetbrains.edu.learning.core.EduUtils;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.ArrayList;

diff --git a/python/educational-core/src/com/jetbrains/edu/courseFormat/StudyItem.java b/python/educational-core/student/src/com/jetbrains/edu/learning/courseFormat/StudyItem.java
similarity index 72%
rename from python/educational-core/src/com/jetbrains/edu/courseFormat/StudyItem.java
rename to python/educational-core/student/src/com/jetbrains/edu/learning/courseFormat/StudyItem.java
index b09d2570a687fe43dc9e246010da5320dde7581d..682dbb0a1bfed7fc84da6eb70338294462a660b4 100644 (file)
--- a/python/educational-core/src/com/jetbrains/edu/courseFormat/StudyItem.java
+++ b/python/educational-core/student/src/com/jetbrains/edu/learning/courseFormat/StudyItem.java
@@ -1,4 +1,4 @@
-package com.jetbrains.edu.courseFormat;
+package com.jetbrains.edu.learning.courseFormat;
 
 public interface StudyItem {
   String getName();

diff --git a/python/educational-core/src/com/jetbrains/edu/courseFormat/StudyStatus.java b/python/educational-core/student/src/com/jetbrains/edu/learning/courseFormat/StudyStatus.java
similarity index 59%
rename from python/educational-core/src/com/jetbrains/edu/courseFormat/StudyStatus.java
rename to python/educational-core/student/src/com/jetbrains/edu/learning/courseFormat/StudyStatus.java
index e8c11503f5653502612a66269929234d2512cdc0..e1849da8461bd3d12a965d2b83d83f58a045547e 100644 (file)
--- a/python/educational-core/src/com/jetbrains/edu/courseFormat/StudyStatus.java
+++ b/python/educational-core/student/src/com/jetbrains/edu/learning/courseFormat/StudyStatus.java
@@ -1,4 +1,4 @@
-package com.jetbrains.edu.courseFormat;
+package com.jetbrains.edu.learning.courseFormat;
 
 public enum StudyStatus {
   Unchecked, Solved, Failed, Uninitialized

diff --git a/python/educational-core/src/com/jetbrains/edu/courseFormat/Task.java b/python/educational-core/student/src/com/jetbrains/edu/learning/courseFormat/Task.java
similarity index 98%
rename from python/educational-core/src/com/jetbrains/edu/courseFormat/Task.java
rename to python/educational-core/student/src/com/jetbrains/edu/learning/courseFormat/Task.java
index b20ea6374ae156807a2e66c35e6e2f8c9f2247a2..3491f386dc6593cb5fe6ae8d146a3e2aaedd6bc7 100644 (file)
--- a/python/educational-core/src/com/jetbrains/edu/courseFormat/Task.java
+++ b/python/educational-core/student/src/com/jetbrains/edu/learning/courseFormat/Task.java
@@ -1,4 +1,4 @@
-package com.jetbrains.edu.courseFormat;
+package com.jetbrains.edu.learning.courseFormat;
 
 import com.google.gson.annotations.Expose;
 import com.google.gson.annotations.SerializedName;
@@ -8,7 +8,7 @@ import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.util.xmlb.annotations.Transient;
-import com.jetbrains.edu.EduNames;
+import com.jetbrains.edu.learning.core.EduNames;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 

diff --git a/python/educational-core/src/com/jetbrains/edu/courseFormat/TaskFile.java b/python/educational-core/student/src/com/jetbrains/edu/learning/courseFormat/TaskFile.java
similarity index 99%
rename from python/educational-core/src/com/jetbrains/edu/courseFormat/TaskFile.java
rename to python/educational-core/student/src/com/jetbrains/edu/learning/courseFormat/TaskFile.java
index 0ebc4f042ee548be38b57ea0e7aa15831f19d7f4..ceb8dd92ac2ce2121db04be9ed461b0151a8441a 100644 (file)
--- a/python/educational-core/src/com/jetbrains/edu/courseFormat/TaskFile.java
+++ b/python/educational-core/student/src/com/jetbrains/edu/learning/courseFormat/TaskFile.java
@@ -1,4 +1,4 @@
-package com.jetbrains.edu.courseFormat;
+package com.jetbrains.edu.learning.courseFormat;
 
 import com.google.gson.annotations.Expose;
 import com.google.gson.annotations.SerializedName;

diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/courseGeneration/StudyGenerator.java b/python/educational-core/student/src/com/jetbrains/edu/learning/courseGeneration/StudyGenerator.java
index 4d04f8e0bb3dc6d0c29752adfe58534135257b73..9af4dc7af1a56f141d4c623bcbec015f7486dad2 100644 (file)
--- a/python/educational-core/student/src/com/jetbrains/edu/learning/courseGeneration/StudyGenerator.java
+++ b/python/educational-core/student/src/com/jetbrains/edu/learning/courseGeneration/StudyGenerator.java
@@ -4,11 +4,11 @@ import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.openapi.vfs.VirtualFile;
-import com.jetbrains.edu.EduNames;
-import com.jetbrains.edu.courseFormat.Course;
-import com.jetbrains.edu.courseFormat.Lesson;
-import com.jetbrains.edu.courseFormat.Task;
-import com.jetbrains.edu.courseFormat.TaskFile;
+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.TaskFile;
 import com.jetbrains.edu.learning.StudyTaskManager;
 import com.jetbrains.edu.learning.StudyUtils;
 import org.jetbrains.annotations.NotNull;

diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/courseGeneration/StudyProjectGenerator.java b/python/educational-core/student/src/com/jetbrains/edu/learning/courseGeneration/StudyProjectGenerator.java
index dc0eb04cee57b10ea0ed3207c0abe8f4667e2454..451220034984ca1a1eb80e64b7de93df6803a622 100644 (file)
--- a/python/educational-core/student/src/com/jetbrains/edu/learning/courseGeneration/StudyProjectGenerator.java
+++ b/python/educational-core/student/src/com/jetbrains/edu/learning/courseGeneration/StudyProjectGenerator.java
@@ -22,17 +22,17 @@ import com.intellij.platform.templates.github.ZipUtil;
 import com.intellij.psi.PsiFile;
 import com.intellij.psi.PsiManager;
 import com.intellij.util.containers.ContainerUtil;
-import com.jetbrains.edu.EduNames;
-import com.jetbrains.edu.EduUtils;
-import com.jetbrains.edu.courseFormat.Course;
-import com.jetbrains.edu.courseFormat.Lesson;
-import com.jetbrains.edu.courseFormat.Task;
-import com.jetbrains.edu.courseFormat.TaskFile;
+import com.jetbrains.edu.learning.core.EduNames;
+import com.jetbrains.edu.learning.core.EduUtils;
+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.TaskFile;
 import com.jetbrains.edu.learning.StudyProjectComponent;
 import com.jetbrains.edu.learning.StudyTaskManager;
 import com.jetbrains.edu.learning.StudyUtils;
-import com.jetbrains.edu.stepic.CourseInfo;
-import com.jetbrains.edu.stepic.EduStepicConnector;
+import com.jetbrains.edu.learning.stepic.CourseInfo;
+import com.jetbrains.edu.learning.stepic.EduStepicConnector;
 import org.apache.commons.codec.binary.Base64;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;

diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/editor/StudyEditor.java b/python/educational-core/student/src/com/jetbrains/edu/learning/editor/StudyEditor.java
index ae5366a50970570312a3122bb15fb5ff4ced4556..50f8ad8cf759f4013872052b2885ed2cca84deaf 100644 (file)
--- a/python/educational-core/student/src/com/jetbrains/edu/learning/editor/StudyEditor.java
+++ b/python/educational-core/student/src/com/jetbrains/edu/learning/editor/StudyEditor.java
@@ -5,8 +5,8 @@ import com.intellij.openapi.fileEditor.impl.text.PsiAwareTextEditorImpl;
 import com.intellij.openapi.fileEditor.impl.text.TextEditorProvider;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.vfs.VirtualFile;
-import com.jetbrains.edu.EduDocumentListener;
-import com.jetbrains.edu.courseFormat.TaskFile;
+import com.jetbrains.edu.learning.core.EduDocumentListener;
+import com.jetbrains.edu.learning.courseFormat.TaskFile;
 import com.jetbrains.edu.learning.StudyUtils;
 import org.jetbrains.annotations.NotNull;
 

diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/editor/StudyEditorFactoryListener.java b/python/educational-core/student/src/com/jetbrains/edu/learning/editor/StudyEditorFactoryListener.java
index 12a566ddf5968b2f3c91e6788c7cc7f42b43b082..9a1eb88859f280c2131e6028573090513d03dde6 100644 (file)
--- a/python/educational-core/student/src/com/jetbrains/edu/learning/editor/StudyEditorFactoryListener.java
+++ b/python/educational-core/student/src/com/jetbrains/edu/learning/editor/StudyEditorFactoryListener.java
@@ -15,9 +15,9 @@ import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.openapi.wm.ToolWindow;
 import com.intellij.openapi.wm.ToolWindowManager;
 import com.intellij.problems.WolfTheProblemSolver;
-import com.jetbrains.edu.EduDocumentListener;
-import com.jetbrains.edu.courseFormat.AnswerPlaceholder;
-import com.jetbrains.edu.courseFormat.TaskFile;
+import com.jetbrains.edu.learning.core.EduDocumentListener;
+import com.jetbrains.edu.learning.courseFormat.AnswerPlaceholder;
+import com.jetbrains.edu.learning.courseFormat.TaskFile;
 import com.jetbrains.edu.learning.StudyUtils;
 import com.jetbrains.edu.learning.navigation.StudyNavigator;
 import com.jetbrains.edu.learning.ui.StudyToolWindowFactory;

diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/editor/StudyFileEditorProvider.java b/python/educational-core/student/src/com/jetbrains/edu/learning/editor/StudyFileEditorProvider.java
index 77e6f10693f8bbac0222523bcb79e970840c8a8e..cdfd8d4535db5e0cc09a45c70e8d67b06148911b 100644 (file)
--- a/python/educational-core/student/src/com/jetbrains/edu/learning/editor/StudyFileEditorProvider.java
+++ b/python/educational-core/student/src/com/jetbrains/edu/learning/editor/StudyFileEditorProvider.java
@@ -8,7 +8,7 @@ import com.intellij.openapi.fileEditor.impl.text.TextEditorProvider;
 import com.intellij.openapi.project.DumbAware;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.vfs.VirtualFile;
-import com.jetbrains.edu.courseFormat.TaskFile;
+import com.jetbrains.edu.learning.courseFormat.TaskFile;
 import com.jetbrains.edu.learning.StudyUtils;
 import org.jdom.Element;
 import org.jetbrains.annotations.NotNull;

diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/editor/StudyHighlightErrorFilter.java b/python/educational-core/student/src/com/jetbrains/edu/learning/editor/StudyHighlightErrorFilter.java
index daf1c5594e707d12a609e2c665531d98c93fe94c..38bae134e235afef5ca634da92a2e7b8f03a1d80 100644 (file)
--- a/python/educational-core/student/src/com/jetbrains/edu/learning/editor/StudyHighlightErrorFilter.java
+++ b/python/educational-core/student/src/com/jetbrains/edu/learning/editor/StudyHighlightErrorFilter.java
@@ -4,7 +4,7 @@ import com.intellij.codeInsight.highlighting.HighlightErrorFilter;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.psi.PsiErrorElement;
 import com.intellij.psi.PsiFile;
-import com.jetbrains.edu.courseFormat.TaskFile;
+import com.jetbrains.edu.learning.courseFormat.TaskFile;
 import com.jetbrains.edu.learning.StudyUtils;
 import org.jetbrains.annotations.NotNull;
 

diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/navigation/StudyNavigator.java b/python/educational-core/student/src/com/jetbrains/edu/learning/navigation/StudyNavigator.java
index 4b889f37023a728624933369f9972385100442de..604e2caa9a7d8af288ce84cd8d9117ce7f1b43cc 100644 (file)
--- a/python/educational-core/student/src/com/jetbrains/edu/learning/navigation/StudyNavigator.java
+++ b/python/educational-core/student/src/com/jetbrains/edu/learning/navigation/StudyNavigator.java
@@ -3,10 +3,10 @@ package com.jetbrains.edu.learning.navigation;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.editor.LogicalPosition;
 import com.intellij.openapi.project.Project;
-import com.jetbrains.edu.EduNames;
-import com.jetbrains.edu.courseFormat.*;
+import com.jetbrains.edu.learning.core.EduNames;
 import com.jetbrains.edu.learning.StudyTaskManager;
 import com.jetbrains.edu.learning.StudyUtils;
+import com.jetbrains.edu.learning.courseFormat.*;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.List;

diff --git a/python/educational-core/src/com/jetbrains/edu/oldCourseFormat/Lesson.java b/python/educational-core/student/src/com/jetbrains/edu/learning/oldCourseFormat/Lesson.java
similarity index 81%
rename from python/educational-core/src/com/jetbrains/edu/oldCourseFormat/Lesson.java
rename to python/educational-core/student/src/com/jetbrains/edu/learning/oldCourseFormat/Lesson.java
index e36ad2ce70b513ec21896c218c23d2f2574055f5..bdf1f45a36c9de021b63fe37426d64eba1e2c495 100644 (file)
--- a/python/educational-core/src/com/jetbrains/edu/oldCourseFormat/Lesson.java
+++ b/python/educational-core/student/src/com/jetbrains/edu/learning/oldCourseFormat/Lesson.java
@@ -1,4 +1,4 @@
-package com.jetbrains.edu.oldCourseFormat;
+package com.jetbrains.edu.learning.oldCourseFormat;
 
 import java.util.ArrayList;
 import java.util.List;

diff --git a/python/educational-core/src/com/jetbrains/edu/oldCourseFormat/LessonInfo.java b/python/educational-core/student/src/com/jetbrains/edu/learning/oldCourseFormat/LessonInfo.java
similarity index 82%
rename from python/educational-core/src/com/jetbrains/edu/oldCourseFormat/LessonInfo.java
rename to python/educational-core/student/src/com/jetbrains/edu/learning/oldCourseFormat/LessonInfo.java
index 1308e863b0bacfcbdec41c180c34c6b9490c8ca0..b19031b335a34c63a347f839f2e051d52573f009 100644 (file)
--- a/python/educational-core/src/com/jetbrains/edu/oldCourseFormat/LessonInfo.java
+++ b/python/educational-core/student/src/com/jetbrains/edu/learning/oldCourseFormat/LessonInfo.java
@@ -1,4 +1,4 @@
-package com.jetbrains.edu.oldCourseFormat;
+package com.jetbrains.edu.learning.oldCourseFormat;
 
 /**
  * Implementation of class which contains information about student progress in current lesson

diff --git a/python/educational-core/src/com/jetbrains/edu/oldCourseFormat/OldCourse.java b/python/educational-core/student/src/com/jetbrains/edu/learning/oldCourseFormat/OldCourse.java
similarity index 84%
rename from python/educational-core/src/com/jetbrains/edu/oldCourseFormat/OldCourse.java
rename to python/educational-core/student/src/com/jetbrains/edu/learning/oldCourseFormat/OldCourse.java
index d3c31bab4d6a403874b24a32575cfcf5cf621c88..fe254359e2efa88a5ea3c47a9f27551d756b9c3d 100644 (file)
--- a/python/educational-core/src/com/jetbrains/edu/oldCourseFormat/OldCourse.java
+++ b/python/educational-core/student/src/com/jetbrains/edu/learning/oldCourseFormat/OldCourse.java
@@ -1,4 +1,4 @@
-package com.jetbrains.edu.oldCourseFormat;
+package com.jetbrains.edu.learning.oldCourseFormat;
 
 import java.util.ArrayList;
 import java.util.List;

diff --git a/python/educational-core/src/com/jetbrains/edu/oldCourseFormat/Task.java b/python/educational-core/student/src/com/jetbrains/edu/learning/oldCourseFormat/Task.java
similarity index 84%
rename from python/educational-core/src/com/jetbrains/edu/oldCourseFormat/Task.java
rename to python/educational-core/student/src/com/jetbrains/edu/learning/oldCourseFormat/Task.java
index a1125fef9c2b5ff9c6beebd6c8c903febba8a849..43a41c815962a01147c91d25bb9430cd2110c43c 100644 (file)
--- a/python/educational-core/src/com/jetbrains/edu/oldCourseFormat/Task.java
+++ b/python/educational-core/student/src/com/jetbrains/edu/learning/oldCourseFormat/Task.java
@@ -1,4 +1,4 @@
-package com.jetbrains.edu.oldCourseFormat;
+package com.jetbrains.edu.learning.oldCourseFormat;
 
 import java.util.HashMap;
 import java.util.Map;

diff --git a/python/educational-core/src/com/jetbrains/edu/oldCourseFormat/TaskFile.java b/python/educational-core/student/src/com/jetbrains/edu/learning/oldCourseFormat/TaskFile.java
similarity index 82%
rename from python/educational-core/src/com/jetbrains/edu/oldCourseFormat/TaskFile.java
rename to python/educational-core/student/src/com/jetbrains/edu/learning/oldCourseFormat/TaskFile.java
index b528f63b3ee487a64fc44275b4ae536a3be3c42e..be2c082f4e75168716cddd2a2fac847903f781b6 100644 (file)
--- a/python/educational-core/src/com/jetbrains/edu/oldCourseFormat/TaskFile.java
+++ b/python/educational-core/student/src/com/jetbrains/edu/learning/oldCourseFormat/TaskFile.java
@@ -1,4 +1,4 @@
-package com.jetbrains.edu.oldCourseFormat;
+package com.jetbrains.edu.learning.oldCourseFormat;
 
 import com.intellij.util.xmlb.annotations.Transient;
 

diff --git a/python/educational-core/src/com/jetbrains/edu/oldCourseFormat/TaskWindow.java b/python/educational-core/student/src/com/jetbrains/edu/learning/oldCourseFormat/TaskWindow.java
similarity index 78%
rename from python/educational-core/src/com/jetbrains/edu/oldCourseFormat/TaskWindow.java
rename to python/educational-core/student/src/com/jetbrains/edu/learning/oldCourseFormat/TaskWindow.java
index 53ef9a90be0e3432825cf75465713c9e32d7afad..50ac639492324c4f0f6f270dbdb1fd6487412e45 100644 (file)
--- a/python/educational-core/src/com/jetbrains/edu/oldCourseFormat/TaskWindow.java
+++ b/python/educational-core/student/src/com/jetbrains/edu/learning/oldCourseFormat/TaskWindow.java
@@ -1,6 +1,6 @@
-package com.jetbrains.edu.oldCourseFormat;
+package com.jetbrains.edu.learning.oldCourseFormat;
 
-import com.jetbrains.edu.courseFormat.StudyStatus;
+import com.jetbrains.edu.learning.courseFormat.StudyStatus;
 
 /**
  * Implementation of windows which user should type in

diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/projectView/StudyDirectoryNode.java b/python/educational-core/student/src/com/jetbrains/edu/learning/projectView/StudyDirectoryNode.java
index 92bb2dfad28029651602c1c784d0fcb6cf877985..18b6d1c7c1057105ebeccec6605259b99711ebee 100644 (file)
--- a/python/educational-core/student/src/com/jetbrains/edu/learning/projectView/StudyDirectoryNode.java
+++ b/python/educational-core/student/src/com/jetbrains/edu/learning/projectView/StudyDirectoryNode.java
@@ -11,12 +11,11 @@ import com.intellij.psi.PsiDirectory;
 import com.intellij.psi.PsiElement;
 import com.intellij.ui.JBColor;
 import com.intellij.ui.SimpleTextAttributes;
-import com.jetbrains.edu.EduNames;
-import com.jetbrains.edu.EduUtils;
-import com.jetbrains.edu.courseFormat.*;
+import com.jetbrains.edu.learning.core.EduNames;
+import com.jetbrains.edu.learning.core.EduUtils;
 import com.jetbrains.edu.learning.StudyTaskManager;
 import com.jetbrains.edu.learning.StudyUtils;
-import icons.EducationalIcons;
+import com.jetbrains.edu.learning.courseFormat.*;
 import icons.InteractiveLearningIcons;
 import org.jetbrains.annotations.NotNull;
 
@@ -46,7 +45,7 @@ public class StudyDirectoryNode extends PsiDirectoryNode {
     }
     if (valueName.equals(myProject.getName())) {
       data.clearText();
-      data.setIcon(EducationalIcons.Course);
+      data.setIcon(InteractiveLearningIcons.Course);
       data.addText(course.getName(), new SimpleTextAttributes(SimpleTextAttributes.STYLE_PLAIN, JBColor.BLACK));
     }
     else if (valueName.contains(EduNames.TASK)) {
@@ -94,7 +93,7 @@ public class StudyDirectoryNode extends PsiDirectoryNode {
     StudyStatus taskStatus = StudyTaskManager.getInstance(myProject).getStatus(lesson);
     switch (taskStatus) {
       case Unchecked: {
-        updatePresentation(data, additionalName, JBColor.BLACK, EducationalIcons.Lesson);
+        updatePresentation(data, additionalName, JBColor.BLACK, InteractiveLearningIcons.Lesson);
         break;
       }
       case Solved: {
@@ -102,7 +101,7 @@ public class StudyDirectoryNode extends PsiDirectoryNode {
         break;
       }
       case Failed: {
-        updatePresentation(data, additionalName, JBColor.RED, EducationalIcons.Lesson);
+        updatePresentation(data, additionalName, JBColor.RED, InteractiveLearningIcons.Lesson);
       }
     }
   }
@@ -111,7 +110,7 @@ public class StudyDirectoryNode extends PsiDirectoryNode {
     StudyStatus taskStatus = StudyTaskManager.getInstance(myProject).getStatus(task);
     switch (taskStatus) {
       case Unchecked: {
-        updatePresentation(data, additionalName, JBColor.BLACK, EducationalIcons.Task);
+        updatePresentation(data, additionalName, JBColor.BLACK, InteractiveLearningIcons.Task);
         break;
       }
       case Solved: {

diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/projectView/StudyTreeStructureProvider.java b/python/educational-core/student/src/com/jetbrains/edu/learning/projectView/StudyTreeStructureProvider.java
index b42e6f1d5acdc1d9040ea4bbe7e775527b1bf342..6fd47eaece843929f99930fc5d1f6f4867cc6f04 100644 (file)
--- a/python/educational-core/student/src/com/jetbrains/edu/learning/projectView/StudyTreeStructureProvider.java
+++ b/python/educational-core/student/src/com/jetbrains/edu/learning/projectView/StudyTreeStructureProvider.java
@@ -8,8 +8,8 @@ import com.intellij.openapi.project.DumbAware;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.psi.PsiDirectory;
-import com.jetbrains.edu.EduNames;
-import com.jetbrains.edu.courseFormat.TaskFile;
+import com.jetbrains.edu.learning.core.EduNames;
+import com.jetbrains.edu.learning.courseFormat.TaskFile;
 import com.jetbrains.edu.learning.StudyTaskManager;
 import com.jetbrains.edu.learning.StudyUtils;
 import org.jetbrains.annotations.NotNull;

diff --git a/python/educational-core/src/com/jetbrains/edu/stepic/CourseInfo.java b/python/educational-core/student/src/com/jetbrains/edu/learning/stepic/CourseInfo.java
similarity index 98%
rename from python/educational-core/src/com/jetbrains/edu/stepic/CourseInfo.java
rename to python/educational-core/student/src/com/jetbrains/edu/learning/stepic/CourseInfo.java
index c23df1d624a325a2e41aa0257639181f2f6eeb5e..2bc2099924d9687703b95f6ba092c6b9da31e3b9 100644 (file)
--- a/python/educational-core/src/com/jetbrains/edu/stepic/CourseInfo.java
+++ b/python/educational-core/student/src/com/jetbrains/edu/learning/stepic/CourseInfo.java
@@ -1,4 +1,4 @@
-package com.jetbrains.edu.stepic;
+package com.jetbrains.edu.learning.stepic;
 
 import com.google.gson.annotations.SerializedName;
 import com.intellij.openapi.util.text.StringUtil;

diff --git a/python/educational-core/src/com/jetbrains/edu/stepic/EduStepicConnector.java b/python/educational-core/student/src/com/jetbrains/edu/learning/stepic/EduStepicConnector.java
similarity index 98%
rename from python/educational-core/src/com/jetbrains/edu/stepic/EduStepicConnector.java
rename to python/educational-core/student/src/com/jetbrains/edu/learning/stepic/EduStepicConnector.java
index 98753e523f6eb287339b9708fbb04238254fcb82..8d871be6a2e2a5d9d1814a9c4e06a71322027374 100644 (file)
--- a/python/educational-core/src/com/jetbrains/edu/stepic/EduStepicConnector.java
+++ b/python/educational-core/student/src/com/jetbrains/edu/learning/stepic/EduStepicConnector.java
@@ -1,4 +1,4 @@
-package com.jetbrains.edu.stepic;
+package com.jetbrains.edu.learning.stepic;
 
 import com.google.gson.FieldNamingPolicy;
 import com.google.gson.Gson;
@@ -17,12 +17,12 @@ import com.intellij.openapi.vfs.VfsUtil;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.openapi.vfs.VirtualFileFilter;
 import com.intellij.util.net.ssl.CertificateManager;
-import com.jetbrains.edu.EduNames;
-import com.jetbrains.edu.EduUtils;
-import com.jetbrains.edu.courseFormat.Course;
-import com.jetbrains.edu.courseFormat.Lesson;
-import com.jetbrains.edu.courseFormat.Task;
-import com.jetbrains.edu.courseFormat.TaskFile;
+import com.jetbrains.edu.learning.core.EduNames;
+import com.jetbrains.edu.learning.core.EduUtils;
+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.TaskFile;
 import org.apache.commons.codec.binary.Base64;
 import org.apache.http.HttpEntity;
 import org.apache.http.HttpStatus;
@@ -468,7 +468,7 @@ public class EduStepicConnector {
       public boolean accept(VirtualFile file) {
         final String name = file.getName();
         return !name.contains(EduNames.LESSON) && !name.equals(EduNames.COURSE_META_FILE) && !name.equals(EduNames.HINTS) &&
-          !"pyc".equals(file.getExtension()) && !file.isDirectory() && !name.equals(EduNames.TEST_HELPER) && !name.startsWith(".");
+          !"pyc".equals(file.getExtension()) && !file.isDirectory() && !name.equals(EduNames.TEST_HELPER) && !name.startsWith("");
       }
     });
 

diff --git a/python/educational-core/src/com/jetbrains/edu/stepic/LoginDialog.java b/python/educational-core/student/src/com/jetbrains/edu/learning/stepic/LoginDialog.java
similarity index 97%
rename from python/educational-core/src/com/jetbrains/edu/stepic/LoginDialog.java
rename to python/educational-core/student/src/com/jetbrains/edu/learning/stepic/LoginDialog.java
index 5b6ac16bc61114c759e3022118ac077b4cf36c72..bb95494d1540d6c92a5d5c7e579abd3d3e662ca8 100644 (file)
--- a/python/educational-core/src/com/jetbrains/edu/stepic/LoginDialog.java
+++ b/python/educational-core/student/src/com/jetbrains/edu/learning/stepic/LoginDialog.java
@@ -1,4 +1,4 @@
-package com.jetbrains.edu.stepic;
+package com.jetbrains.edu.learning.stepic;
 
 import com.intellij.openapi.ui.DialogWrapper;
 import org.jetbrains.annotations.NotNull;

diff --git a/python/educational-core/src/com/jetbrains/edu/stepic/LoginPanel.form b/python/educational-core/student/src/com/jetbrains/edu/learning/stepic/LoginPanel.form
similarity index 97%
rename from python/educational-core/src/com/jetbrains/edu/stepic/LoginPanel.form
rename to python/educational-core/student/src/com/jetbrains/edu/learning/stepic/LoginPanel.form
index 57570c149e93a425079e2d910650d4b97cda1c3d..33b848ad22b9a8f7c2c05751895c9854ec444878 100644 (file)
--- a/python/educational-core/src/com/jetbrains/edu/stepic/LoginPanel.form
+++ b/python/educational-core/student/src/com/jetbrains/edu/learning/stepic/LoginPanel.form
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="com.jetbrains.edu.stepic.LoginPanel">
+<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="com.jetbrains.edu.learning.stepic.LoginPanel">
   <grid id="27dc6" binding="myPane" layout-manager="GridLayoutManager" row-count="3" column-count="3" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
     <margin top="0" left="0" bottom="0" right="0"/>
     <constraints>

diff --git a/python/educational-core/src/com/jetbrains/edu/stepic/LoginPanel.java b/python/educational-core/student/src/com/jetbrains/edu/learning/stepic/LoginPanel.java
similarity index 97%
rename from python/educational-core/src/com/jetbrains/edu/stepic/LoginPanel.java
rename to python/educational-core/student/src/com/jetbrains/edu/learning/stepic/LoginPanel.java
index 35b5af8d84d6586702b30d21ce346eb068dc271e..393e12ad6f523992547887abf26a196e65f4827b 100644 (file)
--- a/python/educational-core/src/com/jetbrains/edu/stepic/LoginPanel.java
+++ b/python/educational-core/student/src/com/jetbrains/edu/learning/stepic/LoginPanel.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.jetbrains.edu.stepic;
+package com.jetbrains.edu.learning.stepic;
 
 import com.intellij.ui.DocumentAdapter;
 import org.jetbrains.annotations.NotNull;

diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/stepic/StudyCoursesUpdater.java b/python/educational-core/student/src/com/jetbrains/edu/learning/stepic/StudyCoursesUpdater.java
index 3e09c7c3f5f984c79634045ad4eec23cf42b9219..01cad4c8b6b9a0b42d90eed7177de54dfea82f19 100644 (file)
--- a/python/educational-core/student/src/com/jetbrains/edu/learning/stepic/StudyCoursesUpdater.java
+++ b/python/educational-core/student/src/com/jetbrains/edu/learning/stepic/StudyCoursesUpdater.java
@@ -21,8 +21,6 @@ import com.intellij.openapi.extensions.Extensions;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.startup.StartupActivity;
 import com.jetbrains.edu.learning.courseGeneration.StudyProjectGenerator;
-import com.jetbrains.edu.stepic.CourseInfo;
-import com.jetbrains.edu.stepic.EduStepicConnector;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.List;

diff --git a/python/educational-core/src/com/jetbrains/edu/stepic/StudySettings.java b/python/educational-core/student/src/com/jetbrains/edu/learning/stepic/StudySettings.java
similarity index 98%
rename from python/educational-core/src/com/jetbrains/edu/stepic/StudySettings.java
rename to python/educational-core/student/src/com/jetbrains/edu/learning/stepic/StudySettings.java
index 417283311a29eeb9c216bb735e1820f19e7f1c38..8941d434306423695831247a0b8ff877bf0f6740 100644 (file)
--- a/python/educational-core/src/com/jetbrains/edu/stepic/StudySettings.java
+++ b/python/educational-core/student/src/com/jetbrains/edu/learning/stepic/StudySettings.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.jetbrains.edu.stepic;
+package com.jetbrains.edu.learning.stepic;
 
 import com.intellij.ide.passwordSafe.PasswordSafe;
 import com.intellij.ide.passwordSafe.PasswordSafeException;

diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/stepic/StudySettingsPanel.java b/python/educational-core/student/src/com/jetbrains/edu/learning/stepic/StudySettingsPanel.java
index b3295c2d9ad8935d9b880e2cd9f63883a8e0aead..e559463c8cfdfd61d9c962460a957dcc8e3c9729 100644 (file)
--- a/python/educational-core/student/src/com/jetbrains/edu/learning/stepic/StudySettingsPanel.java
+++ b/python/educational-core/student/src/com/jetbrains/edu/learning/stepic/StudySettingsPanel.java
@@ -17,8 +17,6 @@ package com.jetbrains.edu.learning.stepic;
 
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.ui.DocumentAdapter;
-import com.jetbrains.edu.stepic.EduStepicConnector;
-import com.jetbrains.edu.stepic.StudySettings;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 

diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/ui/StudyNewProjectPanel.java b/python/educational-core/student/src/com/jetbrains/edu/learning/ui/StudyNewProjectPanel.java
index 21675f548a794135281ef4748655826feb563aeb..b37224e6a80fd402da6f12b4a6e0892d35b73045 100644 (file)
--- a/python/educational-core/student/src/com/jetbrains/edu/learning/ui/StudyNewProjectPanel.java
+++ b/python/educational-core/student/src/com/jetbrains/edu/learning/ui/StudyNewProjectPanel.java
@@ -13,12 +13,12 @@ import com.intellij.openapi.ui.popup.util.BaseListPopupStep;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.util.Consumer;
-import com.jetbrains.edu.courseFormat.Course;
+import com.jetbrains.edu.learning.courseFormat.Course;
 import com.jetbrains.edu.learning.StudyUtils;
 import com.jetbrains.edu.learning.courseGeneration.StudyProjectGenerator;
-import com.jetbrains.edu.stepic.CourseInfo;
-import com.jetbrains.edu.stepic.EduStepicConnector;
-import com.jetbrains.edu.stepic.StudySettings;
+import com.jetbrains.edu.learning.stepic.CourseInfo;
+import com.jetbrains.edu.learning.stepic.EduStepicConnector;
+import com.jetbrains.edu.learning.stepic.StudySettings;
 import icons.InteractiveLearningIcons;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;

diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/ui/StudyProgressToolWindowFactory.java b/python/educational-core/student/src/com/jetbrains/edu/learning/ui/StudyProgressToolWindowFactory.java
index 7f71a2e5eba9a51a038f6ee5548a509190c90559..eea24f44ca0d287ab494121d2fb23f5a78667c42 100644 (file)
--- a/python/educational-core/student/src/com/jetbrains/edu/learning/ui/StudyProgressToolWindowFactory.java
+++ b/python/educational-core/student/src/com/jetbrains/edu/learning/ui/StudyProgressToolWindowFactory.java
@@ -7,11 +7,11 @@ import com.intellij.openapi.wm.ToolWindowFactory;
 import com.intellij.ui.content.Content;
 import com.intellij.ui.content.ContentFactory;
 import com.intellij.util.ui.UIUtil;
-import com.jetbrains.edu.EduNames;
-import com.jetbrains.edu.courseFormat.Course;
-import com.jetbrains.edu.courseFormat.Lesson;
-import com.jetbrains.edu.courseFormat.StudyStatus;
-import com.jetbrains.edu.courseFormat.Task;
+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.StudyStatus;
+import com.jetbrains.edu.learning.courseFormat.Task;
 import com.jetbrains.edu.learning.StudyTaskManager;
 import icons.InteractiveLearningIcons;
 import org.jetbrains.annotations.NotNull;

diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/ui/StudyToolWindow.java b/python/educational-core/student/src/com/jetbrains/edu/learning/ui/StudyToolWindow.java
index e77592c7e35591e655b8f7a0ac95699185c746c2..0230fa10c5af514e7ac4abd3587bd83db4156e7b 100644 (file)
--- a/python/educational-core/student/src/com/jetbrains/edu/learning/ui/StudyToolWindow.java
+++ b/python/educational-core/student/src/com/jetbrains/edu/learning/ui/StudyToolWindow.java
@@ -27,7 +27,7 @@ import com.intellij.openapi.ui.SimpleToolWindowPanel;
 import com.intellij.ui.JBCardLayout;
 import com.intellij.ui.OnePixelSplitter;
 import com.intellij.util.ui.JBUI;
-import com.jetbrains.edu.courseFormat.Course;
+import com.jetbrains.edu.learning.courseFormat.Course;
 import com.jetbrains.edu.learning.StudyTaskManager;
 import com.jetbrains.edu.learning.StudyToolWindowConfigurator;
 import com.jetbrains.edu.learning.StudyUtils;

diff --git a/python/educational-core/student/src/com/jetbrains/edu/learning/ui/StudyToolWindowFactory.java b/python/educational-core/student/src/com/jetbrains/edu/learning/ui/StudyToolWindowFactory.java
index 2394f32158cb60dbda265446aa25034e1ba9fb4c..0ea7f7c30dcd497103a2a7373414efb527d6f1fd 100644 (file)
--- a/python/educational-core/student/src/com/jetbrains/edu/learning/ui/StudyToolWindowFactory.java
+++ b/python/educational-core/student/src/com/jetbrains/edu/learning/ui/StudyToolWindowFactory.java
@@ -7,7 +7,7 @@ import com.intellij.openapi.wm.ToolWindow;
 import com.intellij.openapi.wm.ToolWindowFactory;
 import com.intellij.ui.content.Content;
 import com.intellij.ui.content.ContentManager;
-import com.jetbrains.edu.courseFormat.Course;
+import com.jetbrains.edu.learning.courseFormat.Course;
 import com.jetbrains.edu.learning.StudyProjectComponent;
 import com.jetbrains.edu.learning.StudyTaskManager;
 import com.jetbrains.edu.learning.StudyUtils;

diff --git a/python/educational-core/student/src/icons/InteractiveLearningIcons.java b/python/educational-core/student/src/icons/InteractiveLearningIcons.java
index 714949abdea1597e0319170fad31dcd3595c1ee7..bf4b34b1c8048182277a566cd23e4c76acff872c 100644 (file)
--- a/python/educational-core/student/src/icons/InteractiveLearningIcons.java
+++ b/python/educational-core/student/src/icons/InteractiveLearningIcons.java
@@ -13,13 +13,16 @@ public class InteractiveLearningIcons {
     return IconLoader.getIcon(path, InteractiveLearningIcons.class);
   }
 
+  public static final Icon Course = load("/icons/com/jetbrains/edu/learning/Course.png"); // 16x16
   public static final Icon CourseProgress = load("/icons/com/jetbrains/edu/learning/CourseProgress.png"); // 13x13
   public static final Icon InterpreterGear = load("/icons/com/jetbrains/edu/learning/interpreterGear.png"); // 16x16
+  public static final Icon Lesson = load("/icons/com/jetbrains/edu/learning/Lesson.png"); // 16x16
   public static final Icon LessonCompl = load("/icons/com/jetbrains/edu/learning/LessonCompl.png"); // 16x16
   public static final Icon Prev = load("/icons/com/jetbrains/edu/learning/prev.png"); // 16x16
   public static final Icon Resolve = load("/icons/com/jetbrains/edu/learning/resolve.png"); // 16x16
   public static final Icon Sandbox = load("/icons/com/jetbrains/edu/learning/Sandbox.png"); // 16x16
   public static final Icon ShowHint = load("/icons/com/jetbrains/edu/learning/showHint.png"); // 16x16
+  public static final Icon Task = load("/icons/com/jetbrains/edu/learning/Task.png"); // 16x16
   public static final Icon TaskCompl = load("/icons/com/jetbrains/edu/learning/TaskCompl.png"); // 16x16
   public static final Icon TaskDescription = load("/icons/com/jetbrains/edu/learning/TaskDescription.png"); // 13x13
   public static final Icon TaskProbl = load("/icons/com/jetbrains/edu/learning/TaskProbl.png"); // 16x16

diff --git a/python/educational-core/student/student.iml b/python/educational-core/student/student.iml
index 72e7d83d392f96866199931eb2a3ae8dde6ba7c3..c4f9d2bccdb907e53fba38e04be3de9f728c5166 100644 (file)
--- a/python/educational-core/student/student.iml
+++ b/python/educational-core/student/student.iml
@@ -11,6 +11,6 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="lang-impl" />
     <orderEntry type="library" name="gson" level="project" />
-    <orderEntry type="module" module-name="educational-core" />
+    <orderEntry type="library" name="http-client" level="project" />
   </component>
 </module>
\ No newline at end of file

diff --git a/python/educational-python/course-creator-python/course-creator-python.iml b/python/educational-python/course-creator-python/course-creator-python.iml
index 51499938c1e2aa2415570b508b6cdd7e204c3f46..cf8d512811173bde0b0dc78428441411f4acc3a4 100644 (file)
--- a/python/educational-python/course-creator-python/course-creator-python.iml
+++ b/python/educational-python/course-creator-python/course-creator-python.iml
@@ -11,8 +11,8 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="course-creator" />
     <orderEntry type="module" module-name="lang-impl" />
-    <orderEntry type="module" module-name="educational-core" />
     <orderEntry type="module" module-name="educational-python" />
     <orderEntry type="module" module-name="python-community" />
+    <orderEntry type="module" module-name="student" />
   </component>
 </module>
\ No newline at end of file

diff --git a/python/educational-python/course-creator-python/resources/META-INF/plugin.xml b/python/educational-python/course-creator-python/resources/META-INF/plugin.xml
index 31ea1abbc582e4f581cb1e75649831c1ed435aba..e87961c59b402ff7221beb54afb0a6649a674157 100644 (file)
--- a/python/educational-python/course-creator-python/resources/META-INF/plugin.xml
+++ b/python/educational-python/course-creator-python/resources/META-INF/plugin.xml
@@ -11,18 +11,12 @@
   <change-notes><![CDATA[
     ]]>
   </change-notes>
-  <!-- please see https://confluence.jetbrains.com/display/IDEADEV/Build+Number+Ranges for description -->
-
-  <!-- please see https://confluence.jetbrains.com/display/IDEADEV/Plugin+Compatibility+with+IntelliJ+Platform+Products
-       on how to target different products -->
-  <!-- uncomment to enable plugin in all products
-  <depends>com.intellij.modules.lang</depends>
-  -->
 
   <depends>com.intellij.modules.platform</depends>
   <depends>com.intellij.modules.python</depends>
   <depends>com.jetbrains.edu.coursecreator</depends>
-  <depends>com.jetbrains.edu.core</depends>
+  <depends>com.jetbrains.edu.interactivelearning</depends>
+  <depends>com.jetbrains.python.edu.interactivelearning.python</depends>
   <depends>com.jetbrains.python.edu.core</depends>
 
   <extensions defaultExtensionNs="com.intellij">

diff --git a/python/educational-python/course-creator-python/src/com/jetbrains/edu/coursecreator/PyCCLanguageManager.java b/python/educational-python/course-creator-python/src/com/jetbrains/edu/coursecreator/PyCCLanguageManager.java
index f71f13190e9c620a747b6033f84d8d3bd7ada95e..f66ecff6ddd3f1f3e85986884762ccbdda20d516 100644 (file)
--- a/python/educational-python/course-creator-python/src/com/jetbrains/edu/coursecreator/PyCCLanguageManager.java
+++ b/python/educational-python/course-creator-python/src/com/jetbrains/edu/coursecreator/PyCCLanguageManager.java
@@ -3,7 +3,7 @@ package com.jetbrains.edu.coursecreator;
 import com.intellij.ide.fileTemplates.FileTemplate;
 import com.intellij.ide.fileTemplates.FileTemplateManager;
 import com.intellij.openapi.project.Project;
-import com.jetbrains.edu.EduNames;
+import com.jetbrains.edu.learning.core.EduNames;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 

diff --git a/python/educational-python/course-creator-python/src/com/jetbrains/edu/coursecreator/PyCCProjectGenerator.java b/python/educational-python/course-creator-python/src/com/jetbrains/edu/coursecreator/PyCCProjectGenerator.java
index 29f60e14a0bd97ba26eac842ef646ed3c103a637..ebffadfea5d2c24427defdf2b5f8ebf42f710a9b 100644 (file)
--- a/python/educational-python/course-creator-python/src/com/jetbrains/edu/coursecreator/PyCCProjectGenerator.java
+++ b/python/educational-python/course-creator-python/src/com/jetbrains/edu/coursecreator/PyCCProjectGenerator.java
@@ -15,7 +15,7 @@ import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.platform.DirectoryProjectGenerator;
 import com.intellij.psi.PsiDirectory;
 import com.intellij.psi.PsiManager;
-import com.jetbrains.edu.courseFormat.Course;
+import com.jetbrains.edu.learning.courseFormat.Course;
 import com.jetbrains.edu.coursecreator.actions.CCCreateLesson;
 import com.jetbrains.edu.coursecreator.actions.CCCreateTask;
 import com.jetbrains.edu.coursecreator.ui.CCNewProjectPanel;

diff --git a/python/educational-python/student-python/resources/META-INF/plugin.xml b/python/educational-python/student-python/resources/META-INF/plugin.xml
index 9b0cac5df651ceff35b06d61b3e1b939a1ab8c7a..e4fc06b20a99cb9c33a25232da65e5085f42ae2c 100644 (file)
--- a/python/educational-python/student-python/resources/META-INF/plugin.xml
+++ b/python/educational-python/student-python/resources/META-INF/plugin.xml
@@ -18,7 +18,6 @@
   <depends>com.intellij.modules.lang</depends>
   <depends>com.intellij.modules.python</depends>
   <depends>com.jetbrains.edu.interactivelearning</depends>
-  <depends>com.jetbrains.edu.core</depends>
   <depends>com.jetbrains.python.edu.core</depends>
 
   <extensions defaultExtensionNs="com.intellij">

diff --git a/python/educational-python/student-python/src/com/jetbrains/edu/learning/PyStudyCheckAction.java b/python/educational-python/student-python/src/com/jetbrains/edu/learning/PyStudyCheckAction.java
index 47ac0f993254b74a46c913c7632f41de92d25936..95f8b9a3b2433c6b1ffc976b3db534973a7aa6e6 100644 (file)
--- a/python/educational-python/student-python/src/com/jetbrains/edu/learning/PyStudyCheckAction.java
+++ b/python/educational-python/student-python/src/com/jetbrains/edu/learning/PyStudyCheckAction.java
@@ -10,9 +10,9 @@ import com.intellij.openapi.project.Project;
 import com.intellij.openapi.ui.MessageType;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.openapi.wm.IdeFocusManager;
-import com.jetbrains.edu.courseFormat.StudyStatus;
-import com.jetbrains.edu.courseFormat.Task;
-import com.jetbrains.edu.courseFormat.TaskFile;
+import com.jetbrains.edu.learning.courseFormat.StudyStatus;
+import com.jetbrains.edu.learning.courseFormat.Task;
+import com.jetbrains.edu.learning.courseFormat.TaskFile;
 import com.jetbrains.edu.learning.actions.StudyCheckAction;
 import com.jetbrains.edu.learning.actions.StudyRunAction;
 import com.jetbrains.edu.learning.checker.StudyCheckTask;

diff --git a/python/educational-python/student-python/src/com/jetbrains/edu/learning/PyStudyDirectoryProjectGenerator.java b/python/educational-python/student-python/src/com/jetbrains/edu/learning/PyStudyDirectoryProjectGenerator.java
index d4d95ad5e5d18341a608415e0e3b16e1a26767f6..df9db88d18aeb654bd9970d725c761eea87b1214 100644 (file)
--- a/python/educational-python/student-python/src/com/jetbrains/edu/learning/PyStudyDirectoryProjectGenerator.java
+++ b/python/educational-python/student-python/src/com/jetbrains/edu/learning/PyStudyDirectoryProjectGenerator.java
@@ -16,7 +16,7 @@ import com.intellij.psi.PsiDirectory;
 import com.intellij.psi.PsiManager;
 import com.jetbrains.edu.learning.courseGeneration.StudyProjectGenerator;
 import com.jetbrains.edu.learning.ui.StudyNewProjectPanel;
-import com.jetbrains.edu.stepic.CourseInfo;
+import com.jetbrains.edu.learning.stepic.CourseInfo;
 import com.jetbrains.python.newProject.PythonProjectGenerator;
 import icons.InteractiveLearningPythonIcons;
 import org.jetbrains.annotations.Nls;

diff --git a/python/educational-python/student-python/src/com/jetbrains/edu/learning/PyStudyExecutor.java b/python/educational-python/student-python/src/com/jetbrains/edu/learning/PyStudyExecutor.java
index c0f5b10b7341f0708bb2907ac328094a4e4b583c..a056dc186873bfd9da2ea6b460c6fe5069164e2f 100644 (file)
--- a/python/educational-python/student-python/src/com/jetbrains/edu/learning/PyStudyExecutor.java
+++ b/python/educational-python/student-python/src/com/jetbrains/edu/learning/PyStudyExecutor.java
@@ -28,7 +28,7 @@ import com.intellij.openapi.ui.popup.Balloon;
 import com.intellij.openapi.ui.popup.BalloonBuilder;
 import com.intellij.openapi.ui.popup.JBPopupFactory;
 import com.intellij.openapi.vfs.VirtualFile;
-import com.jetbrains.edu.courseFormat.Task;
+import com.jetbrains.edu.learning.courseFormat.Task;
 import com.jetbrains.edu.learning.checker.StudyExecutor;
 import com.jetbrains.edu.learning.checker.StudyTestRunner;
 import com.jetbrains.edu.learning.courseFormat.UserTest;

diff --git a/python/educational-python/student-python/src/com/jetbrains/edu/learning/PyStudyLanguageManager.java b/python/educational-python/student-python/src/com/jetbrains/edu/learning/PyStudyLanguageManager.java
index a3d9e62854c3443d343d4a4cfc54279e5fdf8794..5cb6c220d3fcc072ff9bd65af2fe86a4a85ab2ef 100644 (file)
--- a/python/educational-python/student-python/src/com/jetbrains/edu/learning/PyStudyLanguageManager.java
+++ b/python/educational-python/student-python/src/com/jetbrains/edu/learning/PyStudyLanguageManager.java
@@ -1,6 +1,6 @@
 package com.jetbrains.edu.learning;
 
-import com.jetbrains.edu.EduNames;
+import com.jetbrains.edu.learning.core.EduNames;
 import org.jetbrains.annotations.NotNull;
 
 public class PyStudyLanguageManager implements StudyLanguageManager {

diff --git a/python/educational-python/student-python/src/com/jetbrains/edu/learning/PyStudyTestRunner.java b/python/educational-python/student-python/src/com/jetbrains/edu/learning/PyStudyTestRunner.java
index 6c74c41575fbaf04fa17570df039cc995b07488b..ba4e268da13c399de2641c34606f1f35ef4d60ad 100644 (file)
--- a/python/educational-python/student-python/src/com/jetbrains/edu/learning/PyStudyTestRunner.java
+++ b/python/educational-python/student-python/src/com/jetbrains/edu/learning/PyStudyTestRunner.java
@@ -8,8 +8,8 @@ import com.intellij.openapi.project.Project;
 import com.intellij.openapi.projectRoots.Sdk;
 import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.openapi.vfs.VirtualFile;
-import com.jetbrains.edu.courseFormat.Course;
-import com.jetbrains.edu.courseFormat.Task;
+import com.jetbrains.edu.learning.courseFormat.Course;
+import com.jetbrains.edu.learning.courseFormat.Task;
 import com.jetbrains.edu.learning.checker.StudyTestRunner;
 import com.jetbrains.python.sdk.PythonSdkType;
 import org.jetbrains.annotations.NotNull;

diff --git a/python/educational-python/student-python/src/com/jetbrains/edu/learning/PyStudyToolWindowConfigurator.java b/python/educational-python/student-python/src/com/jetbrains/edu/learning/PyStudyToolWindowConfigurator.java
index b62d5afc9372c6cfd4866c955b1743bda6500245..70fd8ba7faf6017892f896be0b22603c9152a524 100644 (file)
--- a/python/educational-python/student-python/src/com/jetbrains/edu/learning/PyStudyToolWindowConfigurator.java
+++ b/python/educational-python/student-python/src/com/jetbrains/edu/learning/PyStudyToolWindowConfigurator.java
@@ -2,7 +2,7 @@ package com.jetbrains.edu.learning;
 
 import com.intellij.openapi.actionSystem.DefaultActionGroup;
 import com.intellij.openapi.project.Project;
-import com.jetbrains.edu.courseFormat.Course;
+import com.jetbrains.edu.learning.courseFormat.Course;
 import org.jetbrains.annotations.NotNull;
 
 public class PyStudyToolWindowConfigurator extends StudyBaseToolWindowConfigurator {

diff --git a/python/educational-python/student-python/src/com/jetbrains/edu/learning/actions/PyStudyIntroductionCourseAction.java b/python/educational-python/student-python/src/com/jetbrains/edu/learning/actions/PyStudyIntroductionCourseAction.java
index a99d68b02ac49a5846b89f6741173887791fe9f0..eb936e082c51b08d7f62853da6a5900e5dee9502 100644 (file)
--- a/python/educational-python/student-python/src/com/jetbrains/edu/learning/actions/PyStudyIntroductionCourseAction.java
+++ b/python/educational-python/student-python/src/com/jetbrains/edu/learning/actions/PyStudyIntroductionCourseAction.java
@@ -23,7 +23,7 @@ import com.intellij.openapi.project.Project;
 import com.intellij.openapi.project.ProjectManager;
 import com.intellij.openapi.projectRoots.Sdk;
 import com.jetbrains.edu.learning.PyStudyDirectoryProjectGenerator;
-import com.jetbrains.edu.stepic.CourseInfo;
+import com.jetbrains.edu.learning.stepic.CourseInfo;
 import com.jetbrains.python.configuration.PyConfigurableInterpreterList;
 import com.jetbrains.python.newProject.actions.GenerateProjectCallback;
 import com.jetbrains.python.newProject.actions.ProjectSpecificSettingsStep;

diff --git a/python/educational-python/student-python/src/com/jetbrains/edu/learning/highlighting/PyStudyInspectionExtension.java b/python/educational-python/student-python/src/com/jetbrains/edu/learning/highlighting/PyStudyInspectionExtension.java
index 00c8c1ab5f16bf14795392d9074bacfa76c0ba43..66f627c5e37c3a34bc28c4d71f5247b0f356c234 100644 (file)
--- a/python/educational-python/student-python/src/com/jetbrains/edu/learning/highlighting/PyStudyInspectionExtension.java
+++ b/python/educational-python/student-python/src/com/jetbrains/edu/learning/highlighting/PyStudyInspectionExtension.java
@@ -4,7 +4,7 @@ import com.intellij.openapi.project.Project;
 import com.intellij.psi.PsiFile;
 import com.intellij.psi.PsiReference;
 import com.intellij.psi.util.PsiTreeUtil;
-import com.jetbrains.edu.courseFormat.TaskFile;
+import com.jetbrains.edu.learning.courseFormat.TaskFile;
 import com.jetbrains.edu.learning.StudyTaskManager;
 import com.jetbrains.edu.learning.StudyUtils;
 import com.jetbrains.python.inspections.PyInspectionExtension;

diff --git a/python/educational-python/student-python/student-python.iml b/python/educational-python/student-python/student-python.iml
index 4da02bccfbaade288554e4edf1af18ac61744db2..1303661f14a5f796cec863c61101b861b0c4bdab 100644 (file)
--- a/python/educational-python/student-python/student-python.iml
+++ b/python/educational-python/student-python/student-python.iml
@@ -13,7 +13,6 @@
     <orderEntry type="module" module-name="lang-impl" />
     <orderEntry type="module" module-name="python-community" />
     <orderEntry type="library" name="gson" level="project" />
-    <orderEntry type="module" module-name="educational-core" />
     <orderEntry type="module" module-name="educational-python" />
     <orderEntry type="module" module-name="python-community-configure" />
     <orderEntry type="module" module-name="python-ide-community" />