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

do not show frameworks twice

Browse Source
This commit is contained in:
Dmitry Avdeev
2013-10-21 15:43:09 +04:00
parent 97fb00a79d
commit 831c2302db
3 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/idea-ui/src/com/intellij/ide/projectWizard/ProjectTypeStep.java
+1 -1
View File
@@ -141,7 +141,7 @@ public class ProjectTypeStep extends ModuleWizardStep {
});
for (ProjectCategory category : map.values()) {
myWizard.getSequence().addStepsForBuilder(myBuilders.get(category), context, modulesProvider, false);
myWizard.getSequence().addStepsForBuilder(myBuilders.get(category), context, modulesProvider, true);
}
myFrameworksPanel = new AddSupportForFrameworksPanel(Collections.<FrameworkSupportInModuleProvider>emptyList(), model, true);
java/java-impl/src/com/intellij/openapi/module/JavaModuleType.java
+6 -4
View File
@@ -84,12 +84,14 @@ public class JavaModuleType extends ModuleType<JavaModuleBuilder> {
@NotNull
@Override
public ModuleWizardStep[] createWizardSteps(@NotNull final WizardContext wizardContext, @NotNull final JavaModuleBuilder moduleBuilder,
@NotNull final ModulesProvider modulesProvider) {
@NotNull final ModulesProvider modulesProvider, boolean forNewWizard) {
final ProjectWizardStepFactory wizardFactory = ProjectWizardStepFactory.getInstance();
ArrayList<ModuleWizardStep> steps = new ArrayList<ModuleWizardStep>();
final ModuleWizardStep supportForFrameworksStep = wizardFactory.createSupportForFrameworksStep(wizardContext, moduleBuilder, modulesProvider);
if (supportForFrameworksStep != null) {
steps.add(supportForFrameworksStep);
if (!forNewWizard) {
final ModuleWizardStep supportForFrameworksStep = wizardFactory.createSupportForFrameworksStep(wizardContext, moduleBuilder, modulesProvider);
if (supportForFrameworksStep != null) {
steps.add(supportForFrameworksStep);
}
}
final ModuleWizardStep[] wizardSteps = steps.toArray(new ModuleWizardStep[steps.size()]);
return ArrayUtil.mergeArrays(wizardSteps, super.createWizardSteps(wizardContext, moduleBuilder, modulesProvider));
platform/lang-api/src/com/intellij/openapi/module/ModuleType.java
+4
View File
@@ -61,6 +61,10 @@ public abstract class ModuleType<T extends ModuleBuilder> {
return ModuleWizardStep.EMPTY_ARRAY;
}
public ModuleWizardStep[] createWizardSteps(@NotNull WizardContext wizardContext, @NotNull T moduleBuilder, @NotNull ModulesProvider modulesProvider, boolean forNewWizard) {
return createWizardSteps(wizardContext, moduleBuilder, modulesProvider);
}
@Nullable
public ModuleWizardStep modifySettingsStep(@NotNull SettingsStep settingsStep, @NotNull ModuleBuilder moduleBuilder) {
return null;