Changeset 30188 in osm for applications/editors/josm

Timestamp:

2014-01-07T09:52:14+01:00 (11 years ago)

Author:

malcolmh

Message:

restore js57toosm

Location:

applications/editors/josm/plugins/smed2

Files:

• js57toosm (added)
• js57toosm/build.xml (added)
• js57toosm/src (added)
• js57toosm/src/js57toosm (added)
• js57toosm/src/js57toosm/Js57toosm.java (moved) (moved from applications/editors/josm/plugins/smed2/src/s57/Js57toosm.java ) (1 diff)
• js57toosm/src/s57 (added)
• src/s57/S57dat.java (modified) (2 diffs)

applications/editors/josm/plugins/smed2/js57toosm/src/js57toosm/Js57toosm.java

@@ -8 +8 @@
  */
 
-package s57;
+package js57toosm;
 
 import java.io.*;
 
+import s57.S57dat;
+import s57.S57dat.*;
+import s57.S57map;
 import s57.S57map.*;
-import s57.S57dat.*;
 
 public class Js57toosm {

applications/editors/josm/plugins/smed2/src/s57/S57dat.java

@@ -138 +138 @@
         private static int index;
         private static S57field field;
+        public static int rnum;
         
         public static void setField(byte[] buf, int off, S57field fld, int len) {
@@ -173 +174 @@
                                         wrap = true;
                                 } else {
-                                        System.out.println("ERROR: Subfield not found " + subf.name() + " in " + field.name() + " in record " + Js57toosm.rnum);
+                                        System.out.println("ERROR: Subfield not found " + subf.name() + " in " + field.name() + " in record " + rnum);
                                         System.exit(-1);
                                 }