Changeset 1894 in josm for trunk/src/org/openstreetmap/josm/actions

Timestamp:

2009-08-03T15:00:34+02:00 (17 years ago)

Author:

Gubaer

Message:

fixed #3158: modify status is not removed for partial uploads

Location:

trunk/src/org/openstreetmap/josm/actions

Files:

• SaveActionBase.java (modified) (1 diff)
• UploadAction.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/actions/SaveActionBase.java

@@ -216 +216 @@
                 return;
             }
-            layer.cleanData(null, false);
+            layer.cleanupAfterSaveToDisk();
         } catch (IOException e) {
             e.printStackTrace();

trunk/src/org/openstreetmap/josm/actions/UploadAction.java

@@ -235 +235 @@
         );
         switch(ret) {
-        case JOptionPane.CLOSED_OPTION: return;
-        case JOptionPane.CANCEL_OPTION: return;
-        case 0: synchronizePrimitive(id); break;
-        case 1: synchronizeDataSet(); break;
-        default:
-            // should not happen
-            throw new IllegalStateException(tr("unexpected return value. Got {0}", ret));
+            case JOptionPane.CLOSED_OPTION: return;
+            case JOptionPane.CANCEL_OPTION: return;
+            case 0: synchronizePrimitive(id); break;
+            case 1: synchronizeDataSet(); break;
+            default:
+                // should not happen
+                throw new IllegalStateException(tr("unexpected return value. Got {0}", ret));
         }
     }
@@ -274 +274 @@
         );
         switch(ret) {
-        case JOptionPane.CLOSED_OPTION: return;
-        case 1: return;
-        case 0: synchronizeDataSet(); break;
-        default:
-            // should not happen
-            throw new IllegalStateException(tr("unexpected return value. Got {0}", ret));
+            case JOptionPane.CLOSED_OPTION: return;
+            case 1: return;
+            case 0: synchronizeDataSet(); break;
+            default:
+                // should not happen
+                throw new IllegalStateException(tr("unexpected return value. Got {0}", ret));
         }
     }
@@ -537 +537 @@
             try {
                 writer.uploadOsm(getCurrentDataSet().version, toUpload, progressMonitor.createSubTaskMonitor(ProgressMonitor.ALL_TICKS, false));
-                getEditLayer().cleanData(writer.processed, !toUpload.isEmpty());
             } catch (Exception sxe) {
                 if (uploadCancelled) {
@@ -550 +549 @@
             if (uploadCancelled)
                 return;
+
+            // we always clean the data, even in case of errors. It's possible the data was
+            // partially uploaded
+            //
+            getEditLayer().cleanupAfterUpload(writer.getProcessedPrimitives());
             if (lastException != null) {
                 handleFailedUpload(lastException);