Revision: 8377
Author: [email protected]
Date: Mon Jul 12 14:25:43 2010
Log: Fix some bugs in symbol dumping.

1) Fixes an NPE when dumping symbols with -validateOnly.
2) Fixes unstable sort order being returned from TypeOracle.getTypes().

Review at http://gwt-code-reviews.appspot.com/685801

Review by: [email protected]
http://code.google.com/p/google-web-toolkit/source/detail?r=8377

Modified:
 /trunk/dev/core/src/com/google/gwt/core/ext/typeinfo/TypeOracle.java
 /trunk/dev/core/src/com/google/gwt/dev/Precompile.java

=======================================
--- /trunk/dev/core/src/com/google/gwt/core/ext/typeinfo/TypeOracle.java Tue Jun 22 10:07:56 2010 +++ /trunk/dev/core/src/com/google/gwt/core/ext/typeinfo/TypeOracle.java Mon Jul 12 11:20:44 2010
@@ -584,7 +584,14 @@
    */
   public JClassType[] getTypes() {
     Collection<JRealClassType> values = allTypes.values();
-    return values.toArray(new JClassType[values.size()]);
+    JClassType[] result = values.toArray(new JClassType[values.size()]);
+    Arrays.sort(result, new Comparator<JClassType>() {
+      public int compare(JClassType o1, JClassType o2) {
+        return o1.getQualifiedSourceName().compareTo(
+            o2.getQualifiedSourceName());
+      }
+    });
+    return result;
   }

   public JWildcardType getWildcardType(JWildcardType.BoundType boundType,
=======================================
--- /trunk/dev/core/src/com/google/gwt/dev/Precompile.java Fri Jun 18 04:59:26 2010 +++ /trunk/dev/core/src/com/google/gwt/dev/Precompile.java Mon Jul 12 11:20:44 2010
@@ -472,11 +472,6 @@
               module.getActiveLinkerNames()), genDir);
       // Allow GC later.
       compilationState = null;
-      if (dumpSignatureFile != null) {
-        // Dump early to avoid generated types.
-        SignatureDumper.dumpSignatures(logger,
-            compilationState.getTypeOracle(), dumpSignatureFile);
-      }
       // Never optimize on a validation run.
       jjsOptions.setOptimizePrecompile(false);
       getCompiler(module).precompile(logger, module, rpo, declEntryPts,

--
http://groups.google.com/group/Google-Web-Toolkit-Contributors

Reply via email to