Changeset 2303 in josm for trunk/src/org/openstreetmap/josm/io

Timestamp:

2009-10-24T10:20:45+02:00 (15 years ago)

Author:

Gubaer

Message:

see #3761: Precondition failed: Node is still used by way
Also added help for this use case, see help

File:

• trunk/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java (modified) (6 diffs)

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

@@ -14 +14 @@
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.data.osm.visitor.MergeVisitor;
+import org.openstreetmap.josm.gui.progress.NullProgressMonitor;
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
 
@@ -134 +135 @@
         progressMonitor.beginTask(null, 2);
         try {
-            progressMonitor.indeterminateSubTask(tr("Contacting OSM Server..."));
+            progressMonitor.indeterminateSubTask(tr("Downloading from OSM Server..."));
             StringBuffer sb = new StringBuffer();
             sb.append(primitiveType.getAPIName())
@@ -160 +161 @@
         }
     }
-    /**
-
+
+    /**
      * Reads referring relations from the API server and replies them in a {@see DataSet}
      *
+     * @param progressMonitor the progress monitor
      * @return the data set
      * @throws OsmTransferException
@@ -213 +215 @@
      *
      * @param ds the original dataset
+     * @param progressMonitor  the progress monitor
      * @return the modified dataset
      * @throws OsmTransferException thrown if an exception occurs.
@@ -251 +254 @@
      * replies them as {@see DataSet}
      *
+     * @param progressMonitor the progress monitor. Set to {@see NullProgressMonitor#INSTANCE} if null.
      * @return the dataset with the referring primitives
      * @exception OsmTransferException thrown if an error occurs while communicating with the server
@@ -256 +260 @@
     @Override
     public DataSet parseOsm(ProgressMonitor progressMonitor) throws OsmTransferException {
-        progressMonitor.beginTask(null, 3);
-        try {
+        if (progressMonitor == null) {
+            progressMonitor = NullProgressMonitor.INSTANCE;
+        }
+        try {
+            progressMonitor.beginTask(null, 3);
             DataSet ret = new DataSet();
             if (primitiveType.equals(OsmPrimitiveType.NODE)) {