[jboss-cvs] JBossAS SVN: r67374 - projects/aop/trunk/aop/src/main/org/jboss/aop/proxy/container.

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

Author: kabir.khan at jboss.com
Date: 2007-11-22 06:17:40 -0500 (Thu, 22 Nov 2007)
New Revision: 67374

Modified:
   projects/aop/trunk/aop/src/main/org/jboss/aop/proxy/container/ContainerProxyFactory.java
Log:
[JBAOP-488] Improve toString() method by AOPContainerProxy

Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/proxy/container/ContainerProxyFactory.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/proxy/container/ContainerProxyFactory.java	2007-11-22 09:24:35 UTC (rev 67373)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/proxy/container/ContainerProxyFactory.java	2007-11-22 11:17:40 UTC (rev 67374)
@@ -250,7 +250,11 @@
          addMethodFromTemplate(template, "hashCode", hashCodeBody());
          addMethodFromTemplate(template, "toString", toStringBody());
       }
-      
+      else
+      {
+         addMethodFromTemplate(template, "toString", toStringNotObjectAsSuperBody());
+      }
+
       copyAnnotations(superclass, proxy);
       copySignature(superclass, proxy);
       
@@ -357,6 +361,17 @@
          "}";
    }
 
+   private String toStringNotObjectAsSuperBody()
+   {
+      return 
+         "{" +
+         "   if (delegate != null)" +
+         "      return delegate.toString() + \" (proxied by \" + this.getClass().getName() + \"@\" + java.lang.Integer.toHexString(java.lang.System.identityHashCode(this)) + \")\";" +
+         "   else" +
+         "      return super.toString() + \" (empty proxy of \" + this.getClass().getSuperclass().getName() + \")\";" +
+         "}";
+   }
+
    private CtField addFieldFromTemplate(CtClass template, String name) throws Exception
    {
       return addFieldFromTemplate(template, name, null);