1 files changed, 26 insertions, 12 deletions

diff --git a/ddl/templates/json.java.ede b/ddl/templates/json.java.ede
index cf09533..cfb639a 100644
--- a/ddl/templates/json.java.ede
+++ b/ddl/templates/json.java.ede
@@ -5,6 +5,7 @@ package {{ moduleName }};
 
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.Iterator;
 import org.json.*;
 import RT.*;
 
@@ -51,25 +52,39 @@ public class JSON {
           );
       }
       {% when "Map" %}
-/*
       case {{ t.value | typeEnum }}: {
-        var map = new {{ t.value | javaType }} ();
-        foreach(var i in (JSONObject)rawObj) {
-          map.Add( ({{ t.value.key_ | javaType }})fromJSON(Type.{{ t.value.key_ | typeEnum }},i.Key)
-                 , ({{ t.value.value_ | javaType }})fromJSON(Type.{{ t.value.value_ | typeEnum }},i.Value));
+        JSONObject obj = (JSONObject)rawObj;
+        {{ t.value | javaType }} map = new {{ t.value | javaType }} ();
+        Iterator<String> keyIt = obj.keys();
+        while(keyIt.hasNext()) {
+          String key = keyIt.next();
+          map.put(key, ({{ t.value.value_ | javaType }})fromJSON(Type.{{ t.value.value_ | typeEnum }},obj.get(key)));
         }
         return map;
       }
-*/
       {% when "Array" %}
-//      case {{ t.value | typeEnum }}: return ((JArray)obj).Select(x => fromJSON (Type.{{ t.value.type_ | typeEnum }}, x)).ToList();
+      case {{ t.value | typeEnum }}: {
+        JSONArray obj = (JSONArray)rawObj;
+        {{ t.value | javaType }} v = new {{ t.value | javaType }} ();
+        for (int i = 0; i < obj.length(); i++) {
+          v.add(({{ t.value.type_ | javaType }})fromJSON (Type.{{ t.value.type_ | typeEnum }}, obj.get(i)));
+        }
+        return v;
+      }
       {% when "List" %}
-//      case {{ t.value | typeEnum }}: return ((JArray)obj).Select(x => fromJSON (Type.{{ t.value.type_ | typeEnum }}, x)).ToList();
+      case {{ t.value | typeEnum }}: {
+        JSONArray obj = (JSONArray)rawObj;
+        {{ t.value | javaType }} v = new {{ t.value | javaType }} ();
+        for (int i = 0; i < obj.length(); i++) {
+          v.add(({{ t.value.type_ | javaType }})fromJSON (Type.{{ t.value.type_ | typeEnum }}, obj.get(i)));
+        }
+        return v;
+      }
       {% when "Maybe" %}
-/*
       case {{ t.value | typeEnum }}: {
-        var m = new {{ t.value | javaType }} ();
-        if (obj == null || obj.Type == JTokenType.Null) {
+        JSONObject obj = (JSONObject)rawObj;
+        {{ t.value | javaType }} m = new {{ t.value | javaType }} ();
+        if (obj == null || obj == JSONObject.NULL) {
           m.valid = false;
         } else {
           m.valid = true;
@@ -77,7 +92,6 @@ public class JSON {
         }
         return m;
       }
-*/
       {% else %}
       case {{ t.value | typeEnum }}: return ({{ t.value | javaType }})rawObj;
       {% endcase %}