Changeset 4154 in josm for trunk/src/org/openstreetmap/josm/gui

Timestamp:

2011-06-21T17:16:51+02:00 (14 years ago)

Author:

stoecker

Message:

fix #6414 - downloading incomplete members

Location:

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

Files:

• DownloadRelationMemberTask.java (modified) (4 diffs)
• GenericRelationEditor.java (modified) (2 diffs)

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

@@ -41 +41 @@
     public DownloadRelationMemberTask(Relation parent, Collection<OsmPrimitive> children, OsmDataLayer curLayer, Dialog dialog) {
         super(tr("Download relation members"), new PleaseWaitProgressMonitor(dialog), false /* don't ignore exception */);
-        this.parents.add(parent);
+        if(parent != null)
+            this.parents.add(parent);
         this.children = children;
         this.curLayer = curLayer;
@@ -48 +49 @@
     public DownloadRelationMemberTask(Relation parent, Collection<OsmPrimitive> children, OsmDataLayer curLayer) {
         super(tr("Download relation members"), false /* don't ignore exception */);
-        this.parents.add(parent);
+        if(parent != null)
+            this.parents.add(parent);
         this.children = children;
         this.curLayer = curLayer;
@@ -89 +91 @@
 
     protected String buildDownloadFeedbackMessage() {
-        if (parents.size() == 1) {
+        if (parents.size() == 0) {
+            return trn("Downloading {0} incomplete object",
+                    "Downloading {0} incomplete objects",
+                    children.size(),
+                    children.size());
+        } else if (parents.size() == 1) {
             Relation parent = parents.iterator().next();
             return trn("Downloading {0} incomplete child of relation ''{1}''",
@@ -95 +102 @@
                     children.size(),
                     children.size(),
-                    parent.getDisplayName(DefaultNameFormatter.getInstance())
-            );
-        } else
+                    parent.getDisplayName(DefaultNameFormatter.getInstance()));
+        } else {
             return trn("Downloading {0} incomplete child of {1} parent relations",
                     "Downloading {0} incomplete children of  {1} parent relations",
                     children.size(),
                     children.size(),
-                    parents.size()
-            );
+                    parents.size());
+        }
     }
 

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

@@ -1317 +1317 @@
 
         protected void updateEnabledState() {
-            setEnabled(
-                    getRelation() != null
-                    && memberTableModel.hasIncompleteMembers()
-            );
+            setEnabled(memberTableModel.hasIncompleteMembers());
         }
 
@@ -1350 +1347 @@
 
         protected void updateEnabledState() {
-            setEnabled(
-                    getRelation() != null
-                    && memberTableModel.hasIncompleteSelectedMembers()
-            );
+            setEnabled(memberTableModel.hasIncompleteSelectedMembers());
         }