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

don't wrap actions in extra group for new welcome screen

Browse Source
This commit is contained in:
Konstantin Bulenkov
2014-11-23 13:25:35 +01:00
parent 7c37f33437
commit ed4401b6f8
1 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/ide/src/com/jetbrains/python/newProject/actions/PyCharmNewProjectStep.java
+19 -4
View File
@@ -43,7 +43,11 @@ public class PyCharmNewProjectStep extends DefaultActionGroup implements DumbAwa
final NullableConsumer<AbstractProjectSettingsStep> callback = new GenerateProjectCallback(runnable);
final ProjectSpecificAction action = new ProjectSpecificAction(callback, new PythonBaseProjectGenerator(), isWelcomeScreen);
add(action);
if (isWelcomeScreen) {
addAll(action.getChildren(null));
} else {
add(action);
}
final DirectoryProjectGenerator[] generators = Extensions.getExtensions(DirectoryProjectGenerator.EP_NAME);
if (generators.length == 0) {
@@ -60,14 +64,25 @@ public class PyCharmNewProjectStep extends DefaultActionGroup implements DumbAwa
List<DirectoryProjectGenerator> pluginSpecificGenerators = Lists.newArrayList();
for (DirectoryProjectGenerator generator : generators) {
if (generator instanceof PythonProjectGenerator)
add(new ProjectSpecificAction(callback, generator, isWelcomeScreen));
if (generator instanceof PythonProjectGenerator) {
ProjectSpecificAction group = new ProjectSpecificAction(callback, generator, isWelcomeScreen);
if (isWelcomeScreen) {
addAll(group.getChildren(null));
} else {
add(group);
}
}
else
pluginSpecificGenerators.add(generator);
}
if (!pluginSpecificGenerators.isEmpty()) {
add(new PluginSpecificProjectsStep(callback, pluginSpecificGenerators, isWelcomeScreen));
PluginSpecificProjectsStep step = new PluginSpecificProjectsStep(callback, pluginSpecificGenerators, isWelcomeScreen);
if (isWelcomeScreen){
addAll(step.getChildren(null));
} else {
add(step);
}
}
}