commit 69f6d39d082e7686e5cde9e69fb391d06aef3af0
author cromwellian <cromwellian@8db76d5a-ed1c-0410-87a9-c151d255dfc7> Fri Oct 16 23:19:37 2009 +0000
committer cromwellian <cromwellian@8db76d5a-ed1c-0410-87a9-c151d255dfc7> Fri Oct 16 23:19:37 2009 +0000
tree 4a54e397877cafeeb2aec432d1b3bfbfd36ac806
parent 6f6bafc8638c3d04af98ed17a5606ceb313a7019

Fix for Issue #4002
Patch by: cromwellian
Review by: scottb


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

dev/core/src/com/google/gwt/dev/jjs/impl/GenerateJavaAST.java

diff --git a/dev/core/src/com/google/gwt/dev/jjs/impl/GenerateJavaAST.java b/dev/core/src/com/google/gwt/dev/jjs/impl/GenerateJavaAST.java
index 3b74a87..bf5aaf6 100644
--- a/dev/core/src/com/google/gwt/dev/jjs/impl/GenerateJavaAST.java
+++ b/dev/core/src/com/google/gwt/dev/jjs/impl/GenerateJavaAST.java
@@ -1948,7 +1948,12 @@
         JExpression expr, JClassType classType) {
       if (classType.getFields().size() > 0) {
         JField field = classType.getFields().get(0);
-        if (field.getName().startsWith("this$")) {
+        /* In some circumstances, the outer this ref can be captured as a local
+         * value (val$this), in other cases, as a this ref (this$).
+         * TODO: investigate using more JDT node information as an alternative
+         */
+        if (field.getName().startsWith("this$") ||
+            field.getName().startsWith("val$this$")) {
           list.add(new JFieldRef(expr.getSourceInfo(), expr, field,
               currentClass));
         }