Alter the remaining Application.application occurancies

diff --git a/net/systemeD/potlatch2/BackgroundDialog.mxml b/net/systemeD/potlatch2/BackgroundDialog.mxml
index 580a090ae8c4e550a0980d34679282531a88c5fb..6b35c7f45433b2da95aae27ec1fcc0fcb71f7795 100644 (file)
--- a/net/systemeD/potlatch2/BackgroundDialog.mxml
+++ b/net/systemeD/potlatch2/BackgroundDialog.mxml
@@ -41,6 +41,7 @@
     import mx.managers.PopUpManager;
     import mx.events.CloseEvent;
     import mx.core.Application;
+    import mx.core.FlexGlobals;
        import mx.collections.ArrayCollection;
        import mx.controls.List;
        import net.systemeD.potlatch2.FunctionKeyManager;
@@ -54,7 +55,7 @@
                this.menu=menu;
                collection=source;
                dataCollection=new ArrayCollection(source.collection);
-        PopUpManager.addPopUp(this, Application(Application.application), true);
+        PopUpManager.addPopUp(this, Application(FlexGlobals.topLevelApplication), true);
         PopUpManager.centerPopUp(this);
         this.addEventListener(CloseEvent.CLOSE, backgroundDialog_close);
                dataGrid.dataProvider=dataCollection;

diff --git a/net/systemeD/potlatch2/BackgroundSelector.mxml b/net/systemeD/potlatch2/BackgroundSelector.mxml
index 2c483390bf15a7e5b6f1035ea24c2a5dfb850aa8..cc4c11629b5b6d096ecdb7299c1454ec4e886bc8 100644 (file)
--- a/net/systemeD/potlatch2/BackgroundSelector.mxml
+++ b/net/systemeD/potlatch2/BackgroundSelector.mxml
@@ -6,19 +6,19 @@
        
        <mx:List width="100%" height="100%" id="background"
                        labelField="name"
-                       change="Application.application.bgButton.close(); Imagery.instance().setBackground(background.selectedItem);"
+                       change="FlexGlobals.topLevelApplication.bgButton.close(); Imagery.instance().setBackground(background.selectedItem);"
                dataProvider="{Imagery.instance().getAvailableImagery()}"
                rowCount="{Imagery.instance().getAvailableImagery().length}"/>
        <mx:HBox>
-       <mx:CheckBox width="100%" label="Dim" selected="{Application.application.theMap.getDimming()}" id="dim"
+       <mx:CheckBox width="100%" label="Dim" selected="{FlexGlobals.topLevelApplication.theMap.getDimming()}" id="dim"
            change="setDimming(dim.selected)" />
-       <mx:CheckBox width="100%" label="Sharpen" selected="{Application.application.theMap.getSharpen()}" id="sharpen"
+       <mx:CheckBox width="100%" label="Sharpen" selected="{FlexGlobals.topLevelApplication.theMap.getSharpen()}" id="sharpen"
            change="setSharpen(sharpen.selected)" />
        </mx:HBox>
 
        <mx:HBox>
