Java: Implement interface PositionInfo if positions is generated

Fix kaitai-io/kaitai_struct_java_runtime#27
kaitai-io · Feb 23, 2020 · ed18cf5 · ed18cf5
1 parent 06863e0
commit ed18cf5
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/shared/src/main/scala/io/kaitai/struct/languages/JavaCompiler.scala b/shared/src/main/scala/io/kaitai/struct/languages/JavaCompiler.scala
@@ -72,13 +72,22 @@ class JavaCompiler(val typeProvider: ClassTypeProvider, config: RuntimeConfig)
       ""
     }
 
-    out.puts(s"public ${staticStr}class ${type2class(name)} extends $kstructName {")
+    val iface = if (config.readStoresPos) {
+      "implements PositionInfo "
+    } else {
+      ""
+    }
+
+    out.puts(s"public ${staticStr}class ${type2class(name)} extends $kstructName $iface{")
     out.inc
 
     if (config.readStoresPos) {
       out.puts("public final Map<String, Region> _regions = new HashMap<String, Region>();")
+      out.puts("@Override")
+      out.puts("public final Map<String, Region> _regions() { return this._regions; }")
       out.puts
 
+      importList.add("io.kaitai.struct.PositionInfo")
       importList.add("io.kaitai.struct.Region")
       importList.add("java.util.ArrayList")
       importList.add("java.util.HashMap")