Changeset 13915 in josm for trunk/src/org/openstreetmap/josm

Timestamp:

2018-06-11T01:28:39+02:00 (6 years ago)

Author:

Don-vip

Message:

move clearHighlighted*() default implementation from DataSet to OsmData

Location:

trunk/src/org/openstreetmap/josm/data/osm

Files:

• DataSet.java (modified) (1 diff)
• OsmData.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/data/osm/DataSet.java

@@ -745 +745 @@
 
     @Override
-    public void clearHighlightedVirtualNodes() {
-        setHighlightedVirtualNodes(new ArrayList<WaySegment>());
-    }
-
-    @Override
-    public void clearHighlightedWaySegments() {
-        setHighlightedWaySegments(new ArrayList<WaySegment>());
-    }
-
-    @Override
     public synchronized Area getDataSourceArea() {
         if (cachedDataSourceArea == null) {

trunk/src/org/openstreetmap/josm/data/osm/OsmData.java

@@ -2 +2 @@
 package org.openstreetmap.josm.data.osm;
 
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
@@ -281 +282 @@
      * clear all highlights of virtual nodes
      */
-    void clearHighlightedVirtualNodes();
+    default void clearHighlightedVirtualNodes() {
+        setHighlightedVirtualNodes(new ArrayList<WaySegment>());
+    }
 
     /**
      * clear all highlights of way segments
      */
-    void clearHighlightedWaySegments();
+    default void clearHighlightedWaySegments() {
+        setHighlightedWaySegments(new ArrayList<WaySegment>());
+    }
 
     /**