dos2unix all text files

diff --git a/net/systemeD/potlatch2/mapfeatures/editors/ChoiceComboBox.as b/net/systemeD/potlatch2/mapfeatures/editors/ChoiceComboBox.as
index ed1a372b2c7ed3d7338a31eef12c9a35428fde68..3139cad6fb20fc7339b3af6abdce1b7a7d426d61 100644 (file)
--- a/net/systemeD/potlatch2/mapfeatures/editors/ChoiceComboBox.as
+++ b/net/systemeD/potlatch2/mapfeatures/editors/ChoiceComboBox.as
@@ -36,16 +36,16 @@ package net.systemeD.potlatch2.mapfeatures.editors {
             if ( textInputReplacement ) {
                 IDataRenderer(textInputReplacement).data = selectedItem;
 
-                var arrowWidth:Number = getStyle("arrowButtonWidth");\r
-                var itemHeight:Number = textInputReplacement.getExplicitOrMeasuredHeight();\r
-                var itemWidth:Number = textInputReplacement.getExplicitOrMeasuredWidth();\r
-\r
-                if (isNaN(arrowWidth))\r
-                    arrowWidth = 0;\r
+                var arrowWidth:Number = getStyle("arrowButtonWidth");
+                var itemHeight:Number = textInputReplacement.getExplicitOrMeasuredHeight();
+                var itemWidth:Number = textInputReplacement.getExplicitOrMeasuredWidth();
+
+                if (isNaN(arrowWidth))
+                    arrowWidth = 0;
 
                 var bm:EdgeMetrics = borderMetrics;
 
-                textInputReplacement.setActualSize(unscaledWidth - arrowWidth, itemHeight);\r
+                textInputReplacement.setActualSize(unscaledWidth - arrowWidth, itemHeight);
                 textInputReplacement.move(bm.left, bm.top);
             }
         }
@@ -57,21 +57,21 @@ package net.systemeD.potlatch2.mapfeatures.editors {
                 IDataRenderer(textInputReplacement).data = selectedItem;
                 var prefSize:Object = calculatePreferredSizeFromData(collection.length);
 
-                var arrowWidth:Number = getStyle("arrowButtonWidth");\r
-                var itemHeight:Number = textInputReplacement.getExplicitOrMeasuredHeight();\r
-                var itemWidth:Number = textInputReplacement.getExplicitOrMeasuredWidth();\r
-\r
-                if (isNaN(arrowWidth))\r
-                    arrowWidth = 0;\r
+                var arrowWidth:Number = getStyle("arrowButtonWidth");
+                var itemHeight:Number = textInputReplacement.getExplicitOrMeasuredHeight();
+                var itemWidth:Number = textInputReplacement.getExplicitOrMeasuredWidth();
+
+                if (isNaN(arrowWidth))
+                    arrowWidth = 0;
 
                 var bm:EdgeMetrics = borderMetrics;
-                itemHeight += bm.top + bm.bottom;\r
+                itemHeight += bm.top + bm.bottom;
                 itemWidth += bm.left + bm.right + arrowWidth + 8;
                 prefSize.height += bm.top + bm.bottom;
-                prefSize.width += bm.left + bm.right + arrowWidth + 8;\r
+                prefSize.width += bm.left + bm.right + arrowWidth + 8;
 
-                measuredMinHeight = measuredHeight = Math.max(prefSize.height, itemHeight);\r
-                measuredMinWidth = measuredWidth = Math.max(prefSize.width, itemWidth);\r
+                measuredMinHeight = measuredHeight = Math.max(prefSize.height, itemHeight);
+                measuredMinWidth = measuredWidth = Math.max(prefSize.width, itemWidth);
             }
         }
 
@@ -87,8 +87,8 @@ package net.systemeD.potlatch2.mapfeatures.editors {
                 IDataRenderer(test).data = collection[i];
                 test.validateDisplayList();
                 test.validateSize(true);
-                maxWidth = Math.max(maxWidth, test.getExplicitOrMeasuredWidth());\r
-                maxHeight = Math.max(maxHeight, test.getExplicitOrMeasuredHeight());\r
+                maxWidth = Math.max(maxWidth, test.getExplicitOrMeasuredWidth());
+                maxHeight = Math.max(maxHeight, test.getExplicitOrMeasuredHeight());
             }
             removeChild(test);
             return {width: maxWidth, height: maxHeight};

diff --git a/potlatch2-config.xml b/potlatch2-config.xml
index 56dfdbff56b83f56487bf937ba58014de2be6d4c..4fff7c2a5a8fb00b571b1adc2ff38ffe8476ddcb 100644 (file)
--- a/potlatch2-config.xml
+++ b/potlatch2-config.xml
@@ -1,24 +1,24 @@
-<?xml version="1.0"?>\r
-\r
-<flex-config>\r
-   <compiler>\r
+<?xml version="1.0"?>
+
+<flex-config>
+   <compiler>
       <fonts>
-          <managers>\r
-              <manager-class>flash.fonts.AFEFontManager</manager-class>\r
-          </managers>\r
+          <managers>
+              <manager-class>flash.fonts.AFEFontManager</manager-class>
+          </managers>
       </fonts>
       
       <library-path append="true">
           <path-element>lib</path-element>
-      </library-path>\r
-   </compiler>\r
+      </library-path>
+   </compiler>
+
+   <metadata>
+      <title>Potlatch 2</title>
+      <description>http://wiki.openstreetmap.org/wiki/Potlatch2</description>
+   </metadata>
+
+   <target-player>10.0.0</target-player>
 
-   <metadata>\r
-      <title>Potlatch 2</title>\r
-      <description>http://wiki.openstreetmap.org/wiki/Potlatch2</description>\r
-   </metadata>\r
-\r
-   <target-player>10.0.0</target-player>\r
-\r
-   <output>resources/potlatch2.swf</output>\r
-</flex-config>\r
+   <output>resources/potlatch2.swf</output>
+</flex-config>