remove mx.controls.Alert dependency from halcyon_viewer - Flex should only be used...

diff --git a/net/systemeD/halcyon/MapEvent.as b/net/systemeD/halcyon/MapEvent.as
index 078554a47a2ceed3b8bf7e4a134cb0cc03cfc752..b0f090fbe22b4172e6ff8b0b197cc47238e0b70c 100644 (file)
--- a/net/systemeD/halcyon/MapEvent.as
+++ b/net/systemeD/halcyon/MapEvent.as
@@ -8,6 +8,7 @@ package net.systemeD.halcyon {
                public static const RESIZE:String = "resize";
                public static const MOVE:String = "move";
                public static const NUDGE_BACKGROUND:String = "nudge_background";
+               public static const ERROR:String = "error";
 
                public var params:Object;
 

diff --git a/net/systemeD/halcyon/connection/XMLConnection.as b/net/systemeD/halcyon/connection/XMLConnection.as
index 6bc0dade1200a99e4a7822d22af4dd232a2d4cc9..f003cfe409a86643b525ef143c5991d9b03b4678 100644 (file)
--- a/net/systemeD/halcyon/connection/XMLConnection.as
+++ b/net/systemeD/halcyon/connection/XMLConnection.as
@@ -5,9 +5,8 @@ package net.systemeD.halcyon.connection {
        import flash.system.Security;
        import flash.net.*;
     import org.iotashan.oauth.*;
-       import mx.controls.Alert;
 
-       import net.systemeD.halcyon.Globals;
+       import net.systemeD.halcyon.MapEvent;
 
        public class XMLConnection extends XMLBaseConnection {
 
@@ -40,7 +39,7 @@ package net.systemeD.halcyon.connection {
                }
 
         private function errorOnMapLoad(event:Event):void {
-                       Alert.show("Couldn't load the map", 'Error', mx.controls.Alert.OK);
+                       dispatchEvent(new MapEvent(MapEvent.ERROR, { message: "Couldn't load the map" } ));
         }
         private function mapLoadStatus(event:HTTPStatusEvent):void {
             trace("loading map status = "+event.status);
@@ -181,7 +180,7 @@ package net.systemeD.halcyon.connection {
         }
 
         private function diffUploadError(event:IOErrorEvent):void {
-                       Alert.show("Couldn't upload data: "+httpStatus+" "+event.text, 'Error', mx.controls.Alert.OK);
+                       dispatchEvent(new MapEvent(MapEvent.ERROR, { message: "Couldn't upload data: "+httpStatus+" "+event.text } ));
                dispatchEvent(new SaveCompleteEvent(SAVE_COMPLETED, false));
         }
 

diff --git a/potlatch2.mxml b/potlatch2.mxml
index 4f6bca5d5f7d3ea87a02b63c1208021e974f968e..b340a7e09ff17a93aa536a0cde4eb25eeb6d3a62 100755 (executable)
--- a/potlatch2.mxml
+++ b/potlatch2.mxml
@@ -83,6 +83,7 @@
         import mx.events.DragEvent;
         import mx.managers.DragManager;
         import mx.core.DragSource;
+        import mx.controls.Alert;
 
         public var theMap:Map;
         public var theController:EditController;
@@ -188,11 +189,16 @@
             conn.addEventListener(Connection.SAVE_COMPLETED, onDataComplete);
             conn.addEventListener(Connection.DATA_DIRTY, onDataDirty);
             conn.addEventListener(Connection.DATA_CLEAN, onDataClean);
+                       conn.addEventListener(MapEvent.ERROR, onMapError);
 
                        // create GPS trackloader
                        trackLoader=new TrackLoader(theMap,conn.apiBase);
                }
                
+               public function onMapError(event:MapEvent):void {
+                       Alert.show(event.params.message, 'Error', mx.controls.Alert.OK);
+               }
+
         public function onResizeMap():void {
             if ( theMap != null )
                 theMap.updateSize(map_area.width, map_area.height);