Skip to content

Commit ed46bb0

Browse files
MindScriptActMindScriptAct
committed
Fixed sendToAll function not crash logger.
1 parent 01bf20d commit ed46bb0

File tree

11 files changed

+56
-20
lines changed

11 files changed

+56
-20
lines changed

‎mvcExpress-frameWork.as3proj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@
7878
</library>
7979
<!-- Class files to compile (other referenced classes will automatically be included) -->
8080
<compileTargets>
81-
<compile path="sampleProjects\com\mindScriptAct\mvcExpressVisualizer\VisualLoggerTestModule.as" />
81+
<compile path="test\MvcExpressTestRunner.as" />
8282
</compileTargets>
8383
<!-- Paths to exclude from the Project Explorer tree -->
8484
<hiddenPaths>

‎mvcExpressLogger/com/mindscriptact/mvcExpressLogger/MvcExpressLogger.as‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ public class MvcExpressLogger {
7272
}
7373
}
7474

75-
static public function init(stage:Stage, x:int = 0, y:int = 0, width:int = 600, height:int = 400, alpha:Number = 0.9, autoShow:Boolean = false, initTab:String = "LOG", openKeyCode:int = 192, isCtrlKeyNeeded:Boolean = true, isShiftKeyNeeded:Boolean = false, isAltKeyNeeded:Boolean = false):void {
75+
static public function init(stage:Stage, x:int = 0, y:int = 0, width:int = 900, height:int = 400, alpha:Number = 0.9, autoShow:Boolean = false, initTab:String = "LOG", openKeyCode:int = 192, isCtrlKeyNeeded:Boolean = true, isShiftKeyNeeded:Boolean = false, isAltKeyNeeded:Boolean = false):void {
7676

7777
if (!instance) {
7878
allowInstantiation = true;

‎mvcExpressLogger/com/mindscriptact/mvcExpressLogger/screens/MvcExpressVisualizerScreen.as‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ import flash.utils.setTimeout;
1111
public class MvcExpressVisualizerScreen extends Sprite {
1212
private var screenWidth:int;
1313
private var screenHeight:int;
14-
private var mediators:Vector.<Object>;
15-
private var proxies:Vector.<Object>;
14+
private var mediators:Vector.<Object> = new Vector.<Object>();
15+
private var proxies:Vector.<Object> = new Vector.<Object>();
1616
private var commands:Vector.<Object> = new Vector.<Object>();
1717
private var currentModuleName:String;
1818
private var moduleLabel:Label;
@@ -277,13 +277,14 @@ public class MvcExpressVisualizerScreen extends Sprite {
277277
//
278278
if (proxies) {
279279
this.proxies = proxies;
280-
}
281-
for (var i:int = 0; i < proxies.length; i++) {
282-
addProxy(proxies[i]);
283-
}
284-
for (var j:int = 0; j < proxies.length; j++) {
285-
proxies[j].view.y = j * 20 + 50;
286-
redrawProxyDependencies(proxies[j]);
280+
281+
for (var i:int = 0; i < proxies.length; i++) {
282+
addProxy(proxies[i]);
283+
}
284+
for (var j:int = 0; j < proxies.length; j++) {
285+
proxies[j].view.y = j * 20 + 50;
286+
redrawProxyDependencies(proxies[j]);
287+
}
287288
}
288289
}
289290

@@ -377,7 +378,7 @@ public class MvcExpressVisualizerScreen extends Sprite {
377378
commandLabel.graphics.moveTo(0, 10);
378379
commandLabel.graphics.lineTo(-30, moduleLabel.y - commandLabel.y * 0.2);
379380
commandLabel.graphics.lineTo(-20, moduleLabel.y - commandLabel.y * 0.8);
380-
commandLabel.graphics.lineTo( -commandLabel.x + moduleLabel.x, -commandLabel.y + moduleLabel.y + moduleLabel.height - 10);
381+
commandLabel.graphics.lineTo(-commandLabel.x + moduleLabel.x, -commandLabel.y + moduleLabel.y + moduleLabel.height - 10);
381382

382383
commandLabel.graphics.moveTo(0, 10);
383384
commandLabel.graphics.lineTo(-10, 10 - 2);

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -179,12 +179,14 @@ public class VisualizerManager {
179179
case MvcTraceActions.MEDIATOR_SENDMESSAGE:
180180
case MvcTraceActions.PROXY_SENDMESSAGE:
181181
case MvcTraceActions.COMMAND_SENDMESSAGE:
182+
case MvcTraceActions.MESSENGER_SENDTOALL:
182183
sendMessageStack.push(logObj);
183184
break;
184185
case MvcTraceActions.MODULEBASE_SENDMESSAGE_CLEAN:
185186
case MvcTraceActions.MEDIATOR_SENDMESSAGE_CLEAN:
186187
case MvcTraceActions.PROXY_SENDMESSAGE_CLEAN:
187188
case MvcTraceActions.COMMAND_SENDMESSAGE_CLEAN:
189+
case MvcTraceActions.MESSENGER_SENDTOALL_CLEAN:
188190
topObject = sendMessageStack.pop();
189191
if (logObj.type != topObject.type) {
190192
CONFIG::debug {

‎sampleProjects/com/mindScriptAct/circularDependenciesTest/CircularDepenednyModule.as‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import com.mindScriptAct.circularDependenciesTest.model.CProxy;
66
import com.mindScriptAct.circularDependenciesTest.model.DProxy;
77
import com.mindScriptAct.circularDependenciesTest.view.TestView;
88
import com.mindScriptAct.circularDependenciesTest.view.TestViewMediator;
9+
import com.mindscriptact.mvcExpressLogger.MvcExpressLogger;
910
import org.mvcexpress.modules.ModuleSprite;
1011
import org.mvcexpress.MvcExpress;
1112

@@ -16,7 +17,8 @@ import org.mvcexpress.MvcExpress;
1617
public class CircularDepenednyModule extends ModuleSprite {
1718

1819
public function CircularDepenednyModule() {
19-
20+
MvcExpressLogger.init(this.stage, 0, 0, 900, 500, 0.9, true, MvcExpressLogger.VISUALIZER_TAB);
21+
super();
2022
}
2123

2224
override protected function onInit():void {
@@ -84,11 +86,11 @@ public class CircularDepenednyModule extends ModuleSprite {
8486
proxyMap.map(aProxy);
8587
proxyMap.map(bProxy);
8688
proxyMap.map(cProxy);
87-
89+
8890
// unmap proxies.
89-
proxyMap.unmap(AProxy);
90-
proxyMap.unmap(BProxy);
91-
proxyMap.unmap(CProxy);
91+
//proxyMap.unmap(AProxy);
92+
//proxyMap.unmap(BProxy);
93+
//proxyMap.unmap(CProxy);
9294

9395
//*/
9496

‎sampleProjects/com/mindScriptAct/codeSnippets/MvcExpressSnippets.as‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ public class MvcExpressSnippets extends Sprite {
1616
private var appModule:SnippetAppModule;
1717

1818
public function MvcExpressSnippets():void {
19+
MvcExpressLogger.init(this.stage, 0, 0, 900, 500, 0.9, true, MvcExpressLogger.VISUALIZER_TAB);
1920
if (stage)
2021
init();
2122
else

‎sampleProjects/com/mindScriptAct/codeSnippets/SpriteModuleTest.as‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import com.mindScriptAct.codeSnippets.model.SampleEmptyProxy;
1111
import com.mindScriptAct.codeSnippets.model.SampleProxy;
1212
import com.mindScriptAct.codeSnippets.view.keyboard.KeyboardMediator;
1313
import com.mindScriptAct.codeSnippets.view.MainAppMediator;
14+
import com.mindscriptact.mvcExpressLogger.MvcExpressLogger;
1415
import flash.display.StageAlign;
1516
import flash.display.StageScaleMode;
1617
import flash.utils.Proxy;
@@ -26,6 +27,8 @@ import org.mvcexpress.utils.checkClassStringConstants;
2627
public class SpriteModuleTest extends ModuleSprite {
2728

2829
public function SpriteModuleTest() {
30+
MvcExpressLogger.init(this.stage, 0, 0, 900, 500, 0.9, true, MvcExpressLogger.VISUALIZER_TAB);
31+
super();
2932
trace("SpriteModuleTest.SpriteModuleTest");
3033

3134
//

‎src/org/mvcexpress/MvcExpress.as‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ public class MvcExpress {
1717
/** Current framework minor version */
1818
public static const MINOR_VERSION:uint = 0;
1919
/** Current framework revision version */
20-
public static const REVISION:uint = 0;
20+
public static const REVISION:uint = 1;
2121

2222
/** Current framework version */
2323
public static function get VERSION():String {

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

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import org.mvcexpress.core.traceObjects.TraceMessenger_removeHandler;
1010
import org.mvcexpress.core.traceObjects.TraceMessenger_send;
1111
import org.mvcexpress.core.traceObjects.TraceMessenger_send_handler;
1212
import org.mvcexpress.core.traceObjects.TraceMessenger_sendToAll;
13+
import org.mvcexpress.core.traceObjects.TraceMessenger_sendToAll_clean;
1314
import org.mvcexpress.core.traceObjects.TraceObj;
1415
import org.mvcexpress.MvcExpress;
1516

@@ -164,17 +165,21 @@ public class Messenger {
164165
* @param params parameter object that will be sent to all handler and execute functions as single parameter.
165166
*/
166167
public function sendToAll(type:String, params:Object = null):void {
168+
use namespace pureLegsCore;
167169
// debug this action
168170
CONFIG::debug {
169171
if (MvcExpress.disableSendToAllFeature) {
170172
throw Error("sendMessageToAll feature is disabled by MvcExpress.disableSendToAllFeature set to true.");
171173
}
172174

173-
use namespace pureLegsCore;
174175
MvcExpress.debug(new TraceMessenger_sendToAll(MvcTraceActions.MESSENGER_SENDTOALL, moduleName, type, params))
175176
}
176-
use namespace pureLegsCore;
177177
ModuleManager.sendMessageToAll(type, params);
178+
//
179+
// clean up loging the action
180+
CONFIG::debug {
181+
MvcExpress.debug(new TraceMessenger_sendToAll_clean(MvcTraceActions.MESSENGER_SENDTOALL_CLEAN, moduleName, type, params))
182+
}
178183
}
179184

180185
/**

‎src/org/mvcexpress/core/traceObjects/MvcTraceActions.as‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ public class MvcTraceActions {
3737
static pureLegsCore const PROXYMAP_INJECTSTUFF:String = "ProxyMap.injectStuff";
3838

3939
static pureLegsCore const MESSENGER_SEND_HANDLER:String = "Messenger.send.HANDLER";
40+
static pureLegsCore const MESSENGER_SENDTOALL_CLEAN:String = "Messenger.sendToAll.CLEAN";
4041

4142
static pureLegsCore const MODULEBASE_SENDMESSAGE:String = "ModuleBase.sendMessage";
4243
static pureLegsCore const MODULEBASE_SENDMESSAGE_CLEAN:String = "ModuleBase.sendMessage.CLEAN";

0 commit comments

Comments
 (0)