Changeset 1677 in josm for trunk/src/org/openstreetmap/josm/tools

Timestamp:

2009-06-17T10:04:22+02:00 (15 years ago)

Author:

stoecker

Message:

remove all these ugly tab stops introduced in the last half year

Location:

trunk/src/org/openstreetmap/josm/tools

Files:

• AudioUtil.java (modified) (2 diffs)
• ImageProvider.java (modified) (1 diff)
• OsmUrlToBounds.java (modified) (1 diff)
• PresetTextComparator.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/tools/AudioUtil.java

@@ -20 +20 @@
  */
 public class AudioUtil {
-        
-        static public double getCalibratedDuration(File wavFile) {
+
+    static public double getCalibratedDuration(File wavFile) {
         try {
-                AudioInputStream audioInputStream = AudioSystem.getAudioInputStream(
-                                new URL("file:".concat(wavFile.getAbsolutePath())));
+            AudioInputStream audioInputStream = AudioSystem.getAudioInputStream(
+                    new URL("file:".concat(wavFile.getAbsolutePath())));
             AudioFormat audioFormat = audioInputStream.getFormat();
             long filesize = wavFile.length();
@@ -34 +34 @@
             return naturalLength / calibration;
         } catch (Exception e) {
-                return 0.0;
+            return 0.0;
         }
-        }
-        
+    }
 }
- 

trunk/src/org/openstreetmap/josm/tools/ImageProvider.java

@@ -229 +229 @@
     }
 
-/* from: http://www.jidesoft.com/blog/2008/02/29/rotate-an-icon-in-java/ 
+/* from: http://www.jidesoft.com/blog/2008/02/29/rotate-an-icon-in-java/
 * License: "feel free to use"
 */

trunk/src/org/openstreetmap/josm/tools/OsmUrlToBounds.java

@@ -1 @@
-// License: GPL. Copyright 2007 by Immanuel Scholz and others 
-package org.openstreetmap.josm.tools; 
- 
-import java.util.HashMap; 
- 
-import org.openstreetmap.josm.data.Bounds; 
-import org.openstreetmap.josm.data.coor.LatLon; 
- 
-public class OsmUrlToBounds { 
-    public static Bounds parse(String url) { 
-        int i = url.indexOf('?'); 
-        if (i == -1) 
-            return null; 
-        String[] args = url.substring(i+1).split("&"); 
-        HashMap<String, String> map = new HashMap<String, String>(); 
-        for (String arg : args) { 
-            int eq = arg.indexOf('='); 
-            if (eq != -1) { 
-                map.put(arg.substring(0, eq), arg.substring(eq + 1)); 
-            } 
-        } 
- 
-        Bounds b = null; 
-        try { 
-            if (map.containsKey("bbox")) { 
-                String bbox[] = map.get("bbox").split(","); 
-                b = new Bounds( 
-                    new LatLon(Double.parseDouble(bbox[1]), Double.parseDouble(bbox[0])), 
-                    new LatLon(Double.parseDouble(bbox[3]), Double.parseDouble(bbox[2]))); 
- 
-            } else { 
-                double size = 180.0 / Math.pow(2, Integer.parseInt(map.get("zoom"))); 
-                b = new Bounds( 
-                    new LatLon(parseDouble(map, "lat") - size/2, parseDouble(map, "lon") - size), 
-                    new LatLon(parseDouble(map, "lat") + size/2, parseDouble(map, "lon") + size)); 
-            } 
-        } catch (NumberFormatException x) { 
-        } catch (NullPointerException x) { 
-        } 
-        return b; 
-    } 
-     
-    private static double parseDouble(HashMap<String, String> map, String key) { 
-        if (map.containsKey(key)) 
-            return Double.parseDouble(map.get(key)); 
-        return Double.parseDouble(map.get("m"+key)); 
-    } 
+// License: GPL. Copyright 2007 by Immanuel Scholz and others
+package org.openstreetmap.josm.tools;
+
+import java.util.HashMap;
+
+import org.openstreetmap.josm.data.Bounds;
+import org.openstreetmap.josm.data.coor.LatLon;
+
+public class OsmUrlToBounds {
+    public static Bounds parse(String url) {
+        int i = url.indexOf('?');
+        if (i == -1)
+            return null;
+        String[] args = url.substring(i+1).split("&");
+        HashMap<String, String> map = new HashMap<String, String>();
+        for (String arg : args) {
+            int eq = arg.indexOf('=');
+            if (eq != -1) {
+                map.put(arg.substring(0, eq), arg.substring(eq + 1));
+            }
+        }
+
+        Bounds b = null;
+        try {
+            if (map.containsKey("bbox")) {
+                String bbox[] = map.get("bbox").split(",");
+                b = new Bounds(
+                    new LatLon(Double.parseDouble(bbox[1]), Double.parseDouble(bbox[0])),
+                    new LatLon(Double.parseDouble(bbox[3]), Double.parseDouble(bbox[2])));
+
+            } else {
+                double size = 180.0 / Math.pow(2, Integer.parseInt(map.get("zoom")));
+                b = new Bounds(
+                    new LatLon(parseDouble(map, "lat") - size/2, parseDouble(map, "lon") - size),
+                    new LatLon(parseDouble(map, "lat") + size/2, parseDouble(map, "lon") + size));
+            }
+        } catch (NumberFormatException x) {
+        } catch (NullPointerException x) {
+        }
+        return b;
+    }
+
+    private static double parseDouble(HashMap<String, String> map, String key) {
+        if (map.containsKey(key))
+            return Double.parseDouble(map.get(key));
+        return Double.parseDouble(map.get("m"+key));
+    }
 }

trunk/src/org/openstreetmap/josm/tools/PresetTextComparator.java

@@ -6 +6 @@
 
 public class PresetTextComparator implements Comparator<JMenuItem> {
-        //TODO add error checking and stuff
-        public int compare(JMenuItem arg0, JMenuItem arg1) {
-                return arg0.getText().compareTo(arg1.getText());
-        }
+    //TODO add error checking and stuff
+    public int compare(JMenuItem arg0, JMenuItem arg1) {
+        return arg0.getText().compareTo(arg1.getText());
+    }