[jboss-cvs] JBossAS SVN: r83782 - in projects/aop/trunk/asintegration-mc/src/test/java/org/jboss/test/aop/classpool/jbosscl: support/excluded/replacereferences/parent and 1 other directories.

[jboss-cvs-commits at lists.jboss.org]

Author: kabir.khan at jboss.com
Date: 2009-02-02 11:25:14 -0500 (Mon, 02 Feb 2009)
New Revision: 83782

Modified:
   projects/aop/trunk/asintegration-mc/src/test/java/org/jboss/test/aop/classpool/jbosscl/support/excluded/replacereferences/child/Child.java
   projects/aop/trunk/asintegration-mc/src/test/java/org/jboss/test/aop/classpool/jbosscl/support/excluded/replacereferences/parent/Parent.java
   projects/aop/trunk/asintegration-mc/src/test/java/org/jboss/test/aop/classpool/jbosscl/test/ClassPoolWithReplaceReferencesTestCase.java
Log:
[JBAOP-666] Generate all wrappers in Child and Parent, and remove workaround following Chiba's suggestion

Modified: projects/aop/trunk/asintegration-mc/src/test/java/org/jboss/test/aop/classpool/jbosscl/support/excluded/replacereferences/child/Child.java
===================================================================
--- projects/aop/trunk/asintegration-mc/src/test/java/org/jboss/test/aop/classpool/jbosscl/support/excluded/replacereferences/child/Child.java	2009-02-02 15:15:47 UTC (rev 83781)
+++ projects/aop/trunk/asintegration-mc/src/test/java/org/jboss/test/aop/classpool/jbosscl/support/excluded/replacereferences/child/Child.java	2009-02-02 16:25:14 UTC (rev 83782)
@@ -31,10 +31,4 @@
 public class Child extends Parent
 {
    int child;
-   
-   public static void child_write(Object o, int i)
-   {
-      org.jboss.test.aop.classpool.jbosscl.support.excluded.replacereferences.Invoked.invoked = true;
-      ((Child)o).child = i;
-   }
 }

Modified: projects/aop/trunk/asintegration-mc/src/test/java/org/jboss/test/aop/classpool/jbosscl/support/excluded/replacereferences/parent/Parent.java
===================================================================
--- projects/aop/trunk/asintegration-mc/src/test/java/org/jboss/test/aop/classpool/jbosscl/support/excluded/replacereferences/parent/Parent.java	2009-02-02 15:15:47 UTC (rev 83781)
+++ projects/aop/trunk/asintegration-mc/src/test/java/org/jboss/test/aop/classpool/jbosscl/support/excluded/replacereferences/parent/Parent.java	2009-02-02 16:25:14 UTC (rev 83782)
@@ -29,10 +29,4 @@
 public class Parent
 {
    public int parent;
-   
-   public static void parent_write(Object o, int i)
-   {
-      org.jboss.test.aop.classpool.jbosscl.support.excluded.replacereferences.Invoked.invoked = true;
-      ((Parent)o).parent = i;
-   }
 }

Modified: projects/aop/trunk/asintegration-mc/src/test/java/org/jboss/test/aop/classpool/jbosscl/test/ClassPoolWithReplaceReferencesTestCase.java
===================================================================
--- projects/aop/trunk/asintegration-mc/src/test/java/org/jboss/test/aop/classpool/jbosscl/test/ClassPoolWithReplaceReferencesTestCase.java	2009-02-02 15:15:47 UTC (rev 83781)
+++ projects/aop/trunk/asintegration-mc/src/test/java/org/jboss/test/aop/classpool/jbosscl/test/ClassPoolWithReplaceReferencesTestCase.java	2009-02-02 16:25:14 UTC (rev 83782)
@@ -263,26 +263,26 @@
             }
             CtMethod rmethod = 
                CtNewMethod.make(
+                     Modifier.PUBLIC | Modifier.STATIC,
                      CtClass.intType, 
                      getFieldReadWrapperName(field.getName()),
                      new CtClass[]{objectCt}, 
                      null, 
-                     "{" + CLASS_INVOKED + ".invoked = true; return ((" + clazz.getName() + ")$0)." + field.getName() + ";}", 
+                     "{" + CLASS_INVOKED + ".invoked = true; return ((" + clazz.getName() + ")$1)." + field.getName() + ";}", 
                      clazz);
-            rmethod.setModifiers(Modifier.PUBLIC | Modifier.STATIC);
             clazz.addMethod(rmethod);
 
-// TODO This gives VerifyErrors, mailed Chiba in the meantime have added these methods directly to Parent and Child            
-//            CtMethod wmethod = 
-//               CtNewMethod.make(
-//                     CtClass.voidType, 
-//                     getFieldWriteWrapperName(field.getName()),
-//                     new CtClass[]{objectCt, field.getType()}, 
-//                     null,
-//                     "{" + CLASS_INVOKED + ".invoked = true; ((" + clazz.getName() + ")$0)." + field.getName() + "=(int)$1;}", 
-//                     clazz);
-//            wmethod.setModifiers(Modifier.PUBLIC | Modifier.STATIC);
-//            clazz.addMethod(wmethod);
+
+            CtMethod wmethod = 
+               CtNewMethod.make(
+                     Modifier.PUBLIC | Modifier.STATIC,
+                     CtClass.voidType, 
+                     getFieldWriteWrapperName(field.getName()),
+                     new CtClass[]{objectCt, field.getType()}, 
+                     null,
+                     "{" + CLASS_INVOKED + ".invoked = true; ((" + clazz.getName() + ")$1)." + field.getName() + "=(int)$2;}", 
+                     clazz);
+            clazz.addMethod(wmethod);
          }
       }