[jboss-cvs] JBossAS SVN: r67376 - 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:50:33 -0500 (Thu, 22 Nov 2007)
New Revision: 67376

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/ProxyTemplate.java
Log:
[JBAOP-488] Always use improved toString() method

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 11:43:55 UTC (rev 67375)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/proxy/container/ContainerProxyFactory.java	2007-11-22 11:50:33 UTC (rev 67376)
@@ -248,13 +248,10 @@
       {
          addMethodFromTemplate(template, "equals", equalsBody());
          addMethodFromTemplate(template, "hashCode", hashCodeBody());
-         addMethodFromTemplate(template, "toString", toStringBody());
       }
-      else
-      {
-         addMethodFromTemplate(template, "toString", toStringNotObjectAsSuperBody());
-      }
 
+      addMethodFromTemplate(template, "toString", toStringBody());
+
       copyAnnotations(superclass, proxy);
       copySignature(superclass, proxy);
       
@@ -355,17 +352,6 @@
       return 
          "{" +
          "   if (delegate != null)" +
-         "      return delegate.toString();" +
-         "   else" +
-         "      return super.toString();" +
-         "}";
-   }
-
-   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() + \")\";" +

Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/proxy/container/ProxyTemplate.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/proxy/container/ProxyTemplate.java	2007-11-22 11:43:55 UTC (rev 67375)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/proxy/container/ProxyTemplate.java	2007-11-22 11:50:33 UTC (rev 67376)
@@ -129,11 +129,19 @@
    public String toString()
    {
       if (delegate != null)
-         return delegate.toString();
+         return delegate.toString() + " (proxied by " + this.getClass().getName() + "@" + Integer.toHexString(System.identityHashCode(this)) + ")";
       else
-         return super.toString();
+         return super.toString() + "(empty proxy of " + this.getClass().getSuperclass().getName() + ")";
    }
    
+//   "{" +
+//   "   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 void writeObject(java.io.ObjectOutputStream out) throws IOException
    {
       out.writeObject(delegate);