Fix bug resolving multiple-nested types.
http://gwt-code-reviews.appspot.com/1466808/
Review by: zundel@google.com
git-svn-id: https://google-web-toolkit.googlecode.com/svn/trunk@10399 8db76d5a-ed1c-0410-87a9-c151d255dfc7
diff --git a/dev/core/src/com/google/gwt/dev/javac/JdtCompiler.java b/dev/core/src/com/google/gwt/dev/javac/JdtCompiler.java
index 4202fdf..9f0c604 100644
--- a/dev/core/src/com/google/gwt/dev/javac/JdtCompiler.java
+++ b/dev/core/src/com/google/gwt/dev/javac/JdtCompiler.java
@@ -423,8 +423,10 @@
// resolve an outer type before trying to get the cached inner
String cupName = typeName.substring(0, p);
char[][] chars = CharOperation.splitOn('.', cupName.toCharArray());
- if (lookupEnvironment.getType(chars) != null) {
+ ReferenceBinding outerType = lookupEnvironment.getType(chars);
+ if (outerType != null) {
// outer class was found
+ resolveRecursive(outerType);
chars = CharOperation.splitOn('.', typeName.toCharArray());
type = lookupEnvironment.getCachedType(chars);
if (type == null) {
@@ -472,6 +474,16 @@
return false;
}
+ /**
+ * Recursively invoking {@link ReferenceBinding#memberTypes()} causes JDT to
+ * resolve and cache all nested types at arbitrary depth.
+ */
+ private static void resolveRecursive(ReferenceBinding outerType) {
+ for (ReferenceBinding memberType : outerType.memberTypes()) {
+ resolveRecursive(memberType);
+ }
+ }
+
private AdditionalTypeProviderDelegate additionalTypeProviderDelegate;
/**
