Skip to content

Commit

Permalink
fixed conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
joelhooks committed Mar 19, 2010
2 parents f8211a0 + e1a7053 commit dd48a86
Show file tree
Hide file tree
Showing 74 changed files with 2,335 additions and 6 deletions.
21 changes: 21 additions & 0 deletions AcmeWidgetFactory/.actionScriptProperties
@@ -0,0 +1,21 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<actionScriptProperties mainApplicationPath="AcmeWidgetFactory.mxml" projectUUID="2a461a4a-1779-48f8-abc2-c97515cf9a99" version="6">
<compiler additionalCompilerArguments="-locale en_US" autoRSLOrdering="false" copyDependentFiles="true" flexSDK="Flex 3.4" generateAccessible="false" htmlExpressInstall="true" htmlGenerate="true" htmlHistoryManagement="true" htmlPlayerVersionCheck="true" includeNetmonSwc="false" outputFolderPath="bin-debug" sourceFolderPath="src" strict="true" targetPlayerVersion="0.0.0" useApolloConfig="false" useDebugRSLSwfs="true" verifyDigests="true" warn="true">
<compilerSourcePath/>
<libraryPath defaultLinkType="0">
<libraryPathEntry kind="4" path="">
<excludedEntries>
<libraryPathEntry kind="3" linkType="1" path="${PROJECT_FRAMEWORKS}/libs/flex.swc" useDefaultLinkType="false"/>
</excludedEntries>
</libraryPathEntry>
<libraryPathEntry kind="1" linkType="1" path="libs"/>
<libraryPathEntry kind="3" linkType="1" path="/robotlegs-framework/bin/robotlegs-framework.swc" useDefaultLinkType="false"/>
</libraryPath>
<sourceAttachmentPath/>
</compiler>
<applications>
<application path="AcmeWidgetFactory.mxml"/>
</applications>
<modules/>
<buildCSSFiles/>
</actionScriptProperties>
Binary file not shown.
@@ -0,0 +1,34 @@
<?xml version="1.0" encoding="utf-8"?>
<mx:Module xmlns:fx="http://ns.adobe.com/mxml/2009"
xmlns:s="library://ns.adobe.com/flex/spark"
xmlns:mx="library://ns.adobe.com/flex/halo"
xmlns:generic="org.robotlegs.demos.acmewidgetfactory.modules.generic.*"
implements="org.robotlegs.utilities.modular.core.IModuleContextView"
backgroundColor="#009933"
useHandCursor="true"
buttonMode="true"
layout="vertical"
borderStyle="solid"
cornerRadius="5"
width="124"
height="84">

<fx:Script>
<![CDATA[
import org.robotlegs.utilities.modular.core.IModuleContextView;
import org.robotlegs.utilities.modular.core.IModuleEventDispatcher;
[Inject]
public function setModuleDispatcher(dispatcher:IModuleEventDispatcher):void
{
context.setModuleDispatcher(dispatcher);
}
]]>
</fx:Script>

<fx:Declarations>
<generic:GenericModuleContext id="context"
contextView="{this}"/>
</fx:Declarations>

</mx:Module>
@@ -0,0 +1,21 @@
/*
* Copyright (c) 2009 the original author or authors
*
* Permission is hereby granted to use, modify, and distribute this file
* in accordance with the terms of the license agreement accompanying it.
*/

package org.robotlegs.demos.acmewidgetfactory.modules.generic
{
import org.robotlegs.utilities.modular.mvcs.ModuleContext;

public class GenericModuleContext extends ModuleContext
{

override public function startup():void
{
mediatorMap.mapView(GenericModule, GenericModuleMediator);
}

}
}
@@ -0,0 +1,38 @@
/*
* Copyright (c) 2009 the original author or authors
*
* Permission is hereby granted to use, modify, and distribute this file
* in accordance with the terms of the license agreement accompanying it.
*/

