Context Navigation

← Previous Changeset
Next Changeset →

Changeset 780

Timestamp:

05/12/2008 07:09:47 PM (14 months ago)

Author:

peterfarrell

Message:

- Cleaned up code

Location:

framework/1-6-0/trunk/framework

Files:

: 10 modified

CacheManager.cfc (modified) (1 diff)
EventFilterManager.cfc (modified) (1 diff)
EventManager.cfc (modified) (1 diff)
ListenerManager.cfc (modified) (1 diff)
MessageManager.cfc (modified) (2 diffs)
ModuleManager.cfc (modified) (2 diffs)
PluginManager.cfc (modified) (1 diff)
PropertyManager.cfc (modified) (1 diff)
SubroutineManager.cfc (modified) (1 diff)
ViewManager.cfc (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed

framework/1-6-0/trunk/framework/CacheManager.cfc

r760	r780
69	69	<cffunction name="loadCacheHandlerFromXml" access="public" returntype="uuid" output="false"
70	70	hint="Loads a cache handler from Xml.">
71		<cfargument name="~~xml" type="any~~" required="true" />
	71	<cfargument name="configXML" type="string" required="true" />
72	72	<cfargument name="parentHandlerName" type="string" required="true" />
73	73	<cfargument name="parentHandlerType" type="string" required="true" />
74	74
	75	<cfset var nestedCommandNodes = arguments.configXML.xmlChildren />
75	76	<cfset var command = "" />
76		<cfset var cacheHandler = "" />
77		<cfset var nestedCommandNodes = arguments.xml.xmlChildren />
	77
	78	<cfset var cacheStrategy = "" />
	79	<cfset var cacheHandler = "" />
	80
78	81	<cfset var alias = "" />
79	82	<cfset var criteria = "" />
80	83	<cfset var cacheName = "" />
81		~~<cfset var cacheStrategy = "" />~~
82	84	<cfset var i = 0 />
83	85
84	86	<!--- TODO: implement alias --->
85		<cfif StructKeyExists(arguments.~~xml~~.xmlAttributes, "alias")>
86		<cfset alias = arguments.~~xml~~.xmlAttributes["alias"] />
87		</cfif>
88		<cfif StructKeyExists(arguments.~~xml~~.xmlAttributes, "criteria")>
89		<cfset criteria = arguments.~~xml~~.xmlAttributes["criteria"] />
90		</cfif>
91		<cfif StructKeyExists(arguments.~~xml~~.xmlAttributes, "name")>
92		<cfset cacheName = arguments.~~xml~~.xmlAttributes["name"] />
	87	<cfif StructKeyExists(arguments.configXML.xmlAttributes, "alias")>
	88	<cfset alias = arguments.configXML.xmlAttributes["alias"] />
	89	</cfif>
	90	<cfif StructKeyExists(arguments.configXML.xmlAttributes, "criteria")>
	91	<cfset criteria = arguments.configXML.xmlAttributes["criteria"] />
	92	</cfif>
	93	<cfif StructKeyExists(arguments.configXML.xmlAttributes, "name")>
	94	<cfset cacheName = arguments.configXML.xmlAttributes["name"] />
93	95	</cfif>
94	96

framework/1-6-0/trunk/framework/EventFilterManager.cfc

r724	r780
60	60	<cfargument name="override" type="boolean" required="false" default="false" />
61	61
62		<cfset var filterNodes = "" />
	62	<cfset var filterNodes = ArrayNew(1) />
63	63	<cfset var filterParams = "" />
64		<cfset var paramNodes = "" />
	64	<cfset var filterName = "" />
	65	<cfset var filterType = "" />
	66	<cfset var filter = "" />
	67
	68	<cfset var paramNodes = ArrayNew(1) />
65	69	<cfset var paramName = "" />
66	70	<cfset var paramValue = "" />
67		<cfset var filter = "" />
68		<cfset var filterName = "" />
69		<cfset var filterType = "" />
	71
70	72	<cfset var hasParent = IsObject(getParent()) />
71	73	<cfset var mapping = "" />

framework/1-6-0/trunk/framework/EventManager.cfc

r774	r780
62	62	<cfargument name="override" type="boolean" required="false" default="false" />
63	63
64		<cfset var commandNode = "" />
65		<cfset var eventNodes = "" />
	64	<cfset var eventNodes = ArrayNew(1) />
66	65	<cfset var eventHandler = "" />
67	66	<cfset var eventAccess = "" />
68	67	<cfset var eventName = "" />
	68
	69	<cfset var commandNode = "" />
69	70	<cfset var command = "" />
	71
70	72	<cfset var hasParent = IsObject(getParent()) />
71	73	<cfset var mapping = "" />

framework/1-6-0/trunk/framework/ListenerManager.cfc

r724	r780
60	60	<cfargument name="override" type="boolean" required="false" default="false" />
61	61
62		<cfset var listenerNodes = "" />
	62	<cfset var listenerNodes = ArrayNew(1) />
63	63	<cfset var listenerParams = "" />
64	64	<cfset var listenerName = "" />
65	65	<cfset var listenerType = "" />
66		<cfset var paramNodes = "" />
	66	<cfset var listener = "" />
	67
	68	<cfset var paramNodes = ArrayNew(1) />
67	69	<cfset var paramName = "" />
68	70	<cfset var paramValue = "" />
	71
69	72	<cfset var invokerType = "" />
70	73	<cfset var invoker = "" />
71		<cfset var listener = "" />
	74
72	75	<cfset var hasParent = IsObject(getParent()) />
73	76	<cfset var mapping = "" />

framework/1-6-0/trunk/framework/MessageManager.cfc

r738	r780
61	61	<cfargument name="override" type="boolean" required="false" default="false" />
62	62
63		<cfset var messageSubscribersNodes = "" />
	63	<cfset var messageSubscribersNodes = ArrayNew(1) />
64	64	<cfset var messageParams = "" />
65	65	<cfset var messageName = "" />
…	…
68	68	<cfset var messageTimeout = "" />
69	69
70		<cfset var subscriberNodes = "" />
	70	<cfset var subscriberNodes = ArrayNew(1) />
71	71	<cfset var subscriberListenerName = "" />
72	72	<cfset var subscriberListener = "" />
73	73	<cfset var subscriberMethod = "" />
74	74	<cfset var subscriberResultArg = "" />
	75
75	76	<cfset var messageHandler = "" />
76	77	<cfset var messageSubscriberInvoker = "" />

framework/1-6-0/trunk/framework/ModuleManager.cfc

r625	r780
65	65	<cfargument name="override" type="boolean" required="false" default="false" />
66	66
67		<cfset var moduleNodes = "" />
	67	<cfset var moduleNodes = ArrayNew(1) />
68	68	<cfset var modulesNode = "" />
69	69	<cfset var modulesNodes = "" />
	70	<cfset var module = "" />
	71
70	72	<cfset var name = "" />
71	73	<cfset var file = "" />
72		~~<cfset var module = "" />~~
73	74	<cfset var overrideXml = "" />
74	75	<cfset var baseName = "" />
…	…
81	82	<cfset modulesNode = XMLSearch(arguments.configXML, ".//modules") />
82	83	</cfif>
83		<cfif arrayLen(modulesNode) eq 1>
	84	<cfif ArrayLen(modulesNode) eq 1>
84	85	<cfset modulesNode = modulesNode[1]>
85		<cfif structKeyExists(modulesNode[1].xmlAttributes, "baseName")>
	86	<cfif StructKeyExists(modulesNode[1].xmlAttributes, "baseName")>
86	87	<cfset baseName = modulesNode[1].xmlAttributes["baseName"] />
87	88	</cfif>

framework/1-6-0/trunk/framework/PluginManager.cfc

r724	r780
84	84	<cfargument name="override" type="boolean" required="false" default="false" />
85	85
86		<cfset var pluginNodes = 0 />
87		<cfset var paramNodes = 0 />
88		<cfset var paramName = 0 />
89		<cfset var paramValue = 0 />
90		<cfset var plugin = 0 />
91		<cfset var pluginName = 0 />
92		<cfset var pluginType = 0 />
93		<cfset var pluginParams = 0 />
	86	<cfset var pluginNodes = ArrayNew(1) />
	87	<cfset var pluginName = "" />
	88	<cfset var pluginType = "" />
	89	<cfset var pluginParams = StructNew() />
	90	<cfset var plugin = "" />
	91
	92	<cfset var paramNodes = ArrayNew(1) />
	93	<cfset var paramName = "" />
	94	<cfset var paramValue = "" />
	95
94	96	<cfset var i = 0 />
95	97	<cfset var j = 0 />

framework/1-6-0/trunk/framework/PropertyManager.cfc

r740	r780
71	71	<cfargument name="override" type="boolean" required="false" default="false" />
72	72
73		<cfset var propertyNodes = "" />
	73	<cfset var propertyNodes = ArrayNew(1) />
74	74	<cfset var propertyName = "" />
75	75	<cfset var propertyValue = "" />
76	76	<cfset var propertyType = "" />
77	77	<cfset var propertyParams = "" />
78		<cfset var paramsNodes = "" />
	78
	79	<cfset var paramsNodes = ArrayNew(1) />
79	80	<cfset var paramName = "" />
80	81	<cfset var paramValue = "" />
	82
81	83	<cfset var hasParent = IsObject(getParent()) />
82	84	<cfset var mapping = "" />

framework/1-6-0/trunk/framework/SubroutineManager.cfc

r774	r780
62	62	<cfargument name="override" type="boolean" required="false" default="false" />
63	63
64		<cfset var subroutineNodes = "" />
	64	<cfset var subroutineNodes = ArrayNew(1) />
65	65	<cfset var subroutineHandler = "" />
66	66	<cfset var subroutineName = "" />
	67
67	68	<cfset var commandNode = "" />
68	69	<cfset var command = "" />
	70
69	71	<cfset var hasParent = IsObject(getParent()) />
70	72	<cfset var mapping = "" />

framework/1-6-0/trunk/framework/ViewManager.cfc

r709	r780
59	59	<cfargument name="override" type="boolean" required="false" default="false" />
60	60
61		<cfset var viewNodes = "" />
	61	<cfset var viewNodes = ArrayNew(1) />
	62
62	63	<cfset var name = "" />
63	64	<cfset var page = "" />
	65
64	66	<cfset var hasParent = IsObject(getParent()) />
65	67	<cfset var mapping = "" />

Context Navigation

Changeset 780

Legend:

Download in other formats: