diff --git a/java/compiler/impl/src/com/intellij/compiler/impl/CompileDriver.java b/java/compiler/impl/src/com/intellij/compiler/impl/CompileDriver.java index 2d80ce876b65..175e565492ac 100644 --- a/java/compiler/impl/src/com/intellij/compiler/impl/CompileDriver.java +++ b/java/compiler/impl/src/com/intellij/compiler/impl/CompileDriver.java @@ -2485,7 +2485,7 @@ public class CompileDriver { } private void showConfigurationDialog(String moduleNameToSelect, String tabNameToSelect) { - ProjectSettingsService.getInstance(myProject).showModuleConfigurationDialog(moduleNameToSelect, tabNameToSelect, false); + ProjectSettingsService.getInstance(myProject).showModuleConfigurationDialog(moduleNameToSelect, tabNameToSelect); } private static VirtualFile lookupVFile(final LocalFileSystem lfs, final String path) { diff --git a/java/idea-ui/src/com/intellij/ide/actions/ShowModulePropertiesAction.java b/java/idea-ui/src/com/intellij/ide/actions/ShowModulePropertiesAction.java index 1fa86ffb55f9..2fc6d6f371da 100644 --- a/java/idea-ui/src/com/intellij/ide/actions/ShowModulePropertiesAction.java +++ b/java/idea-ui/src/com/intellij/ide/actions/ShowModulePropertiesAction.java @@ -36,7 +36,7 @@ public class ShowModulePropertiesAction extends AnAction{ if (module == null) { return; } - ModulesConfigurator.showDialog(project, module.getName(), null, false); + ModulesConfigurator.showDialog(project, module.getName(), null); } public void update(AnActionEvent e) { diff --git a/java/idea-ui/src/com/intellij/ide/impl/NewProjectUtil.java b/java/idea-ui/src/com/intellij/ide/impl/NewProjectUtil.java index 6752d00cd87d..139aecd99e6d 100644 --- a/java/idea-ui/src/com/intellij/ide/impl/NewProjectUtil.java +++ b/java/idea-ui/src/com/intellij/ide/impl/NewProjectUtil.java @@ -149,7 +149,7 @@ public class NewProjectUtil { public void run() { if (newProject.isDisposed()) return; if (need2OpenProjectStructure) { - ModulesConfigurator.showDialog(newProject, null, null, true); + ModulesConfigurator.showDialog(newProject, null, null); } ApplicationManager.getApplication().invokeLater(new Runnable() { public void run() { diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/IdeaProjectSettingsService.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/IdeaProjectSettingsService.java index b9fa3e13e628..0add5019ade1 100644 --- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/IdeaProjectSettingsService.java +++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/IdeaProjectSettingsService.java @@ -53,7 +53,7 @@ public class IdeaProjectSettingsService extends ProjectSettingsService { } public void openModuleSettings(final Module module) { - ModulesConfigurator.showDialog(myProject, module.getName(), null, false); + ModulesConfigurator.showDialog(myProject, module.getName(), null); } @Override @@ -62,7 +62,7 @@ public class IdeaProjectSettingsService extends ProjectSettingsService { } public void openModuleLibrarySettings(final Module module) { - ModulesConfigurator.showDialog(myProject, module.getName(), ClasspathEditor.NAME, false); + ModulesConfigurator.showDialog(myProject, module.getName(), ClasspathEditor.NAME); } @Override @@ -71,7 +71,7 @@ public class IdeaProjectSettingsService extends ProjectSettingsService { } public void openContentEntriesSettings(final Module module) { - ModulesConfigurator.showDialog(myProject, module.getName(), ContentEntriesEditor.NAME, false); + ModulesConfigurator.showDialog(myProject, module.getName(), ContentEntriesEditor.NAME); } @Override @@ -122,8 +122,8 @@ public class IdeaProjectSettingsService extends ProjectSettingsService { } @Override - public void showModuleConfigurationDialog(String moduleToSelect, String editorNameToSelect, boolean showModuleWizard) { - ModulesConfigurator.showDialog(myProject, moduleToSelect, editorNameToSelect, showModuleWizard); + public void showModuleConfigurationDialog(String moduleToSelect, String editorNameToSelect) { + ModulesConfigurator.showDialog(myProject, moduleToSelect, editorNameToSelect); } @Override diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ModulesConfigurator.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ModulesConfigurator.java index dc741b1c4fa4..e917795b7827 100644 --- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ModulesConfigurator.java +++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ModulesConfigurator.java @@ -56,7 +56,6 @@ import com.intellij.util.graph.GraphGenerator; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import javax.swing.*; import java.awt.*; import java.util.*; import java.util.List; @@ -120,10 +119,6 @@ public class ModulesConfigurator implements ModulesProvider, ModuleEditor.Change } - public ProjectConfigurable getModulesConfigurable() { - return myProjectConfigurable; - } - @NotNull public Module[] getModules() { return myModuleModel.getModules(); @@ -546,24 +541,11 @@ public class ModulesConfigurator implements ModulesProvider, ModuleEditor.Change }); } - public static boolean showDialog(Project project, - @Nullable final String moduleToSelect, - @Nullable final String editorNameToSelect, - final boolean showModuleWizard) { + public static boolean showDialog(Project project, @Nullable final String moduleToSelect, @Nullable final String editorNameToSelect) { final ProjectStructureConfigurable config = ProjectStructureConfigurable.getInstance(project); return ShowSettingsUtil.getInstance().editConfigurable(project, config, new Runnable() { public void run() { - final ModuleStructureConfigurable modulesConfig = config.getModulesConfig(); - config.select(moduleToSelect, editorNameToSelect, true).doWhenDone(new Runnable() { - public void run() { - modulesConfig.setStartModuleWizard(showModuleWizard); - SwingUtilities.invokeLater(new Runnable() { - public void run() { - modulesConfig.setStartModuleWizard(false); - } - }); - } - }); + config.select(moduleToSelect, editorNameToSelect, true); } }); } diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ProjectConfigurable.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ProjectConfigurable.java index 02db17388b9c..a6375ac57e35 100644 --- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ProjectConfigurable.java +++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ProjectConfigurable.java @@ -53,8 +53,6 @@ import org.jetbrains.annotations.Nullable; import javax.swing.*; import javax.swing.event.DocumentEvent; import java.awt.*; -import java.awt.event.WindowAdapter; -import java.awt.event.WindowEvent; import java.io.IOException; import java.util.Collection; import java.util.Set; @@ -77,7 +75,7 @@ public class ProjectConfigurable extends NamedConfigurable implements D private JTextField myProjectName; - private MyJPanel myPanel; + private JPanel myPanel; private final Alarm myUpdateWarningAlarm = new Alarm(Alarm.ThreadToUse.SHARED_THREAD); @@ -95,7 +93,6 @@ public class ProjectConfigurable extends NamedConfigurable implements D init(model); } - public DetailsComponent getDetailsComponent() { return myDetailsComponent; } @@ -111,7 +108,7 @@ public class ProjectConfigurable extends NamedConfigurable implements D } private void init(final ProjectSdksModel model) { - myPanel = new MyJPanel(); + myPanel = new JPanel(new GridBagLayout()); myPanel.setPreferredSize(new Dimension(700, 500)); if (((ProjectEx)myProject).getStateStore().getStorageScheme().equals(StorageScheme.DIRECTORY_BASED)) { @@ -333,10 +330,6 @@ public class ProjectConfigurable extends NamedConfigurable implements D FileChooserFactory.getInstance().installFileCompletion(myProjectCompilerOutput.getTextField(), outputPathsChooserDescriptor, true, null); } - public void setStartModuleWizardOnShow(final boolean show) { - myStartModuleWizardOnShow = show; - } - public String getCompilerOutputUrl() { return VfsUtil.pathToUrl(myProjectCompilerOutput.getText().trim()); } @@ -354,29 +347,4 @@ public class ProjectConfigurable extends NamedConfigurable implements D public void navigate() { } } - - private class MyJPanel extends JPanel { - public MyJPanel() { - super(new GridBagLayout()); - } - - public void addNotify() { - super.addNotify(); - if (myStartModuleWizardOnShow) { - final Window parentWindow = (Window)SwingUtilities.getAncestorOfClass(Window.class, this); - parentWindow.addWindowListener(new WindowAdapter() { - public void windowActivated(WindowEvent e) { - parentWindow.removeWindowListener(this); - SwingUtilities.invokeLater(new Runnable() { - public void run() { - myModulesConfigurator.addModule(parentWindow); - } - }); - } - }); - } - } - } - - } diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/actions/NewModuleAction.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/actions/NewModuleAction.java index a5d578396ebb..399936aa4591 100644 --- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/actions/NewModuleAction.java +++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/actions/NewModuleAction.java @@ -20,7 +20,6 @@ import com.intellij.ide.util.projectWizard.ModuleBuilder; import com.intellij.ide.util.projectWizard.ProjectBuilder; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; -import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.module.Module; import com.intellij.openapi.project.Project; import com.intellij.openapi.project.ProjectBundle; @@ -72,7 +71,7 @@ public class NewModuleAction extends AnAction implements DumbAware { else { builder.commit(project, null, ModulesProvider.EMPTY_MODULES_PROVIDER); if (builder.isOpenProjectSettingsAfter()) { - ModulesConfigurator.showDialog(project, null, null, true); + ModulesConfigurator.showDialog(project, null, null); } } } diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/ModuleStructureConfigurable.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/ModuleStructureConfigurable.java index ed2718706a4a..0de234e8d764 100644 --- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/ModuleStructureConfigurable.java +++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/ModuleStructureConfigurable.java @@ -420,10 +420,6 @@ public class ModuleStructureConfigurable extends BaseStructureConfigurable imple return ServiceManager.getService(project, ModuleStructureConfigurable.class); } - public void setStartModuleWizard(final boolean show) { - myContext.myModulesConfigurator.getModulesConfigurable().setStartModuleWizardOnShow(show); - } - public Project getProject() { return myProject; } diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ShowModulePropertiesFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ShowModulePropertiesFix.java index ea7aabda768f..3e777adde43a 100644 --- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ShowModulePropertiesFix.java +++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ShowModulePropertiesFix.java @@ -57,7 +57,7 @@ public class ShowModulePropertiesFix implements IntentionAction { } public void invoke(@NotNull final Project project, final Editor editor, final PsiFile file) throws IncorrectOperationException { - ProjectSettingsService.getInstance(project).showModuleConfigurationDialog(myModuleName, null, false); + ProjectSettingsService.getInstance(project).showModuleConfigurationDialog(myModuleName, null); } public boolean startInWriteAction() { diff --git a/java/java-impl/src/com/intellij/codeInspection/inconsistentLanguageLevel/InconsistentLanguageLevelInspection.java b/java/java-impl/src/com/intellij/codeInspection/inconsistentLanguageLevel/InconsistentLanguageLevelInspection.java index d0281792b077..110453f7fa51 100644 --- a/java/java-impl/src/com/intellij/codeInspection/inconsistentLanguageLevel/InconsistentLanguageLevelInspection.java +++ b/java/java-impl/src/com/intellij/codeInspection/inconsistentLanguageLevel/InconsistentLanguageLevelInspection.java @@ -135,7 +135,7 @@ public class InconsistentLanguageLevelInspection extends DescriptorProviderInspe public void applyFix(@NotNull Project project, @NotNull CommonProblemDescriptor descriptor) { if (!myModule.isDisposed()) { - ProjectSettingsService.getInstance(project).showModuleConfigurationDialog(myModule.getName(), ProjectBundle.message("modules.classpath.title"), false); + ProjectSettingsService.getInstance(project).showModuleConfigurationDialog(myModule.getName(), ProjectBundle.message("modules.classpath.title")); } } } diff --git a/java/java-impl/src/com/intellij/ide/util/PackageUtil.java b/java/java-impl/src/com/intellij/ide/util/PackageUtil.java index fdf5779f612d..04eacb052a1a 100644 --- a/java/java-impl/src/com/intellij/ide/util/PackageUtil.java +++ b/java/java-impl/src/com/intellij/ide/util/PackageUtil.java @@ -361,7 +361,7 @@ public class PackageUtil { ProjectBundle.message("module.source.roots.not.configured.title") ); - ProjectSettingsService.getInstance(module.getProject()).showModuleConfigurationDialog(module.getName(), CommonContentEntriesEditor.NAME, false); + ProjectSettingsService.getInstance(module.getProject()).showModuleConfigurationDialog(module.getName(), CommonContentEntriesEditor.NAME); sourceRoots = ModuleRootManager.getInstance(module).getSourceRoots(); if (sourceRoots.length == 0) { diff --git a/platform/lang-impl/src/com/intellij/ide/util/PlatformPackageUtil.java b/platform/lang-impl/src/com/intellij/ide/util/PlatformPackageUtil.java index 4d152236e64a..e0a9f80fd90a 100644 --- a/platform/lang-impl/src/com/intellij/ide/util/PlatformPackageUtil.java +++ b/platform/lang-impl/src/com/intellij/ide/util/PlatformPackageUtil.java @@ -226,7 +226,7 @@ public class PlatformPackageUtil { ); ProjectSettingsService - .getInstance(module.getProject()).showModuleConfigurationDialog(module.getName(), CommonContentEntriesEditor.NAME, false); + .getInstance(module.getProject()).showModuleConfigurationDialog(module.getName(), CommonContentEntriesEditor.NAME); sourceRoots = ModuleRootManager.getInstance(module).getSourceRoots(); if (sourceRoots.length == 0) { diff --git a/platform/lang-impl/src/com/intellij/openapi/roots/ui/configuration/ProjectSettingsService.java b/platform/lang-impl/src/com/intellij/openapi/roots/ui/configuration/ProjectSettingsService.java index 4f37adf0e93d..5c016d814afd 100644 --- a/platform/lang-impl/src/com/intellij/openapi/roots/ui/configuration/ProjectSettingsService.java +++ b/platform/lang-impl/src/com/intellij/openapi/roots/ui/configuration/ProjectSettingsService.java @@ -101,7 +101,7 @@ public class ProjectSettingsService { return false; } - public void showModuleConfigurationDialog(@Nullable String moduleToSelect, @Nullable String editorNameToSelect, boolean showModuleWizard) { + public void showModuleConfigurationDialog(@Nullable String moduleToSelect, @Nullable String editorNameToSelect) { } public Sdk chooseAndSetSdk() { diff --git a/plugins/android/src/org/jetbrains/android/run/AndroidRunConfigurationBase.java b/plugins/android/src/org/jetbrains/android/run/AndroidRunConfigurationBase.java index 66e4d392859b..56136741b4ee 100644 --- a/plugins/android/src/org/jetbrains/android/run/AndroidRunConfigurationBase.java +++ b/plugins/android/src/org/jetbrains/android/run/AndroidRunConfigurationBase.java @@ -194,7 +194,7 @@ public abstract class AndroidRunConfigurationBase extends ModuleBasedConfigurati AndroidPlatform platform = configuration.getAndroidPlatform(); if (platform == null) { Messages.showErrorDialog(project, AndroidBundle.message("specify.platform.error"), CommonBundle.getErrorTitle()); - ModulesConfigurator.showDialog(project, module.getName(), ClasspathEditor.NAME, false); + ModulesConfigurator.showDialog(project, module.getName(), ClasspathEditor.NAME); return null; } diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/compiler/GroovyCompiler.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/compiler/GroovyCompiler.java index 6bb55ed4d9a4..f14e3235c09d 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/compiler/GroovyCompiler.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/compiler/GroovyCompiler.java @@ -228,7 +228,7 @@ public class GroovyCompiler extends GroovyCompilerBase { if (!GroovyConfigUtils.getInstance().tryToSetUpGroovyFacetOntheFly(module)) { Messages.showErrorDialog(myProject, GroovyBundle.message("cannot.compile.groovy.files.no.facet", module.getName()), GroovyBundle.message("cannot.compile")); - ModulesConfigurator.showDialog(module.getProject(), module.getName(), ClasspathEditor.NAME, false); + ModulesConfigurator.showDialog(module.getProject(), module.getName(), ClasspathEditor.NAME); return false; } } diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/mvc/MvcFramework.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/mvc/MvcFramework.java index fbb88357f998..ae7c7d2cb475 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/mvc/MvcFramework.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/mvc/MvcFramework.java @@ -123,7 +123,7 @@ public abstract class MvcFramework { "Error", Messages.getErrorIcon()) == 1) { return; } - ProjectSettingsService.getInstance(module.getProject()).showModuleConfigurationDialog(module.getName(), ClasspathEditor.NAME, false); + ProjectSettingsService.getInstance(module.getProject()).showModuleConfigurationDialog(module.getName(), ClasspathEditor.NAME); } module.putUserData(CREATE_APP_STRUCTURE, null); final int result = Messages.showYesNoCancelDialog(module.getProject(), diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/runner/DefaultGroovyScriptRunner.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/runner/DefaultGroovyScriptRunner.java index 8b6ffc9f484f..5180322e86d9 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/runner/DefaultGroovyScriptRunner.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/runner/DefaultGroovyScriptRunner.java @@ -54,7 +54,7 @@ public class DefaultGroovyScriptRunner extends GroovyScriptRunner { if (LibrariesUtil.getGroovyHomePath(module) == null) { ExecutionUtil.handleExecutionError(project, executor.getToolWindowId(), profile, new ExecutionException("Groovy is not configured")); - ModulesConfigurator.showDialog(module.getProject(), module.getName(), ClasspathEditor.NAME, false); + ModulesConfigurator.showDialog(module.getProject(), module.getName(), ClasspathEditor.NAME); return false; }