Skip to content

Commit 24ff736

Browse files
MindScriptActMindScriptAct
committed
Added MvcTraceOctions to hold debug action constants.
1 parent 6560c89 commit 24ff736

28 files changed

+133
-65
lines changed

‎mvcExpressLogger/com/mindscriptact/mvcExpressLogger/visualizer/VisualizerManager.as‎

Lines changed: 21 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package com.mindscriptact.mvcExpressLogger.visualizer {
22
import com.mindscriptact.mvcExpressLogger.screens.MvcExpressVisualizerScreen;
33
import flash.utils.Dictionary;
4-
import org.flexunit.async.AsyncNativeTestResponder;
5-
import org.mvcexpress.core.CommandMap;
4+
import org.mvcexpress.core.namespace.pureLegsCore;
5+
import org.mvcexpress.core.traceObjects.MvcTraceActions;
66
import org.mvcexpress.mvc.Command;
77
import org.mvcexpress.mvc.Mediator;
88
import org.mvcexpress.mvc.Proxy;
@@ -21,13 +21,14 @@ public class VisualizerManager {
2121
private var sendMessageStack:Vector.<Object> = new Vector.<Object>();
2222

2323
public function logMvcExpress(logObj:Object):void {
24+
use namespace pureLegsCore;
2425
var topObject:Object;
2526
var mediators:Vector.<Object>;
2627
var proxies:Vector.<Object>;
2728
var i:int;
2829
//trace("VisualizerManager.logMvcExpress > logObj : " + logObj);
2930
switch (logObj.action) {
30-
case "MediatorMap.mediate":
31+
case MvcTraceActions.MEDIATORMAP_MEDIATE:
3132
mediators = getModuleMediators(logObj.moduleName);
3233
mediators.push(logObj);
3334
//mediatorClass = com.mindScriptAct.mvcExpressVisualizer.view.VisualLoggerTestModuleMediator$)
@@ -39,7 +40,7 @@ public class VisualizerManager {
3940
}
4041
}
4142
break;
42-
case "MediatorMap.unmediate":
43+
case MvcTraceActions.MEDIATORMAP_UNMEDIATE:
4344
mediators = getModuleMediators(logObj.moduleName);
4445
for (i = 0; i < mediators.length; i++) {
4546
if (mediators[i].viewObject == logObj.viewObject) {
@@ -53,7 +54,7 @@ public class VisualizerManager {
5354
}
5455
}
5556
break;
56-
case "ProxyMap.map":
57+
case MvcTraceActions.PROXYMAP_MAP:
5758
proxies = getModuleProxies(logObj.moduleName);
5859
proxies.push(logObj);
5960
if (this.mvcExpressVisualizerScreen) {
@@ -62,7 +63,7 @@ public class VisualizerManager {
6263
}
6364
}
6465
break;
65-
case "ProxyMap.unmap":
66+
case MvcTraceActions.PROXYMAP_UNMAP:
6667
proxies = getModuleProxies(logObj.moduleName);
6768
for (i = 0; i < proxies.length; i++) {
6869
if (proxies[i].injectClass == logObj.injectClass && proxies[i].name == logObj.name) {
@@ -76,7 +77,7 @@ public class VisualizerManager {
7677
}
7778
}
7879
break;
79-
case "ProxyMap.injectStuff":
80+
case MvcTraceActions.PROXYMAP_INJECTSTUFF:
8081
var hostObject:Object = logObj.hostObject;
8182
var injectedObject:Object = logObj.injectObject;
8283
var a:Object = injectedObject as Proxy;
@@ -136,8 +137,8 @@ public class VisualizerManager {
136137
}
137138
}
138139
break;
139-
case "CommandMap.execute":
140-
case "CommandMap.handleCommandExecute":
140+
case MvcTraceActions.COMMANDMAP_EXECUTE:
141+
case MvcTraceActions.COMMANDMAP_HANDLECOMMANDEXECUTE:
141142
if (this.mvcExpressVisualizerScreen) {
142143
if (currentModuleName == logObj.moduleName) {
143144
if (sendMessageStack.length) {
@@ -162,7 +163,7 @@ public class VisualizerManager {
162163
}
163164
}
164165
break;
165-
case "Mediator.addHandler":
166+
case MvcTraceActions.MEDIATOR_ADDHANDLER:
166167
// add handler to mediator
167168
mediators = getModuleMediators(logObj.moduleName);
168169
for (var k:int = 0; k < mediators.length; k++) {
@@ -174,16 +175,16 @@ public class VisualizerManager {
174175
}
175176
}
176177
break;
177-
case "ModuleBase.sendMessage":
178-
case "Mediator.sendMessage":
179-
case "Proxy.sendMessage":
180-
case "Command.sendMessage":
178+
case MvcTraceActions.MODULEBASE_SENDMESSAGE:
179+
case MvcTraceActions.MEDIATOR_SENDMESSAGE:
180+
case MvcTraceActions.PROXY_SENDMESSAGE:
181+
case MvcTraceActions.COMMAND_SENDMESSAGE:
181182
sendMessageStack.push(logObj);
182183
break;
183-
case "ModuleBase.sendMessage.CLEAN":
184-
case "Mediator.sendMessage.CLEAN":
185-
case "Proxy.sendMessage.CLEAN":
186-
case "Command.sendMessage.CLEAN":
184+
case MvcTraceActions.MODULEBASE_SENDMESSAGE_CLEAN:
185+
case MvcTraceActions.MEDIATOR_SENDMESSAGE_CLEAN:
186+
case MvcTraceActions.PROXY_SENDMESSAGE_CLEAN:
187+
case MvcTraceActions.COMMAND_SENDMESSAGE_CLEAN:
187188
topObject = sendMessageStack.pop();
188189
if (logObj.type != topObject.type) {
189190
CONFIG::debug {
@@ -197,7 +198,7 @@ public class VisualizerManager {
197198
}
198199
}
199200
break;
200-
case "Messenger.send":
201+
case MvcTraceActions.MESSENGER_SEND:
201202
topObject = sendMessageStack[sendMessageStack.length - 1];
202203
if (topObject) {
203204
if (logObj.type == topObject.type) {
@@ -229,7 +230,7 @@ public class VisualizerManager {
229230
}
230231
}
231232
break;
232-
case "Messenger.send.HANDLER":
233+
case MvcTraceActions.MESSENGER_SEND_HANDLER:
233234
if (mvcExpressVisualizerScreen) {
234235
if (currentModuleName == logObj.moduleName) {
235236
//

‎src/org/mvcexpress/core/CommandMap.as‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,12 @@ import flash.utils.getDefinitionByName;
66
import flash.utils.getQualifiedClassName;
77
import org.mvcexpress.core.messenger.Messenger;
88
import org.mvcexpress.core.namespace.pureLegsCore;
9+
import org.mvcexpress.core.traceObjects.MvcTraceActions;
910
import org.mvcexpress.core.traceObjects.TraceCommandMap_execute;
1011
import org.mvcexpress.core.traceObjects.TraceCommandMap_handleCommandExecute;
1112
import org.mvcexpress.core.traceObjects.TraceCommandMap_map;
1213
import org.mvcexpress.core.traceObjects.TraceCommandMap_unmap;
14+
import org.mvcexpress.core.traceObjects.TraceObj;
1315
import org.mvcexpress.mvc.Command;
1416
import org.mvcexpress.MvcExpress;
1517
import org.mvcexpress.utils.checkClassSuperclass;
@@ -53,7 +55,7 @@ public class CommandMap {
5355
// debug this action
5456
CONFIG::debug {
5557
use namespace pureLegsCore;
56-
MvcExpress.debug(new TraceCommandMap_map("CommandMap.map", moduleName, type, commandClass));
58+
MvcExpress.debug(new TraceCommandMap_map(MvcTraceActions.COMMANDMAP_MAP, moduleName, type, commandClass));
5759
validateCommandClass(commandClass);
5860
if (!Boolean(type) || type == "null" || type == "undefined") {
5961
throw Error("Message type:[" + type + "] can not be empty or 'null' or 'undefined'. (You are trying to map command:" + commandClass + ")");
@@ -76,7 +78,7 @@ public class CommandMap {
7678
// debug this action
7779
CONFIG::debug {
7880
use namespace pureLegsCore;
79-
MvcExpress.debug(new TraceCommandMap_unmap("CommandMap.unmap", moduleName, type, commandClass));
81+
MvcExpress.debug(new TraceCommandMap_unmap(MvcTraceActions.COMMANDMAP_UNMAP, moduleName, type, commandClass));
8082
}
8183
var commandList:Vector.<Class> = classRegistry[type];
8284
if (commandList) {
@@ -111,7 +113,7 @@ public class CommandMap {
111113
// debug this action
112114
CONFIG::debug {
113115
use namespace pureLegsCore;
114-
MvcExpress.debug(new TraceCommandMap_execute("CommandMap.execute", moduleName, command, commandClass, params));
116+
MvcExpress.debug(new TraceCommandMap_execute(MvcTraceActions.COMMANDMAP_EXECUTE, moduleName, command, commandClass, params));
115117

116118
validateCommandParams(commandClass, params);
117119
}
@@ -158,7 +160,7 @@ public class CommandMap {
158160
// debug this action
159161
CONFIG::debug {
160162
use namespace pureLegsCore;
161-
MvcExpress.debug(new TraceCommandMap_handleCommandExecute("CommandMap.handleCommandExecute", moduleName, command, commandList[i], messageType, params));
163+
MvcExpress.debug(new TraceCommandMap_handleCommandExecute(MvcTraceActions.COMMANDMAP_HANDLECOMMANDEXECUTE, moduleName, command, commandList[i], messageType, params));
162164
}
163165

164166
use namespace pureLegsCore;

‎src/org/mvcexpress/core/MediatorMap.as‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,12 @@ import flash.utils.getQualifiedClassName;
66
import org.mvcexpress.core.interfaces.IMediatorMap;
77
import org.mvcexpress.core.messenger.Messenger;
88
import org.mvcexpress.core.namespace.pureLegsCore;
9+
import org.mvcexpress.core.traceObjects.MvcTraceActions;
910
import org.mvcexpress.core.traceObjects.TraceMediatorMap_map;
1011
import org.mvcexpress.core.traceObjects.TraceMediatorMap_mediate;
1112
import org.mvcexpress.core.traceObjects.TraceMediatorMap_unmap;
1213
import org.mvcexpress.core.traceObjects.TraceMediatorMap_unmediate;
14+
import org.mvcexpress.core.traceObjects.TraceObj;
1315
import org.mvcexpress.mvc.Mediator;
1416
import org.mvcexpress.MvcExpress;
1517
import org.mvcexpress.utils.checkClassSuperclass;
@@ -48,7 +50,7 @@ public class MediatorMap implements IMediatorMap {
4850
// debug this action
4951
CONFIG::debug {
5052
use namespace pureLegsCore;
51-
MvcExpress.debug(new TraceMediatorMap_map("MediatorMap.map", moduleName, viewClass, mediatorClass));
53+
MvcExpress.debug(new TraceMediatorMap_map(MvcTraceActions.MEDIATORMAP_MAP, moduleName, viewClass, mediatorClass));
5254
// check if mediatorClass is subclass of Mediator class
5355
if (!checkClassSuperclass(mediatorClass, "org.mvcexpress.mvc::Mediator")) {
5456
throw Error("mediatorClass:" + mediatorClass + " you are trying to map is not extended from 'org.mvcexpress.mvc::Mediator' class.");
@@ -70,7 +72,7 @@ public class MediatorMap implements IMediatorMap {
7072
// debug this action
7173
CONFIG::debug {
7274
use namespace pureLegsCore;
73-
MvcExpress.debug(new TraceMediatorMap_unmap("MediatorMap.unmap", moduleName, viewClass));
75+
MvcExpress.debug(new TraceMediatorMap_unmap(MvcTraceActions.MEDIATORMAP_UNMAP, moduleName, viewClass));
7476
}
7577
// clear mapping
7678
delete classRegistry[viewClass];
@@ -105,7 +107,7 @@ public class MediatorMap implements IMediatorMap {
105107
// debug this action
106108
CONFIG::debug {
107109
use namespace pureLegsCore;
108-
MvcExpress.debug(new TraceMediatorMap_mediate("MediatorMap.mediate", moduleName, viewObject, mediator, viewClass, mediatorClass, getQualifiedClassName(mediatorClass)));
110+
MvcExpress.debug(new TraceMediatorMap_mediate(MvcTraceActions.MEDIATORMAP_MEDIATE, moduleName, viewObject, mediator, viewClass, mediatorClass, getQualifiedClassName(mediatorClass)));
109111
}
110112

111113
CONFIG::debug {
@@ -136,7 +138,7 @@ public class MediatorMap implements IMediatorMap {
136138
// debug this action
137139
CONFIG::debug {
138140
use namespace pureLegsCore;
139-
MvcExpress.debug(new TraceMediatorMap_unmediate("MediatorMap.unmediate", moduleName, viewObject));
141+
MvcExpress.debug(new TraceMediatorMap_unmediate(MvcTraceActions.MEDIATORMAP_UNMEDIATE, moduleName, viewObject));
140142
}
141143
// get object mediator
142144
var mediator:Mediator = mediatorRegistry[viewObject];

‎src/org/mvcexpress/core/ModuleBase.as‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@ import org.mvcexpress.core.messenger.Messenger;
88
import org.mvcexpress.core.ModuleManager;
99
import org.mvcexpress.core.namespace.pureLegsCore;
1010
import org.mvcexpress.core.ProxyMap;
11+
import org.mvcexpress.core.traceObjects.MvcTraceActions;
1112
import org.mvcexpress.core.traceObjects.TraceModuleBase_sendMessage;
13+
import org.mvcexpress.core.traceObjects.TraceObj;
1214
import org.mvcexpress.MvcExpress;
1315

1416
/**
@@ -135,15 +137,15 @@ public class ModuleBase {
135137
// log the action
136138
CONFIG::debug {
137139
use namespace pureLegsCore;
138-
MvcExpress.debug(new TraceModuleBase_sendMessage("ModuleBase.sendMessage", moduleName, this, type, params));
140+
MvcExpress.debug(new TraceModuleBase_sendMessage(MvcTraceActions.MODULEBASE_SENDMESSAGE, moduleName, this, type, params));
139141
}
140142
//
141143
_messenger.send(type, params);
142144
//
143145
// clean up loging the action
144146
CONFIG::debug {
145147
use namespace pureLegsCore;
146-
MvcExpress.debug(new TraceModuleBase_sendMessage("ModuleBase.sendMessage.CLEAN", moduleName, this, type, params));
148+
MvcExpress.debug(new TraceModuleBase_sendMessage(MvcTraceActions.MODULEBASE_SENDMESSAGE_CLEAN, moduleName, this, type, params));
147149
}
148150
}
149151

‎src/org/mvcexpress/core/ModuleManager.as‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,10 @@ package org.mvcexpress.core {
22
import flash.utils.Dictionary;
33
import org.mvcexpress.core.messenger.Messenger;
44
import org.mvcexpress.core.namespace.pureLegsCore;
5+
import org.mvcexpress.core.traceObjects.MvcTraceActions;
56
import org.mvcexpress.core.traceObjects.TraceModuleManager_createModule;
67
import org.mvcexpress.core.traceObjects.TraceModuleManager_disposeModule;
8+
import org.mvcexpress.core.traceObjects.TraceObj;
79
import org.mvcexpress.MvcExpress;
810

911
/**
@@ -39,7 +41,7 @@ public class ModuleManager {
3941
// debug this action
4042
CONFIG::debug {
4143
use namespace pureLegsCore;
42-
MvcExpress.debug(new TraceModuleManager_createModule("ModuleManager.createModule", moduleName, autoInit));
44+
MvcExpress.debug(new TraceModuleManager_createModule(MvcTraceActions.MODULEMANAGER_CREATEMODULE, moduleName, autoInit));
4345
}
4446
if (moduleRegistry[moduleName] == null) {
4547
_moduleId++
@@ -79,7 +81,7 @@ public class ModuleManager {
7981
// debug this action
8082
CONFIG::debug {
8183
use namespace pureLegsCore;
82-
MvcExpress.debug(new TraceModuleManager_disposeModule("ModuleManager.disposeModule", moduleName));
84+
MvcExpress.debug(new TraceModuleManager_disposeModule(MvcTraceActions.MODULEMANAGER_DISPOSEMODULE, moduleName));
8385
}
8486
if (moduleRegistry[moduleName]) {
8587
delete moduleRegistry[moduleName];

‎src/org/mvcexpress/core/ProxyMap.as‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ import org.mvcexpress.core.inject.InjectRuleVO;
77
import org.mvcexpress.core.interfaces.IProxyMap;
88
import org.mvcexpress.core.messenger.Messenger;
99
import org.mvcexpress.core.namespace.pureLegsCore;
10+
import org.mvcexpress.core.traceObjects.MvcTraceActions;
11+
import org.mvcexpress.core.traceObjects.TraceObj;
1012
import org.mvcexpress.core.traceObjects.TraceProxyMap_injectPending;
1113
import org.mvcexpress.core.traceObjects.TraceProxyMap_injectStuff;
1214
import org.mvcexpress.core.traceObjects.TraceProxyMap_map;
@@ -64,7 +66,7 @@ public class ProxyMap implements IProxyMap {
6466
// debug this action
6567
CONFIG::debug {
6668
use namespace pureLegsCore;
67-
MvcExpress.debug(new TraceProxyMap_map("ProxyMap.map", moduleName, proxyObject, injectClass, name));
69+
MvcExpress.debug(new TraceProxyMap_map(MvcTraceActions.PROXYMAP_MAP, moduleName, proxyObject, injectClass, name));
6870
}
6971

7072
var className:String = getQualifiedClassName(injectClass);
@@ -107,7 +109,7 @@ public class ProxyMap implements IProxyMap {
107109
// debug this action
108110
CONFIG::debug {
109111
use namespace pureLegsCore;
110-
MvcExpress.debug(new TraceProxyMap_unmap("ProxyMap.unmap", moduleName, injectClass, name));
112+
MvcExpress.debug(new TraceProxyMap_unmap(MvcTraceActions.PROXYMAP_UNMAP, moduleName, injectClass, name));
111113
}
112114
// remove proxy if it exists.
113115
var className:String = getQualifiedClassName(injectClass);
@@ -198,7 +200,7 @@ public class ProxyMap implements IProxyMap {
198200
// debug this action
199201
CONFIG::debug {
200202
use namespace pureLegsCore;
201-
MvcExpress.debug(new TraceProxyMap_injectStuff("ProxyMap.injectStuff", moduleName, object, injectObject, rules[i]));
203+
MvcExpress.debug(new TraceProxyMap_injectStuff(MvcTraceActions.PROXYMAP_INJECTSTUFF, moduleName, object, injectObject, rules[i]));
202204
}
203205
} else {
204206
// if local injection fails... test for global(hosted) injections
@@ -212,7 +214,7 @@ public class ProxyMap implements IProxyMap {
212214
// debug this action
213215
CONFIG::debug {
214216
use namespace pureLegsCore;
215-
MvcExpress.debug(new TraceProxyMap_injectPending("ProxyMap.injectPending", moduleName, object, injectObject, rules[i]));
217+
MvcExpress.debug(new TraceProxyMap_injectPending(MvcTraceActions.PROXYMAP_INJECTPENDING, moduleName, object, injectObject, rules[i]));
216218
}
217219
//
218220
if (!pendingInjectionsRegistry[rules[i].injectClassAndName]) {

‎src/org/mvcexpress/core/messenger/Messenger.as‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,13 @@ import flash.utils.Dictionary;
44
import org.mvcexpress.core.CommandMap;
55
import org.mvcexpress.core.ModuleManager;
66
import org.mvcexpress.core.namespace.pureLegsCore;
7+
import org.mvcexpress.core.traceObjects.MvcTraceActions;
78
import org.mvcexpress.core.traceObjects.TraceMessenger_addHandler;
89
import org.mvcexpress.core.traceObjects.TraceMessenger_removeHandler;
910
import org.mvcexpress.core.traceObjects.TraceMessenger_send;
1011
import org.mvcexpress.core.traceObjects.TraceMessenger_send_handler;
1112
import org.mvcexpress.core.traceObjects.TraceMessenger_sendToAll;
13+
import org.mvcexpress.core.traceObjects.TraceObj;
1214
import org.mvcexpress.MvcExpress;
1315

1416
/**
@@ -51,7 +53,7 @@ public class Messenger {
5153
// debug this action
5254
CONFIG::debug {
5355
use namespace pureLegsCore;
54-
MvcExpress.debug(new TraceMessenger_addHandler("Messenger.addHandler", moduleName, type, handler, handlerClassName));
56+
MvcExpress.debug(new TraceMessenger_addHandler(MvcTraceActions.MESSENGER_ADDHANDLER, moduleName, type, handler, handlerClassName));
5557
}
5658

5759
// if this message type used for the first time - create data placeholders.
@@ -91,7 +93,7 @@ public class Messenger {
9193
// debug this action
9294
CONFIG::debug {
9395
use namespace pureLegsCore;
94-
MvcExpress.debug(new TraceMessenger_removeHandler("Messenger.removeHandler", moduleName, type, handler));
96+
MvcExpress.debug(new TraceMessenger_removeHandler(MvcTraceActions.MESSENGER_REMOVEHANDLER, moduleName, type, handler));
9597
}
9698
if (handlerRegistry[type]) {
9799
if (handlerRegistry[type][handler]) {
@@ -112,7 +114,7 @@ public class Messenger {
112114
// debug this action
113115
CONFIG::debug {
114116
use namespace pureLegsCore;
115-
MvcExpress.debug(new TraceMessenger_send("Messenger.send", moduleName, type, params));
117+
MvcExpress.debug(new TraceMessenger_send(MvcTraceActions.MESSENGER_SEND, moduleName, type, params));
116118
}
117119
var messageList:Vector.<HandlerVO> = messageRegistry[type];
118120
var handlerVo:HandlerVO;
@@ -143,7 +145,7 @@ public class Messenger {
143145
handlerVo.handlerClassName
144146
//
145147
use namespace pureLegsCore;
146-
MvcExpress.debug(new TraceMessenger_send_handler("Messenger.send.HANDLER", moduleName, type, params, handlerVo.handler, handlerVo.handlerClassName));
148+
MvcExpress.debug(new TraceMessenger_send_handler(MvcTraceActions.MESSENGER_SEND_HANDLER, moduleName, type, params, handlerVo.handler, handlerVo.handlerClassName));
147149
}
148150
handlerVo.handler(params);
149151
}
@@ -169,7 +171,7 @@ public class Messenger {
169171
}
170172

171173
use namespace pureLegsCore;
172-
MvcExpress.debug(new TraceMessenger_sendToAll("Messenger.sendToAll", moduleName, type, params))
174+
MvcExpress.debug(new TraceMessenger_sendToAll(MvcTraceActions.MESSENGER_SENDTOALL, moduleName, type, params))
173175
}
174176
use namespace pureLegsCore;
175177
ModuleManager.sendMessageToAll(type, params);

0 commit comments

Comments
 (0)