From 374a3024dd7c42a56d3b1b23c982f69f7e8a2284 Mon Sep 17 00:00:00 2001 From: Ekaterina Tuzova Date: Mon, 16 Feb 2015 17:39:15 +0300 Subject: [PATCH] moved stepic connector to the edu core --- .../learning/PyStudyDirectoryProjectGenerator.java | 1 + .../actions/PyStudyIntroductionCourseAction.java | 2 +- .../courseGeneration/StudyProjectGenerator.java | 12 ++++++++---- .../edu/learning/ui/StudyNewProjectPanel.java | 2 +- .../com/jetbrains/edu/stepic}/CourseInfo.java | 2 +- .../jetbrains/edu/stepic/EduStepicConnector.java} | 9 ++++----- 6 files changed, 16 insertions(+), 12 deletions(-) rename python/educational/{interactive-learning/src/com/jetbrains/edu/learning => src/com/jetbrains/edu/stepic}/CourseInfo.java (97%) rename python/educational/{interactive-learning/src/com/jetbrains/edu/learning/stepic/StudyStepicConnector.java => src/com/jetbrains/edu/stepic/EduStepicConnector.java} (95%) diff --git a/python/edu/interactive-learning-python/src/com/jetbrains/edu/learning/PyStudyDirectoryProjectGenerator.java b/python/edu/interactive-learning-python/src/com/jetbrains/edu/learning/PyStudyDirectoryProjectGenerator.java index 3a3b98d444d1..1f3ffca7e256 100644 --- a/python/edu/interactive-learning-python/src/com/jetbrains/edu/learning/PyStudyDirectoryProjectGenerator.java +++ b/python/edu/interactive-learning-python/src/com/jetbrains/edu/learning/PyStudyDirectoryProjectGenerator.java @@ -16,6 +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.python.newProject.PythonProjectGenerator; import icons.InteractiveLearningPythonIcons; import org.jetbrains.annotations.Nls; diff --git a/python/edu/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 index 56378398d747..bebf42f1542a 100644 --- a/python/edu/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 @@ -21,9 +21,9 @@ import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.project.Project; import com.intellij.openapi.project.ProjectManager; import com.intellij.openapi.projectRoots.Sdk; -import com.jetbrains.edu.learning.CourseInfo; import com.jetbrains.edu.learning.PyStudyDirectoryProjectGenerator; import com.jetbrains.edu.learning.StudyUtils; +import com.jetbrains.edu.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/interactive-learning/src/com/jetbrains/edu/learning/courseGeneration/StudyProjectGenerator.java b/python/educational/interactive-learning/src/com/jetbrains/edu/learning/courseGeneration/StudyProjectGenerator.java index 8fded5aca6e6..3969c6977085 100644 --- a/python/educational/interactive-learning/src/com/jetbrains/edu/learning/courseGeneration/StudyProjectGenerator.java +++ b/python/educational/interactive-learning/src/com/jetbrains/edu/learning/courseGeneration/StudyProjectGenerator.java @@ -24,8 +24,12 @@ 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.*; -import com.jetbrains.edu.learning.stepic.StudyStepicConnector; +import com.jetbrains.edu.learning.StudyLanguageManager; +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 org.jetbrains.annotations.NotNull; import java.io.*; @@ -50,7 +54,7 @@ public class StudyProjectGenerator { } public void generateProject(@NotNull final Project project, @NotNull final VirtualFile baseDir) { - final Course course = StudyStepicConnector.getCourse(mySelectedCourseInfo); + final Course course = EduStepicConnector.getCourse(mySelectedCourseInfo); if (course == null) return; StudyTaskManager.getInstance(project).setCourse(course); flushCourse(course); @@ -235,7 +239,7 @@ public class StudyProjectGenerator { return myCourses; } else { - myCourses = StudyStepicConnector.getCourses(); + myCourses = EduStepicConnector.getCourses(); return myCourses; } } diff --git a/python/educational/interactive-learning/src/com/jetbrains/edu/learning/ui/StudyNewProjectPanel.java b/python/educational/interactive-learning/src/com/jetbrains/edu/learning/ui/StudyNewProjectPanel.java index 225ba643135a..f425f597a322 100644 --- a/python/educational/interactive-learning/src/com/jetbrains/edu/learning/ui/StudyNewProjectPanel.java +++ b/python/educational/interactive-learning/src/com/jetbrains/edu/learning/ui/StudyNewProjectPanel.java @@ -3,9 +3,9 @@ package com.jetbrains.edu.learning.ui; import com.intellij.facet.ui.FacetValidatorsManager; import com.intellij.facet.ui.ValidationResult; import com.intellij.icons.AllIcons; -import com.jetbrains.edu.learning.CourseInfo; import com.jetbrains.edu.learning.StudyUtils; import com.jetbrains.edu.learning.courseGeneration.StudyProjectGenerator; +import com.jetbrains.edu.stepic.CourseInfo; import org.jetbrains.annotations.NotNull; import javax.swing.*; diff --git a/python/educational/interactive-learning/src/com/jetbrains/edu/learning/CourseInfo.java b/python/educational/src/com/jetbrains/edu/stepic/CourseInfo.java similarity index 97% rename from python/educational/interactive-learning/src/com/jetbrains/edu/learning/CourseInfo.java rename to python/educational/src/com/jetbrains/edu/stepic/CourseInfo.java index 2c354b183a28..161dc10b059b 100644 --- a/python/educational/interactive-learning/src/com/jetbrains/edu/learning/CourseInfo.java +++ b/python/educational/src/com/jetbrains/edu/stepic/CourseInfo.java @@ -1,4 +1,4 @@ -package com.jetbrains.edu.learning; +package com.jetbrains.edu.stepic; import com.google.gson.annotations.SerializedName; diff --git a/python/educational/interactive-learning/src/com/jetbrains/edu/learning/stepic/StudyStepicConnector.java b/python/educational/src/com/jetbrains/edu/stepic/EduStepicConnector.java similarity index 95% rename from python/educational/interactive-learning/src/com/jetbrains/edu/learning/stepic/StudyStepicConnector.java rename to python/educational/src/com/jetbrains/edu/stepic/EduStepicConnector.java index 7d209750af1c..c3e781e876d8 100644 --- a/python/educational/interactive-learning/src/com/jetbrains/edu/learning/stepic/StudyStepicConnector.java +++ b/python/educational/src/com/jetbrains/edu/stepic/EduStepicConnector.java @@ -1,4 +1,4 @@ -package com.jetbrains.edu.learning.stepic; +package com.jetbrains.edu.stepic; import com.google.gson.FieldNamingPolicy; import com.google.gson.Gson; @@ -9,7 +9,6 @@ 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.CourseInfo; import org.jetbrains.annotations.NotNull; import java.io.BufferedReader; @@ -19,11 +18,11 @@ import java.util.Collections; import java.util.HashMap; import java.util.List; -public class StudyStepicConnector { +public class EduStepicConnector { private static final String stepicApiUrl = "https://stepic.org/api/"; - private static final Logger LOG = Logger.getInstance(StudyStepicConnector.class.getName()); + private static final Logger LOG = Logger.getInstance(EduStepicConnector.class.getName()); - private StudyStepicConnector() {} + private EduStepicConnector() {} @NotNull public static List getCourses() {