Changeset 2317 in josm for trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java

Timestamp:

2009-10-25T15:13:08+01:00 (17 years ago)

Author:

Gubaer

Message:

applied #3663: patch by singularita: Function to automatically download all missing relations members in all relations
Slightly updated and completed with context sensitive help, see also help

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java (modified) (5 diffs)

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

@@ -1203 +1203 @@
             if (!isEnabled())
                 return;
-            Main.worker.submit(new DownloadTask(GenericRelationEditor.this));
+            Main.worker.submit(new DownloadTask(
+                    Collections.singletonList(getRelation()),
+                    getLayer(),
+                    memberTableModel,
+                    GenericRelationEditor.this)
+            );
         }
 
@@ -1369 +1374 @@
      *
      */
-    class DownloadTask extends PleaseWaitRunnable {
+    public static class DownloadTask extends PleaseWaitRunnable {
         private boolean cancelled;
         private int conflictsCount;
         private Exception lastException;
-
-        public DownloadTask(Dialog parent) {
+        private List<Relation> relations;
+        private OsmDataLayer curLayer;
+        private MemberTableModel memberTableModel;
+
+        public DownloadTask(List<Relation> relations, OsmDataLayer curLayer, MemberTableModel memberTableModel, Dialog parent) {
             super(tr("Download relation members"), new PleaseWaitProgressMonitor(parent), false /*
              * don't
@@ -1380 +1388 @@
              * exception
              */);
+            this.relations = relations;
+            this.curLayer = curLayer;
+            this.memberTableModel = memberTableModel;
+        }
+
+        public DownloadTask(List<Relation> relations, OsmDataLayer curLayer, MemberTableModel memberTableModel) {
+            super(tr("Download relation members"), new PleaseWaitProgressMonitor(), false /*
+             * don't
+             * ignore
+             * exception
+             */);
+            this.relations = relations;
+            this.curLayer = curLayer;
+            this.memberTableModel = memberTableModel;
         }
 
@@ -1390 +1412 @@
         @Override
         protected void finish() {
+            Main.map.repaint();
             if (cancelled)
                 return;
-            memberTableModel.updateMemberReferences(getLayer().data);
+            if (memberTableModel != null) {
+                memberTableModel.fireTableDataChanged();
+            }
             if (lastException != null) {
                 ExceptionDialogUtil.explainException(lastException);
@@ -1410 +1435 @@
         protected void realRun() throws SAXException, IOException, OsmTransferException {
             try {
-                progressMonitor.indeterminateSubTask("");
-                OsmServerObjectReader reader = new OsmServerObjectReader(getRelation().getId(), OsmPrimitiveType.RELATION,
-                        true);
-                DataSet dataSet = reader.parseOsm(progressMonitor
-                        .createSubTaskMonitor(ProgressMonitor.ALL_TICKS, false));
-                if (dataSet != null) {
-                    final MergeVisitor visitor = new MergeVisitor(getLayer().data, dataSet);
-                    visitor.merge();
-
-                    // copy the merged layer's data source info
-                    for (DataSource src : dataSet.dataSources) {
-                        getLayer().data.dataSources.add(src);
+                boolean changed = false;
+                for (Relation relation : relations) {
+                    progressMonitor.indeterminateSubTask("");
+                    OsmServerObjectReader reader = new OsmServerObjectReader(relation.getId(), OsmPrimitiveType.RELATION,
+                            true);
+                    DataSet dataSet = reader.parseOsm(progressMonitor
+                            .createSubTaskMonitor(ProgressMonitor.ALL_TICKS, false));
+                    if (dataSet != null) {
+                        changed = true;
+                        final MergeVisitor visitor = new MergeVisitor(curLayer.data, dataSet);
+                        visitor.merge();
+
+                        // copy the merged layer's data source info
+                        for (DataSource src : dataSet.dataSources) {
+                            curLayer.data.dataSources.add(src);
+                        }
+                        if (!visitor.getConflicts().isEmpty()) {
+                            curLayer.getConflicts().add(visitor.getConflicts());
+                            conflictsCount = visitor.getConflicts().size();
+                        }
                     }
-                    // FIXME: this is necessary because there are dialogs listening
-                    // for DataChangeEvents which manipulate Swing components on this
-                    // thread.
-                    //
+                }
+                // FIXME: this is necessary because there are dialogs listening
+                // for DataChangeEvents which manipulate Swing components on this
+                // thread.
+                //
+                if (changed) {
                     SwingUtilities.invokeLater(new Runnable() {
                         public void run() {
-                            getLayer().fireDataChange();
+                            curLayer.fireDataChange();
                         }
                     });
-                    if (!visitor.getConflicts().isEmpty()) {
-                        getLayer().getConflicts().add(visitor.getConflicts());
-                        conflictsCount = visitor.getConflicts().size();
-                    }
                 }
             } catch (Exception e) {