Changeset 12066 in josm for trunk

Timestamp:

2017-05-05T21:50:01+02:00 (7 years ago)

Author:

stoecker

Message:

see #14655 - enforce UTF-8 for output in files

File:

• trunk/scripts/SyncEditorLayerIndex.groovy (modified) (3 diffs)

trunk/scripts/SyncEditorLayerIndex.groovy

@@ -39 +39 @@
     static String josmInputFile = 'imagery_josm.imagery.xml'
     static String ignoreInputFile = 'imagery_josm.ignores.txt'
-    static FileWriter outputFile = null
-    static BufferedWriter outputStream = null
+    static FileOutputStream outputFile = null
+    static OutputStreamWriter outputStream = null
     def skip = [:]
 
@@ -56 +56 @@
         script.loadJosmEntries()
         if(options.josmxml) {
-            def file = new FileWriter(options.josmxml)
-            def stream = new BufferedWriter(file)
+            def file = new FileOutputStream(options.josmxml)
+            def stream = new OutputStreamWriter(file, "UTF-8")
             script.printentries(script.josmEntries, stream)
+            stream.close();
+            file.close();
         }
         script.loadELIEntries()
         if(options.elixml) {
-            def file = new FileWriter(options.elixml)
-            def stream = new BufferedWriter(file)
+            def file = new FileOutputStream(options.elixml)
+            def stream = new OutputStreamWriter(file, "UTF-8")
             script.printentries(script.eliEntries, stream)
+            stream.close();
+            file.close();
         }
         script.checkInOneButNotTheOther()
@@ -110 +114 @@
         }
         if (options.output && options.output != "-") {
-            outputFile = new FileWriter(options.output)
-            outputStream = new BufferedWriter(outputFile)
+            outputFile = new FileOutputStream(options.output)
+            outputStream = new OutputStreamWriter(outputFile, "UTF-8")
         }
     }