From d04892da9a98fb079364f2200ea5f4567c1e5591 Mon Sep 17 00:00:00 2001 From: Ekaterina Tuzova Date: Wed, 14 Jan 2015 17:24:30 +0300 Subject: [PATCH] refactoring pycharm educational third iteration moved interactive-learning-python and course-creator-python modules to the proper place added missing icons to the interactive-learning --- .../course-creator-python.iml | 0 .../resources/META-INF/plugin.xml | 0 .../fileTemplates/internal/task.answer.ft | 0 .../fileTemplates/internal/task.html.ft | 0 .../fileTemplates/internal/test_helper.py.ft | 0 .../fileTemplates/internal/tests.py.ft | 0 .../icons/CourseCreationProjectType.png | Bin .../icons/CourseCreationProjectType@2x.png | Bin .../CourseCreationProjectType@2x_dark.png | Bin .../icons/CourseCreationProjectType_dark.png | Bin .../PyCCAnswerFileTypeFactory.java | 0 .../coursecreator/PyCCProjectGenerator.java | 0 .../actions/PyCCRunTestsAction.java | 0 .../src/icons/CourseCreatorPythonIcons.java | 0 .../testData/helloworld.py | 0 .../testData/helloworld.xml | 0 .../tests/CCDocumentListenerTest.java | 0 .../tests/CCTestCase.java | 0 .../interactive-learning-python.iml | 0 .../resources/META-INF/plugin.xml | 0 .../com/jetbrains/python/edu/user_tester.py | 0 .../resources/courses/introduction_course.zip | Bin .../edu/learning/EducationalProjectType.png | Bin .../learning/EducationalProjectType@2x.png | Bin .../learning/EducationalProjectType_dark.png | Bin .../EducationalProjectType_dark@2x.png | Bin .../PyStudyDirectoryProjectGenerator.java | 0 .../edu/learning/PyStudyTestRunner.java | 0 .../jetbrains/edu/learning/PyStudyUtils.java | 0 .../PyStudyIntroductionCourseAction.java | 0 .../actions/PyStudyWatchTutorialAction.java | 0 .../highlighting/PyStudyVisitorFilter.java | 0 .../icons/InteractiveLearningPythonIcons.java | 0 .../testData/course.json | 0 .../testData/helloworld.py | 0 .../tests/JsonParserTest.java | 0 .../tests/StudyDocumentListenerTest.java | 0 .../tests/StudyTestCase.java | 0 .../educational-python/educational-python.iml | 11 -------- .../src/icons/InteractiveLearningIcons.java | 26 ++++++++++++++++++ 40 files changed, 26 insertions(+), 11 deletions(-) rename python/{educational-python => edu}/course-creator-python/course-creator-python.iml (100%) rename python/{educational-python => edu}/course-creator-python/resources/META-INF/plugin.xml (100%) rename python/{educational-python => edu}/course-creator-python/resources/fileTemplates/internal/task.answer.ft (100%) rename python/{educational-python => edu}/course-creator-python/resources/fileTemplates/internal/task.html.ft (100%) rename python/{educational-python => edu}/course-creator-python/resources/fileTemplates/internal/test_helper.py.ft (100%) rename python/{educational-python => edu}/course-creator-python/resources/fileTemplates/internal/tests.py.ft (100%) rename python/{educational-python => edu}/course-creator-python/resources/icons/CourseCreationProjectType.png (100%) rename python/{educational-python => edu}/course-creator-python/resources/icons/CourseCreationProjectType@2x.png (100%) rename python/{educational-python => edu}/course-creator-python/resources/icons/CourseCreationProjectType@2x_dark.png (100%) rename python/{educational-python => edu}/course-creator-python/resources/icons/CourseCreationProjectType_dark.png (100%) rename python/{educational-python => edu}/course-creator-python/src/com/jetbrains/edu/coursecreator/PyCCAnswerFileTypeFactory.java (100%) rename python/{educational-python => edu}/course-creator-python/src/com/jetbrains/edu/coursecreator/PyCCProjectGenerator.java (100%) rename python/{educational-python => edu}/course-creator-python/src/com/jetbrains/edu/coursecreator/actions/PyCCRunTestsAction.java (100%) rename python/{educational-python => edu}/course-creator-python/src/icons/CourseCreatorPythonIcons.java (100%) rename python/{educational-python => edu}/course-creator-python/testData/helloworld.py (100%) rename python/{educational-python => edu}/course-creator-python/testData/helloworld.xml (100%) rename python/{educational-python => edu}/course-creator-python/tests/CCDocumentListenerTest.java (100%) rename python/{educational-python => edu}/course-creator-python/tests/CCTestCase.java (100%) rename python/{educational-python => edu}/interactive-learning-python/interactive-learning-python.iml (100%) rename python/{educational-python => edu}/interactive-learning-python/resources/META-INF/plugin.xml (100%) rename python/{educational-python => edu}/interactive-learning-python/resources/com/jetbrains/python/edu/user_tester.py (100%) rename python/{educational-python => edu}/interactive-learning-python/resources/courses/introduction_course.zip (100%) rename python/{educational-python => edu}/interactive-learning-python/resources/icons/com/jetbrains/edu/learning/EducationalProjectType.png (100%) rename python/{educational-python => edu}/interactive-learning-python/resources/icons/com/jetbrains/edu/learning/EducationalProjectType@2x.png (100%) rename python/{educational-python => edu}/interactive-learning-python/resources/icons/com/jetbrains/edu/learning/EducationalProjectType_dark.png (100%) rename python/{educational-python => edu}/interactive-learning-python/resources/icons/com/jetbrains/edu/learning/EducationalProjectType_dark@2x.png (100%) rename python/{educational-python => edu}/interactive-learning-python/src/com/jetbrains/edu/learning/PyStudyDirectoryProjectGenerator.java (100%) rename python/{educational-python => edu}/interactive-learning-python/src/com/jetbrains/edu/learning/PyStudyTestRunner.java (100%) rename python/{educational-python => edu}/interactive-learning-python/src/com/jetbrains/edu/learning/PyStudyUtils.java (100%) rename python/{educational-python => edu}/interactive-learning-python/src/com/jetbrains/edu/learning/actions/PyStudyIntroductionCourseAction.java (100%) rename python/{educational-python => edu}/interactive-learning-python/src/com/jetbrains/edu/learning/actions/PyStudyWatchTutorialAction.java (100%) rename python/{educational-python => edu}/interactive-learning-python/src/com/jetbrains/edu/learning/highlighting/PyStudyVisitorFilter.java (100%) rename python/{educational-python => edu}/interactive-learning-python/src/icons/InteractiveLearningPythonIcons.java (100%) rename python/{educational-python => edu}/interactive-learning-python/testData/course.json (100%) rename python/{educational-python => edu}/interactive-learning-python/testData/helloworld.py (100%) rename python/{educational-python => edu}/interactive-learning-python/tests/JsonParserTest.java (100%) rename python/{educational-python => edu}/interactive-learning-python/tests/StudyDocumentListenerTest.java (100%) rename python/{educational-python => edu}/interactive-learning-python/tests/StudyTestCase.java (100%) delete mode 100644 python/educational-python/educational-python.iml create mode 100644 python/educational/interactive-learning/src/icons/InteractiveLearningIcons.java diff --git a/python/educational-python/course-creator-python/course-creator-python.iml b/python/edu/course-creator-python/course-creator-python.iml similarity index 100% rename from python/educational-python/course-creator-python/course-creator-python.iml rename to python/edu/course-creator-python/course-creator-python.iml diff --git a/python/educational-python/course-creator-python/resources/META-INF/plugin.xml b/python/edu/course-creator-python/resources/META-INF/plugin.xml similarity index 100% rename from python/educational-python/course-creator-python/resources/META-INF/plugin.xml rename to python/edu/course-creator-python/resources/META-INF/plugin.xml diff --git a/python/educational-python/course-creator-python/resources/fileTemplates/internal/task.answer.ft b/python/edu/course-creator-python/resources/fileTemplates/internal/task.answer.ft similarity index 100% rename from python/educational-python/course-creator-python/resources/fileTemplates/internal/task.answer.ft rename to python/edu/course-creator-python/resources/fileTemplates/internal/task.answer.ft diff --git a/python/educational-python/course-creator-python/resources/fileTemplates/internal/task.html.ft b/python/edu/course-creator-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/edu/course-creator-python/resources/fileTemplates/internal/task.html.ft diff --git a/python/educational-python/course-creator-python/resources/fileTemplates/internal/test_helper.py.ft b/python/edu/course-creator-python/resources/fileTemplates/internal/test_helper.py.ft similarity index 100% rename from python/educational-python/course-creator-python/resources/fileTemplates/internal/test_helper.py.ft rename to python/edu/course-creator-python/resources/fileTemplates/internal/test_helper.py.ft diff --git a/python/educational-python/course-creator-python/resources/fileTemplates/internal/tests.py.ft b/python/edu/course-creator-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/edu/course-creator-python/resources/fileTemplates/internal/tests.py.ft diff --git a/python/educational-python/course-creator-python/resources/icons/CourseCreationProjectType.png b/python/edu/course-creator-python/resources/icons/CourseCreationProjectType.png similarity index 100% rename from python/educational-python/course-creator-python/resources/icons/CourseCreationProjectType.png rename to python/edu/course-creator-python/resources/icons/CourseCreationProjectType.png diff --git a/python/educational-python/course-creator-python/resources/icons/CourseCreationProjectType@2x.png b/python/edu/course-creator-python/resources/icons/CourseCreationProjectType@2x.png similarity index 100% rename from python/educational-python/course-creator-python/resources/icons/CourseCreationProjectType@2x.png rename to python/edu/course-creator-python/resources/icons/CourseCreationProjectType@2x.png diff --git a/python/educational-python/course-creator-python/resources/icons/CourseCreationProjectType@2x_dark.png b/python/edu/course-creator-python/resources/icons/CourseCreationProjectType@2x_dark.png similarity index 100% rename from python/educational-python/course-creator-python/resources/icons/CourseCreationProjectType@2x_dark.png rename to python/edu/course-creator-python/resources/icons/CourseCreationProjectType@2x_dark.png diff --git a/python/educational-python/course-creator-python/resources/icons/CourseCreationProjectType_dark.png b/python/edu/course-creator-python/resources/icons/CourseCreationProjectType_dark.png similarity index 100% rename from python/educational-python/course-creator-python/resources/icons/CourseCreationProjectType_dark.png rename to python/edu/course-creator-python/resources/icons/CourseCreationProjectType_dark.png diff --git a/python/educational-python/course-creator-python/src/com/jetbrains/edu/coursecreator/PyCCAnswerFileTypeFactory.java b/python/edu/course-creator-python/src/com/jetbrains/edu/coursecreator/PyCCAnswerFileTypeFactory.java similarity index 100% rename from python/educational-python/course-creator-python/src/com/jetbrains/edu/coursecreator/PyCCAnswerFileTypeFactory.java rename to python/edu/course-creator-python/src/com/jetbrains/edu/coursecreator/PyCCAnswerFileTypeFactory.java diff --git a/python/educational-python/course-creator-python/src/com/jetbrains/edu/coursecreator/PyCCProjectGenerator.java b/python/edu/course-creator-python/src/com/jetbrains/edu/coursecreator/PyCCProjectGenerator.java similarity index 100% rename from python/educational-python/course-creator-python/src/com/jetbrains/edu/coursecreator/PyCCProjectGenerator.java rename to python/edu/course-creator-python/src/com/jetbrains/edu/coursecreator/PyCCProjectGenerator.java diff --git a/python/educational-python/course-creator-python/src/com/jetbrains/edu/coursecreator/actions/PyCCRunTestsAction.java b/python/edu/course-creator-python/src/com/jetbrains/edu/coursecreator/actions/PyCCRunTestsAction.java similarity index 100% rename from python/educational-python/course-creator-python/src/com/jetbrains/edu/coursecreator/actions/PyCCRunTestsAction.java rename to python/edu/course-creator-python/src/com/jetbrains/edu/coursecreator/actions/PyCCRunTestsAction.java diff --git a/python/educational-python/course-creator-python/src/icons/CourseCreatorPythonIcons.java b/python/edu/course-creator-python/src/icons/CourseCreatorPythonIcons.java similarity index 100% rename from python/educational-python/course-creator-python/src/icons/CourseCreatorPythonIcons.java rename to python/edu/course-creator-python/src/icons/CourseCreatorPythonIcons.java diff --git a/python/educational-python/course-creator-python/testData/helloworld.py b/python/edu/course-creator-python/testData/helloworld.py similarity index 100% rename from python/educational-python/course-creator-python/testData/helloworld.py rename to python/edu/course-creator-python/testData/helloworld.py diff --git a/python/educational-python/course-creator-python/testData/helloworld.xml b/python/edu/course-creator-python/testData/helloworld.xml similarity index 100% rename from python/educational-python/course-creator-python/testData/helloworld.xml rename to python/edu/course-creator-python/testData/helloworld.xml diff --git a/python/educational-python/course-creator-python/tests/CCDocumentListenerTest.java b/python/edu/course-creator-python/tests/CCDocumentListenerTest.java similarity index 100% rename from python/educational-python/course-creator-python/tests/CCDocumentListenerTest.java rename to python/edu/course-creator-python/tests/CCDocumentListenerTest.java diff --git a/python/educational-python/course-creator-python/tests/CCTestCase.java b/python/edu/course-creator-python/tests/CCTestCase.java similarity index 100% rename from python/educational-python/course-creator-python/tests/CCTestCase.java rename to python/edu/course-creator-python/tests/CCTestCase.java diff --git a/python/educational-python/interactive-learning-python/interactive-learning-python.iml b/python/edu/interactive-learning-python/interactive-learning-python.iml similarity index 100% rename from python/educational-python/interactive-learning-python/interactive-learning-python.iml rename to python/edu/interactive-learning-python/interactive-learning-python.iml diff --git a/python/educational-python/interactive-learning-python/resources/META-INF/plugin.xml b/python/edu/interactive-learning-python/resources/META-INF/plugin.xml similarity index 100% rename from python/educational-python/interactive-learning-python/resources/META-INF/plugin.xml rename to python/edu/interactive-learning-python/resources/META-INF/plugin.xml diff --git a/python/educational-python/interactive-learning-python/resources/com/jetbrains/python/edu/user_tester.py b/python/edu/interactive-learning-python/resources/com/jetbrains/python/edu/user_tester.py similarity index 100% rename from python/educational-python/interactive-learning-python/resources/com/jetbrains/python/edu/user_tester.py rename to python/edu/interactive-learning-python/resources/com/jetbrains/python/edu/user_tester.py diff --git a/python/educational-python/interactive-learning-python/resources/courses/introduction_course.zip b/python/edu/interactive-learning-python/resources/courses/introduction_course.zip similarity index 100% rename from python/educational-python/interactive-learning-python/resources/courses/introduction_course.zip rename to python/edu/interactive-learning-python/resources/courses/introduction_course.zip diff --git a/python/educational-python/interactive-learning-python/resources/icons/com/jetbrains/edu/learning/EducationalProjectType.png b/python/edu/interactive-learning-python/resources/icons/com/jetbrains/edu/learning/EducationalProjectType.png similarity index 100% rename from python/educational-python/interactive-learning-python/resources/icons/com/jetbrains/edu/learning/EducationalProjectType.png rename to python/edu/interactive-learning-python/resources/icons/com/jetbrains/edu/learning/EducationalProjectType.png diff --git a/python/educational-python/interactive-learning-python/resources/icons/com/jetbrains/edu/learning/EducationalProjectType@2x.png b/python/edu/interactive-learning-python/resources/icons/com/jetbrains/edu/learning/EducationalProjectType@2x.png similarity index 100% rename from python/educational-python/interactive-learning-python/resources/icons/com/jetbrains/edu/learning/EducationalProjectType@2x.png rename to python/edu/interactive-learning-python/resources/icons/com/jetbrains/edu/learning/EducationalProjectType@2x.png diff --git a/python/educational-python/interactive-learning-python/resources/icons/com/jetbrains/edu/learning/EducationalProjectType_dark.png b/python/edu/interactive-learning-python/resources/icons/com/jetbrains/edu/learning/EducationalProjectType_dark.png similarity index 100% rename from python/educational-python/interactive-learning-python/resources/icons/com/jetbrains/edu/learning/EducationalProjectType_dark.png rename to python/edu/interactive-learning-python/resources/icons/com/jetbrains/edu/learning/EducationalProjectType_dark.png diff --git a/python/educational-python/interactive-learning-python/resources/icons/com/jetbrains/edu/learning/EducationalProjectType_dark@2x.png b/python/edu/interactive-learning-python/resources/icons/com/jetbrains/edu/learning/EducationalProjectType_dark@2x.png similarity index 100% rename from python/educational-python/interactive-learning-python/resources/icons/com/jetbrains/edu/learning/EducationalProjectType_dark@2x.png rename to python/edu/interactive-learning-python/resources/icons/com/jetbrains/edu/learning/EducationalProjectType_dark@2x.png diff --git a/python/educational-python/interactive-learning-python/src/com/jetbrains/edu/learning/PyStudyDirectoryProjectGenerator.java b/python/edu/interactive-learning-python/src/com/jetbrains/edu/learning/PyStudyDirectoryProjectGenerator.java similarity index 100% rename from python/educational-python/interactive-learning-python/src/com/jetbrains/edu/learning/PyStudyDirectoryProjectGenerator.java rename to python/edu/interactive-learning-python/src/com/jetbrains/edu/learning/PyStudyDirectoryProjectGenerator.java diff --git a/python/educational-python/interactive-learning-python/src/com/jetbrains/edu/learning/PyStudyTestRunner.java b/python/edu/interactive-learning-python/src/com/jetbrains/edu/learning/PyStudyTestRunner.java similarity index 100% rename from python/educational-python/interactive-learning-python/src/com/jetbrains/edu/learning/PyStudyTestRunner.java rename to python/edu/interactive-learning-python/src/com/jetbrains/edu/learning/PyStudyTestRunner.java diff --git a/python/educational-python/interactive-learning-python/src/com/jetbrains/edu/learning/PyStudyUtils.java b/python/edu/interactive-learning-python/src/com/jetbrains/edu/learning/PyStudyUtils.java similarity index 100% rename from python/educational-python/interactive-learning-python/src/com/jetbrains/edu/learning/PyStudyUtils.java rename to python/edu/interactive-learning-python/src/com/jetbrains/edu/learning/PyStudyUtils.java diff --git a/python/educational-python/interactive-learning-python/src/com/jetbrains/edu/learning/actions/PyStudyIntroductionCourseAction.java b/python/edu/interactive-learning-python/src/com/jetbrains/edu/learning/actions/PyStudyIntroductionCourseAction.java similarity index 100% rename from python/educational-python/interactive-learning-python/src/com/jetbrains/edu/learning/actions/PyStudyIntroductionCourseAction.java rename to python/edu/interactive-learning-python/src/com/jetbrains/edu/learning/actions/PyStudyIntroductionCourseAction.java diff --git a/python/educational-python/interactive-learning-python/src/com/jetbrains/edu/learning/actions/PyStudyWatchTutorialAction.java b/python/edu/interactive-learning-python/src/com/jetbrains/edu/learning/actions/PyStudyWatchTutorialAction.java similarity index 100% rename from python/educational-python/interactive-learning-python/src/com/jetbrains/edu/learning/actions/PyStudyWatchTutorialAction.java rename to python/edu/interactive-learning-python/src/com/jetbrains/edu/learning/actions/PyStudyWatchTutorialAction.java diff --git a/python/educational-python/interactive-learning-python/src/com/jetbrains/edu/learning/highlighting/PyStudyVisitorFilter.java b/python/edu/interactive-learning-python/src/com/jetbrains/edu/learning/highlighting/PyStudyVisitorFilter.java similarity index 100% rename from python/educational-python/interactive-learning-python/src/com/jetbrains/edu/learning/highlighting/PyStudyVisitorFilter.java rename to python/edu/interactive-learning-python/src/com/jetbrains/edu/learning/highlighting/PyStudyVisitorFilter.java diff --git a/python/educational-python/interactive-learning-python/src/icons/InteractiveLearningPythonIcons.java b/python/edu/interactive-learning-python/src/icons/InteractiveLearningPythonIcons.java similarity index 100% rename from python/educational-python/interactive-learning-python/src/icons/InteractiveLearningPythonIcons.java rename to python/edu/interactive-learning-python/src/icons/InteractiveLearningPythonIcons.java diff --git a/python/educational-python/interactive-learning-python/testData/course.json b/python/edu/interactive-learning-python/testData/course.json similarity index 100% rename from python/educational-python/interactive-learning-python/testData/course.json rename to python/edu/interactive-learning-python/testData/course.json diff --git a/python/educational-python/interactive-learning-python/testData/helloworld.py b/python/edu/interactive-learning-python/testData/helloworld.py similarity index 100% rename from python/educational-python/interactive-learning-python/testData/helloworld.py rename to python/edu/interactive-learning-python/testData/helloworld.py diff --git a/python/educational-python/interactive-learning-python/tests/JsonParserTest.java b/python/edu/interactive-learning-python/tests/JsonParserTest.java similarity index 100% rename from python/educational-python/interactive-learning-python/tests/JsonParserTest.java rename to python/edu/interactive-learning-python/tests/JsonParserTest.java diff --git a/python/educational-python/interactive-learning-python/tests/StudyDocumentListenerTest.java b/python/edu/interactive-learning-python/tests/StudyDocumentListenerTest.java similarity index 100% rename from python/educational-python/interactive-learning-python/tests/StudyDocumentListenerTest.java rename to python/edu/interactive-learning-python/tests/StudyDocumentListenerTest.java diff --git a/python/educational-python/interactive-learning-python/tests/StudyTestCase.java b/python/edu/interactive-learning-python/tests/StudyTestCase.java similarity index 100% rename from python/educational-python/interactive-learning-python/tests/StudyTestCase.java rename to python/edu/interactive-learning-python/tests/StudyTestCase.java diff --git a/python/educational-python/educational-python.iml b/python/educational-python/educational-python.iml deleted file mode 100644 index c90834f2d607..000000000000 --- a/python/educational-python/educational-python.iml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/python/educational/interactive-learning/src/icons/InteractiveLearningIcons.java b/python/educational/interactive-learning/src/icons/InteractiveLearningIcons.java new file mode 100644 index 000000000000..a6151a684e3c --- /dev/null +++ b/python/educational/interactive-learning/src/icons/InteractiveLearningIcons.java @@ -0,0 +1,26 @@ +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 InteractiveLearningIcons { + private static Icon load(String path) { + return IconLoader.getIcon(path, InteractiveLearningIcons.class); + } + + 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 TaskProbl = load("/icons/com/jetbrains/edu/learning/TaskProbl.png"); // 16x16 + public static final Icon WatchInput = load("/icons/com/jetbrains/edu/learning/WatchInput.png"); // 24x24 +}