MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

cleanup

Browse Source
This commit is contained in:
Ekaterina Tuzova
2017-04-06 14:54:32 +03:00
parent cc693b55e7
commit 22ffb8a16b
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/educational-python/Edu-Python/src/com/jetbrains/edu/learning/PyEduPluginConfigurator.java
+4 -2
View File
@@ -34,6 +34,7 @@ public class PyEduPluginConfigurator implements EduPluginConfigurator {
public static final String PYTHON_2 = "2.x";
private static final String TESTS_PY = "tests.py";
private static final Logger LOG = Logger.getInstance(PyEduPluginConfigurator.class);
private static final String COURSE_NAME = "Introduction to Python.zip";
@NotNull
@Override
@@ -133,13 +134,14 @@ public class PyEduPluginConfigurator implements EduPluginConfigurator {
@Override
public List<String> getBundledCoursePaths() {
@NonNls String jarPath = PathUtil.getJarPathForClass(PyEduPluginConfigurator.class);
if (jarPath.endsWith(".jar")) {
final File jarFile = new File(jarPath);
File pluginBaseDir = jarFile.getParentFile();
return Collections.singletonList(new File(new File(pluginBaseDir, "courses"), "Introduction to Python.zip").getPath());
return Collections.singletonList(new File(new File(pluginBaseDir, "courses"), COURSE_NAME).getPath());
}
return Collections.singletonList(new File(new File(jarPath, "courses"), "Introduction to Python.zip").getPath());
return Collections.singletonList(new File(new File(jarPath, "courses"), COURSE_NAME).getPath());
}
}
python/educational-python/Edu-Python/src/com/jetbrains/edu/learning/actions/PyStudyIntroductionCourseAction.java
+2 -1
View File
@@ -20,6 +20,7 @@ import com.intellij.openapi.actionSystem.AnAction;
import com.intellij.openapi.actionSystem.AnActionEvent;
import com.intellij.openapi.actionSystem.Presentation;
import com.jetbrains.edu.learning.EduPluginConfigurator;
import com.jetbrains.edu.learning.PyEduPluginConfigurator;
import com.jetbrains.edu.learning.PyStudyDirectoryProjectGenerator;
import com.jetbrains.edu.learning.courseFormat.Course;
import com.jetbrains.edu.learning.courseGeneration.StudyProjectGenerator;
@@ -65,7 +66,7 @@ public class PyStudyIntroductionCourseAction extends AnAction {
}
else {
final PyStudyDirectoryProjectGenerator generator = new PyStudyDirectoryProjectGenerator(true);
final EduPluginConfigurator configurator = EduPluginConfigurator.INSTANCE.forLanguage(PythonLanguage.getInstance());
final EduPluginConfigurator configurator = new PyEduPluginConfigurator();
final String bundledCoursePath = configurator.getBundledCoursePaths().get(0);
Course introCourse = StudyProjectGenerator.getCourse(bundledCoursePath);
if (introCourse == null) {