diff options
author | Andrey Loskutov | 2017-07-12 15:24:06 +0000 |
---|---|---|
committer | Andrey Loskutov | 2017-07-12 15:24:06 +0000 |
commit | 359ccf81e9d3b62ba06be7b344fa2eb84745fc4c (patch) | |
tree | ad86b077d4ff90b40cce00b05be790b25d76eda5 /bundles/org.eclipse.equinox.registry | |
parent | 16ac0f7fcd3ec2db793fc077b2cc67b2dfa72c8e (diff) | |
download | rt.equinox.bundles-359ccf81e9d3b62ba06be7b344fa2eb84745fc4c.tar.gz rt.equinox.bundles-359ccf81e9d3b62ba06be7b344fa2eb84745fc4c.tar.xz rt.equinox.bundles-359ccf81e9d3b62ba06be7b344fa2eb84745fc4c.zip |
Bug 519547 - generification for non internal classes
Change-Id: I6766245739d33282347cef16acbcdcd4873c726b
Signed-off-by: Andrey Loskutov <loskutov@gmx.de>
Diffstat (limited to 'bundles/org.eclipse.equinox.registry')
4 files changed, 18 insertions, 17 deletions
diff --git a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/osgi/EquinoxRegistryStrategy.java b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/osgi/EquinoxRegistryStrategy.java index 7a0730431..847010d02 100644 --- a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/osgi/EquinoxRegistryStrategy.java +++ b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/osgi/EquinoxRegistryStrategy.java @@ -85,7 +85,7 @@ public class EquinoxRegistryStrategy extends RegistryStrategyOSGI { * most users see no performance degradation and that order of registry events remains consistent. */ @Override - public final void scheduleChangeEvent(Object[] listeners, Map deltas, Object registry) { + public final void scheduleChangeEvent(Object[] listeners, Map<String, ?> deltas, Object registry) { if (useJobs) { try { new ExtensionEventDispatcherJob(listeners, deltas, registry).schedule(); diff --git a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/osgi/ExtensionEventDispatcherJob.java b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/osgi/ExtensionEventDispatcherJob.java index ca03f3d3f..a032c493b 100644 --- a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/osgi/ExtensionEventDispatcherJob.java +++ b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/internal/registry/osgi/ExtensionEventDispatcherJob.java @@ -33,11 +33,11 @@ final public class ExtensionEventDispatcherJob extends Job { return rule == this; } }; - private Map<?, ?> deltas; - private Object[] listenerInfos; - private Object registry; + private final Map<String, ?> deltas; + private final Object[] listenerInfos; + private final Object registry; - public ExtensionEventDispatcherJob(Object[] listenerInfos, Map<?, ?> deltas, Object registry) { + public ExtensionEventDispatcherJob(Object[] listenerInfos, Map<String, ?> deltas, Object registry) { // name not NL'd since it is a system job super("Registry event dispatcher"); //$NON-NLS-1$ setSystem(true); diff --git a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/runtime/dynamichelpers/ExtensionTracker.java b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/runtime/dynamichelpers/ExtensionTracker.java index 8db0dc07e..b90e63451 100644 --- a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/runtime/dynamichelpers/ExtensionTracker.java +++ b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/runtime/dynamichelpers/ExtensionTracker.java @@ -28,11 +28,11 @@ import org.eclipse.core.runtime.*; */ public class ExtensionTracker implements IExtensionTracker, IRegistryChangeListener { //Map keeping the association between extensions and a set of objects. Key: IExtension, value: ReferenceHashSet. - private Map extensionToObjects = new HashMap(); - private ListenerList handlers = new ListenerList(); + private Map<IExtension, ReferenceHashSet<Object>> extensionToObjects = new HashMap<>(); + private ListenerList<HandlerWrapper> handlers = new ListenerList<>(); private final Object lock = new Object(); private boolean closed = false; - private IExtensionRegistry registry; // the registry that this tacker works with + private final IExtensionRegistry registry; // the registry that this tacker works with private static final Object[] EMPTY_ARRAY = new Object[0]; @@ -95,9 +95,9 @@ public class ExtensionTracker implements IExtensionTracker, IRegistryChangeListe if (closed) return; - ReferenceHashSet associatedObjects = (ReferenceHashSet) extensionToObjects.get(element); + ReferenceHashSet<Object> associatedObjects = extensionToObjects.get(element); if (associatedObjects == null) { - associatedObjects = new ReferenceHashSet(); + associatedObjects = new ReferenceHashSet<>(); extensionToObjects.put(element, associatedObjects); } associatedObjects.add(object, referenceType); @@ -173,7 +173,7 @@ public class ExtensionTracker implements IExtensionTracker, IRegistryChangeListe if (closed) return; - ReferenceHashSet associatedObjects = (ReferenceHashSet) extensionToObjects.remove(delta.getExtension()); + ReferenceHashSet<?> associatedObjects = extensionToObjects.remove(delta.getExtension()); if (associatedObjects == null) removedObjects = EMPTY_ARRAY; else @@ -195,7 +195,7 @@ public class ExtensionTracker implements IExtensionTracker, IRegistryChangeListe synchronized (lock) { if (closed) return EMPTY_ARRAY; - ReferenceHashSet objectSet = (ReferenceHashSet) extensionToObjects.get(element); + ReferenceHashSet<?> objectSet = extensionToObjects.get(element); if (objectSet == null) return EMPTY_ARRAY; @@ -228,7 +228,7 @@ public class ExtensionTracker implements IExtensionTracker, IRegistryChangeListe synchronized (lock) { if (closed) return; - ReferenceHashSet associatedObjects = (ReferenceHashSet) extensionToObjects.get(extension); + ReferenceHashSet<Object> associatedObjects = extensionToObjects.get(extension); if (associatedObjects != null) associatedObjects.remove(object); } @@ -242,7 +242,7 @@ public class ExtensionTracker implements IExtensionTracker, IRegistryChangeListe synchronized (lock) { if (closed) return EMPTY_ARRAY; - ReferenceHashSet associatedObjects = (ReferenceHashSet) extensionToObjects.remove(extension); + ReferenceHashSet<?> associatedObjects = extensionToObjects.remove(extension); if (associatedObjects == null) return EMPTY_ARRAY; return associatedObjects.toArray(); diff --git a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/runtime/spi/RegistryStrategy.java b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/runtime/spi/RegistryStrategy.java index 0f55de6f8..6a3268ae0 100644 --- a/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/runtime/spi/RegistryStrategy.java +++ b/bundles/org.eclipse.equinox.registry/src/org/eclipse/core/runtime/spi/RegistryStrategy.java @@ -158,6 +158,7 @@ public class RegistryStrategy { * * @deprecated use {@link #onStart(IExtensionRegistry, boolean)}. */ + @Deprecated public void onStart(IExtensionRegistry registry) { // The default implementation } @@ -210,7 +211,7 @@ public class RegistryStrategy { */ public Object createExecutableExtension(RegistryContributor contributor, String className, String overridenContributorName) throws CoreException { Object result = null; - Class classInstance = null; + Class<?> classInstance = null; try { classInstance = Class.forName(className); } catch (ClassNotFoundException e1) { @@ -241,7 +242,7 @@ public class RegistryStrategy { * @param deltas the registry deltas (thread safe); may not be <code>null</code> * @param registry the extension registry (NOT thread safe); may not be <code>null</code> */ - public void scheduleChangeEvent(Object[] listeners, Map deltas, Object registry) { + public void scheduleChangeEvent(Object[] listeners, Map<String, ?> deltas, Object registry) { ((ExtensionRegistry) registry).scheduleChangeEvent(listeners, deltas); } @@ -255,7 +256,7 @@ public class RegistryStrategy { * @param registry the extension registry; may not be <code>null</code> * @return status of the operation or <code>null</code> */ - public final static IStatus processChangeEvent(Object[] listeners, Map deltas, Object registry) { + public final static IStatus processChangeEvent(Object[] listeners, Map<String, ?> deltas, Object registry) { if (registry instanceof ExtensionRegistry) return ((ExtensionRegistry) registry).processChangeEvent(listeners, deltas); return null; |