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

Timestamp:

2009-09-20T11:46:08+02:00 (17 years ago)

Author:

Gubaer

Message:

fixed #3304: Upload failed - Placeholder Relation not found
fixed #2353: Wrong relation upload order results in 512 Precondition Failed
Warning: this is going to break plugins which register Upload Hooks. These plugins will be fixed shortly.

Location:

trunk/src/org/openstreetmap/josm/actions

Files:

• UploadAction.java (modified) (5 diffs)
• upload (added)
• upload/ApiPreconditionCheckerHook.java (moved) (moved from trunk/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java ) (3 diffs)
• upload/CyclicUploadDependencyException.java (added)
• upload/RelationUploadOrderHook.java (added)
• upload/UploadHook.java (added)
• upload/UploadParameterHook.java (added)

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

@@ -19 +19 @@
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.actions.upload.ApiPreconditionCheckerHook;
+import org.openstreetmap.josm.actions.upload.RelationUploadOrderHook;
+import org.openstreetmap.josm.actions.upload.UploadHook;
+import org.openstreetmap.josm.actions.upload.UploadParameterHook;
 import org.openstreetmap.josm.data.APIDataSet;
 import org.openstreetmap.josm.data.conflict.ConflictCollection;
@@ -67 +71 @@
          * Checks server capabilities before upload.
          */
-        uploadHooks.add(new ApiPreconditionChecker());
+        uploadHooks.add(new ApiPreconditionCheckerHook());
+
+        /**
+         * Adjusts the upload order of new relations
+         */
+        uploadHooks.add(new RelationUploadOrderHook());
 
         /**
@@ -73 +82 @@
          * give the user the possibility to cancel the upload.
          */
-        uploadHooks.add(new UploadConfirmationHook());
+        uploadHooks.add(new UploadParameterHook());
     }
 
@@ -99 +108 @@
         }
     }
-
-    /** Upload Hook */
-    public interface UploadHook {
-        /**
-         * Checks the upload.
-         * @param apiDataSet the data to upload
-         */
-        public boolean checkUpload(APIDataSet apiDataSet);
-    }
-
 
     public UploadAction() {
@@ -483 +482 @@
     }
 
-
-    static public class UploadConfirmationHook implements UploadHook {
-
-        public boolean checkUpload(APIDataSet apiData) {
-            final UploadDialog dialog = UploadDialog.getUploadDialog();
-            dialog.setUploadedPrimitives(apiData.getPrimitivesToAdd(),apiData.getPrimitivesToUpdate(), apiData.getPrimitivesToDelete());
-            dialog.setVisible(true);
-            if (dialog.isCanceled())
-                return false;
-            dialog.rememberUserInput();
-            return true;
-        }
-    }
-
     public UploadDiffTask createUploadTask(OsmDataLayer layer, Collection<OsmPrimitive> toUpload, Changeset changeset, boolean closeChangesetAfterUpload) {
         return new UploadDiffTask(layer, toUpload, changeset, closeChangesetAfterUpload);

trunk/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java

@@ -1 @@
-package org.openstreetmap.josm.actions;
+package org.openstreetmap.josm.actions.upload;
 
 import static org.openstreetmap.josm.tools.I18n.tr;
@@ -10 +10 @@
 
 import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.actions.UploadAction.UploadHook;
 import org.openstreetmap.josm.data.APIDataSet;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
@@ -19 +18 @@
 import org.openstreetmap.josm.io.OsmApiInitializationException;
 
-public class ApiPreconditionChecker implements UploadHook {
+public class ApiPreconditionCheckerHook implements UploadHook {
 
     public boolean checkUpload(APIDataSet apiData) {