[Junit-devel] CVS: junit/org/junit/internal/requests ClassesRequest.java, 1.3, 1.4 ClassRequest.java, 1.4, 1.5

[David S. <ds...@us...>]

Update of /cvsroot/junit/junit/org/junit/internal/requests
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv25645/org/junit/internal/requests

Modified Files:
	ClassesRequest.java ClassRequest.java 
Log Message:
- Fixed raw types because Eclipse 3.3 told us to.
- No longer dynamically check arrays that are statically typed as objects.
- Update documentation to 4.2

Index: ClassesRequest.java
===================================================================
RCS file: /cvsroot/junit/junit/org/junit/internal/requests/ClassesRequest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- ClassesRequest.java	25 Aug 2006 14:43:02 -0000	1.3
+++ ClassesRequest.java	16 Nov 2006 19:17:42 -0000	1.4
@@ -5,10 +5,10 @@
 import org.junit.runner.Runner;
 
 public class ClassesRequest extends Request {
-	private final Class[] fClasses;
+	private final Class<?>[] fClasses;
 	private final String fName;
 	
-	public ClassesRequest(String name, Class... classes) {
+	public ClassesRequest(String name, Class<?>... classes) {
 		fClasses= classes;
 		fName= name;
 	}

Index: ClassRequest.java
===================================================================
RCS file: /cvsroot/junit/junit/org/junit/internal/requests/ClassRequest.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- ClassRequest.java	2 Nov 2006 22:56:55 -0000	1.4
+++ ClassRequest.java	16 Nov 2006 19:17:42 -0000	1.5
@@ -17,12 +17,10 @@
 	
 	@Override
 	public Runner getRunner() {
-		Class runnerClass= getRunnerClass(fTestClass);
+		Class<? extends Runner> runnerClass= getRunnerClass(fTestClass);
 		try {
-			Constructor constructor= runnerClass.getConstructor(Class.class); // TODO good error message if no such constructor
-			Runner runner= (Runner) constructor
-					.newInstance(new Object[] { fTestClass });
-			return runner;
+			Constructor<? extends Runner> constructor= runnerClass.getConstructor(Class.class); // TODO good error message if no such constructor
+			return constructor.newInstance(new Object[] { fTestClass });
 		} catch (StackOverflowError e) {
 			throw new RuntimeException();
 		} catch (Exception e) {
@@ -30,7 +28,7 @@
 		} 
 	}
 
-	Class getRunnerClass(Class<?> testClass) {
+	Class<? extends Runner> getRunnerClass(Class<?> testClass) {
 		RunWith annotation= testClass.getAnnotation(RunWith.class);
 		if (annotation != null) {
 			return annotation.value();