diff options
| author | Thomas Watson | 2020-04-28 23:43:44 +0000 |
|---|---|---|
| committer | Thomas Watson | 2020-04-28 23:44:30 +0000 |
| commit | 15857fa80132b34246c62480198d3684b2a129d3 (patch) | |
| tree | 4520bce3493d0a013b2866dc9272058fd6ff12a0 | |
| parent | f5c8d65524882931ce1678b6e2e03ac71a6fd091 (diff) | |
| download | rt.equinox.framework-15857fa80132b34246c62480198d3684b2a129d3.tar.gz rt.equinox.framework-15857fa80132b34246c62480198d3684b2a129d3.tar.xz rt.equinox.framework-15857fa80132b34246c62480198d3684b2a129d3.zip | |
Bug 552573 - rename createBundleActivator to newBundleActivator
Change-Id: I76646b16bc7ef2efab34d0747143b1a2e6c01197
Signed-off-by: Thomas Watson <tjwatson@us.ibm.com>
3 files changed, 7 insertions, 7 deletions
diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/ConnectTests.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/ConnectTests.java index 445c15137..c84ab16ab 100644 --- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/ConnectTests.java +++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/ConnectTests.java @@ -140,7 +140,7 @@ public class ConnectTests extends AbstractBundleTests { } @Override - public Optional<BundleActivator> createBundleActivator() { + public Optional<BundleActivator> newBundleActivator() { createBundleActivatorCalled.getAndIncrement(); return Optional.empty(); } @@ -360,8 +360,8 @@ public class ConnectTests extends AbstractBundleTests { final AtomicInteger bundleActvatorStopCalled = new AtomicInteger(); ModuleConnector activatorModuleConnector = new TestCountingModuleConnector() { @Override - public Optional<BundleActivator> createBundleActivator() { - super.createBundleActivator(); + public Optional<BundleActivator> newBundleActivator() { + super.newBundleActivator(); return Optional.of(new BundleActivator() { @Override @@ -399,8 +399,8 @@ public class ConnectTests extends AbstractBundleTests { ModuleConnector activatorModuleConnector = new TestCountingModuleConnector() { @Override - public Optional<BundleActivator> createBundleActivator() { - super.createBundleActivator(); + public Optional<BundleActivator> newBundleActivator() { + super.newBundleActivator(); return Optional.of(new BundleActivator() { @Override diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/connect/ConnectHookConfigurator.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/connect/ConnectHookConfigurator.java index bc457ed67..a7e764c64 100644 --- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/connect/ConnectHookConfigurator.java +++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/connect/ConnectHookConfigurator.java @@ -168,7 +168,7 @@ public class ConnectHookConfigurator implements HookConfigurator { @Override public BundleActivator createActivator() { final List<BundleActivator> activators = new ArrayList<>(); - moduleConnector.createBundleActivator().ifPresent((a) -> activators.add(a)); + moduleConnector.newBundleActivator().ifPresent((a) -> activators.add(a)); return new BundleActivator() { @Override public void start(BundleContext context) throws Exception { diff --git a/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/connect/ModuleConnector.java b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/connect/ModuleConnector.java index 3ac13cb44..d0f56e270 100644 --- a/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/connect/ModuleConnector.java +++ b/bundles/org.eclipse.osgi/osgi/src/org/osgi/framework/connect/ModuleConnector.java @@ -91,5 +91,5 @@ public interface ModuleConnector { * @return a new activator for this module connector or * {@link Optional#empty() empty} if no activator is available */ - Optional<BundleActivator> createBundleActivator(); + Optional<BundleActivator> newBundleActivator(); } |