Changeset 1852 in josm

Timestamp:

Jul 26, 2009 11:32:04 AM (4 years ago)

Author:

Gubaer

Message:

fixed #3094: Relation editor tries to download objects with id:0 from the server
Parent relations now also displayed for new relations

Location:

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

Files:

• ChildRelationBrowser.java (modified) (4 diffs)
• GenericRelationEditor.java (modified) (1 diff)

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

@@ -419 +419 @@
                 while(! relationsToDownload.isEmpty() && !cancelled) {
                     Relation r = relationsToDownload.pop();
+                    if (r.id == 0) {
+                        continue;
+                    }
                     rememberChildRelationsToDownload(r);
                     progressMonitor.setCustomText(tr("Downloading relation {0}", nameFormatter.getName(r)));
@@ -514 +517 @@
         }
 
+        protected void mergeDataSet(DataSet dataSet) {
+            if (dataSet != null) {
+                final MergeVisitor visitor = new MergeVisitor(getLayer().data, dataSet);
+                visitor.merge();
+                // FIXME: this is necessary because there are dialogs listening
+                // for DataChangeEvents which manipulate Swing components on this
+                // thread.
+                //
+                SwingUtilities.invokeLater(new Runnable() {
+                    public void run() {
+                        getLayer().fireDataChange();
+                    }
+                });
+                if (!visitor.getConflicts().isEmpty()) {
+                    getLayer().getConflicts().add(visitor.getConflicts());
+                    conflictsCount +=  visitor.getConflicts().size();
+                }
+            }
+        }
+
         @Override
         protected void realRun() throws SAXException, IOException, OsmTransferException {
@@ -521 +544 @@
                 while(it.hasNext() && !cancelled) {
                     Relation r = it.next();
+                    if (r.id == 0) {
+                        continue;
+                    }
                     progressMonitor.setCustomText(tr("Downloading relation {0}", nameFormatter.getName(r)));
                     OsmServerObjectReader reader = new OsmServerObjectReader(r.id, OsmPrimitiveType.RELATION,
@@ -526 +552 @@
                     DataSet dataSet = reader.parseOsm(progressMonitor
                             .createSubTaskMonitor(ProgressMonitor.ALL_TICKS, false));
-                    if (dataSet != null) {
-                        final MergeVisitor visitor = new MergeVisitor(getLayer().data, dataSet);
-                        visitor.merge();
-                        // FIXME: this is necessary because there are dialogs listening
-                        // for DataChangeEvents which manipulate Swing components on this
-                        // thread.
-                        //
-                        SwingUtilities.invokeLater(new Runnable() {
-                            public void run() {
-                                getLayer().fireDataChange();
-                            }
-                        });
-                        if (!visitor.getConflicts().isEmpty()) {
-                            getLayer().getConflicts().add(visitor.getConflicts());
-                            conflictsCount +=  visitor.getConflicts().size();
-                        }
-                    }
+                    mergeDataSet(dataSet);
                     refreshView(r);
                 }

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

@@ -161 +161 @@
         JTabbedPane tabbedPane = new JTabbedPane();
         tabbedPane.add(tr("Tags and Members"), pnl);
-        if (relation != null && relation.id > 0) {
-            referrerBrowser = new ReferringRelationsBrowser(getLayer(), referrerModel, this);
-            tabbedPane.add(tr("Parent Relations"), referrerBrowser);
-        }
+        referrerBrowser = new ReferringRelationsBrowser(getLayer(), referrerModel, this);
+        tabbedPane.add(tr("Parent Relations"), referrerBrowser);
         tabbedPane.add(tr("Child Relations"), new ChildRelationBrowser(getLayer(), relation));
         tabbedPane.addChangeListener(