diff options
Diffstat (limited to 'java/idea-ui/src/com/intellij/ide')
8 files changed, 14 insertions, 32 deletions
diff --git a/java/idea-ui/src/com/intellij/ide/palette/impl/PaletteGroupHeader.java b/java/idea-ui/src/com/intellij/ide/palette/impl/PaletteGroupHeader.java index 72f197fa38b8..c98caefa3f75 100644 --- a/java/idea-ui/src/com/intellij/ide/palette/impl/PaletteGroupHeader.java +++ b/java/idea-ui/src/com/intellij/ide/palette/impl/PaletteGroupHeader.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2009 JetBrains s.r.o. + * Copyright 2000-2013 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -159,7 +159,7 @@ public class PaletteGroupHeader extends JCheckBox implements DataProvider { @Nullable public Object getData(String dataId) { Object data = myPaletteWindow.getData(dataId); if (data != null) return data; - Project project = PlatformDataKeys.PROJECT.getData(myPaletteWindow); + Project project = CommonDataKeys.PROJECT.getData(myPaletteWindow); return myGroup.getData(project, dataId); } diff --git a/java/idea-ui/src/com/intellij/ide/projectWizard/NewProjectWizard.java b/java/idea-ui/src/com/intellij/ide/projectWizard/NewProjectWizard.java index 5ecda308c122..290d3cd65f8f 100644 --- a/java/idea-ui/src/com/intellij/ide/projectWizard/NewProjectWizard.java +++ b/java/idea-ui/src/com/intellij/ide/projectWizard/NewProjectWizard.java @@ -35,6 +35,7 @@ public class NewProjectWizard extends AbstractProjectWizard { super("New Project", project, defaultPath); // addStep(); // addStep(new ProjectSummaryStep(myWizardContext)); + myWizardContext.setNewWizard(true); mySequence = new StepSequence(); mySequence.addCommonStep(new ProjectTypeStep(myWizardContext, this, modulesProvider)); mySequence.addCommonFinishingStep(new ProjectSettingsStep(myWizardContext), null); diff --git a/java/idea-ui/src/com/intellij/ide/projectWizard/ProjectTypeStep.java b/java/idea-ui/src/com/intellij/ide/projectWizard/ProjectTypeStep.java index 2003d991dc64..3efa81829db1 100644 --- a/java/idea-ui/src/com/intellij/ide/projectWizard/ProjectTypeStep.java +++ b/java/idea-ui/src/com/intellij/ide/projectWizard/ProjectTypeStep.java @@ -141,7 +141,7 @@ public class ProjectTypeStep extends ModuleWizardStep { }); for (ProjectCategory category : map.values()) { - myWizard.getSequence().addStepsForBuilder(myBuilders.get(category), context, modulesProvider, true); + myWizard.getSequence().addStepsForBuilder(myBuilders.get(category), context, modulesProvider); } myFrameworksPanel = new AddSupportForFrameworksPanel(Collections.<FrameworkSupportInModuleProvider>emptyList(), model, true); @@ -218,7 +218,7 @@ public class ProjectTypeStep extends ModuleWizardStep { public void updateDataModel() { ModuleBuilder builder = getSelectedBuilder(); assert builder != null; - myWizard.getSequence().addStepsForBuilder(builder, myContext, myModulesProvider, true); + myWizard.getSequence().addStepsForBuilder(builder, myContext, myModulesProvider); } @Override 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 51296b6f41ac..e1d46ea35e30 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 @@ -43,7 +43,6 @@ import com.intellij.ui.HideableDecorator; import com.intellij.ui.IdeBorderFactory; import com.intellij.ui.components.JBLabel; import com.intellij.ui.components.JBList; -import com.intellij.util.containers.FactoryMap; import com.intellij.util.containers.MultiMap; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -94,13 +93,6 @@ public class SelectTemplateStep extends ModuleWizardStep implements SettingsStep private final StepSequence mySequence; @Nullable private ModuleWizardStep mySettingsStep; - private FactoryMap<String, ModuleWizardStep> mySettingsSteps = new FactoryMap<String, ModuleWizardStep>() { - @Nullable - @Override - protected ModuleWizardStep create(String key) { - return myModuleBuilder.modifySettingsStep(SelectTemplateStep.this); - } - }; private final ProjectTypesList myList; @@ -160,9 +152,6 @@ public class SelectTemplateStep extends ModuleWizardStep implements SettingsStep @Override public void disposeUIResources() { Disposer.dispose(myList); - for (ModuleWizardStep step : mySettingsSteps.values()) { - step.disposeUIResources(); - } } @Override @@ -184,7 +173,9 @@ public class SelectTemplateStep extends ModuleWizardStep implements SettingsStep restorePanel(myNamePathComponent, 4); restorePanel(myModulePanel, myWizardContext.isCreatingNewProject() ? 8 : 6); restorePanel(myExpertPanel, myWizardContext.isCreatingNewProject() ? 1 : 0); - createSettingsStep(); + + if (mySettingsStep != null) mySettingsStep.disposeUIResources(); + mySettingsStep = myModuleBuilder == null ? null : myModuleBuilder.modifySettingsStep(this); String description = null; if (template != null) { @@ -208,15 +199,6 @@ public class SelectTemplateStep extends ModuleWizardStep implements SettingsStep mySettingsPanel.repaint(); } - private void createSettingsStep() { - if (myModuleBuilder == null) { - mySettingsStep = null; - } - else { - mySettingsStep = mySettingsSteps.get(myModuleBuilder.getBuilderId()); - } - } - private static int restorePanel(JPanel component, int i) { int removed = 0; while (component.getComponentCount() > i) { diff --git a/java/idea-ui/src/com/intellij/ide/util/newProjectWizard/StepSequence.java b/java/idea-ui/src/com/intellij/ide/util/newProjectWizard/StepSequence.java index bbc9b21769f2..866bc7701394 100644 --- a/java/idea-ui/src/com/intellij/ide/util/newProjectWizard/StepSequence.java +++ b/java/idea-ui/src/com/intellij/ide/util/newProjectWizard/StepSequence.java @@ -55,11 +55,10 @@ public class StepSequence { public void addStepsForBuilder(@NotNull AbstractModuleBuilder builder, @NotNull WizardContext wizardContext, - @NotNull ModulesProvider modulesProvider, - boolean forNewWizard) { + @NotNull ModulesProvider modulesProvider) { String id = builder.getBuilderId(); if (!mySpecificSteps.containsKey(id)) { - mySpecificSteps.put(id, Arrays.asList(builder.createWizardSteps(wizardContext, modulesProvider, forNewWizard))); + mySpecificSteps.put(id, Arrays.asList(builder.createWizardSteps(wizardContext, modulesProvider))); } } diff --git a/java/idea-ui/src/com/intellij/ide/util/newProjectWizard/modes/CreateFromScratchMode.java b/java/idea-ui/src/com/intellij/ide/util/newProjectWizard/modes/CreateFromScratchMode.java index bb631ec75ede..bc10c316e6d7 100644 --- a/java/idea-ui/src/com/intellij/ide/util/newProjectWizard/modes/CreateFromScratchMode.java +++ b/java/idea-ui/src/com/intellij/ide/util/newProjectWizard/modes/CreateFromScratchMode.java @@ -63,7 +63,7 @@ public class CreateFromScratchMode extends WizardMode { StepSequence sequence = new StepSequence(); for (ModuleBuilder builder : builders) { - sequence.addStepsForBuilder(builder, context, modulesProvider, false); + sequence.addStepsForBuilder(builder, context, modulesProvider); } return sequence; } diff --git a/java/idea-ui/src/com/intellij/ide/util/newProjectWizard/modes/CreateFromTemplateMode.java b/java/idea-ui/src/com/intellij/ide/util/newProjectWizard/modes/CreateFromTemplateMode.java index acac1865a5aa..898e6243f7a5 100644 --- a/java/idea-ui/src/com/intellij/ide/util/newProjectWizard/modes/CreateFromTemplateMode.java +++ b/java/idea-ui/src/com/intellij/ide/util/newProjectWizard/modes/CreateFromTemplateMode.java @@ -108,7 +108,7 @@ public class CreateFromTemplateMode extends WizardMode { MultiMap<TemplatesGroup, ProjectTemplate> map = getTemplatesMap(context, true); StepSequence sequence = new StepSequence(); for (ProjectTemplate template : map.values()) { - sequence.addStepsForBuilder(template.createModuleBuilder(), context, modulesProvider, false); + sequence.addStepsForBuilder(template.createModuleBuilder(), context, modulesProvider); } mySelectTemplateStep = new SelectTemplateStep(context, sequence, map); sequence.addCommonStep(mySelectTemplateStep); diff --git a/java/idea-ui/src/com/intellij/ide/util/projectWizard/AbstractStepWithProgress.java b/java/idea-ui/src/com/intellij/ide/util/projectWizard/AbstractStepWithProgress.java index f1c4b5f146fc..1068a14f7331 100644 --- a/java/idea-ui/src/com/intellij/ide/util/projectWizard/AbstractStepWithProgress.java +++ b/java/idea-ui/src/com/intellij/ide/util/projectWizard/AbstractStepWithProgress.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2009 JetBrains s.r.o. + * Copyright 2000-2013 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -178,7 +178,7 @@ public abstract class AbstractStepWithProgress<Result> extends ModuleWizardStep if (isProgressRunning()) { final int answer = Messages.showOkCancelDialog(getComponent(), myPromptStopSearch, IdeBundle.message("title.question"), IdeBundle.message("action.continue.searching"), IdeBundle.message("action.stop.searching"), Messages.getWarningIcon()); - if (answer == 1) { // terminate + if (answer != Messages.OK) { // terminate cancelSearch(); } return false; |