Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorslewis2014-03-27 06:42:03 +0000
committerslewis2014-03-27 06:42:03 +0000
commit17d2e4d2aa9e137414c9ea459dfb20d5c6158cd8 (patch)
treec6eaa08b951865d634fc0be852d048b3c8d75825
parent75e4edba4f357e8e202787a2d2973912709b54fa (diff)
downloadorg.eclipse.ecf-17d2e4d2aa9e137414c9ea459dfb20d5c6158cd8.tar.gz
org.eclipse.ecf-17d2e4d2aa9e137414c9ea459dfb20d5c6158cd8.tar.xz
org.eclipse.ecf-17d2e4d2aa9e137414c9ea459dfb20d5c6158cd8.zip
Fixes to trivial provider
-rw-r--r--examples/bundles/org.eclipse.ecf.examples.provider.trivial/META-INF/MANIFEST.MF3
-rwxr-xr-xexamples/bundles/org.eclipse.ecf.examples.provider.trivial/src/org/eclipse/ecf/internal/examples/provider/trivial/Activator.java5
-rw-r--r--framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/util/ExtensionRegistryRunnable.java8
3 files changed, 6 insertions, 10 deletions
diff --git a/examples/bundles/org.eclipse.ecf.examples.provider.trivial/META-INF/MANIFEST.MF b/examples/bundles/org.eclipse.ecf.examples.provider.trivial/META-INF/MANIFEST.MF
index e591a7136..90cc2b997 100644
--- a/examples/bundles/org.eclipse.ecf.examples.provider.trivial/META-INF/MANIFEST.MF
+++ b/examples/bundles/org.eclipse.ecf.examples.provider.trivial/META-INF/MANIFEST.MF
@@ -6,8 +6,7 @@ Bundle-Version: 1.0.200.provider
Bundle-Activator: org.eclipse.ecf.internal.examples.provider.trivial.Activator
Bundle-Vendor: %bundle.provider
Require-Bundle: org.eclipse.ecf,
- org.eclipse.equinox.common;bundle-version="3.6.200",
- org.eclipse.equinox.registry;bundle-version="3.5.400";resolution:=optional
+ org.eclipse.equinox.common;bundle-version="3.6.200"
Eclipse-LazyStart: true
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: CDC-1.1/Foundation-1.1,
diff --git a/examples/bundles/org.eclipse.ecf.examples.provider.trivial/src/org/eclipse/ecf/internal/examples/provider/trivial/Activator.java b/examples/bundles/org.eclipse.ecf.examples.provider.trivial/src/org/eclipse/ecf/internal/examples/provider/trivial/Activator.java
index d17456b5b..e392e6d64 100755
--- a/examples/bundles/org.eclipse.ecf.examples.provider.trivial/src/org/eclipse/ecf/internal/examples/provider/trivial/Activator.java
+++ b/examples/bundles/org.eclipse.ecf.examples.provider.trivial/src/org/eclipse/ecf/internal/examples/provider/trivial/Activator.java
@@ -1,6 +1,5 @@
package org.eclipse.ecf.internal.examples.provider.trivial;
-import org.eclipse.core.runtime.IExtensionRegistry;
import org.eclipse.core.runtime.SafeRunner;
import org.eclipse.ecf.core.identity.Namespace;
import org.eclipse.ecf.core.util.ExtensionRegistryRunnable;
@@ -35,10 +34,6 @@ public class Activator implements BundleActivator {
this.context = context;
plugin = this;
SafeRunner.run(new ExtensionRegistryRunnable(this.context) {
- protected void runWithRegistry(IExtensionRegistry registry)
- throws Exception {
- // do nothing
- }
protected void runWithoutRegistry() throws Exception {
Activator.this.context.registerService(Namespace.class, new TrivialNamespace("ecf.namespace.trivial"), null);
}
diff --git a/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/util/ExtensionRegistryRunnable.java b/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/util/ExtensionRegistryRunnable.java
index ca82a0987..5dd20535e 100644
--- a/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/util/ExtensionRegistryRunnable.java
+++ b/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/util/ExtensionRegistryRunnable.java
@@ -16,7 +16,7 @@ import org.osgi.util.tracker.ServiceTracker;
/**
* @since 3.3
*/
-public abstract class ExtensionRegistryRunnable implements ISafeRunnable {
+public class ExtensionRegistryRunnable implements ISafeRunnable {
private BundleContext context;
@@ -28,8 +28,10 @@ public abstract class ExtensionRegistryRunnable implements ISafeRunnable {
// by default do nothing
}
- protected abstract void runWithRegistry(IExtensionRegistry registry)
- throws Exception;
+ protected void runWithRegistry(IExtensionRegistry registry)
+ throws Exception {
+ // by default do nothing
+ }
protected void logWarning(Throwable exception) {
Activator a = Activator.getDefault();

Back to the top