[jboss-cvs] JBossAS SVN: r95909 - in projects/kernel/trunk/dependency/src: main/java/org/jboss/dependency/spi and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Nov 2 05:19:55 EST 2009
Author: kabir.khan at jboss.com
Date: 2009-11-02 05:19:55 -0500 (Mon, 02 Nov 2009)
New Revision: 95909
Modified:
projects/kernel/trunk/dependency/src/main/java/org/jboss/dependency/plugins/AbstractController.java
projects/kernel/trunk/dependency/src/main/java/org/jboss/dependency/plugins/ListControllerStateModel.java
projects/kernel/trunk/dependency/src/main/java/org/jboss/dependency/plugins/MapControllerStateModel.java
projects/kernel/trunk/dependency/src/main/java/org/jboss/dependency/spi/ControllerStateModel.java
projects/kernel/trunk/dependency/src/test/java/org/jboss/test/dependency/controller/test/ControllerStateModelTestCase.java
Log:
Move CSM.addState() into an abstract base class since callers of Controller.getState() should not be able to add states. Adding states should happen via controller
Modified: projects/kernel/trunk/dependency/src/main/java/org/jboss/dependency/plugins/AbstractController.java
===================================================================
--- projects/kernel/trunk/dependency/src/main/java/org/jboss/dependency/plugins/AbstractController.java 2009-11-02 10:18:17 UTC (rev 95908)
+++ projects/kernel/trunk/dependency/src/main/java/org/jboss/dependency/plugins/AbstractController.java 2009-11-02 10:19:55 UTC (rev 95909)
@@ -76,7 +76,7 @@
/** Whether we are shutdown */
private boolean shutdown = false;
- private ControllerStateModel stateModel = new MapControllerStateModel();
+ private AbstractControllerStateModel stateModel = new MapControllerStateModel();
/** All contexts by name Map<Object, ControllerContext> */
private Map<Object, ControllerContext> allContexts = new ConcurrentHashMap<Object, ControllerContext>();
Modified: projects/kernel/trunk/dependency/src/main/java/org/jboss/dependency/plugins/ListControllerStateModel.java
===================================================================
--- projects/kernel/trunk/dependency/src/main/java/org/jboss/dependency/plugins/ListControllerStateModel.java 2009-11-02 10:18:17 UTC (rev 95908)
+++ projects/kernel/trunk/dependency/src/main/java/org/jboss/dependency/plugins/ListControllerStateModel.java 2009-11-02 10:19:55 UTC (rev 95909)
@@ -27,7 +27,6 @@
import java.util.concurrent.CopyOnWriteArrayList;
import org.jboss.dependency.spi.ControllerState;
-import org.jboss.dependency.spi.ControllerStateModel;
/**
* The legacy list based ControllerStateModel implementation
@@ -35,7 +34,7 @@
* @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
* @version $Revision: 1.1 $
*/
-public class ListControllerStateModel implements ControllerStateModel
+public class ListControllerStateModel extends AbstractControllerStateModel
{
/** The states in order List<ControllerState> */
private List<ControllerState> states = new CopyOnWriteArrayList<ControllerState>();
Modified: projects/kernel/trunk/dependency/src/main/java/org/jboss/dependency/plugins/MapControllerStateModel.java
===================================================================
--- projects/kernel/trunk/dependency/src/main/java/org/jboss/dependency/plugins/MapControllerStateModel.java 2009-11-02 10:18:17 UTC (rev 95908)
+++ projects/kernel/trunk/dependency/src/main/java/org/jboss/dependency/plugins/MapControllerStateModel.java 2009-11-02 10:19:55 UTC (rev 95909)
@@ -29,14 +29,13 @@
import java.util.concurrent.CopyOnWriteArrayList;
import org.jboss.dependency.spi.ControllerState;
-import org.jboss.dependency.spi.ControllerStateModel;
/**
*
* @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
* @version $Revision: 1.1 $
*/
-public class MapControllerStateModel implements ControllerStateModel
+public class MapControllerStateModel extends AbstractControllerStateModel
{
private volatile ControllerStateWrapper first;
private volatile ControllerStateWrapper last;
Modified: projects/kernel/trunk/dependency/src/main/java/org/jboss/dependency/spi/ControllerStateModel.java
===================================================================
--- projects/kernel/trunk/dependency/src/main/java/org/jboss/dependency/spi/ControllerStateModel.java 2009-11-02 10:18:17 UTC (rev 95908)
+++ projects/kernel/trunk/dependency/src/main/java/org/jboss/dependency/spi/ControllerStateModel.java 2009-11-02 10:19:55 UTC (rev 95909)
@@ -32,16 +32,6 @@
public interface ControllerStateModel extends Iterable<ControllerState>
{
/**
- * Add a state to the model
- *
- * @param state The state to add
- * @param before The exisiting state to add this state before
- * @return true if the state was added, false if the state already existed and therefore was not added
- * @throws IllegalArgumentException if the before state did not exist
- */
- boolean addState(ControllerState state, ControllerState before);
-
- /**
* Returns the first state in the state model
*
* @return the first state or null if the state model is empty
Modified: projects/kernel/trunk/dependency/src/test/java/org/jboss/test/dependency/controller/test/ControllerStateModelTestCase.java
===================================================================
--- projects/kernel/trunk/dependency/src/test/java/org/jboss/test/dependency/controller/test/ControllerStateModelTestCase.java 2009-11-02 10:18:17 UTC (rev 95908)
+++ projects/kernel/trunk/dependency/src/test/java/org/jboss/test/dependency/controller/test/ControllerStateModelTestCase.java 2009-11-02 10:19:55 UTC (rev 95909)
@@ -26,10 +26,10 @@
import junit.framework.Test;
+import org.jboss.dependency.plugins.AbstractControllerStateModel;
import org.jboss.dependency.plugins.ListControllerStateModel;
import org.jboss.dependency.plugins.MapControllerStateModel;
import org.jboss.dependency.spi.ControllerState;
-import org.jboss.dependency.spi.ControllerStateModel;
/**
* Test to try out a new ControllerStateModel implementation
@@ -67,7 +67,7 @@
private void runControllerStateModelTest(ControllerStateModelFactory factory)
{
- ControllerStateModel model = factory.createControllerStateModel();
+ AbstractControllerStateModel model = factory.createControllerStateModel();
try
{
@@ -221,7 +221,7 @@
{
int counter = 0;
- ControllerStateModel model = factory.createControllerStateModel();
+ AbstractControllerStateModel model = factory.createControllerStateModel();
ControllerState[] states = new ControllerState[NUM_STATES];
for (int i = 0 ; i < NUM_STATES ; i++)
@@ -310,11 +310,11 @@
private interface ControllerStateModelFactory
{
- ControllerStateModel createControllerStateModel();
+ AbstractControllerStateModel createControllerStateModel();
ControllerStateModelFactory EXISITING = new ControllerStateModelFactory()
{
- public ControllerStateModel createControllerStateModel()
+ public AbstractControllerStateModel createControllerStateModel()
{
return new ListControllerStateModel();
}
@@ -328,7 +328,7 @@
ControllerStateModelFactory MAP = new ControllerStateModelFactory()
{
- public ControllerStateModel createControllerStateModel()
+ public AbstractControllerStateModel createControllerStateModel()
{
return new MapControllerStateModel();
}
More information about the jboss-cvs-commits
mailing list