Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Piggott2011-04-15 12:44:32 -0400
committerMatthew Piggott2011-04-15 15:03:24 -0400
commitcfc9d18fb6459472703ee574e6d5a1e0e6f5effe (patch)
tree5a88be0ce50becaa93262ff039fb75e3c86358ef /org.eclipse.m2e.scm
parent72aebf4dd3e1edf8b158a11627fe3c0dd044557c (diff)
downloadm2e-core-cfc9d18fb6459472703ee574e6d5a1e0e6f5effe.tar.gz
m2e-core-cfc9d18fb6459472703ee574e6d5a1e0e6f5effe.tar.xz
m2e-core-cfc9d18fb6459472703ee574e6d5a1e0e6f5effe.zip
Removed many uses of depreciated MavenPlugin.getDefault()
Diffstat (limited to 'org.eclipse.m2e.scm')
-rw-r--r--org.eclipse.m2e.scm/src/org/eclipse/m2e/scm/MavenProjectPomScanner.java2
-rw-r--r--org.eclipse.m2e.scm/src/org/eclipse/m2e/scm/internal/wizards/MavenProjectCheckoutJob.java10
2 files changed, 5 insertions, 7 deletions
diff --git a/org.eclipse.m2e.scm/src/org/eclipse/m2e/scm/MavenProjectPomScanner.java b/org.eclipse.m2e.scm/src/org/eclipse/m2e/scm/MavenProjectPomScanner.java
index e2a54226..7f23bc58 100644
--- a/org.eclipse.m2e.scm/src/org/eclipse/m2e/scm/MavenProjectPomScanner.java
+++ b/org.eclipse.m2e.scm/src/org/eclipse/m2e/scm/MavenProjectPomScanner.java
@@ -55,7 +55,7 @@ public class MavenProjectPomScanner<T> extends AbstractProjectScanner<MavenProje
public MavenProjectPomScanner(boolean developer, Dependency[] dependencies) {
this.developer = developer;
this.dependencies = dependencies;
- this.maven = MavenPlugin.getDefault().getMaven();
+ this.maven = MavenPlugin.getMaven();
}
public String getDescription() {
diff --git a/org.eclipse.m2e.scm/src/org/eclipse/m2e/scm/internal/wizards/MavenProjectCheckoutJob.java b/org.eclipse.m2e.scm/src/org/eclipse/m2e/scm/internal/wizards/MavenProjectCheckoutJob.java
index 4fff0d12..a282fdbf 100644
--- a/org.eclipse.m2e.scm/src/org/eclipse/m2e/scm/internal/wizards/MavenProjectCheckoutJob.java
+++ b/org.eclipse.m2e.scm/src/org/eclipse/m2e/scm/internal/wizards/MavenProjectCheckoutJob.java
@@ -109,14 +109,13 @@ public abstract class MavenProjectCheckoutJob extends WorkspaceJob {
IWorkspaceRoot workspace = ResourcesPlugin.getWorkspace().getRoot();
- MavenPlugin plugin = MavenPlugin.getDefault();
- MavenModelManager modelManager = plugin.getMavenModelManager();
+ MavenModelManager modelManager = MavenPlugin.getMavenModelManager();
LocalProjectScanner scanner = new LocalProjectScanner(workspace.getLocation().toFile(), operation.getLocations(),
true, modelManager);
scanner.run(monitor);
- this.projects = plugin.getProjectConfigurationManager().collectProjects(scanner.getProjects());
+ this.projects = MavenPlugin.getProjectConfigurationManager().collectProjects(scanner.getProjects());
if(checkoutAllProjects) {
// check if there any project name conflicts
@@ -210,13 +209,12 @@ public abstract class MavenProjectCheckoutJob extends WorkspaceJob {
}
if(checkoutAllProjects) {
- final MavenPlugin plugin = MavenPlugin.getDefault();
WorkspaceJob job = new AbstactCreateMavenProjectJob(Messages.MavenProjectCheckoutJob_job, workingSets) {
@Override
protected List<IProject> doCreateMavenProjects(IProgressMonitor monitor) throws CoreException {
- Set<MavenProjectInfo> projectSet = plugin.getProjectConfigurationManager().collectProjects(projects);
+ Set<MavenProjectInfo> projectSet = MavenPlugin.getProjectConfigurationManager().collectProjects(projects);
- List<IMavenProjectImportResult> results = plugin.getProjectConfigurationManager().importProjects(
+ List<IMavenProjectImportResult> results = MavenPlugin.getProjectConfigurationManager().importProjects(
projectSet, configuration, monitor);
return toProjects(results);

Back to the top