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

Timestamp:

2008-08-22T21:25:28+02:00 (16 years ago)

Author:

stoecker

Message:

Prevent editing inactive layer. Fix layer oder and display order. Closes #371

File:

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

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

@@ -18 +18 @@
 import org.openstreetmap.josm.data.coor.EastNorth;
 import org.openstreetmap.josm.data.coor.LatLon;
+import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
@@ -49 +50 @@
         public NavigatableComponent() {
                 setLayout(null);
-    }
+        }
+
+        protected DataSet getData()
+        {
+                return Main.ds;
+        }
 
         /**
@@ -137 +143 @@
                 double minDistanceSq = Double.MAX_VALUE;
                 Node minPrimitive = null;
-                for (Node n : Main.ds.nodes) {
+                for (Node n : getData().nodes) {
                         if (n.deleted || n.incomplete)
                                 continue;
@@ -163 +169 @@
         public final List<WaySegment> getNearestWaySegments(Point p) {
                 TreeMap<Double, List<WaySegment>> nearest = new TreeMap<Double, List<WaySegment>>();
-                for (Way w : Main.ds.ways) {
+                for (Way w : getData().ways) {
                         if (w.deleted || w.incomplete) continue;
                         Node lastN = null;
@@ -273 +279 @@
         public Collection<OsmPrimitive> getAllNearest(Point p) {
                 Collection<OsmPrimitive> nearest = new HashSet<OsmPrimitive>();
-                        for (Way w : Main.ds.ways) {
+                        for (Way w : getData().ways) {
                         if (w.deleted || w.incomplete) continue;
                         Node lastN = null;
@@ -295 +301 @@
                                 }
                         }
-                for (Node n : Main.ds.nodes) {
+                for (Node n : getData().nodes) {
                         if (!n.deleted && !n.incomplete
                                         && getPoint(n.eastNorth).distanceSq(p) < snapDistance) {
@@ -314 +320 @@
         public Collection<Node> getNearestNodes(Point p) {
                 Collection<Node> nearest = new HashSet<Node>();
-                for (Node n : Main.ds.nodes) {
+                for (Node n : getData().nodes) {
                         if (!n.deleted && !n.incomplete
                                         && getPoint(n.eastNorth).distanceSq(p) < snapDistance) {