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.discovery | |
| 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.discovery')
2 files changed, 3 insertions, 6 deletions
diff --git a/org.eclipse.m2e.discovery/src/org/eclipse/m2e/internal/discovery/MavenDiscoveryService.java b/org.eclipse.m2e.discovery/src/org/eclipse/m2e/internal/discovery/MavenDiscoveryService.java index dd68ca11..dc6b5005 100644 --- a/org.eclipse.m2e.discovery/src/org/eclipse/m2e/internal/discovery/MavenDiscoveryService.java +++ b/org.eclipse.m2e.discovery/src/org/eclipse/m2e/internal/discovery/MavenDiscoveryService.java @@ -147,8 +147,7 @@ public class MavenDiscoveryService implements IMavenDiscoveryUI, IMavenDiscovery } } - MavenPlugin mavenPlugin = MavenPlugin.getDefault(); - IMaven maven = mavenPlugin.getMaven(); + IMaven maven = MavenPlugin.getMaven(); MavenExecutionRequest request = maven.createExecutionRequest(monitor); // TODO this ignores workspace dependencies diff --git a/org.eclipse.m2e.discovery/src/org/eclipse/m2e/internal/discovery/startup/UpdateConfigurationStartup.java b/org.eclipse.m2e.discovery/src/org/eclipse/m2e/internal/discovery/startup/UpdateConfigurationStartup.java index 0470605d..de62f6ad 100644 --- a/org.eclipse.m2e.discovery/src/org/eclipse/m2e/internal/discovery/startup/UpdateConfigurationStartup.java +++ b/org.eclipse.m2e.discovery/src/org/eclipse/m2e/internal/discovery/startup/UpdateConfigurationStartup.java @@ -24,7 +24,6 @@ import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.MultiStatus; import org.eclipse.jface.preference.IPreferenceStore; -import org.eclipse.m2e.core.MavenPlugin; import org.eclipse.m2e.core.core.IMavenConstants; import org.eclipse.m2e.core.ui.internal.UpdateConfigurationJob; import org.eclipse.m2e.internal.discovery.DiscoveryActivator; @@ -86,12 +85,11 @@ public class UpdateConfigurationStartup implements IStartup { */ public static void updateConfiguration() { Collection<IProject> projects = getMarkedProjects(); - new UpdateConfigurationJob(MavenPlugin.getDefault(), projects.toArray(new IProject[projects.size()])).schedule(); + new UpdateConfigurationJob(projects.toArray(new IProject[projects.size()])).schedule(); } private static void updateConfiguration(IProject[] projects) { - final MavenPlugin plugin = MavenPlugin.getDefault(); - new UpdateConfigurationJob(plugin, projects).schedule(); + new UpdateConfigurationJob(projects).schedule(); } private static void addEarlyStartup() { |