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

Timestamp:

2009-09-27T16:29:21+02:00 (15 years ago)

Author:

Gubaer

Message:

fixed #3249: Resolve conflicts between invisible and deleted primitives automatically

Location:

trunk/src/org/openstreetmap/josm/io

Files:

• OsmApi.java (modified) (3 diffs)
• OsmApiPrimitiveGoneException.java (added)
• OsmServerWriter.java (modified) (5 diffs)

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

@@ -398 +398 @@
      *
      * @param list the list of changed OSM Primitives
+     * @param  monitor the progress monitor
      * @return list of processed primitives
      * @throws OsmTransferException if something is wrong
      */
-    public Collection<OsmPrimitive> uploadDiff(Collection<OsmPrimitive> list, ProgressMonitor progressMonitor) throws OsmTransferException {
+    public Collection<OsmPrimitive> uploadDiff(Collection<OsmPrimitive> list, ProgressMonitor monitor) throws OsmTransferException {
         try {
-            progressMonitor.beginTask("", list.size() * 2);
+            monitor.beginTask("", list.size() * 2);
             if (changeset == null)
                 throw new OsmTransferException(tr("No changeset present for diff upload."));
 
-            initialize(progressMonitor);
+            initialize(monitor);
             final ArrayList<OsmPrimitive> processed = new ArrayList<OsmPrimitive>();
 
             CreateOsmChangeVisitor duv = new CreateOsmChangeVisitor(changeset, OsmApi.this);
 
-            progressMonitor.subTask(tr("Preparing..."));
+            monitor.subTask(tr("Preparing..."));
             for (OsmPrimitive osm : list) {
                 osm.visit(duv);
-                progressMonitor.worked(1);
+                monitor.worked(1);
             }
-            progressMonitor.indeterminateSubTask(tr("Uploading..."));
+            monitor.indeterminateSubTask(tr("Uploading..."));
 
             String diff = duv.getDocument();
-            String diffresult = sendRequest("POST", "changeset/" + changeset.getId() + "/upload", diff,progressMonitor);
+            String diffresult = sendRequest("POST", "changeset/" + changeset.getId() + "/upload", diff,monitor);
             DiffResultReader.parseDiffResult(diffresult, list, processed, duv.getNewIdMap(),
-                    progressMonitor.createSubTaskMonitor(ProgressMonitor.ALL_TICKS, false));
+                    monitor.createSubTaskMonitor(ProgressMonitor.ALL_TICKS, false));
             return processed;
         } catch(OsmTransferException e) {
@@ -429 +430 @@
             throw new OsmTransferException(e);
         } finally {
-            progressMonitor.finishTask();
-        }
-    }
-
-
+            monitor.finishTask();
+        }
+    }
 
     private void sleepAndListen(int retry, ProgressMonitor monitor) throws OsmTransferCancelledException {
@@ -548 +547 @@
                 activeConnection.disconnect();
 
-                if (retCode != 200)
-                    throw new OsmApiException(
-                            retCode,
-                            errorHeader == null? null : errorHeader.trim(),
-                                    responseBody == null ? null : responseBody.toString().trim()
-                    );
-
+                errorHeader = errorHeader == null? null : errorHeader.trim();
+                String errorBody = responseBody == null ? null : responseBody.toString().trim();
+                switch(retCode) {
+                    case HttpURLConnection.HTTP_OK:
+                        break; // do nothing
+                    case HttpURLConnection.HTTP_GONE:
+                        throw new OsmApiPrimitiveGoneException(errorHeader, errorBody);
+                    default:
+                        throw new OsmApiException(retCode, errorHeader, errorBody);
+
+                }
                 return responseBody.toString();
             } catch (UnknownHostException e) {

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

@@ -13 +13 @@
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
+import org.openstreetmap.josm.gui.progress.NullProgressMonitor;
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
 
@@ -111 +112 @@
      */
     protected void uploadChangesAsDiffUpload(Collection<OsmPrimitive> primitives, ProgressMonitor progressMonitor) throws OsmTransferException {
-        // upload everything in one changeset
-        //
         try {
             progressMonitor.beginTask(tr("Starting to upload in one request ..."));
@@ -130 +129 @@
      * @param apiVersion version of the data set
      * @param primitives list of objects to send
-     */
-    public void uploadOsm(String apiVersion, Collection<OsmPrimitive> primitives, Changeset changeset, boolean closeChangesetAfterUpload, ProgressMonitor progressMonitor) throws OsmTransferException {
+     * @param changeset the changeset the data is uploaded to. Must not be null.
+     * @param monitor the progress monitor. If null, assumes {@see NullProgressMonitor#INSTANCE}
+     * @throws IllegalArgumentException thrown if changeset is null
+     * @throws OsmTransferException thrown if something goes wrong
+     */
+    public void uploadOsm(String apiVersion, Collection<OsmPrimitive> primitives, Changeset changeset, ProgressMonitor monitor) throws OsmTransferException {
+        if (changeset == null)
+            throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null", "changeset"));
         processed = new LinkedList<OsmPrimitive>();
-        progressMonitor.beginTask(tr("Uploading data ..."));
-        api.initialize(progressMonitor);
+        monitor = monitor == null ? NullProgressMonitor.INSTANCE : monitor;
+        monitor.beginTask(tr("Uploading data ..."));
         try {
+            api.initialize(monitor);
             // check whether we can use diff upload
             //
-            boolean casUseDiffUploads = api.hasSupportForDiffUploads();
+            boolean canUseDiffUpload = api.hasSupportForDiffUploads();
             if (apiVersion == null) {
                 System.out.println(tr("WARNING: no API version defined for data to upload. Falling back to version 0.6"));
@@ -144 +150 @@
             }
             boolean useDiffUpload = Main.pref.getBoolean("osm-server.atomic-upload", apiVersion.compareTo("0.6")>=0);
-            if (useDiffUpload && ! casUseDiffUploads) {
+            if (useDiffUpload && ! canUseDiffUpload) {
                 System.out.println(tr("WARNING: preference ''{0}'' or API version ''{1}'' of dataset requires to use diff uploads, but API is not able to handle them. Ignoring diff upload.", "osm-server.atomic-upload", apiVersion));
                 useDiffUpload = false;
             }
-            if (changeset == null) {
-                changeset = new Changeset();
-            }
             if (changeset.getId() == 0) {
-                api.openChangeset(changeset,progressMonitor.createSubTaskMonitor(0, false));
+                api.openChangeset(changeset,monitor.createSubTaskMonitor(0, false));
             } else {
-                api.updateChangeset(changeset,progressMonitor.createSubTaskMonitor(0, false));
+                api.updateChangeset(changeset,monitor.createSubTaskMonitor(0, false));
             }
             api.setChangeset(changeset);
             if (useDiffUpload) {
-                uploadChangesAsDiffUpload(primitives,progressMonitor.createSubTaskMonitor(0,false));
+                uploadChangesAsDiffUpload(primitives,monitor.createSubTaskMonitor(0,false));
             } else {
-                uploadChangesIndividually(primitives,progressMonitor.createSubTaskMonitor(0,false));
+                uploadChangesIndividually(primitives,monitor.createSubTaskMonitor(0,false));
             }
         } catch(OsmTransferException e) {
@@ -167 +170 @@
             throw new OsmTransferException(e);
         } finally {
-            try {
-                if (closeChangesetAfterUpload && api.getChangeset() != null && api.getChangeset().getId() > 0) {
-                    api.closeChangeset(changeset,progressMonitor.createSubTaskMonitor(0, false));
-                    api.setChangeset(null);
-                }
-            } catch (Exception ee) {
-                OsmChangesetCloseException closeException = new OsmChangesetCloseException(ee);
-                closeException.setChangeset(api.getChangeset());
-                throw closeException;
-            } finally {
-                progressMonitor.finishTask();
-            }
+            monitor.finishTask();
+            api.setChangeset(null);
         }
     }