[jboss-cvs] JBossAS SVN: r90491 - in projects/aop/branches/Branch_2_1: aop/src/main/java/org/jboss/aop/advice and 1 other directories.

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

Author: kabir.khan at jboss.com
Date: 2009-06-22 05:21:09 -0400 (Mon, 22 Jun 2009)
New Revision: 90491

Modified:
   projects/aop/branches/Branch_2_1/aop/src/main/java/org/jboss/aop/Advisor.java
   projects/aop/branches/Branch_2_1/aop/src/main/java/org/jboss/aop/advice/SortedCFlowInterceptor.java
   projects/aop/branches/Branch_2_1/deployers/src/main/java/org/jboss/aop/asintegration/jboss5/AopMetaDataDeployerOutput.java
Log:
Source code tidy up

Modified: projects/aop/branches/Branch_2_1/aop/src/main/java/org/jboss/aop/Advisor.java
===================================================================
--- projects/aop/branches/Branch_2_1/aop/src/main/java/org/jboss/aop/Advisor.java	2009-06-22 09:17:54 UTC (rev 90490)
+++ projects/aop/branches/Branch_2_1/aop/src/main/java/org/jboss/aop/Advisor.java	2009-06-22 09:21:09 UTC (rev 90491)
@@ -40,7 +40,6 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.CopyOnWriteArraySet;
 
 import javassist.CtClass;
 import javassist.CtConstructor;

Modified: projects/aop/branches/Branch_2_1/aop/src/main/java/org/jboss/aop/advice/SortedCFlowInterceptor.java
===================================================================
--- projects/aop/branches/Branch_2_1/aop/src/main/java/org/jboss/aop/advice/SortedCFlowInterceptor.java	2009-06-22 09:17:54 UTC (rev 90490)
+++ projects/aop/branches/Branch_2_1/aop/src/main/java/org/jboss/aop/advice/SortedCFlowInterceptor.java	2009-06-22 09:21:09 UTC (rev 90491)
@@ -81,7 +81,9 @@
       }
       
       this.chains = new LinkedHashMap<Integer, Interceptor[]>(2, 1, true){
-        @Override
+        private static final long serialVersionUID = 1L;
+
+      @Override
         protected boolean removeEldestEntry(Entry<Integer,Interceptor[]> eldest)
         {
            return size() > 5;

Modified: projects/aop/branches/Branch_2_1/deployers/src/main/java/org/jboss/aop/asintegration/jboss5/AopMetaDataDeployerOutput.java
===================================================================
--- projects/aop/branches/Branch_2_1/deployers/src/main/java/org/jboss/aop/asintegration/jboss5/AopMetaDataDeployerOutput.java	2009-06-22 09:17:54 UTC (rev 90490)
+++ projects/aop/branches/Branch_2_1/deployers/src/main/java/org/jboss/aop/asintegration/jboss5/AopMetaDataDeployerOutput.java	2009-06-22 09:21:09 UTC (rev 90491)
@@ -23,12 +23,9 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Set;
 
-import org.jboss.aop.microcontainer.beans.Aspect;
 import org.jboss.aop.microcontainer.beans.metadata.AspectManagerAwareBeanMetaDataFactory;
 import org.jboss.beans.metadata.spi.BeanMetaData;
-import org.jboss.beans.metadata.spi.PropertyMetaData;
 import org.jboss.beans.metadata.spi.builder.BeanMetaDataBuilder;
 
 /**
@@ -124,20 +121,6 @@
       
          //set the new name used by the controller for managing beans
          builder.setName(newName);
-         
-         //Debug stuff
-         if (bean.getBean().equals(Aspect.class.getName()))
-         {
-            Object scope = null;
-            Set<PropertyMetaData> properties = bean.getProperties();
-            for (PropertyMetaData property : properties)
-            {
-               if (property.getName().equals("scope"))
-               {
-                  scope = property.getValue().getUnderlyingValue();
-               }
-            }
-         }
       }
    }
 }