Author: amitman...@google.com
Date: Wed Jan 7 15:39:19 2009
New Revision: 4402
Modified:
releases/1.6/tools/api-checker/build.xml
releases/1.6/tools/api-checker/src/com/google/gwt/tools/apichecker/ApiCompatibilityChecker.java
Log:
This simple patch: (i) fixes a NPE when running apiChecker using gwt-trunk
jars, (ii) rightly excludes the source files from the gwt-api-checker.jar
Patch by: amitmanjhi
Modified: releases/1.6/tools/api-checker/build.xml
==============================================================================
--- releases/1.6/tools/api-checker/build.xml (original)
+++ releases/1.6/tools/api-checker/build.xml Wed Jan 7 15:39:19 2009
@@ -37,7 +37,6 @@
<mkdir dir="${gwt.build.lib}" />
<gwt.jar>
- <fileset dir="src" excludes="**/package.html" />
<fileset dir="${javac.out}" />
</gwt.jar>
</target>
Modified:
releases/1.6/tools/api-checker/src/com/google/gwt/tools/apichecker/ApiCompatibilityChecker.java
==============================================================================
---
releases/1.6/tools/api-checker/src/com/google/gwt/tools/apichecker/ApiCompatibilityChecker.java
(original)
+++
releases/1.6/tools/api-checker/src/com/google/gwt/tools/apichecker/ApiCompatibilityChecker.java
Wed Jan 7 15:39:19 2009
@@ -784,8 +784,8 @@
try {
return new JarFile(str);
} catch (IOException ex) {
- System.err.println("exception in getting jar from name "
- + ex.getMessage());
+ System.err.println("exception in getting jar from fileName: " + str
+ + ", message: " + ex.getMessage());
return null;
}
}
@@ -858,7 +858,7 @@
"com/google/gwt/dev/jjs/intrinsic/com/google/gwt/lang",
"com/google/gwt/lang",}));
cu = new JarFileCompilationUnits(new JarFile[] {gwtDevJar},
- gwtIncludedPaths, null, logger);
+ gwtIncludedPaths, new HashSet<String>(), logger);
units.addAll(cu.getCompilationUnits());
return units;
}
--~--~---------~--~----~------------~-------~--~----~
http://groups.google.com/group/Google-Web-Toolkit-Contributors
-~----------~----~----~----~------~----~------~--~---
