[jboss-cvs] JBossAS SVN: r60417 - projects/aop/trunk/aop/src/main/org/jboss/aop/instrument.

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

Author: flavia.rainone at jboss.com
Date: 2007-02-07 18:24:41 -0500 (Wed, 07 Feb 2007)
New Revision: 60417

Modified:
   projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/FieldJoinPointGenerator.java
   projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/JoinPointGenerator.java
   projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/OptimizedBehaviourInvocations.java
Log:
Code Refactoring: replaced "getArguments" and "setArguments" by constants OptimizedBehaviourInvocations.GET_ARGUMENTS and OptimizedBehaviourInvocations.SET_ARGUMENTS.

Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/FieldJoinPointGenerator.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/FieldJoinPointGenerator.java	2007-02-07 23:11:23 UTC (rev 60416)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/FieldJoinPointGenerator.java	2007-02-07 23:24:41 UTC (rev 60417)
@@ -536,8 +536,9 @@
       
       protected String createGetArgumentsBody()
       {
-         StringBuffer code = new StringBuffer("public java.lang.Object[] getArguments()");
-         code.append("{ ");
+         StringBuffer code = new StringBuffer("public java.lang.Object[] ");
+         code.append(OptimizedBehaviourInvocations.GET_ARGUMENTS);
+         code.append("(){ ");
          code.append("   if(");
          code.append(ARGUMENTS);
          code.append("  == null)");
@@ -638,8 +639,9 @@
       
       protected String createGetArgumentsBody()
       {
-         StringBuffer code = new StringBuffer("public java.lang.Object[] getArguments()");
-         code.append("{ ");
+         StringBuffer code = new StringBuffer("public java.lang.Object[] ");
+         code.append(OptimizedBehaviourInvocations.GET_ARGUMENTS);
+         code.append("(){ ");
          code.append("   if(");
          code.append(ARGUMENTS);
          code.append("  == null)");

Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/JoinPointGenerator.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/JoinPointGenerator.java	2007-02-07 23:11:23 UTC (rev 60416)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/JoinPointGenerator.java	2007-02-07 23:24:41 UTC (rev 60417)
@@ -259,7 +259,7 @@
    private static final String RETURN_VALUE = "ret";
    private static final String THROWABLE = "t";
    protected static final String ARGUMENTS= "arguments";
-   private static final String GET_ARGUMENTS= " getArguments()";
+   private static final String GET_ARGUMENTS= OptimizedBehaviourInvocations.GET_ARGUMENTS + "()";
    protected static final CtClass[] EMPTY_CTCLASS_ARRAY = new CtClass[0];
    private final ArrayList<Integer> joinPointArguments;
    
@@ -849,7 +849,7 @@
          if (argsFoundAfter)
          {
             code.append(ARGUMENTS);
-            code.append(" = jp.getArguments();");
+            code.append(" = jp.").append(GET_ARGUMENTS).append(";");
          }
          
          code.append("      }");

Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/OptimizedBehaviourInvocations.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/OptimizedBehaviourInvocations.java	2007-02-07 23:11:23 UTC (rev 60416)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/OptimizedBehaviourInvocations.java	2007-02-07 23:24:41 UTC (rev 60417)
@@ -50,6 +50,9 @@
    
    protected static final String INVOKE_TARGET = "invokeTarget";
    
+   static final String GET_ARGUMENTS = "getArguments";
+   private static final String SET_ARGUMENTS = "setArguments";
+   
    /**
     * Returns a piece of code that sets all typed argument fields to the
     * parameter values of current behaviour (i.e., arg0 = $1; arg1 = $2...).
@@ -168,7 +171,7 @@
    {
       if (params.length == 0) return;
       CtClass methodInvocation = pool.get("org.jboss.aop.joinpoint.MethodInvocation");
-      CtMethod template = methodInvocation.getDeclaredMethod("setArguments");
+      CtMethod template = methodInvocation.getDeclaredMethod(SET_ARGUMENTS);
    
       StringBuffer code = new StringBuffer("{");
       code.append("   inconsistentArgs = false;");
@@ -228,7 +231,7 @@
    {
       try {
          CtClass superInvocation = invocation.getSuperclass();
-         CtMethod template = superInvocation.getDeclaredMethod("getArguments");
+         CtMethod template = superInvocation.getDeclaredMethod(GET_ARGUMENTS);
          
          StringBuffer code = new StringBuffer();
          code.append("{ ");
@@ -241,8 +244,9 @@
          {
             code.append("   if (super.marshalledArguments != null)");
             code.append("   {");
-            code.append("      Object[] args = super.getArguments();");
-            code.append("      setArguments(args);");
+            code.append("      Object[] args = super.").append(GET_ARGUMENTS);
+            code.append("();      ");
+            code.append(SET_ARGUMENTS).append("(args);");
             code.append("      return args;");
             code.append("   }");
          }