Changeset 4645 in josm for trunk/src/org/openstreetmap/josm/io/OsmServerWriter.java

Timestamp:

2011-12-10T06:44:44+01:00 (12 years ago)

Author:

framm

Message:

Added three new hooks for plugins, allowing plugins to mess with JOSM's server I/O. Plugins can now add postprocessors to server reading (so they may change what JOSM receives from the OSM server), and they can add postprocessors to server writing (so they can react to an upload action *after* it happened and after IDs for new objects have been assigned - this is in addition to the existing UploadHook which is a server writing preprocessor). Thirdly, plugins can now substitute their own version of OsmWriter. Taken together, these changes make it possible for a plugin to introduce extra information from a non-OSM source into the JOSM editing process, and upon upload split away that extra information and send it to another destination. - Also made minor changes to CredentialDialog to allow plugins to subclass the dialog in case they need their own authentication.

File:

• trunk/src/org/openstreetmap/josm/io/OsmServerWriter.java (modified) (4 diffs)

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

@@ -36 +36 @@
      */
     private Collection<IPrimitive> processed;
+
+    private static ArrayList<OsmServerWritePostprocessor> postprocessors;
+    public static void registerPostprocessor(OsmServerWritePostprocessor pp) {
+        if (postprocessors == null) {
+            postprocessors = new ArrayList<OsmServerWritePostprocessor>();
+        }
+        postprocessors.add(pp);
+    }
+    public static void unregisterPostprocessor(OsmServerWritePostprocessor pp) {
+        if (postprocessors != null) {
+            postprocessors.remove(pp);
+        }
+    }
 
     private OsmApi api = OsmApi.getOsmApi();
@@ -205 +218 @@
             throw e;
         } finally {
+            executePostprocessors(monitor);
             monitor.finishTask();
             api.setChangeset(null);
@@ -216 +230 @@
             api.createPrimitive(osm, progressMonitor);
         } else {
-            api.modifyPrimitive(osm,progressMonitor);
+            api.modifyPrimitive(osm, progressMonitor);
         }
     }
@@ -235 +249 @@
         return processed;
     }
+
+    /**
+     * Calls all registered upload postprocessors.
+     */
+    public void executePostprocessors(ProgressMonitor pm) {
+        if (postprocessors != null) {
+            for (OsmServerWritePostprocessor pp : postprocessors) {
+                pp.postprocessUploadedPrimitives(processed, pm);
+            }
+        }
+    }
 }