Changeset 3438 in josm for trunk

Timestamp:

2010-08-15T00:34:57+02:00 (14 years ago)

Author:

stoecker

Message:

fix some charset errors

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/Preferences.java (modified) (2 diffs)
• data/coor/CoordinateFormat.java (modified) (1 diff)
• data/coor/LatLon.java (modified) (1 diff)
• gui/MapStatus.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/Preferences.java

@@ -678 +678 @@
         String s = get(key);
         if (s != null && s.length() != 0)
-            return s.indexOf("\u001e") >= 0 || s.indexOf("§§§") >= 0;
+            return s.indexOf("\u001e") >= 0;
             else
                 return def;
@@ -700 +700 @@
         if(s != null && s.length() != 0)
         {
-            if(s.indexOf("\u001e") < 0) /* FIXME: legacy code, remove later */
-            {
-                String r =s;
-                if(r.indexOf("§§§") > 0) {
-                    r = r.replaceAll("§§§","\u001e");
-                } else {
-                    r = r.replace(';','\u001e');
-                }
-                if(!r.equals(s)) /* save the converted string */
-                {
-                    put(key,r);
-                    s = r;
-                }
-            }
             return Arrays.asList(s.split("\u001e"));
         }

trunk/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java

@@ -16 +16 @@
 
     /**
-     * the degrees/minutes/seconds format 9° 99" 99'
+     * the degrees/minutes/seconds format 9 deg 99 min 99 sec
      */
     DEGREES_MINUTES_SECONDS (tr("deg\u00B0 min'' sec\"")),

trunk/src/org/openstreetmap/josm/data/coor/LatLon.java

@@ -203 +203 @@
      * Returns this lat/lon pair in human-readable format.
      *
-     * @return String in the format "lat=1.23456°, lon=2.34567°"
+     * @return String in the format "lat=1.23456 deg, lon=2.34567 deg"
      */
     public String toDisplayString() {

trunk/src/org/openstreetmap/josm/gui/MapStatus.java

@@ -628 +628 @@
     }
     public void setAngle(double a) {
-        angleText.setText(a < 0 ? "--" : Math.round(a*10)/10.0 + " °");
+        angleText.setText(a < 0 ? "--" : Math.round(a*10)/10.0 + " \u00B0");
     }
     public void setHeading(double h) {
-        headingText.setText(h < 0 ? "--" : Math.round(h*10)/10.0 + " °");
+        headingText.setText(h < 0 ? "--" : Math.round(h*10)/10.0 + " \u00B0");
     }
     public void setDist(double dist) {