testing: generics
diff --git a/core/plugins/org.eclipse.dltk.testing/src/org/eclipse/dltk/internal/testing/model/DLTKTestingModel.java b/core/plugins/org.eclipse.dltk.testing/src/org/eclipse/dltk/internal/testing/model/DLTKTestingModel.java
index f3177a5..5d1e952 100755
--- a/core/plugins/org.eclipse.dltk.testing/src/org/eclipse/dltk/internal/testing/model/DLTKTestingModel.java
+++ b/core/plugins/org.eclipse.dltk.testing/src/org/eclipse/dltk/internal/testing/model/DLTKTestingModel.java
@@ -72,7 +72,7 @@
 		 * a TestRunner once to a launch. Once a test runner is connected, it is
 		 * removed from the set.
 		 */
-		private final HashSet fTrackedLaunches = new HashSet(20);
+		private final HashSet<ILaunch> fTrackedLaunches = new HashSet<ILaunch>(20);
 
 		protected void initialize(ILaunchManager launchManager) {
 			fTrackedLaunches.clear();
diff --git a/core/plugins/org.eclipse.dltk.testing/src/org/eclipse/dltk/internal/testing/model/TestContainerElement.java b/core/plugins/org.eclipse.dltk.testing/src/org/eclipse/dltk/internal/testing/model/TestContainerElement.java
index 77a99f1..09a325c 100644
--- a/core/plugins/org.eclipse.dltk.testing/src/org/eclipse/dltk/internal/testing/model/TestContainerElement.java
+++ b/core/plugins/org.eclipse.dltk.testing/src/org/eclipse/dltk/internal/testing/model/TestContainerElement.java
@@ -8,7 +8,6 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-
 package org.eclipse.dltk.internal.testing.model;
 
 import java.util.ArrayList;
@@ -20,9 +19,9 @@
 public abstract class TestContainerElement extends TestElement implements
 		ITestElementContainer {
 
-	private List/* <TestElement> */fChildren;
+	private List<TestElement> fChildren;
 	private Status fChildrenStatus;
-	
+
 	public TestContainerElement(TestContainerElement parent, String id,
 			String testName) {
 		this(parent, id, testName, 8);
@@ -31,7 +30,7 @@
 	public TestContainerElement(TestContainerElement parent, String id,
 			String testName, int childrenCount) {
 		super(parent, id, testName);
-		fChildren = new ArrayList(childrenCount);
+		fChildren = new ArrayList<TestElement>(childrenCount);
 	}
 
 	/*
@@ -56,8 +55,7 @@
 	 * @see org.eclipse.jdt.junit.model.ITestSuiteElement#getChildren()
 	 */
 	public ITestElement[] getChildren() {
-		return (ITestElement[]) fChildren.toArray(new ITestElement[fChildren
-				.size()]);
+		return fChildren.toArray(new ITestElement[fChildren.size()]);
 	}
 
 	public void addChild(TestElement child) {
@@ -76,8 +74,8 @@
 	}
 
 	private Status getCumulatedStatus() {
-		TestElement[] children = (TestElement[]) fChildren
-				.toArray(new TestElement[fChildren.size()]);
+		TestElement[] children = fChildren.toArray(new TestElement[fChildren
+				.size()]);
 		// copy list to avoid concurreny problems
 		if (children.length == 0)
 			return getSuiteStatus();
@@ -106,7 +104,7 @@
 			internalSetChildrenStatus(childStatus);
 			return;
 		}
-		TestElement lastChild = (TestElement) fChildren.get(childCount - 1);
+		TestElement lastChild = fChildren.get(childCount - 1);
 		if (child == lastChild) {
 			if (childStatus.isDone()) {
 				// all children done, collect cumulative status
@@ -153,7 +151,8 @@
 		if (index > 0) {
 			className = className.substring(index + 1);
 		}
-		return className + ": " + getSuiteTypeName() + " : " + super.toString() + " (" + fChildren.size() + ")"; //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+		return className
+				+ ": " + getSuiteTypeName() + " : " + super.toString() + " (" + fChildren.size() + ")"; //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
 	}
 
 }
diff --git a/core/plugins/org.eclipse.dltk.testing/src/org/eclipse/dltk/internal/testing/model/TestRunHandler.java b/core/plugins/org.eclipse.dltk.testing/src/org/eclipse/dltk/internal/testing/model/TestRunHandler.java
index e5a277b..4961aac 100755
--- a/core/plugins/org.eclipse.dltk.testing/src/org/eclipse/dltk/internal/testing/model/TestRunHandler.java
+++ b/core/plugins/org.eclipse.dltk.testing/src/org/eclipse/dltk/internal/testing/model/TestRunHandler.java
@@ -8,7 +8,6 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/
-
 package org.eclipse.dltk.internal.testing.model;
 
 import java.util.Stack;
@@ -36,7 +35,7 @@
 	private TestRunSession fTestRunSession;
 	private TestContainerElement fTestSuite;
 	private TestCaseElement fTestCase;
-	private Stack/*<Boolean>*/ fNotRun= new Stack();
+	private Stack<Boolean> fNotRun= new Stack<Boolean>();
 
 	private StringBuffer fFailureBuffer;
 	private boolean fInExpected;