[jboss-cvs] JBossAS SVN: r70505 - in projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata: spi and 1 other directory.

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

Author: adrian at jboss.org
Date: 2008-03-06 13:29:47 -0500 (Thu, 06 Mar 2008)
New Revision: 70505

Modified:
   projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractCallbackMetaData.java
   projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/spi/CallbackMetaData.java
Log:
Tidyup the whenRequired inconsistencies

Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractCallbackMetaData.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractCallbackMetaData.java	2008-03-06 18:03:55 UTC (rev 70504)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractCallbackMetaData.java	2008-03-06 18:29:47 UTC (rev 70505)
@@ -108,7 +108,7 @@
       flushJBossObjectCache();
    }
 
-   public ControllerState getWhenRequiredState()
+   public ControllerState getWhenRequired()
    {
       return whenRequired;
    }
@@ -232,8 +232,8 @@
          buffer.append(" signature=").append(signature);
       if (ControllerState.INSTALLED.equals(dependentState) == false)
          buffer.append(" dependentState=" + dependentState);
-      if (ControllerState.CONFIGURED.equals(whenRequired) == false)
-         buffer.append(" whenRequiredState=" + dependentState);
+      if (ControllerState.INSTALLED.equals(whenRequired) == false)
+         buffer.append(" whenRequired=" + whenRequired);
    }
 
    public void toShortString(JBossStringBuilder buffer)

Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/spi/CallbackMetaData.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/spi/CallbackMetaData.java	2008-03-06 18:03:55 UTC (rev 70504)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/spi/CallbackMetaData.java	2008-03-06 18:29:47 UTC (rev 70505)
@@ -57,7 +57,7 @@
     *
     * @return the required state
     */
-   ControllerState getWhenRequiredState();
+   ControllerState getWhenRequired();
 
    /**
     * Get signature.