[jboss-cvs] JBossAS SVN: r73568 - projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans.

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

Author: kabir.khan at jboss.com
Date: 2008-05-21 15:37:33 -0400 (Wed, 21 May 2008)
New Revision: 73568

Modified:
   projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/GenericBeanAspectFactory.java
Log:
getName() should return the name of the aspect

Modified: projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/GenericBeanAspectFactory.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/GenericBeanAspectFactory.java	2008-05-21 19:36:31 UTC (rev 73567)
+++ projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/GenericBeanAspectFactory.java	2008-05-21 19:37:33 UTC (rev 73568)
@@ -23,7 +23,6 @@
 
 import org.jboss.aop.Advisor;
 import org.jboss.aop.InstanceAdvisor;
-import org.jboss.aop.advice.AspectFactory;
 import org.jboss.aop.advice.GenericAspectFactory;
 import org.jboss.aop.joinpoint.Joinpoint;
 import org.jboss.beans.metadata.plugins.factory.GenericBeanFactory;
@@ -45,26 +44,37 @@
    protected BeanFactory factory;
 
    protected String name;
+   protected String classname;
    
    protected Element element;
    
-   public GenericBeanAspectFactory(String name, BeanFactory factory, Element element)
+   public GenericBeanAspectFactory(String name, GenericBeanFactory factory, Element element)
    {
       super(null, element);
       this.name = name;
-      this.factory = factory;
       this.element = element;
+      setBeanFactory(factory);
    }
 
    public void setBeanFactory(GenericBeanFactory factory)
    {
+      if (factory != null)
+      {
+         classname = factory.getBean();
+      }
       this.factory = factory;
    }
    
-   public String getName()
+   public String getAspectName()
    {
       return name;
    }
+   
+   public String getName()
+   {
+      //This must return the classname of the aspect, aop depends on that
+      return classname;
+   }
 
    public Object createPerVM()
    {