Skip to Content.
Sympa Menu

notify-dpml - svn commit: r1558 - in development/laboratory/planet/components/fsm: . api api/src/main/net/dpml/fsm basic basic/src/main/net/dpml/fsm/basic demo demo/trafficlight demo/trafficlight/src/main/net/dpml/fsm/trafficlight

notify-dpml AT lists.ibiblio.org

Subject: DPML Notify

List archive

Chronological Thread  
  • From: niclas AT netcompartner.com
  • To: notify-dpml AT lists.ibiblio.org
  • Subject: svn commit: r1558 - in development/laboratory/planet/components/fsm: . api api/src/main/net/dpml/fsm basic basic/src/main/net/dpml/fsm/basic demo demo/trafficlight demo/trafficlight/src/main/net/dpml/fsm/trafficlight
  • Date: Sat, 22 Jan 2005 15:10:04 +0100

Author: niclas
Date: Sat Jan 22 15:10:04 2005
New Revision: 1558

Modified:
development/laboratory/planet/components/fsm/api/build.xml

development/laboratory/planet/components/fsm/api/src/main/net/dpml/fsm/TransitionListener.java
development/laboratory/planet/components/fsm/basic/build.xml

development/laboratory/planet/components/fsm/basic/src/main/net/dpml/fsm/basic/StateMachineImpl.java
development/laboratory/planet/components/fsm/build.xml
development/laboratory/planet/components/fsm/demo/build.xml
development/laboratory/planet/components/fsm/demo/trafficlight/build.xml

development/laboratory/planet/components/fsm/demo/trafficlight/src/main/net/dpml/fsm/trafficlight/TrafficLight.java
development/laboratory/planet/components/fsm/index.xml
development/laboratory/planet/components/fsm/module.xml
Log:
Removed traces of transitionmachine and changed that to the statemachine
equiv.

Modified: development/laboratory/planet/components/fsm/api/build.xml
==============================================================================
--- development/laboratory/planet/components/fsm/api/build.xml (original)
+++ development/laboratory/planet/components/fsm/api/build.xml Sat Jan 22
15:10:04 2005
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>

-<project name="dpml-transitionmachine-api" default="install" basedir="."
+<project name="dpml-fsm-api" default="install" basedir="."
xmlns:magic="antlib:net.dpml.magic">

<magic:import uri="artifact:template:dpml/magic/standard"/>