package org.robotlegs.demos.acmewidgetfactory.modules.generic
{
import flash.events.Event;
import flash.events.MouseEvent;

import org.robotlegs.utilities.modular.mvcs.ModuleMediator;

public class GenericModuleMediator extends ModuleMediator
{
[Inject]
public var view:GenericModule;

override public function onRegister():void
{
eventMap.mapListener(view, MouseEvent.CLICK, onViewClick);
eventMap.mapListener(moduleDispatcher, "SomeModuleEvent", onSomeModuleEvent );
}

protected function onViewClick(e:MouseEvent):void
{
moduleDispatcher.dispatchEvent(new Event("SomeModuleEvent"));
}

protected function onSomeModuleEvent(e:Event):void
{
view.alpha *= 0.8;
(view.alpha > 0.1) || (view.alpha = 0.9);
}

}
}
Expand Up @@ -21,7 +21,6 @@
*/
package org.robotlegs.demos.acmewidgetfactory.shell
{
import org.robotlegs.base.ContextEvent;
import org.robotlegs.demos.acmewidgetfactory.common.interfaces.ILoggerModule;
import org.robotlegs.demos.acmewidgetfactory.common.interfaces.IWidgetModule;
import org.robotlegs.demos.acmewidgetfactory.shell.controller.CreateLoggerCommand;
Expand All @@ -40,11 +39,11 @@ package org.robotlegs.demos.acmewidgetfactory.shell
import org.robotlegs.demos.acmewidgetfactory.shell.view.WidgetHolderMediator;
import org.robotlegs.demos.acmewidgetfactory.shell.view.WidgetHolderView;
import org.robotlegs.demos.acmewidgetfactory.shell.view.WidgetModuleMediator;
import org.robotlegs.mvcs.Context;
import org.robotlegs.utilities.modular.mvcs.ModuleShellContext;

public class AcmeWidgetFactoryContext extends Context
public class AcmeWidgetFactoryContext extends ModuleShellContext
{

override public function startup():void
{
// Controller
Expand All @@ -68,7 +67,7 @@ package org.robotlegs.demos.acmewidgetfactory.shell
mediatorMap.mapView('org.robotlegs.demos.acmewidgetfactory.modules.widget::WidgetModule', WidgetModuleMediator, IWidgetModule);

// Ready
dispatchEvent(new ContextEvent(ContextEvent.STARTUP_COMPLETE));
super.startup();
}

}
Expand Down
Expand Up @@ -6,6 +6,7 @@ package org.robotlegs.demos.acmewidgetfactory.shell.controller
{
public static const REMOVE_ALL_WIDGETS:String = 'REMOVE_ALL_WIDGETS';
public static const CLEAR_LOGGER:String = 'CLEAR_LOGGER';
public static const ADD_GENERIC_MODULE:String = 'ADD_GENERIC_MODULE';

public function ShellEvent(type:String)
{
Expand Down
Expand Up @@ -22,6 +22,7 @@ package org.robotlegs.demos.acmewidgetfactory.shell.view
eventMap.mapListener(view.destroyWidgetButton, MouseEvent.CLICK, onDestroyWidgetClick);
eventMap.mapListener(view.destroyAllWidgetsButton, MouseEvent.CLICK, onDestroyAllClick);
eventMap.mapListener(view.clearLoggerButton, MouseEvent.CLICK, onClearLoggerClick);
eventMap.mapListener(view.addGenericModuleButton, MouseEvent.CLICK, onAddGenericModuleClick);
}

protected function onCreateWidgetClick(e:MouseEvent):void
Expand Down Expand Up @@ -49,5 +50,10 @@ package org.robotlegs.demos.acmewidgetfactory.shell.view
eventDispatcher.dispatchEvent(new ShellEvent(ShellEvent.CLEAR_LOGGER));
}

protected function onAddGenericModuleClick(e:MouseEvent):void
{
eventDispatcher.dispatchEvent(new ShellEvent(ShellEvent.ADD_GENERIC_MODULE));
}

}
}
Expand Up @@ -58,11 +58,14 @@
<mx:Button id="destroyAllWidgetsButton"
label="Destroy All Widgets"
width="100%"/>
<mx:Button id="addGenericModuleButton"
label="Add Generic Module"
width="100%"/>
<mx:Button id="clearLoggerButton"
label="Clear Logger"
width="100%"/>
</mx:HBox>

