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

Removed an extension point 'eduProjectCreator'

Browse Source
This commit is contained in:
meanmail
2017-04-11 15:21:26 +07:00
parent a4ee6d7bc2
commit c3b513c1fb
9 changed files with 38 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/educational-core/resources/META-INF/plugin.xml
+1 -2
View File
@@ -49,7 +49,6 @@
<extensionPoint qualifiedName="Edu.optionsProvider" beanClass="com.jetbrains.edu.learning.settings.StudyOptionsProviderEP">
<with attribute="instance" implements="com.jetbrains.edu.learning.settings.StudyOptionsProvider"/>
</extensionPoint>
<extensionPoint qualifiedName="Edu.eduProjectCreator" interface="com.jetbrains.edu.learning.builtInServer.EduProjectCreator"/>
</extensionPoints>
<actions>
@@ -173,7 +172,7 @@
<applicationService serviceImplementation="com.jetbrains.edu.learning.StudySettings"/>
<editorTabTitleProvider implementation="com.jetbrains.edu.learning.StudyTabTitleProvider"/>
<typedHandler implementation="com.jetbrains.edu.learning.StudyTypeHandlerDelegate" order="first, before completionAutoPopup"/>
<httpRequestHandler implementation="com.jetbrains.edu.learning.builtInServer.StepikRestService"/>
<httpRequestHandler implementation="com.jetbrains.edu.learning.builtInServer.EduStepikRestService"/>
<!--course creator-->
<projectService serviceImplementation="com.jetbrains.edu.coursecreator.CCProjectService"/>
python/educational-core/src/com/jetbrains/edu/learning/EduPluginConfigurator.java
+5
View File
@@ -12,6 +12,7 @@ import com.intellij.openapi.module.Module;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.psi.PsiDirectory;
import com.intellij.util.Consumer;
import com.jetbrains.edu.learning.actions.*;
import com.jetbrains.edu.learning.core.EduNames;
import com.jetbrains.edu.learning.courseFormat.Course;
@@ -131,4 +132,8 @@ public interface EduPluginConfigurator {
default List<String> getBundledCoursePaths() {
return Collections.emptyList();
}
default boolean createCourseProject(@NotNull Course course, @Nullable Consumer<Project> onCreated) {
return false;
}
}
python/educational-core/src/com/jetbrains/edu/learning/builtInServer/BuiltInServerUtils.java → python/educational-core/src/com/jetbrains/edu/learning/builtInServer/EduBuiltInServerUtils.java
+8 -3
View File
@@ -25,6 +25,7 @@ import com.intellij.openapi.project.Project;
import com.intellij.openapi.project.ProjectManager;
import com.intellij.util.Consumer;
import com.intellij.util.xmlb.XmlSerializationException;
import com.jetbrains.edu.learning.EduPluginConfigurator;
import com.jetbrains.edu.learning.StudySettings;
import com.jetbrains.edu.learning.StudyTaskManager;
import com.jetbrains.edu.learning.courseFormat.Course;
@@ -51,8 +52,8 @@ import static com.jetbrains.edu.learning.navigation.StudyNavigator.navigateToTas
/**
* @author meanmail
*/
public class BuiltInServerUtils {
private static final Logger LOG = Logger.getInstance(BuiltInServerUtils.class);
public class EduBuiltInServerUtils {
private static final Logger LOG = Logger.getInstance(EduBuiltInServerUtils.class);
public static boolean focusOpenProject(int courseId, int stepId) {
Project[] openProjects = ProjectManager.getInstance().getOpenProjects();
@@ -189,7 +190,11 @@ public class BuiltInServerUtils {
navigateToStep(project, targetCourse, stepId);
}
});
return EduProjectCreator.createProject(course[0], onCreated);
EduPluginConfigurator configurator = EduPluginConfigurator.INSTANCE.forLanguage(course[0].getLanguageById());
if (configurator == null) {
return false;
}
return configurator.createCourseProject(course[0], onCreated);
}
return false;
}
python/educational-core/src/com/jetbrains/edu/learning/builtInServer/EduProjectCreator.java
-51
View File
@@ -1,51 +0,0 @@
/*
* Copyright 2000-2017 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.jetbrains.edu.learning.builtInServer;
import com.intellij.openapi.extensions.ExtensionPointName;
import com.intellij.openapi.extensions.Extensions;
import com.intellij.openapi.project.Project;
import com.intellij.util.Consumer;
import com.jetbrains.edu.learning.courseFormat.Course;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
/**
* @author meanmail
*/
public class EduProjectCreator {
public static final ExtensionPointName<EduProjectCreator> EP_NAME = ExtensionPointName.create("Edu.eduProjectCreator");
public static boolean createProject(@NotNull Course course, @Nullable Consumer<Project> onCreated) {
EduProjectCreator[] extensions = Extensions.getExtensions(EP_NAME);
for (EduProjectCreator projectCreator : extensions) {
if (projectCreator.canCreateProject(course)) {
return projectCreator.createCourseProject(course, onCreated);
}
}
return false;
}
public boolean createCourseProject(@NotNull Course course, @Nullable Consumer<Project> onCreated) {
return false;
}
public boolean canCreateProject(@NotNull Course course) {
return false;
}
}
python/educational-core/src/com/jetbrains/edu/learning/builtInServer/StepikRestService.java → python/educational-core/src/com/jetbrains/edu/learning/builtInServer/EduStepikRestService.java
+3 -3
View File
@@ -30,15 +30,15 @@ import java.util.List;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import static com.jetbrains.edu.learning.builtInServer.BuiltInServerUtils.*;
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;
/**
* @author meanmail
*/
public class StepikRestService extends RestService {
private static final Logger LOG = Logger.getInstance(StepikRestService.class.getName());
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+)");
@NotNull
python/educational-python/Edu-Python/resources/META-INF/plugin.xml
-1
View File
@@ -36,7 +36,6 @@
</extensions>
<extensions defaultExtensionNs="Edu">
<pluginConfigurator implementationClass="com.jetbrains.edu.learning.PyEduPluginConfigurator" language="Python"/>
<eduProjectCreator implementation="com.jetbrains.edu.learning.builtInServer.EduPythonProjectCreator"/>
</extensions>
<actions>
<action id="WelcomeScreen.PythonIntro" class="com.jetbrains.edu.learning.actions.PyStudyIntroductionCourseAction"
python/educational-python/Edu-Python/src/com/jetbrains/edu/learning/PyEduPluginConfigurator.java
+18
View File
@@ -5,6 +5,8 @@ import com.intellij.ide.fileTemplates.FileTemplate;
import com.intellij.ide.fileTemplates.FileTemplateManager;
import com.intellij.ide.fileTemplates.FileTemplateUtil;
import com.intellij.ide.util.DirectoryUtil;
import com.intellij.ide.util.projectWizard.AbstractNewProjectDialog;
import com.intellij.openapi.actionSystem.DefaultActionGroup;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.project.Project;
@@ -14,9 +16,11 @@ import com.intellij.openapi.util.io.FileUtilRt;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.psi.PsiDirectory;
import com.intellij.psi.PsiManager;
import com.intellij.util.Consumer;
import com.intellij.util.PathUtil;
import com.jetbrains.edu.coursecreator.settings.CCSettings;
import com.jetbrains.edu.learning.actions.StudyCheckAction;
import com.jetbrains.edu.learning.builtInServer.EduBuiltInServerNewProjectStep;
import com.jetbrains.edu.learning.core.EduNames;
import com.jetbrains.edu.learning.courseFormat.Course;
import com.jetbrains.edu.learning.courseFormat.tasks.Task;
@@ -144,4 +148,18 @@ public class PyEduPluginConfigurator implements EduPluginConfigurator {
return Collections.singletonList(new File(new File(jarPath, "courses"), COURSE_NAME).getPath());
}
@Override
public boolean createCourseProject(@NotNull Course course, @Nullable Consumer<Project> onCreated) {
ApplicationManager.getApplication().invokeAndWait(() -> {
AbstractNewProjectDialog dlg = new AbstractNewProjectDialog() {
@Override
protected DefaultActionGroup createRootStep() {
return new EduBuiltInServerNewProjectStep(course, onCreated);
}
};
dlg.show();
});
return true;
}
}
python/educational-python/Edu-Python/src/com/jetbrains/edu/learning/builtInServer/BuiltInServerNewProjectStep.java → python/educational-python/Edu-Python/src/com/jetbrains/edu/learning/builtInServer/EduBuiltInServerNewProjectStep.java
+3 -3
View File
@@ -30,9 +30,9 @@ import java.util.ArrayList;
/**
* @author meanmail
*/
public class BuiltInServerNewProjectStep extends PyCharmNewProjectStep {
public BuiltInServerNewProjectStep(@NotNull Course course, @Nullable Consumer<Project> onCreated) {
super(new BuiltInServerNewProjectStep.MyCustomization(course, onCreated));
public class EduBuiltInServerNewProjectStep extends PyCharmNewProjectStep {
public EduBuiltInServerNewProjectStep(@NotNull Course course, @Nullable Consumer<Project> onCreated) {
super(new EduBuiltInServerNewProjectStep.MyCustomization(course, onCreated));
}
protected static class MyCustomization extends PyCharmNewProjectStep.Customization {
python/educational-python/Edu-Python/src/com/jetbrains/edu/learning/builtInServer/EduPythonProjectCreator.java
-50
View File
@@ -1,50 +0,0 @@
/*
* Copyright 2000-2017 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.jetbrains.edu.learning.builtInServer;
import com.intellij.ide.util.projectWizard.AbstractNewProjectDialog;
import com.intellij.openapi.actionSystem.DefaultActionGroup;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.project.Project;
import com.intellij.util.Consumer;
import com.jetbrains.edu.learning.courseFormat.Course;
import com.jetbrains.python.PythonLanguage;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
/**
* @author meanmail
*/
public class EduPythonProjectCreator extends EduProjectCreator {
@Override
public boolean canCreateProject(@NotNull Course course) {
return course.getLanguageById() == PythonLanguage.getInstance();
}
@Override
public boolean createCourseProject(@NotNull Course course, @Nullable Consumer<Project> onCreated) {
ApplicationManager.getApplication().invokeAndWait(() -> {
AbstractNewProjectDialog dlg = new AbstractNewProjectDialog() {
@Override
protected DefaultActionGroup createRootStep() {
return new BuiltInServerNewProjectStep(course, onCreated);
}
};
dlg.show();
});
return true;
}
}