Minor refactoring

This commit is contained in:
meanmail
2017-04-11 21:42:34 +07:00
parent e8a4074457
commit f8be70c916
4 changed files with 10 additions and 9 deletions
@@ -31,20 +31,20 @@ import java.util.regex.Matcher;
import java.util.regex.Pattern;
import static com.jetbrains.edu.learning.builtInServer.EduBuiltInServerUtils.*;
import static com.jetbrains.edu.learning.core.EduNames.SERVICE_NAME;
import static com.jetbrains.edu.learning.core.EduNames.STEP_ID;
import static com.jetbrains.edu.learning.stepic.EduStepicNames.EDU_STEPIK_SERVICE_NAME;
import static com.jetbrains.edu.learning.stepic.EduStepicNames.STEP_ID;
/**
* @author meanmail
*/
public class EduStepikRestService extends RestService {
private static final Logger LOG = Logger.getInstance(EduStepikRestService.class.getName());
private static final Pattern OPEN_COURSE = Pattern.compile("/" + SERVICE_NAME + "/course/(\\d+)");
private static final Pattern OPEN_COURSE = Pattern.compile("/" + EDU_STEPIK_SERVICE_NAME + "/course/(\\d+)");
@NotNull
@Override
protected String getServiceName() {
return SERVICE_NAME;
return EDU_STEPIK_SERVICE_NAME;
}
@Override
@@ -51,8 +51,6 @@ public class EduNames {
public static final String SUBTASK = "subtask";
public static final String STUDY_PROJECT_XML_PATH = "/.idea/study_project.xml";
public static final String SERVICE_NAME = "edu/stepik";
public static final String STEP_ID = "step_id";
private EduNames() {
}
@@ -23,4 +23,7 @@ public class EduStepicNames {
public static final String STEPIC_REGISTRATION_LINK = "https://stepic.org/registration?next=%2Fexplore%2Fcourses";
public static final String PYCHARM_PREFIX = "pycharm";
public static final String EDU_STEPIK_SERVICE_NAME = "edu/stepik";
public static final String STEP_ID = "step_id";
}
@@ -25,7 +25,8 @@ import com.jetbrains.python.newProject.steps.PyCharmNewProjectStep;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
/**
* @author meanmail
@@ -54,8 +55,7 @@ public class EduBuiltInServerNewProjectStep extends PyCharmNewProjectStep {
@Override
protected DirectoryProjectGenerator createEmptyProjectGenerator() {
StudyProjectGenerator generator = myGenerator.getGenerator();
ArrayList<Course> courses = new ArrayList<>();
courses.add(myCourse);
List<Course> courses = Collections.singletonList(myCourse);
generator.setCourses(courses);
generator.setSelectedCourse(myCourse);
return myGenerator;