commit df41e7ca45f3c15796fc4ce0c0c97180b9a0ab44
author scottb@google.com <scottb@google.com@8db76d5a-ed1c-0410-87a9-c151d255dfc7> Wed Dec 17 18:32:43 2008 +0000
committer scottb@google.com <scottb@google.com@8db76d5a-ed1c-0410-87a9-c151d255dfc7> Wed Dec 17 18:32:43 2008 +0000
tree 61671aaa67928ad122ae87f47a583bb09046871e
parent 4610283b6ec9cc68c1eeb245506013d58efd5626

Update to Java 1.5.

git-svn-id: https://google-web-toolkit.googlecode.com/svn/releases/1.6@4348 8db76d5a-ed1c-0410-87a9-c151d255dfc7

dev/core/src/com/google/gwt/dev/util/xml/ReflectiveParser.java

diff --git a/dev/core/src/com/google/gwt/dev/util/xml/ReflectiveParser.java b/dev/core/src/com/google/gwt/dev/util/xml/ReflectiveParser.java
index 1b53760..580fe89 100644
--- a/dev/core/src/com/google/gwt/dev/util/xml/ReflectiveParser.java
+++ b/dev/core/src/com/google/gwt/dev/util/xml/ReflectiveParser.java
@@ -51,9 +51,9 @@
 
     private Reader reader;
 
-    private Stack schemaLevels = new Stack();
+    private Stack<Schema> schemaLevels = new Stack<Schema>();
 
-    private Stack argStack = new Stack();
+    private Stack<Object[]> argStack = new Stack<Object[]>();
 
     private Schema defaultSchema;
 
@@ -82,7 +82,7 @@
       }
       // Find the precomputed handler class info.
       //
-      Class slc = schemaLevel.getClass();
+      Class<? extends Schema> slc = schemaLevel.getClass();
       HandlerClassInfo classInfo = HandlerClassInfo.getClassInfo(slc);
       assert (classInfo != null); // would've thrown if unregistered
       HandlerMethod method = classInfo.getTextMethod();
@@ -118,7 +118,7 @@
 
       // Find the precomputed handler class info.
       //
-      Class slc = schemaLevel.getClass();
+      Class<? extends Schema> slc = schemaLevel.getClass();
       HandlerClassInfo classInfo = HandlerClassInfo.getClassInfo(slc);
       assert (classInfo != null); // would've thrown if unregistered
       HandlerMethod method = classInfo.getEndMethod(elem);
@@ -174,7 +174,7 @@
 
       // Find the precomputed handler class info.
       //
-      Class slc = schemaLevel.getClass();
+      Class<? extends Schema> slc = schemaLevel.getClass();
       HandlerClassInfo classInfo = HandlerClassInfo.getClassInfo(slc);
       HandlerMethod method = classInfo.getStartMethod(elemName);
 
@@ -268,15 +268,15 @@
     }
 
     private Object[] getCurrentArgs() {
-      return (Object[]) argStack.peek();
+      return argStack.peek();
     }
 
     private Schema getNextToTopSchemaLevel() {
-      return (Schema) schemaLevels.get(schemaLevels.size() - 2);
+      return schemaLevels.get(schemaLevels.size() - 2);
     }
 
     private Schema getTopSchemaLevel() {
-      return (Schema) schemaLevels.peek();
+      return schemaLevels.peek();
     }
 
     private void parse(TreeLogger logger, Schema topSchema, Reader reader)
@@ -351,7 +351,7 @@
         //
         Schema maybeParent = null;
         for (int i = schemaLevels.size() - 1; i >= 0; --i) {
-          maybeParent = (Schema) schemaLevels.get(i);
+          maybeParent = schemaLevels.get(i);
           if (maybeParent != null) {
             break;
           }
@@ -384,16 +384,16 @@
   /**
    * Can safely register the same class recursively.
    */
-  public static void registerSchemaLevel(Class schemaLevelClass) {
+  public static void registerSchemaLevel(Class<? extends Schema> schemaLevelClass) {
     HandlerClassInfo.registerClass(schemaLevelClass);
 
     // Try to register nested classes.
     //
-    Class[] nested = schemaLevelClass.getDeclaredClasses();
+    Class<?>[] nested = schemaLevelClass.getDeclaredClasses();
     for (int i = 0, n = nested.length; i < n; ++i) {
-      Class nestedClass = nested[i];
+      Class<?> nestedClass = nested[i];
       if (Schema.class.isAssignableFrom(nestedClass)) {
-        registerSchemaLevel(nestedClass);
+        registerSchemaLevel(nestedClass.asSubclass(Schema.class));
       }
     }
   }