Namespacing upgrade. Oh Adobe, how we love your outdated and self-contradictory upgra...
authorAndy Allan <andy@gravitystorm.co.uk>
Wed, 29 Jun 2011 18:01:08 +0000 (19:01 +0100)
committerAndy Allan <andy@gravitystorm.co.uk>
Wed, 29 Jun 2011 18:01:08 +0000 (19:01 +0100)
34 files changed:
net/systemeD/potlatch2/BackgroundDialog.mxml
net/systemeD/potlatch2/BackgroundSelector.mxml
net/systemeD/potlatch2/CategorySelector.mxml
net/systemeD/potlatch2/RelationEditorPanel.mxml
net/systemeD/potlatch2/RelationLoaderPanel.mxml
net/systemeD/potlatch2/RelationSelectPanel.mxml
net/systemeD/potlatch2/StyleSelector.mxml
net/systemeD/potlatch2/TagGrid.mxml
net/systemeD/potlatch2/TagViewer.mxml
net/systemeD/potlatch2/Toolbox.mxml
net/systemeD/potlatch2/VectorSourceDialog.mxml
net/systemeD/potlatch2/find/FindDialog.mxml
net/systemeD/potlatch2/help/HelpDialog.mxml
net/systemeD/potlatch2/help/VideoPlayer.mxml
net/systemeD/potlatch2/mapfeatures/editors/CheckboxEditor.mxml
net/systemeD/potlatch2/mapfeatures/editors/ChoiceEditor.mxml
net/systemeD/potlatch2/mapfeatures/editors/FreeTextEditor.mxml
net/systemeD/potlatch2/mapfeatures/editors/NumberEditor.mxml
net/systemeD/potlatch2/mapfeatures/editors/RestrictionRenderer.mxml
net/systemeD/potlatch2/mapfeatures/editors/RouteEditor.mxml
net/systemeD/potlatch2/mapfeatures/editors/RouteIcon.mxml
net/systemeD/potlatch2/mapfeatures/editors/SliderEditor.mxml
net/systemeD/potlatch2/mapfeatures/editors/SpeedEditor.mxml
net/systemeD/potlatch2/mapfeatures/editors/TurnRestrictionEditor.mxml
net/systemeD/potlatch2/mapfeatures/editors/TurnRestrictionIcon.mxml
net/systemeD/potlatch2/mapfeatures/editors/TurnRestrictionRenderer.mxml
net/systemeD/potlatch2/mygpx/MyGpxDialog.mxml
net/systemeD/potlatch2/options/OptionsDialog.mxml
net/systemeD/potlatch2/panels/BackgroundPanel.mxml
net/systemeD/potlatch2/panels/BugPanel.mxml
net/systemeD/potlatch2/panels/MarkerPanel.mxml
net/systemeD/potlatch2/save/OAuthPanel.mxml
net/systemeD/potlatch2/save/SaveDialog.mxml
potlatch2.mxml

index 6b35c7f..4c21149 100644 (file)
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <mx:TitleWindow
-        xmlns:mx="http://www.adobe.com/2006/mxml" 
+        xmlns:fx="http://ns.adobe.com/mxml/2009"
+        xmlns:mx="library://ns.adobe.com/flex/mx"
         layout="vertical" showCloseButton="true"
         horizontalAlign="center" 
         width="500" height="300" verticalGap="0">
         <mx:DataGridColumn editable="true"  dataField="url" headerText="URL"/>
         <mx:DataGridColumn editable="false" headerText="Key" width="70">
                        <mx:itemRenderer>
-                               <mx:Component>
+                               <fx:Component>
                                <mx:ComboBox
                                        selectedItem="{FunctionKeyManager.instance().getKeyFor(outerDocument.title,data.name)}"
                                    dataProvider="{FunctionKeyManager.fkeysCollection}"
                                        change="FunctionKeyManager.instance().setKeyFromFString(selectedItem as String,outerDocument.title,data.name)" />
-                               </mx:Component>
+                               </fx:Component>
                        </mx:itemRenderer>
                </mx:DataGridColumn>
     </mx:columns>
@@ -27,7 +28,7 @@
     <mx:LinkButton label="Add" click="addNewSource()"/>
   </mx:HBox>
 
