From 35c0d3bc98194d1fc1d42059a333d1279f831148 Mon Sep 17 00:00:00 2001 From: Anton Makeev Date: Fri, 17 Oct 2008 11:33:14 +0400 Subject: [PATCH] Maven: new settings --- .../idea/maven/embedder/CustomArtifact.java | 2 +- .../idea/maven/embedder/MavenConsoleImpl.java | 6 +- .../idea/maven/embedder/MavenEmbedderFactory.java | 14 +- .../idea/maven/embedder/MavenEmbedderWrapper.java | 2 +- .../idea/maven/events/MavenEventsManager.java | 2 +- .../idea/maven/events/MavenKeymapExtension.java | 2 +- .../maven/events/actions/AssignShortcutAction.java | 2 +- .../maven/indices/MavenArtifactSearchPanel.java | 2 +- .../jetbrains/idea/maven/indices/MavenIndex.java | 2 +- .../jetbrains/idea/maven/indices/MavenIndices.java | 2 +- .../idea/maven/indices/MavenIndicesManager.java | 10 +- .../maven/indices/MavenProjectIndicesManager.java | 8 - .../idea/maven/navigator/MavenNavigatorPanel.java | 2 +- .../maven/project/MavenArtifactDownloader.java | 10 +- .../MavenEnvironmentForm.form} | 2 +- .../MavenEnvironmentForm.java} | 20 +- .../maven/project/MavenFoldersConfigurator.java | 10 +- .../MavenGeneralConfigurable.form} | 4 +- .../MavenGeneralConfigurable.java} | 41 ++-- .../MavenGeneralSettings.java} | 10 +- .../maven/project/MavenImportSettingsForm.form | 108 ---------- ...urable.java => MavenImportingConfigurable.java} | 18 +- ...rtSettings.java => MavenImportingSettings.java} | 8 +- .../maven/project/MavenImportingSettingsForm.form | 98 +++++++++ ...gsForm.java => MavenImportingSettingsForm.java} | 14 +- .../maven/project/MavenModuleConfigurator.java | 5 +- .../maven/project/MavenProjectConfigurator.java | 23 +- .../idea/maven/project/MavenProjectsTree.java | 35 ++- .../idea/maven/project/MavenWorkspaceSettings.java | 8 +- .../maven/project/action/IgnoreProjectAction.java | 2 +- .../action/ToggleOfflineAction.java | 8 +- .../maven/project/action/ToggleProfileAction.java | 2 +- .../action/ToggleSkipTestsAction.java | 2 +- .../action => runner}/CompositeConfigurable.java | 2 +- .../jetbrains/idea/maven/runner/MavenExecutor.java | 6 +- .../idea/maven/runner/MavenExternalExecutor.java | 4 +- .../idea/maven/runner/MavenExternalParameters.java | 10 +- .../idea/maven/runner/MavenRunConfiguration.java | 12 +- .../jetbrains/idea/maven/runner/MavenRunner.java | 37 ++-- .../idea/maven/runner/MavenRunnerConfigurable.java | 239 +++++++++++++++++++++ .../maven/runner/MavenRunnerSettingsEditor.java | 12 +- .../idea/maven/utils/MavenArtifactUtil.java | 2 +- .../idea/maven/{core => utils}/MavenDataKeys.java | 2 +- .../maven/{core => utils}/MavenIconProvider.java | 2 +- .../idea/maven/{core => utils}/MavenLog.java | 2 +- .../jetbrains/idea/maven/utils/MavenSettings.java | 66 ++++++ .../idea/maven/wizards/MavenModuleBuilder.java | 2 +- .../idea/maven/wizards/MavenProjectBuilder.java | 55 ++--- .../idea/maven/wizards/MavenProjectRootStep.java | 33 ++- .../src/main/resources/IndicesBundle.properties | 2 +- .../maven/src/main/resources/META-INF/plugin.xml | 36 +--- .../src/main/resources/ProjectBundle.properties | 13 +- .../org/jetbrains/idea/maven/ArchetypesTest.java | 4 +- .../idea/maven/MavenImportingTestCase.java | 7 +- .../org/jetbrains/idea/maven/MavenTestCase.java | 18 +- .../idea/maven/indices/MavenIndicesStressTest.java | 4 +- .../idea/maven/indices/MavenIndicesTest.java | 2 +- .../maven/indices/MavenIndicesTestFixture.java | 4 +- .../idea/maven/indices/NexusIndexerTest.java | 2 +- .../idea/maven/project/MavenProjectsTreeTest.java | 12 +- .../idea/maven/runner/MavenExecutorsTest.java | 8 +- 61 files changed, 668 insertions(+), 414 deletions(-) rename plugins/maven/src/main/java/org/jetbrains/idea/maven/{core/MavenPathsForm.form => project/MavenEnvironmentForm.form} (98%) rename plugins/maven/src/main/java/org/jetbrains/idea/maven/{core/MavenPathsForm.java => project/MavenEnvironmentForm.java} (90%) rename plugins/maven/src/main/java/org/jetbrains/idea/maven/{core/MavenCoreConfigurable.form => project/MavenGeneralConfigurable.form} (97%) rename plugins/maven/src/main/java/org/jetbrains/idea/maven/{core/MavenCoreConfigurable.java => project/MavenGeneralConfigurable.java} (75%) rename plugins/maven/src/main/java/org/jetbrains/idea/maven/{core/MavenCoreSettings.java => project/MavenGeneralSettings.java} (95%) delete mode 100644 plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenImportSettingsForm.form rename plugins/maven/src/main/java/org/jetbrains/idea/maven/project/{ImportSettingsConfigurable.java => MavenImportingConfigurable.java} (60%) rename plugins/maven/src/main/java/org/jetbrains/idea/maven/project/{MavenImportSettings.java => MavenImportingSettings.java} (93%) create mode 100644 plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenImportingSettingsForm.form rename plugins/maven/src/main/java/org/jetbrains/idea/maven/project/{MavenImportSettingsForm.java => MavenImportingSettingsForm.java} (89%) rename plugins/maven/src/main/java/org/jetbrains/idea/maven/{core => project}/action/ToggleOfflineAction.java (62%) rename plugins/maven/src/main/java/org/jetbrains/idea/maven/{core => project}/action/ToggleSkipTestsAction.java (93%) rename plugins/maven/src/main/java/org/jetbrains/idea/maven/{core/action => runner}/CompositeConfigurable.java (97%) create mode 100644 plugins/maven/src/main/java/org/jetbrains/idea/maven/runner/MavenRunnerConfigurable.java rename plugins/maven/src/main/java/org/jetbrains/idea/maven/{core => utils}/MavenDataKeys.java (92%) rename plugins/maven/src/main/java/org/jetbrains/idea/maven/{core => utils}/MavenIconProvider.java (95%) rename plugins/maven/src/main/java/org/jetbrains/idea/maven/{core => utils}/MavenLog.java (79%) create mode 100644 plugins/maven/src/main/java/org/jetbrains/idea/maven/utils/MavenSettings.java diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/embedder/CustomArtifact.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/embedder/CustomArtifact.java index 304f9256b8..bf30fea3fc 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/embedder/CustomArtifact.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/embedder/CustomArtifact.java @@ -9,7 +9,7 @@ import org.apache.maven.artifact.resolver.filter.ArtifactFilter; import org.apache.maven.artifact.versioning.ArtifactVersion; import org.apache.maven.artifact.versioning.OverConstrainedVersionException; import org.apache.maven.artifact.versioning.VersionRange; -import org.jetbrains.idea.maven.core.MavenLog; +import org.jetbrains.idea.maven.utils.MavenLog; import java.io.File; import java.io.FileOutputStream; diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/embedder/MavenConsoleImpl.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/embedder/MavenConsoleImpl.java index 129a75df3b..099fb714d1 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/embedder/MavenConsoleImpl.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/embedder/MavenConsoleImpl.java @@ -15,7 +15,7 @@ import com.intellij.openapi.wm.ToolWindowManager; import com.intellij.peer.PeerFactory; import com.intellij.ui.content.Content; import com.intellij.ui.content.MessageView; -import org.jetbrains.idea.maven.core.MavenCoreSettings; +import org.jetbrains.idea.maven.project.MavenGeneralSettings; import org.jetbrains.idea.maven.utils.MavenUtil; import org.jetbrains.idea.maven.runner.MavenRunnerParameters; import org.jetbrains.idea.maven.runner.MavenRunnerSettings; @@ -34,13 +34,13 @@ public class MavenConsoleImpl extends MavenConsole { private final AtomicBoolean isOpen = new AtomicBoolean(false); private final Pair myParametersAndSettings; - public MavenConsoleImpl(String title, Project project, MavenCoreSettings coreSettings) { + public MavenConsoleImpl(String title, Project project, MavenGeneralSettings coreSettings) { this(title, project, coreSettings, null); } public MavenConsoleImpl(String title, Project project, - MavenCoreSettings coreSettings, + MavenGeneralSettings coreSettings, Pair parametersAndSettings) { super(coreSettings.getOutputLevel(), coreSettings.isPrintErrorStackTraces()); myTitle = title; diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/embedder/MavenEmbedderFactory.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/embedder/MavenEmbedderFactory.java index 2e15f26783..af37d2ad32 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/embedder/MavenEmbedderFactory.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/embedder/MavenEmbedderFactory.java @@ -11,8 +11,8 @@ import org.codehaus.plexus.component.repository.ComponentDescriptor; import org.codehaus.plexus.util.cli.CommandLineUtils; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.Nullable; -import org.jetbrains.idea.maven.core.MavenCoreSettings; -import org.jetbrains.idea.maven.core.MavenLog; +import org.jetbrains.idea.maven.project.MavenGeneralSettings; +import org.jetbrains.idea.maven.utils.MavenLog; import org.jetbrains.idea.maven.utils.JDOMReader; import org.jetbrains.idea.maven.project.MavenProjectsTree; @@ -157,29 +157,29 @@ public class MavenEmbedderFactory { return Arrays.asList(standardGoals); } - public static MavenEmbedderWrapper createEmbedderForRead(MavenCoreSettings settings, + public static MavenEmbedderWrapper createEmbedderForRead(MavenGeneralSettings settings, MavenConsole console) { return createEmbedderForRead(settings, console, null); } - public static MavenEmbedderWrapper createEmbedderForRead(MavenCoreSettings settings, + public static MavenEmbedderWrapper createEmbedderForRead(MavenGeneralSettings settings, MavenConsole console, MavenProjectsTree projectsTree) { return createEmbedder(settings, console, new MyCustomizer(projectsTree, false)); } - public static MavenEmbedderWrapper createEmbedderForResolve(MavenCoreSettings settings, + public static MavenEmbedderWrapper createEmbedderForResolve(MavenGeneralSettings settings, MavenConsole console, MavenProjectsTree projectsTree) { return createEmbedder(settings, console, new MyCustomizer(projectsTree, true)); } - public static MavenEmbedderWrapper createEmbedderForExecute(MavenCoreSettings settings, + public static MavenEmbedderWrapper createEmbedderForExecute(MavenGeneralSettings settings, MavenConsole console) { return createEmbedder(settings, console, null); } - private static MavenEmbedderWrapper createEmbedder(MavenCoreSettings settings, + private static MavenEmbedderWrapper createEmbedder(MavenGeneralSettings settings, MavenConsole console, ContainerCustomizer customizer) { Configuration configuration = new DefaultConfiguration(); diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/embedder/MavenEmbedderWrapper.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/embedder/MavenEmbedderWrapper.java index bf212df39c..87431cd624 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/embedder/MavenEmbedderWrapper.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/embedder/MavenEmbedderWrapper.java @@ -25,7 +25,7 @@ import org.apache.maven.project.ProjectBuildingException; import org.apache.maven.reactor.MavenExecutionException; import org.codehaus.plexus.component.repository.exception.ComponentLookupException; import org.codehaus.plexus.util.xml.pull.XmlPullParserException; -import org.jetbrains.idea.maven.core.MavenLog; +import org.jetbrains.idea.maven.utils.MavenLog; import org.jetbrains.idea.maven.project.MavenProcessCanceledException; import org.jetbrains.idea.maven.project.TransferListenerAdapter; import org.jetbrains.idea.maven.utils.MavenId; diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/events/MavenEventsManager.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/events/MavenEventsManager.java index e806ee1332..5956c6559d 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/events/MavenEventsManager.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/events/MavenEventsManager.java @@ -31,7 +31,7 @@ import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.TestOnly; -import org.jetbrains.idea.maven.core.MavenDataKeys; +import org.jetbrains.idea.maven.utils.MavenDataKeys; import org.jetbrains.idea.maven.utils.DummyProjectComponent; import org.jetbrains.idea.maven.utils.MavenConstants; import org.jetbrains.idea.maven.project.MavenProjectModel; diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/events/MavenKeymapExtension.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/events/MavenKeymapExtension.java index c90a1476cb..8ad20f2eaa 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/events/MavenKeymapExtension.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/events/MavenKeymapExtension.java @@ -13,7 +13,7 @@ import com.intellij.openapi.vfs.VirtualFile; import com.intellij.util.containers.HashMap; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.TestOnly; -import org.jetbrains.idea.maven.core.MavenLog; +import org.jetbrains.idea.maven.utils.MavenLog; import org.jetbrains.idea.maven.embedder.MavenEmbedderFactory; import org.jetbrains.idea.maven.project.MavenProjectModel; import org.jetbrains.idea.maven.project.MavenProjectsManager; diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/events/actions/AssignShortcutAction.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/events/actions/AssignShortcutAction.java index 56544ab0ba..a085522134 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/events/actions/AssignShortcutAction.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/events/actions/AssignShortcutAction.java @@ -7,7 +7,7 @@ import com.intellij.openapi.keymap.impl.ui.EditKeymapsDialog; import com.intellij.openapi.project.Project; import com.intellij.openapi.vfs.VirtualFile; import org.jetbrains.annotations.Nullable; -import org.jetbrains.idea.maven.core.MavenDataKeys; +import org.jetbrains.idea.maven.utils.MavenDataKeys; import org.jetbrains.idea.maven.events.MavenEventsManager; import org.jetbrains.idea.maven.utils.MavenConstants; diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/indices/MavenArtifactSearchPanel.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/indices/MavenArtifactSearchPanel.java index cda43060d3..8cbc2387be 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/indices/MavenArtifactSearchPanel.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/indices/MavenArtifactSearchPanel.java @@ -8,7 +8,7 @@ import com.intellij.util.Alarm; import com.intellij.util.ui.Tree; import com.intellij.util.ui.UIUtil; import com.intellij.util.ui.tree.TreeUtil; -import org.jetbrains.idea.maven.core.MavenLog; +import org.jetbrains.idea.maven.utils.MavenLog; import org.jetbrains.idea.maven.utils.MavenId; import org.sonatype.nexus.index.ArtifactInfo; diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/indices/MavenIndex.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/indices/MavenIndex.java index 8e7c1c725e..17d02ced26 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/indices/MavenIndex.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/indices/MavenIndex.java @@ -11,7 +11,7 @@ import org.apache.lucene.index.IndexReader; import org.apache.lucene.search.*; import org.apache.maven.wagon.proxy.ProxyInfo; import org.jetbrains.annotations.TestOnly; -import org.jetbrains.idea.maven.core.MavenLog; +import org.jetbrains.idea.maven.utils.MavenLog; import org.jetbrains.idea.maven.project.TransferListenerAdapter; import org.sonatype.nexus.index.*; import org.sonatype.nexus.index.context.IndexContextInInconsistentStateException; diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/indices/MavenIndices.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/indices/MavenIndices.java index 69f8e54bd5..e8977c704b 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/indices/MavenIndices.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/indices/MavenIndices.java @@ -8,7 +8,7 @@ import org.apache.maven.settings.Proxy; import org.apache.maven.wagon.proxy.ProxyInfo; import org.codehaus.plexus.PlexusContainer; import org.codehaus.plexus.component.repository.exception.ComponentLookupException; -import org.jetbrains.idea.maven.core.MavenLog; +import org.jetbrains.idea.maven.utils.MavenLog; import org.sonatype.nexus.index.NexusIndexer; import org.sonatype.nexus.index.ArtifactContextProducer; import org.sonatype.nexus.index.updater.IndexUpdater; diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/indices/MavenIndicesManager.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/indices/MavenIndicesManager.java index 6186905f1f..e22147f2f0 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/indices/MavenIndicesManager.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/indices/MavenIndicesManager.java @@ -21,12 +21,12 @@ import org.codehaus.plexus.PlexusContainer; import org.codehaus.plexus.component.repository.exception.ComponentLookupException; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.TestOnly; -import org.jetbrains.idea.maven.core.MavenCore; -import org.jetbrains.idea.maven.core.MavenCoreSettings; -import org.jetbrains.idea.maven.core.MavenLog; +import org.jetbrains.idea.maven.project.MavenGeneralSettings; +import org.jetbrains.idea.maven.utils.MavenLog; import org.jetbrains.idea.maven.embedder.MavenEmbedderFactory; -import org.jetbrains.idea.maven.utils.MavenUtil; +import org.jetbrains.idea.maven.project.MavenProjectsManager; import org.jetbrains.idea.maven.runner.SoutMavenConsole; +import org.jetbrains.idea.maven.utils.MavenUtil; import java.io.File; import java.util.*; @@ -72,7 +72,7 @@ public class MavenIndicesManager implements ApplicationComponent { private void ensureInitialized() { if (myIndices != null) return; - MavenCoreSettings settings = MavenCore.getInstance(ProjectManager.getInstance().getDefaultProject()).getState(); + MavenGeneralSettings settings = MavenProjectsManager.getInstance(ProjectManager.getInstance().getDefaultProject()).getGeneralSettings(); myEmbedder = MavenEmbedderFactory.createEmbedderForExecute(settings, new SoutMavenConsole()).getEmbedder(); File dir = myTestIndicesDir == null diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/indices/MavenProjectIndicesManager.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/indices/MavenProjectIndicesManager.java index 51c9e5c357..43f1be6767 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/indices/MavenProjectIndicesManager.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/indices/MavenProjectIndicesManager.java @@ -1,12 +1,10 @@ package org.jetbrains.idea.maven.indices; import com.intellij.openapi.application.ApplicationManager; -import com.intellij.openapi.options.Configurable; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.text.StringUtil; import org.apache.lucene.search.Query; import org.apache.maven.artifact.repository.ArtifactRepository; -import org.jetbrains.idea.maven.core.MavenCore; import org.jetbrains.idea.maven.project.MavenProjectModel; import org.jetbrains.idea.maven.project.MavenProjectsManager; import org.jetbrains.idea.maven.utils.DummyProjectComponent; @@ -42,12 +40,6 @@ public class MavenProjectIndicesManager extends DummyProjectComponent { } public void doInit() { - MavenCore.getInstance(myProject).addConfigurableFactory(new MavenCore.ConfigurableFactory() { - public Configurable createConfigurable() { - return new MavenIndicesConfigurable(myProject); - } - }); - if (ApplicationManager.getApplication().isUnitTestMode()) { updateIndicesList(); } diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/navigator/MavenNavigatorPanel.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/navigator/MavenNavigatorPanel.java index ea96dd7004..fe73d9d223 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/navigator/MavenNavigatorPanel.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/navigator/MavenNavigatorPanel.java @@ -16,7 +16,7 @@ import com.intellij.uiDesigner.core.GridConstraints; import com.intellij.uiDesigner.core.GridLayoutManager; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.Nullable; -import org.jetbrains.idea.maven.core.MavenDataKeys; +import org.jetbrains.idea.maven.utils.MavenDataKeys; import org.jetbrains.idea.maven.embedder.MavenEmbedderFactory; import org.jetbrains.idea.maven.project.MavenProjectModel; import org.jetbrains.idea.maven.project.MavenProjectsManager; diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenArtifactDownloader.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenArtifactDownloader.java index b61bf15b17..b1ee128164 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenArtifactDownloader.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenArtifactDownloader.java @@ -12,7 +12,7 @@ import java.io.File; import java.util.*; public class MavenArtifactDownloader { - private final MavenArtifactSettings mySettings; + private final MavenDownloadingSettings mySettings; private final MavenEmbedderWrapper myEmbedder; private final MavenProcess myProgress; private final MavenProjectsTree myProjectsTree; @@ -20,7 +20,7 @@ public class MavenArtifactDownloader { public static void download(MavenProjectsTree projectsTree, List mavenProjects, - MavenArtifactSettings settings, + MavenDownloadingSettings settings, boolean demand, MavenEmbedderWrapper embedder, MavenProcess p) throws MavenProcessCanceledException { @@ -29,7 +29,7 @@ public class MavenArtifactDownloader { private MavenArtifactDownloader(MavenProjectsTree projectsTree, List mavenProjects, - MavenArtifactSettings settings, + MavenDownloadingSettings settings, MavenEmbedderWrapper embedder, MavenProcess p) { myProjectsTree = projectsTree; @@ -61,8 +61,8 @@ public class MavenArtifactDownloader { } } - private boolean shouldDownload(MavenArtifactSettings.UPDATE_MODE level, boolean demand) { - return level == MavenArtifactSettings.UPDATE_MODE.ALWAYS || (level == MavenArtifactSettings.UPDATE_MODE.ON_DEMAND && demand); + private boolean shouldDownload(MavenDownloadingSettings.UPDATE_MODE level, boolean demand) { + return level == MavenDownloadingSettings.UPDATE_MODE.ALWAYS || (level == MavenDownloadingSettings.UPDATE_MODE.ON_DEMAND && demand); } private void scheduleFilesRefresh(final List downloadedFiles) { diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/core/MavenPathsForm.form b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenEnvironmentForm.form similarity index 98% rename from plugins/maven/src/main/java/org/jetbrains/idea/maven/core/MavenPathsForm.form rename to plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenEnvironmentForm.form index 02efd76587..00a218f179 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/core/MavenPathsForm.form +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenEnvironmentForm.form @@ -1,5 +1,5 @@ -
+ diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/core/MavenPathsForm.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenEnvironmentForm.java similarity index 90% rename from plugins/maven/src/main/java/org/jetbrains/idea/maven/core/MavenPathsForm.java rename to plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenEnvironmentForm.java index 9a3c284a94..b598e76986 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/core/MavenPathsForm.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenEnvironmentForm.java @@ -15,7 +15,7 @@ * ========================================================================= */ -package org.jetbrains.idea.maven.core; +package org.jetbrains.idea.maven.project; import com.intellij.openapi.fileChooser.FileChooserDescriptor; import com.intellij.openapi.ui.LabeledComponent; @@ -29,7 +29,7 @@ import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.io.File; -public class MavenPathsForm { +public class MavenEnvironmentForm { private JPanel panel; private LabeledComponent mavenHomeComponent; private LabeledComponent localRepositoryComponent; @@ -41,8 +41,8 @@ public class MavenPathsForm { private Overrider mavenSettingsFileOverrider; private Overrider localRepositoryOverrider; - public MavenPathsForm() { - mavenHomeComponent.getComponent().addBrowseFolderListener(CoreBundle.message("maven.select.maven.home.directory"), "", null, + public MavenEnvironmentForm() { + mavenHomeComponent.getComponent().addBrowseFolderListener(ProjectBundle.message("maven.select.maven.home.directory"), "", null, new FileChooserDescriptor(false, true, false, false, false, false)); mavenHomeOverrider = new Overrider(mavenHomeComponent, mavenHomeOverrideCheckBox, new Overrider.DefaultFileProvider() { @Nullable @@ -51,7 +51,7 @@ public class MavenPathsForm { } }); - mavenSettingsFileComponent.getComponent().addBrowseFolderListener(CoreBundle.message("maven.select.maven.settings.file"), "", null, + mavenSettingsFileComponent.getComponent().addBrowseFolderListener(ProjectBundle.message("maven.select.maven.settings.file"), "", null, new FileChooserDescriptor(true, false, false, false, false, false)); mavenSettingsFileOverrider = new Overrider(mavenSettingsFileComponent, mavenSettingsFileOverrideCheckBox, new Overrider.DefaultFileProvider() { @@ -61,7 +61,7 @@ public class MavenPathsForm { } }); - localRepositoryComponent.getComponent().addBrowseFolderListener(CoreBundle.message("maven.select.local.repository"), "", null, + localRepositoryComponent.getComponent().addBrowseFolderListener(ProjectBundle.message("maven.select.local.repository"), "", null, new FileChooserDescriptor(false, true, false, false, false, false)); localRepositoryOverrider = new Overrider(localRepositoryComponent, localRepositoryOverrideCheckBox, new Overrider.DefaultFileProvider() { @@ -72,19 +72,19 @@ public class MavenPathsForm { }); } - public boolean isModified(MavenCoreSettings data) { - MavenCoreSettings formData = new MavenCoreSettings(); + public boolean isModified(MavenGeneralSettings data) { + MavenGeneralSettings formData = new MavenGeneralSettings(); setData(formData); return !formData.equals(data); } - public void setData(MavenCoreSettings data) { + public void setData(MavenGeneralSettings data) { data.setMavenHome(mavenHomeOverrider.getText()); data.setMavenSettingsFile(mavenSettingsFileOverrider.getText()); data.setLocalRepository(localRepositoryOverrider.getText()); } - public void getData(MavenCoreSettings data) { + public void getData(MavenGeneralSettings data) { mavenHomeOverrider.setText(data.getMavenHome()); mavenSettingsFileOverrider.setText(data.getMavenSettingsFile()); localRepositoryOverrider.setText(data.getLocalRepository()); diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenFoldersConfigurator.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenFoldersConfigurator.java index dde7bdca0c..c40d236b62 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenFoldersConfigurator.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenFoldersConfigurator.java @@ -20,12 +20,12 @@ import java.util.Map; public class MavenFoldersConfigurator { private MavenProjectModel myMavenProject; - private MavenImportSettings myPrefs; + private MavenImportingSettings myImportingSettings; private RootModelAdapter myModel; public static void updateProjectFolders(final Project project, final List updatedProjects) { final MavenProjectsManager manager = MavenProjectsManager.getInstance(project); - final MavenImportSettings settings = manager.getImportSettings(); + final MavenImportingSettings settings = manager.getImportingSettings(); final Map fileToProjectMapping = new HashMap(); @@ -66,9 +66,9 @@ public class MavenFoldersConfigurator { }); } - public MavenFoldersConfigurator(MavenProjectModel mavenProject, MavenImportSettings settings, RootModelAdapter model) { + public MavenFoldersConfigurator(MavenProjectModel mavenProject, MavenImportingSettings settings, RootModelAdapter model) { myMavenProject = mavenProject; - myPrefs = settings; + myImportingSettings = settings; myModel = model; } @@ -99,7 +99,7 @@ public class MavenFoldersConfigurator { } private void configOutputFolders() { - if (myPrefs.isUseMavenOutput()) { + if (myImportingSettings.isUseMavenOutput()) { myModel.useModuleOutput(myMavenProject.getOutputDirectory(), myMavenProject.getTestOutputDirectory()); } diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/core/MavenCoreConfigurable.form b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenGeneralConfigurable.form similarity index 97% rename from plugins/maven/src/main/java/org/jetbrains/idea/maven/core/MavenCoreConfigurable.form rename to plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenGeneralConfigurable.form index 42c0da68d7..b4da5ff1cd 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/core/MavenCoreConfigurable.form +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenGeneralConfigurable.form @@ -1,5 +1,5 @@ - + @@ -104,7 +104,7 @@ - + diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/core/MavenCoreConfigurable.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenGeneralConfigurable.java similarity index 75% rename from plugins/maven/src/main/java/org/jetbrains/idea/maven/core/MavenCoreConfigurable.java rename to plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenGeneralConfigurable.java index 8b70f1abd5..78766d69cc 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/core/MavenCoreConfigurable.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenGeneralConfigurable.java @@ -15,7 +15,7 @@ * ========================================================================= */ -package org.jetbrains.idea.maven.core; +package org.jetbrains.idea.maven.project; import com.intellij.openapi.options.Configurable; import org.apache.maven.execution.MavenExecutionRequest; @@ -29,7 +29,7 @@ import javax.swing.*; /** * @author Ralf Quebbemann (ralfq@codehaus.org) */ -public abstract class MavenCoreConfigurable implements Configurable { +public abstract class MavenGeneralConfigurable implements Configurable { private JCheckBox checkboxWorkOffline; private JPanel panel; private JComboBox comboboxOutputLevel; @@ -39,18 +39,19 @@ public abstract class MavenCoreConfigurable implements Configurable { private JComboBox comboboxPluginUpdatePolicy; private JCheckBox checkboxUsePluginRegistry; private JCheckBox checkboxNonRecursive; - private MavenPathsForm mavenPathsForm; + private MavenEnvironmentForm mavenPathsForm; private final DefaultComboBoxModel comboboxModelOutputLevel = new DefaultComboBoxModel(); private final DefaultComboBoxModel comboboxModelChecksumPolicy = new DefaultComboBoxModel(); private final DefaultComboBoxModel comboboxModelMultiprojectBuildFailPolicy = new DefaultComboBoxModel(); private final DefaultComboBoxModel comboboxModelPluginUpdatePolicy = new DefaultComboBoxModel(); - protected abstract MavenCoreSettings getState(); + protected abstract MavenGeneralSettings getState(); private void fillComboboxFailureBehavior() { - ComboBoxUtil.setModel(comboboxMultiprojectBuildFailPolicy, comboboxModelMultiprojectBuildFailPolicy, new Object[][]{ - {MavenExecutionRequest.REACTOR_FAIL_FAST, "Stop at first failure"}, {MavenExecutionRequest.REACTOR_FAIL_AT_END, "Fail at the end"}, - {MavenExecutionRequest.REACTOR_FAIL_NEVER, "Never fail"}}); + ComboBoxUtil.setModel(comboboxMultiprojectBuildFailPolicy, comboboxModelMultiprojectBuildFailPolicy, + new Object[][]{{MavenExecutionRequest.REACTOR_FAIL_FAST, "Stop at first failure"}, + {MavenExecutionRequest.REACTOR_FAIL_AT_END, "Fail at the end"}, + {MavenExecutionRequest.REACTOR_FAIL_NEVER, "Never fail"}}); } private void fillComboboxPluginUpdatePolicy() { @@ -59,15 +60,17 @@ public abstract class MavenCoreConfigurable implements Configurable { } private void fillComboboxChecksumPolicy() { - ComboBoxUtil.setModel(comboboxChecksumPolicy, comboboxModelChecksumPolicy, new Object[][]{{"", "No Global Policy"}, - {MavenExecutionRequest.CHECKSUM_POLICY_FAIL, "Strict (Fail)"}, {MavenExecutionRequest.CHECKSUM_POLICY_WARN, "Lax (Warn Only)"}}); + ComboBoxUtil.setModel(comboboxChecksumPolicy, comboboxModelChecksumPolicy, + new Object[][]{{"", "No Global Policy"}, {MavenExecutionRequest.CHECKSUM_POLICY_FAIL, "Strict (Fail)"}, + {MavenExecutionRequest.CHECKSUM_POLICY_WARN, "Lax (Warn Only)"}}); } private void fillComboboxOutputLevel() { - ComboBoxUtil.setModel(comboboxOutputLevel, comboboxModelOutputLevel, new Object[][]{ - {MavenExecutionRequest.LOGGING_LEVEL_DEBUG, "Debug"}, {MavenExecutionRequest.LOGGING_LEVEL_INFO, "Info"}, - {MavenExecutionRequest.LOGGING_LEVEL_WARN, "Warn"}, {MavenExecutionRequest.LOGGING_LEVEL_ERROR, "Error"}, - {MavenExecutionRequest.LOGGING_LEVEL_FATAL, "Fatal"}, {MavenExecutionRequest.LOGGING_LEVEL_DISABLED, "Disabled"}}); + ComboBoxUtil.setModel(comboboxOutputLevel, comboboxModelOutputLevel, + new Object[][]{{MavenExecutionRequest.LOGGING_LEVEL_DEBUG, "Debug"}, + {MavenExecutionRequest.LOGGING_LEVEL_INFO, "Info"}, {MavenExecutionRequest.LOGGING_LEVEL_WARN, "Warn"}, + {MavenExecutionRequest.LOGGING_LEVEL_ERROR, "Error"}, {MavenExecutionRequest.LOGGING_LEVEL_FATAL, "Fatal"}, + {MavenExecutionRequest.LOGGING_LEVEL_DISABLED, "Disabled"}}); } public JComponent createComponent() { @@ -80,7 +83,7 @@ public abstract class MavenCoreConfigurable implements Configurable { } public boolean isModified() { - MavenCoreSettings formData = new MavenCoreSettings(); + MavenGeneralSettings formData = new MavenGeneralSettings(); setData(formData); return !formData.equals(getState()); } @@ -93,7 +96,7 @@ public abstract class MavenCoreConfigurable implements Configurable { getData(getState()); } - private void setData(MavenCoreSettings data) { + private void setData(MavenGeneralSettings data) { data.setWorkOffline(checkboxWorkOffline.isSelected()); mavenPathsForm.setData(data); @@ -102,18 +105,18 @@ public abstract class MavenCoreConfigurable implements Configurable { data.setNonRecursive(checkboxNonRecursive.isSelected()); Integer level = (Integer)ComboBoxUtil.getSelectedValue(comboboxModelOutputLevel); - if(level!=null){ + if (level != null) { data.setOutputLevel(level); } data.setChecksumPolicy(ComboBoxUtil.getSelectedString(comboboxModelChecksumPolicy)); data.setFailureBehavior(ComboBoxUtil.getSelectedString(comboboxModelMultiprojectBuildFailPolicy)); Boolean policy = (Boolean)ComboBoxUtil.getSelectedValue(comboboxModelPluginUpdatePolicy); - if(policy!=null){ + if (policy != null) { data.setPluginUpdatePolicy(policy); } } - private void getData(MavenCoreSettings data) { + private void getData(MavenGeneralSettings data) { checkboxWorkOffline.setSelected(data.isWorkOffline()); mavenPathsForm.getData(data); @@ -134,7 +137,7 @@ public abstract class MavenCoreConfigurable implements Configurable { @Nls public String getDisplayName() { - return CoreBundle.message("maven.tab.general"); + return ProjectBundle.message("maven.tab.general"); } @Nullable diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/core/MavenCoreSettings.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenGeneralSettings.java similarity index 95% rename from plugins/maven/src/main/java/org/jetbrains/idea/maven/core/MavenCoreSettings.java rename to plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenGeneralSettings.java index 99815ad08a..053053887c 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/core/MavenCoreSettings.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenGeneralSettings.java @@ -1,4 +1,4 @@ -package org.jetbrains.idea.maven.core; +package org.jetbrains.idea.maven.project; import com.intellij.openapi.util.Comparing; import org.apache.maven.execution.MavenExecutionRequest; @@ -12,7 +12,7 @@ import java.io.File; * @author Vladislav.Kaznacheev */ @SuppressWarnings({"UnusedDeclaration"}) -public class MavenCoreSettings implements Cloneable { +public class MavenGeneralSettings implements Cloneable { private boolean workOffline = false; @NotNull private String mavenHome = ""; @@ -150,7 +150,7 @@ public class MavenCoreSettings implements Cloneable { if (this == o) return true; if (o == null || getClass() != o.getClass()) return false; - final MavenCoreSettings that = (MavenCoreSettings)o; + final MavenGeneralSettings that = (MavenGeneralSettings)o; if (nonRecursive != that.nonRecursive) return false; if (outputLevel != that.outputLevel) return false; @@ -184,9 +184,9 @@ public class MavenCoreSettings implements Cloneable { } @Override - public MavenCoreSettings clone() { + public MavenGeneralSettings clone() { try { - return (MavenCoreSettings)super.clone(); + return (MavenGeneralSettings)super.clone(); } catch (CloneNotSupportedException e) { throw new Error(e); diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenImportSettingsForm.form b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenImportSettingsForm.form deleted file mode 100644 index ee15732a99..0000000000 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenImportSettingsForm.form +++ /dev/null @@ -1,108 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/ImportSettingsConfigurable.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenImportingConfigurable.java similarity index 60% rename from plugins/maven/src/main/java/org/jetbrains/idea/maven/project/ImportSettingsConfigurable.java rename to plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenImportingConfigurable.java index 3981d67829..4380e9202a 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/ImportSettingsConfigurable.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenImportingConfigurable.java @@ -11,19 +11,19 @@ import javax.swing.*; /** * @author Vladislav.Kaznacheev */ -public class ImportSettingsConfigurable implements Configurable { - private MavenImportSettings myImporterSettings; +public class MavenImportingConfigurable implements Configurable { + private MavenImportingSettings myImportingSettings; private JPanel panel; - private MavenImportSettingsForm mySettingsForm; + private MavenImportingSettingsForm mySettingsForm; - public ImportSettingsConfigurable(MavenImportSettings importerSettings) { - myImporterSettings = importerSettings; + public MavenImportingConfigurable(MavenImportingSettings importingSettings) { + myImportingSettings = importingSettings; } @Nls public String getDisplayName() { - return ProjectBundle.message("maven.import"); + return ProjectBundle.message("maven.tab.importing"); } @Nullable @@ -42,15 +42,15 @@ public class ImportSettingsConfigurable implements Configurable { } public boolean isModified() { - return mySettingsForm.isModified(myImporterSettings); + return mySettingsForm.isModified(myImportingSettings); } public void apply() throws ConfigurationException { - mySettingsForm.getData(myImporterSettings); + mySettingsForm.getData(myImportingSettings); } public void reset() { - mySettingsForm.setData(myImporterSettings); + mySettingsForm.setData(myImportingSettings); } public void disposeUIResources() { diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenImportSettings.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenImportingSettings.java similarity index 93% rename from plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenImportSettings.java rename to plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenImportingSettings.java index 01bb83d647..3b188e4c3a 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenImportSettings.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenImportingSettings.java @@ -5,7 +5,7 @@ import org.jetbrains.annotations.NotNull; /** * @author Vladislav.Kaznacheev */ -public class MavenImportSettings implements Cloneable { +public class MavenImportingSettings implements Cloneable { @NotNull private String dedicatedModuleDir = ""; private boolean lookForNested = false; private boolean autoSync = false; @@ -84,7 +84,7 @@ public class MavenImportSettings implements Cloneable { if (this == o) return true; if (o == null || getClass() != o.getClass()) return false; - final MavenImportSettings that = (MavenImportSettings)o; + final MavenImportingSettings that = (MavenImportingSettings)o; if (createModuleGroups != that.createModuleGroups) return false; if (lookForNested != that.lookForNested) return false; @@ -112,9 +112,9 @@ public class MavenImportSettings implements Cloneable { } @Override - public MavenImportSettings clone() { + public MavenImportingSettings clone() { try { - return (MavenImportSettings)super.clone(); + return (MavenImportingSettings)super.clone(); } catch (CloneNotSupportedException e) { throw new Error(e); diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenImportingSettingsForm.form b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenImportingSettingsForm.form new file mode 100644 index 0000000000..07297cfe97 --- /dev/null +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenImportingSettingsForm.form @@ -0,0 +1,98 @@ + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenImportSettingsForm.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenImportingSettingsForm.java similarity index 89% rename from plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenImportSettingsForm.java rename to plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenImportingSettingsForm.java index 8e5a32af07..4784404cf7 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenImportSettingsForm.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenImportingSettingsForm.java @@ -12,7 +12,7 @@ import java.awt.event.ActionListener; /** * @author Vladislav.Kaznacheev */ -public class MavenImportSettingsForm { +public class MavenImportingSettingsForm { private JPanel panel; private JCheckBox myModuleDirCheckBox; @@ -25,11 +25,11 @@ public class MavenImportSettingsForm { private JCheckBox myUpdateFoldersOnImportCheckBox; private JCheckBox myImportIsBackgroundCheckBox; - public MavenImportSettingsForm() { + public MavenImportingSettingsForm() { this(false); } - public MavenImportSettingsForm(boolean isImportStep) { + public MavenImportingSettingsForm(boolean isImportStep) { ActionListener listener = new ActionListener() { public void actionPerformed(final ActionEvent e) { @@ -67,7 +67,7 @@ public class MavenImportSettingsForm { return panel; } - public void getData(MavenImportSettings data) { + public void getData(MavenImportingSettings data) { data.setDedicatedModuleDir(myModuleDirCheckBox.isSelected() ? myModuleDirControl.getText() : ""); data.setCreateModuleGroups(myCreateGroupsCheckBox.isSelected()); data.setAutoSync(myAutoSyncCheckBox.isSelected()); @@ -78,7 +78,7 @@ public class MavenImportSettingsForm { data.setImportInBackground(myImportIsBackgroundCheckBox.isSelected()); } - public void setData(final MavenImportSettings data) { + public void setData(final MavenImportingSettings data) { myModuleDirCheckBox.setSelected(!StringUtil.isEmptyOrSpaces(data.getDedicatedModuleDir())); myModuleDirControl.setText(data.getDedicatedModuleDir()); @@ -93,8 +93,8 @@ public class MavenImportSettingsForm { enableControls(); } - public boolean isModified(MavenImportSettings settings) { - MavenImportSettings formData = new MavenImportSettings(); + public boolean isModified(MavenImportingSettings settings) { + MavenImportingSettings formData = new MavenImportingSettings(); getData(formData); return !formData.equals(settings); } diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenModuleConfigurator.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenModuleConfigurator.java index 54acdeee24..1fff32287d 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenModuleConfigurator.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenModuleConfigurator.java @@ -22,7 +22,7 @@ public class MavenModuleConfigurator { private MavenProjectsTree myMavenTree; private MavenProjectModel myMavenProject; private Map myMavenProjectToModuleName; - private MavenImportSettings mySettings; + private MavenImportingSettings mySettings; private ModulesProvider myModulesProvider; private RootModelAdapter myRootModelAdapter; private LibraryTableModifiableModelProvider myTableModifiableModelProvider; @@ -32,7 +32,8 @@ public class MavenModuleConfigurator { MavenProjectsTree mavenTree, MavenProjectModel mavenProject, Map mavenProjectToModuleName, - MavenImportSettings settings, final ModulesProvider modulesProvider) { + MavenImportingSettings settings, + ModulesProvider modulesProvider) { myModule = module; myModuleModel = moduleModel; myMavenTree = mavenTree; diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenProjectConfigurator.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenProjectConfigurator.java index 8431f36c92..fd4666b7cc 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenProjectConfigurator.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenProjectConfigurator.java @@ -25,7 +25,7 @@ public class MavenProjectConfigurator { private ModifiableModuleModel myModuleModel; private MavenProjectsTree myMavenTree; private Map myFileToModuleMapping; - private MavenImportSettings myImporterSettings; + private MavenImportingSettings myImportingSettings; private List myRootModelsToCommit = new ArrayList(); private Map myMavenProjectToModule = new HashMap(); @@ -37,11 +37,11 @@ public class MavenProjectConfigurator { public MavenProjectConfigurator(Project p, MavenProjectsTree projectsTree, Map fileToModuleMapping, - MavenImportSettings importerSettings) { + MavenImportingSettings importingSettings) { myProject = p; myMavenTree = projectsTree; myFileToModuleMapping = fileToModuleMapping; - myImporterSettings = importerSettings; + myImportingSettings = importingSettings; } public List config(final ModifiableModuleModel model, final ModulesProvider modulesProvider) { @@ -78,7 +78,7 @@ public class MavenProjectConfigurator { if (!each.isResolved() || each.getFile() == null) continue; files.add(each.getFile()); } - + LocalFileSystem.getInstance().refreshIoFiles(files); } @@ -90,7 +90,7 @@ public class MavenProjectConfigurator { myMavenProjectToModule, myMavenProjectToModuleName, myMavenProjectToModulePath, - myImporterSettings.getDedicatedModuleDir()); + myImportingSettings.getDedicatedModuleDir()); } private void configSettings() { @@ -111,7 +111,7 @@ public class MavenProjectConfigurator { int result = Messages.showYesNoDialog(myProject, ProjectBundle.message("maven.import.message.delete.obsolete", formatted), - ProjectBundle.message("maven.import"), + ProjectBundle.message("maven.tab.importing"), Messages.getQuestionIcon()); if (result == 1) return;// NO @@ -179,7 +179,7 @@ public class MavenProjectConfigurator { } private boolean shouldCreateModuleFor(MavenProjectModel project) { - return myImporterSettings.isCreateModulesForAggregators() || !project.isAggregator(); + return myImportingSettings.isCreateModulesForAggregators() || !project.isAggregator(); } private boolean ensureModuleCreated(MavenProjectModel project) { @@ -195,14 +195,15 @@ public class MavenProjectConfigurator { return true; } - private MavenModuleConfigurator createModuleConfigurator(Module module, MavenProjectModel mavenProject, - final ModulesProvider modulesProvider) { + private MavenModuleConfigurator createModuleConfigurator(Module module, + MavenProjectModel mavenProject, + ModulesProvider modulesProvider) { return new MavenModuleConfigurator(module, myModuleModel, myMavenTree, mavenProject, myMavenProjectToModuleName, - myImporterSettings, + myImportingSettings, modulesProvider ); } @@ -218,7 +219,7 @@ public class MavenProjectConfigurator { } private void configModuleGroups() { - if (!myImporterSettings.isCreateModuleGroups()) return; + if (!myImportingSettings.isCreateModuleGroups()) return; final Stack groups = new Stack(); final boolean createTopLevelGroup = myMavenTree.getRootProjects().size() > 1; diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenProjectsTree.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenProjectsTree.java index 2fc76bec69..77e1221a04 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenProjectsTree.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenProjectsTree.java @@ -7,14 +7,13 @@ import com.intellij.openapi.vfs.VirtualFile; import com.intellij.util.concurrency.ReentrantWriterPreferenceReadWriteLock; import org.apache.maven.artifact.Artifact; import org.apache.maven.model.Parent; -import org.jetbrains.idea.maven.core.MavenCoreSettings; -import org.jetbrains.idea.maven.core.MavenLog; import org.jetbrains.idea.maven.dom.model.Dependency; import org.jetbrains.idea.maven.embedder.MavenConsole; import org.jetbrains.idea.maven.embedder.MavenEmbedderFactory; import org.jetbrains.idea.maven.embedder.MavenEmbedderWrapper; import org.jetbrains.idea.maven.utils.MavenConstants; import org.jetbrains.idea.maven.utils.MavenId; +import org.jetbrains.idea.maven.utils.MavenLog; import java.io.File; import java.util.*; @@ -31,7 +30,7 @@ public class MavenProjectsTree { public void read(Collection filesToImport, List activeProfiles, - MavenCoreSettings mavenSettings, + MavenGeneralSettings mavenSettings, MavenConsole console, MavenProcess p) throws MavenProcessCanceledException { myProfiles = activeProfiles; @@ -51,11 +50,11 @@ public class MavenProjectsTree { } } - public void update(Collection files, MavenCoreSettings mavenSettings, MavenConsole console, MavenProcess p) throws MavenProcessCanceledException { + public void update(Collection files, MavenGeneralSettings mavenSettings, MavenConsole console, MavenProcess p) throws MavenProcessCanceledException { update(files, mavenSettings, console, p, false); } - private void update(Collection files, MavenCoreSettings mavenSettings, MavenConsole console, MavenProcess p, boolean force) + private void update(Collection files, MavenGeneralSettings mavenSettings, MavenConsole console, MavenProcess p, boolean force) throws MavenProcessCanceledException { MavenEmbedderWrapper e = MavenEmbedderFactory.createEmbedderForRead(mavenSettings, console, this); @@ -227,7 +226,7 @@ public class MavenProjectsTree { } } - public void delete(List files, MavenCoreSettings mavenSettings, MavenConsole console, MavenProcess p) throws MavenProcessCanceledException { + public void delete(List files, MavenGeneralSettings mavenSettings, MavenConsole console, MavenProcess p) throws MavenProcessCanceledException { List projectsToUpdate = new ArrayList(); List removedProjects = new ArrayList(); @@ -394,11 +393,11 @@ public class MavenProjectsTree { } } - public void resolve(MavenCoreSettings coreSettings, - MavenArtifactSettings artifactSettings, + public void resolve(MavenGeneralSettings generalSettings, + MavenDownloadingSettings downloadingSettings, MavenConsole console, MavenProcess p) throws MavenProcessCanceledException { - MavenEmbedderWrapper e = MavenEmbedderFactory.createEmbedderForResolve(coreSettings, console, this); + MavenEmbedderWrapper e = MavenEmbedderFactory.createEmbedderForResolve(generalSettings, console, this); try { List projects = getProjects(); @@ -411,14 +410,14 @@ public class MavenProjectsTree { fireUpdated(each); } - doDownload(artifactSettings, p, e, projects, false); + doDownload(downloadingSettings, p, e, projects, false); } finally { e.release(); } } - public void generateSources(MavenCoreSettings coreSettings, + public void generateSources(MavenGeneralSettings coreSettings, MavenConsole console, MavenProcess p) throws MavenProcessCanceledException { MavenEmbedderWrapper embedder = MavenEmbedderFactory.createEmbedderForExecute(coreSettings, console); @@ -436,25 +435,25 @@ public class MavenProjectsTree { } } - public void download(MavenCoreSettings coreSettings, - MavenArtifactSettings artifactSettings, + public void download(MavenGeneralSettings generalSettings, + MavenDownloadingSettings downloadingSettings, MavenConsole console, MavenProcess p) throws MavenProcessCanceledException { - MavenEmbedderWrapper e = MavenEmbedderFactory.createEmbedderForExecute(coreSettings, console); + MavenEmbedderWrapper e = MavenEmbedderFactory.createEmbedderForExecute(generalSettings, console); try { - doDownload(artifactSettings, p, e, getProjects(), true); + doDownload(downloadingSettings, p, e, getProjects(), true); } finally { e.release(); } } - private void doDownload(MavenArtifactSettings artifactSettings, + private void doDownload(MavenDownloadingSettings settings, MavenProcess p, MavenEmbedderWrapper embedder, List projects, boolean demand) throws MavenProcessCanceledException { - MavenArtifactDownloader.download(this, projects, artifactSettings, demand, embedder, p); + MavenArtifactDownloader.download(this, projects, settings, demand, embedder, p); } public Dependency addDependency(Project project, @@ -465,7 +464,7 @@ public class MavenProjectsTree { public Artifact downloadArtifact(MavenProjectModel mavenProject, MavenId id, - MavenCoreSettings coreSettings, + MavenGeneralSettings coreSettings, MavenConsole console) throws MavenProcessCanceledException { MavenEmbedderWrapper e = MavenEmbedderFactory.createEmbedderForExecute(coreSettings, console); try { diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenWorkspaceSettings.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenWorkspaceSettings.java index e957b5d8d9..7447c27cb3 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenWorkspaceSettings.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenWorkspaceSettings.java @@ -1,9 +1,7 @@ package org.jetbrains.idea.maven.project; -/** - * Author: Vladislav.Kaznacheev - */ public class MavenWorkspaceSettings { - public MavenImportSettings myImporterSettings = new MavenImportSettings(); - public MavenArtifactSettings myArtifactSettings = new MavenArtifactSettings(); + public MavenGeneralSettings generalSettings = new MavenGeneralSettings(); + public MavenImportingSettings importingSettings = new MavenImportingSettings(); + public MavenDownloadingSettings downloadingSettings = new MavenDownloadingSettings(); } diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/action/IgnoreProjectAction.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/action/IgnoreProjectAction.java index 10800f4088..1480dd2fdb 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/action/IgnoreProjectAction.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/action/IgnoreProjectAction.java @@ -5,7 +5,7 @@ import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.options.ShowSettingsUtil; import com.intellij.openapi.project.Project; -import org.jetbrains.idea.maven.core.MavenDataKeys; +import org.jetbrains.idea.maven.utils.MavenDataKeys; import org.jetbrains.idea.maven.project.MavenProjectModel; import org.jetbrains.idea.maven.project.ProjectBundle; import org.jetbrains.idea.maven.project.MavenIgnoreConfigurable; diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/core/action/ToggleOfflineAction.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/action/ToggleOfflineAction.java similarity index 62% rename from plugins/maven/src/main/java/org/jetbrains/idea/maven/core/action/ToggleOfflineAction.java rename to plugins/maven/src/main/java/org/jetbrains/idea/maven/project/action/ToggleOfflineAction.java index b74ed815e3..d71ac959c4 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/core/action/ToggleOfflineAction.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/action/ToggleOfflineAction.java @@ -1,22 +1,22 @@ -package org.jetbrains.idea.maven.core.action; +package org.jetbrains.idea.maven.project.action; import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.actionSystem.ToggleAction; import com.intellij.openapi.project.Project; -import org.jetbrains.idea.maven.core.MavenCore; +import org.jetbrains.idea.maven.project.MavenProjectsManager; public class ToggleOfflineAction extends ToggleAction { public boolean isSelected(AnActionEvent e){ Project project = e.getData(PlatformDataKeys.PROJECT); - return project != null && project.getComponent(MavenCore.class).getState().isWorkOffline(); + return project != null && MavenProjectsManager.getInstance(project).getGeneralSettings().isWorkOffline(); } public void setSelected(AnActionEvent e, boolean state){ Project project = e.getData(PlatformDataKeys.PROJECT); if(project != null){ - project.getComponent(MavenCore.class).getState().setWorkOffline(state); + MavenProjectsManager.getInstance(project).getGeneralSettings().setWorkOffline(state); } } } \ No newline at end of file diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/action/ToggleProfileAction.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/action/ToggleProfileAction.java index 9778204ea1..59720d85ab 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/action/ToggleProfileAction.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/action/ToggleProfileAction.java @@ -5,7 +5,7 @@ import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.project.Project; import com.intellij.openapi.vfs.VirtualFile; -import org.jetbrains.idea.maven.core.MavenDataKeys; +import org.jetbrains.idea.maven.utils.MavenDataKeys; import org.jetbrains.idea.maven.project.MavenProjectsManager; import org.jetbrains.idea.maven.project.ProjectBundle; diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/core/action/ToggleSkipTestsAction.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/action/ToggleSkipTestsAction.java similarity index 93% rename from plugins/maven/src/main/java/org/jetbrains/idea/maven/core/action/ToggleSkipTestsAction.java rename to plugins/maven/src/main/java/org/jetbrains/idea/maven/project/action/ToggleSkipTestsAction.java index d1c394c2be..5350f98fe0 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/core/action/ToggleSkipTestsAction.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/action/ToggleSkipTestsAction.java @@ -1,4 +1,4 @@ -package org.jetbrains.idea.maven.core.action; +package org.jetbrains.idea.maven.project.action; import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.actionSystem.PlatformDataKeys; diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/core/action/CompositeConfigurable.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/runner/CompositeConfigurable.java similarity index 97% rename from plugins/maven/src/main/java/org/jetbrains/idea/maven/core/action/CompositeConfigurable.java rename to plugins/maven/src/main/java/org/jetbrains/idea/maven/runner/CompositeConfigurable.java index d37eb922fd..b63cffee66 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/core/action/CompositeConfigurable.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/runner/CompositeConfigurable.java @@ -1,4 +1,4 @@ -package org.jetbrains.idea.maven.core.action; +package org.jetbrains.idea.maven.runner; import com.intellij.openapi.options.Configurable; import com.intellij.openapi.options.ConfigurationException; diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/runner/MavenExecutor.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/runner/MavenExecutor.java index 811680d1e8..34c406ebe8 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/runner/MavenExecutor.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/runner/MavenExecutor.java @@ -21,7 +21,7 @@ package org.jetbrains.idea.maven.runner; import com.intellij.openapi.progress.ProgressIndicator; import com.intellij.openapi.progress.ProgressManager; import org.apache.maven.project.MavenProject; -import org.jetbrains.idea.maven.core.MavenCoreSettings; +import org.jetbrains.idea.maven.project.MavenGeneralSettings; import org.jetbrains.idea.maven.embedder.MavenConsole; import java.text.MessageFormat; @@ -29,7 +29,7 @@ import java.util.List; public abstract class MavenExecutor { final MavenRunnerParameters myParameters; - final MavenCoreSettings myCoreSettings; + final MavenGeneralSettings myCoreSettings; final MavenRunnerSettings myRunnerSettings; private String myCaption; protected MavenConsole myConsole; @@ -40,7 +40,7 @@ public abstract class MavenExecutor { private int exitCode = 0; public MavenExecutor(MavenRunnerParameters parameters, - MavenCoreSettings coreSettings, + MavenGeneralSettings coreSettings, MavenRunnerSettings runnerSettings, String caption, MavenConsole console) { diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/runner/MavenExternalExecutor.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/runner/MavenExternalExecutor.java index 8220dfccb3..b7006709a9 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/runner/MavenExternalExecutor.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/runner/MavenExternalExecutor.java @@ -26,7 +26,7 @@ import com.intellij.openapi.progress.ProgressIndicator; import com.intellij.openapi.util.Key; import org.apache.maven.project.MavenProject; import org.jetbrains.annotations.NonNls; -import org.jetbrains.idea.maven.core.MavenCoreSettings; +import org.jetbrains.idea.maven.project.MavenGeneralSettings; import org.jetbrains.idea.maven.embedder.MavenConsole; import java.util.List; @@ -39,7 +39,7 @@ public class MavenExternalExecutor extends MavenExecutor { @NonNls private static final int INFO_PREFIX_SIZE = "[INFO] ".length(); public MavenExternalExecutor(MavenRunnerParameters parameters, - MavenCoreSettings coreSettings, + MavenGeneralSettings coreSettings, MavenRunnerSettings runnerSettings, MavenConsole console) { super(parameters, coreSettings, runnerSettings, RunnerBundle.message("external.executor.caption"), console); diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/runner/MavenExternalParameters.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/runner/MavenExternalParameters.java index 3e38417d77..7482368469 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/runner/MavenExternalParameters.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/runner/MavenExternalParameters.java @@ -28,7 +28,7 @@ import com.intellij.openapi.util.text.StringUtil; import org.apache.maven.execution.MavenExecutionRequest; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; -import org.jetbrains.idea.maven.core.MavenCoreSettings; +import org.jetbrains.idea.maven.project.MavenGeneralSettings; import org.jetbrains.idea.maven.embedder.MavenEmbedderFactory; import org.jetbrains.idea.maven.runner.MavenRunnerSettings; import org.jetbrains.idea.maven.runner.RunnerBundle; @@ -47,7 +47,7 @@ public class MavenExternalParameters { @NonNls private static final String MAVEN_OPTS = "MAVEN_OPTS"; public static JavaParameters createJavaParameters(final MavenRunnerParameters parameters, - final MavenCoreSettings coreSettings, + final MavenGeneralSettings coreSettings, final MavenRunnerSettings runnerSettings) throws ExecutionException { final JavaParameters params = new JavaParameters(); @@ -114,7 +114,7 @@ public class MavenExternalParameters { } private static List createMavenParameters(final List list, - final MavenCoreSettings coreSettings, + final MavenGeneralSettings coreSettings, final MavenRunnerSettings runnerSettings, final MavenRunnerParameters parameters) { encodeCoreAndRunnerSettings(coreSettings, runnerSettings, list); @@ -162,7 +162,7 @@ public class MavenExternalParameters { cmdList.add(MessageFormat.format("-D{0}={1}", key, value)); } - private static String resolveMavenHome(@NotNull MavenCoreSettings coreSettings) throws ExecutionException { + private static String resolveMavenHome(@NotNull MavenGeneralSettings coreSettings) throws ExecutionException { final File file = MavenEmbedderFactory.resolveMavenHomeDirectory(coreSettings.getMavenHome()); if (file == null) { @@ -206,7 +206,7 @@ public class MavenExternalParameters { return classpathEntries; } - private static void encodeCoreAndRunnerSettings(MavenCoreSettings coreSettings, MavenRunnerSettings runnerSettings, + private static void encodeCoreAndRunnerSettings(MavenGeneralSettings coreSettings, MavenRunnerSettings runnerSettings, @NonNls List cmdList) { if (coreSettings.isWorkOffline()) { cmdList.add("--offline"); diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/runner/MavenRunConfiguration.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/runner/MavenRunConfiguration.java index 7278db0721..9663ad6a58 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/runner/MavenRunConfiguration.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/runner/MavenRunConfiguration.java @@ -17,8 +17,8 @@ import com.intellij.openapi.util.WriteExternalException; import com.intellij.util.xmlb.XmlSerializer; import org.jdom.Element; import org.jetbrains.annotations.NotNull; -import org.jetbrains.idea.maven.core.MavenCore; -import org.jetbrains.idea.maven.core.MavenCoreSettings; +import org.jetbrains.idea.maven.project.MavenGeneralSettings; +import org.jetbrains.idea.maven.project.MavenProjectsManager; import java.io.File; @@ -71,7 +71,7 @@ public class MavenRunConfiguration extends RunConfigurationBase implements Locat return Module.EMPTY_ARRAY; } - public MavenCoreSettings getCoreSettings() { + public MavenGeneralSettings getCoreSettings() { return mySettings.myCoreSettings; } @@ -116,7 +116,7 @@ public class MavenRunConfiguration extends RunConfigurationBase implements Locat public static class MavenSettings implements Cloneable { public static final String TAG = "MavenSettings"; - public MavenCoreSettings myCoreSettings; + public MavenGeneralSettings myCoreSettings; public MavenRunnerSettings myRunnerSettings; public MavenRunnerParameters myRunnerParameters; @@ -125,7 +125,7 @@ public class MavenRunConfiguration extends RunConfigurationBase implements Locat } public MavenSettings(Project project) { - this(MavenCore.getInstance(project).getState(), + this(MavenProjectsManager.getInstance(project).getGeneralSettings(), MavenRunner.getInstance(project).getState(), new MavenRunnerParameters()); } @@ -134,7 +134,7 @@ public class MavenRunConfiguration extends RunConfigurationBase implements Locat this(that.myCoreSettings, that.myRunnerSettings, that.myRunnerParameters); } - private MavenSettings(MavenCoreSettings cs, MavenRunnerSettings rs, MavenRunnerParameters rp) { + private MavenSettings(MavenGeneralSettings cs, MavenRunnerSettings rs, MavenRunnerParameters rp) { myCoreSettings = cs.clone(); myRunnerSettings = rs.clone(); myRunnerSettings.setUseMavenEmbedder(false); diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/runner/MavenRunner.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/runner/MavenRunner.java index 4da7ab9d1c..80a434bd3c 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/runner/MavenRunner.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/runner/MavenRunner.java @@ -5,7 +5,6 @@ import com.intellij.openapi.components.PersistentStateComponent; import com.intellij.openapi.components.State; import com.intellij.openapi.components.Storage; import com.intellij.openapi.fileEditor.FileDocumentManager; -import com.intellij.openapi.options.Configurable; import com.intellij.openapi.progress.ProcessCanceledException; import com.intellij.openapi.progress.ProgressIndicator; import com.intellij.openapi.progress.ProgressManager; @@ -15,9 +14,8 @@ import com.intellij.openapi.util.Pair; import org.apache.maven.project.MavenProject; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.idea.maven.core.MavenCore; -import org.jetbrains.idea.maven.core.MavenCoreSettings; -import org.jetbrains.idea.maven.core.MavenLog; +import org.jetbrains.idea.maven.project.MavenGeneralSettings; +import org.jetbrains.idea.maven.utils.MavenLog; import org.jetbrains.idea.maven.embedder.MavenConsole; import org.jetbrains.idea.maven.embedder.MavenConsoleHelper; import org.jetbrains.idea.maven.embedder.MavenConsoleImpl; @@ -30,7 +28,6 @@ import java.util.List; @State(name = "MavenRunner", storages = {@Storage(id = "default", file = "$WORKSPACE_FILE$")}) public class MavenRunner extends DummyProjectComponent implements PersistentStateComponent { private final Project myProject; - private final MavenCore myMavenCore; private MavenRunnerSettings mySettings = new MavenRunnerSettings(); @@ -38,21 +35,9 @@ public class MavenRunner extends DummyProjectComponent implements PersistentStat return project.getComponent(MavenRunner.class); } - public MavenRunner(final Project project, MavenCore mavenCore) { + public MavenRunner(final Project project) { super("MavenRunner"); - myProject = project; - myMavenCore = mavenCore; - - mavenCore.addConfigurableFactory(new MavenCore.ConfigurableFactory() { - public Configurable createConfigurable() { - return new MavenRunnerSettingsConfigurable(project, false) { - protected MavenRunnerSettings getState() { - return mySettings; - } - }; - } - }); } public MavenRunnerSettings getState() { @@ -74,10 +59,10 @@ public class MavenRunner extends DummyProjectComponent implements PersistentStat public void run(final MavenRunnerParameters parameters, final MavenRunnerSettings settings, final Runnable onComplete) { FileDocumentManager.getInstance().saveAllDocuments(); - final MavenConsole console = createConsole(myMavenCore.getState(), + final MavenConsole console = createConsole(getGeneralSettings(), Pair.create(parameters, settings)); try { - final MavenExecutor[] executor = new MavenExecutor[]{createExecutor(parameters, myMavenCore.getState(), settings, console)}; + final MavenExecutor[] executor = new MavenExecutor[]{createExecutor(parameters, getGeneralSettings(), settings, console)}; ProgressManager.getInstance().run(new Task.Backgroundable(myProject, executor[0].getCaption(), true) { public void run(@NotNull ProgressIndicator indicator) { @@ -125,13 +110,17 @@ public class MavenRunner extends DummyProjectComponent implements PersistentStat } } + private MavenGeneralSettings getGeneralSettings() { + return MavenProjectsManager.getInstance(myProject).getGeneralSettings(); + } + public boolean runBatch(List commands, - @Nullable MavenCoreSettings coreSettings, + @Nullable MavenGeneralSettings coreSettings, @Nullable MavenRunnerSettings runnerSettings, @Nullable final String action, ProgressIndicator indicator) { - final MavenCoreSettings effectiveCoreSettings = coreSettings != null ? coreSettings : myMavenCore.getState(); + final MavenGeneralSettings effectiveCoreSettings = coreSettings != null ? coreSettings : getGeneralSettings(); final MavenRunnerSettings effectiveRunnerSettings = runnerSettings != null ? runnerSettings : getState(); MavenConsole console = createConsole(effectiveCoreSettings, null); @@ -165,7 +154,7 @@ public class MavenRunner extends DummyProjectComponent implements PersistentStat MavenProjectsManager.getInstance(myProject).updateProjectFolders(processedProjects); } - private MavenConsole createConsole(MavenCoreSettings coreSettings, + private MavenConsole createConsole(MavenGeneralSettings coreSettings, Pair parametersAndSettings) { if (ApplicationManager.getApplication().isUnitTestMode()) { return new SoutMavenConsole(); @@ -174,7 +163,7 @@ public class MavenRunner extends DummyProjectComponent implements PersistentStat } private MavenExecutor createExecutor(MavenRunnerParameters taskParameters, - MavenCoreSettings coreSettings, + MavenGeneralSettings coreSettings, MavenRunnerSettings runnerSettings, MavenConsole console) { if (runnerSettings.isUseMavenEmbedder()) { diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/runner/MavenRunnerConfigurable.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/runner/MavenRunnerConfigurable.java new file mode 100644 index 0000000000..2e912d1044 --- /dev/null +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/runner/MavenRunnerConfigurable.java @@ -0,0 +1,239 @@ +/* ========================================================================== + * Copyright 2006 Mevenide Team + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ========================================================================= + */ + +package org.jetbrains.idea.maven.runner; + +import com.intellij.openapi.options.Configurable; +import com.intellij.openapi.options.ConfigurationException; +import com.intellij.openapi.project.Project; +import com.intellij.openapi.util.Pair; +import com.intellij.ui.AddEditRemovePanel; +import com.intellij.ui.RawCommandLineEditor; +import org.jetbrains.annotations.Nls; +import org.jetbrains.annotations.NonNls; +import org.jetbrains.annotations.Nullable; +import org.jetbrains.idea.maven.utils.ComboBoxUtil; +import org.jetbrains.idea.maven.project.MavenProjectsManager; +import org.jetbrains.idea.maven.project.MavenProjectModel; + +import javax.swing.*; +import java.awt.event.ItemEvent; +import java.awt.event.ItemListener; +import java.util.*; + +/** + * Creates the form for the Maven2 build setup and is responsible for updating the + * underlying data model. + * + * @author Ralf Quebbemann (ralfq@codehaus.org) + */ +public abstract class MavenRunnerConfigurable implements Configurable { + private JPanel panel; + private JCheckBox checkBoxRunMavenInBackground; + private JRadioButton radioButtonUseEmbeddedMaven; + private JRadioButton radioButtonUseExternalMaven; + private JLabel labelVMParameters; + private RawCommandLineEditor textFieldVMParameters; + private JLabel labelJdkHomeDirectory; + private JComboBox comboBoxChooseJDK; + private final DefaultComboBoxModel comboboxModelChooseJdk = new DefaultComboBoxModel(); + private JCheckBox checkBoxSkipTests; + private JPanel panelForPropertiesEditor; + private MyPropertiesPanel propertiesPanel; + private Project myProject; + private Map myProperties; + + public MavenRunnerConfigurable(Project p, boolean isRunConfiguration) { + myProject = p; + + propertiesPanel = new MyPropertiesPanel(); + panelForPropertiesEditor.add(propertiesPanel); + + textFieldVMParameters.setDialogCaption(labelVMParameters.getText()); + + if (isRunConfiguration) { + checkBoxRunMavenInBackground.setVisible(false); + radioButtonUseEmbeddedMaven.setVisible(false); + radioButtonUseExternalMaven.setVisible(false); + } else { + final ItemListener mavenModeListener = new ItemListener() { + public void itemStateChanged(ItemEvent e) { + enableControls(); + } + }; + + radioButtonUseEmbeddedMaven.addItemListener(mavenModeListener); + radioButtonUseExternalMaven.addItemListener(mavenModeListener); + } + + collectProperties(); + } + + private void collectProperties() { + MavenProjectsManager s = MavenProjectsManager.getInstance(myProject); + Map result = new LinkedHashMap(); + + for(MavenProjectModel each : s.getProjects()) { + Properties properties = each.getProperties(); + for (Map.Entry p : properties.entrySet()) { + result.put((String)p.getKey(), (String)p.getValue()); + } + } + + myProperties = result; + } + + protected abstract MavenRunnerSettings getState(); + + public JComponent createComponent() { + return getRootComponent(); + } + + public boolean isModified() { + MavenRunnerSettings s = new MavenRunnerSettings(); + setData(s); + return !s.equals(getState()); + } + + public void apply() throws ConfigurationException { + setData(getState()); + } + + public void reset() { + getData(getState()); + } + + @Nls + public String getDisplayName() { + return RunnerBundle.message("maven.tab.runner"); + } + + @Nullable + public Icon getIcon() { + return null; + } + + @Nullable + @NonNls + public String getHelpTopic() { + return null; + } + + public void disposeUIResources() { + + } + + private void fillComboboxJdk(MavenRunnerSettings data) { + comboboxModelChooseJdk.removeAllElements(); + for (Pair jdk : data.collectJdkNamesAndDescriptions()) { + ComboBoxUtil.addToModel(comboboxModelChooseJdk, jdk.getFirst(), jdk.getSecond()); + } + comboBoxChooseJDK.setModel(comboboxModelChooseJdk); + } + + JComponent getRootComponent() { + return panel; + } + + void getData(MavenRunnerSettings data) { + radioButtonUseEmbeddedMaven.setSelected(data.isUseMavenEmbedder()); + radioButtonUseExternalMaven.setSelected(!data.isUseMavenEmbedder()); + checkBoxRunMavenInBackground.setSelected(data.isRunMavenInBackground()); + textFieldVMParameters.setText(data.getVmOptions()); + checkBoxSkipTests.setSelected(data.isSkipTests()); + + enableControls(); + + fillComboboxJdk(data); + ComboBoxUtil.select(comboboxModelChooseJdk, data.getJreName()); + + propertiesPanel.setDataFromMap(data.getMavenProperties()); + } + + void setData(MavenRunnerSettings data) { + data.setUseMavenEmbedder(radioButtonUseEmbeddedMaven.isSelected()); + data.setRunMavenInBackground(checkBoxRunMavenInBackground.isSelected()); + data.setVmOptions(textFieldVMParameters.getText().trim()); + data.setSkipTests(checkBoxSkipTests.isSelected()); + data.setJreName(ComboBoxUtil.getSelectedString(comboboxModelChooseJdk)); + + data.setMavenProperties(propertiesPanel.getDataAsMap()); + } + + private void enableControls() { + final boolean on = radioButtonUseExternalMaven.isSelected(); + labelVMParameters.setEnabled(on); + textFieldVMParameters.setEnabled(on); + labelJdkHomeDirectory.setEnabled(on); + comboBoxChooseJDK.setEnabled(on); + } + + private class MyPropertiesPanel extends AddEditRemovePanel> { + public MyPropertiesPanel() { + super(new MyPropertiesTableModel(), new ArrayList>(), null); + } + + protected Pair addItem() { + return doAddOrEdit(new Pair("", "")); + } + + protected boolean removeItem(Pair o) { + return true; + } + + protected Pair editItem(Pair o) { + return doAddOrEdit(o); + } + + private Pair doAddOrEdit(Pair o) { + EditMavenPropertyDialog d = new EditMavenPropertyDialog(myProject, o, myProperties); + d.show(); + if (!d.isOK()) return null; + return d.getValue(); + } + + public Map getDataAsMap() { + Map result = new LinkedHashMap(); + for (Pair p : getData()) { + result.put(p.getFirst(), p.getSecond()); + } + return result; + } + + public void setDataFromMap(Map map) { + List> result = new ArrayList>(); + for (Map.Entry e : map.entrySet()) { + result.add(new Pair(e.getKey(), e.getValue())); + } + setData(result); + } + } + + private static class MyPropertiesTableModel implements AddEditRemovePanel.TableModel> { + public int getColumnCount() { + return 2; + } + + public String getColumnName(int c) { + return c == 0 ? "Name" : "Value"; + } + + public Object getField(Pair o, int c) { + return c == 0? o.getFirst() : o.getSecond(); + } + } +} diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/runner/MavenRunnerSettingsEditor.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/runner/MavenRunnerSettingsEditor.java index b9c9b611c2..ed99b18b46 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/runner/MavenRunnerSettingsEditor.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/runner/MavenRunnerSettingsEditor.java @@ -5,9 +5,9 @@ import com.intellij.openapi.options.ConfigurationException; import com.intellij.openapi.options.SettingsEditor; import com.intellij.openapi.project.Project; import org.jetbrains.annotations.NotNull; -import org.jetbrains.idea.maven.core.MavenCoreConfigurable; -import org.jetbrains.idea.maven.core.MavenCoreSettings; -import org.jetbrains.idea.maven.core.action.CompositeConfigurable; +import org.jetbrains.idea.maven.project.MavenGeneralConfigurable; +import org.jetbrains.idea.maven.project.MavenGeneralSettings; +import org.jetbrains.idea.maven.runner.CompositeConfigurable; import javax.swing.*; @@ -25,11 +25,11 @@ public class MavenRunnerSettingsEditor extends SettingsEditor result = new ArrayList(); + + result.add(new MavenGeneralConfigurable() { + protected MavenGeneralSettings getState() { + return MavenProjectsManager.getInstance(myProject).getGeneralSettings(); + } + }); + result.add(new MavenImportingConfigurable(MavenProjectsManager.getInstance(myProject).getImportingSettings())); + result.add(new MavenIgnoreConfigurable(MavenProjectsManager.getInstance(myProject))); + result.add(new MavenDownloadingConfigurable(MavenProjectsManager.getInstance(myProject).getArtifactSettings())); + + result.add(new MavenRunnerConfigurable(myProject, false) { + protected MavenRunnerSettings getState() { + return MavenRunner.getInstance(myProject).getState(); + } + }); + + if (!myProject.isDefault()) { + result.add(new MavenIndicesConfigurable(myProject)); + } + + return result.toArray(new Configurable[result.size()]); + } + + public String getId() { + return MavenSettings.class.getSimpleName(); + } + + @Nls + public String getDisplayName() { + return "Maven"; + } + + public Icon getIcon() { + return IconLoader.getIcon("/general/configurableEditor.png"); + } + + public String getHelpTopic() { + return null; + } +} diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/wizards/MavenModuleBuilder.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/wizards/MavenModuleBuilder.java index f5c4dba85e..b38cca24db 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/wizards/MavenModuleBuilder.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/wizards/MavenModuleBuilder.java @@ -20,7 +20,7 @@ import com.intellij.psi.PsiFile; import com.intellij.psi.PsiManager; import com.intellij.psi.codeStyle.CodeStyleManager; import com.intellij.psi.xml.XmlElement; -import org.jetbrains.idea.maven.core.MavenLog; +import org.jetbrains.idea.maven.utils.MavenLog; import org.jetbrains.idea.maven.dom.MavenDomUtil; import org.jetbrains.idea.maven.dom.model.MavenModel; import org.jetbrains.idea.maven.dom.model.Module; diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/wizards/MavenProjectBuilder.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/wizards/MavenProjectBuilder.java index eded591564..d223dc299e 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/wizards/MavenProjectBuilder.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/wizards/MavenProjectBuilder.java @@ -14,8 +14,7 @@ import com.intellij.projectImport.ProjectImportBuilder; import org.apache.maven.model.Model; import org.apache.maven.model.Profile; import org.jetbrains.annotations.Nullable; -import org.jetbrains.idea.maven.core.MavenCore; -import org.jetbrains.idea.maven.core.MavenCoreSettings; +import org.jetbrains.idea.maven.project.MavenGeneralSettings; import org.jetbrains.idea.maven.embedder.MavenEmbedderFactory; import org.jetbrains.idea.maven.embedder.MavenEmbedderWrapper; import org.jetbrains.idea.maven.project.*; @@ -37,9 +36,9 @@ public class MavenProjectBuilder extends ProjectImportBuilder private Project myProjectToUpdate; - private MavenCoreSettings myCoreSettings; - private MavenImportSettings myImporterSettings; - private MavenArtifactSettings myArtifactSettings; + private MavenGeneralSettings myGeneralSettingsCache; + private MavenImportingSettings myImportingSettingsCache; + private MavenDownloadingSettings myDownloadingSettingsCache; private VirtualFile myImportRoot; private List myFiles; @@ -71,9 +70,9 @@ public class MavenProjectBuilder extends ProjectImportBuilder } public List commit(final Project project, final ModifiableModuleModel model, final ModulesProvider modulesProvider) { - project.getComponent(MavenWorkspaceSettingsComponent.class).getState().myImporterSettings = getImporterPreferences(); - project.getComponent(MavenWorkspaceSettingsComponent.class).getState().myArtifactSettings = getArtifactPreferences(); - project.getComponent(MavenCore.class).loadState(myCoreSettings); + project.getComponent(MavenWorkspaceSettingsComponent.class).getState().generalSettings = getGeneralSettings(); + project.getComponent(MavenWorkspaceSettingsComponent.class).getState().importingSettings = getImportingSettings(); + project.getComponent(MavenWorkspaceSettingsComponent.class).getState().downloadingSettings = getDownloadingSettings(); MavenProjectsManager manager = MavenProjectsManager.getInstance(project); @@ -87,7 +86,7 @@ public class MavenProjectBuilder extends ProjectImportBuilder } private void enusreRepositoryPathMacro() { - final File repo = myCoreSettings.getEffectiveLocalRepository(); + final File repo = getGeneralSettings().getEffectiveLocalRepository(); final PathMacros macros = PathMacros.getInstance(); for (String each : macros.getAllMacroNames()) { @@ -121,9 +120,7 @@ public class MavenProjectBuilder extends ProjectImportBuilder return runConfigurationProcess(ProjectBundle.message("maven.scanning.projects"), new MavenProcess.MavenTask() { public void run(MavenProcess p) throws MavenProcessCanceledException { p.setText(ProjectBundle.message("maven.locating.files")); - myFiles = FileFinder.findPomFiles(getImportRoot().getChildren(), - getImporterPreferences().isLookForNested(), - p.getIndicator(), + myFiles = FileFinder.findPomFiles(getImportRoot().getChildren(), getImportingSettings().isLookForNested(), p.getIndicator(), new ArrayList()); collectProfiles(); @@ -140,7 +137,7 @@ public class MavenProjectBuilder extends ProjectImportBuilder private void collectProfiles() { myProfiles = new ArrayList(); - MavenEmbedderWrapper e = MavenEmbedderFactory.createEmbedderForRead(getCoreState(), new SoutMavenConsole()); + MavenEmbedderWrapper e = MavenEmbedderFactory.createEmbedderForRead(getGeneralSettings(), new SoutMavenConsole()); try { for (VirtualFile f : myFiles) { MavenProjectHolder holder = MavenReader.readProject(e, f, new ArrayList()); @@ -198,11 +195,7 @@ public class MavenProjectBuilder extends ProjectImportBuilder private void readMavenProjectTree(MavenProcess p) throws MavenProcessCanceledException { myMavenProjectTree = new MavenProjectsTree(); - myMavenProjectTree.read(myFiles, - mySelectedProfiles, - getCoreState(), - new SoutMavenConsole(), - p); + myMavenProjectTree.read(myFiles, mySelectedProfiles, getGeneralSettings(), new SoutMavenConsole(), p); } public List getList() { @@ -227,27 +220,25 @@ public class MavenProjectBuilder extends ProjectImportBuilder myOpenModulesConfigurator = on; } - public MavenCoreSettings getCoreState() { - if (myCoreSettings == null) { - myCoreSettings = getProject().getComponent(MavenCore.class).getState().clone(); + public MavenGeneralSettings getGeneralSettings() { + if (myGeneralSettingsCache == null) { + myGeneralSettingsCache = getProject().getComponent(MavenWorkspaceSettingsComponent.class).getState().generalSettings.clone(); } - return myCoreSettings; + return myGeneralSettingsCache; } - public MavenImportSettings getImporterPreferences() { - if (myImporterSettings == null) { - myImporterSettings = getProject().getComponent(MavenWorkspaceSettingsComponent.class).getState() - .myImporterSettings.clone(); + public MavenImportingSettings getImportingSettings() { + if (myImportingSettingsCache == null) { + myImportingSettingsCache = getProject().getComponent(MavenWorkspaceSettingsComponent.class).getState().importingSettings.clone(); } - return myImporterSettings; + return myImportingSettingsCache; } - private MavenArtifactSettings getArtifactPreferences() { - if (myArtifactSettings == null) { - myArtifactSettings = getProject().getComponent(MavenWorkspaceSettingsComponent.class).getState() - .myArtifactSettings.clone(); + private MavenDownloadingSettings getDownloadingSettings() { + if (myDownloadingSettingsCache == null) { + myDownloadingSettingsCache = getProject().getComponent(MavenWorkspaceSettingsComponent.class).getState().downloadingSettings.clone(); } - return myArtifactSettings; + return myDownloadingSettingsCache; } private Project getProject() { diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/wizards/MavenProjectRootStep.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/wizards/MavenProjectRootStep.java index 12a1614953..ec1af2d58e 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/wizards/MavenProjectRootStep.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/wizards/MavenProjectRootStep.java @@ -11,11 +11,8 @@ import com.intellij.projectImport.ProjectImportWizardStep; import org.jetbrains.annotations.Nls; import org.jetbrains.annotations.NonNls; 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.MavenImportSettingsForm; -import org.jetbrains.idea.maven.project.MavenImportSettings; -import org.jetbrains.idea.maven.project.ProjectBundle; +import org.jetbrains.idea.maven.project.MavenGeneralSettings; +import org.jetbrains.idea.maven.project.*; import javax.swing.*; import java.awt.*; @@ -27,18 +24,18 @@ import java.awt.event.MouseEvent; */ public class MavenProjectRootStep extends ProjectImportWizardStep { - private MavenCoreSettings myCoreSettings; + private MavenGeneralSettings myCoreSettings; private MavenProjectBuilder myImportContext; - private MavenImportSettings myImporterSettings; + private MavenImportingSettings myImportingSettings; private final JPanel myPanel; private NamePathComponent myRootPathComponent; - private final MavenImportSettingsForm myImporterSettingsForm; + private final MavenImportingSettingsForm myImporterSettingsForm; public MavenProjectRootStep(WizardContext wizardContext) { super(wizardContext); - myImporterSettingsForm = new MavenImportSettingsForm(true) { + myImporterSettingsForm = new MavenImportingSettingsForm(true) { public String getDefaultModuleDir() { return myRootPathComponent.getPath(); } @@ -76,7 +73,7 @@ public class MavenProjectRootStep extends ProjectImportWizardStep { } public void updateDataModel() { - final MavenImportSettings settings = getImporterSettings(); + final MavenImportingSettings settings = getImportingSettings(); myImporterSettingsForm.getData(settings); suggestProjectNameAndPath(settings.getDedicatedModuleDir(), myRootPathComponent.getPath()); } @@ -101,16 +98,16 @@ public class MavenProjectRootStep extends ProjectImportWizardStep { myRootPathComponent.getPathComponent().selectAll(); } } - myImporterSettingsForm.setData(getImporterSettings()); + myImporterSettingsForm.setData(getImportingSettings()); } public JComponent getPreferredFocusedComponent() { return myRootPathComponent.getPathComponent(); } - private MavenCoreSettings getCoreSettings() { + private MavenGeneralSettings getCoreSettings() { if (myCoreSettings == null) { - myCoreSettings = ((MavenProjectBuilder)getBuilder()).getCoreState(); + myCoreSettings = ((MavenProjectBuilder)getBuilder()).getGeneralSettings(); } return myCoreSettings; } @@ -122,11 +119,11 @@ public class MavenProjectRootStep extends ProjectImportWizardStep { return myImportContext; } - public MavenImportSettings getImporterSettings() { - if (myImporterSettings == null) { - myImporterSettings = ((MavenProjectBuilder)getBuilder()).getImporterPreferences(); + public MavenImportingSettings getImportingSettings() { + if (myImportingSettings == null) { + myImportingSettings = ((MavenProjectBuilder)getBuilder()).getImportingSettings(); } - return myImporterSettings; + return myImportingSettings; } @NonNls @@ -135,7 +132,7 @@ public class MavenProjectRootStep extends ProjectImportWizardStep { } class MavenPathsConfigurable implements Configurable { - MavenPathsForm myForm = new MavenPathsForm(); + MavenEnvironmentForm myForm = new MavenEnvironmentForm(); @Nls public String getDisplayName() { diff --git a/plugins/maven/src/main/resources/IndicesBundle.properties b/plugins/maven/src/main/resources/IndicesBundle.properties index d699e0ecca..68a6f6a51d 100644 --- a/plugins/maven/src/main/resources/IndicesBundle.properties +++ b/plugins/maven/src/main/resources/IndicesBundle.properties @@ -1,4 +1,4 @@ -maven.indices=Maven Repository Indices +maven.indices=Repository Indices maven.index.url=URL maven.index.type=Type maven.index.timestamp=Updated diff --git a/plugins/maven/src/main/resources/META-INF/plugin.xml b/plugins/maven/src/main/resources/META-INF/plugin.xml index 839b205049..8396742034 100644 --- a/plugins/maven/src/main/resources/META-INF/plugin.xml +++ b/plugins/maven/src/main/resources/META-INF/plugin.xml @@ -25,6 +25,8 @@ + + @@ -34,7 +36,7 @@ - + @@ -61,10 +63,6 @@ - org.jetbrains.idea.maven.core.MavenCore - - org.jetbrains.idea.maven.project.MavenProjectsManager @@ -88,26 +86,14 @@ - - - - - - @@ -188,21 +174,19 @@ - - - - - - - + + + + + diff --git a/plugins/maven/src/main/resources/ProjectBundle.properties b/plugins/maven/src/main/resources/ProjectBundle.properties index 5e95ab674c..dce8e5c349 100644 --- a/plugins/maven/src/main/resources/ProjectBundle.properties +++ b/plugins/maven/src/main/resources/ProjectBundle.properties @@ -36,9 +36,9 @@ maven.navigator.nothing.to.display=
There are no Maven projects to or {1} to let the plugin find all pom.xml files
\ under the project roots and import them.
-maven.import=Import +maven.tab.importing=Importing -maven.tab.artifacts=Artifacts +maven.tab.downloading=Downloading maven.download.never=Never maven.download.ondemand=On demand maven.download.always=On import @@ -56,3 +56,12 @@ maven.project.problem.missingModule=Missing module: ''{0}''. maven.project.problem.unresolvedDependency=Unresolved dependency: ''{0}''. maven.project.problem.unresolvedExtension=Unresolved build extension: ''{0}''. maven.project.problem.unresolvedPlugin=Unresolved plugin: ''{0}''. + + +maven.tab.general=General +maven.configurable.name=Maven Integration +maven.default.configurable.name=Maven Integration: default settings +maven.select.maven.home.directory=Select Maven installation directory +maven.select.maven.settings.file=Select Maven settings file +maven.select.local.repository=Select Maven local repository +maven.file.type.descr=Maven project files \ No newline at end of file diff --git a/plugins/maven/src/test/java/org/jetbrains/idea/maven/ArchetypesTest.java b/plugins/maven/src/test/java/org/jetbrains/idea/maven/ArchetypesTest.java index 13869a1459..46f7487b2a 100644 --- a/plugins/maven/src/test/java/org/jetbrains/idea/maven/ArchetypesTest.java +++ b/plugins/maven/src/test/java/org/jetbrains/idea/maven/ArchetypesTest.java @@ -35,10 +35,10 @@ public class ArchetypesTest extends MavenTestCase { settings.setMavenProperties(props); MavenExecutor exec; if (useEmbedder) { - exec = new MavenEmbeddedExecutor(params, getMavenCoreSettings(), settings, new NullMavenConsole()); + exec = new MavenEmbeddedExecutor(params, getMavenGeneralSettings(), settings, new NullMavenConsole()); } else { settings.setJreName(MavenRunnerSettings.USE_INTERNAL_JAVA); - exec = new MavenExternalExecutor(params, getMavenCoreSettings(), settings, new NullMavenConsole()); + exec = new MavenExternalExecutor(params, getMavenGeneralSettings(), settings, new NullMavenConsole()); } exec.execute(new ArrayList(), new EmptyProgressIndicator()); diff --git a/plugins/maven/src/test/java/org/jetbrains/idea/maven/MavenImportingTestCase.java b/plugins/maven/src/test/java/org/jetbrains/idea/maven/MavenImportingTestCase.java index adeb07a319..2ba592f57c 100644 --- a/plugins/maven/src/test/java/org/jetbrains/idea/maven/MavenImportingTestCase.java +++ b/plugins/maven/src/test/java/org/jetbrains/idea/maven/MavenImportingTestCase.java @@ -23,7 +23,6 @@ import org.jetbrains.idea.maven.project.*; import org.jetbrains.idea.maven.runner.MavenEmbeddedExecutor; import org.jetbrains.idea.maven.runner.MavenRunnerParameters; import org.jetbrains.idea.maven.runner.MavenRunnerSettings; -import org.jetbrains.idea.maven.runner.SoutMavenConsole; import java.io.File; import java.io.IOException; @@ -50,8 +49,8 @@ public abstract class MavenImportingTestCase extends MavenTestCase { super.tearDown(); } - protected MavenImportSettings getMavenImporterSettings() { - return myMavenProjectsManager.getImportSettings(); + protected MavenImportingSettings getMavenImporterSettings() { + return myMavenProjectsManager.getImportingSettings(); } protected MavenTreeStructure.RootNode createMavenTree() { @@ -334,7 +333,7 @@ public abstract class MavenImportingTestCase extends MavenTestCase { MavenRunnerParameters rp = new MavenRunnerParameters(true, dir.getPath(), Arrays.asList(goal), null); MavenRunnerSettings rs = new MavenRunnerSettings(); - MavenEmbeddedExecutor e = new MavenEmbeddedExecutor(rp, getMavenCoreSettings(), rs, new NullMavenConsole()); + MavenEmbeddedExecutor e = new MavenEmbeddedExecutor(rp, getMavenGeneralSettings(), rs, new NullMavenConsole()); e.execute(new ArrayList(), new EmptyProgressIndicator()); } diff --git a/plugins/maven/src/test/java/org/jetbrains/idea/maven/MavenTestCase.java b/plugins/maven/src/test/java/org/jetbrains/idea/maven/MavenTestCase.java index 5f8245282f..1134afa3a1 100644 --- a/plugins/maven/src/test/java/org/jetbrains/idea/maven/MavenTestCase.java +++ b/plugins/maven/src/test/java/org/jetbrains/idea/maven/MavenTestCase.java @@ -13,8 +13,8 @@ import com.intellij.openapi.vfs.VirtualFile; import com.intellij.testFramework.fixtures.IdeaProjectTestFixture; import com.intellij.testFramework.fixtures.IdeaTestFixtureFactory; import junit.framework.TestCase; -import org.jetbrains.idea.maven.core.MavenCore; -import org.jetbrains.idea.maven.core.MavenCoreSettings; +import org.jetbrains.idea.maven.project.MavenGeneralSettings; +import org.jetbrains.idea.maven.project.MavenProjectsManager; import java.io.File; import java.io.IOException; @@ -146,12 +146,8 @@ public abstract class MavenTestCase extends TestCase { }.executeSilently().throwException(); } - protected MavenCore getMavenCore() { - return MavenCore.getInstance(myProject); - } - - protected MavenCoreSettings getMavenCoreSettings() { - return getMavenCore().getState(); + protected MavenGeneralSettings getMavenGeneralSettings() { + return MavenProjectsManager.getInstance(myProject).getGeneralSettings(); } protected String getRepositoryPath() { @@ -160,11 +156,11 @@ public abstract class MavenTestCase extends TestCase { } protected File getRepositoryFile() { - return getMavenCoreSettings().getEffectiveLocalRepository(); + return getMavenGeneralSettings().getEffectiveLocalRepository(); } protected void setRepositoryPath(String path) { - getMavenCoreSettings().setLocalRepository(path); + getMavenGeneralSettings().setLocalRepository(path); } protected String getProjectPath() { @@ -179,7 +175,7 @@ public abstract class MavenTestCase extends TestCase { File file = new File(myDir, "settings.xml"); file.createNewFile(); FileUtil.writeToFile(file, content.getBytes()); - getMavenCoreSettings().setMavenSettingsFile(file.getPath()); + getMavenGeneralSettings().setMavenSettingsFile(file.getPath()); } protected Module createModule(String name) throws IOException { diff --git a/plugins/maven/src/test/java/org/jetbrains/idea/maven/indices/MavenIndicesStressTest.java b/plugins/maven/src/test/java/org/jetbrains/idea/maven/indices/MavenIndicesStressTest.java index f41a21f343..974f8ae70f 100644 --- a/plugins/maven/src/test/java/org/jetbrains/idea/maven/indices/MavenIndicesStressTest.java +++ b/plugins/maven/src/test/java/org/jetbrains/idea/maven/indices/MavenIndicesStressTest.java @@ -21,7 +21,7 @@ public abstract class MavenIndicesStressTest extends MavenTestCase implements Ma helper.copy("local2", "local1"); //setRepositoryPath(fixture.getTestDataPath("local1")); - MavenEmbedder embedder = MavenEmbedderFactory.createEmbedderForExecute(getMavenCoreSettings(), new NullMavenConsole()).getEmbedder(); + MavenEmbedder embedder = MavenEmbedderFactory.createEmbedderForExecute(getMavenGeneralSettings(), new NullMavenConsole()).getEmbedder(); File indicesDir = new File(myDir, "indices"); final MavenIndices indices = new MavenIndices(embedder, indicesDir, this); @@ -81,7 +81,7 @@ public abstract class MavenIndicesStressTest extends MavenTestCase implements Ma helper.copy("local2", "local1"); setRepositoryPath(helper.getTestDataPath("local1")); - MavenEmbedder embedder = MavenEmbedderFactory.createEmbedderForExecute(getMavenCoreSettings(), new NullMavenConsole()).getEmbedder(); + MavenEmbedder embedder = MavenEmbedderFactory.createEmbedderForExecute(getMavenGeneralSettings(), new NullMavenConsole()).getEmbedder(); File indicesDir = new File(myDir, "indices"); MavenIndices indices = new MavenIndices(embedder, indicesDir, this); diff --git a/plugins/maven/src/test/java/org/jetbrains/idea/maven/indices/MavenIndicesTest.java b/plugins/maven/src/test/java/org/jetbrains/idea/maven/indices/MavenIndicesTest.java index 42fa79f448..dd8aa538aa 100644 --- a/plugins/maven/src/test/java/org/jetbrains/idea/maven/indices/MavenIndicesTest.java +++ b/plugins/maven/src/test/java/org/jetbrains/idea/maven/indices/MavenIndicesTest.java @@ -44,7 +44,7 @@ public class MavenIndicesTest extends MavenImportingTestCase { } private void initIndices(String relativeDir) { - myEmbedder = MavenEmbedderFactory.createEmbedderForExecute(getMavenCoreSettings(), new NullMavenConsole()).getEmbedder(); + myEmbedder = MavenEmbedderFactory.createEmbedderForExecute(getMavenGeneralSettings(), new NullMavenConsole()).getEmbedder(); myIndicesDir = new File(myDir, relativeDir); myIndices = new MavenIndices(myEmbedder, myIndicesDir, new MavenIndex.IndexListener() { public void indexIsBroken(MavenIndex index) { diff --git a/plugins/maven/src/test/java/org/jetbrains/idea/maven/indices/MavenIndicesTestFixture.java b/plugins/maven/src/test/java/org/jetbrains/idea/maven/indices/MavenIndicesTestFixture.java index 1a3d95c3c0..0d7c65817a 100644 --- a/plugins/maven/src/test/java/org/jetbrains/idea/maven/indices/MavenIndicesTestFixture.java +++ b/plugins/maven/src/test/java/org/jetbrains/idea/maven/indices/MavenIndicesTestFixture.java @@ -2,7 +2,7 @@ package org.jetbrains.idea.maven.indices; import com.intellij.openapi.project.Project; import com.intellij.util.ArrayUtil; -import org.jetbrains.idea.maven.core.MavenCore; +import org.jetbrains.idea.maven.project.MavenProjectsManager; import java.io.File; import java.io.IOException; @@ -34,7 +34,7 @@ public class MavenIndicesTestFixture { addToRepository(each); } - MavenCore.getInstance(myProject).getState().setLocalRepository(myRepositoryHelper.getTestDataPath(myLocalRepoDir)); + MavenProjectsManager.getInstance(myProject).getGeneralSettings().setLocalRepository(myRepositoryHelper.getTestDataPath(myLocalRepoDir)); getIndicesManager().setTestIndexDir(new File(myDir, "MavenIndices")); myIndicesManager = MavenProjectIndicesManager.getInstance(myProject); diff --git a/plugins/maven/src/test/java/org/jetbrains/idea/maven/indices/NexusIndexerTest.java b/plugins/maven/src/test/java/org/jetbrains/idea/maven/indices/NexusIndexerTest.java index ade9c147b7..e78c1a5f83 100644 --- a/plugins/maven/src/test/java/org/jetbrains/idea/maven/indices/NexusIndexerTest.java +++ b/plugins/maven/src/test/java/org/jetbrains/idea/maven/indices/NexusIndexerTest.java @@ -35,7 +35,7 @@ public class NexusIndexerTest extends MavenTestCase { super.setUp(); myRepositoryHelper = new MavenCustomRepositoryHelper(myDir, "local1_index", "local1", "remote"); - myEmbedder = MavenEmbedderFactory.createEmbedderForExecute(getMavenCoreSettings(), new NullMavenConsole()).getEmbedder(); + myEmbedder = MavenEmbedderFactory.createEmbedderForExecute(getMavenGeneralSettings(), new NullMavenConsole()).getEmbedder(); PlexusContainer p = myEmbedder.getPlexusContainer(); myIndexer = (NexusIndexer)p.lookup(NexusIndexer.class); diff --git a/plugins/maven/src/test/java/org/jetbrains/idea/maven/project/MavenProjectsTreeTest.java b/plugins/maven/src/test/java/org/jetbrains/idea/maven/project/MavenProjectsTreeTest.java index 41870fdc33..4ced57d3b5 100644 --- a/plugins/maven/src/test/java/org/jetbrains/idea/maven/project/MavenProjectsTreeTest.java +++ b/plugins/maven/src/test/java/org/jetbrains/idea/maven/project/MavenProjectsTreeTest.java @@ -686,7 +686,7 @@ public class MavenProjectsTreeTest extends MavenImportingTestCase { assertEquals("child", myTree.findProject(child).getMavenProject().getArtifactId()); - myTree.delete(asList(parent), getMavenCoreSettings(), NULL_CONSOLE, EMPTY_PROCESS); + myTree.delete(asList(parent), getMavenGeneralSettings(), NULL_CONSOLE, EMPTY_PROCESS); assertEquals("${childName}", myTree.findProject(child).getMavenProject().getArtifactId()); } @@ -725,7 +725,7 @@ public class MavenProjectsTreeTest extends MavenImportingTestCase { readModel(myProjectPom, child, subChild); assertEquals("subChild", myTree.findProject(subChild).getMavenProject().getArtifactId()); - myTree.delete(asList(child), getMavenCoreSettings(), NULL_CONSOLE, EMPTY_PROCESS); + myTree.delete(asList(child), getMavenGeneralSettings(), NULL_CONSOLE, EMPTY_PROCESS); assertEquals("${subChildName}", myTree.findProject(subChild).getMavenProject().getArtifactId()); } @@ -976,7 +976,7 @@ public class MavenProjectsTreeTest extends MavenImportingTestCase { assertEquals(1, roots.size()); assertEquals(1, myTree.getModules(roots.get(0)).size()); - myTree.delete(asList(m), getMavenCoreSettings(), NULL_CONSOLE, EMPTY_PROCESS); + myTree.delete(asList(m), getMavenGeneralSettings(), NULL_CONSOLE, EMPTY_PROCESS); roots = myTree.getRootProjects(); assertEquals(1, roots.size()); @@ -1015,7 +1015,7 @@ public class MavenProjectsTreeTest extends MavenImportingTestCase { assertEquals(1, myTree.getModules(roots.get(0)).size()); assertEquals(1, myTree.getModules(myTree.getModules(roots.get(0)).get(0)).size()); - myTree.delete(asList(m1), getMavenCoreSettings(), NULL_CONSOLE, EMPTY_PROCESS); + myTree.delete(asList(m1), getMavenGeneralSettings(), NULL_CONSOLE, EMPTY_PROCESS); roots = myTree.getRootProjects(); assertEquals(1, roots.size()); @@ -1030,12 +1030,12 @@ public class MavenProjectsTreeTest extends MavenImportingTestCase { private void readModel(List profiles, VirtualFile... files) throws MavenProcessCanceledException, MavenException { myTree.read(asList(files), profiles, - getMavenCoreSettings(), + getMavenGeneralSettings(), NULL_CONSOLE, EMPTY_PROCESS); } private void update(VirtualFile files) throws MavenProcessCanceledException { - myTree.update(asList(files), getMavenCoreSettings(), NULL_CONSOLE, EMPTY_PROCESS); + myTree.update(asList(files), getMavenGeneralSettings(), NULL_CONSOLE, EMPTY_PROCESS); } } diff --git a/plugins/maven/src/test/java/org/jetbrains/idea/maven/runner/MavenExecutorsTest.java b/plugins/maven/src/test/java/org/jetbrains/idea/maven/runner/MavenExecutorsTest.java index 3168a73b3e..ce0e403460 100644 --- a/plugins/maven/src/test/java/org/jetbrains/idea/maven/runner/MavenExecutorsTest.java +++ b/plugins/maven/src/test/java/org/jetbrains/idea/maven/runner/MavenExecutorsTest.java @@ -37,11 +37,11 @@ public class MavenExecutorsTest extends MavenTestCase { MavenExecutor e; if (useEmbedder) { - e = new MavenEmbeddedExecutor(params, getMavenCoreSettings(), settings, new NullMavenConsole()); + e = new MavenEmbeddedExecutor(params, getMavenGeneralSettings(), settings, new NullMavenConsole()); } else { settings.setJreName(MavenRunnerSettings.USE_INTERNAL_JAVA); - e = new MavenExternalExecutor(params, getMavenCoreSettings(), settings, new NullMavenConsole()); + e = new MavenExternalExecutor(params, getMavenGeneralSettings(), settings, new NullMavenConsole()); } assertTrue(e.execute(new ArrayList(), new EmptyProgressIndicator())); @@ -85,7 +85,7 @@ public class MavenExecutorsTest extends MavenTestCase { } }; - MavenExecutor e = new MavenEmbeddedExecutor(params, getMavenCoreSettings(), new MavenRunnerSettings(), console); + MavenExecutor e = new MavenEmbeddedExecutor(params, getMavenGeneralSettings(), new MavenRunnerSettings(), console); e.execute(new ArrayList(), new EmptyProgressIndicator()); assertTrue(buffer.toString(), buffer.toString().contains(containingString)); } @@ -112,7 +112,7 @@ public class MavenExecutorsTest extends MavenTestCase { "1"); MavenRunnerParameters params = new MavenRunnerParameters(true, getProjectPath(), Arrays.asList("compile"), null); - MavenEmbeddedExecutor e = new MavenEmbeddedExecutor(params, getMavenCoreSettings(), new MavenRunnerSettings(), new NullMavenConsole()) + MavenEmbeddedExecutor e = new MavenEmbeddedExecutor(params, getMavenGeneralSettings(), new MavenRunnerSettings(), new NullMavenConsole()) ; ArrayList result = new ArrayList(); -- 2.11.4.GIT