</mx:Form>

</mx:VBox>
</mx:VBox>
@@ -1,14 +1,21 @@
package org.robotlegs.demos.acmewidgetfactory.shell.view
{
import flash.display.DisplayObject;
import flash.system.ApplicationDomain;

import mx.controls.SWFLoader;
import mx.modules.ModuleLoader;

import org.robotlegs.demos.acmewidgetfactory.shell.controller.ShellEvent;
import org.robotlegs.demos.acmewidgetfactory.shell.controller.ShellWidgetEvent;
import org.robotlegs.demos.acmewidgetfactory.shell.model.ActiveWidgetModel;
import org.robotlegs.demos.acmewidgetfactory.shell.model.ActiveWidgetModelEvent;
import org.robotlegs.mvcs.Mediator;

public class WidgetHolderMediator extends Mediator
{
private static const MODULE_URL:String = 'org/robotlegs/demos/acmewidgetfactory/modules/generic/GenericModule.swf';

[Inject]
public var view:WidgetHolderView;

Expand All @@ -23,6 +30,7 @@ package org.robotlegs.demos.acmewidgetfactory.shell.view
{
eventMap.mapListener(eventDispatcher, ActiveWidgetModelEvent.WIDGET_CREATED, onWidgetCreated);
eventMap.mapListener(eventDispatcher, ShellWidgetEvent.SHUTDOWN_WIDGET_COMPLETE, onShutdownWidgetComplete);
eventMap.mapListener(eventDispatcher, ShellEvent.ADD_GENERIC_MODULE, addGenericModule);
}

protected function onWidgetCreated(e:ActiveWidgetModelEvent):void
Expand All @@ -35,5 +43,14 @@ package org.robotlegs.demos.acmewidgetfactory.shell.view
view.removeChild(activeWidgetModel.getWidget(e.widgetId) as DisplayObject);
eventDispatcher.dispatchEvent(new ShellWidgetEvent(ShellWidgetEvent.REMOVE_WIDGET_COMPLETE, e.widgetId));
}

protected function addGenericModule(e:ShellEvent):void
{
var modLoader:ModuleLoader = new ModuleLoader();
modLoader.width = 124;
modLoader.height = 84;
modLoader.loadModule(MODULE_URL);
view.addChild(modLoader);
}
}
}
46 changes: 46 additions & 0 deletions CafeTownsend/.actionScriptProperties
@@ -0,0 +1,46 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<actionScriptProperties mainApplicationPath="CafeTownsend.mxml" projectUUID="9f052255-e597-4732-8123-e2528c3ab1ea" version="6">
<compiler additionalCompilerArguments="-locale en_US -keep-as3-metadata+=&quot;Inject,PostConstruct&quot;" autoRSLOrdering="false" copyDependentFiles="true" generateAccessible="false" htmlExpressInstall="true" htmlGenerate="true" htmlHistoryManagement="false" htmlPlayerVersionCheck="true" includeNetmonSwc="false" outputFolderPath="bin-debug" sourceFolderPath="src" strict="true" targetPlayerVersion="0.0.0" useApolloConfig="false" useDebugRSLSwfs="true" verifyDigests="true" warn="true">
<compilerSourcePath>
<compilerSourcePathEntry kind="1" linkType="1" path="locale/{locale}"/>
<compilerSourcePathEntry kind="1" linkType="1" path="build"/>
</compilerSourcePath>
<libraryPath defaultLinkType="0">
<libraryPathEntry kind="4" path="">
<excludedEntries>
<libraryPathEntry kind="3" linkType="1" path="${PROJECT_FRAMEWORKS}/libs/flex.swc" useDefaultLinkType="false"/>
</excludedEntries>
</libraryPathEntry>
<libraryPathEntry kind="3" linkType="1" path="/robotlegs-framework/bin/robotlegs-framework.swc" useDefaultLinkType="false"/>
</libraryPath>
<sourceAttachmentPath/>
</compiler>
<applications>
<application path="CafeTownsend.mxml"/>
</applications>
<modules/>
<buildCSSFiles/>
<publishSource>
<sourcePathIncludes>
<include path="build"/>
</sourcePathIncludes>
<sourceExcludes>
<exclude path="html-template"/>
<exclude path="src/org/robotlegs/demos/cafetownsend/detail/controller"/>
<exclude path="src/org/robotlegs/demos/cafetownsend/detail/service"/>
<exclude path="src/org/robotlegs/demos/cafetownsend/detail/view/components/assets"/>
<exclude path="src/org/robotlegs/demos/cafetownsend/detail/view/components/events"/>
<exclude path="src/org/robotlegs/demos/cafetownsend/list/controller"/>
<exclude path="src/org/robotlegs/demos/cafetownsend/list/model/vo"/>
<exclude path="src/org/robotlegs/demos/cafetownsend/list/service/dto"/>
<exclude path="src/org/robotlegs/demos/cafetownsend/list/view/components/assets"/>
<exclude path="src/org/robotlegs/demos/cafetownsend/list/view/components/events"/>
<exclude path="src/org/robotlegs/demos/cafetownsend/main/controller"/>
<exclude path="src/org/robotlegs/demos/cafetownsend/main/service/dto"/>
<exclude path="src/org/robotlegs/demos/cafetownsend/main/view/components/events"/>
<exclude path="src/org/robotlegs/demos/cafetownsend/user/service/dto"/>
<exclude path="src/org/robotlegs/demos/cafetownsend/user/view/components/assets"/>
<exclude path="src/org/robotlegs/demos/cafetownsend/user/view/components/events"/>
</sourceExcludes>
</publishSource>
</actionScriptProperties>
2 changes: 2 additions & 0 deletions CafeTownsend/.flexProperties
@@ -0,0 +1,2 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<flexProperties enableServiceManager="false" flexServerFeatures="0" flexServerType="0" toolCompile="true" useServerFlexSDK="false" version="2"/>
8 changes: 8 additions & 0 deletions CafeTownsend/.gitignore
@@ -0,0 +1,8 @@
.svn/
bin/
bin-debug/
html-template/
libs/
.DS_Store
.settings
bin-release
18 changes: 18 additions & 0 deletions CafeTownsend/.project
@@ -0,0 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>CafeTownsend_Robotlegs</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>com.adobe.flexbuilder.project.flexbuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>com.adobe.flexbuilder.project.flexnature</nature>
<nature>com.adobe.flexbuilder.project.actionscriptnature</nature>
</natures>
</projectDescription>
Binary file added CafeTownsend/build/assets/header.jpg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
38 changes: 38 additions & 0 deletions CafeTownsend/build/data/Employees.xml
@@ -0,0 +1,38 @@
<?xml version="1.0" encoding="utf-8"?>
<employees>
<employee>
<emp_id>1</emp_id>
<firstname>Shaun</firstname>
<lastname>Smith</lastname>
<email>darscan@cafetownsend.com</email>
<startdate>04/17/2009</startdate>
</employee>
<employee>
<emp_id>2</emp_id>
<firstname>Joel</firstname>
<lastname>Hooks</lastname>
<email>jhooks@cafetownsend.com</email>
<startdate>07/15/2009</startdate>
</employee>
<employee>
<emp_id>3</emp_id>
<firstname>Robert</firstname>
<lastname>Penner</lastname>
<email>robpenner@cafetownsend.com</email>
<startdate>09/24/2009</startdate>
</employee>
<employee>
<emp_id>4</emp_id>
<firstname>Till</firstname>
<lastname>Schneidereit</lastname>
<email>tschneidereit@cafetownsend.com</email>
<startdate>10/01/2009</startdate>
</employee>
<employee>
<emp_id>5</emp_id>
<firstname>Stray</firstname>
<lastname>x</lastname>
<email>stray_and_ruby@cafetownsend.com</email>
<startdate>10/20/2009</startdate>
</employee>
</employees>

0 comments on commit dd48a86

Please sign in to comment.