moved stepic connector to the edu core

This commit is contained in:
Ekaterina Tuzova
2015-02-16 17:39:15 +03:00
parent e1f7d878e5
commit 374a3024dd
6 changed files with 16 additions and 12 deletions
@@ -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;
@@ -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;
@@ -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;
}
}
@@ -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.*;
@@ -1,4 +1,4 @@
package com.jetbrains.edu.learning;
package com.jetbrains.edu.stepic;
import com.google.gson.annotations.SerializedName;
@@ -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<CourseInfo> getCourses() {