Changeset 1814 in josm for trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java

Timestamp:

2009-07-19T19:04:49+02:00 (17 years ago)

Author:

Gubaer

Message:

removed dependencies to Main.ds, removed Main.ds
removed AddVisitor, NameVisitor, DeleteVisitor - unnecessary double dispatching for these simple cases

File:

• trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java (modified) (18 diffs)

trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java

@@ -27 +27 @@
 import org.openstreetmap.josm.data.osm.WaySegment;
 import org.openstreetmap.josm.data.projection.Projection;
-import org.openstreetmap.josm.data.projection.Mercator;
 
 /**
@@ -55 +54 @@
     }
 
-    protected DataSet getData()
-    {
-        return Main.ds;
+    protected DataSet getCurrentDataSet() {
+        return Main.main.getCurrentDataSet();
     }
 
@@ -102 +100 @@
     public ProjectionBounds getProjectionBounds() {
         return new ProjectionBounds(
-        new EastNorth(
-                center.east() - getWidth()/2.0*scale,
-                center.north() - getHeight()/2.0*scale),
-        new EastNorth(
-                center.east() + getWidth()/2.0*scale,
-                center.north() + getHeight()/2.0*scale));
+                new EastNorth(
+                        center.east() - getWidth()/2.0*scale,
+                        center.north() - getHeight()/2.0*scale),
+                        new EastNorth(
+                                center.east() + getWidth()/2.0*scale,
+                                center.north() + getHeight()/2.0*scale));
     };
 
     public Bounds getRealBounds() {
         return new Bounds(
-        getProjection().eastNorth2latlon(new EastNorth(
-                center.east() - getWidth()/2.0*scale,
-                center.north() - getHeight()/2.0*scale)),
-        getProjection().eastNorth2latlon(new EastNorth(
-                center.east() + getWidth()/2.0*scale,
-                center.north() + getHeight()/2.0*scale)));
+                getProjection().eastNorth2latlon(new EastNorth(
+                        center.east() - getWidth()/2.0*scale,
+                        center.north() - getHeight()/2.0*scale)),
+                        getProjection().eastNorth2latlon(new EastNorth(
+                                center.east() + getWidth()/2.0*scale,
+                                center.north() + getHeight()/2.0*scale)));
     };
 
@@ -163 +161 @@
      */
     private void zoomTo(EastNorth newCenter, double newScale) {
-/* TODO: check that newCenter is really inside visible world and that scale is correct, don't allow zooming out to much */
+        /* TODO: check that newCenter is really inside visible world and that scale is correct, don't allow zooming out to much */
         boolean rep = false;
         if (!newCenter.equals(center)) {
@@ -177 +175 @@
             firePropertyChange("scale", oldScale, newScale);
         }
-        if(rep)
+        if(rep) {
             repaint();
+        }
     }
 
@@ -186 +185 @@
 
     public void zoomTo(LatLon newCenter) {
-        if (newCenter instanceof CachedLatLon)
+        if(newCenter instanceof CachedLatLon) {
             zoomTo(((CachedLatLon)newCenter).getEastNorth(), scale);
-        else
+        } else {
             zoomTo(getProjection().latlon2eastNorth(newCenter), scale);
+        }
     }
 
@@ -197 +197 @@
         // You will get the formula by simplifying this expression: newCenter = oldCenter + mouseCoordinatesInNewZoom - mouseCoordinatesInOldZoom
         zoomTo(new EastNorth(
-        center.east() - (x - getWidth()/2.0) * (newScale - scale),
-        center.north() + (y - getHeight()/2.0) * (newScale - scale)),
-        newScale);
+                center.east() - (x - getWidth()/2.0) * (newScale - scale),
+                center.north() + (y - getHeight()/2.0) * (newScale - scale)),
+                newScale);
     }
 
@@ -213 +213 @@
         // -20 to leave some border
         int w = getWidth()-20;
-        if (w < 20)
+        if (w < 20) {
             w = 20;
+        }
         int h = getHeight()-20;
-        if (h < 20)
+        if (h < 20) {
             h = 20;
+        }
 
         double scaleX = (box.max.east()-box.min.east())/w;
@@ -228 +230 @@
     public void zoomTo(Bounds box) {
         zoomTo(new ProjectionBounds(getProjection().latlon2eastNorth(box.min),
-        getProjection().latlon2eastNorth(box.max)));
+                getProjection().latlon2eastNorth(box.max)));
     }
 
