commit 64b32b84a37e878139f4955e4f147f34f83cb584
author mmendez@google.com <mmendez@google.com@8db76d5a-ed1c-0410-87a9-c151d255dfc7> Wed May 21 15:05:08 2008 +0000
committer mmendez@google.com <mmendez@google.com@8db76d5a-ed1c-0410-87a9-c151d255dfc7> Wed May 21 15:05:08 2008 +0000
tree 2bb8425d77c1e2b1714bf15d8920fb134c0a04e1
parent 67441eec3ba541c09dc426b46ebe3143e5ceaf06

Fixed a typo and factored out the immediate subtypes computation.

Review by: spoon (desk check)

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

user/src/com/google/gwt/user/rebind/rpc/TypeHierarchyUtils.java

diff --git a/user/src/com/google/gwt/user/rebind/rpc/TypeHierarchyUtils.java b/user/src/com/google/gwt/user/rebind/rpc/TypeHierarchyUtils.java
index bcdc1fd..79feed8 100644
--- a/user/src/com/google/gwt/user/rebind/rpc/TypeHierarchyUtils.java
+++ b/user/src/com/google/gwt/user/rebind/rpc/TypeHierarchyUtils.java
@@ -29,7 +29,7 @@
 import java.util.Stack;
 
 /**
- * Collection of utility methods for dealing with type hierachies.
+ * Collection of utility methods for dealing with type hierarchies.
  */
 class TypeHierarchyUtils {
 
@@ -62,7 +62,7 @@
     Set<JClassType> types = new HashSet<JClassType>();
 
     for (JClassType type : leaves) {
-      TypeHierarchyUtils.depthFirstSearch(types, adjList, type.getErasedType());
+      depthFirstSearch(types, adjList, type.getErasedType());
     }
 
     return Arrays.asList(types.toArray(new JClassType[0]));
@@ -119,6 +119,21 @@
   }
 
   /**
+   * Returns the immediate subtypes of a given type.
+   */
+  private static List<JClassType> getImmediateSubtypes(JClassType clazz) {
+    List<JClassType> immediateSubtypes = new ArrayList<JClassType>();
+    for (JClassType subclass : clazz.getSubtypes()) {
+      if (subclass.getSuperclass() == clazz || clazz.isInterface() != null
+          && directlyImplementsInterface(subclass, clazz)) {
+        immediateSubtypes.add(subclass);
+      }
+    }
+
+    return immediateSubtypes;
+  }
+
+  /**
    * Given a root type return an adjacency list that is the inverted type
    * hierarchy.
    */
@@ -130,25 +145,16 @@
     queue.push(root);
     while (!queue.isEmpty()) {
       JClassType clazz = queue.pop();
-      JClassType[] subclasses = clazz.getSubtypes();
-
       if (seen.contains(clazz)) {
         continue;
       }
       seen.add(clazz);
 
-      for (JClassType subclass : subclasses) {
-        if (clazz.isInterface() != null) {
-          if (TypeHierarchyUtils.directlyImplementsInterface(subclass, clazz)) {
-            TypeHierarchyUtils.addEdge(adjList, subclass, clazz);
-            queue.push(subclass);
-          }
-        } else {
-          if (subclass.getSuperclass() == clazz) {
-            TypeHierarchyUtils.addEdge(adjList, subclass, clazz);
-            queue.push(subclass);
-          }
-        }
+      List<JClassType> immediateSubtypes = getImmediateSubtypes(clazz);
+      for (JClassType immediateSubtype : immediateSubtypes) {
+        // Add an edge from the immediate subtype to the supertype
+        addEdge(adjList, immediateSubtype, clazz);
+        queue.push(immediateSubtype);
       }
     }