Changeset 35392 in osm for applications/editors/josm/plugins/seachart/josmtos57/src

Timestamp:

2020-03-22T12:03:02+01:00 (5 years ago)

Author:

malcolmh

Message:

use XML DOM to parse OSM files

File:

• applications/editors/josm/plugins/seachart/josmtos57/src/josmtos57/Josmtos57.java (modified) (3 diffs)

applications/editors/josm/plugins/seachart/josmtos57/src/josmtos57/Josmtos57.java

@@ -6 +6 @@
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
-import java.io.FileReader;
+import java.io.File;
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
@@ -62 +62 @@
     };
 
-    static BufferedReader in;
+    static File in;
     static FileOutputStream out;
     static S57map map;
@@ -93 +93 @@
             System.exit(-1);
         }
+        in = new File(args[0]);
         try {
-            in = new BufferedReader(new FileReader(new File(args[0])));
-            try {
-                S57osm.OSMmap(in, map, false);
-            } catch (Exception e) {
-                System.err.println("Input data error");
-                System.exit(-1);
-            }
-            in.close();
-        } catch (IOException e) {
-            System.err.println("Input file: " + e.getMessage());
+            S57osm.OSMmap(in, map, false);
+        } catch (Exception e) {
+            System.err.println("Input data error");
             System.exit(-1);
         }