@@ -238 +240 @@
         double minDistanceSq = snapDistance;
         Node minPrimitive = null;
-        for (Node n : getData().nodes) {
-            if (n.deleted || n.incomplete)
+        for (Node n : getCurrentDataSet().nodes) {
+            if (n.deleted || n.incomplete) {
                 continue;
+            }
             Point sp = getPoint(n);
             double dist = p.distanceSq(sp);
@@ -249 +252 @@
             // when multiple nodes on one point, prefer new or selected nodes
             else if(dist == minDistanceSq && minPrimitive != null
-            && ((n.id == 0 && n.selected)
-            || (!minPrimitive.selected && (n.selected || n.id == 0))))
+                    && ((n.id == 0 && n.selected)
+                            || (!minPrimitive.selected && (n.selected || n.id == 0)))) {
                 minPrimitive = n;
+            }
         }
         return minPrimitive;
@@ -264 +268 @@
     public final List<WaySegment> getNearestWaySegments(Point p) {
         TreeMap<Double, List<WaySegment>> nearest = new TreeMap<Double, List<WaySegment>>();
-        for (Way w : getData().ways) {
-            if (w.deleted || w.incomplete) continue;
+        for (Way w : getCurrentDataSet().ways) {
+            if (w.deleted || w.incomplete) {
+                continue;
+            }
             Node lastN = null;
             int i = -2;
             for (Node n : w.nodes) {
                 i++;
-                if (n.deleted || n.incomplete) continue;
+                if (n.deleted || n.incomplete) {
+                    continue;
+                }
                 if (lastN == null) {
                     lastN = n;
@@ -283 +291 @@
                 double perDist = a-(a-b+c)*(a-b+c)/4/c; // perpendicular distance squared
                 if (perDist < snapDistance && a < c+snapDistance && b < c+snapDistance) {
-                    if(w.selected) // prefer selected ways a little bit
+                    if(w.selected) {
                         perDist -= 0.00001;
+                    }
                     List<WaySegment> l;
                     if (nearest.containsKey(perDist)) {
@@ -315 +324 @@
     public final WaySegment getNearestWaySegment(Point p, Collection<WaySegment> ignore) {
         List<WaySegment> nearest = getNearestWaySegments(p);
-        if (ignore != null) nearest.removeAll(ignore);
+        if (ignore != null) {
+            nearest.removeAll(ignore);
+        }
         return nearest.isEmpty() ? null : nearest.get(0);
     }
@@ -376 +387 @@
     public Collection<OsmPrimitive> getAllNearest(Point p) {
         Collection<OsmPrimitive> nearest = new HashSet<OsmPrimitive>();
-            for (Way w : getData().ways) {
-            if (w.deleted || w.incomplete) continue;
+        for (Way w : getCurrentDataSet().ways) {
+            if (w.deleted || w.incomplete) {
+                continue;
+            }
             Node lastN = null;
             for (Node n : w.nodes) {
-                if (n.deleted || n.incomplete) continue;
+                if (n.deleted || n.incomplete) {
+                    continue;
+                }
                 if (lastN == null) {
                     lastN = n;
@@ -393 +408 @@
                 if (perDist < snapDistance && a < c+snapDistance && b < c+snapDistance) {
                     nearest.add(w);
-                        break;
-                    }
+                    break;
+                }
                 lastN = n;
-                }
-            }
-        for (Node n : getData().nodes) {
+            }
+        }
+        for (Node n : getCurrentDataSet().nodes) {
             if (!n.deleted && !n.incomplete
                     && getPoint(n).distanceSq(p) < snapDistance) {
@@ -417 +432 @@
     public Collection<Node> getNearestNodes(Point p) {
         Collection<Node> nearest = new HashSet<Node>();
-        for (Node n : getData().nodes) {
+        for (Node n : getCurrentDataSet().nodes) {
             if (!n.deleted && !n.incomplete
                     && getPoint(n).distanceSq(p) < snapDistance) {
@@ -436 +451 @@
     public final Collection<Node> getNearestNodes(Point p, Collection<Node> ignore) {
         Collection<Node> nearest = getNearestNodes(p);
-                if (nearest == null) return null;
-        if (ignore != null) nearest.removeAll(ignore);
+        if (nearest == null) return null;
+        if (ignore != null) {
+            nearest.removeAll(ignore);
+        }
         return nearest.isEmpty() ? null : nearest;
     }