summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Liebig2008-03-31 03:12:35 (EDT)
committerStefan Liebig2008-03-31 03:12:35 (EDT)
commit64d80854f636dce8a9bd4e325e4977cb0f3f61ce (patch)
treea83fc19a72b4b36aebafa445561b145cbe989368
parentc0a648ee79629d9b8f56790575bfeab5c021c731 (diff)
downloadorg.eclipse.riena.old-64d80854f636dce8a9bd4e325e4977cb0f3f61ce.zip
org.eclipse.riena.old-64d80854f636dce8a9bd4e325e4977cb0f3f61ce.tar.gz
org.eclipse.riena.old-64d80854f636dce8a9bd4e325e4977cb0f3f61ce.tar.bz2
refactoring of Service/Extension-Injector
-rw-r--r--org.eclipse.riena.communication.discovery/src/org/eclipse/riena/internal/communication/discovery/Activator.java8
-rw-r--r--org.eclipse.riena.exceptionmanager/src/org/eclipse/riena/internal/exceptionmanager/Activator.java8
2 files changed, 8 insertions, 8 deletions
diff --git a/org.eclipse.riena.communication.discovery/src/org/eclipse/riena/internal/communication/discovery/Activator.java b/org.eclipse.riena.communication.discovery/src/org/eclipse/riena/internal/communication/discovery/Activator.java
index 44d225c..dbdd90a 100644
--- a/org.eclipse.riena.communication.discovery/src/org/eclipse/riena/internal/communication/discovery/Activator.java
+++ b/org.eclipse.riena.communication.discovery/src/org/eclipse/riena/internal/communication/discovery/Activator.java
@@ -16,8 +16,8 @@ import org.eclipse.riena.communication.core.factory.IRemoteServiceFactory;
import org.eclipse.riena.communication.core.factory.RemoteServiceFactory;
import org.eclipse.riena.communication.core.publisher.IServicePublishEventDispatcher;
import org.eclipse.riena.core.RienaActivator;
-import org.eclipse.riena.core.service.Injector;
-import org.eclipse.riena.core.service.ServiceId;
+import org.eclipse.riena.core.injector.Inject;
+import org.eclipse.riena.core.service.ServiceInjector;
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceEvent;
import org.osgi.framework.ServiceListener;
@@ -25,7 +25,7 @@ import org.osgi.framework.ServiceListener;
public class Activator extends RienaActivator {
private RemoteServiceDiscovery discovery;
- private Injector registryInjector;
+ private ServiceInjector registryInjector;
private String HOST_ID = Activator.class.getName();
private IRemoteServiceRegistration servicePublisherReg;
@@ -44,7 +44,7 @@ public class Activator extends RienaActivator {
discovery = new RemoteServiceDiscovery(context);
discovery.setRemoteServiceFactory(factory);
- registryInjector = new ServiceId(IRemoteServiceRegistry.ID).useRanking().injectInto(discovery)
+ registryInjector = Inject.service(IRemoteServiceRegistry.ID).useRanking().into(discovery)
.andStart(context);
discovery.start();
diff --git a/org.eclipse.riena.exceptionmanager/src/org/eclipse/riena/internal/exceptionmanager/Activator.java b/org.eclipse.riena.exceptionmanager/src/org/eclipse/riena/internal/exceptionmanager/Activator.java
index d04c461..289251c 100644
--- a/org.eclipse.riena.exceptionmanager/src/org/eclipse/riena/internal/exceptionmanager/Activator.java
+++ b/org.eclipse.riena.exceptionmanager/src/org/eclipse/riena/internal/exceptionmanager/Activator.java
@@ -14,8 +14,8 @@ import java.util.Hashtable;
import org.eclipse.riena.core.exception.IExceptionHandler;
import org.eclipse.riena.core.exception.IExceptionHandlerManager;
-import org.eclipse.riena.core.service.Injector;
-import org.eclipse.riena.core.service.ServiceId;
+import org.eclipse.riena.core.injector.Inject;
+import org.eclipse.riena.core.service.ServiceInjector;
import org.osgi.framework.BundleActivator;
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceRegistration;
@@ -25,7 +25,7 @@ public class Activator implements BundleActivator {
private BundleContext context;
- private Injector handlerManagerInjector;
+ private ServiceInjector handlerManagerInjector;
private ServiceRegistration handlerManagerReg;
@@ -41,7 +41,7 @@ public class Activator implements BundleActivator {
ExceptionHandlerManagerDefault handlerManager = new ExceptionHandlerManagerDefault();
String handlerId = IExceptionHandler.ID;
- handlerManagerInjector = new ServiceId(handlerId).injectInto(handlerManager).andStart(context);
+ handlerManagerInjector = Inject.service(handlerId).into(handlerManager).andStart(context);
Hashtable<String, String> properties = new Hashtable<String, String>(0);
handlerManagerReg = context.registerService(IExceptionHandlerManager.ID, handlerManager, properties);