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

Timestamp:

2016-06-16T12:37:18+02:00 (8 years ago)

Author:

Don-vip

Message:

gsoc-core - remove more deprecation warnings

File:

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

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

@@ -304 +304 @@
     }
 
+    /**
+     * Returns current data set. To be removed: end of 2016.
+     * @return current data set
+     * @deprecated Use {@link Main#getLayerManager()}.getEditDataSet() instead.
+     */
+    @Deprecated
     protected DataSet getCurrentDataSet() {
         return Main.main.getCurrentDataSet();
@@ -794 +800 @@
     private Map<Double, List<Node>> getNearestNodesImpl(Point p, Predicate<OsmPrimitive> predicate) {
         Map<Double, List<Node>> nearestMap = new TreeMap<>();
-        DataSet ds = getCurrentDataSet();
+        DataSet ds = Main.getLayerManager().getEditDataSet();
 
         if (ds != null) {
@@ -1003 +1009 @@
     private Map<Double, List<WaySegment>> getNearestWaySegmentsImpl(Point p, Predicate<OsmPrimitive> predicate) {
         Map<Double, List<WaySegment>> nearestMap = new TreeMap<>();
-        DataSet ds = getCurrentDataSet();
+        DataSet ds = Main.getLayerManager().getEditDataSet();
 
         if (ds != null) {
@@ -1364 +1370 @@
     public final OsmPrimitive getNearestNodeOrWay(Point p, Predicate<OsmPrimitive> predicate, boolean useSelected) {
         Collection<OsmPrimitive> sel;
-        DataSet ds = getCurrentDataSet();
+        DataSet ds = Main.getLayerManager().getEditDataSet();
         if (useSelected && ds != null) {
             sel = ds.getSelected();