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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Alexey Kudravtsev
2013-10-22 12:37:15 +04:00
parent 6fab344369 86ad4d8cee
commit b764706f56
3 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/openapi/module/JavaModuleType.java
+1 -1
View File
@@ -94,7 +94,7 @@ public class JavaModuleType extends ModuleType<JavaModuleBuilder> {
}
}
final ModuleWizardStep[] wizardSteps = steps.toArray(new ModuleWizardStep[steps.size()]);
return ArrayUtil.mergeArrays(wizardSteps, super.createWizardSteps(wizardContext, moduleBuilder, modulesProvider));
return ArrayUtil.mergeArrays(wizardSteps, super.createWizardSteps(wizardContext, moduleBuilder, modulesProvider, forNewWizard));
}
@Nullable
java/openapi/src/com/intellij/ide/util/projectWizard/JavaModuleBuilder.java
+5 -1
View File
@@ -92,7 +92,11 @@ public class JavaModuleBuilder extends ModuleBuilder implements SourcePathsBuild
@Override
public ModuleWizardStep[] createWizardSteps(@NotNull WizardContext wizardContext, @NotNull ModulesProvider modulesProvider, boolean forNewWizard) {
return forNewWizard ? ModuleWizardStep.EMPTY_ARRAY : super.createWizardSteps(wizardContext, modulesProvider);
if (forNewWizard) return ModuleWizardStep.EMPTY_ARRAY;
ModuleType moduleType = getModuleType();
return moduleType == null
? ModuleWizardStep.EMPTY_ARRAY
: moduleType.createWizardSteps(wizardContext, this, modulesProvider, false);
}
public void setupRootModel(ModifiableRootModel rootModel) throws ConfigurationException {
platform/lang-api/src/com/intellij/openapi/module/ModuleType.java
+2 -2
View File
@@ -58,11 +58,11 @@ public abstract class ModuleType<T extends ModuleBuilder> {
@NotNull
public ModuleWizardStep[] createWizardSteps(@NotNull WizardContext wizardContext, @NotNull T moduleBuilder, @NotNull ModulesProvider modulesProvider) {
return ModuleWizardStep.EMPTY_ARRAY;
return createWizardSteps(wizardContext, moduleBuilder, modulesProvider, false);
}
public ModuleWizardStep[] createWizardSteps(@NotNull WizardContext wizardContext, @NotNull T moduleBuilder, @NotNull ModulesProvider modulesProvider, boolean forNewWizard) {
return createWizardSteps(wizardContext, moduleBuilder, modulesProvider);
return ModuleWizardStep.EMPTY_ARRAY;
}
@Nullable