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

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

Author: kabir.khan at jboss.com
Date: 2008-03-25 15:44:34 -0400 (Tue, 25 Mar 2008)
New Revision: 71266

Modified:
   projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/GeneratedAdvisorFieldAccessTransformer.java
Log:
Get rid of unused code and other warnings

Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/GeneratedAdvisorFieldAccessTransformer.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/GeneratedAdvisorFieldAccessTransformer.java	2008-03-25 19:44:09 UTC (rev 71265)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/instrument/GeneratedAdvisorFieldAccessTransformer.java	2008-03-25 19:44:34 UTC (rev 71266)
@@ -21,8 +21,6 @@
   */
 package org.jboss.aop.instrument;
 
-import java.util.ArrayList;
-
 import org.jboss.aop.util.JavassistMethodHashing;
 
 import javassist.CannotCompileException;
@@ -198,6 +196,7 @@
       CtClass genadvisor = getGenadvisor();
       if (doGet)
       {
+         @SuppressWarnings("unused")
          CtMethod rmethod = super.buildReadWrapperPlaceHolder(
                genadvisor,
                field,
@@ -207,6 +206,7 @@
       }
       if (doSet)
       {
+         @SuppressWarnings("unused")
          CtMethod wmethod = super.buildWriteWrapperPlaceHolder(
                genadvisor,
                field,
@@ -246,11 +246,11 @@
       return ((GeneratedAdvisorInstrumentor)instrumentor).getGenadvisor();
    }
 
-   private CtClass getGenInstanceAdvisor()
-   {
-      return ((GeneratedAdvisorInstrumentor)instrumentor).getGenInstanceadvisor();
-   }
-
+//   private CtClass getGenInstanceAdvisor()
+//   {
+//      return ((GeneratedAdvisorInstrumentor)instrumentor).getGenInstanceadvisor();
+//   }
+//
    private String getAdvisorReadWrapperBody(CtClass clazz, CtField field, int index)
    throws NotFoundException, CannotCompileException
    {
@@ -407,7 +407,6 @@
       //Just delegate to method in advisor
       boolean isStatic = Modifier.isStatic(field.getModifiers());
 
-      String code;
       String advisor = isStatic ?
             "((" + GeneratedAdvisorInstrumentor.getAdvisorFQN(clazz) + ")" + Instrumentor.HELPER_FIELD_NAME + ")" :
             "((" + GeneratedAdvisorInstrumentor.getAdvisorFQN(clazz) + ")((" + clazz.getName() + ")$1)." + GeneratedAdvisorInstrumentor.GET_CURRENT_ADVISOR + ")";
@@ -461,28 +460,28 @@
       }
    }
 
-   private ArrayList pendingFieldWriteInfos = new ArrayList();
-   private ArrayList pendingFieldReadInfos = new ArrayList();
+//   private ArrayList<PendingFieldInfo> pendingFieldWriteInfos = new ArrayList<PendingFieldInfo>();
+//   private ArrayList<PendingFieldInfo> pendingFieldReadInfos = new ArrayList<PendingFieldInfo>();
+//
+//   private class PendingFieldInfo
+//   {
+//      CtField field;
+//      int index;
+//      public PendingFieldInfo(CtField field, int index)
+//      {
+//         this.field = field;
+//         this.index = index;
+//      }
+//      public CtField getField()
+//      {
+//         return field;
+//      }
+//      public int getIndex()
+//      {
+//         return index;
+//      }
+//   }
 
-   private class PendingFieldInfo
-   {
-      CtField field;
-      int index;
-      public PendingFieldInfo(CtField field, int index)
-      {
-         this.field = field;
-         this.index = index;
-      }
-      public CtField getField()
-      {
-         return field;
-      }
-      public int getIndex()
-      {
-         return index;
-      }
-   }
-
    protected class GeneratedAdvisorFieldAccessExprEditor extends FieldAccessExprEditor
    {
       public GeneratedAdvisorFieldAccessExprEditor(CtClass clazz, CtField field, boolean doGet, boolean doSet, int index)