summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Liebig2008-04-02 08:21:42 (EDT)
committerStefan Liebig2008-04-02 08:21:42 (EDT)
commit2651b6debd5c308ee92955e4e432eddb3d3b8d87 (patch)
treed70b06f04d91a0fb40916c864dc87a982ba5c348
parent64d80854f636dce8a9bd4e325e4977cb0f3f61ce (diff)
downloadorg.eclipse.riena.old-2651b6debd5c308ee92955e4e432eddb3d3b8d87.zip
org.eclipse.riena.old-2651b6debd5c308ee92955e4e432eddb3d3b8d87.tar.gz
org.eclipse.riena.old-2651b6debd5c308ee92955e4e432eddb3d3b8d87.tar.bz2
refactoring: remove service ID field from interfaces
-rw-r--r--org.eclipse.riena.communication.discovery/src/org/eclipse/riena/internal/communication/discovery/Activator.java4
-rw-r--r--org.eclipse.riena.communication.discovery/src/org/eclipse/riena/internal/communication/discovery/RemoteServiceDiscovery.java4
-rw-r--r--org.eclipse.riena.exceptionhandler/src/org/eclipse/riena/internal/exceptionhandler/Activator.java2
-rw-r--r--org.eclipse.riena.exceptionmanager/src/org/eclipse/riena/internal/exceptionmanager/Activator.java5
4 files changed, 8 insertions, 7 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 dbdd90a..aaaeedb 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
@@ -44,7 +44,7 @@ public class Activator extends RienaActivator {
discovery = new RemoteServiceDiscovery(context);
discovery.setRemoteServiceFactory(factory);
- registryInjector = Inject.service(IRemoteServiceRegistry.ID).useRanking().into(discovery)
+ registryInjector = Inject.service(IRemoteServiceRegistry.class.getName()).useRanking().into(discovery)
.andStart(context);
discovery.start();
@@ -52,7 +52,7 @@ public class Activator extends RienaActivator {
"http://${hostname}/hessian/ServicePublisherWS", "hessian", null, HOST_ID);
ProtocolNotifier protNotifier = new ProtocolNotifier();
- context.addServiceListener(protNotifier, "(objectClass=" + IRemoteServiceFactory.ID + ")");
+ context.addServiceListener(protNotifier, "(objectClass=" + IRemoteServiceFactory.class.getName() + ")");
// ToDo Service Update Listener
diff --git a/org.eclipse.riena.communication.discovery/src/org/eclipse/riena/internal/communication/discovery/RemoteServiceDiscovery.java b/org.eclipse.riena.communication.discovery/src/org/eclipse/riena/internal/communication/discovery/RemoteServiceDiscovery.java
index 075f1ce..298a198 100644
--- a/org.eclipse.riena.communication.discovery/src/org/eclipse/riena/internal/communication/discovery/RemoteServiceDiscovery.java
+++ b/org.eclipse.riena.communication.discovery/src/org/eclipse/riena/internal/communication/discovery/RemoteServiceDiscovery.java
@@ -55,10 +55,10 @@ public class RemoteServiceDiscovery {
* @return
*/
private synchronized RemoteServiceDescription[] getAllServices() {
- ServiceReference refPublisher = context.getServiceReference(IServicePublishEventDispatcher.ID);
+ ServiceReference refPublisher = context.getServiceReference(IServicePublishEventDispatcher.class.getName());
if (refPublisher == null) {
LOGGER.log(LogService.LOG_WARNING, "no IServicePublishEventDispatcher service available ["
- + IServicePublishEventDispatcher.ID + "]");
+ + IServicePublishEventDispatcher.class.getName() + "]");
return EMPTY_SERVICE_ENTRY_ARRAY;
}
IServicePublishEventDispatcher servicePublisher = (IServicePublishEventDispatcher) context
diff --git a/org.eclipse.riena.exceptionhandler/src/org/eclipse/riena/internal/exceptionhandler/Activator.java b/org.eclipse.riena.exceptionhandler/src/org/eclipse/riena/internal/exceptionhandler/Activator.java
index dc263f2..533b4a8 100644
--- a/org.eclipse.riena.exceptionhandler/src/org/eclipse/riena/internal/exceptionhandler/Activator.java
+++ b/org.eclipse.riena.exceptionhandler/src/org/eclipse/riena/internal/exceptionhandler/Activator.java
@@ -30,7 +30,7 @@ public class Activator implements BundleActivator {
DefaultExceptionHandler handler = new DefaultExceptionHandler();
Hashtable<String, String> properties = new Hashtable<String, String>(0);
- handlerReg = context.registerService(IExceptionHandler.ID, handler, properties);
+ handlerReg = context.registerService(IExceptionHandler.class.getName(), handler, properties);
}
/*
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 289251c..392edeb 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
@@ -39,12 +39,13 @@ public class Activator implements BundleActivator {
private void registerExceptionHandlerManager() {
ExceptionHandlerManagerDefault handlerManager = new ExceptionHandlerManagerDefault();
- String handlerId = IExceptionHandler.ID;
+ String handlerId = IExceptionHandler.class.getName();
handlerManagerInjector = Inject.service(handlerId).into(handlerManager).andStart(context);
Hashtable<String, String> properties = new Hashtable<String, String>(0);
- handlerManagerReg = context.registerService(IExceptionHandlerManager.ID, handlerManager, properties);
+ handlerManagerReg = context.registerService(IExceptionHandlerManager.class.getName(), handlerManager,
+ properties);
}
/*