From 7533953db8c66dfa1c3cafb369a9d78c81048a2d Mon Sep 17 00:00:00 2001 From: Dmitry Avdeev Date: Wed, 31 Oct 2012 14:26:18 +0400 Subject: [PATCH] templates step re-layouted --- .../newProjectWizard/SelectTemplateStep.form | 53 +++++++++---------- .../newProjectWizard/SelectTemplateStep.java | 21 ++++---- .../util/projectWizard/JavaSettingsStep.java | 2 +- .../util/projectWizard/SdkSettingsStep.java | 11 +++- .../openapi/module/JavaModuleType.java | 9 ---- 5 files changed, 46 insertions(+), 50 deletions(-) diff --git a/java/idea-ui/src/com/intellij/ide/util/newProjectWizard/SelectTemplateStep.form b/java/idea-ui/src/com/intellij/ide/util/newProjectWizard/SelectTemplateStep.form index 2165b8970814..fc071c17fc98 100644 --- a/java/idea-ui/src/com/intellij/ide/util/newProjectWizard/SelectTemplateStep.form +++ b/java/idea-ui/src/com/intellij/ide/util/newProjectWizard/SelectTemplateStep.form @@ -1,6 +1,6 @@
- + @@ -10,7 +10,7 @@ - + @@ -37,37 +37,18 @@ - + + - - - - - - - - - - + - - - - - - - - - - - - + @@ -84,14 +65,14 @@ - + - + @@ -106,7 +87,7 @@ - + @@ -168,6 +149,22 @@ + + + + + + + + + + + + + + + + diff --git a/java/idea-ui/src/com/intellij/ide/util/newProjectWizard/SelectTemplateStep.java b/java/idea-ui/src/com/intellij/ide/util/newProjectWizard/SelectTemplateStep.java index ba846191f108..163931be7130 100644 --- a/java/idea-ui/src/com/intellij/ide/util/newProjectWizard/SelectTemplateStep.java +++ b/java/idea-ui/src/com/intellij/ide/util/newProjectWizard/SelectTemplateStep.java @@ -242,18 +242,20 @@ public class SelectTemplateStep extends ModuleWizardStep implements SettingsStep } }); - //if (myTemplatesTree.getModel().getSize() > 0) { - // myTemplatesTree.setSelectedIndex(0); - //} mySearchField.addDocumentListener(new DocumentAdapter() { @Override protected void textChanged(DocumentEvent e) { doFilter(); } }); + myDescriptionPanel.setVisible(false); - mySettingsPanel.setVisible(false); - myExpertPanel.setVisible(false); + if (myWizardContext.isCreatingNewProject()) { + addField("Project \u001bformat:", myFormatPanel.getStorageFormatComboBox(), myModulePanel); + } + +// mySettingsPanel.setVisible(false); +// myExpertPanel.setVisible(false); new AnAction() { @Override @@ -314,11 +316,8 @@ public class SelectTemplateStep extends ModuleWizardStep implements SettingsStep private void setupPanels(@Nullable ProjectTemplate template) { restorePanel(myNamePathComponent, 4); - restorePanel(myModulePanel, 6); + restorePanel(myModulePanel, myWizardContext.isCreatingNewProject() ? 8 : 6); restorePanel(myExpertPanel, myWizardContext.isCreatingNewProject() ? 1 : 0); - if (myWizardContext.isCreatingNewProject()) { - addExpertField("Project \u001bformat:", myFormatPanel.getStorageFormatComboBox()); - } mySettingsStep = myModuleBuilder == null ? null : myModuleBuilder.modifySettingsStep(this); String description = null; @@ -333,8 +332,8 @@ public class SelectTemplateStep extends ModuleWizardStep implements SettingsStep } } - mySettingsPanel.setVisible(template != null); - myExpertPlaceholder.setVisible(template != null && myExpertPanel.getComponentCount() > 0); +// mySettingsPanel.setVisible(template != null); + myExpertPlaceholder.setVisible(myExpertPanel.getComponentCount() > 0); myDescriptionPanel.setVisible(StringUtil.isNotEmpty(description)); mySettingsPanel.revalidate(); diff --git a/java/idea-ui/src/com/intellij/ide/util/projectWizard/JavaSettingsStep.java b/java/idea-ui/src/com/intellij/ide/util/projectWizard/JavaSettingsStep.java index a0d74f2dafa9..696ec24c4898 100644 --- a/java/idea-ui/src/com/intellij/ide/util/projectWizard/JavaSettingsStep.java +++ b/java/idea-ui/src/com/intellij/ide/util/projectWizard/JavaSettingsStep.java @@ -47,7 +47,7 @@ public class JavaSettingsStep extends SdkSettingsStep { private JPanel myPanel; public JavaSettingsStep(SettingsStep settingsStep, ModuleBuilder moduleBuilder, Condition sdkFilter) { - super(settingsStep, sdkFilter); + super(settingsStep, moduleBuilder, sdkFilter); myModuleBuilder = moduleBuilder; if (moduleBuilder instanceof JavaModuleBuilder) { diff --git a/java/idea-ui/src/com/intellij/ide/util/projectWizard/SdkSettingsStep.java b/java/idea-ui/src/com/intellij/ide/util/projectWizard/SdkSettingsStep.java index f43edac46008..601e5198a146 100644 --- a/java/idea-ui/src/com/intellij/ide/util/projectWizard/SdkSettingsStep.java +++ b/java/idea-ui/src/com/intellij/ide/util/projectWizard/SdkSettingsStep.java @@ -19,6 +19,7 @@ import com.intellij.openapi.options.ConfigurationException; import com.intellij.openapi.project.Project; import com.intellij.openapi.projectRoots.Sdk; import com.intellij.openapi.projectRoots.SdkTypeId; +import com.intellij.openapi.roots.ProjectRootManager; import com.intellij.openapi.roots.ui.configuration.JdkComboBox; import com.intellij.openapi.roots.ui.configuration.projectRoot.ProjectSdksModel; import com.intellij.openapi.util.Condition; @@ -35,7 +36,7 @@ public class SdkSettingsStep extends ModuleWizardStep { protected final WizardContext myWizardContext; protected final ProjectSdksModel myModel; - public SdkSettingsStep(SettingsStep settingsStep, Condition sdkFilter) { + public SdkSettingsStep(SettingsStep settingsStep, ModuleBuilder moduleBuilder, Condition sdkFilter) { myWizardContext = settingsStep.getContext(); myModel = new ProjectSdksModel(); @@ -44,6 +45,14 @@ public class SdkSettingsStep extends ModuleWizardStep { myJdkComboBox = new JdkComboBox(myModel, sdkFilter); + if (project != null) { + Sdk sdk = ProjectRootManager.getInstance(project).getProjectSdk(); + if (sdk != null && moduleBuilder.isSuitableSdkType(sdk.getSdkType())) { + // use default project SDK + return; + } + } + JButton button = new JButton("\u001BNew..."); myJdkComboBox.setSetupButton(button, project, myModel, project == null ? new JdkComboBox.NoneJdkComboBoxItem() : new JdkComboBox.ProjectJdkComboBoxItem(), diff --git a/java/java-impl/src/com/intellij/openapi/module/JavaModuleType.java b/java/java-impl/src/com/intellij/openapi/module/JavaModuleType.java index 388cc7fa2fc2..3226588382d4 100644 --- a/java/java-impl/src/com/intellij/openapi/module/JavaModuleType.java +++ b/java/java-impl/src/com/intellij/openapi/module/JavaModuleType.java @@ -105,15 +105,6 @@ public class JavaModuleType extends ModuleType { @Nullable @Override public ModuleWizardStep modifySettingsStep(SettingsStep settingsStep, final ModuleBuilder moduleBuilder) { - Project project = settingsStep.getContext().getProject(); - if (project != null) { - Sdk sdk = ProjectRootManager.getInstance(project).getProjectSdk(); - if (sdk != null && moduleBuilder.isSuitableSdkType(sdk.getSdkType())) { - // use default project SDK -// context.setProjectJdk(sdk); - return null; - } - } return ProjectWizardStepFactory.getInstance().createJavaSettingsStep(settingsStep, moduleBuilder, new Condition() { @Override public boolean value(SdkTypeId sdkType) {