-       <mx:Button label="Edit..." click="Application.application.bgButton.close(); new BackgroundDialog().init('Background imagery',background,Imagery.instance());" />
-       <mx:Button label="Vector file..." click="Application.application.bgButton.close(); new VectorSourceDialog().init();" />
+       <mx:Button label="Edit..." click="FlexGlobals.topLevelApplication.bgButton.close(); new BackgroundDialog().init('Background imagery',background,Imagery.instance());" />
+       <mx:Button label="Vector file..." click="FlexGlobals.topLevelApplication.bgButton.close(); new VectorSourceDialog().init();" />
        </mx:HBox>
 
        <mx:Script><![CDATA[
@@ -32,14 +32,14 @@
                import mx.managers.PopUpManager;
 
                public function setDimming(v:Boolean):void {
-                       Application.application.theMap.setDimming(dim.selected);
-                       Application.application.yahoo.alpha = dim.selected ? 0.5 : 1;
+                       FlexGlobals.topLevelApplication.theMap.setDimming(dim.selected);
+                       FlexGlobals.topLevelApplication.yahoo.alpha = dim.selected ? 0.5 : 1;
                        var obj:SharedObject=SharedObject.getLocal("user_state");
                        obj.setProperty('background_dim',v);
                        obj.flush();
                }
                public function setSharpen(v:Boolean):void {
-                       Application.application.theMap.setSharpen(sharpen.selected);
+                       FlexGlobals.topLevelApplication.theMap.setSharpen(sharpen.selected);
                        var obj:SharedObject=SharedObject.getLocal("user_state");
                        obj.setProperty('background_sharpen',v);
                        obj.flush();

diff --git a/net/systemeD/potlatch2/RelationSelectPanel.mxml b/net/systemeD/potlatch2/RelationSelectPanel.mxml
index f10440d25a23f74c19ebd8669401421910009412..a3af4dc4876dae28cdd0975e4e54716df077c4f0 100644 (file)
--- a/net/systemeD/potlatch2/RelationSelectPanel.mxml
+++ b/net/systemeD/potlatch2/RelationSelectPanel.mxml
@@ -11,6 +11,7 @@
         import net.systemeD.potlatch2.*;
         import mx.managers.PopUpManager;
         import mx.core.Application;
+        import mx.core.FlexGlobals;
 
         private var conn:Connection;
         private var relationList:Array;
@@ -29,7 +30,7 @@
             //tagmatches[k]=t[k];// deep copy match pattern tags
             defaulttags[k]=t[k][0];  // route=[hiking,foot] -> route=hiking
           }    
-          PopUpManager.addPopUp(this, Application(Application.application), true);
+          PopUpManager.addPopUp(this, Application(FlexGlobals.topLevelApplication), true);
           PopUpManager.centerPopUp(this);
     
           var titles:Array = [];
@@ -76,7 +77,7 @@
 
                        PopUpManager.removePopUp(this);
                        var panel:RelationEditorPanel = RelationEditorPanel(
-                           PopUpManager.createPopUp(Application(Application.application), RelationEditorPanel, true));
+                           PopUpManager.createPopUp(Application(FlexGlobals.topLevelApplication), RelationEditorPanel, true));
                        panel.setRelation(relation);
                        PopUpManager.centerPopUp(panel);
         }
@@ -84,7 +85,7 @@
                public function closeAndLoadRelation():void {
                        PopUpManager.removePopUp(this);
                        var panel:RelationLoaderPanel = RelationLoaderPanel(
-                           PopUpManager.createPopUp(Application(Application.application), RelationLoaderPanel, true));
+                           PopUpManager.createPopUp(Application(FlexGlobals.topLevelApplication), RelationLoaderPanel, true));
                        panel.setEntity(entity);
                        PopUpManager.centerPopUp(panel);
                }

diff --git a/net/systemeD/potlatch2/StyleSelector.mxml b/net/systemeD/potlatch2/StyleSelector.mxml
index d839ad7f8d1309ea58795f7f15e6b8cb2663fcd5..6d5b0d2a4a6181631a1c6a5e8a375038c5593bba 100644 (file)
--- a/net/systemeD/potlatch2/StyleSelector.mxml
+++ b/net/systemeD/potlatch2/StyleSelector.mxml
@@ -6,11 +6,11 @@
        
        <mx:List width="100%" height="100%" id="mapStyle" 
                labelField="name"
-               change="Application.application.styleButton.close(); Stylesheets.instance().setStylesheet(mapStyle.selectedItem.name, mapStyle.selectedItem.url);"
+               change="FlexGlobals.topLevelApplication.styleButton.close(); Stylesheets.instance().setStylesheet(mapStyle.selectedItem.name, mapStyle.selectedItem.url);"
                dataProvider="{Stylesheets.instance().getCollection()}"
                rowCount="{Stylesheets.instance().getCollection().length}" />
 
