Changeset 15240 in josm for trunk/src/org

Timestamp:

2019-07-10T23:58:43+02:00 (5 years ago)

Author:

Don-vip

Message:

fix #17910 - Enable download of incomplete members from cloned relations in relation editor

Location:

trunk/src/org/openstreetmap/josm/gui/dialogs/relation

Files:

• MemberTableModel.java (modified) (5 diffs)
• actions/AbstractRelationEditorAction.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableModel.java

@@ -20 +20 @@
 import javax.swing.table.AbstractTableModel;
 
+import org.openstreetmap.josm.data.osm.AbstractPrimitive;
 import org.openstreetmap.josm.data.osm.DataSelectionListener;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
@@ -381 +382 @@
      */
     public Set<OsmPrimitive> getIncompleteMemberPrimitives() {
-        Set<OsmPrimitive> ret = new HashSet<>();
-        for (RelationMember member : members) {
-            if (member.getMember().isIncomplete()) {
-                ret.add(member.getMember());
-            }
-        }
-        return ret;
+        return members.stream().map(RelationMember::getMember).filter(AbstractPrimitive::isIncomplete).collect(Collectors.toSet());
     }
 
@@ -396 +391 @@
      */
     public Set<OsmPrimitive> getSelectedIncompleteMemberPrimitives() {
-        Set<OsmPrimitive> ret = new HashSet<>();
-        for (RelationMember member : getSelectedMembers()) {
-            if (member.getMember().isIncomplete()) {
-                ret.add(member.getMember());
-            }
-        }
-        return ret;
+        return getSelectedMembers().stream().map(RelationMember::getMember).filter(AbstractPrimitive::isIncomplete).collect(Collectors.toSet());
     }
 
@@ -411 +400 @@
      */
     public boolean hasIncompleteMembers() {
-        for (RelationMember member : members) {
-            if (member.getMember().isIncomplete())
-                return true;
-        }
-        return false;
+        return members.stream().anyMatch(rm -> rm.getMember().isIncomplete());
     }
 
@@ -424 +409 @@
      */
     public boolean hasIncompleteSelectedMembers() {
-        for (RelationMember member : getSelectedMembers()) {
-            if (member.getMember().isIncomplete())
-                return true;
-        }
-        return false;
+        return getSelectedMembers().stream().anyMatch(rm -> rm.getMember().isIncomplete());
     }
 

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/AbstractRelationEditorAction.java

@@ -90 +90 @@
 
     protected final boolean canDownload() {
-        if (editorAccess.getEditor().getRelation() == null)
-            return false;
-        DataSet ds = editorAccess.getEditor().getRelation().getDataSet();
+        DataSet ds = editorAccess.getEditor().getLayer().getDataSet();
         return !NetworkManager.isOffline(OnlineResource.OSM_API) && ds != null && !ds.isLocked()
                 && DownloadPolicy.BLOCKED != ds.getDownloadPolicy();