Updates GWT to use JDT version 3.4.2.
Review by: jat
git-svn-id: https://google-web-toolkit.googlecode.com/svn/releases/1.6@4362 8db76d5a-ed1c-0410-87a9-c151d255dfc7
diff --git a/dev/core/build.xml b/dev/core/build.xml
index e5090e6..2ca8b9a 100755
--- a/dev/core/build.xml
+++ b/dev/core/build.xml
@@ -25,7 +25,7 @@
<gwt.jar destfile="${alldeps.jar}">
<zipfileset src="${gwt.tools.lib}/apache/tapestry-util-text-4.0.2.jar" />
<zipfileset src="${gwt.tools.lib}/apache/ant-1.6.5.jar" />
- <zipfileset src="${gwt.tools.lib}/eclipse/jdt-3.3.1.jar" />
+ <zipfileset src="${gwt.tools.lib}/eclipse/jdt-3.4.2.jar" />
<zipfileset src="${gwt.tools.lib}/jetty/jetty-6.1.11.jar" />
<zipfileset src="${gwt.tools.lib}/tomcat/ant-launcher-1.6.5.jar" />
<zipfileset src="${gwt.tools.lib}/tomcat/catalina-1.0.jar" />
diff --git a/dev/core/src/com/google/gwt/dev/javac/LongFromJSNIChecker.java b/dev/core/src/com/google/gwt/dev/javac/LongFromJSNIChecker.java
index fa49fd6..7e699ab 100644
--- a/dev/core/src/com/google/gwt/dev/javac/LongFromJSNIChecker.java
+++ b/dev/core/src/com/google/gwt/dev/javac/LongFromJSNIChecker.java
@@ -189,10 +189,11 @@
if (binding instanceof ProblemReferenceBinding) {
ProblemReferenceBinding prb = (ProblemReferenceBinding) binding;
- if (prb.problemId() == ProblemReasons.NotVisible) {
+ if (prb.problemId() == ProblemReasons.NotVisible
+ && prb.closestMatch() instanceof ReferenceBinding) {
// It's just a visibility problem, so try drilling
// down manually
- ReferenceBinding drilling = prb.closestMatch();
+ ReferenceBinding drilling = (ReferenceBinding) prb.closestMatch();
for (int i = prb.compoundName.length; i < compoundName.length; i++) {
drilling = drilling.getMemberType(compoundName[i]);
}
diff --git a/dev/core/test/com/google/gwt/dev/javac/BinaryTypeReferenceRestrictionsCheckerTest.java b/dev/core/test/com/google/gwt/dev/javac/BinaryTypeReferenceRestrictionsCheckerTest.java
index 16b7e90..e3ab405 100644
--- a/dev/core/test/com/google/gwt/dev/javac/BinaryTypeReferenceRestrictionsCheckerTest.java
+++ b/dev/core/test/com/google/gwt/dev/javac/BinaryTypeReferenceRestrictionsCheckerTest.java
@@ -92,6 +92,10 @@
return null;
}
+ public char[][][] getMissingTypeNames() {
+ return null;
+ }
+
public int getModifiers() {
return 0;
}
@@ -169,7 +173,8 @@
TypeDeclaration typeDeclaration = new TypeDeclaration(compilationResult);
typeDeclaration.scope = new ClassScope(cud.scope, null);
- typeDeclaration.staticInitializerScope = new MethodScope(typeDeclaration.scope, null, false);
+ typeDeclaration.staticInitializerScope = new MethodScope(
+ typeDeclaration.scope, null, false);
cud.types = new TypeDeclaration[] {typeDeclaration};
BinaryTypeBinding binaryTypeBinding = new BinaryTypeBinding(null,
@@ -205,8 +210,10 @@
assertEquals(expectedExpressions.length, binaryTypeReferenceSites.size());
for (int i = 0; i < binaryTypeReferenceSites.size(); ++i) {
BinaryTypeReferenceSite binaryTypeReferenceSite = binaryTypeReferenceSites.get(i);
- assertSame(binaryTypeBinding, binaryTypeReferenceSite.getBinaryTypeBinding());
- assertSame(expectedExpressions[i], binaryTypeReferenceSite.getExpression());
+ assertSame(binaryTypeBinding,
+ binaryTypeReferenceSite.getBinaryTypeBinding());
+ assertSame(expectedExpressions[i],
+ binaryTypeReferenceSite.getExpression());
}
}
