Module: nagvis Branch: master Commit: 9bfd2a217f64e6c6a82636a4f7bb64f2690af3ca URL: http://nagvis.git.sourceforge.net/git/gitweb.cgi?p=nagvis/nagvis/commit/?id=9bfd2a217f64e6c6a82636a4f7bb64f2690af3ca
Author: Andriy Skuratov <[email protected]> Date: Tue Aug 18 11:03:55 2009 +0300 gmap:Links are displayable now. --- uifx/src/modules/gmap/data/LinksData.as | 18 ++++-------------- uifx/src/modules/gmap/mate/PreinitEM.mxml | 2 +- uifx/src/modules/gmap/mate/StartupEM.mxml | 12 ++++++------ uifx/src/modules/gmap/mate/UIInitEM.mxml | 20 +++++++++++++------- 4 files changed, 24 insertions(+), 28 deletions(-) diff --git a/uifx/src/modules/gmap/data/LinksData.as b/uifx/src/modules/gmap/data/LinksData.as index d89c530..7435003 100644 --- a/uifx/src/modules/gmap/data/LinksData.as +++ b/uifx/src/modules/gmap/data/LinksData.as @@ -7,29 +7,19 @@ package modules.gmap.data public class LinksData extends ArrayCollection { - private var _locations:LocationsData; - - public function LinksData(locations:LocationsData, source:Array=null) + public function LinksData(source:Array=null) { super(source); - - _locations = locations; - _locations.addEventListener(CollectionEvent.COLLECTION_CHANGE, onLocationsChange); - } - - protected function onLocationsChange(event:CollectionEvent):void - { - //TODO: do something } - public function fill(data : Array) : void + public function fill(data : Array, locations:LocationsData) : void { this.source = data; for each(var link:Link in this) { - link.location1 = _locations.getItemById(link.id1); - link.location2 = _locations.getItemById(link.id2); + link.location1 = locations.getItemById(link.id1); + link.location2 = locations.getItemById(link.id2); } } } diff --git a/uifx/src/modules/gmap/mate/PreinitEM.mxml b/uifx/src/modules/gmap/mate/PreinitEM.mxml index 1f27f3d..cf6af64 100644 --- a/uifx/src/modules/gmap/mate/PreinitEM.mxml +++ b/uifx/src/modules/gmap/mate/PreinitEM.mxml @@ -28,7 +28,7 @@ <ObjectBuilder generator="{LocationsData}"/> <ObjectBuilder generator="{LocationsExtData}"/> <ObjectBuilder generator="{CurrentLink}"/> - <ObjectBuilder generator="{LinksData}" constructorArguments="{LocationsData}"/> + <ObjectBuilder generator="{LinksData}"/> <ObjectBuilder generator="{HostsData}"/> <ObjectBuilder generator="{HostGroupsData}"/> <ObjectBuilder generator="{ServicesData}"/> diff --git a/uifx/src/modules/gmap/mate/StartupEM.mxml b/uifx/src/modules/gmap/mate/StartupEM.mxml index fd9d4ab..e3b91e5 100644 --- a/uifx/src/modules/gmap/mate/StartupEM.mxml +++ b/uifx/src/modules/gmap/mate/StartupEM.mxml @@ -35,14 +35,14 @@ <resultHandlers> <MethodInvoker generator="{LocationsData}" method="fill" arguments="{resultObject}"/> <MethodInvoker generator="{Poller}" method="resourceReady"/> + <RemoteObjectInvoker destination="zend" source="Link" method="getAll" debug="true"> + <resultHandlers> + <DataCopier destination="data" destinationKey="locations" source="{LocationsData}"/> + <MethodInvoker generator="{LinksData}" method="fill" arguments="{[resultObject, data.locations]}"/> + </resultHandlers> + </RemoteObjectInvoker> </resultHandlers> </RemoteObjectInvoker> - <RemoteObjectInvoker destination="zend" source="Link" method="getAll" debug="true"> - <resultHandlers> - <MethodInvoker generator="{LinksData}" method="fill" arguments="{resultObject}"/> - </resultHandlers> - </RemoteObjectInvoker> - </Injectors> <Injectors target="{MapMD}" debug="true"> diff --git a/uifx/src/modules/gmap/mate/UIInitEM.mxml b/uifx/src/modules/gmap/mate/UIInitEM.mxml index c6cb1e6..7f02886 100644 --- a/uifx/src/modules/gmap/mate/UIInitEM.mxml +++ b/uifx/src/modules/gmap/mate/UIInitEM.mxml @@ -5,13 +5,6 @@ > <mx:Script> <![CDATA[ - import modules.gmap.view.DialogLink; - import modules.gmap.view.DialogSettings; - import modules.gmap.data.SettingsData; - import modules.gmap.data.ServiceGroupsData; - import modules.gmap.data.ServicesData; - import modules.gmap.data.HostGroupsData; - import modules.gmap.data.HostsData; import com.asfusion.mate.events.Dispatcher; import modules.gmap.view.MainView; @@ -19,8 +12,11 @@ import modules.gmap.view.controls.GMapLocationControl; import modules.gmap.view.controls.GMapLocationsControl; import modules.gmap.view.controls.GMapLocationsExtControl; + import modules.gmap.view.controls.GMapLinksControl; import modules.gmap.view.DialogViewpoint; import modules.gmap.view.DialogLocation; + import modules.gmap.view.DialogLink; + import modules.gmap.view.DialogSettings; import modules.gmap.mediator.MainMD; import modules.gmap.mediator.MapMD; @@ -31,6 +27,12 @@ import modules.gmap.data.LocationsData; import modules.gmap.data.LocationsExtData; import modules.gmap.data.CurrentLink; + import modules.gmap.data.LinksData; + import modules.gmap.data.SettingsData; + import modules.gmap.data.ServiceGroupsData; + import modules.gmap.data.ServicesData; + import modules.gmap.data.HostGroupsData; + import modules.gmap.data.HostsData; ]]> </mx:Script> @@ -77,5 +79,9 @@ <Injectors target="{GMapLocationsExtControl}" debug="true"> <PropertyInjector targetKey="dataProvider" source="{LocationsExtData}"/> </Injectors> + + <Injectors target="{GMapLinksControl}"> + <PropertyInjector targetKey="dataProvider" source="{LinksData}"/> + </Injectors> </EventMap> ------------------------------------------------------------------------------ Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day trial. Simplify your report design, integration and deployment - and focus on what you do best, core application coding. Discover what's new with Crystal Reports now. http://p.sf.net/sfu/bobj-july _______________________________________________ Nagvis-checkins mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/nagvis-checkins
