1 files changed, 13 insertions, 13 deletions

diff --git a/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/model/RunJavaSearchTests.java b/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/model/RunJavaSearchTests.java
index 12c4f31a6..4a2472e03 100644
--- a/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/model/RunJavaSearchTests.java
+++ b/tests/org.eclipse.wst.jsdt.core.tests.model/src/org/eclipse/wst/jsdt/core/tests/model/RunJavaSearchTests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2007 IBM Corporation and others.
+ * Copyright (c) 2000, 2014 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
@@ -7,29 +7,31 @@
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
+ *     Mickael Istria (Red Hat Inc.) - 426209 Java 6 + Warnings cleanup
  *******************************************************************************/
 package org.eclipse.wst.jsdt.core.tests.model;
 
-import java.lang.reflect.*;
-import java.util.*;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
 import java.util.ArrayList;
-
-import org.eclipse.wst.jsdt.core.tests.junit.extension.TestCase;
+import java.util.List;
 
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
+import org.eclipse.wst.jsdt.core.tests.junit.extension.TestCase;
+
 public class RunJavaSearchTests extends junit.framework.TestCase {
 
-	public final static List TEST_CLASSES = new ArrayList();
+	public final static List<Class<? extends TestCase>> TEST_CLASSES = new ArrayList<Class<? extends TestCase>>();
 	static {
 		TEST_CLASSES.add(JavaSearchTests.class);
 		TEST_CLASSES.add(WorkingCopySearchTests.class);
 		TEST_CLASSES.add(JavaSearchJavadocTests.class);
 	}
 
-	public static Class[] getTestClasses() {
-		return (Class[]) TEST_CLASSES.toArray();
+	public static Class<? extends TestCase>[] getTestClasses() {
+		return TEST_CLASSES.toArray(new Class[TEST_CLASSES.size()]);
 	}
 
 	public RunJavaSearchTests(String name) {
@@ -40,10 +42,10 @@ public class RunJavaSearchTests extends junit.framework.TestCase {
 		TestSuite ts = new TestSuite(RunJavaSearchTests.class.getName());
 
 		// Store test classes with same "JavaSearch"project
-		AbstractJavaSearchTests.JAVA_SEARCH_SUITES = new ArrayList(TEST_CLASSES);
+		AbstractJavaSearchTests.JAVA_SEARCH_SUITES = new ArrayList<Class<? extends TestCase>>(TEST_CLASSES);
 
 		// Get all classes
-		List allClasses = new ArrayList(TEST_CLASSES);
+		List<Class<? extends TestCase>> allClasses = new ArrayList<Class<? extends TestCase>>(TEST_CLASSES);
 		allClasses.add(JavaSearchBugsTests.class);
 		allClasses.add(JavaSearchMultipleProjectsTests.class);
 		allClasses.add(SearchTests.class);
@@ -57,9 +59,7 @@ public class RunJavaSearchTests extends junit.framework.TestCase {
 		TestCase.RUN_ONLY_ID = null;
 
 		// Add all tests suite of tests
-		for (int i = 0, size = allClasses.size(); i < size; i++) {
-			Class testClass = (Class) allClasses.get(i);
-
+		for (Class<? extends TestCase> testClass : allClasses) {
 			// call the suite() method and add the resulting suite to the suite
 			try {
 				Method suiteMethod = testClass.getDeclaredMethod("suite", new Class[0]); //$NON-NLS-1$