[jboss-cvs] JBossAS SVN: r63965 - in projects/microcontainer/trunk/dependency/src/main/org/jboss/dependency/plugins: action and 1 other directory.

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

Author: alesj
Date: 2007-07-11 04:13:11 -0400 (Wed, 11 Jul 2007)
New Revision: 63965

Modified:
   projects/microcontainer/trunk/dependency/src/main/org/jboss/dependency/plugins/AbstractController.java
   projects/microcontainer/trunk/dependency/src/main/org/jboss/dependency/plugins/action/AccessControllerContextAction.java
   projects/microcontainer/trunk/dependency/src/main/org/jboss/dependency/plugins/action/SimpleControllerContextAction.java
Log:
Using helper ControllerContextAction.

Modified: projects/microcontainer/trunk/dependency/src/main/org/jboss/dependency/plugins/AbstractController.java
===================================================================
--- projects/microcontainer/trunk/dependency/src/main/org/jboss/dependency/plugins/AbstractController.java	2007-07-11 08:02:27 UTC (rev 63964)
+++ projects/microcontainer/trunk/dependency/src/main/org/jboss/dependency/plugins/AbstractController.java	2007-07-11 08:13:11 UTC (rev 63965)
@@ -43,6 +43,7 @@
 import org.jboss.dependency.spi.DependencyItem;
 import org.jboss.dependency.spi.LifecycleCallbackItem;
 import org.jboss.dependency.plugins.action.ControllerContextAction;
+import org.jboss.dependency.plugins.action.SimpleControllerContextAction;
 import org.jboss.util.JBossObject;
 import org.jboss.util.JBossStringBuilder;
 
@@ -1552,18 +1553,26 @@
       }
    }
 
-   private class AliasControllerContextAction implements ControllerContextAction
+   private class AliasControllerContextAction extends SimpleControllerContextAction<AliasControllerContext>
    {
-      public void install(ControllerContext context) throws Throwable
+      protected AliasControllerContext contextCast(ControllerContext context)
       {
-         AliasControllerContext acc = (AliasControllerContext)context;
+         return AliasControllerContext.class.cast(context);
+      }
 
-         Object alias = acc.getAlias();
+      protected boolean validateContext(ControllerContext context)
+      {
+         return (context instanceof AliasControllerContext);
+      }
+
+      protected void installAction(AliasControllerContext context) throws Throwable
+      {
+         Object alias = context.getAlias();
          Object jmxAlias = JMXObjectNameFix.needsAnAlias(alias);
          if (jmxAlias != null)
             alias = jmxAlias;
 
-         Object original = acc.getOriginal();
+         Object original = context.getOriginal();
          Object jmxOriginal = JMXObjectNameFix.needsAnAlias(original);
          if (jmxOriginal != null)
             original = jmxOriginal;
@@ -1585,14 +1594,12 @@
          }
       }
 
-      public void uninstall(ControllerContext context)
+      protected void uninstallAction(AliasControllerContext context)
       {
          lockWrite();
          try
          {
-            AliasControllerContext acc = (AliasControllerContext)context;
-
-            Object alias = acc.getAlias();
+            Object alias = context.getAlias();
             Object jmxAlias = JMXObjectNameFix.needsAnAlias(alias);
             if (jmxAlias != null)
                alias = jmxAlias;

Modified: projects/microcontainer/trunk/dependency/src/main/org/jboss/dependency/plugins/action/AccessControllerContextAction.java
===================================================================
--- projects/microcontainer/trunk/dependency/src/main/org/jboss/dependency/plugins/action/AccessControllerContextAction.java	2007-07-11 08:02:27 UTC (rev 63964)
+++ projects/microcontainer/trunk/dependency/src/main/org/jboss/dependency/plugins/action/AccessControllerContextAction.java	2007-07-11 08:13:11 UTC (rev 63965)
@@ -37,7 +37,7 @@
  * @param <T> full ControllerContext impl
  * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
  */
-public abstract class AccessControllerContextAction<S extends  ControllerContext, T extends ControllerContext> implements ControllerContextAction
+public abstract class AccessControllerContextAction<S extends ControllerContext, T extends ControllerContext> implements ControllerContextAction
 {
    /**
     * Validate context

Modified: projects/microcontainer/trunk/dependency/src/main/org/jboss/dependency/plugins/action/SimpleControllerContextAction.java
===================================================================
--- projects/microcontainer/trunk/dependency/src/main/org/jboss/dependency/plugins/action/SimpleControllerContextAction.java	2007-07-11 08:02:27 UTC (rev 63964)
+++ projects/microcontainer/trunk/dependency/src/main/org/jboss/dependency/plugins/action/SimpleControllerContextAction.java	2007-07-11 08:13:11 UTC (rev 63965)
@@ -29,7 +29,7 @@
  * @param <T> ControllerContext impl
  * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
  */
-public abstract class SimpleControllerContextAction<T extends ControllerContext>  extends AccessControllerContextAction<T, T>
+public abstract class SimpleControllerContextAction<T extends ControllerContext> extends AccessControllerContextAction<T, T>
 {
    /**
     * Cast the context to the actual implementation.