Changeset 3594 in josm for trunk/src/org/openstreetmap/josm/data

Timestamp:

2010-10-09T00:37:35+02:00 (14 years ago)

Author:

bastiK

Message:

applied #5500 (patch by cmuelle8) - improve SelectAction and NavigatableComponent

File:

• trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/SimplePaintVisitor.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/SimplePaintVisitor.java

@@ -13 +13 @@
 import java.awt.Stroke;
 import java.awt.geom.GeneralPath;
+import java.awt.geom.Point2D;
 import java.util.Collection;
 import java.util.Iterator;
@@ -26 +27 @@
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.data.osm.visitor.AbstractVisitor;
-import org.openstreetmap.josm.data.osm.visitor.paint.MapPaintSettings;
 import org.openstreetmap.josm.gui.NavigatableComponent;
 
@@ -266 +266 @@
 
             final int size = max((ds.isSelected(n) ? selectedNodeSize : 0),
-                                    (n.isTagged() ? taggedNodeSize : 0),
-                                    (n.isConnectionNode() ? connectionNodeSize : 0),
-                                    unselectedNodeSize);
+                    (n.isTagged() ? taggedNodeSize : 0),
+                    (n.isConnectionNode() ? connectionNodeSize : 0),
+                    unselectedNodeSize);
 
             final boolean fill = (ds.isSelected(n) && fillSelectedNode) ||
-                                    (n.isTagged() && fillTaggedNode) ||
-                                    (n.isConnectionNode() && fillConnectionNode) ||
-                                    fillUnselectedNode;
+            (n.isTagged() && fillTaggedNode) ||
+            (n.isConnectionNode() && fillConnectionNode) ||
+            fillUnselectedNode;
 
             drawNode(n, color, size, fill);
@@ -279 +279 @@
     }
 
-    public static boolean isLargeSegment(Point p1, Point p2, int space)
+    public static boolean isLargeSegment(Point2D p1, Point2D p2, int space)
     {
-        int xd = p1.x-p2.x; if(xd < 0) {
-            xd = -xd;
-        }
-        int yd = p1.y-p2.y; if(yd < 0) {
-            yd = -yd;
-        }
+        double xd = Math.abs(p1.getX()-p2.getX());
+        double yd = Math.abs(p1.getY()-p2.getY());
         return (xd+yd > space);
     }