Changeset 103 in josm for src/org/openstreetmap/josm/io/OsmWriter.java

Timestamp:

2006-07-01T00:56:23+02:00 (18 years ago)

Author:

imi

Message:

• fixed unicode compatibility
• added Layer menu which mirrors the layer list context menu
• added "convert to data layer" for all gps layers
• removed raw gpx import and 0.2 osm-file import
• removed dependency to JDOM

File:

• src/org/openstreetmap/josm/io/OsmWriter.java (modified) (5 diffs)

src/org/openstreetmap/josm/io/OsmWriter.java

@@ -1 +1 @@
 package org.openstreetmap.josm.io;
 
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
 import java.io.PrintWriter;
-import java.io.Writer;
+import java.io.UnsupportedEncodingException;
 import java.util.HashMap;
 import java.util.Map.Entry;
@@ -44 +46 @@
          *              is lost and id's remain 0 instead of decrementing from -1)
          */
-        public static void output(Writer out, DataSet ds, boolean osmConform) {
+        public static void output(OutputStream out, DataSet ds, boolean osmConform) {
                 OsmWriter writer = new OsmWriter(out, osmConform);
                 writer.out.println("<?xml version='1.0' encoding='UTF-8'?>");
@@ -55 +57 @@
                         writer.visit(w);
                 writer.out.println("</osm>");
+                writer.close();
         }
 
-        public static void outputSingle(Writer out, OsmPrimitive osm, boolean osmConform) {
+        public static void outputSingle(OutputStream out, OsmPrimitive osm, boolean osmConform) {
                 OsmWriter writer = new OsmWriter(out, osmConform);
                 writer.out.println(XmlWriter.header());
@@ -63 +66 @@
                 osm.visit(writer);
                 writer.out.println("</osm>");
+                writer.close();
         }
 
-        private OsmWriter(Writer out, boolean osmConform) {
-                if (out instanceof PrintWriter)
-                        this.out = (PrintWriter)out;
-                else
-                        this.out = new PrintWriter(out);
+        private OsmWriter(OutputStream out, boolean osmConform) {
+                try {
+                this.out = new PrintWriter(new OutputStreamWriter(out, "UTF-8"));
+        } catch (UnsupportedEncodingException e) {
+                throw new RuntimeException(e);
+        }
                 this.osmConform = osmConform;
         }
@@ -141 +146 @@
                 }
         }
+
+        public void close() {
+            out.close();
+    }
 }