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

Timestamp:

2009-11-21T20:13:15+01:00 (14 years ago)

Author:

Gubaer

Message:

Code related to #3999. Uncommented for the time being.

File:

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

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

@@ -76 +76 @@
 import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionCache;
 import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionList;
-import org.openstreetmap.josm.io.OsmApi;
+import org.openstreetmap.josm.io.OsmServerBackreferenceReader;
 import org.openstreetmap.josm.io.OsmServerObjectReader;
 import org.openstreetmap.josm.io.OsmTransferException;
@@ -87 +87 @@
  *
  */
-public class GenericRelationEditor extends RelationEditor {
+public class GenericRelationEditor extends RelationEditor  {
 
     static private final Logger logger = Logger.getLogger(GenericRelationEditor.class.getName());
@@ -1381 +1381 @@
         private OsmDataLayer curLayer;
         private MemberTableModel memberTableModel;
+        private OsmServerObjectReader objectReader;
+        private OsmServerBackreferenceReader parentReader;
 
         public DownloadTask(List<Relation> relations, OsmDataLayer curLayer, MemberTableModel memberTableModel, Dialog parent) {
@@ -1399 +1401 @@
         protected void cancel() {
             cancelled = true;
-            OsmApi.getOsmApi().cancel();
+            synchronized(this) {
+                if (objectReader != null) {
+                    objectReader.cancel();
+                } else if (parentReader != null) {
+                    parentReader.cancel();
+                }
+            }
         }
 
@@ -1419 +1427 @@
             try {
                 for (Relation relation : relations) {
-                    progressMonitor.indeterminateSubTask("");
-                    OsmServerObjectReader reader = new OsmServerObjectReader(relation.getId(), OsmPrimitiveType.RELATION,
-                            true);
-                    final DataSet dataSet = reader.parseOsm(progressMonitor
+                    // download the relation
+                    //
+                    progressMonitor.indeterminateSubTask(tr("Downloading relation ''{0}''", relation.getDisplayName(DefaultNameFormatter.getInstance())));
+                    synchronized(this) {
+                        if (cancelled) return;
+                        objectReader = new OsmServerObjectReader(relation.getId(), OsmPrimitiveType.RELATION, true /* full download */);
+                    }
+                    final DataSet dataSet = objectReader.parseOsm(progressMonitor
                             .createSubTaskMonitor(ProgressMonitor.ALL_TICKS, false));
                     if (dataSet == null)
                         return;
+                    synchronized (this) {
+                        if (cancelled) return;
+                        objectReader = null;
+                    }
+
+                    // download referring objects of the downloaded member objects
+                    //
+                    // asked for in #3999, but uncommented for the time being. Could be used
+                    // later, perhaps if user explicity requests so (for instance by checking
+                    // a checkbox)
+                    //                    for (OsmPrimitive p: relation.getMemberPrimitives()) {
+                    //                        synchronized(this) {
+                    //                            if (cancelled) return;
+                    //                            parentReader = new OsmServerBackreferenceReader(p);
+                    //                        }
+                    //                        DataSet parents = parentReader.parseOsm(progressMonitor.createSubTaskMonitor(1, false));
+                    //                        synchronized(this) {
+                    //                            if (cancelled) return;
+                    //                            parentReader = null;
+                    //                        }
+                    //                        DataSetMerger merger = new DataSetMerger(dataSet, parents);
+                    //                        merger.merge();
+                    //                    }
+                    //                    if (cancelled) return;
+
                     // has to run on the EDT because mergeFrom may trigger events
                     // which update the UI
@@ -1438 +1475 @@
                             }
                     );
-
                 }
             } catch (Exception e) {