Changeset 3671 in josm for trunk/src/org/openstreetmap/josm/data/validation/TestError.java

Timestamp:

2010-11-25T09:45:38+01:00 (13 years ago)

Author:

bastiK

Message:

adapt coding style (to some degree); there shouldn't be any semantic changes in this commit

File:

• trunk/src/org/openstreetmap/josm/data/validation/TestError.java (modified) (10 diffs)

trunk/src/org/openstreetmap/josm/data/validation/TestError.java

@@ -157 +157 @@
                 return null;
             String type = "u";
-            if (o instanceof Way)
+            if (o instanceof Way) {
                 type = "w";
-            else if (o instanceof Relation)
+            } else if (o instanceof Relation) {
                 type = "r";
-            else if (o instanceof Node)
+            } else if (o instanceof Node) {
                 type = "n";
+            }
             strings.add(type + "_" + o.getId());
         }
@@ -173 +174 @@
     public String getIgnoreSubGroup() {
         String ignorestring = getIgnoreGroup();
-        if (description_en != null)
+        if (description_en != null) {
             ignorestring += "_" + description_en;
+        }
         return ignorestring;
     }
@@ -216 +218 @@
 
     /**
-     * Fixes the error with the appropiate command
+     * Fixes the error with the appropriate command
      *
      * @return The command to fix the error
@@ -243 +245 @@
     public void visitHighlighted(ValidatorVisitor v) {
         for (Object o : highlighted) {
-            if (o instanceof OsmPrimitive)
+            if (o instanceof OsmPrimitive) {
                 v.visit((OsmPrimitive) o);
-            else if (o instanceof WaySegment)
+            } else if (o instanceof WaySegment) {
                 v.visit((WaySegment) o);
-            else if (o instanceof List<?>) {
+            } else if (o instanceof List<?>) {
                 v.visit((List<Node>)o);
             }
@@ -273 +275 @@
         }
 
+        @Override
         public void visit(OsmPrimitive p) {
             if (p.isUsable()) {
@@ -289 +292 @@
             if (selected) {
                 g.fillOval(p.x - 5, p.y - 5, 10, 10);
-            } else
+            } else {
                 g.drawOval(p.x - 5, p.y - 5, 10, 10);
+            }
         }
 
@@ -301 +305 @@
             int deg = (int) Math.toDegrees(t);
             if (selected) {
-                int[] x = new int[] { (int) (p1.x + 5 * cosT), (int) (p2.x + 5 * cosT), (int) (p2.x - 5 * cosT),
-                        (int) (p1.x - 5 * cosT) };
-                int[] y = new int[] { (int) (p1.y - 5 * sinT), (int) (p2.y - 5 * sinT), (int) (p2.y + 5 * sinT),
-                        (int) (p1.y + 5 * sinT) };
+                int[] x = new int[] { (int) (p1.x + 5 * cosT), (int) (p2.x + 5 * cosT),
+                                      (int) (p2.x - 5 * cosT), (int) (p1.x - 5 * cosT) };
+                int[] y = new int[] { (int) (p1.y - 5 * sinT), (int) (p2.y - 5 * sinT),
+                                      (int) (p2.y + 5 * sinT), (int) (p1.y + 5 * sinT) };
                 g.fillPolygon(x, y, 4);
                 g.fillArc(p1.x - 5, p1.y - 5, 10, 10, deg, 180);
                 g.fillArc(p2.x - 5, p2.y - 5, 10, 10, deg, -180);
             } else {
-                g.drawLine((int) (p1.x + 5 * cosT), (int) (p1.y - 5 * sinT), (int) (p2.x + 5 * cosT),
-                        (int) (p2.y - 5 * sinT));
-                g.drawLine((int) (p1.x - 5 * cosT), (int) (p1.y + 5 * sinT), (int) (p2.x - 5 * cosT),
-                        (int) (p2.y + 5 * sinT));
+                g.drawLine((int) (p1.x + 5 * cosT), (int) (p1.y - 5 * sinT),
+                           (int) (p2.x + 5 * cosT), (int) (p2.y - 5 * sinT));
+                g.drawLine((int) (p1.x - 5 * cosT), (int) (p1.y + 5 * sinT),
+                           (int) (p2.x - 5 * cosT), (int) (p2.y + 5 * sinT));
                 g.drawArc(p1.x - 5, p1.y - 5, 10, 10, deg, 180);
                 g.drawArc(p2.x - 5, p2.y - 5, 10, 10, deg, -180);
@@ -334 +338 @@
          * @param n The node to draw.
          */
+        @Override
         public void visit(Node n) {
-            if (isNodeVisible(n))
+            if (isNodeVisible(n)) {
                 drawNode(n, severity.getColor());
-        }
-
+            }
+        }
+
+        @Override
         public void visit(Way w) {
             visit(w.getNodes());
         }
 
+        @Override
         public void visit(WaySegment ws) {
             if (ws.lowerIndex < 0 || ws.lowerIndex + 1 >= ws.way.getNodesCount())
@@ -352 +360 @@
         }
 
+        @Override
         public void visit(Relation r) {
             /* No idea how to draw a relation. */
@@ -387 +396 @@
         }
 
+        @Override
         public void visit(List<Node> nodes) {
             Node lastN = null;