Changeset 1523 in josm for trunk/src/org/openstreetmap/josm/io/XmlWriter.java

Timestamp:

2009-04-06T20:18:48+02:00 (15 years ago)

Author:

framm

Message:

• Major redesign of how JOSM talks to the OSM server. Connections now all go through a new OsmApi class that finds out which version the server uses. JOSM should now be able to handle 0.5 and 0.6 without configuration change. Config options osm-server.version and osm-server.additional-versions now obsolete. Handling of error and cancel situations might still need some improvement.

File:

• trunk/src/org/openstreetmap/josm/io/XmlWriter.java (modified) (3 diffs)

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

@@ -2 +2 @@
 package org.openstreetmap.josm.io;
 
-import java.io.OutputStream;
-import java.io.OutputStreamWriter;
 import java.io.PrintWriter;
-import java.io.UnsupportedEncodingException;
 import java.util.HashMap;
 
@@ -15 +12 @@
 public class XmlWriter {
 
-    /**
-     * The interface to write the data into an Osm stream
-     * @author immanuel.scholz
-     */
-    public static interface OsmWriterInterface {
-        void header(PrintWriter out);
-        void write(PrintWriter out);
-        void footer(PrintWriter out);
-    }
-
-
-    protected XmlWriter(PrintWriter out) {
+    protected PrintWriter out;
+    
+    public XmlWriter(PrintWriter out) {
         this.out = out;
     }
-
+    
     /**
      * Encode the given string in XML1.0 format.
@@ -49 +37 @@
 
     /**
-     * Write the header and start tag, then call the runnable to add all real tags and finally
-     * "closes" the xml by writing the footer.
-     */
-    public static void output(OutputStream outStream, OsmWriterInterface outputWriter) {
-        PrintWriter out;
-        try {
-            out = new PrintWriter(new OutputStreamWriter(outStream, "UTF-8"));
-        } catch (UnsupportedEncodingException e) {
-            throw new RuntimeException(e);
-        }
-        out.println("<?xml version='1.0' encoding='UTF-8'?>");
-        outputWriter.header(out);
-        outputWriter.write(out);
-        outputWriter.footer(out);
-        out.flush();
-        out.close();
-    }
-
-    /**
      * The output writer to save the values to.
      */
-    protected final PrintWriter out;
     final private static HashMap<Character, String> encoding = new HashMap<Character, String>();
     static {