Changeset 4874 in josm for trunk/src/org/openstreetmap/josm/data/validation/tests

Timestamp:

2012-01-26T21:52:34+01:00 (12 years ago)

Author:

jttt

Message:

Use static class were appropriate

Location:

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

Files:

• DeprecatedTags.java (modified) (5 diffs)
• DuplicateNode.java (modified) (1 diff)
• DuplicateRelation.java (modified) (1 diff)
• DuplicateWay.java (modified) (2 diffs)
• RelationChecker.java (modified) (1 diff)

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

@@ -1 +1 @@
 package org.openstreetmap.josm.data.validation.tests;
 
-import org.openstreetmap.josm.data.osm.Node;
-import org.openstreetmap.josm.data.osm.Relation;
-import org.openstreetmap.josm.data.osm.Way;
 import static org.openstreetmap.josm.tools.I18n.tr;
 
@@ -9 +6 @@
 import java.util.LinkedList;
 import java.util.List;
+
 import org.openstreetmap.josm.command.ChangePropertyCommand;
 import org.openstreetmap.josm.command.Command;
 import org.openstreetmap.josm.command.SequenceCommand;
+import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.data.osm.Tag;
+import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.data.validation.Severity;
 import org.openstreetmap.josm.data.validation.Test;
@@ -97 +98 @@
     }
 
-    private class DeprecationCheck {
+    private static class DeprecationCheck {
 
         int code;
@@ -148 +149 @@
                 String key = tag.getKey();
                 String value = tag.getValue();
-                if (value.isEmpty() && !p.hasKey(key)) {
+                if (value.isEmpty() && !p.hasKey(key))
                     return false;
-                }
-                if (!value.isEmpty() && !value.equals(p.get(key))) {
+                if (!value.isEmpty() && !value.equals(p.get(key)))
                     return false;
-                }
             }
             return true;
@@ -167 +166 @@
 
         String getDescription() {
-            if (alternatives.isEmpty()) {
+            if (alternatives.isEmpty())
                 return tr("{0} is deprecated", Utils.join(", ", test));
-            } else {
+            else
                 return tr("{0} is deprecated, use {1} instead", Utils.join(", ", test), Utils.join(tr(" or "), alternatives));
-            }
         }
     }

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

@@ -39 +39 @@
 public class DuplicateNode extends Test {
 
-    private class NodeHash implements Hash<Object, Object> {
+    private static class NodeHash implements Hash<Object, Object> {
 
         double precision = Main.pref.getDouble("validator.duplicatenodes.precision", 0.);

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

@@ -34 +34 @@
 {
 
-    public class RelMember {
+    public static class RelMember {
         private String role;
         private OsmPrimitiveType type;

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

@@ -34 +34 @@
 {
 
-    private class WayPair {
+    private static class WayPair {
         public List<LatLon> coor;
         public Map<String, String> keys;
@@ -56 +56 @@
     }
 
-    private class WayPairNoTags {
+    private static class WayPairNoTags {
         public List<LatLon> coor;
         public WayPairNoTags(List<LatLon> _coor) {

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

@@ -70 +70 @@
     }
 
-    public class RoleInfo {
+    public static class RoleInfo {
         int total = 0;
         Collection<Node> nodes = new LinkedList<Node>();