From cfc9d18fb6459472703ee574e6d5a1e0e6f5effe Mon Sep 17 00:00:00 2001 From: Matthew Piggott Date: Fri, 15 Apr 2011 12:44:32 -0400 Subject: Removed many uses of depreciated MavenPlugin.getDefault() --- .../tests/common/AbstractLifecycleMappingTest.java | 14 +++++------ .../tests/common/AbstractMavenProjectTestCase.java | 29 +++++++++------------- .../org/eclipse/m2e/tests/common/MavenHelpers.java | 4 +-- 3 files changed, 21 insertions(+), 26 deletions(-) (limited to 'org.eclipse.m2e.tests.common') diff --git a/org.eclipse.m2e.tests.common/src/org/eclipse/m2e/tests/common/AbstractLifecycleMappingTest.java b/org.eclipse.m2e.tests.common/src/org/eclipse/m2e/tests/common/AbstractLifecycleMappingTest.java index 072fb09f..29f7742d 100644 --- a/org.eclipse.m2e.tests.common/src/org/eclipse/m2e/tests/common/AbstractLifecycleMappingTest.java +++ b/org.eclipse.m2e.tests.common/src/org/eclipse/m2e/tests/common/AbstractLifecycleMappingTest.java @@ -41,8 +41,8 @@ import org.eclipse.m2e.core.internal.project.registry.MavenProjectFacade; import org.eclipse.m2e.core.internal.project.registry.ProjectRegistryManager; import org.eclipse.m2e.core.lifecyclemapping.model.IPluginExecutionMetadata; import org.eclipse.m2e.core.project.IMavenProjectFacade; -import org.eclipse.m2e.core.project.IProjectConfigurationManager; import org.eclipse.m2e.core.project.IMavenProjectRegistry; +import org.eclipse.m2e.core.project.IProjectConfigurationManager; import org.eclipse.m2e.core.project.ResolverConfiguration; import org.eclipse.m2e.core.project.configurator.MojoExecutionKey; @@ -57,8 +57,8 @@ public abstract class AbstractLifecycleMappingTest extends AbstractMavenProjectT protected void setUp() throws Exception { super.setUp(); - mavenProjectManager = MavenPlugin.getDefault().getMavenProjectRegistry(); - projectConfigurationManager = MavenPlugin.getDefault().getProjectConfigurationManager(); + mavenProjectManager = MavenPlugin.getMavenProjectRegistry(); + projectConfigurationManager = MavenPlugin.getProjectConfigurationManager(); } @Override @@ -95,14 +95,14 @@ public abstract class AbstractLifecycleMappingTest extends AbstractMavenProjectT * Creates new partially initialised MavenProjectFacade instance */ protected MavenProjectFacade newMavenProjectFacade(IFile pom) throws CoreException { - MavenProject mavenProject = plugin.getMaven().readProject(pom.getLocation().toFile(), monitor); - MavenExecutionRequest request = plugin.getMaven().createExecutionRequest(monitor); - MavenSession session = plugin.getMaven().createSession(request, mavenProject); + MavenProject mavenProject = MavenPlugin.getMaven().readProject(pom.getLocation().toFile(), monitor); + MavenExecutionRequest request = MavenPlugin.getMaven().createExecutionRequest(monitor); + MavenSession session = MavenPlugin.getMaven().createSession(request, mavenProject); Map> executionPlans = new LinkedHashMap>(); executionPlans.put(ProjectRegistryManager.LIFECYCLE_CLEAN, new ArrayList()); executionPlans.put( ProjectRegistryManager.LIFECYCLE_DEFAULT, - plugin + MavenPlugin .getMaven() .calculateExecutionPlan(session, mavenProject, Arrays.asList(ProjectRegistryManager.LIFECYCLE_DEFAULT), false, monitor).getMojoExecutions()); diff --git a/org.eclipse.m2e.tests.common/src/org/eclipse/m2e/tests/common/AbstractMavenProjectTestCase.java b/org.eclipse.m2e.tests.common/src/org/eclipse/m2e/tests/common/AbstractMavenProjectTestCase.java index 9d181321..1f238ff1 100644 --- a/org.eclipse.m2e.tests.common/src/org/eclipse/m2e/tests/common/AbstractMavenProjectTestCase.java +++ b/org.eclipse.m2e.tests.common/src/org/eclipse/m2e/tests/common/AbstractMavenProjectTestCase.java @@ -85,8 +85,6 @@ public abstract class AbstractMavenProjectTestCase extends TestCase { protected ProjectRegistryRefreshJob projectRefreshJob; protected Job downloadSourcesJob; - protected MavenPlugin plugin; - protected IMavenConfiguration mavenConfiguration; private String oldUserSettingsFile; @@ -107,15 +105,13 @@ public abstract class AbstractMavenProjectTestCase extends TestCase { options.put(JavaCore.CORE_JAVA_BUILD_RESOURCE_COPY_FILTER, ".svn/"); JavaCore.setOptions(options); - plugin = MavenPlugin.getDefault(); - projectRefreshJob = MavenPluginActivator.getDefault().getProjectManagerRefreshJob(); projectRefreshJob.sleep(); downloadSourcesJob = ((BuildPathManager) MavenJdtPlugin.getDefault().getBuildpathManager()).getDownloadSourcesJob(); downloadSourcesJob.sleep(); - mavenConfiguration = MavenPlugin.getDefault().getMavenConfiguration(); + mavenConfiguration = MavenPlugin.getMavenConfiguration(); oldUserSettingsFile = mavenConfiguration.getUserSettingsFile(); File settings = new File("settings.xml").getCanonicalFile(); @@ -125,7 +121,7 @@ public abstract class AbstractMavenProjectTestCase extends TestCase { mavenConfiguration.setUserSettingsFile(userSettingsFile); } - ArtifactRepository localRepository = MavenPlugin.getDefault().getMaven().getLocalRepository(); + ArtifactRepository localRepository = MavenPlugin.getMaven().getLocalRepository(); if(localRepository != null) { repo = new File(localRepository.getBasedir()); } else { @@ -292,8 +288,7 @@ public abstract class AbstractMavenProjectTestCase extends TestCase { } protected IProject[] importProjects(String basedir, String[] pomNames, ResolverConfiguration configuration, boolean skipSanityCheck) throws IOException, CoreException { - final MavenPlugin plugin = MavenPlugin.getDefault(); - MavenModelManager mavenModelManager = plugin.getMavenModelManager(); + MavenModelManager mavenModelManager = MavenPlugin.getMavenModelManager(); IWorkspaceRoot root = workspace.getRoot(); File src = new File(basedir); @@ -315,9 +310,10 @@ public abstract class AbstractMavenProjectTestCase extends TestCase { workspace.run(new IWorkspaceRunnable() { public void run(IProgressMonitor monitor) throws CoreException { - importResults.addAll(plugin.getProjectConfigurationManager().importProjects(projectInfos, importConfiguration, monitor)); + importResults.addAll(MavenPlugin.getProjectConfigurationManager().importProjects(projectInfos, + importConfiguration, monitor)); } - }, plugin.getProjectConfigurationManager().getRule(), IWorkspace.AVOID_UPDATE, monitor); + }, MavenPlugin.getProjectConfigurationManager().getRule(), IWorkspace.AVOID_UPDATE, monitor); IProject[] projects = new IProject[projectInfos.size()]; for (int i = 0; i < projectInfos.size(); i++) { @@ -331,7 +327,7 @@ public abstract class AbstractMavenProjectTestCase extends TestCase { */ if(!skipSanityCheck) { Model model = projectInfos.get(0).getModel(); - IMavenProjectFacade facade = plugin.getMavenProjectRegistry().create(projects[i], monitor); + IMavenProjectFacade facade = MavenPlugin.getMavenProjectRegistry().create(projects[i], monitor); if(facade == null) { fail("Project " + model.getGroupId() + "-" + model.getArtifactId() + "-" + model.getVersion() + " was not imported. Errors: " @@ -361,19 +357,18 @@ public abstract class AbstractMavenProjectTestCase extends TestCase { copyDir(new File(projectLocation), dir); File pomFile = new File(dir, IMavenConstants.POM_FILE_NAME); - Model model = MavenPlugin.getDefault().getMavenModelManager().readMavenModel(pomFile); + Model model = MavenPlugin.getMavenModelManager().readMavenModel(pomFile); final MavenProjectInfo projectInfo = new MavenProjectInfo(projectName, pomFile, model, null); setBasedirRename(projectInfo); - final MavenPlugin plugin = MavenPlugin.getDefault(); - workspace.run(new IWorkspaceRunnable() { public void run(IProgressMonitor monitor) throws CoreException { - plugin.getProjectConfigurationManager().importProjects(Collections.singleton(projectInfo), importConfiguration, monitor); + MavenPlugin.getProjectConfigurationManager().importProjects(Collections.singleton(projectInfo), + importConfiguration, monitor); IProject project = workspace.getRoot().getProject(importConfiguration.getProjectName(projectInfo.getModel())); assertNotNull("Failed to import project " + projectInfo, project); } - }, plugin.getProjectConfigurationManager().getRule(), IWorkspace.AVOID_UPDATE, monitor); + }, MavenPlugin.getProjectConfigurationManager().getRule(), IWorkspace.AVOID_UPDATE, monitor); return workspace.getRoot().getProject(projectName); } @@ -447,7 +442,7 @@ public abstract class AbstractMavenProjectTestCase extends TestCase { } protected void injectFilexWagon() throws Exception { - PlexusContainer container = ((MavenImpl) MavenPlugin.getDefault().getMaven()).getPlexusContainer(); + PlexusContainer container = ((MavenImpl) MavenPlugin.getMaven()).getPlexusContainer(); if(container.getContainerRealm().getResource(FilexWagon.class.getName().replace('.', '/') + ".class") == null) { container.getContainerRealm().importFrom(FilexWagon.class.getClassLoader(), FilexWagon.class.getName()); ComponentDescriptor descriptor = new ComponentDescriptor(); diff --git a/org.eclipse.m2e.tests.common/src/org/eclipse/m2e/tests/common/MavenHelpers.java b/org.eclipse.m2e.tests.common/src/org/eclipse/m2e/tests/common/MavenHelpers.java index f895a3ab..f9c3e2ea 100644 --- a/org.eclipse.m2e.tests.common/src/org/eclipse/m2e/tests/common/MavenHelpers.java +++ b/org.eclipse.m2e.tests.common/src/org/eclipse/m2e/tests/common/MavenHelpers.java @@ -25,14 +25,14 @@ public class MavenHelpers { if(settingsFile != null && settingsFile.length() > 0) { settingsFile = new File(settingsFile).getAbsolutePath(); } - IMavenConfiguration mavenConfiguration = MavenPlugin.getDefault().getMavenConfiguration(); + IMavenConfiguration mavenConfiguration = MavenPlugin.getMavenConfiguration(); String oldUserSettingsFile = mavenConfiguration.getUserSettingsFile(); mavenConfiguration.setUserSettingsFile(settingsFile); return oldUserSettingsFile; } public static String getUserSettings() { - IMavenConfiguration mavenConfiguration = MavenPlugin.getDefault().getMavenConfiguration(); + IMavenConfiguration mavenConfiguration = MavenPlugin.getMavenConfiguration(); return mavenConfiguration.getUserSettingsFile(); } -- cgit v1.2.3