Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #5422 from timothyjward/fix/m2e-version
[m2e] Remove references to internal packages and avoid static methods
- Loading branch information
Showing
16 changed files
with
286 additions
and
150 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,32 +1,59 @@ | ||
| package bndtools.m2e; | ||
|
|
||
| import org.eclipse.m2e.core.internal.MavenPluginActivator; | ||
| import org.eclipse.m2e.core.internal.project.registry.MavenProjectManager; | ||
| import org.eclipse.m2e.core.MavenPlugin; | ||
| import org.eclipse.m2e.core.embedder.IMaven; | ||
| import org.eclipse.m2e.core.project.IMavenProjectRegistry; | ||
| import org.osgi.annotation.bundle.Header; | ||
| import org.osgi.framework.Bundle; | ||
| import org.osgi.framework.BundleActivator; | ||
| import org.osgi.framework.BundleContext; | ||
| import org.osgi.framework.FrameworkUtil; | ||
|
|
||
| import aQute.bnd.osgi.Constants; | ||
|
|
||
| @Header(name = Constants.BUNDLE_ACTIVATOR, value = "${@class}") | ||
| public class Activator implements BundleActivator { | ||
|
|
||
| /** | ||
| * M2E version 2 has implicit support for whiteboard listeners and registers | ||
| * services. This activator helps us to work in both situations. | ||
| */ | ||
| private boolean isM2E_v2; | ||
|
|
||
| private MavenProjectChangedListenersTracker projectChangedListenersTracker; | ||
|
|
||
| @Override | ||
| public void start(BundleContext context) throws Exception { | ||
| projectChangedListenersTracker = new MavenProjectChangedListenersTracker(); | ||
| MavenProjectManager projectManager = MavenPluginActivator.getDefault() | ||
| .getMavenProjectManager(); | ||
| projectManager.addMavenProjectChangedListener(projectChangedListenersTracker); | ||
| Bundle bundle = FrameworkUtil.getBundle(MavenPlugin.class); | ||
| isM2E_v2 = bundle.getVersion() | ||
| .getMajor() == 2; | ||
|
|
||
| if (!isM2E_v2) { | ||
| projectChangedListenersTracker = new MavenProjectChangedListenersTracker(); | ||
| IMavenProjectRegistry projectManager = MavenPlugin.getMavenProjectRegistry(); | ||
| projectManager.addMavenProjectChangedListener(projectChangedListenersTracker); | ||
|
|
||
| registerM2EServices(context); | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * These services should only be registered if running on M2E 1.x | ||
| * | ||
| * @param context | ||
| */ | ||
| private void registerM2EServices(BundleContext context) { | ||
| context.registerService(IMaven.class, MavenPlugin.getMaven(), null); | ||
| context.registerService(IMavenProjectRegistry.class, MavenPlugin.getMavenProjectRegistry(), null); | ||
| } | ||
|
|
||
| @Override | ||
| public void stop(BundleContext context) throws Exception { | ||
| MavenProjectManager projectManager = MavenPluginActivator.getDefault() | ||
| .getMavenProjectManager(); | ||
| projectManager.removeMavenProjectChangedListener(projectChangedListenersTracker); | ||
| projectChangedListenersTracker.close(); | ||
| if (!isM2E_v2) { | ||
| IMavenProjectRegistry projectManager = MavenPlugin.getMavenProjectRegistry(); | ||
| projectManager.removeMavenProjectChangedListener(projectChangedListenersTracker); | ||
| projectChangedListenersTracker.close(); | ||
| } | ||
| } | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| package bndtools.m2e; | ||
|
|
||
| import org.osgi.service.component.annotations.Component; | ||
|
|
||
| @Component(service = M2ETypeAccess.class) | ||
| public class M2ETypeAccess { | ||
|
|
||
| } |
Oops, something went wrong.