Changeset 8260 in josm for trunk/src/org/openstreetmap/josm/gui/util

Timestamp:

2015-04-25T14:00:05+02:00 (10 years ago)

Author:

bastiK

Message:

see #10217 - move unit handling to parser
adds support for negative angles
new: length units px,cm,mm,in,q,pc,pt as in CSS (immediately converted to px)

File:

• trunk/src/org/openstreetmap/josm/gui/util/RotationAngle.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/util/RotationAngle.java

@@ -41 +41 @@
      */
     public static RotationAngle buildStaticRotation(final String string) {
-        final Pattern radiansPattern = Pattern.compile("(\\d+\\.?\\d*)\\s*(rad)?");
-        final Pattern degreesPattern = Pattern.compile("(\\d+\\.?\\d*)\\s*(deg|°)");
-        final Pattern gradianPattern = Pattern.compile("(\\d+\\.?\\d*)\\s*(grad)");
-        final Pattern turnPattern = Pattern.compile("(\\d+\\.?\\d*)\\s*(turn)");
         final double value;
-        Matcher matcher;
-        if ((matcher = radiansPattern.matcher(string)).matches()) {
-            value = Double.parseDouble(matcher.group(1));
-        } else if ((matcher = degreesPattern.matcher(string)).matches()) {
-            value = Math.toRadians(Double.parseDouble(matcher.group(1)));
-        } else if ((matcher = gradianPattern.matcher(string)).matches()) {
-            value = Double.parseDouble(matcher.group(1)) / 200 * Math.PI;
-        } else if ((matcher = turnPattern.matcher(string)).matches()) {
-            value = Double.parseDouble(matcher.group(1)) * 2 * Math.PI;
-        } else {
-            try {
-                value = parseCardinalRotation(string);
-            } catch (IllegalArgumentException ignore) {
-                throw new IllegalArgumentException("Invalid string: " + string);
-            }
+        try {
+            value = parseCardinalRotation(string);
+        } catch (IllegalArgumentException ignore) {
+            throw new IllegalArgumentException("Invalid string: " + string);
         }
         return buildStaticRotation(value);