mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-29 19:45:01 +02:00
Code Issues Wiki Activity

[250287] Support multiple registration of a service

Browse source
This commit is contained in:
Marc Khouzam 2008-10-09 17:36:59 +00:00
parent c489d7f7e7
commit 6e0e76e459
1 changed files with 36 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
plugins/org.eclipse.dd.dsf/src/org/eclipse/dd/dsf/service/AbstractDsfService.java
View file

@ -13,6 +13,8 @@ package org.eclipse.dd.dsf.service;
import java.util.Arrays; import java.util.Arrays;
import java.util.Dictionary; import java.util.Dictionary;
import java.util.Enumeration; import java.util.Enumeration;
import java.util.HashSet;
import java.util.Set;
import org.eclipse.dd.dsf.concurrent.DsfExecutor; import org.eclipse.dd.dsf.concurrent.DsfExecutor;
import org.eclipse.dd.dsf.concurrent.IDsfStatusConstants; import org.eclipse.dd.dsf.concurrent.IDsfStatusConstants;
@ -96,6 +98,36 @@ abstract public class AbstractDsfService
*/ */
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
protected void register(String[] classes, Dictionary properties) { protected void register(String[] classes, Dictionary properties) {
/*
* If this service has already been registered, make sure we
* keep the names it has been registered with. However, we
* must trigger a new registration or else OSGI will keep the two
* registration separate.
*/
if (fRegistration != null) {
String[] previousClasses = (String[])fRegistration.getReference().getProperty(Constants.OBJECTCLASS);
// Use a HashSet to avoid duplicates
Set<String> newClasses = new HashSet<String>();
newClasses.addAll(Arrays.asList(previousClasses));
newClasses.addAll(Arrays.asList(classes));
classes = newClasses.toArray(new String[0]);
/*
* Also keep all previous properties.
*/
if (fProperties != null) {
for (Enumeration e = fProperties.keys() ; e.hasMoreElements();) {
Object key = e.nextElement();
Object value = fProperties.get(key);
properties.put(key, value);
}
}
// Now, cancel the previous registration
unregister();
}
/* /*
* Ensure that the list of classes contains the base DSF service * Ensure that the list of classes contains the base DSF service
* interface, as well as the actual class type of this object. * interface, as well as the actual class type of this object.
@ -179,7 +211,10 @@ abstract public class AbstractDsfService
* *
*/ */
protected void unregister() { protected void unregister() {
fRegistration.unregister(); if (fRegistration != null) {
fRegistration.unregister();
}
fRegistration = null;
} }
/** Returns the registration object that was obtained when this service was registered */ /** Returns the registration object that was obtained when this service was registered */