Changeset 34926 in osm for applications/editors

Timestamp:

2019-03-20T20:34:00+01:00 (6 years ago)

Author:

donvip

Message:

fix java warnings

Location:

applications/editors/josm/plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes

Files:

• gui/RoadGui.java (modified) (2 diffs)
• gui/TurnLanesDialog.java (modified) (2 diffs)
• model/ModelContainer.java (modified) (1 diff)
• model/Turn.java (modified) (1 diff)

applications/editors/josm/plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/RoadGui.java

@@ -36 +36 @@
 
 import org.openstreetmap.josm.data.osm.Node;
-import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.plugins.turnlanes.model.Lane;
@@ -629 +628 @@
 
         final Node n = end.getJunction().getNode();
-        for (Way w : OsmPrimitive.getFilteredList(n.getReferrers(), Way.class)) {
+        for (Way w : org.openstreetmap.josm.tools.Utils.filteredCollection(n.getReferrers(), Way.class)) {
             if (w.getNodesCount() > 1 && !end.getWay().equals(w) && w.isFirstLastNode(n) && Utils.isRoad(w)) {
                 final Node nextNode = w.firstNode().equals(n) ? w.getNode(1) : w.getNode(w.getNodesCount() - 2);

applications/editors/josm/plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/TurnLanesDialog.java

@@ -9 +9 @@
 import java.awt.event.ActionEvent;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.HashSet;
-import java.util.List;
 import java.util.Set;
 
@@ -178 +176 @@
     void refresh() {
         if (isShowing && editing) {
-            final Collection<OsmPrimitive> s = Collections.unmodifiableCollection(selected);
-            final List<Node> nodes = OsmPrimitive.getFilteredList(s, Node.class);
-            final List<Way> ways = OsmPrimitive.getFilteredList(s, Way.class);
+            final Collection<Node> nodes = org.openstreetmap.josm.tools.Utils.filteredCollection(selected, Node.class);
+            final Collection<Way> ways = org.openstreetmap.josm.tools.Utils.filteredCollection(selected, Way.class);
 
             final ModelContainer mc = nodes.isEmpty() ? ModelContainer.empty() : ModelContainer

applications/editors/josm/plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/ModelContainer.java

@@ -61 +61 @@
         boolean closed = true;
 
-        for (Relation r : OsmPrimitive.getFilteredList(w.getReferrers(), Relation.class)) {
+        for (Relation r : org.openstreetmap.josm.tools.Utils.filteredCollection(w.getReferrers(), Relation.class)) {
             if (!r.get("type").equals(Constants.TYPE_TURNS)) {
                 continue;

applications/editors/josm/plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Turn.java

@@ -24 +24 @@
         final Set<Turn> result = new HashSet<>();
 
-        for (Relation r : OsmPrimitive.getFilteredList(primitive.getReferrers(), Relation.class)) {
+        for (Relation r : org.openstreetmap.josm.tools.Utils.filteredCollection(primitive.getReferrers(), Relation.class)) {
             if (!r.isUsable() || !r.get("type").equals(Constants.TYPE_TURNS)) {
                 continue;