Modified:
development/laboratory/planet/components/fsm/api/src/main/net/dpml/fsm/TransitionListener.java
==============================================================================
---
development/laboratory/planet/components/fsm/api/src/main/net/dpml/fsm/TransitionListener.java
(original)
+++
development/laboratory/planet/components/fsm/api/src/main/net/dpml/fsm/TransitionListener.java
Sat Jan 22 15:10:04 2005
@@ -31,7 +31,7 @@
public interface TransitionListener
{
/** Event fired when a transition occur from one state to another.
- * It is intended that the functionality tied to the transition machine
+ * It is intended that the functionality tied to the state machine
* is implemented thorugh this interface.
*/
void transition( TransitionEvent event );

Modified: development/laboratory/planet/components/fsm/basic/build.xml
==============================================================================
--- development/laboratory/planet/components/fsm/basic/build.xml
(original)
+++ development/laboratory/planet/components/fsm/basic/build.xml Sat
Jan 22 15:10:04 2005
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>

-<project name="dpml-transitionmachine-basic" default="install" basedir="."
+<project name="dpml-fsm-basic" default="install" basedir="."
xmlns:magic="antlib:net.dpml.magic">

<magic:import uri="artifact:template:dpml/magic/standard"/>

Modified:
development/laboratory/planet/components/fsm/basic/src/main/net/dpml/fsm/basic/StateMachineImpl.java
==============================================================================
---
development/laboratory/planet/components/fsm/basic/src/main/net/dpml/fsm/basic/StateMachineImpl.java
(original)
+++
development/laboratory/planet/components/fsm/basic/src/main/net/dpml/fsm/basic/StateMachineImpl.java
Sat Jan 22 15:10:04 2005
@@ -96,11 +96,14 @@

public void addTransitions( Collection transitions )
{
- Iterator iterator = transitions.iterator();
- while( iterator.hasNext() )
+ synchronized( this )
{
- Transition transition = (Transition) iterator.next();
- addTransition( transition );
+ Iterator iterator = transitions.iterator();
+ while( iterator.hasNext() )
+ {
+ Transition transition = (Transition) iterator.next();
+ addTransition( transition );
+ }
}
}

@@ -149,11 +152,14 @@

public void removeTransitionListener( TransitionListener listener )
{
- Iterator iter = m_transitions.keySet().iterator();
- while( iter.hasNext() )
+ synchronized( this )
{
- Transition transition = (Transition) iter.next();
- transition.removeTransitionListener( listener );
+ Iterator iter = m_transitions.keySet().iterator();
+ while( iter.hasNext() )
+ {
+ Transition transition = (Transition) iter.next();
+ transition.removeTransitionListener( listener );
+ }
}
}


Modified: development/laboratory/planet/components/fsm/build.xml
==============================================================================
--- development/laboratory/planet/components/fsm/build.xml (original)
+++ development/laboratory/planet/components/fsm/build.xml Sat Jan 22
15:10:04 2005
@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!--
+<!--
Copyright 2004 Niclas Hedhman
-
+
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
+ You may obtain a copy of the License at
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied.
-
+
See the License for the specific language governing permissions and
limitations under the License.
-->

-<project name="dpml-transitionmachine" default="default" basedir="."
+<project name="dpml-fsm" default="default" basedir="."
xmlns:magic="antlib:net.dpml.magic">

<magic:import uri="artifact:template:dpml/magic/reactor"/>

Modified: development/laboratory/planet/components/fsm/demo/build.xml
==============================================================================
--- development/laboratory/planet/components/fsm/demo/build.xml (original)
+++ development/laboratory/planet/components/fsm/demo/build.xml Sat Jan 22
15:10:04 2005
@@ -1,24 +1,24 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!--
+<!--
Copyright 2004 Stephen J McConnell
Copyright 2004 Niclas Hedhman
-
+
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
+ You may obtain a copy of the License at
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied.
-
+
See the License for the specific language governing permissions and
limitations under the License.
-->

-<project name="dpml-transitionmachine" default="default" basedir="."
+<project name="dpml-fsm" default="default" basedir="."
xmlns:magic="antlib:net.dpml.magic">

<magic:import uri="artifact:template:dpml/magic/reactor"/>

Modified:
development/laboratory/planet/components/fsm/demo/trafficlight/build.xml
==============================================================================
--- development/laboratory/planet/components/fsm/demo/trafficlight/build.xml
(original)
+++ development/laboratory/planet/components/fsm/demo/trafficlight/build.xml
Sat Jan 22 15:10:04 2005
@@ -1,21 +1,21 @@
<?xml version="1.0" encoding="UTF-8" ?>

-<project
- name="dpml-trafficlight"
- default="install"
+<project
+ name="dpml-trafficlight"
+ default="install"
basedir="."
xmlns:magic="antlib:net.dpml.magic"
- xmlns:x="plugin:dpml/magic/dpml-magic-core"
+ xmlns:x="plugin:dpml/magic/dpml-magic-core"
>

<magic:import uri="artifact:template:dpml/magic/standard"/>

<target name="build" depends="standard.build" >
<x:block name="trafficlight" >
-
- <x:component name="runner"
class="net.dpml.transitionmachine.trafficlight.demo.TrafficLight" />
-
- <x:component name="machine"
class="net.dpml.transitionmachine.basic.TransitionMachineImpl"
activation="false" >
+
+ <x:component name="runner"
class="net.dpml.fsm.trafficlight.TrafficLight" />
+
+ <x:component name="machine"
class="net.dpml.fsm.basic.StateMachineImpl" activation="false" >
<x:dependencies>
<x:dependency key="red-to-green" source="transition-red-to-green"
/>
<x:dependency key="green-to-yellow"
source="transition-green-to-yellow" />
@@ -26,92 +26,92 @@
<x:dependency key="greenyellow-to-red"
source="transition-greenyellow-to-red" />
</x:dependencies>
</x:component>
-
- <x:component name="rule"
class="net.dpml.transitionmachine.basic.CommandRule" >
+
+ <x:component name="rule" class="net.dpml.fsm.basic.CommandRule" >
<x:parameters>
<x:parameter name="command" value="tick" />
</x:parameters>
</x:component>
-
- <x:component name="state-red"
class="net.dpml.transitionmachine.basic.StateImpl" >
+
+ <x:component name="state-red" class="net.dpml.fsm.basic.StateImpl" >
<x:parameters>
<x:parameter name="identity" value="state-red" />
</x:parameters>
</x:component>
-
- <x:component name="state-redyellow"
class="net.dpml.transitionmachine.basic.StateImpl" >
+
+ <x:component name="state-redyellow"
class="net.dpml.fsm.basic.StateImpl" >
<x:parameters>
<x:parameter name="identity" value="state-redyellow" />
</x:parameters>
</x:component>
-
- <x:component name="state-yellow"
class="net.dpml.transitionmachine.basic.StateImpl" >
+
+ <x:component name="state-yellow" class="net.dpml.fsm.basic.StateImpl" >
<x:parameters>
<x:parameter name="identity" value="state-yellow" />
</x:parameters>
</x:component>
-
- <x:component name="state-green"
class="net.dpml.transitionmachine.basic.StateImpl" >
+
+ <x:component name="state-green" class="net.dpml.fsm.basic.StateImpl" >
<x:parameters>
<x:parameter name="identity" value="state-green" />
</x:parameters>
</x:component>
-
- <x:component name="state-greenyellow"
class="net.dpml.transitionmachine.basic.StateImpl" >
+
+ <x:component name="state-greenyellow"
class="net.dpml.fsm.basic.StateImpl" >
<x:parameters>
<x:parameter name="identity" value="state-greenyellow" />
</x:parameters>
</x:component>
-
- <x:component name="transition-red-to-green"
class="net.dpml.transitionmachine.basic.TransitionComponent" >
+
+ <x:component name="transition-red-to-green"
class="net.dpml.fsm.basic.TransitionComponent" >
<x:dependencies>
<x:dependency key="begin" source="state-red" />
<x:dependency key="end" source="state-green" />
</x:dependencies>
</x:component>
-
- <x:component name="transition-red-to-redyellow"
class="net.dpml.transitionmachine.basic.TransitionComponent" >
+
+ <x:component name="transition-red-to-redyellow"
class="net.dpml.fsm.basic.TransitionComponent" >
<x:dependencies>
<x:dependency key="begin" source="state-red" />
<x:dependency key="end" source="state-redyellow" />
</x:dependencies>
</x:component>
-
- <x:component name="transition-yellow-to-red"
class="net.dpml.transitionmachine.basic.TransitionComponent" >
+
+ <x:component name="transition-yellow-to-red"
class="net.dpml.fsm.basic.TransitionComponent" >
<x:dependencies>
<x:dependency key="begin" source="state-yellow" />
<x:dependency key="end" source="state-red" />
</x:dependencies>
</x:component>
-
- <x:component name="transition-green-to-yellow"
class="net.dpml.transitionmachine.basic.TransitionComponent" >
+
+ <x:component name="transition-green-to-yellow"
class="net.dpml.fsm.basic.TransitionComponent" >
<x:dependencies>
<x:dependency key="begin" source="state-green" />
<x:dependency key="end" source="state-yellow" />
</x:dependencies>
</x:component>
-
- <x:component name="transition-green-to-greenyellow"
class="net.dpml.transitionmachine.basic.TransitionComponent" >
+
+ <x:component name="transition-green-to-greenyellow"
class="net.dpml.fsm.basic.TransitionComponent" >
<x:dependencies>
<x:dependency key="begin" source="state-green" />
<x:dependency key="end" source="state-greenyellow" />
</x:dependencies>
</x:component>
-
- <x:component name="transition-greenyellow-to-red"
class="net.dpml.transitionmachine.basic.TransitionComponent" >
+
+ <x:component name="transition-greenyellow-to-red"
class="net.dpml.fsm.basic.TransitionComponent" >
<x:dependencies>
<x:dependency key="begin" source="state-greenyellow" />
<x:dependency key="end" source="state-red" />
</x:dependencies>
</x:component>
-
- <x:component name="transition-redyellow-to-green"
class="net.dpml.transitionmachine.basic.TransitionComponent" >
+
+ <x:component name="transition-redyellow-to-green"
class="net.dpml.fsm.basic.TransitionComponent" >
<x:dependencies>
<x:dependency key="begin" source="state-redyellow" />
<x:dependency key="end" source="state-green" />
</x:dependencies>
</x:component>
-
+
</x:block>
</target>
</project>

Modified:
development/laboratory/planet/components/fsm/demo/trafficlight/src/main/net/dpml/fsm/trafficlight/TrafficLight.java
==============================================================================
---
development/laboratory/planet/components/fsm/demo/trafficlight/src/main/net/dpml/fsm/trafficlight/TrafficLight.java
(original)
+++
development/laboratory/planet/components/fsm/demo/trafficlight/src/main/net/dpml/fsm/trafficlight/TrafficLight.java
Sat Jan 22 15:10:04 2005
@@ -65,7 +65,7 @@
* @param man ServiceManager servicing this Part.
*
* @throws ServiceException if any of the required dependencies can not
be satisfied.
- * @metro.dependency type="net.dpml.fsm.TransitionMachine" key="fsm"
+ * @metro.dependency type="net.dpml.fsm.StateMachine" key="fsm"
* @metro.dependency type="net.dpml.fsm.Transition" key="red-to-green"
* @metro.dependency type="net.dpml.fsm.Transition" key="green-to-yellow"
* @metro.dependency type="net.dpml.fsm.Transition" key="yellow-to-red"

Modified: development/laboratory/planet/components/fsm/index.xml
==============================================================================
--- development/laboratory/planet/components/fsm/index.xml (original)
+++ development/laboratory/planet/components/fsm/index.xml Sat Jan 22
15:10:04 2005
@@ -18,15 +18,15 @@
limitations under the License.
-->

-<index key="dpml-transitionmachine">
+<index key="dpml-fsm">
<import uri="artifact:module:dpml/metro/dpml-metro#SNAPSHOT"/>
<import uri="artifact:module:dpml/magic/dpml-magic#SNAPSHOT"/>
<import uri="artifact:module:dpml/transit/dpml-transit#SNAPSHOT"/>

<project file="module.xml">
<info>
- <group>dpml/transitionmachine</group>
- <name>dpml-transitionmachine</name>
+ <group>dpml/fsm</group>
+ <name>dpml-fsm</name>
<version>1.0.0</version>
<status>SNAPSHOT</status>
<type>module</type>
@@ -41,8 +41,8 @@

<project basedir="api">
<info>
- <group>dpml/transitionmachine</group>
- <name>dpml-transitionmachine-api</name>
+ <group>dpml/fsm</group>
+ <name>dpml-fsm-api</name>
<version>1.0.0</version>
<status>SNAPSHOT</status>
</info>
@@ -55,8 +55,8 @@

<project basedir="basic">
<info>
- <group>dpml/transitionmachine</group>
- <name>dpml-transitionmachine-basic</name>
+ <group>dpml/fsmm</group>
+ <name>dpml-fsm-basic</name>
<version>1.0.0</version>
<status>SNAPSHOT</status>
</info>
@@ -68,7 +68,7 @@
<include key="dpml-parameters-api" />
<include key="dpml-parameters-impl" build="false" runtime="false"
test="true" />
<include key="dpml-service-api" />
- <include key="dpml-transitionmachine-api" />
+ <include key="dpml-fsm-api" />
<include key="dpml-transit" />
</dependencies>
<plugins>
@@ -78,13 +78,13 @@

<project basedir="demo/trafficlight">
<info>
- <group>dpml/transitionmachine/demo</group>
+ <group>dpml/fsm/demo</group>
<name>dpml-trafficlight</name>
<version>1.0.0</version>
<status>SNAPSHOT</status>
</info>
<dependencies>
- <include key="dpml-transitionmachine-basic" />
+ <include key="dpml-fsm-basic" />
</dependencies>
<plugins>
<include key="dpml-meta-tools"/>

Modified: development/laboratory/planet/components/fsm/module.xml
==============================================================================
--- development/laboratory/planet/components/fsm/module.xml (original)
+++ development/laboratory/planet/components/fsm/module.xml Sat Jan 22
15:10:04 2005
@@ -1,25 +1,25 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<!--
+<!--
Copyright 2004 Stephen J McConnell
Copyright 2004 Niclas Hedhman
-
+
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
+ You may obtain a copy of the License at
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied.
-
+
See the License for the specific language governing permissions and
limitations under the License.
-->

-<project name="dpml-transitionmachine" default="docs" basedir="."
- xmlns:magic="antlib:net.dpml.magic"
+<project name="dpml-fsm" default="docs" basedir="."
+ xmlns:magic="antlib:net.dpml.magic"
xmlns:x="plugin:dpml/magic/dpml-magic-core">

<magic:import uri="artifact:template:dpml/magic/standard"/>
@@ -38,7 +38,7 @@
<x:javadoc>
<link href="http://java.sun.com/j2se/1.4/docs/api"/>
<group title="Public API">
- <package name="net.dpml.transitionmachine"/>
+ <package name="net.dpml.fsm"/>
</group>
<group title="Private API">
<package name="net.dpml.*"/>



  • svn commit: r1558 - in development/laboratory/planet/components/fsm: . api api/src/main/net/dpml/fsm basic basic/src/main/net/dpml/fsm/basic demo demo/trafficlight demo/trafficlight/src/main/net/dpml/fsm/trafficlight, niclas, 01/22/2005

Archive powered by MHonArc 2.6.24.

Top of Page