Removed an extension point 'eduProjectCreator'

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
@@ -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"
@@ -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;
}
}
@@ -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 {
@@ -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;
}
}