svn commit: r1153714 - in /tapestry/tapestry5/trunk/plastic/src/main/java/org/apache/tapestry5/internal/plastic: InheritanceData.java PlasticClassPool.java

[hlship]

Author: hlship
Date: Thu Aug  4 01:12:30 2011
New Revision: 1153714

URL: http://svn.apache.org/viewvc?rev=1153714&view=rev
Log:
Fix bug where InheritanceData.methodName() would only return names from the 
immediate object, not inherited from parents, leading to name conflicts in 
introduced methods

Modified:
    
tapestry/tapestry5/trunk/plastic/src/main/java/org/apache/tapestry5/internal/plastic/InheritanceData.java
    
tapestry/tapestry5/trunk/plastic/src/main/java/org/apache/tapestry5/internal/plastic/PlasticClassPool.java

Modified: 
tapestry/tapestry5/trunk/plastic/src/main/java/org/apache/tapestry5/internal/plastic/InheritanceData.java
URL: 
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/plastic/src/main/java/org/apache/tapestry5/internal/plastic/InheritanceData.java?rev=1153714&r1=1153713&r2=1153714&view=diff
==============================================================================
--- 
tapestry/tapestry5/trunk/plastic/src/main/java/org/apache/tapestry5/internal/plastic/InheritanceData.java
 (original)
+++ 
tapestry/tapestry5/trunk/plastic/src/main/java/org/apache/tapestry5/internal/plastic/InheritanceData.java
 Thu Aug  4 01:12:30 2011
@@ -142,7 +142,7 @@ public class InheritanceData
 
         while (cursor != null)
         {
-            result.addAll(methodNames);
+            result.addAll(cursor.methodNames);
             cursor = cursor.parent;
         }
 

Modified: 
tapestry/tapestry5/trunk/plastic/src/main/java/org/apache/tapestry5/internal/plastic/PlasticClassPool.java
URL: 
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/plastic/src/main/java/org/apache/tapestry5/internal/plastic/PlasticClassPool.java?rev=1153714&r1=1153713&r2=1153714&view=diff
==============================================================================
--- 
tapestry/tapestry5/trunk/plastic/src/main/java/org/apache/tapestry5/internal/plastic/PlasticClassPool.java
 (original)
+++ 
tapestry/tapestry5/trunk/plastic/src/main/java/org/apache/tapestry5/internal/plastic/PlasticClassPool.java
 Thu Aug  4 01:12:30 2011
@@ -366,6 +366,8 @@ public class PlasticClassPool implements
             return new PlasticClassImpl(classNode, this, def.inheritanceData, 
def.staticContext);
         }
 
+        // When the base class is Object, or otherwise not in a transformed 
package,
+        // then start with the empty
         return new PlasticClassImpl(classNode, this, emptyInheritanceData, 
emptyStaticContext);
     }