Changeset 2484 in josm

Timestamp:

Nov 19, 2009 6:09:12 PM (4 years ago)

Author:

Gubaer

Message:

fixed #3925: Download relation members takes a long time to return

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/osm/DataSetMerger.java (modified) (1 diff)
• gui/dialogs/RelationListDialog.java (modified) (3 diffs)
• gui/dialogs/relation/GenericRelationEditor.java (modified) (6 diffs)
• io/OsmServerObjectReader.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/osm/DataSetMerger.java

@@ -39 +39 @@
      */
     private Set<Long> childrenToMerge;
-
     private Set<OsmPrimitive> deletedObjectsToUnlink;
 

trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java

@@ -602 +602 @@
         }
 
+        public void addRelations(Collection<? extends OsmPrimitive> addedPrimitives) {
+            if (addedPrimitives == null || addedPrimitives.isEmpty()) return;
+            boolean added = false;
+            for (OsmPrimitive p: addedPrimitives) {
+                if (! (p instanceof Relation)) {
+                    continue;
+                }
+                if (relations.contains(p)) {
+                    continue;
+                }
+                relations.add((Relation)p);
+                added = true;
+            }
+            if (added) {
+                fireIntervalAdded(this, 0, getSize());
+            }
+        }
+
         public Object getElementAt(int index) {
             if (relations == null) return null;
@@ -681 +699 @@
 
     public void primtivesAdded(Collection<? extends OsmPrimitive> added) {
-        updateList();
+        model.addRelations(added);
     }
 
@@ -689 +707 @@
 
     public void relationMembersChanged(Relation r) {
-        updateList();
+        // trigger a repaint of the relation list
+        displaylist.repaint();
     }
 
     public void tagsChanged(OsmPrimitive prim) {
         if (prim instanceof Relation) {
-            updateList();
+            // trigger a repaint of the relation list
+            displaylist.repaint();
         }
     }

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

@@ -56 +56 @@
 import org.openstreetmap.josm.data.conflict.Conflict;
 import org.openstreetmap.josm.data.osm.DataSet;
-import org.openstreetmap.josm.data.osm.DataSetMerger;
-import org.openstreetmap.josm.data.osm.DataSource;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
@@ -1379 +1377 @@
     public static class DownloadTask extends PleaseWaitRunnable {
         private boolean cancelled;
-        private int conflictsCount;
         private Exception lastException;
         private List<Relation> relations;
@@ -1386 +1383 @@
 
         public DownloadTask(List<Relation> relations, OsmDataLayer curLayer, MemberTableModel memberTableModel, Dialog parent) {
-            super(tr("Download relation members"), new PleaseWaitProgressMonitor(parent), false /*
-             * don't
-             * ignore
-             * exception
-             */);
+            super(tr("Download relation members"), new PleaseWaitProgressMonitor(parent), false /* don't ignore exception */);
             this.relations = relations;
             this.curLayer = curLayer;
@@ -1397 +1390 @@
 
         public DownloadTask(List<Relation> relations, OsmDataLayer curLayer, MemberTableModel memberTableModel) {
-            super(tr("Download relation members"), new PleaseWaitProgressMonitor(), false /*
-             * don't
-             * ignore
-             * exception
-             */);
+            super(tr("Download relation members"), new PleaseWaitProgressMonitor(), false /* don't ignore exception */);
             this.relations = relations;
             this.curLayer = curLayer;
@@ -1424 +1413 @@
                 ExceptionDialogUtil.explainException(lastException);
             }
-
-            if (conflictsCount > 0) {
-                JOptionPane.showMessageDialog(
-                        Main.parent,
-                        tr("There were {0} conflicts during import.", conflictsCount),
-                        tr("Warning"),
-                        JOptionPane.WARNING_MESSAGE
-                );
-            }
         }
 
@@ -1438 +1418 @@
         protected void realRun() throws SAXException, IOException, OsmTransferException {
             try {
-                boolean changed = false;
                 for (Relation relation : relations) {
                     progressMonitor.indeterminateSubTask("");
                     OsmServerObjectReader reader = new OsmServerObjectReader(relation.getId(), OsmPrimitiveType.RELATION,
                             true);
-                    DataSet dataSet = reader.parseOsm(progressMonitor
+                    final DataSet dataSet = reader.parseOsm(progressMonitor
                             .createSubTaskMonitor(ProgressMonitor.ALL_TICKS, false));
-                    if (dataSet != null) {
-                        changed = true;
-                        final DataSetMerger visitor = new DataSetMerger(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.
-                //
-                if (changed) {
-                    SwingUtilities.invokeLater(new Runnable() {
-                        public void run() {
-                            curLayer.fireDataChange();
-                            curLayer.onPostDownloadFromServer();
-                        }
-                    });
+                    if (dataSet == null)
+                        return;
+                    // has to run on the EDT because mergeFrom may trigger events
+                    // which update the UI
+                    //
+                    SwingUtilities.invokeAndWait(
+                            new Runnable() {
+                                public void run() {
+                                    curLayer.mergeFrom(dataSet);
+                                    curLayer.fireDataChange();
+                                    curLayer.onPostDownloadFromServer();
+                                }
+                            }
+                    );
+
                 }
             } catch (Exception e) {

trunk/src/org/openstreetmap/josm/io/OsmServerObjectReader.java

@@ -34 +34 @@
         InputStream in = null;
         try {
-            progressMonitor.subTask(tr("Downloading OSM data..."));
+            progressMonitor.indeterminateSubTask(tr("Downloading OSM data..."));
             StringBuffer sb = new StringBuffer();
             sb.append(type.getAPIName());