Changeset 3673 in josm for trunk

Timestamp:

2010-11-25T13:01:58+01:00 (13 years ago)

Author:

bastiK

Message:

(hopefully) fix some coding errors

Location:

trunk/src/org/openstreetmap/josm/data/validation/tests

Files:

• MultipolygonTest.java (modified) (1 diff)
• RelationChecker.java (modified) (2 diffs)
• TagChecker.java (modified) (2 diffs)
• TurnrestrictionTest.java (modified) (1 diff)
• WronglyOrderedWays.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java

@@ -81 +81 @@
         for (int i=1; i<nodes.size(); i++) {
             Node n = nodes.get(i);
-            result.lineTo((float )n.getCoor().lat(), (float) n.getCoor().lon());
+            result.lineTo((float) n.getCoor().lat(), (float) n.getCoor().lon());
         }
         return result;

trunk/src/org/openstreetmap/josm/data/validation/tests/RelationChecker.java

@@ -135 +135 @@
                     done.add(r.key);
                     String keyname = r.key;
-                    if (keyname == "") { //FIXME
+                    if ("".equals(keyname)) {
                         keyname = tr("<empty>");
                     }
@@ -144 +144 @@
                         if (count == 0) {
                             String s = marktr("Role {0} missing");
-                            errors.add( new TestError(this, Severity.WARNING, tr("Role verification problem"),
-                                    tr(s, keyname), MessageFormat.format(s, keyname), ROLE_MISSING, n) );
+                            errors.add(new TestError(this, Severity.WARNING, tr("Role verification problem"),
+                                    tr(s, keyname), MessageFormat.format(s, keyname), ROLE_MISSING, n));
                         }
                         else if (vc > count) {
                             String s = marktr("Number of {0} roles too low ({1})");
-                            errors.add( new TestError(this, Severity.WARNING, tr("Role verification problem"),
-                                    tr(s, keyname, count), MessageFormat.format(s, keyname, count), LOW_COUNT, n) );
+                            errors.add(new TestError(this, Severity.WARNING, tr("Role verification problem"),
+                                    tr(s, keyname, count), MessageFormat.format(s, keyname, count), LOW_COUNT, n));
                         } else {
                             String s = marktr("Number of {0} roles too high ({1})");
-                            errors.add( new TestError(this, Severity.WARNING, tr("Role verification problem"),
-                                    tr(s, keyname, count), MessageFormat.format(s, keyname, count), HIGH_COUNT, n) );
+                            errors.add(new TestError(this, Severity.WARNING, tr("Role verification problem"),
+                                    tr(s, keyname, count), MessageFormat.format(s, keyname, count), HIGH_COUNT, n));
                         }
                     }

trunk/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java

@@ -836 +836 @@
             public boolean valueAll = false;
             public boolean valueBool = false;
+
             private Pattern getPattern(String str) throws IllegalStateException, PatternSyntaxException {
                 if (str.endsWith("/i"))
@@ -850 +851 @@
                 String n = m.group(1).trim();
 
-                // FIXME FIXME: indentation and { } pairs don't match, probably coding error
-
-                if(n.equals("*"))
+                if(n.equals("*")) {
                     tagAll = true;
-                else
+                } else {
                     tag = n.startsWith("/") ? getPattern(n) : n;
                     noMatch = m.group(2).equals("!=");
                     n = m.group(3).trim();
-                    if(n.equals("*"))
+                    if (n.equals("*")) {
                         valueAll = true;
-                    else if(n.equals("BOOLEAN_TRUE"))
-                    {
+                    } else if (n.equals("BOOLEAN_TRUE")) {
                         valueBool = true;
                         value = OsmUtils.trueval;
-                    }
-                    else if(n.equals("BOOLEAN_FALSE"))
-                    {
+                    } else if (n.equals("BOOLEAN_FALSE")) {
                         valueBool = true;
                         value = OsmUtils.falseval;
-                    }
-                    else
+                    } else {
                         value = n.startsWith("/") ? getPattern(n) : n;
+                    }
+                }
             }
 

trunk/src/org/openstreetmap/josm/data/validation/tests/TurnrestrictionTest.java

@@ -136 +136 @@
                 errors.add(new TestError(this, Severity.ERROR,
                         tr("The \"to\" way does not start or end at a \"via\" node"), TO_VIA_NODE, r));
-                //FIXME: return; ?
+                return;
             }
         } else {

trunk/src/org/openstreetmap/josm/data/validation/tests/WronglyOrderedWays.java

@@ -83 +83 @@
          *
          */
-        if(w.getNode(0) == w.getNode(w.getNodesCount()-1)) {
+        if (w.getNode(0) == w.getNode(w.getNodesCount()-1)) {
             double area2 = 0;