From f8be70c91691df852e90f9afcee4ffebd735b2c3 Mon Sep 17 00:00:00 2001
From: meanmail <meanmail@mail.ru>
Date: Tue, 11 Apr 2017 21:42:34 +0700
Subject: [PATCH] Minor refactoring

---
 .../edu/learning/builtInServer/EduStepikRestService.java  | 8 ++++----
 .../src/com/jetbrains/edu/learning/core/EduNames.java     | 2 --
 .../com/jetbrains/edu/learning/stepic/EduStepicNames.java | 3 +++
 .../builtInServer/EduBuiltInServerNewProjectStep.java     | 6 +++---
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/python/educational-core/src/com/jetbrains/edu/learning/builtInServer/EduStepikRestService.java b/python/educational-core/src/com/jetbrains/edu/learning/builtInServer/EduStepikRestService.java
index 5a2ccad1dc3b..1e0f94ee8b83 100644
--- a/python/educational-core/src/com/jetbrains/edu/learning/builtInServer/EduStepikRestService.java
+++ b/python/educational-core/src/com/jetbrains/edu/learning/builtInServer/EduStepikRestService.java
@@ -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
diff --git a/python/educational-core/src/com/jetbrains/edu/learning/core/EduNames.java b/python/educational-core/src/com/jetbrains/edu/learning/core/EduNames.java
index 40c7cea89ad5..db66e50205b5 100644
--- a/python/educational-core/src/com/jetbrains/edu/learning/core/EduNames.java
+++ b/python/educational-core/src/com/jetbrains/edu/learning/core/EduNames.java
@@ -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() {
   }
diff --git a/python/educational-core/src/com/jetbrains/edu/learning/stepic/EduStepicNames.java b/python/educational-core/src/com/jetbrains/edu/learning/stepic/EduStepicNames.java
index 5ee99dc6cde8..e2e8ef92ec1f 100644
--- a/python/educational-core/src/com/jetbrains/edu/learning/stepic/EduStepicNames.java
+++ b/python/educational-core/src/com/jetbrains/edu/learning/stepic/EduStepicNames.java
@@ -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";
 }
diff --git a/python/educational-python/Edu-Python/src/com/jetbrains/edu/learning/builtInServer/EduBuiltInServerNewProjectStep.java b/python/educational-python/Edu-Python/src/com/jetbrains/edu/learning/builtInServer/EduBuiltInServerNewProjectStep.java
index 305f88c0cca8..0e79ddc210da 100644
--- a/python/educational-python/Edu-Python/src/com/jetbrains/edu/learning/builtInServer/EduBuiltInServerNewProjectStep.java
+++ b/python/educational-python/Edu-Python/src/com/jetbrains/edu/learning/builtInServer/EduBuiltInServerNewProjectStep.java
@@ -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;