1 files changed, 17 insertions, 17 deletions

diff --git a/bundles/org.eclipse.equinox.transforms.hook/src/org/eclipse/equinox/internal/transforms/TransformInstanceListData.java b/bundles/org.eclipse.equinox.transforms.hook/src/org/eclipse/equinox/internal/transforms/TransformInstanceListData.java
index 8be5f3297..f1ca1edc2 100644
--- a/bundles/org.eclipse.equinox.transforms.hook/src/org/eclipse/equinox/internal/transforms/TransformInstanceListData.java
+++ b/bundles/org.eclipse.equinox.transforms.hook/src/org/eclipse/equinox/internal/transforms/TransformInstanceListData.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
+ * Copyright (c) 2008, 2013 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -21,7 +21,7 @@ import org.osgi.util.tracker.ServiceTracker;
 /**
  * Class that represents a dynamic list of TransformTuples that have been registered against a particular transform type.
  */
-public class TransformInstanceListData extends ServiceTracker {
+public class TransformInstanceListData extends ServiceTracker<URL, URL> {
 	/**
 	 * Used when there are no transform data types
 	 */
@@ -34,17 +34,17 @@ public class TransformInstanceListData extends ServiceTracker {
 	/**
 	 * Map from transformer class -> tuple array
 	 */
-	private Map transformerToTuple = new HashMap();
+	private Map<String, TransformTuple[]> transformerToTuple = new HashMap<String, TransformTuple[]>();
 
 	/**
 	 * List of all tuples in the system.
 	 */
-	private List rawTuples = new ArrayList();
+	private List<TransformTuple> rawTuples = new ArrayList<TransformTuple>();
 
 	/**
 	 * Map from bundle ID -> boolean representing whether or not a given bundle currently has any transforms registered against it.
 	 */
-	private Map bundleIdToTransformPresence = new HashMap();
+	private Map<String, Boolean> bundleIdToTransformPresence = new HashMap<String, Boolean>();
 	private final EquinoxLogServices logServices;
 
 	/**
@@ -71,7 +71,7 @@ public class TransformInstanceListData extends ServiceTracker {
 
 		if (transformerToTuple.size() == 0)
 			return EMPTY_TYPES;
-		return (String[]) transformerToTuple.keySet().toArray(new String[transformerToTuple.size()]);
+		return transformerToTuple.keySet().toArray(new String[transformerToTuple.size()]);
 	}
 
 	/**
@@ -82,7 +82,7 @@ public class TransformInstanceListData extends ServiceTracker {
 		if (stale)
 			rebuildTransformMap();
 
-		return (TransformTuple[]) transformerToTuple.get(type);
+		return transformerToTuple.get(type);
 	}
 
 	/**
@@ -95,12 +95,12 @@ public class TransformInstanceListData extends ServiceTracker {
 			rebuildTransformMap();
 
 		String bundleName = bundle.getSymbolicName();
-		Boolean hasTransformsFor = (Boolean) bundleIdToTransformPresence.get(bundleName);
+		Boolean hasTransformsFor = bundleIdToTransformPresence.get(bundleName);
 
 		if (hasTransformsFor == null) {
 			hasTransformsFor = Boolean.FALSE;
-			for (Iterator i = rawTuples.iterator(); i.hasNext();) {
-				TransformTuple tuple = (TransformTuple) i.next();
+			for (Iterator<TransformTuple> i = rawTuples.iterator(); i.hasNext();) {
+				TransformTuple tuple = i.next();
 				if (tuple.bundlePattern.matcher(bundleName).matches()) {
 					hasTransformsFor = Boolean.TRUE;
 				}
@@ -120,20 +120,20 @@ public class TransformInstanceListData extends ServiceTracker {
 		rawTuples.clear();
 		bundleIdToTransformPresence.clear();
 
-		ServiceReference[] serviceReferences = getServiceReferences();
+		ServiceReference<URL>[] serviceReferences = getServiceReferences();
 		stale = false;
 		if (serviceReferences == null)
 			return;
 
 		for (int i = 0; i < serviceReferences.length; i++) {
-			ServiceReference serviceReference = serviceReferences[i];
+			ServiceReference<URL> serviceReference = serviceReferences[i];
 			String type = serviceReference.getProperty(TransformTuple.TRANSFORMER_TYPE).toString();
 
-			URL url = (URL) getService(serviceReference);
+			URL url = getService(serviceReference);
 			TransformTuple[] transforms;
 			try {
 				transforms = CSVParser.parse(url, logServices);
-				TransformTuple[] existing = (TransformTuple[]) transformerToTuple.get(type);
+				TransformTuple[] existing = transformerToTuple.get(type);
 				if (existing != null) {
 					TransformTuple[] newTransforms = new TransformTuple[existing.length + transforms.length];
 					System.arraycopy(existing, 0, newTransforms, 0, existing.length);
@@ -152,7 +152,7 @@ public class TransformInstanceListData extends ServiceTracker {
 		}
 	}
 
-	public Object addingService(ServiceReference reference) {
+	public URL addingService(ServiceReference<URL> reference) {
 		try {
 			return super.addingService(reference);
 		} finally {
@@ -160,12 +160,12 @@ public class TransformInstanceListData extends ServiceTracker {
 		}
 	}
 
-	public void modifiedService(ServiceReference reference, Object service) {
+	public void modifiedService(ServiceReference<URL> reference, URL service) {
 		super.modifiedService(reference, service);
 		stale = true;
 	}
 
-	public void removedService(ServiceReference reference, Object service) {
+	public void removedService(ServiceReference<URL> reference, URL service) {
 		super.removedService(reference, service);
 		stale = true;
 	}