Changeset 4645 in josm for trunk/src/org/openstreetmap/josm/io/OsmApi.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/OsmApi.java (modified) (7 diffs)

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

@@ -31 +31 @@
 import org.openstreetmap.josm.data.osm.IPrimitive;
 import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
+import org.openstreetmap.josm.gui.layer.ImageryLayer;
 import org.openstreetmap.josm.gui.layer.Layer;
-import org.openstreetmap.josm.gui.layer.ImageryLayer;
 import org.openstreetmap.josm.gui.progress.NullProgressMonitor;
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
@@ -107 +107 @@
      */
     private boolean initialized = false;
-
-    private StringWriter swriter = new StringWriter();
-    private OsmWriter osmWriter = new OsmWriter(new PrintWriter(swriter), true, null);
 
     /**
@@ -175 +172 @@
                     serverUrl,
                     version));
-            osmWriter.setVersion(version);
             initialized = true;
 
-            /* This is an interim solution for openstreetmap.org not currently 
+            /* This is an interim solution for openstreetmap.org not currently
              * transmitting their imagery blacklist in the capabilities call.
              * remove this as soon as openstreetmap.org adds blacklists. */
@@ -191 +187 @@
             /* This checks if there are any layers currently displayed that
              * are now on the blacklist, and removes them. This is a rare
-             * situaton - probably only occurs if the user changes the API URL
+             * situation - probably only occurs if the user changes the API URL
              * in the preferences menu. Otherwise they would not have been able
              * to load the layers in the first place becuase they would have
@@ -228 +224 @@
      */
     private String toXml(IPrimitive o, boolean addBody) {
+        StringWriter swriter = new StringWriter();
+        OsmWriter osmWriter = OsmWriterFactory.createOsmWriter(new PrintWriter(swriter), true, version);
         swriter.getBuffer().setLength(0);
         osmWriter.setWithBody(addBody);
@@ -234 +232 @@
         o.visit(osmWriter);
         osmWriter.footer();
-        osmWriter.out.flush();
+        osmWriter.flush();
         return swriter.toString();
     }
@@ -245 +243 @@
      */
     private String toXml(Changeset s) {
+        StringWriter swriter = new StringWriter();
+        OsmWriter osmWriter = OsmWriterFactory.createOsmWriter(new PrintWriter(swriter), true, version);
         swriter.getBuffer().setLength(0);
         osmWriter.header();
         osmWriter.visit(s);
         osmWriter.footer();
-        osmWriter.out.flush();
+        osmWriter.flush();
         return swriter.toString();
     }