Skip to content

Commit 9a4463a

Browse files
MindScriptActMindScriptAct
committed
channelName renamed to scopeName.
1 parent f83083c commit 9a4463a

File tree

12 files changed

+94
-33
lines changed

12 files changed

+94
-33
lines changed

‎sampleProjects/com/mindScriptAct/modularSample/constants/ChannelNames.as‎

Lines changed: 0 additions & 13 deletions
This file was deleted.

‎sampleProjects/com/mindScriptAct/modularSample/constants/ScopeNames.as‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
package com.mindScriptAct.modularSample.constants {
2+
3+
/**
4+
* COMMENT
5+
* @author Raimundas Banevicius ([email protected])
6+
*/
7+
public class ScopeNames {
8+
static public const FIRST_SCOPE:String = "firstScope";
9+
static public const EVEN_SCOPE:String = "evenScope";
10+
11+
12+
}
13+
}

‎sampleProjects/com/mindScriptAct/modularSample/view/ModularSampleMediator.as‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.mindScriptAct.modularSample.view {
22
import com.bit101.components.PushButton;
3-
import com.mindScriptAct.modularSample.constants.ChannelNames;
3+
import com.mindScriptAct.modularSample.constants.ScopeNames;
44
import com.mindScriptAct.modularSample.ModularSample;
55
import com.mindScriptAct.modules.console.Console;
66
import com.mindScriptAct.modules.console.msg.ConsoleMsg;
@@ -107,11 +107,11 @@ public class ModularSampleMediator extends Mediator {
107107
}
108108

109109
public function handleMessageToFirst(event:MouseEvent):void {
110-
sendChannelMessage(GlobalMessage.SEND_TARGETED_INPUT_MESSAGE, new ConsoleParams("Message to FIRST module!!!", [1]), ChannelNames.FIRST_CHANNEL);
110+
sendChannelMessage(GlobalMessage.SEND_TARGETED_INPUT_MESSAGE, new ConsoleParams("Message to FIRST module!!!", [1]), ScopeNames.FIRST_SCOPE);
111111
}
112112

113113
public function handleMessageToEven(event:MouseEvent):void {
114-
sendChannelMessage(GlobalMessage.SEND_TARGETED_INPUT_MESSAGE, new ConsoleParams("Message to even modules!!! (2 and 4)", [2, 4]), ChannelNames.EVEN_CHANNEL);
114+
sendChannelMessage(GlobalMessage.SEND_TARGETED_INPUT_MESSAGE, new ConsoleParams("Message to even modules!!! (2 and 4)", [2, 4]), ScopeNames.EVEN_SCOPE);
115115
}
116116

117117
public function handleMessageToAll(event:MouseEvent):void {

‎sampleProjects/com/mindScriptAct/modules/console/view/ConsoleMediator.as‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
package com.mindScriptAct.modules.console.view {
2-
import com.mindScriptAct.modularSample.constants.ChannelNames;
2+
import com.mindScriptAct.modularSample.constants.ScopeNames;
33
import com.mindScriptAct.modules.console.Console;
44
import com.mindScriptAct.modules.console.msg.ConsoleDataMsg;
55
import com.mindScriptAct.modules.console.msg.ConsoleViewMsg;
@@ -24,7 +24,7 @@ public class ConsoleMediator extends Mediator {
2424
addHandler(ConsoleDataMsg.MESSAGE_ADDED, handleMessageAdded);
2525
//addRemoteHandler(GlobalMessage.SEND_INPUT_MESSAGE_TO_ALL_DONT_STORE, handleMessageAdded, ModuleNames.SHELL);
2626

27-
addChannelHandler(GlobalMessage.SEND_TARGETED_INPUT_MESSAGE, handleTargeterMessage, ChannelNames.FIRST_CHANNEL);
27+
addChannelHandler(GlobalMessage.SEND_TARGETED_INPUT_MESSAGE, handleTargeterMessage, ScopeNames.FIRST_SCOPE);
2828

2929
}
3030

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -105,30 +105,30 @@ public class ModuleManager {
105105
// channel
106106
//----------------------------------
107107

108-
static pureLegsCore function sendChannelMessage(type:String, params:Object, channelName:String):void {
109-
trace("ModuleManager.channelMessage > type : " + type + ", params : " + params + ", channelName : " + channelName);
108+
static pureLegsCore function sendChannelMessage(type:String, params:Object, scopeName:String):void {
109+
trace("ModuleManager.channelMessage > type : " + type + ", params : " + params + ", scopeName " + scopeName);
110110
use namespace pureLegsCore;
111-
var channelMesanger:Messenger = channels[channelName];
111+
var channelMesanger:Messenger = channels[scopeName];
112112
if (channelMesanger) {
113113
channelMesanger.send(type, params);
114114
}
115115
}
116116

117-
static pureLegsCore function addChannelHandler(type:String, handler:Function, channelName:String):HandlerVO {
118-
var channelMesanger:Messenger = channels[channelName];
117+
static pureLegsCore function addChannelHandler(type:String, handler:Function, scopeName:String):HandlerVO {
118+
var channelMesanger:Messenger = channels[scopeName];
119119
if (!channelMesanger) {
120120
use namespace pureLegsCore;
121121
Messenger.allowInstantiation = true;
122-
channelMesanger = new Messenger("$channel_" + channelName);
122+
channelMesanger = new Messenger("$channel_" + scopeName);
123123
Messenger.allowInstantiation = false;
124-
channels[channelName] = channelMesanger;
124+
channels[scopeName] = channelMesanger;
125125
}
126126
return channelMesanger.addHandler(type, handler);
127127
}
128128

129-
static pureLegsCore function removeChannelHandler(type:String, handler:Function, channelName:String):void {
129+
static pureLegsCore function removeChannelHandler(type:String, handler:Function, scopeName:String):void {
130130
//use namespace pureLegsCore;
131-
var channelMesanger:Messenger = channels[channelName];
131+
var channelMesanger:Messenger = channels[scopeName];
132132
if (channelMesanger) {
133133
channelMesanger.removeHandler(type, handler);
134134
}

‎src/org/mvcexpress/mvc/Mediator.as‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -170,14 +170,14 @@ public class Mediator {
170170

171171
/**
172172
*/
173-
protected function sendChannelMessage(type:String, params:Object = null, channelName:String = "global"):void {
173+
protected function sendChannelMessage(type:String, params:Object = null, scopeName:String = "global"):void {
174174
use namespace pureLegsCore;
175175
// log the action
176176
CONFIG::debug {
177177
use namespace pureLegsCore;
178178
MvcExpress.debug(new TraceMediator_channelMessage(MvcTraceActions.MEDIATOR_CHANNELMESSAGE, messenger.moduleName, this, type, params));
179179
}
180-
ModuleManager.sendChannelMessage(type, params, channelName);
180+
ModuleManager.sendChannelMessage(type, params, scopeName);
181181
//
182182
// clean up loging the action
183183
CONFIG::debug {
@@ -327,14 +327,14 @@ public class Mediator {
327327
// channel
328328
//----------------------------------
329329

330-
protected function addChannelHandler(type:String, handler:Function, channelName:String = "global"):void {
330+
protected function addChannelHandler(type:String, handler:Function, scopeName:String = "global"):void {
331331
use namespace pureLegsCore;
332-
messageDataRegistry.push(ModuleManager.addChannelHandler(type, handler, channelName));
332+
messageDataRegistry.push(ModuleManager.addChannelHandler(type, handler, scopeName));
333333
}
334334

335-
protected function removeChannelHandler(type:String, handler:Function, channelName:String = "global"):void {
335+
protected function removeChannelHandler(type:String, handler:Function, scopeName:String = "global"):void {
336336
use namespace pureLegsCore;
337-
ModuleManager.removeChannelHandler(type, handler, channelName);
337+
ModuleManager.removeChannelHandler(type, handler, scopeName);
338338
}
339339

340340
}

‎test/integration/channeling/ChannelingTests.as‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ public class ChannelingTests {
3636
Assert.assertFalse("test1 handler must be false", channelModulA.view.test1handled);
3737
Assert.assertFalse("test2 handler must be false", channelModulA.view.test2handled);
3838
Assert.assertFalse("test3 handler must be false", channelModulA.view.test3handled);
39+
Assert.assertFalse("test3 handler must be false", channelModulA.view.test4handled);
3940
//
4041
channelModulA.addChannelHandler_test1();
4142

@@ -54,6 +55,7 @@ public class ChannelingTests {
5455
Assert.assertFalse("test1 handler must be false", channelModulA.view.test1handled);
5556
Assert.assertFalse("test2 handler must be false", channelModulA.view.test2handled);
5657
Assert.assertFalse("test3 handler must be false", channelModulA.view.test3handled);
58+
Assert.assertFalse("test3 handler must be false", channelModulA.view.test4handled);
5759
//
5860
channelModulA.addChannelHandler_test1();
5961

@@ -74,6 +76,7 @@ public class ChannelingTests {
7476
Assert.assertFalse("test1 handler must be false", channelModulA.view.test1handled);
7577
Assert.assertFalse("test2 handler must be false", channelModulA.view.test2handled);
7678
Assert.assertFalse("test3 handler must be false", channelModulA.view.test3handled);
79+
Assert.assertFalse("test3 handler must be false", channelModulA.view.test4handled);
7780
//
7881
channelModulA.addChannelHandler_test1();
7982
channelModulA.addChannelHandler_test2();
@@ -94,8 +97,10 @@ public class ChannelingTests {
9497
Assert.assertFalse("test1 handler must be false", channelModulA.view.test1handled);
9598
Assert.assertFalse("test2 handler must be false", channelModulA.view.test2handled);
9699
Assert.assertFalse("test3 handler must be false", channelModulA.view.test3handled);
100+
Assert.assertFalse("test3 handler must be false", channelModulA.view.test4handled);
97101
//
98102
channelModulA.addChannelHandler_test1();
103+
channelModulA.addChannelHandler_test2();
99104
channelModulA.addChannelHandler_testChannel_test3();
100105

101106
channelModulB.sendChannelMessage_testChannel_test3();
@@ -104,6 +109,34 @@ public class ChannelingTests {
104109
Assert.assertFalse(channelModulA.view.test1handled);
105110
Assert.assertFalse(channelModulA.view.test2handled);
106111
}
112+
113+
[Test]
114+
115+
public function channeling_moduleToModuleChanneling_addChannelHandler_sendsMessageWithParams():void {
116+
//
117+
channelModulA.cheateTestMediator();
118+
channelModulB.cheateTestMediator();
119+
//
120+
Assert.assertFalse("test1 handler must be false", channelModulA.view.test1handled);
121+
Assert.assertFalse("test2 handler must be false", channelModulA.view.test2handled);
122+
Assert.assertFalse("test3 handler must be false", channelModulA.view.test3handled);
123+
Assert.assertFalse("test3 handler must be false", channelModulA.view.test4handled);
124+
//
125+
channelModulA.addChannelHandler_test1();
126+
channelModulA.addChannelHandler_test2();
127+
channelModulA.addChannelHandler_testChannel_test3();
128+
channelModulA.addChannelHandler_testChannel_test4_withParams();
129+
130+
channelModulB.sendChannelMessage_testChannel_test4_withParams();
131+
//
132+
133+
"test4 params string"
134+
Assert.assertEquals("params must be sent properly", channelModulA.view.test4params, "test4 params string");
135+
Assert.assertTrue("test4 handler must be true after addChannelHandler() and sendChannelMessage()", channelModulA.view.test4handled);
136+
Assert.assertFalse(channelModulA.view.test1handled);
137+
Assert.assertFalse(channelModulA.view.test2handled);
138+
Assert.assertFalse(channelModulA.view.test3handled);
139+
}
107140

108141
}
109142
}

‎test/integration/channeling/testObj/moduleA/ChannelAMediator.as‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package integration.channeling.testObj.moduleA {
22
import flash.display.Sprite;
33
import flash.events.Event;
4+
import flash.geom.Point;
45
import org.mvcexpress.mvc.Mediator;
56

67
/**
@@ -19,6 +20,7 @@ public class ChannelAMediator extends Mediator {
1920
view.addEventListener("addChannelHandler_test1", addChannelHandler1);
2021
view.addEventListener("addChannelHandler_test2", addChannelHandler2);
2122
view.addEventListener("addChannelHandler_testChannel_test3", addChannelHandler3);
23+
view.addEventListener("addChannelHandler_testChannel_test4_withParams", addChannelHandler4);
2224
view.addEventListener("removeChannelHandler_test1", removeChannelHandler1);
2325
}
2426

@@ -34,6 +36,10 @@ public class ChannelAMediator extends Mediator {
3436
addChannelHandler("test3", handleTest3Channelmessage, "testChannel");
3537
}
3638

39+
private function addChannelHandler4(event:Event):void {
40+
addChannelHandler("test4", handleTest4Channelmessage, "testChannel");
41+
}
42+
3743
private function removeChannelHandler1(event:Event):void {
3844
removeChannelHandler("test1", handleTest1Channelmessage);
3945
}
@@ -53,6 +59,12 @@ public class ChannelAMediator extends Mediator {
5359
view.test3handled = true;
5460
}
5561

62+
private function handleTest4Channelmessage(testParams:String):void {
63+
trace( "ChannelAMediator.handleTest4Channelmessage > testParams : " + testParams );
64+
view.test4handled = true;
65+
view.test4params = testParams;
66+
}
67+
5668
override public function onRemove():void {
5769

5870
}

‎test/integration/channeling/testObj/moduleA/ChannelModuleA.as‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,10 @@ public class ChannelModuleA extends ModuleCore {
3838
view.dispatchEvent(new Event("addChannelHandler_testChannel_test3"));
3939
}
4040

41+
public function addChannelHandler_testChannel_test4_withParams():void {
42+
view.dispatchEvent(new Event("addChannelHandler_testChannel_test4_withParams"));
43+
}
44+
4145
override protected function onInit():void {
4246

4347
}

‎test/integration/channeling/testObj/moduleA/ChannelViewA.as‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package integration.channeling.testObj.moduleA {
22
import flash.display.Sprite;
3+
import flash.geom.Point;
34

45
/**
56
* COMMENT
@@ -9,5 +10,7 @@ public class ChannelViewA extends Sprite {
910
public var test1handled:Boolean = false;
1011
public var test2handled:Boolean = false;
1112
public var test3handled:Boolean = false;
13+
public var test4handled:Boolean = false;
14+
public var test4params:String;
1215
}
1316
}

0 commit comments

Comments
 (0)