From 7333bf965a7aad5ae026fee78e01e53a944bb12b Mon Sep 17 00:00:00 2001 From: "Liana.Bakradze" Date: Mon, 6 Feb 2017 18:10:56 +0300 Subject: [PATCH] merge course-creator-python into student-python --- .../course-creator-python.iml | 20 ------------------ .../src/icons/CourseCreatorPythonIcons.java | 17 --------------- .../educational-python/main_pycharm_edu.iml | 1 - .../fileTemplates/internal/task.html.ft | 0 .../fileTemplates/internal/task.md.ft | 0 .../fileTemplates/internal/task.py.ft | 0 .../fileTemplates/internal/tests.py.ft | 0 .../resources/META-INF/course-creator.xml} | 19 ----------------- .../resources/META-INF/plugin.xml | 1 + .../learning}/CourseCreationProjectType.png | Bin .../CourseCreationProjectType@2x.png | Bin .../CourseCreationProjectType@2x_dark.png | Bin .../CourseCreationProjectType_dark.png | Bin .../CreateFromArchiveProjectStep.java | 0 .../coursecreator/PyCCChangeCourseInfo.java | 0 .../PyCCCreateProjectFromArchive.java | 0 .../coursecreator/PyCCLanguageManager.java | 0 .../coursecreator/PyCCProjectGenerator.java | 4 ++-- .../run/PyCCCommandLineState.java | 0 .../run/PyCCRunTestConfiguration.java | 0 .../run/PyCCRunTestsConfigurationFactory.java | 0 .../PyCCRunTestsConfigurationProducer.java | 0 .../run/PyCCRunTestsConfigurationType.java | 0 .../coursecreator/run/PyCCSettingEditor.form | 0 .../coursecreator/run/PyCCSettingsEditor.java | 0 .../icons/InteractiveLearningPythonIcons.java | 1 + .../student-python/student-python.iml | 1 + 27 files changed, 5 insertions(+), 59 deletions(-) delete mode 100644 python/educational-python/course-creator-python/course-creator-python.iml delete mode 100644 python/educational-python/course-creator-python/src/icons/CourseCreatorPythonIcons.java rename python/educational-python/{course-creator-python => }/resources/fileTemplates/internal/task.html.ft (100%) rename python/educational-python/{course-creator-python => }/resources/fileTemplates/internal/task.md.ft (100%) rename python/educational-python/{course-creator-python => }/resources/fileTemplates/internal/task.py.ft (100%) rename python/educational-python/{course-creator-python => }/resources/fileTemplates/internal/tests.py.ft (100%) rename python/educational-python/{course-creator-python/resources/META-INF/plugin.xml => student-python/resources/META-INF/course-creator.xml} (60%) rename python/educational-python/{course-creator-python/resources/icons => student-python/resources/icons/com/jetbrains/edu/learning}/CourseCreationProjectType.png (100%) rename python/educational-python/{course-creator-python/resources/icons => student-python/resources/icons/com/jetbrains/edu/learning}/CourseCreationProjectType@2x.png (100%) rename python/educational-python/{course-creator-python/resources/icons => student-python/resources/icons/com/jetbrains/edu/learning}/CourseCreationProjectType@2x_dark.png (100%) rename python/educational-python/{course-creator-python/resources/icons => student-python/resources/icons/com/jetbrains/edu/learning}/CourseCreationProjectType_dark.png (100%) rename python/educational-python/{course-creator-python => student-python}/src/com/jetbrains/edu/coursecreator/CreateFromArchiveProjectStep.java (100%) rename python/educational-python/{course-creator-python => student-python}/src/com/jetbrains/edu/coursecreator/PyCCChangeCourseInfo.java (100%) rename python/educational-python/{course-creator-python => student-python}/src/com/jetbrains/edu/coursecreator/PyCCCreateProjectFromArchive.java (100%) rename python/educational-python/{course-creator-python => student-python}/src/com/jetbrains/edu/coursecreator/PyCCLanguageManager.java (100%) rename python/educational-python/{course-creator-python => student-python}/src/com/jetbrains/edu/coursecreator/PyCCProjectGenerator.java (97%) rename python/educational-python/{course-creator-python => student-python}/src/com/jetbrains/edu/coursecreator/run/PyCCCommandLineState.java (100%) rename python/educational-python/{course-creator-python => student-python}/src/com/jetbrains/edu/coursecreator/run/PyCCRunTestConfiguration.java (100%) rename python/educational-python/{course-creator-python => student-python}/src/com/jetbrains/edu/coursecreator/run/PyCCRunTestsConfigurationFactory.java (100%) rename python/educational-python/{course-creator-python => student-python}/src/com/jetbrains/edu/coursecreator/run/PyCCRunTestsConfigurationProducer.java (100%) rename python/educational-python/{course-creator-python => student-python}/src/com/jetbrains/edu/coursecreator/run/PyCCRunTestsConfigurationType.java (100%) rename python/educational-python/{course-creator-python => student-python}/src/com/jetbrains/edu/coursecreator/run/PyCCSettingEditor.form (100%) rename python/educational-python/{course-creator-python => student-python}/src/com/jetbrains/edu/coursecreator/run/PyCCSettingsEditor.java (100%) diff --git a/python/educational-python/course-creator-python/course-creator-python.iml b/python/educational-python/course-creator-python/course-creator-python.iml deleted file mode 100644 index ba637201f6dc..000000000000 --- a/python/educational-python/course-creator-python/course-creator-python.iml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/python/educational-python/course-creator-python/src/icons/CourseCreatorPythonIcons.java b/python/educational-python/course-creator-python/src/icons/CourseCreatorPythonIcons.java deleted file mode 100644 index b4bcd501ad76..000000000000 --- a/python/educational-python/course-creator-python/src/icons/CourseCreatorPythonIcons.java +++ /dev/null @@ -1,17 +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 CourseCreatorPythonIcons { - private static Icon load(String path) { - return IconLoader.getIcon(path, CourseCreatorPythonIcons.class); - } - - public static final Icon CourseCreationProjectType = load("/icons/CourseCreationProjectType.png"); // 16x16 -} diff --git a/python/educational-python/main_pycharm_edu.iml b/python/educational-python/main_pycharm_edu.iml index c2e9e1eff290..465313c7319f 100644 --- a/python/educational-python/main_pycharm_edu.iml +++ b/python/educational-python/main_pycharm_edu.iml @@ -16,7 +16,6 @@ - diff --git a/python/educational-python/course-creator-python/resources/fileTemplates/internal/task.html.ft b/python/educational-python/resources/fileTemplates/internal/task.html.ft similarity index 100% rename from python/educational-python/course-creator-python/resources/fileTemplates/internal/task.html.ft rename to python/educational-python/resources/fileTemplates/internal/task.html.ft diff --git a/python/educational-python/course-creator-python/resources/fileTemplates/internal/task.md.ft b/python/educational-python/resources/fileTemplates/internal/task.md.ft similarity index 100% rename from python/educational-python/course-creator-python/resources/fileTemplates/internal/task.md.ft rename to python/educational-python/resources/fileTemplates/internal/task.md.ft diff --git a/python/educational-python/course-creator-python/resources/fileTemplates/internal/task.py.ft b/python/educational-python/resources/fileTemplates/internal/task.py.ft similarity index 100% rename from python/educational-python/course-creator-python/resources/fileTemplates/internal/task.py.ft rename to python/educational-python/resources/fileTemplates/internal/task.py.ft diff --git a/python/educational-python/course-creator-python/resources/fileTemplates/internal/tests.py.ft b/python/educational-python/resources/fileTemplates/internal/tests.py.ft similarity index 100% rename from python/educational-python/course-creator-python/resources/fileTemplates/internal/tests.py.ft rename to python/educational-python/resources/fileTemplates/internal/tests.py.ft diff --git a/python/educational-python/course-creator-python/resources/META-INF/plugin.xml b/python/educational-python/student-python/resources/META-INF/course-creator.xml similarity index 60% rename from python/educational-python/course-creator-python/resources/META-INF/plugin.xml rename to python/educational-python/student-python/resources/META-INF/course-creator.xml index 85ec939dd37e..29d74733ee4e 100644 --- a/python/educational-python/course-creator-python/resources/META-INF/plugin.xml +++ b/python/educational-python/student-python/resources/META-INF/course-creator.xml @@ -1,23 +1,4 @@ - com.jetbrains.edu.coursecreator.python - Course Creator for PyCharm Edu - 2.0.3 - - . - ]]> - JetBrains - - - - - com.intellij.modules.platform - com.intellij.modules.python - com.jetbrains.edu.coursecreator - com.jetbrains.edu.interactivelearning - com.jetbrains.python.edu.interactivelearning.python - 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 ad55873def45..2a5a9bd21263 100644 --- a/python/educational-python/student-python/resources/META-INF/plugin.xml +++ b/python/educational-python/student-python/resources/META-INF/plugin.xml @@ -18,6 +18,7 @@ com.intellij.modules.lang com.intellij.modules.python com.jetbrains.edu.interactivelearning + com.jetbrains.edu.coursecreator diff --git a/python/educational-python/course-creator-python/resources/icons/CourseCreationProjectType.png b/python/educational-python/student-python/resources/icons/com/jetbrains/edu/learning/CourseCreationProjectType.png similarity index 100% rename from python/educational-python/course-creator-python/resources/icons/CourseCreationProjectType.png rename to python/educational-python/student-python/resources/icons/com/jetbrains/edu/learning/CourseCreationProjectType.png diff --git a/python/educational-python/course-creator-python/resources/icons/CourseCreationProjectType@2x.png b/python/educational-python/student-python/resources/icons/com/jetbrains/edu/learning/CourseCreationProjectType@2x.png similarity index 100% rename from python/educational-python/course-creator-python/resources/icons/CourseCreationProjectType@2x.png rename to python/educational-python/student-python/resources/icons/com/jetbrains/edu/learning/CourseCreationProjectType@2x.png diff --git a/python/educational-python/course-creator-python/resources/icons/CourseCreationProjectType@2x_dark.png b/python/educational-python/student-python/resources/icons/com/jetbrains/edu/learning/CourseCreationProjectType@2x_dark.png similarity index 100% rename from python/educational-python/course-creator-python/resources/icons/CourseCreationProjectType@2x_dark.png rename to python/educational-python/student-python/resources/icons/com/jetbrains/edu/learning/CourseCreationProjectType@2x_dark.png diff --git a/python/educational-python/course-creator-python/resources/icons/CourseCreationProjectType_dark.png b/python/educational-python/student-python/resources/icons/com/jetbrains/edu/learning/CourseCreationProjectType_dark.png similarity index 100% rename from python/educational-python/course-creator-python/resources/icons/CourseCreationProjectType_dark.png rename to python/educational-python/student-python/resources/icons/com/jetbrains/edu/learning/CourseCreationProjectType_dark.png diff --git a/python/educational-python/course-creator-python/src/com/jetbrains/edu/coursecreator/CreateFromArchiveProjectStep.java b/python/educational-python/student-python/src/com/jetbrains/edu/coursecreator/CreateFromArchiveProjectStep.java similarity index 100% rename from python/educational-python/course-creator-python/src/com/jetbrains/edu/coursecreator/CreateFromArchiveProjectStep.java rename to python/educational-python/student-python/src/com/jetbrains/edu/coursecreator/CreateFromArchiveProjectStep.java diff --git a/python/educational-python/course-creator-python/src/com/jetbrains/edu/coursecreator/PyCCChangeCourseInfo.java b/python/educational-python/student-python/src/com/jetbrains/edu/coursecreator/PyCCChangeCourseInfo.java similarity index 100% rename from python/educational-python/course-creator-python/src/com/jetbrains/edu/coursecreator/PyCCChangeCourseInfo.java rename to python/educational-python/student-python/src/com/jetbrains/edu/coursecreator/PyCCChangeCourseInfo.java diff --git a/python/educational-python/course-creator-python/src/com/jetbrains/edu/coursecreator/PyCCCreateProjectFromArchive.java b/python/educational-python/student-python/src/com/jetbrains/edu/coursecreator/PyCCCreateProjectFromArchive.java similarity index 100% rename from python/educational-python/course-creator-python/src/com/jetbrains/edu/coursecreator/PyCCCreateProjectFromArchive.java rename to python/educational-python/student-python/src/com/jetbrains/edu/coursecreator/PyCCCreateProjectFromArchive.java diff --git a/python/educational-python/course-creator-python/src/com/jetbrains/edu/coursecreator/PyCCLanguageManager.java b/python/educational-python/student-python/src/com/jetbrains/edu/coursecreator/PyCCLanguageManager.java similarity index 100% rename from python/educational-python/course-creator-python/src/com/jetbrains/edu/coursecreator/PyCCLanguageManager.java rename to python/educational-python/student-python/src/com/jetbrains/edu/coursecreator/PyCCLanguageManager.java diff --git a/python/educational-python/course-creator-python/src/com/jetbrains/edu/coursecreator/PyCCProjectGenerator.java b/python/educational-python/student-python/src/com/jetbrains/edu/coursecreator/PyCCProjectGenerator.java similarity index 97% rename from python/educational-python/course-creator-python/src/com/jetbrains/edu/coursecreator/PyCCProjectGenerator.java rename to python/educational-python/student-python/src/com/jetbrains/edu/coursecreator/PyCCProjectGenerator.java index 351a8807898c..08b023c7d613 100644 --- a/python/educational-python/course-creator-python/src/com/jetbrains/edu/coursecreator/PyCCProjectGenerator.java +++ b/python/educational-python/student-python/src/com/jetbrains/edu/coursecreator/PyCCProjectGenerator.java @@ -27,7 +27,7 @@ import com.jetbrains.python.PythonLanguage; import com.jetbrains.python.newProject.PyNewProjectSettings; import com.jetbrains.python.newProject.PythonProjectGenerator; import com.jetbrains.python.remote.PyProjectSynchronizer; -import icons.CourseCreatorPythonIcons; +import icons.InteractiveLearningPythonIcons; import org.jetbrains.annotations.Nls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -52,7 +52,7 @@ public class PyCCProjectGenerator extends PythonProjectGenerator + \ No newline at end of file