OsmPrimitive.getFilteredList() and OsmPrimitive.getFilteredSet() are …

…deprecated Copied a copy of the methods to ContourMergeModel
Gubaer · Jan 8, 2019 · 26c1d75 · 26c1d75
1 parent 4c7a2ab
commit 26c1d75
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 6 deletions.
diff --git a/src/main/java/org/openstreetmap/josm/plugins/contourmerge/ContourMergeMode.java b/src/main/java/org/openstreetmap/josm/plugins/contourmerge/ContourMergeMode.java
@@ -135,7 +135,7 @@ public void mouseClicked(MouseEvent e) {
             List<Node> candidates = getMapView().getNearestNodes(e.getPoint(),
                     OsmPrimitive::isSelectable);
             if (!candidates.isEmpty()){
-                if (!OsmPrimitive.getFilteredList(
+                if (!ContourMergeModel.getFilteredList(
                         candidates.get(0).getReferrers(),
                         Way.class).isEmpty()) {
                     /*
@@ -181,15 +181,15 @@ public void mouseMoved(MouseEvent e) {
                     getMapView().setCursor(ImageProvider.getCursor("normal",
                             "contourmerge_deselect_node"));
                 } else {
-                    if (OsmPrimitive.getFilteredList(
+                    if (ContourMergeModel.getFilteredList(
                             candidates.get(0).getReferrers(),
                             Way.class).isEmpty()) {
                         showHelpText(tr("Can''t select an isolated node"));
                         getMapView().setCursor(DragSource.DefaultMoveNoDrop);
                     } else {
                         showHelpText(tr("Left-Click: select node"));
                         getMapView().setCursor(ImageProvider.getCursor("normal",
-                                "contourmerge_select_node"));
+                            "contourmerge_select_node"));
                     }
                 }
                 model.setFeedbackNode(candidates.get(0));

diff --git a/src/main/java/org/openstreetmap/josm/plugins/contourmerge/ContourMergeModel.java b/src/main/java/org/openstreetmap/josm/plugins/contourmerge/ContourMergeModel.java
@@ -25,6 +25,22 @@
  * specific edit layer, if the <tt>contourmerge</tt> map mode is enabled.</p>
  */
 public class ContourMergeModel implements DataSetListener{
+    public static <T extends OsmPrimitive> List<T> getFilteredList(
+            Collection<OsmPrimitive> list, Class<T> type) {
+        return (list != null ? list.stream() : Stream.empty())
+                .filter(type::isInstance)
+                .map(type::cast)
+                .collect(Collectors.toList());
+    }
+
+    public static <T extends OsmPrimitive> Set<T> getFilteredSet(
+            Collection<OsmPrimitive> set, Class<T> type) {
+        return (set != null ? set.stream() : Stream.empty())
+                .filter(type::isInstance)
+                .map(type::cast)
+                .collect(Collectors.toCollection(LinkedHashSet::new));
+    }
+
 
     @SuppressWarnings("unused")
     static private final Logger logger =
@@ -200,7 +216,7 @@ public WaySegment getDropFeedbackSegment(){
      */
     protected Set<Way> computeSelectedWays(){
         return selectedNodes.stream()
-            .flatMap(n -> OsmPrimitive.getFilteredList(
+            .flatMap(n -> getFilteredList(
                 n.getReferrers(),Way.class
             ).stream())
             .collect(Collectors.toSet());
@@ -214,7 +230,7 @@ protected Set<Way> computeSelectedWays(){
      */
     protected Set<Node> computeSelectedNodesOnWay(Way way){
         return selectedNodes.stream()
-            .filter(n -> OsmPrimitive.getFilteredSet(n.getReferrers(),
+            .filter(n -> getFilteredSet(n.getReferrers(),
                     Way.class).contains(way)
              )
             .collect(Collectors.toSet());
@@ -539,7 +555,7 @@ protected void ensureSelectedNodesConsistent() {
             Node n = it.next();
             if (!layer.data.getNodes().contains(n)) {
                 it.remove();
-            } else if (OsmPrimitive.getFilteredSet(n.getReferrers(),
+            } else if (getFilteredSet(n.getReferrers(),
                     Way.class).isEmpty()) {
                 it.remove();
             } else if (n.isDeleted()) {