Changeset 3671 in josm for trunk/src/org/openstreetmap/josm/data/validation/util

Timestamp:

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

Author:

bastiK

Message:

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

Location:

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

Files:

• AgregatePrimitivesVisitor.java (modified) (3 diffs)
• MultipleNameVisitor.java (modified) (5 diffs)
• NameVisitor.java (modified) (4 diffs)
• ValUtil.java (modified) (10 diffs)

trunk/src/org/openstreetmap/josm/data/validation/util/AgregatePrimitivesVisitor.java

@@ -19 +19 @@
  * @author frsantos
  */
-public class AgregatePrimitivesVisitor extends AbstractVisitor
-{
+public class AgregatePrimitivesVisitor extends AbstractVisitor {
     /** Aggregated data */
     final Collection<OsmPrimitive> aggregatedData = new HashSet<OsmPrimitive>();
@@ -29 +28 @@
      * @return The aggregated primitives
      */
-    public Collection<OsmPrimitive> visit(Collection<OsmPrimitive> data)
-    {
-        for (OsmPrimitive osm : data)
-        {
+    public Collection<OsmPrimitive> visit(Collection<OsmPrimitive> data) {
+        for (OsmPrimitive osm : data) {
             osm.visit(this);
         }
@@ -39 +36 @@
     }
 
-    public void visit(Node n)
-    {
-        if(!aggregatedData.contains(n))
+    @Override
+    public void visit(Node n) {
+        if (!aggregatedData.contains(n)) {
             aggregatedData.add(n);
-    }
-
-    public void visit(Way w)
-    {
-        if(!aggregatedData.contains(w))
-        {
-            aggregatedData.add(w);
-            for (Node n : w.getNodes())
-                visit(n);
         }
     }
 
+    @Override
+    public void visit(Way w) {
+        if (!aggregatedData.contains(w)) {
+            aggregatedData.add(w);
+            for (Node n : w.getNodes()) {
+                visit(n);
+            }
+        }
+    }
+
+    @Override
     public void visit(Relation r) {
         if (!aggregatedData.contains(r)) {

trunk/src/org/openstreetmap/josm/data/validation/util/MultipleNameVisitor.java

@@ -31 +31 @@
      * @param data The collection of primitives
      */
-    public void visit(Collection<? extends OsmPrimitive> data)
-    {
+    public void visit(Collection<? extends OsmPrimitive> data) {
         String multipleName = null;
         String multiplePluralClassname = null;
@@ -40 +39 @@
 
         multipleClassname = null;
-        for (OsmPrimitive osm : data)
-        {
+        for (OsmPrimitive osm : data) {
             String name = osm.get("name");
-            if(name == null) name = osm.get("ref");
-            if(!initializedname)
-            {
+            if (name == null) {
+                name = osm.get("ref");
+            }
+            if (!initializedname) {
                 multipleName = name; initializedname = true;
-            }
-            else if(multipleName != null && (name == null  || !name.equals(multipleName)))
-            {
+            } else if (multipleName != null && (name == null  || !name.equals(multipleName))) {
                 multipleName = null;
             }
 
-            if(firstName == null && name != null)
+            if (firstName == null && name != null) {
                 firstName = name;
+            }
             osm.visit(this);
-            if (multipleClassname == null)
-            {
+            if (multipleClassname == null) {
                 multipleClassname = className;
                 multiplePluralClassname = classNamePlural;
-            }
-            else if (!multipleClassname.equals(className))
-            {
+            } else if (!multipleClassname.equals(className)) {
                 multipleClassname = "object";
                 multiplePluralClassname = trn("object", "objects", 2);
@@ -68 +63 @@
         }
 
-        if( size == 1 )
+        if (size == 1) {
             displayName = name;
-        else if(multipleName != null)
+        } else if (multipleName != null) {
             displayName = size + " " + trn(multipleClassname, multiplePluralClassname, size) + ": " + multipleName;
-        else if(firstName != null)
+        } else if (firstName != null) {
             displayName = size + " " + trn(multipleClassname, multiplePluralClassname, size) + ": " + tr("{0}, ...", firstName);
-        else
+        } else {
             displayName = size + " " + trn(multipleClassname, multiplePluralClassname, size);
+        }
     }
 
     @Override
-    public JLabel toLabel()
-    {
+    public JLabel toLabel() {
         return new JLabel(getText(), getIcon(), JLabel.HORIZONTAL);
     }
@@ -88 +83 @@
      * @return the name of the items
      */
-    public String getText()
-    {
+    public String getText() {
         return displayName;
     }
@@ -97 +91 @@
      * @return the icon of the items
      */
-    public Icon getIcon()
-    {
-        if( size == 1 )
+    public Icon getIcon() {
+        if (size == 1)
             return icon;
         else

trunk/src/org/openstreetmap/josm/data/validation/util/NameVisitor.java

@@ -43 +43 @@
      * is displayed.
      */
+    @Override
     public void visit(Node n) {
         name = n.getDisplayName(DefaultNameFormatter.getInstance());
@@ -55 +56 @@
      * is displayed with x being the number of nodes in the way.
      */
+    @Override
     public void visit(Way w) {
         name = w.getDisplayName(DefaultNameFormatter.getInstance());
@@ -65 +67 @@
     /**
      */
+    @Override
     public void visit(Relation e) {
         name = e.getDisplayName(DefaultNameFormatter.getInstance());
@@ -77 +80 @@
     }
 
-
     private void addId(OsmPrimitive osm) {
-        if (Main.pref.getBoolean("osm-primitives.showid"))
+        if (Main.pref.getBoolean("osm-primitives.showid")) {
             name += tr(" [id: {0}]", osm.getId());
+        }
     }
 }

trunk/src/org/openstreetmap/josm/data/validation/util/ValUtil.java

@@ -38 +38 @@
      * @return A list with all the cells the way starts or ends
      */
-    public static List<List<Way>> getWaysInCell(Way w, Map<Point2D,List<Way>> cellWays)
-    {
+    public static List<List<Way>> getWaysInCell(Way w, Map<Point2D,List<Way>> cellWays) {
         if (w.getNodesCount() == 0)
             return Collections.emptyList();
@@ -59 +58 @@
         cell = new Point2D.Double(x0, y0);
         cellNodes.add(cell);
-        List<Way> ways = cellWays.get( cell );
-        if( ways == null )
-        {
+        List<Way> ways = cellWays.get(cell);
+        if (ways == null) {
             ways = new ArrayList<Way>();
             cellWays.put(cell, ways);
@@ -69 +67 @@
         // End of the way
         cell = new Point2D.Double(x1, y1);
-        if( !cellNodes.contains(cell) )
-        {
+        if (!cellNodes.contains(cell)) {
             cellNodes.add(cell);
             ways = cellWays.get( cell );
-            if( ways == null )
-            {
+            if (ways == null) {
                 ways = new ArrayList<Way>();
                 cellWays.put(cell, ways);
@@ -82 +78 @@
 
         // Then floor coordinates, in case the way is in the border of the cell.
-        x0 = (long)Math.floor(n1.getEastNorth().east()  * OsmValidator.griddetail);
-        y0 = (long)Math.floor(n1.getEastNorth().north() * OsmValidator.griddetail);
-        x1 = (long)Math.floor(n2.getEastNorth().east()  * OsmValidator.griddetail);
-        y1 = (long)Math.floor(n2.getEastNorth().north() * OsmValidator.griddetail);
+        x0 = (long) Math.floor(n1.getEastNorth().east()  * OsmValidator.griddetail);
+        y0 = (long) Math.floor(n1.getEastNorth().north() * OsmValidator.griddetail);
+        x1 = (long) Math.floor(n2.getEastNorth().east()  * OsmValidator.griddetail);
+        y1 = (long) Math.floor(n2.getEastNorth().north() * OsmValidator.griddetail);
 
         // Start of the way
         cell = new Point2D.Double(x0, y0);
-        if( !cellNodes.contains(cell) )
-        {
+        if (!cellNodes.contains(cell)) {
             cellNodes.add(cell);
-            ways = cellWays.get( cell );
-            if( ways == null )
-            {
+            ways = cellWays.get(cell);
+            if (ways == null) {
                 ways = new ArrayList<Way>();
                 cellWays.put(cell, ways);
@@ -103 +97 @@
         // End of the way
         cell = new Point2D.Double(x1, y1);
-        if( !cellNodes.contains(cell) )
-        {
+        if (!cellNodes.contains(cell)) {
             cellNodes.add(cell);
-            ways = cellWays.get( cell );
-            if( ways == null )
-            {
+            ways = cellWays.get(cell);
+            if (ways == null) {
                 ways = new ArrayList<Way>();
                 cellWays.put(cell, ways);
@@ -114 +106 @@
             cells.add(ways);
         }
-
         return cells;
     }
@@ -128 +119 @@
      * @return A list with the coordinates of all cells
      */
-    public static List<Point2D> getSegmentCells(Node n1, Node n2, double gridDetail)
-    {
+    public static List<Point2D> getSegmentCells(Node n1, Node n2, double gridDetail) {
         List<Point2D> cells = new ArrayList<Point2D>();
         double x0 = n1.getEastNorth().east() * gridDetail;
@@ -136 +126 @@
         double y1 = n2.getEastNorth().north() * gridDetail + 1;
 
-        if( x0 > x1 )
-        {
+        if (x0 > x1) {
             // Move to 1st-4th cuadrants
             double aux;
@@ -147 +136 @@
         double dy  = y1 - y0;
         long stepY = y0 <= y1 ? 1 : -1;
-        long gridX0 = (long)Math.floor(x0);
-        long gridX1 = (long)Math.floor(x1);
-        long gridY0 = (long)Math.floor(y0);
-        long gridY1 = (long)Math.floor(y1);
+        long gridX0 = (long) Math.floor(x0);
+        long gridX1 = (long) Math.floor(x1);
+        long gridY0 = (long) Math.floor(y0);
+        long gridY1 = (long) Math.floor(y1);
 
         long maxSteps = (gridX1 - gridX0) + Math.abs(gridY1 - gridY0) + 1;
-        while( (gridX0 <= gridX1 && (gridY0 - gridY1)*stepY <= 0) && maxSteps-- > 0)
-        {
-            cells.add( new Point2D.Double(gridX0, gridY0) );
+        while ((gridX0 <= gridX1 && (gridY0 - gridY1)*stepY <= 0) && maxSteps-- > 0) {
+            cells.add( new Point2D.Double(gridX0, gridY0));
 
             // Is the cross between the segment and next vertical line nearer than the cross with next horizontal line?
@@ -166 +154 @@
             double distY = Math.pow(scanX - x0, 2) + Math.pow(gridY0 + stepY - y0, 2);
 
-            if( distX < distY)
+            if (distX < distY) {
                 gridX0 += 1;
-            else
+            } else {
                 gridY0 += stepY;
+            }
         }
-
         return cells;
     }