From de53b97d58353f1233c0a7a3cb050fdbe298a93d Mon Sep 17 00:00:00 2001 From: Anton Makeev Date: Tue, 27 May 2008 11:06:17 +0400 Subject: [PATCH] Maven: import options did not take effect (IDEADEV-24749) --- .../maven/project/action/MavenImportBuilder.java | 2 +- .../maven/project/action/MavenImportRootStep.java | 25 ++++++++++++---------- .../idea/maven/repository/MavenIndicesManager.java | 11 ---------- 3 files changed, 15 insertions(+), 23 deletions(-) diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/action/MavenImportBuilder.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/action/MavenImportBuilder.java index d33ed240a0..38a62cd964 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/action/MavenImportBuilder.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/action/MavenImportBuilder.java @@ -26,7 +26,7 @@ import java.util.*; /** * @author Vladislav.Kaznacheev */ -public class MavenImportBuilder extends ProjectImportBuilder implements MavenImportProcessorContext { +public class MavenImportBuilder extends ProjectImportBuilder { private final static Icon ICON = IconLoader.getIcon("/images/mavenEmblem.png"); private Project projectToUpdate; diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/action/MavenImportRootStep.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/action/MavenImportRootStep.java index 2cec4723ad..1f3fd8c828 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/action/MavenImportRootStep.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/action/MavenImportRootStep.java @@ -14,7 +14,6 @@ import org.jetbrains.annotations.Nullable; import org.jetbrains.idea.maven.core.MavenCoreSettings; import org.jetbrains.idea.maven.core.MavenPathsForm; import org.jetbrains.idea.maven.project.ImporterSettingsForm; -import org.jetbrains.idea.maven.project.MavenImportProcessorContext; import org.jetbrains.idea.maven.project.MavenImporterSettings; import org.jetbrains.idea.maven.project.ProjectBundle; @@ -29,7 +28,7 @@ import java.awt.event.MouseEvent; class MavenImportRootStep extends ProjectImportWizardStep { private MavenCoreSettings myCoreSettings; - private MavenImportProcessorContext myImportContext; + private MavenImportBuilder myImportContext; private MavenImporterSettings myImporterSettings; private final JPanel myPanel; @@ -48,20 +47,23 @@ class MavenImportRootStep extends ProjectImportWizardStep { myPanel = new JPanel(new GridBagLayout()); myPanel.setBorder(BorderFactory.createEtchedBorder()); - myRootPathComponent = new NamePathComponent("", ProjectBundle.message("maven.import.label.select.root"), - ProjectBundle.message("maven.import.title.select.root"), "", false); + myRootPathComponent = new NamePathComponent("", + ProjectBundle.message("maven.import.label.select.root"), + ProjectBundle.message("maven.import.title.select.root"), + "", false); + myRootPathComponent.setNameComponentVisible(false); myPanel.add(myRootPathComponent, new GridBagConstraints(0, 0, 1, 1, 1.0, 0.0, GridBagConstraints.NORTHWEST, GridBagConstraints.HORIZONTAL, new Insets(5, 6, 0, 6), 0, 0)); myPanel.add(myImporterSettingsForm.createComponent(), new GridBagConstraints(0, 1, 1, 1, 1.0, 1.0, GridBagConstraints.NORTHWEST, - GridBagConstraints.HORIZONTAL, new Insets(15, 6, 0, 6), - 0, 0)); + GridBagConstraints.HORIZONTAL, new Insets(15, 6, 0, 6), + 0, 0)); JButton advancedButton = new JButton(ProjectBundle.message("maven.advanced.button.name")); myPanel.add(advancedButton, new GridBagConstraints(0, 2, 1, 1, 1.0, 1.0, GridBagConstraints.NORTHEAST, 0, new Insets(15, 6, 0, 6), - 0, 0)); - advancedButton.addMouseListener(new MouseAdapter(){ + 0, 0)); + advancedButton.addMouseListener(new MouseAdapter() { public void mouseClicked(final MouseEvent event) { super.mouseClicked(event); ShowSettingsUtil.getInstance().editConfigurable(myPanel, new MavenPathsConfigurable()); @@ -80,6 +82,7 @@ class MavenImportRootStep extends ProjectImportWizardStep { } public boolean validate() throws ConfigurationException { + updateDataModel(); // needed to make 'exhaustive search' take an effect. return getImportContext().setRootDirectory(myRootPathComponent.getPath()); } @@ -106,15 +109,15 @@ class MavenImportRootStep extends ProjectImportWizardStep { } private MavenCoreSettings getCoreSettings() { - if(myCoreSettings == null){ + if (myCoreSettings == null) { myCoreSettings = ((MavenImportBuilder)getBuilder()).getCoreState(); } return myCoreSettings; } - public MavenImportProcessorContext getImportContext() { + public MavenImportBuilder getImportContext() { if (myImportContext == null) { - myImportContext = (MavenImportProcessorContext)getBuilder(); + myImportContext = (MavenImportBuilder)getBuilder(); } return myImportContext; } diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/repository/MavenIndicesManager.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/repository/MavenIndicesManager.java index 9aa8e923c6..56bf3ae079 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/repository/MavenIndicesManager.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/repository/MavenIndicesManager.java @@ -50,17 +50,6 @@ public class MavenIndicesManager extends DummyProjectComponent { myProject = p; } - public void initComponent() { - //StartupManager.getInstance(myProject).registerPostStartupActivity(new Runnable() { - // public void run() { - // if (ApplicationManager.getApplication().isUnitTestMode()) return; - // if (!MavenProjectsManager.getInstance(myProject).isMavenProject()) return; - // - // doInit(); - // } - //}); - } - public void doInit() { isInitialized = true; -- 2.11.4.GIT