[jboss-cvs] JBossAS SVN: r70507 - in projects/microcontainer/trunk/kernel/src/main/org/jboss: beans/metadata/spi and 2 other directories.

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

Author: adrian at jboss.org
Date: 2008-03-06 13:58:51 -0500 (Thu, 06 Mar 2008)
New Revision: 70507

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
   projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/InstallCallbackAnnotationPlugin.java
   projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/UninstallCallbackAnnotationPlugin.java
   projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/xml/CallbackHandler.java
Log:
The real confusion with CallbackMetaData whenRequired is that it already exists on the super class :-)

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:58:23 UTC (rev 70506)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/AbstractCallbackMetaData.java	2008-03-06 18:58:51 UTC (rev 70507)
@@ -55,9 +55,6 @@
    protected String property;
 
    /** The required state of the dependency */
-   protected ControllerState whenRequired = ControllerState.INSTALLED;
-
-   /** The required state of the dependency */
    protected ControllerState dependentState = ControllerState.INSTALLED;
 
    /** The signature */
@@ -108,23 +105,6 @@
       flushJBossObjectCache();
    }
 
-   public ControllerState getWhenRequired()
-   {
-      return whenRequired;
-   }
-
-   /**
-    * Set when required state.
-    *
-    * @param whenRequired when is this call back required (default Configured)
-    */
-   @XmlAttribute(name="whenRequired")
-   public void setWhenRequired(ControllerState whenRequired)
-   {
-      this.whenRequired = whenRequired;
-      flushJBossObjectCache();
-   }
-
    public String getSignature()
    {
       return signature;
@@ -183,6 +163,7 @@
 
    public void describeVisit(MetaDataVisitor vistor)
    {
+      ControllerState whenRequired = getState();
       try
       {
          KernelControllerContext context = vistor.getControllerContext();
@@ -232,8 +213,6 @@
          buffer.append(" signature=").append(signature);
       if (ControllerState.INSTALLED.equals(dependentState) == false)
          buffer.append(" dependentState=" + 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:58:23 UTC (rev 70506)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/spi/CallbackMetaData.java	2008-03-06 18:58:51 UTC (rev 70507)
@@ -53,13 +53,6 @@
    ControllerState getDependentState();
 
    /**
-    * Get the when required state
-    *
-    * @return the required state
-    */
-   ControllerState getWhenRequired();
-
-   /**
     * Get signature.
     *
     * @return method / property parameter signature

Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/InstallCallbackAnnotationPlugin.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/InstallCallbackAnnotationPlugin.java	2008-03-06 18:58:23 UTC (rev 70506)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/InstallCallbackAnnotationPlugin.java	2008-03-06 18:58:51 UTC (rev 70507)
@@ -57,7 +57,7 @@
    protected AbstractCallbackMetaData createCallback(T info, Install annotation)
    {
       InstallCallbackMetaData callback = new InstallCallbackMetaData();
-      callback.setWhenRequired(new ControllerState(annotation.whenRequired()));
+      callback.setState(new ControllerState(annotation.whenRequired()));
       callback.setDependentState(new ControllerState(annotation.dependentState()));
       if (isAttributePresent(annotation.cardinality()))
          callback.setCardinality(Cardinality.fromString(annotation.cardinality()));

Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/UninstallCallbackAnnotationPlugin.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/UninstallCallbackAnnotationPlugin.java	2008-03-06 18:58:23 UTC (rev 70506)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/annotations/UninstallCallbackAnnotationPlugin.java	2008-03-06 18:58:51 UTC (rev 70507)
@@ -57,7 +57,7 @@
    protected AbstractCallbackMetaData createCallback(T info, Uninstall annotation)
    {
       UninstallCallbackMetaData callback = new UninstallCallbackMetaData();
-      callback.setWhenRequired(new ControllerState(annotation.whenRequired()));
+      callback.setState(new ControllerState(annotation.whenRequired()));
       callback.setDependentState(new ControllerState(annotation.dependentState()));
       if (isAttributePresent(annotation.cardinality()))
          callback.setCardinality(Cardinality.fromString(annotation.cardinality()));

Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/xml/CallbackHandler.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/xml/CallbackHandler.java	2008-03-06 18:58:23 UTC (rev 70506)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/kernel/plugins/deployment/xml/CallbackHandler.java	2008-03-06 18:58:51 UTC (rev 70507)
@@ -63,7 +63,7 @@
          else if ("state".equals(localName))
             callbackMetaData.setDependentState(new ControllerState(attrs.getValue(i)));
          else if ("whenRequired".equals(localName))
-            callbackMetaData.setWhenRequired(new ControllerState(attrs.getValue(i)));
+            callbackMetaData.setState(new ControllerState(attrs.getValue(i)));
          else if ("signature".equals(localName))
             callbackMetaData.setSignature(attrs.getValue(i));
          else if ("cardinality".equals(localName))