@@ -53,7 +53,7 @@ <cfset instance.index = 1 /> </cffunction> - <!--- IEnumerable Implementation ---> + <!--- Iterator ---> <cffunction name="next" access="public" output="false"> <cfif hasNext()> CollectionBase.cfc @@ -42,12 +42,7 @@ </cfloop> <cfreturn false /> </cffunction> - - <cffunction name="transitions" access="public" output="false"> - <cfargument name="record" required="true" /> - </cffunction> - - + <cffunction name="getName" access="public" returntype="string" output="false"> <cfreturn instance.name /> </cffunction> Event.cfc @@ -1,11 +1,11 @@ <cfcomponent displayname="State" output="false"> - <cfscript> instance = structNew(); </cfscript> + + <cfset instance = structNew() /> <cffunction name="init" access="public" output="false"> <cfargument name="name" type="string" required="true" /> <cfscript> instance.name = arguments.name; - instance.callbacks = structNew(); </cfscript> <cfreturn this /> </cffunction> @@ -29,7 +29,7 @@ <cfset invokeCallback('exit#getName()#Action', arguments.obj) /> </cffunction> - <cffunction name="invokeCallback" returntype="boolean" access="public" output="false"> + <cffunction name="invokeCallback" returntype="boolean" access="private" output="false"> <cfargument name="callback" type="string" required="true" /> <cfargument name="obj" required="true" /> <cfif structKeyExists(arguments.obj, arguments.callback)> State.cfc @@ -79,6 +79,7 @@ </cffunction> <!--- This should only be called once during init ---> + <cffunction name="setInitialState" access="private" output="false"> <cfargument name="stateName" required="true" /> <cfscript> @@ -87,8 +88,7 @@ setState(arguments.stateName); state.after(this); </cfscript> - </cffunction> - + </cffunction> <cffunction name="getCurrentState" access="public" returntype="string" output="false"> <cfreturn invokeMethod("get#instance.stateMethod#") /> @@ -132,8 +132,14 @@ <cfreturn '' /> </cffunction> - <!--- Some method twisting ---> + <!--- + We are using onMissingMethod for three things: + 1. To defined the state query handlers, i.e. isClosed() + 2. To define the event firing shortcuts, i.e. close() + 3. To pass any unknown method on to the decorated object to handle + + ---> <cffunction name="onMissingMethod" output="false" access="public"> <cfargument name="missingMethodName" type="string" /> <cfargument name="missingMethodArguments" type="struct" /> @@ -159,7 +165,7 @@ <!--- Utility ---> - <cffunction name="invokeMethod" access="public" returntype="Any" output="false"> + <cffunction name="invokeMethod" access="private" returntype="Any" output="false"> <cfargument name="method" type="string" required="true" /> <cfargument name="argcollection" type="struct" required="false" default="#structNew()#" /> StateMachine.cfc @@ -62,11 +62,6 @@ </cfscript> </cffunction> - <cffunction name="isEqual" access="public" output="false"> - <cfargument name="obj" required="true" /> - </cffunction> - - <cffunction name="getFromState" access="public" returntype="string" output="false"> <cfreturn instance.from /> </cffunction> @@ -75,9 +70,4 @@ <cfreturn instance.to /> </cffunction> - <cffunction name="setFromState" access="public" returntype="void" output="false"> - <cfargument name="From" type="string" required="true" /> - <cfset instance.from = arguments.from /> - </cffunction> - </cfcomponent> \ No newline at end of file StateTransition.cfc 9bd2d89c803a6023caf640b7d8bd70f7cd4b4582 Ryan Wood ryan.wood@gmail.com http://github.com/ryanwood/shade/commit/4245d4bde90bb8ef808702716d99aedae1409387 4245d4bde90bb8ef808702716d99aedae1409387 2008-07-18T13:20:38-07:00 2008-07-18T13:20:38-07:00 Clean up c11f3841bb68e555072486dd829866f411f7e1f3 Ryan Wood ryan.wood@gmail.com