-       <mx:Button label="Edit..." click="Application.application.styleButton.close(); new BackgroundDialog().init('Map style',mapStyle,Stylesheets.instance());" />
+       <mx:Button label="Edit..." click="FlexGlobals.topLevelApplication.styleButton.close(); new BackgroundDialog().init('Map style',mapStyle,Stylesheets.instance());" />
 
        <mx:Script><![CDATA[
                import net.systemeD.halcyon.*;

diff --git a/net/systemeD/potlatch2/VectorSourceDialog.mxml b/net/systemeD/potlatch2/VectorSourceDialog.mxml
index e17c8837c56f62aa9857b15009de572fd486f11a..046bc941a50f4e146c3649d9df3c967927bee440 100644 (file)
--- a/net/systemeD/potlatch2/VectorSourceDialog.mxml
+++ b/net/systemeD/potlatch2/VectorSourceDialog.mxml
@@ -91,6 +91,7 @@
     import mx.events.DataGridEvent;
     import mx.events.CloseEvent;
     import mx.core.Application;
+    import mx.core.FlexGlobals;
        import mx.collections.ArrayCollection;
        import mx.controls.Alert;
 
@@ -102,7 +103,7 @@
 
 
     public function init():void {
-        PopUpManager.addPopUp(this, Application(Application.application), true);
+        PopUpManager.addPopUp(this, Application(FlexGlobals.topLevelApplication), true);
         PopUpManager.centerPopUp(this);
         this.addEventListener(CloseEvent.CLOSE, vectorDialog_close);
                dataGrid.addEventListener("visibility_changed", toggleVisibility);

diff --git a/net/systemeD/potlatch2/find/FindDialog.mxml b/net/systemeD/potlatch2/find/FindDialog.mxml
index a64c90e73692ae0a8ac0f6fd7f08254f14a42d52..c19ff640bbae66fc7e9ab666995f51e4e19b5153 100644 (file)
--- a/net/systemeD/potlatch2/find/FindDialog.mxml
+++ b/net/systemeD/potlatch2/find/FindDialog.mxml
@@ -7,6 +7,7 @@
        <mx:Script><![CDATA[
         import flash.events.Event;
                import mx.core.Application;
+               import mx.core.FlexGlobals;
                import mx.events.CloseEvent;
                import mx.events.FlexEvent;
                import mx.managers.PopUpManager;
@@ -27,7 +28,7 @@
                                
                
                public function init():void {
-                       PopUpManager.addPopUp(this, Application(Application.application), true);
+                       PopUpManager.addPopUp(this, Application(FlexGlobals.topLevelApplication), true);
                        PopUpManager.centerPopUp(this);
                        this.addEventListener(CloseEvent.CLOSE, findDialog_close);
                        
@@ -74,9 +75,9 @@
         }
         
         private function goToSelected():void {
-            Application.application.theMap.updateCoordsFromLatLon(selectedResult.lat, selectedResult.lon);
-            Application.application.theMap.download();
-            //Application.application.theMap.redraw();            
+            FlexGlobals.topLevelApplication.theMap.updateCoordsFromLatLon(selectedResult.lat, selectedResult.lon);
+            FlexGlobals.topLevelApplication.theMap.download();
+            //FlexGlobals.topLevelApplication.theMap.redraw();
             PopUpManager.removePopUp(this);
         }
         

diff --git a/net/systemeD/potlatch2/help/HelpDialog.mxml b/net/systemeD/potlatch2/help/HelpDialog.mxml
index 30daaeab20fe265eee5571fe63f467483a298d94..02c4665ddbbd86c27113076985773b27a6dfa283 100644 (file)
--- a/net/systemeD/potlatch2/help/HelpDialog.mxml
+++ b/net/systemeD/potlatch2/help/HelpDialog.mxml
@@ -10,10 +10,11 @@
     import mx.managers.PopUpManager;
     import mx.events.CloseEvent;
     import mx.core.Application;
+    import mx.core.FlexGlobals;
 
     /** Pops up a multi-tabbed help window in the middle of the screen, then remembers that the user has seen it. */
     public function init():void {
-        PopUpManager.addPopUp(this, Application(Application.application), true);
+        PopUpManager.addPopUp(this, Application(FlexGlobals.topLevelApplication), true);
         PopUpManager.centerPopUp(this);
         this.addEventListener(CloseEvent.CLOSE, helpDialog_close);
 
@@ -353,7 +354,7 @@
   </mx:TabNavigator>
 
   <mx:ControlBar>
-    <mx:Label text="Version: {Application.application.version} Build: {Application.application.build_number}" />
+    <mx:Label text="Version: {FlexGlobals.topLevelApplication.version} Build: {FlexGlobals.topLevelApplication.build_number}" />
     <mx:Spacer width="100%"/>
     <mx:Button label="Ok" click="PopUpManager.removePopUp(this);" styleName="titleWindowButton" />
   </mx:ControlBar>

diff --git a/net/systemeD/potlatch2/mapfeatures/editors/TurnRestrictionIcon.mxml b/net/systemeD/potlatch2/mapfeatures/editors/TurnRestrictionIcon.mxml
index 11465a4a692b104c97e05497ccf64a7301eed413..6e6b713afb263630d3d44cd0b8e8a5c3111c639f 100644 (file)
--- a/net/systemeD/potlatch2/mapfeatures/editors/TurnRestrictionIcon.mxml
+++ b/net/systemeD/potlatch2/mapfeatures/editors/TurnRestrictionIcon.mxml
@@ -69,6 +69,7 @@
     import mx.collections.ArrayCollection;
        import mx.utils.ObjectProxy;
        import mx.core.Application;
+       import mx.core.FlexGlobals;
        import mx.managers.PopUpManager;
 
     private var _turn:Object;
@@ -136,7 +137,7 @@
        public function openAdvanced():void {
                var rel:Relation=Relation(_turn.relation);
                var panel:RelationEditorPanel = RelationEditorPanel(
-                       PopUpManager.createPopUp(Application(Application.application), RelationEditorPanel, true));
+                       PopUpManager.createPopUp(Application(FlexGlobals.topLevelApplication), RelationEditorPanel, true));
                panel.setRelation(rel);
                PopUpManager.centerPopUp(panel);
        }

diff --git a/net/systemeD/potlatch2/mygpx/MyGpxDialog.mxml b/net/systemeD/potlatch2/mygpx/MyGpxDialog.mxml
index 429b62c08dbca142f43cda06ac3942b4854b92e0..aef8e62c0bf2a8505c433e130f9681735fb6ebc7 100644 (file)
--- a/net/systemeD/potlatch2/mygpx/MyGpxDialog.mxml
+++ b/net/systemeD/potlatch2/mygpx/MyGpxDialog.mxml
@@ -9,6 +9,7 @@
     import mx.managers.PopUpManager;
     import mx.events.CloseEvent;
     import mx.core.Application;
+    import mx.core.FlexGlobals;
 
     import net.systemeD.halcyon.connection.*;
     import net.systemeD.potlatch2.save.*;
@@ -22,7 +23,7 @@
     private var conn:Connection;
 
     public function init():void {
-        PopUpManager.addPopUp(this, Application(Application.application), true);
+        PopUpManager.addPopUp(this, Application(FlexGlobals.topLevelApplication), true);
         PopUpManager.centerPopUp(this);
         this.addEventListener(CloseEvent.CLOSE, myGpxDialog_close);
 

diff --git a/net/systemeD/potlatch2/options/OptionsDialog.mxml b/net/systemeD/potlatch2/options/OptionsDialog.mxml
index c98cab8d051e7f970dcf6cf00651e1d68b536244..62233a4e880c9e6037c4e5d2044eac986ad5ebf2 100644 (file)
--- a/net/systemeD/potlatch2/options/OptionsDialog.mxml
+++ b/net/systemeD/potlatch2/options/OptionsDialog.mxml
@@ -8,22 +8,23 @@
     import mx.managers.PopUpManager;
     import mx.events.CloseEvent;
     import mx.core.Application;
+    import mx.core.FlexGlobals;
     import net.systemeD.halcyon.Globals;
     import net.systemeD.halcyon.Map;
     import net.systemeD.halcyon.connection.Connection;
     import net.systemeD.halcyon.connection.StatusFetcher;
     
     public function init():void {
-        PopUpManager.addPopUp(this, Application(Application.application), true);
+        PopUpManager.addPopUp(this, Application(FlexGlobals.topLevelApplication), true);
         PopUpManager.centerPopUp(this);
         this.addEventListener(CloseEvent.CLOSE, optionsDialog_close);
 
         var obj:SharedObject = SharedObject.getLocal("user_state");
 
-        tbcheck.selected = Application.application.toolbox.visible;
-        cursorcheck.selected = Application.application.theController.cursorsEnabled;
+        tbcheck.selected = FlexGlobals.topLevelApplication.toolbox.visible;
+        cursorcheck.selected = FlexGlobals.topLevelApplication.theController.cursorsEnabled;
         tigercheck.selected = obj.data['tiger_highlighted'];
-        latlongcheck.selected = Application.application.coordsbox.visible;
+        latlongcheck.selected = FlexGlobals.topLevelApplication.coordsbox.visible;
                licencecheck.selected = Map(Globals.vars.root).editableLayer.connection.statusFetcher!=null;
     }
     
@@ -33,7 +34,7 @@
 
     private function tigerToggle():void {
         Globals.vars.highlightTiger = tigercheck.selected;
-        Application.application.theMap.redraw();
+        FlexGlobals.topLevelApplication.theMap.redraw();
 
         var obj:SharedObject = SharedObject.getLocal("user_state");
         obj.setProperty("tiger_highlighted",tigercheck.selected);
@@ -55,16 +56,16 @@
               ]]>
   </mx:Script>
        <mx:CheckBox width="100%" label="Show toolbox" selected="true" id="tbcheck"
-           change="Application.application.toolbox.toggle()" />
+           change="FlexGlobals.topLevelApplication.toolbox.toggle()" />
 
        <mx:CheckBox width="100%" label="Use custom cursors" selected="true" id="cursorcheck"
-           change="Application.application.theController.cursorsEnabled=cursorcheck.selected" />
+           change="FlexGlobals.topLevelApplication.theController.cursorsEnabled=cursorcheck.selected" />
 
     <mx:CheckBox width="100%" label="Highlight unedited TIGER (US roads)" selected="false" id="tigercheck"
         change="tigerToggle()" />
 
        <mx:CheckBox width="100%" label="Show mouse latitude/longitude" selected="false" id="latlongcheck" 
-               change="Application.application.coordsbox.visible=latlongcheck.selected" />
+               change="FlexGlobals.topLevelApplication.coordsbox.visible=latlongcheck.selected" />
 
     <mx:CheckBox width="100%" label="Show licence status" selected="false" id="licencecheck"
         change="licenceToggle()" />

diff --git a/net/systemeD/potlatch2/save/SaveDialog.mxml b/net/systemeD/potlatch2/save/SaveDialog.mxml
index 676c446cd7c05b7fa6493415265ff6a1af291755..cac5ab6ddf27fda9f45c1eeae1c8a4bd66ceba8f 100644 (file)
--- a/net/systemeD/potlatch2/save/SaveDialog.mxml
+++ b/net/systemeD/potlatch2/save/SaveDialog.mxml
@@ -82,6 +82,7 @@
     import mx.controls.*;
     import mx.managers.PopUpManager;
        import mx.core.Application;
+       import mx.core.FlexGlobals;
     import mx.events.DataGridEvent;
     import mx.events.DataGridEventReason;
     

diff --git a/potlatch2.mxml b/potlatch2.mxml
index 0c3e996d5d6cdd230466a2f8d50862f79a7c5a72..2b1b524a5f0b0988c3ce5bd3db54d08994311356 100644 (file)
--- a/potlatch2.mxml
+++ b/potlatch2.mxml
@@ -108,6 +108,7 @@
                import mx.core.IChildList;
         import mx.containers.Canvas;
                import mx.core.Application;
+               import mx.core.FlexGlobals;
         import mx.events.DragEvent;
         import mx.events.CloseEvent;
         import mx.managers.DragManager;
@@ -360,7 +361,7 @@
                        if (entity is Relation) {
                                // If it's a relation, just bring up the editor panel
                                var panel:RelationEditorPanel = RelationEditorPanel(
-                                       PopUpManager.createPopUp(Application(Application.application), RelationEditorPanel, true));
+                                       PopUpManager.createPopUp(Application(FlexGlobals.topLevelApplication), RelationEditorPanel, true));
                                panel.setRelation(entity as Relation);
                                PopUpManager.centerPopUp(panel);
                                return;