diff options
author | Matthew Piggott | 2011-04-15 16:44:32 +0000 |
---|---|---|
committer | Matthew Piggott | 2011-04-15 19:03:24 +0000 |
commit | cfc9d18fb6459472703ee574e6d5a1e0e6f5effe (patch) | |
tree | 5a88be0ce50becaa93262ff039fb75e3c86358ef /org.eclipse.m2e.launching | |
parent | 72aebf4dd3e1edf8b158a11627fe3c0dd044557c (diff) | |
download | m2e-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.launching')
6 files changed, 11 insertions, 12 deletions
diff --git a/org.eclipse.m2e.launching/src/org/eclipse/m2e/actions/ExecutePomAction.java b/org.eclipse.m2e.launching/src/org/eclipse/m2e/actions/ExecutePomAction.java index 0968e2de..b766e165 100644 --- a/org.eclipse.m2e.launching/src/org/eclipse/m2e/actions/ExecutePomAction.java +++ b/org.eclipse.m2e.launching/src/org/eclipse/m2e/actions/ExecutePomAction.java @@ -224,7 +224,7 @@ public class ExecutePomAction implements ILaunchShortcut, IExecutableExtension { } private void setProjectConfiguration(ILaunchConfigurationWorkingCopy workingCopy, IContainer basedir) { - IMavenProjectRegistry projectManager = MavenPlugin.getDefault().getMavenProjectRegistry(); + IMavenProjectRegistry projectManager = MavenPlugin.getMavenProjectRegistry(); IFile pomFile = basedir.getFile(new Path(IMavenConstants.POM_FILE_NAME)); IMavenProjectFacade projectFacade = projectManager.create(pomFile, false, new NullProgressMonitor()); if(projectFacade != null) { diff --git a/org.eclipse.m2e.launching/src/org/eclipse/m2e/internal/launch/MavenConsoleLineTracker.java b/org.eclipse.m2e.launching/src/org/eclipse/m2e/internal/launch/MavenConsoleLineTracker.java index f3425268..9443260a 100644 --- a/org.eclipse.m2e.launching/src/org/eclipse/m2e/internal/launch/MavenConsoleLineTracker.java +++ b/org.eclipse.m2e.launching/src/org/eclipse/m2e/internal/launch/MavenConsoleLineTracker.java @@ -190,7 +190,7 @@ public class MavenConsoleLineTracker implements IConsoleLineTracker { } static IProject getProject(String baseDir) { - IMavenProjectRegistry projectManager = MavenPlugin.getDefault().getMavenProjectRegistry(); + IMavenProjectRegistry projectManager = MavenPlugin.getMavenProjectRegistry(); for(IMavenProjectFacade projectFacade : projectManager.getProjects()) { IContainer base = projectFacade.getPom().getParent(); String baseLocation = base.getLocation().toPortableString(); diff --git a/org.eclipse.m2e.launching/src/org/eclipse/m2e/internal/launch/MavenLaunchDelegate.java b/org.eclipse.m2e.launching/src/org/eclipse/m2e/internal/launch/MavenLaunchDelegate.java index c6d4c31e..6cb67e79 100644 --- a/org.eclipse.m2e.launching/src/org/eclipse/m2e/internal/launch/MavenLaunchDelegate.java +++ b/org.eclipse.m2e.launching/src/org/eclipse/m2e/internal/launch/MavenLaunchDelegate.java @@ -222,7 +222,7 @@ public class MavenLaunchDelegate extends JavaLaunchDelegate implements MavenLaun * Construct string with preferences to pass to JVM as system properties */ private String getPreferences(ILaunchConfiguration configuration) throws CoreException { - IMavenConfiguration mavenConfiguration = MavenPlugin.getDefault().getMavenConfiguration(); + IMavenConfiguration mavenConfiguration = MavenPlugin.getMavenConfiguration(); StringBuffer sb = new StringBuffer(); diff --git a/org.eclipse.m2e.launching/src/org/eclipse/m2e/internal/launch/MavenLaunchUtils.java b/org.eclipse.m2e.launching/src/org/eclipse/m2e/internal/launch/MavenLaunchUtils.java index 29fc057e..25141288 100644 --- a/org.eclipse.m2e.launching/src/org/eclipse/m2e/internal/launch/MavenLaunchUtils.java +++ b/org.eclipse.m2e.launching/src/org/eclipse/m2e/internal/launch/MavenLaunchUtils.java @@ -47,7 +47,7 @@ public class MavenLaunchUtils { private static final Logger log = LoggerFactory.getLogger(MavenLaunchUtils.class); public static MavenRuntime getMavenRuntime(ILaunchConfiguration configuration) throws CoreException { - MavenRuntimeManager runtimeManager = MavenPlugin.getDefault().getMavenRuntimeManager(); + MavenRuntimeManager runtimeManager = MavenPlugin.getMavenRuntimeManager(); String location = configuration.getAttribute(MavenLaunchConstants.ATTR_RUNTIME, ""); //$NON-NLS-1$ MavenRuntime runtime = runtimeManager.getRuntime(location); if(runtime == null) { @@ -84,8 +84,8 @@ public class MavenLaunchUtils { return; } - IMavenProjectRegistry projectManager = MavenPlugin.getDefault().getMavenProjectRegistry(); - IMaven maven = MavenPlugin.getDefault().getMaven(); + IMavenProjectRegistry projectManager = MavenPlugin.getMavenProjectRegistry(); + IMaven maven = MavenPlugin.getMaven(); for(String gav : list) { // groupId:artifactId:version StringTokenizer st = new StringTokenizer(gav, ":"); //$NON-NLS-1$ diff --git a/org.eclipse.m2e.launching/src/org/eclipse/m2e/internal/launch/MavenSourcePathComputer.java b/org.eclipse.m2e.launching/src/org/eclipse/m2e/internal/launch/MavenSourcePathComputer.java index bb317e82..8f3916cf 100644 --- a/org.eclipse.m2e.launching/src/org/eclipse/m2e/internal/launch/MavenSourcePathComputer.java +++ b/org.eclipse.m2e.launching/src/org/eclipse/m2e/internal/launch/MavenSourcePathComputer.java @@ -164,7 +164,7 @@ public class MavenSourcePathComputer implements ISourcePathComputer { private File getSourcesJar(String groupId, String artifactId, String version) { if (groupId != null && artifactId != null && version != null) { - IMaven maven = MavenPlugin.getDefault().getMaven(); + IMaven maven = MavenPlugin.getMaven(); try { Artifact artifact = maven.resolve(groupId, artifactId, version, "jar", "sources", null, null); //$NON-NLS-1$ //$NON-NLS-2$ diff --git a/org.eclipse.m2e.launching/src/org/eclipse/m2e/ui/internal/launch/MavenLaunchMainTab.java b/org.eclipse.m2e.launching/src/org/eclipse/m2e/ui/internal/launch/MavenLaunchMainTab.java index e117960d..827fd5e7 100644 --- a/org.eclipse.m2e.launching/src/org/eclipse/m2e/ui/internal/launch/MavenLaunchMainTab.java +++ b/org.eclipse.m2e.launching/src/org/eclipse/m2e/ui/internal/launch/MavenLaunchMainTab.java @@ -459,7 +459,7 @@ public class MavenLaunchMainTab extends AbstractLaunchConfigurationTab implement } }); - MavenRuntimeManager runtimeManager = MavenPlugin.getDefault().getMavenRuntimeManager(); + MavenRuntimeManager runtimeManager = MavenPlugin.getMavenRuntimeManager(); runtimeComboViewer.setInput(runtimeManager.getMavenRuntimes()); runtimeComboViewer.setSelection(new StructuredSelection(runtimeManager.getDefaultRuntime())); } @@ -472,7 +472,7 @@ public class MavenLaunchMainTab extends AbstractLaunchConfigurationTab implement public void widgetSelected(SelectionEvent e) { PreferencesUtil.createPreferenceDialogOn(getShell(), "org.eclipse.m2e.core.preferences.MavenInstallationsPreferencePage", null, null).open(); //$NON-NLS-1$ - MavenRuntimeManager runtimeManager = MavenPlugin.getDefault().getMavenRuntimeManager(); + MavenRuntimeManager runtimeManager = MavenPlugin.getMavenRuntimeManager(); runtimeComboViewer.setInput(runtimeManager.getMavenRuntimes()); runtimeComboViewer.setSelection(new StructuredSelection(runtimeManager.getDefaultRuntime())); } @@ -559,9 +559,8 @@ public class MavenLaunchMainTab extends AbstractLaunchConfigurationTab implement this.profilesText.setText(getAttribute(configuration, ATTR_PROFILES, "")); //$NON-NLS-1$ try { - MavenPlugin plugin = MavenPlugin.getDefault(); - MavenRuntimeManager runtimeManager = plugin.getMavenRuntimeManager(); - IMavenConfiguration mavenConfiguration = MavenPlugin.getDefault().getMavenConfiguration(); + MavenRuntimeManager runtimeManager = MavenPlugin.getMavenRuntimeManager(); + IMavenConfiguration mavenConfiguration = MavenPlugin.getMavenConfiguration(); this.offlineButton.setSelection(getAttribute(configuration, ATTR_OFFLINE, mavenConfiguration.isOffline())); this.debugOutputButton.setSelection(getAttribute(configuration, ATTR_DEBUG_OUTPUT, mavenConfiguration.isDebugOutput())); |