summaryrefslogtreecommitdiffstatsabout
diff options
context:
space:
mode:
authorMatthew Piggott2011-02-14 10:21:32 (EST)
committer Pascal Rapicault2011-02-16 13:16:48 (EST)
commita8879c34b33cb377e49466ef9d22e6c693f3bbfe (patch)
treec51edf9cca12e5fcbe42a5e2977d435ae84c30b1
parent0077d01e8805a192b5908da030bef7d8a27f64db (diff)
downloadm2e-core-a8879c34b33cb377e49466ef9d22e6c693f3bbfe.zip
m2e-core-a8879c34b33cb377e49466ef9d22e6c693f3bbfe.tar.gz
m2e-core-a8879c34b33cb377e49466ef9d22e6c693f3bbfe.tar.bz2
Bug 336626 - Removed Dependency Dialog Page from wizards
-rw-r--r--org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/MavenModuleWizard.java13
-rw-r--r--org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/MavenPomWizard.java11
-rw-r--r--org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/MavenProjectWizard.java13
3 files changed, 0 insertions, 37 deletions
diff --git a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/MavenModuleWizard.java b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/MavenModuleWizard.java
index eb5b434..74bfa42 100644
--- a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/MavenModuleWizard.java
+++ b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/MavenModuleWizard.java
@@ -16,7 +16,6 @@ import java.util.List;
import java.util.Properties;
import org.apache.maven.archetype.catalog.Archetype;
-import org.apache.maven.model.Dependency;
import org.apache.maven.model.Model;
import org.apache.maven.model.Parent;
import org.eclipse.core.resources.IFile;
@@ -73,9 +72,6 @@ public class MavenModuleWizard extends AbstractMavenProjectWizard implements INe
/** The wizard page for gathering archetype project information. */
protected MavenProjectWizardArchetypeParametersPage parametersPage;
- /** The wizard page for choosing the Maven2 dependencies to use. */
- private MavenDependenciesWizardPage dependenciesPage;
-
private String moduleName;
protected boolean isEditor = false;
@@ -98,17 +94,11 @@ public class MavenModuleWizard extends AbstractMavenProjectWizard implements INe
archetypePage = new MavenProjectWizardArchetypePage(importConfiguration);
parametersPage = new MavenProjectWizardArchetypeParametersPage(importConfiguration);
artifactPage = new MavenProjectWizardArtifactPage(importConfiguration);
- dependenciesPage = new MavenDependenciesWizardPage(importConfiguration, //
- Messages.getString("wizard.project.page.dependencies.title"), // //$NON-NLS-1$
- Messages.getString("wizard.project.page.dependencies.description")); //$NON-NLS-1$
- dependenciesPage.setDependencies(new Dependency[0]);
- dependenciesPage.setShowScope(true);
addPage(parentPage);
addPage(archetypePage);
addPage(parametersPage);
addPage(artifactPage);
- addPage(dependenciesPage);
}
/** Adds the listeners after the page controls are created. */
@@ -198,9 +188,6 @@ public class MavenModuleWizard extends AbstractMavenProjectWizard implements INe
if(parentPage.isSimpleProject()) {
final Model model = artifactPage.getModel();
- @SuppressWarnings("unchecked")
- List<Dependency> modelDependencies = model.getDependencies();
- modelDependencies.addAll(Arrays.asList(dependenciesPage.getDependencies()));
final String[] folders = artifactPage.getFolders();
diff --git a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/MavenPomWizard.java b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/MavenPomWizard.java
index a0ad021..6004369 100644
--- a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/MavenPomWizard.java
+++ b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/MavenPomWizard.java
@@ -13,10 +13,7 @@ package org.eclipse.m2e.core.ui.internal.wizards;
import java.io.File;
import java.lang.reflect.InvocationTargetException;
-import java.util.Arrays;
-import java.util.List;
-import org.apache.maven.model.Dependency;
import org.apache.maven.model.Model;
import org.eclipse.core.resources.IContainer;
import org.eclipse.core.resources.IFile;
@@ -56,8 +53,6 @@ public class MavenPomWizard extends Wizard implements INewWizard {
private static final Logger log = LoggerFactory.getLogger(MavenPomWizard.class);
private MavenPomWizardPage artifactPage;
- private MavenDependenciesWizardPage dependenciesPage;
-
private ISelection selection;
/**
@@ -75,11 +70,8 @@ public class MavenPomWizard extends Wizard implements INewWizard {
public void addPages() {
artifactPage = new MavenPomWizardPage(selection);
- dependenciesPage = new MavenDependenciesWizardPage();
- dependenciesPage.setDependencies(new Dependency[0]);
addPage(artifactPage);
- addPage(dependenciesPage);
}
/**
@@ -89,9 +81,6 @@ public class MavenPomWizard extends Wizard implements INewWizard {
public boolean performFinish() {
final String projectName = artifactPage.getProject();
final Model model = artifactPage.getModel();
- @SuppressWarnings("unchecked")
- List<Dependency> modelDependencies = model.getDependencies();
- modelDependencies.addAll(Arrays.asList(dependenciesPage.getDependencies()));
IRunnableWithProgress op = new IRunnableWithProgress() {
public void run(IProgressMonitor monitor) throws InvocationTargetException {
diff --git a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/MavenProjectWizard.java b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/MavenProjectWizard.java
index 319cd34..7af109f 100644
--- a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/MavenProjectWizard.java
+++ b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/MavenProjectWizard.java
@@ -16,7 +16,6 @@ import java.util.List;
import java.util.Properties;
import org.apache.maven.archetype.catalog.Archetype;
-import org.apache.maven.model.Dependency;
import org.apache.maven.model.Model;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IWorkspace;
@@ -84,9 +83,6 @@ public class MavenProjectWizard extends AbstractMavenProjectWizard implements IN
/** The wizard page for gathering archetype project information. */
protected MavenProjectWizardArchetypeParametersPage parametersPage;
- /** The wizard page for choosing the Maven2 dependencies to use. */
- protected MavenDependenciesWizardPage dependenciesPage;
-
protected Button simpleProject;
/**
@@ -130,17 +126,11 @@ public class MavenProjectWizard extends AbstractMavenProjectWizard implements IN
archetypePage = new MavenProjectWizardArchetypePage(importConfiguration);
parametersPage = new MavenProjectWizardArchetypeParametersPage(importConfiguration);
artifactPage = new MavenProjectWizardArtifactPage(importConfiguration);
- dependenciesPage = new MavenDependenciesWizardPage(importConfiguration, //
- Messages.getString("wizard.project.page.dependencies.title"), // //$NON-NLS-1$
- Messages.getString("wizard.project.page.dependencies.description")); //$NON-NLS-1$
- dependenciesPage.setDependencies(new Dependency[0]);
- dependenciesPage.setShowScope(true);
addPage(locationPage);
addPage(archetypePage);
addPage(parametersPage);
addPage(artifactPage);
- addPage(dependenciesPage);
}
/** Adds the listeners after the page controls are created. */
@@ -224,9 +214,6 @@ public class MavenProjectWizard extends AbstractMavenProjectWizard implements IN
final MavenPlugin plugin = MavenPlugin.getDefault();
if(simpleProject.getSelection()) {
- List<Dependency> modelDependencies = model.getDependencies();
- modelDependencies.addAll(Arrays.asList(dependenciesPage.getDependencies()));
-
final String[] folders = artifactPage.getFolders();
job = new AbstactCreateMavenProjectJob(Messages.getString("wizard.project.job.creatingProject", projectName), workingSets) { //$NON-NLS-1$