-  <mx:Script><![CDATA[
+  <fx:Script><![CDATA[
 
        /*
                Still to do:
@@ -80,6 +81,6 @@
        }
 
   ]]>
-  </mx:Script>
+  </fx:Script>
 
 </mx:TitleWindow>
index cc4c116..cb65eb6 100644 (file)
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <mx:VBox
-       xmlns:mx="http://www.adobe.com/2006/mxml"
+       xmlns:fx="http://ns.adobe.com/mxml/2009"
+       xmlns:mx="library://ns.adobe.com/flex/mx"
        paddingTop="10" paddingLeft="10" paddingRight="10" paddingBottom="10"
        horizontalAlign="left" backgroundColor="white" borderStyle="inset">
        
@@ -21,7 +22,7 @@
        <mx:Button label="Vector file..." click="FlexGlobals.topLevelApplication.bgButton.close(); new VectorSourceDialog().init();" />
        </mx:HBox>
 
-       <mx:Script><![CDATA[
+       <fx:Script><![CDATA[
 
                import net.systemeD.halcyon.*;
                import net.systemeD.halcyon.connection.*;
@@ -44,6 +45,6 @@
                        obj.setProperty('background_sharpen',v);
                        obj.flush();
                }
-    ]]></mx:Script>    
+    ]]></fx:Script>
 </mx:VBox>
 
index fbee981..893b5a8 100644 (file)
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <mx:VBox
-       xmlns:mx="http://www.adobe.com/2006/mxml"
+       xmlns:fx="http://ns.adobe.com/mxml/2009"
+       xmlns:mx="library://ns.adobe.com/flex/mx"
        xmlns:halcyon="net.systemeD.halcyon.*"
        backgroundColor="white" borderStyle="inset">
 
                        width="420" height="100%" change="itemSelected(event);" styleName="catToggleTiles"
                        creationComplete="ensureSelection();">
               <mx:itemRenderer>
-                  <mx:Component>
+                  <fx:Component>
                       <mx:VBox width="100" height="75"
                           horizontalScrollPolicy="off" verticalScrollPolicy="off"
                           horizontalAlign="center" verticalGap="0" toolTip="{data.description}">
                           <mx:Image source="{data.image}" height="100%" verticalAlign="middle"/>
                           <mx:Text text="{data.name}"/>
                       </mx:VBox>
-                  </mx:Component>
+                  </fx:Component>
               </mx:itemRenderer>
           </mx:TileList>
           </mx:VBox>
@@ -31,7 +32,7 @@
   </mx:HBox>
 
   <!-- mx:Label id="hoverInfo" text="Hover Info goes here"/>-->
-  <mx:Script><![CDATA[
+  <fx:Script><![CDATA[
 
 
       import net.systemeD.halcyon.connection.*;
           settingSelection = false;
       }
 
-  ]]></mx:Script>
+  ]]></fx:Script>
 </mx:VBox>
 
index 1f33cfe..1fd6b53 100644 (file)
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <mx:TitleWindow
-       xmlns:mx="http://www.adobe.com/2006/mxml"
+       xmlns:fx="http://ns.adobe.com/mxml/2009"
+       xmlns:mx="library://ns.adobe.com/flex/mx"
        xmlns:potlatch2="net.systemeD.potlatch2.*"
        title="Edit Relation" width="350" height="400"
        showCloseButton="true" close="PopUpManager.removePopUp(this);">
@@ -8,7 +9,7 @@
        <potlatch2:TagViewer width="100%" height="100%" id="tagViewer"
            creationComplete="checkRelation()"/>
        
-       <mx:Script><![CDATA[
+       <fx:Script><![CDATA[
                import net.systemeD.halcyon.*;
                import net.systemeD.halcyon.connection.*;
                import net.systemeD.potlatch2.*;
@@ -26,6 +27,6 @@
             if ( _relation != null )
                 tagViewer.setEntity([_relation]);
         }
-    ]]></mx:Script>    
+    ]]></fx:Script>
 </mx:TitleWindow>
 
index 2a617a1..a0c6236 100644 (file)
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <mx:TitleWindow
-       xmlns:mx="http://www.adobe.com/2006/mxml"
+       xmlns:fx="http://ns.adobe.com/mxml/2009"
+       xmlns:mx="library://ns.adobe.com/flex/mx"
        xmlns:potlatch2="net.systemeD.potlatch2.*"
        title="Load Relation" width="350" height="160"
        creationComplete="requestedID.setFocus()"
@@ -14,7 +15,7 @@
       <mx:Spacer width="100%"/>
       <mx:Button label="Load" click="loadRelation();" styleName="titleWindowButton" />
     </mx:ControlBar>
-       <mx:Script><![CDATA[
+       <fx:Script><![CDATA[
                import net.systemeD.halcyon.*;
                import net.systemeD.halcyon.connection.*;
                import net.systemeD.potlatch2.*;
@@ -60,6 +61,6 @@
                        MainUndoStack.getGlobalStack().addAction(undo);
                }
                
-    ]]></mx:Script>    
+    ]]></fx:Script>
 </mx:TitleWindow>
 
index a3af4dc..e626f4f 100644 (file)
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <mx:TitleWindow
-    xmlns:mx="http://www.adobe.com/2006/mxml"
+    xmlns:fx="http://ns.adobe.com/mxml/2009"
+    xmlns:mx="library://ns.adobe.com/flex/mx"
     xmlns:potlatch2="net.systemeD.potlatch2.*"
     title="Select Relation" width="350" height="400"
     showCloseButton="true" close="PopUpManager.removePopUp(this);">
 
-    <mx:Script><![CDATA[
+    <fx:Script><![CDATA[
         import net.systemeD.halcyon.*;
         import net.systemeD.halcyon.connection.*;
         import net.systemeD.potlatch2.*;
@@ -90,7 +91,7 @@
                        PopUpManager.centerPopUp(panel);
                }
         
-    ]]></mx:Script> 
+    ]]></fx:Script>
     <mx:Text id="warning" text="" />
     <mx:List width="100%" height="100%" id="relationSelector" verticalScrollPolicy="on" allowMultipleSelection="true" > 
     </mx:List>
index 6d5b0d2..7ac5c6b 100644 (file)
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <mx:VBox
-       xmlns:mx="http://www.adobe.com/2006/mxml"
+       xmlns:fx="http://ns.adobe.com/mxml/2009"
+       xmlns:mx="library://ns.adobe.com/flex/mx"
        paddingTop="10" paddingLeft="10" paddingRight="10" paddingBottom="10"
        horizontalAlign="left" backgroundColor="white" borderStyle="inset">
        
 
        <mx:Button label="Edit..." click="FlexGlobals.topLevelApplication.styleButton.close(); new BackgroundDialog().init('Map style',mapStyle,Stylesheets.instance());" />
 
-       <mx:Script><![CDATA[
+       <fx:Script><![CDATA[
                import net.systemeD.halcyon.*;
                import net.systemeD.halcyon.connection.*;
                import net.systemeD.potlatch2.*;
                import net.systemeD.potlatch2.collections.Stylesheets;
                import mx.core.*;
-    ]]></mx:Script>    
+    ]]></fx:Script>
 </mx:VBox>
 
index 17b8615..0f6614d 100644 (file)
@@ -5,15 +5,16 @@
 -->
 
 <mx:DataGrid editable="true" doubleClickEnabled="true" doubleClick="addNewTag()"
+    xmlns:fx="http://ns.adobe.com/mxml/2009"
        xmlns:controls="net.systemeD.controls.*"
-       xmlns:mx="http://www.adobe.com/2006/mxml">
+       xmlns:mx="library://ns.adobe.com/flex/mx">
        <mx:columns>
 
                <!-- Key -->
 
                <mx:DataGridColumn editable="true" dataField="key" headerText="Key">
                        <mx:itemEditor>
-                               <mx:Component>
+                               <fx:Component>
                                        <controls:AutoComplete
                                                dataProvider="{MapFeatures.getInstance().getAutoCompleteKeys(outerDocument.getEntityType())}"
                                                labelField="name"
@@ -21,9 +22,9 @@
                                                restrict="&#x0020;-&#x10FFFF;"
                                                maxChars="255" 
                                                typedText="{outerDocument.selectedItem.key}">
-                                       <mx:Script><![CDATA[ import net.systemeD.potlatch2.mapfeatures.*; ]]></mx:Script>
+                                       <fx:Script><![CDATA[ import net.systemeD.potlatch2.mapfeatures.*; ]]></fx:Script>
                                        </controls:AutoComplete>
-                               </mx:Component>
+                               </fx:Component>
                        </mx:itemEditor>
                </mx:DataGridColumn>
 
@@ -31,7 +32,7 @@
 
                <mx:DataGridColumn editable="true" dataField="value" headerText="Value" itemRenderer="net.systemeD.controls.DataGridWarningField" >
                        <mx:itemEditor>
-                               <mx:Component>
+                               <fx:Component>
                                        <controls:AutoComplete
                                                dataProvider="{MapFeatures.getInstance().getAutoCompleteValues(outerDocument.getEntityType(),outerDocument.selectedItem.key)}"
                                                labelField="name"
@@ -39,9 +40,9 @@
                                                restrict="&#x0020;-&#x10FFFF;"
                                                maxChars="255" 
                                                typedText="{outerDocument.selectedItem.value}">
-                                       <mx:Script><![CDATA[ import net.systemeD.potlatch2.mapfeatures.*; ]]></mx:Script>
+                                       <fx:Script><![CDATA[ import net.systemeD.potlatch2.mapfeatures.*; ]]></fx:Script>
                                        </controls:AutoComplete>
-                               </mx:Component>
+                               </fx:Component>
                        </mx:itemEditor>
                </mx:DataGridColumn>
 
 
                <mx:DataGridColumn width="20" editable="false">
                        <mx:itemRenderer>
-                               <mx:Component>
+                               <fx:Component>
                     <mx:HBox horizontalAlign="center" verticalAlign="middle">
                       <mx:Image source="@Embed('../../../embedded/delete_small.svg')"
                           click='event.stopPropagation();outerDocument.removeTag();'
                           buttonMode="true" useHandCursor="true" width="12" height="12">
                       </mx:Image>
                                        </mx:HBox>
-                               </mx:Component>
+                               </fx:Component>
                        </mx:itemRenderer>
                </mx:DataGridColumn>
        </mx:columns>
 
-       <mx:Script><![CDATA[
+       <fx:Script><![CDATA[
 
                import net.systemeD.halcyon.connection.*;
                import mx.collections.*;
                        return selectedEntity.getType();
                }
 
-       ]]></mx:Script>
+       ]]></fx:Script>
 </mx:DataGrid>
index 0329ecf..ec36a12 100644 (file)
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <mx:VBox
-       xmlns:mx="http://www.adobe.com/2006/mxml"
+    xmlns:fx="http://ns.adobe.com/mxml/2009"
+       xmlns:mx="library://ns.adobe.com/flex/mx"
        xmlns:flexlib="flexlib.containers.*"
        xmlns:controls="net.systemeD.controls.*"
        xmlns:potlatch2="net.systemeD.potlatch2.*"
@@ -23,9 +24,9 @@
                <mx:TileList dataProvider="{dndRep.currentItem.getFeaturesForType('point', true)}" width="100%" height="1"
                                     rowHeight="32" columnWidth="32" updateComplete="resizePOIGrid(event)" styleName="dndPanelTileList">
                        <mx:itemRenderer>
-                               <mx:Component>
+                               <fx:Component>
                                        <mx:VBox toolTip="{data.name}">
-                                               <mx:Script><![CDATA[
+                                               <fx:Script><![CDATA[
                                                        import mx.events.DragEvent;
                                                        import mx.managers.DragManager;
                                                        import mx.core.DragSource;
                                                                dragProxy.height = dragInitiator.height; // for non-embedded images
                                                                DragManager.doDrag(dragInitiator, dragSource, event, dragProxy);
                                                        }
-                                               ]]></mx:Script>
+                                               ]]></fx:Script>
                                                <mx:Image id="foo" source="{data.dndimage}" height="24" width="24" mouseMove="dragPOI(event, data.tags)" toolTip="{data.name}" />
                                        </mx:VBox>
-                               </mx:Component>
+                               </fx:Component>
                        </mx:itemRenderer>
                </mx:TileList>
        </mx:Repeater>
                 <mx:DataGridColumn editable="false" dataField="description" headerText="Relation"/>
                 <mx:DataGridColumn editable="false" dataField="id_idx" headerText="ID"/>
                 <mx:DataGridColumn editable="true" dataField="role" headerText="Role">
-                    <mx:itemEditor><mx:Component><mx:TextInput restrict="&#x0020;-&#x10FFFF;" /></mx:Component></mx:itemEditor>
+                    <mx:itemEditor><fx:Component><mx:TextInput restrict="&#x0020;-&#x10FFFF;" /></fx:Component></mx:itemEditor>
                 </mx:DataGridColumn>
                                <mx:DataGridColumn width="20" editable="false">
                                        <mx:itemRenderer>
-                                               <mx:Component>
+                                               <fx:Component>
                                    <mx:HBox horizontalAlign="center" verticalAlign="middle">
                                                                <mx:PopUpButton arrowButtonWidth="12" paddingLeft="0" paddingRight="0" width="12" height="12" 
                                                                                open="{outerDocument.updateRelationMenu(event);}" 
                                                                                creationComplete="{outerDocument.createRelationMenu(PopUpButton(event.target));}"/>
                                                        </mx:HBox>
-                                               </mx:Component>
+                                               </fx:Component>
                                        </mx:itemRenderer>
                                </mx:DataGridColumn>
             </mx:columns>
             <mx:DataGridColumn editable="false" dataField="type" headerText="Type"/>
             <mx:DataGridColumn editable="false" dataField="id" headerText="ID"/>
             <mx:DataGridColumn editable="true" dataField="role" headerText="Role">
-                               <mx:itemEditor><mx:Component><mx:TextInput restrict="&#x0020;-&#x10FFFF;" /></mx:Component></mx:itemEditor>
+                               <mx:itemEditor><fx:Component><mx:TextInput restrict="&#x0020;-&#x10FFFF;" /></fx:Component></mx:itemEditor>
                        </mx:DataGridColumn>
           </mx:columns>
         </mx:DataGrid>
             <mx:DataGridColumn editable="false" dataField="description" headerText="Relation"/>
             <mx:DataGridColumn editable="false" dataField="id_idx" headerText="ID"/>
             <mx:DataGridColumn editable="true" dataField="role" headerText="Role">
-                <mx:itemEditor><mx:Component><mx:TextInput restrict="&#x0020;-&#x10FFFF;" /></mx:Component></mx:itemEditor>
+                <mx:itemEditor><fx:Component><mx:TextInput restrict="&#x0020;-&#x10FFFF;" /></fx:Component></mx:itemEditor>
             </mx:DataGridColumn>
                        <mx:DataGridColumn width="20" editable="false">
                                <mx:itemRenderer>
-                                       <mx:Component>
+                                       <fx:Component>
                            <mx:HBox horizontalAlign="center" verticalAlign="middle">
                                                        <mx:PopUpButton arrowButtonWidth="12" paddingLeft="0" paddingRight="0" width="12" height="12" 
                                                                        open="{outerDocument.updateRelationMenu(event);}" 
                                                                        creationComplete="{outerDocument.createRelationMenu(PopUpButton(event.target));}"/>
                                                </mx:HBox>
-                                       </mx:Component>
+                                       </fx:Component>
                                </mx:itemRenderer>
                        </mx:DataGridColumn>
         </mx:columns>
 
 </mx:ViewStack>
 
-  <mx:Script><![CDATA[
+  <fx:Script><![CDATA[
       import net.systemeD.halcyon.connection.*;
       import net.systemeD.halcyon.MapPaint;
       import net.systemeD.potlatch2.mapfeatures.*;
                if (rows!=Math.floor(rows)) { rows=Math.floor(rows+1); }
                event.target.height=rows*(event.target.rowHeight+1);
        }
-  ]]></mx:Script>
+  ]]></fx:Script>
 </mx:VBox>
 
index dcb05c3..39e7e38 100644 (file)
@@ -1,14 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <mx:Panel
-       xmlns:mx="http://www.adobe.com/2006/mxml"
+    xmlns:fx="http://ns.adobe.com/mxml/2009"
+       xmlns:mx="library://ns.adobe.com/flex/mx"
        xmlns:potlatch2="net.systemeD.potlatch2.*"
        height="76" width="129" layout="absolute"
        styleName="theToolBox">
 
+        <fx:Declarations>
         <!-- the animation effect that controls the rotation of the reverse arrow.
               We could get more fancy by using previous angle in angleFrom, and a longer duration, to give a nice animated effect -->
         <mx:Rotate id="rotate" angleFrom="{angle-1}" angleTo="{angle}" target="{arrowBox}" originX="{arrowBox.width/2}" originY="{arrowBox.height/2}" duration="4"/>
-
+        </fx:Declarations>
 
                <mx:Image data="@Embed('../../../embedded/close_small.png')"
                        includeInLayout="false" id="toolboxClose" click="toggle();" 
@@ -94,7 +96,7 @@
                        toolTip="Create parallel way (P)" 
                        width="28" height="28" textAlign="left" y="34" x="96" paddingLeft="8" paddingRight="0" />
 
-       <mx:Script><![CDATA[
+       <fx:Script><![CDATA[
 
                import flash.events.Event;
                import flash.events.MouseEvent;
 
 
        ]]>
-</mx:Script>   
+</fx:Script>
 </mx:Panel>
index 046bc94..9013310 100644 (file)
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <mx:TitleWindow
-        xmlns:mx="http://www.adobe.com/2006/mxml" 
+        xmlns:fx="http://ns.adobe.com/mxml/2009"
+        xmlns:mx="library://ns.adobe.com/flex/mx"
         layout="vertical" showCloseButton="true"
         horizontalAlign="center" title="Load vector file"
         width="500" height="350" verticalGap="0">
            <mx:columns>
                <mx:DataGridColumn editable="false" dataField="visible" headerText="Show?" width="45">
                                <mx:itemRenderer>
-                                       <mx:Component>
+                                       <fx:Component>
                                                <mx:CheckBox selectedField="isSelected"
                                                                         click="data.isSelected=!data.isSelected; this.parent.parent.dispatchEvent(new Event('visibility_changed'));" 
                                                                         paddingLeft="5"/>
-                                       </mx:Component>
+                                       </fx:Component>
                                </mx:itemRenderer>
                        </mx:DataGridColumn>
                <mx:DataGridColumn editable="false" dataField="interactive" headerText="Select?" width="45">
                                        <!-- There should really be a way to hide this for the editable layer. See
                                             http://stackoverflow.com/questions/6329895/how-do-i-change-the-style-of-one-individual-cell-in-a-flex-datagrid 
                                             Leave it as a FIXME until we move to Flex 4 -->
-                                       <mx:Component>
+                                       <fx:Component>
                                                <mx:CheckBox selectedField="isInteractive"
                                                                         click="data.isInteractive=!data.isInteractive; this.parent.parent.dispatchEvent(new Event('interactive_changed'));" 
                                                             paddingLeft="5"/>
-                                       </mx:Component>
+                                       </fx:Component>
                                </mx:itemRenderer>
                        </mx:DataGridColumn>
                <mx:DataGridColumn editable="true"  dataField="name"  headerText="Name"/>
                <mx:DataGridColumn editable="false" dataField="url"   headerText="URL"/>
                <mx:DataGridColumn editable="false" dataField="style" headerText="Style">
                                <mx:itemRenderer>
-                                       <mx:Component>
+                                       <fx:Component>
                                        <mx:ComboBox
                                                        selectedItem="{outerDocument.whichStyle(data)}"
                                                change="outerDocument.styleEdited(data.name,selectedItem.url)"
                                                dataProvider="{outerDocument.styles}" 
                                                        labelField="name" />
-                                       </mx:Component>
+                                       </fx:Component>
                                </mx:itemRenderer>
                        </mx:DataGridColumn>
            </mx:columns>
@@ -61,9 +62,9 @@
                        <mx:Label text="Shapefile projection:" />
                        <mx:ComboBox id="projection"> 
                                <mx:ArrayCollection>
-                                       <mx:Object label="Lat/long" data="" />
-                                       <mx:Object label="Ordnance Survey GB" data="EPSG:27700" />
-                                       <mx:Object label="NAD83" data="EPSG:4269" />
+                                       <fx:Object label="Lat/long" data="" />
+                                       <fx:Object label="Ordnance Survey GB" data="EPSG:27700" />
+                                       <fx:Object label="NAD83" data="EPSG:4269" />
                                </mx:ArrayCollection>
                        </mx:ComboBox>
                        <mx:CheckBox width="100%" label="Simplify paths" selected="true" id="simplify" />
@@ -75,7 +76,7 @@
                </mx:HBox>
        </mx:VBox>
 
-  <mx:Script><![CDATA[
+  <fx:Script><![CDATA[
 
        import net.systemeD.halcyon.Map;
        import net.systemeD.halcyon.MapPaint;
        }
 
               ]]>
-  </mx:Script>
+  </fx:Script>
 </mx:TitleWindow>
index c19ff64..1faf0bb 100644 (file)
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <mx:TitleWindow
-       xmlns:mx="http://www.adobe.com/2006/mxml" 
+       xmlns:fx="http://ns.adobe.com/mxml/2009"
+       xmlns:mx="library://ns.adobe.com/flex/mx"
        layout="vertical" showCloseButton="true"
        horizontalAlign="center" title="Search"
        width="458" height="350" verticalGap="0" creationComplete="txtFind.setFocus()">
-       <mx:Script><![CDATA[
+       <fx:Script><![CDATA[
         import flash.events.Event;
                import mx.core.Application;
                import mx.core.FlexGlobals;
@@ -83,7 +84,7 @@
         
         
        ]]>
-       </mx:Script>
+       </fx:Script>
 
        <mx:HBox horizontalAlign="left" width="100%">
                <mx:Label text="Enter place name: " />
index 02c4665..91437be 100644 (file)
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <mx:TitleWindow
-        xmlns:mx="http://www.adobe.com/2006/mxml"
+        xmlns:fx="http://ns.adobe.com/mxml/2009"
+        xmlns:mx="library://ns.adobe.com/flex/mx"
         xmlns:help="net.systemeD.potlatch2.help.*"
         layout="vertical" showCloseButton="true"
         horizontalAlign="center" title="{getTitleText()}"
         width="660" height="500"
         verticalGap="0">
-  <mx:Script><![CDATA[
+  <fx:Script><![CDATA[
     import mx.managers.PopUpManager;
     import mx.events.CloseEvent;
     import mx.core.Application;
     }
 
               ]]>
-  </mx:Script>
+  </fx:Script>
   <mx:TabNavigator id="helpTN" width="100%" height="100%" styleName="helpTN" creationPolicy="all">
     <mx:VBox label="Welcome" id="welcome" width="100%" height="100%">
       <mx:Grid width="100%"><!-- prepare for a column of icons, at some point -->
index 47da5a0..0a1b08e 100644 (file)
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<mx:VBox xmlns:mx="http://www.adobe.com/2006/mxml" verticalGap="0">
+<mx:VBox
+    xmlns:fx="http://ns.adobe.com/mxml/2009"
+    xmlns:mx="library://ns.adobe.com/flex/mx"
+    verticalGap="0">
        <mx:ViewStack id="videoStack" width="100%" height="100%">
                <mx:Box id="previewContainer">
                        <mx:Image id="preview" width="100%" height="100%" source="{previewImage}" 
@@ -22,7 +25,7 @@
                        thumbRelease="progressThumbRelease(event);" />
        </mx:HBox> 
 
-       <mx:Script> 
+       <fx:Script>
                <![CDATA[ 
 
                        /** VideoPlayer component for P2 help dialog.
@@ -82,5 +85,5 @@
                        }
 
                ]]> 
-       </mx:Script>
+       </fx:Script>
 </mx:VBox>
index 007f634..66b997b 100644 (file)
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <edit:SingleTagEditor
-       xmlns:mx="http://www.adobe.com/2006/mxml" 
+       xmlns:fx="http://ns.adobe.com/mxml/2009"
+       xmlns:mx="library://ns.adobe.com/flex/mx"
        xmlns:edit="net.systemeD.potlatch2.mapfeatures.editors.*"
        xmlns:flexlib="flexlib.controls.*"
        verticalGap="0"
@@ -13,7 +14,7 @@
                                 labelPlacement="right" label=""
                                 change="value=toYesNo()" />
 
-  <mx:Script><![CDATA[
+  <fx:Script><![CDATA[
   
        protected function initCheckbox():void {
                // ** FIXME - these should really be bindings (selected="{...}"). 
@@ -44,6 +45,6 @@
                return inputBox.selected ? 'yes':'no';
        }
        
-  ]]></mx:Script>
+  ]]></fx:Script>
 </edit:SingleTagEditor>
 
index e75eb5e..9198211 100644 (file)
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <edit:SingleTagEditor
-       xmlns:mx="http://www.adobe.com/2006/mxml" 
+       xmlns:fx="http://ns.adobe.com/mxml/2009"
+       xmlns:mx="library://ns.adobe.com/flex/mx"
        xmlns:edit="net.systemeD.potlatch2.mapfeatures.editors.*"
        toolTip="{fieldDescription}"
     direction="{fieldDirection}" styleName="titledEditor">
       change="value = inputBox.selectedItem.value"
       open="inputBox.dropdown.variableRowHeight = true">
       <edit:itemRenderer>
-        <mx:Component>
+        <fx:Component>
         <mx:HBox toolTip="{data.description}" horizontalScrollPolicy="off">
           <mx:Image source="{Choice(data).icon}"/>
           <mx:Label htmlText="{data.label}"/>
         </mx:HBox>
-        </mx:Component>
+        </fx:Component>
       </edit:itemRenderer>
   </edit:ChoiceComboBox>
 
-  <mx:Script><![CDATA[
+  <fx:Script><![CDATA[
       import mx.collections.*;
       import mx.utils.*;
       import net.systemeD.potlatch2.mapfeatures.Feature;
@@ -67,6 +68,6 @@
           choice.value = null;
           return choice;
       }
-  ]]></mx:Script>
+  ]]></fx:Script>
 </edit:SingleTagEditor>
 
index a7b142e..08ed76e 100644 (file)
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <edit:SingleTagEditor
-       xmlns:mx="http://www.adobe.com/2006/mxml" 
+       xmlns:fx="http://ns.adobe.com/mxml/2009"
+       xmlns:mx="library://ns.adobe.com/flex/mx"
        xmlns:edit="net.systemeD.potlatch2.mapfeatures.editors.*"
        xmlns:flexlib="flexlib.controls.*"
        xmlns:controls="net.systemeD.controls.*"
       focusOut="value = inputBox.text" enter="value = inputBox.text"
       restrict="&#x0020;-&#x10FFFF;" />
 
-  <mx:Script><![CDATA[
+  <fx:Script><![CDATA[
   
       [Bindable(event="factory_set")]
       protected function get prompt():String {
           return _factory == null ? null : FreeTextEditorFactory(_factory).notPresentText;
       }
       
-  ]]></mx:Script>
+  ]]></fx:Script>
 </edit:SingleTagEditor>
 
index e35e419..ecf8761 100644 (file)
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <edit:SingleTagEditor
-       xmlns:mx="http://www.adobe.com/2006/mxml" 
+       xmlns:fx="http://ns.adobe.com/mxml/2009"
+       xmlns:mx="library://ns.adobe.com/flex/mx"
        xmlns:edit="net.systemeD.potlatch2.mapfeatures.editors.*"
        xmlns:flexlib="flexlib.controls.*"
        verticalGap="0"
@@ -22,7 +23,7 @@
         <mx:Label text="{warning}" visible="{!isValueValid}" includeInLayout="{!isValueValid}" styleName="warningText" />
     </mx:HBox>
 
-  <mx:Script><![CDATA[
+  <fx:Script><![CDATA[
     [Bindable(event="factory_set")]
     protected function get prompt():String {
         return _factory == null ? null : NumberEditorFactory(_factory).notPresentText;
@@ -81,6 +82,6 @@
         value = null;
     }
        
-  ]]></mx:Script>
+  ]]></fx:Script>
 </edit:SingleTagEditor>
 
index b075186..868e5ac 100644 (file)
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <mx:Canvas
-       xmlns:mx="http://www.adobe.com/2006/mxml" 
+       xmlns:fx="http://ns.adobe.com/mxml/2009"
+       xmlns:mx="library://ns.adobe.com/flex/mx"
        xmlns:edit="net.systemeD.potlatch2.mapfeatures.editors.*"
        width="50" height="50" maxWidth="50" maxHeight="50" minWidth="50" minHeight="50"
        toolTip="{data.description}" enabled="{data.value != null}"
index 9cfb7b7..cfd4a9c 100644 (file)
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <edit:RelationMemberEditor
-       xmlns:mx="http://www.adobe.com/2006/mxml" 
+       xmlns:fx="http://ns.adobe.com/mxml/2009"
+       xmlns:mx="library://ns.adobe.com/flex/mx"
        xmlns:edit="net.systemeD.potlatch2.mapfeatures.editors.*"
        xmlns:flexlib="flexlib.controls.*"
        verticalGap="0"
@@ -12,7 +13,7 @@
   <mx:VBox verticalGap="0" width="100%" id="routeIcons"/>
   <mx:LinkButton label="Add to a route" click="addToRelation()" />
 
-  <mx:Script><![CDATA[
+  <fx:Script><![CDATA[
     import net.systemeD.halcyon.connection.*;
     import net.systemeD.potlatch2.*;
     import mx.managers.PopUpManager;
@@ -42,6 +43,6 @@
                new RelationSelectPanel().init(_entity, _factory.relationTagPatterns);        
        }
     
-  ]]></mx:Script>
+  ]]></fx:Script>
 </edit:RelationMemberEditor>
 
index 7ab0003..1c07c09 100644 (file)
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <mx:HBox
-       xmlns:mx="http://www.adobe.com/2006/mxml" 
+       xmlns:fx="http://ns.adobe.com/mxml/2009"
+       xmlns:mx="library://ns.adobe.com/flex/mx"
        xmlns:edit="net.systemeD.potlatch2.mapfeatures.editors.*"
        xmlns:flexlib="flexlib.controls.*"
        borderStyle="inset" verticalAlign="middle" width="100%" paddingLeft="3"
@@ -14,7 +15,7 @@
        <mx:Image source="@Embed('../../../../../embedded/delete.svg')" click='event.stopPropagation();removeFromRelation()'
         buttonMode="true" useHandCursor="true" />
     
-    <mx:Script><![CDATA[
+    <fx:Script><![CDATA[
     import net.systemeD.halcyon.connection.*;
     import net.systemeD.halcyon.styleparser.RuleSet;
     import net.systemeD.potlatch2.mapfeatures.*;
@@ -97,6 +98,6 @@
                Relation(_route["relation"]).removeMember(_route["entity"], MainUndoStack.getGlobalStack().addAction);
        }
     
-    ]]></mx:Script>
+    ]]></fx:Script>
 </mx:HBox>
 
index 7b06ea4..e878850 100644 (file)
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <edit:SingleTagEditor
-       xmlns:mx="http://www.adobe.com/2006/mxml" 
+       xmlns:fx="http://ns.adobe.com/mxml/2009"
+       xmlns:mx="library://ns.adobe.com/flex/mx"
        xmlns:edit="net.systemeD.potlatch2.mapfeatures.editors.*"
        xmlns:flexlib="flexlib.controls.*"
        verticalGap="0"
@@ -18,7 +19,7 @@
                  liveDragging="true"
                                 change="setTagValueFromSlider()" />
 
-  <mx:Script><![CDATA[
+  <fx:Script><![CDATA[
 
     private function setTagValueFromSlider():void {
         // unset the tag if being set to the default
@@ -79,6 +80,6 @@
         return parsed;
     }
        
-  ]]></mx:Script>
+  ]]></fx:Script>
 </edit:SingleTagEditor>
 
index 4471672..de78016 100644 (file)
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <edit:SingleTagEditor
-       xmlns:mx="http://www.adobe.com/2006/mxml" 
+       xmlns:fx="http://ns.adobe.com/mxml/2009"
+       xmlns:mx="library://ns.adobe.com/flex/mx"
        xmlns:edit="net.systemeD.potlatch2.mapfeatures.editors.*"
        toolTip="{fieldDescription}"
        direction="horizontal" styleName="titledEditor">
@@ -14,7 +15,7 @@
       fontWeight="normal">
   </edit:ChoiceComboBox>
 
-  <mx:Script><![CDATA[
+  <fx:Script><![CDATA[
       import mx.collections.*;
       import mx.utils.*;
       import net.systemeD.potlatch2.mapfeatures.Feature;
@@ -65,6 +66,6 @@
           choice.value = null;
           return choice;
       }
-  ]]></mx:Script>
+  ]]></fx:Script>
 </edit:SingleTagEditor>
 
index 69b9702..27c7f2f 100644 (file)
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <edit:RelationMemberEditor
-       xmlns:mx="http://www.adobe.com/2006/mxml" 
+       xmlns:fx="http://ns.adobe.com/mxml/2009"
+       xmlns:mx="library://ns.adobe.com/flex/mx"
        xmlns:edit="net.systemeD.potlatch2.mapfeatures.editors.*"
        xmlns:flexlib="flexlib.controls.*"
        verticalGap="0"
@@ -12,7 +13,7 @@
   <mx:VBox verticalGap="0" width="100%" id="turnRestrictionIcons"/>
   <mx:LinkButton label="Add new turn restriction" click="addNewTurnRestriction()" />
 
-  <mx:Script><![CDATA[
+  <fx:Script><![CDATA[
        import net.systemeD.halcyon.connection.*;
        import net.systemeD.potlatch2.*;
        import mx.core.*;
@@ -37,6 +38,6 @@
                addTurnRestrictions();
        }
        
-  ]]></mx:Script>
+  ]]></fx:Script>
 </edit:RelationMemberEditor>
 
index 6e6b713..fd63252 100644 (file)
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <mx:HBox
-       xmlns:mx="http://www.adobe.com/2006/mxml" 
+       xmlns:fx="http://ns.adobe.com/mxml/2009"
+       xmlns:mx="library://ns.adobe.com/flex/mx"
        xmlns:edit="net.systemeD.potlatch2.mapfeatures.editors.*"
        xmlns:flexlib="flexlib.controls.*"
        horizontalScrollPolicy="off"
                                            dropdownWidth="162" rowCount="2"
                                            fontWeight="normal">
                                        <mx:ArrayCollection id="restrictionTypes">
-                                               <mx:Object label="No left turn" data='no_left_turn' />
-                                               <mx:Object label="No right turn" data='no_right_turn' />
-                                               <mx:Object label="No U turns" data='no_u_turn' />
-                                               <mx:Object label="No straight on" data='no_straight_on' />
-                                               <mx:Object label="Left turn only" data='only_left_turn' />
-                                               <mx:Object label="Right turn only" data='only_right_turn' />
-                                               <mx:Object label="Straight on only" data='only_straight_on' />
+                                               <fx:Object label="No left turn" data='no_left_turn' />
+                                               <fx:Object label="No right turn" data='no_right_turn' />
+                                               <fx:Object label="No U turns" data='no_u_turn' />
+                                               <fx:Object label="No straight on" data='no_straight_on' />
+                                               <fx:Object label="Left turn only" data='only_left_turn' />
+                                               <fx:Object label="Right turn only" data='only_right_turn' />
+                                               <fx:Object label="Straight on only" data='only_straight_on' />
                                        </mx:ArrayCollection>
                                </edit:ChoiceComboBox>
                                </mx:GridItem>
@@ -57,7 +58,7 @@
        </mx:HBox>
        </mx:VBox>
 
-    <mx:Script><![CDATA[
+    <fx:Script><![CDATA[
     import net.systemeD.halcyon.connection.*;
     import net.systemeD.halcyon.styleparser.RuleSet;
     import net.systemeD.potlatch2.RelationEditorPanel;
                var to:Object  =findSelected('to'  ); if (to  ) { paint.setHighlight(to.data  , { restrictto: bool   } ); }
        }
     
-    ]]></mx:Script>
+    ]]></fx:Script>
 </mx:HBox>
 
index 50bf477..7687a26 100644 (file)
@@ -1,13 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <mx:Canvas
-       xmlns:mx="http://www.adobe.com/2006/mxml" 
+       xmlns:fx="http://ns.adobe.com/mxml/2009"
+       xmlns:mx="library://ns.adobe.com/flex/mx"
        xmlns:edit="net.systemeD.potlatch2.mapfeatures.editors.*"
        width="40" height="40" maxWidth="40" maxHeight="40" minWidth="40" minHeight="40"
        mouseEnabled="false" mouseChildren="false">
 
        <mx:Image x="0" y="0" id="sign" left="4" top="4" source="{dataProxied.data ? 'features/restriction__'+dataProxied.data+'.png' : ''}" toolTip="{dataProxied.label}" />
 
-  <mx:Script><![CDATA[
+  <fx:Script><![CDATA[
 
        import mx.utils.ObjectProxy;
 
@@ -15,7 +16,7 @@
                return new ObjectProxy(data);
        }
 
-  ]]></mx:Script>
+  ]]></fx:Script>
        
 </mx:Canvas>
 
index aef8e62..ec57b37 100644 (file)
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <mx:TitleWindow
-        xmlns:mx="http://www.adobe.com/2006/mxml"
+        xmlns:fx="http://ns.adobe.com/mxml/2009"
+        xmlns:mx="library://ns.adobe.com/flex/mx"
         layout="vertical" showCloseButton="true"
         horizontalAlign="center" title="MyGpx Files"
         width="600" height="400"
         verticalGap="0">
-  <mx:Script><![CDATA[
+  <fx:Script><![CDATA[
     import mx.managers.PopUpManager;
     import mx.events.CloseEvent;
     import mx.core.Application;
@@ -67,7 +68,7 @@
         }
     }
               ]]>
-  </mx:Script>
+  </fx:Script>
 
   <mx:Text text="Traces" id="results" />
   <mx:DataGrid dataProvider="{traces}" width="100%" height="100%" id="traceGrid">
             <mx:DataGridColumn editable="false" dataField="tagsText" headerText="tags"/>
             <mx:DataGridColumn editable="false">
               <mx:itemRenderer>
-                <mx:Component>
+                <fx:Component>
                   <mx:VBox>
                     <mx:Button label="Load"
                       click="parentDocument.loadFile(data)"/>
                   </mx:VBox>
-                </mx:Component>
+                </fx:Component>
               </mx:itemRenderer>
             </mx:DataGridColumn>
     </mx:columns>
index 62233a4..28a092c 100644 (file)
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <mx:TitleWindow
-        xmlns:mx="http://www.adobe.com/2006/mxml" 
+        xmlns:fx="http://ns.adobe.com/mxml/2009"
+        xmlns:mx="library://ns.adobe.com/flex/mx"
         layout="vertical" showCloseButton="true"
         horizontalAlign="center" title="Options"
         width="350" height="250" verticalGap="0">
-  <mx:Script><![CDATA[
+  <fx:Script><![CDATA[
     import mx.managers.PopUpManager;
     import mx.events.CloseEvent;
     import mx.core.Application;
@@ -54,7 +55,7 @@
        }
 
               ]]>
-  </mx:Script>
+  </fx:Script>
        <mx:CheckBox width="100%" label="Show toolbox" selected="true" id="tbcheck"
            change="FlexGlobals.topLevelApplication.toolbox.toggle()" />
 
index 982feb2..9030a8b 100644 (file)
@@ -4,7 +4,10 @@
     Background Panel
 -->
 
-<mx:VBox xmlns:mx="http://www.adobe.com/2006/mxml" height="100%">
+<mx:VBox
+    xmlns:fx="http://ns.adobe.com/mxml/2009"
+    xmlns:mx="library://ns.adobe.com/flex/mx"
+    height="100%">
   <mx:Text id="backgroundPanelText" text="You have selected a Background Feature." width="100%" styleName="helpInfo" />
   <mx:DataGrid editable="false" id="backgroundPanelDG" width="100%" height="50%">
     <mx:columns>
@@ -14,7 +17,7 @@
   </mx:DataGrid>
   <mx:Text text="All the data copied to the main layer? Click 'complete'!" />
   <mx:Button label="Complete" click="markComplete()"/>
-  <mx:Script><![CDATA[
+  <fx:Script><![CDATA[
 
       import net.systemeD.halcyon.connection.*;
       import net.systemeD.halcyon.MapPaint;
@@ -50,5 +53,5 @@
             }
       }
       ]]>
-  </mx:Script>
+  </fx:Script>
 </mx:VBox>
\ No newline at end of file
index 0f606d2..c13b496 100644 (file)
@@ -4,7 +4,11 @@
     Bug Panel
 -->
 
-<mx:VBox xmlns:mx="http://www.adobe.com/2006/mxml" height="100%" paddingTop="10">
+<mx:VBox
+    xmlns:fx="http://ns.adobe.com/mxml/2009"
+    xmlns:mx="library://ns.adobe.com/flex/mx"
+    height="100%"
+    paddingTop="10">
   <mx:HBox>
     <mx:Image source="{bugImage}" width="32" height="32" />
     <mx:Text text="{bugTitle}" fontWeight="bold" fontSize="18" />
@@ -56,7 +60,7 @@
     </mx:VBox>
   </mx:ViewStack>
 
-  <mx:Script><![CDATA[
+  <fx:Script><![CDATA[
 
       import net.systemeD.halcyon.connection.*;
       import net.systemeD.potlatch2.BugConnection;
       }
 
       ]]>
-  </mx:Script>
+  </fx:Script>
 </mx:VBox>
\ No newline at end of file
index 2ab42b3..3a42b75 100644 (file)
@@ -4,7 +4,10 @@
     Marker Panel
 -->
 
-<mx:VBox xmlns:mx="http://www.adobe.com/2006/mxml" height="100%">
+<mx:VBox
+    xmlns:fx="http://ns.adobe.com/mxml/2009"
+    xmlns:mx="library://ns.adobe.com/flex/mx"
+    height="100%">
   <mx:Text id="markerPanelText" text="You have selected a marker." width="100%" styleName="helpInfo" />
   <mx:DataGrid editable="false" id="markerPanelDG" width="100%" height="50%">
     <mx:columns>
@@ -12,7 +15,7 @@
       <mx:DataGridColumn editable="false" dataField="value" headerText="value" />
     </mx:columns>
   </mx:DataGrid>
-  <mx:Script><![CDATA[
+  <fx:Script><![CDATA[
 
       import net.systemeD.halcyon.connection.*;
       import net.systemeD.halcyon.MapPaint;
@@ -41,5 +44,5 @@
             for each(var tag:Tag in tags) { tagDataProvider.addItem(tag); }
       }
       ]]>
-  </mx:Script>
+  </fx:Script>
 </mx:VBox>
\ No newline at end of file
index f972f92..cf5f663 100644 (file)
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <mx:TitleWindow
-       xmlns:mx="http://www.adobe.com/2006/mxml" 
+    xmlns:fx="http://ns.adobe.com/mxml/2009"
+       xmlns:mx="library://ns.adobe.com/flex/mx"
        layout="vertical"
        horizontalAlign="center" title="Authorisation Required"
        creationComplete="getRequestToken()"
@@ -66,7 +67,7 @@
            <mx:Button id="tryAccessButton" label="Try Access" click="getAccessToken()" enabled="false" styleName="titleWindowButton" />
        </mx:ControlBar>
        
-       <mx:Script><![CDATA[
+       <fx:Script><![CDATA[
                import flash.display.InteractiveObject;
         import flash.events.Event;
         import flash.net.*;
                        getAccessToken();
                }
         
-       ]]></mx:Script>
+       ]]></fx:Script>
 </mx:TitleWindow>
 
index cac5ab6..c0849a5 100644 (file)
@@ -1,15 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <mx:TitleWindow
-       xmlns:mx="http://www.adobe.com/2006/mxml" 
+    xmlns:fx="http://ns.adobe.com/mxml/2009"
+       xmlns:mx="library://ns.adobe.com/flex/mx"
        layout="vertical"
        horizontalAlign="center" title="Save Changes"
        width="350" height="330" verticalGap="0">
 
+  <fx:Declarations>
   <mx:ArrayCollection id="changesetTags">
-    <mx:Object k="created_by" v="Potlatch 2"/>
-    <mx:Object k="version" v="{Application.application.version}"/>
-    <mx:Object k="build" v="{Application.application.build_number}"/>
+    <fx:Object k="created_by" v="Potlatch 2"/>
+    <fx:Object k="version" v="{FlexGlobals.topLevelApplication.version}"/>
+    <fx:Object k="build" v="{FlexGlobals.topLevelApplication.build_number}"/>
   </mx:ArrayCollection>
+  </fx:Declarations>
   
   <mx:ViewStack id="processSequence" width="100%" height="100%" 
       creationPolicy="all" creationComplete="if (doSkip) skipInput() else comment.setFocus()">
               itemEditEnd="verifyInput(event)">
             <mx:columns>
                 <mx:DataGridColumn editable="true" dataField="k" headerText="Key">
-                    <mx:itemEditor><mx:Component><mx:TextInput restrict="&#x0020;-&#x10FFFF;" /></mx:Component></mx:itemEditor>
+                    <mx:itemEditor><fx:Component><mx:TextInput restrict="&#x0020;-&#x10FFFF;" /></fx:Component></mx:itemEditor>
                 </mx:DataGridColumn>
                 <mx:DataGridColumn editable="true" dataField="v" headerText="Value">
-                    <mx:itemEditor><mx:Component><mx:TextInput restrict="&#x0020;-&#x10FFFF;" /></mx:Component></mx:itemEditor>
+                    <mx:itemEditor><fx:Component><mx:TextInput restrict="&#x0020;-&#x10FFFF;" /></fx:Component></mx:itemEditor>
                 </mx:DataGridColumn>
             </mx:columns>
           </mx:DataGrid>        
@@ -77,7 +80,7 @@
     <mx:Button id="saveButton" label="Save >" click="startSave();" styleName="titleWindowButton" />
   </mx:ControlBar>
   
-  <mx:Script><![CDATA[
+  <fx:Script><![CDATA[
   
     import mx.controls.*;
     import mx.managers.PopUpManager;
         _connection.removeEventListener(Connection.SAVE_COMPLETED, saveCompleted);
         PopUpManager.removePopUp(this);
     }
-  ]]></mx:Script>
+  ]]></fx:Script>
 </mx:TitleWindow>
 
index 2b1b524..09c9861 100644 (file)
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<mx:Application 
-       xmlns:mx="http://www.adobe.com/2006/mxml" 
+<mx:Application
+    xmlns:fx="http://ns.adobe.com/mxml/2009"
+       xmlns:mx="library://ns.adobe.com/flex/mx"
+    xmlns:s="library://ns.adobe.com/flex/spark"
        xmlns:halcyon="net.systemeD.halcyon.*"
        xmlns:potlatch2="net.systemeD.potlatch2.*"
        layout="vertical"
        addedToStage="startInit()"
        preloader="net.systemeD.potlatch2.Preloader">
 
-    <map:LocalizationMap xmlns:map="l10n.map.*" />
 
-       <mx:Style source="styles/Application.css"/>
 
-    <mx:Glow id="glowImage" duration="100" 
-        alphaFrom="0.3" alphaTo="1.0" 
-        blurXFrom="0.0" blurXTo="5.0" 
-        blurYFrom="0.0" blurYTo="5.0" 
-        color="0xFF8000"/>
-    <mx:Glow id="unglowImage" duration="100" 
-        alphaFrom="1.0" alphaTo="0.3" 
-        blurXFrom="5.0" blurXTo="0.0" 
-        blurYFrom="5.0" blurYTo="0.0" 
-        color="0xFF8000"/>
-    <mx:WipeLeft id="wipeOut" duration="250"/>
-    <mx:WipeRight id="wipeIn" duration="250"/>
+       <fx:Style source="styles/Application.css"/>
+
+    <fx:Declarations>
+        <map:LocalizationMap xmlns:map="l10n.map.*" />
+        <mx:Glow id="glowImage" duration="100"
+            alphaFrom="0.3" alphaTo="1.0"
+            blurXFrom="0.0" blurXTo="5.0"
+            blurYFrom="0.0" blurYTo="5.0"
+            color="0xFF8000"/>
+        <mx:Glow id="unglowImage" duration="100"
+            alphaFrom="1.0" alphaTo="0.3"
+            blurXFrom="5.0" blurXTo="0.0"
+            blurYFrom="5.0" blurYTo="0.0"
+            color="0xFF8000"/>
+        <mx:WipeLeft id="wipeOut" duration="250"/>
+        <mx:WipeRight id="wipeIn" duration="250"/>
+    </fx:Declarations>
 
     <mx:ApplicationControlBar dock="true">
         <mx:PopUpButton id="bgButton" label="Background" openAlways="true" styleName="appBarButton"
                                                     mx.controls.Menu(gpsButton.popUp).selectedIndex=0; /* Yes, we do need to call it twice */
                                                     theMap.removeLayerByName('GPS tracks'); }">
                        <mx:dataProvider>
-                               <mx:Array>
-                                       <mx:Object label="GPS data" id="gpsData" />
-                                       <mx:Object label="My tracks" id="myTracks" />
-                                       <mx:Object label="Clear" id="clearGps" />
-                               </mx:Array>
+                               <fx:Array>
+                                       <fx:Object label="GPS data" id="gpsData" />
+                                       <fx:Object label="My tracks" id="myTracks" />
+                                       <fx:Object label="Clear" id="clearGps" />
+                               </fx:Array>
                        </mx:dataProvider>
                </mx:PopUpMenuButton>
         <mx:Spacer width="100%"/>
@@ -85,7 +90,7 @@
 
     </mx:HDividedBox>
 
-       <mx:Script><![CDATA[
+       <fx:Script><![CDATA[
                import net.systemeD.halcyon.*;
                import net.systemeD.halcyon.connection.*;
                import net.systemeD.potlatch2.*;
             conn.fetchUserTraces();
         }
 
-       ]]></mx:Script>
+       ]]></fx:Script>
 
 </mx:Application>