Revize 961cd43a

#7794

Rozpoznávání polí, úprava JSON

demo_mh/Deserializer/src/deserialize/Variable.java

@@ -1 +1 @@
 package deserialize;
 
-import org.json.simple.JSONObject;
+import java.util.Arrays;
+
+import org.codehaus.jackson.node.ObjectNode;
 
 public class Variable {
 	
@@ -8 +10 @@
 	private String variable;
 	private String typeName;
 	private Object value = null;
+	private Object array[] = null;
 	
 	public Variable(char type, String variable, String typeName) {
 		this.type = type;
@@ -34 +37 @@
 	}
 	
 	public boolean isValueSet() {
-		return value != null;
+		return value != null || array != null;
 	}
 	
 	public void setValue(Object value) {
 		this.value = value;
 	}
 	
-	@SuppressWarnings("unchecked")
-	public void putToJSON(JSONObject obj) {
-		if (value != null) {
-			if (value.getClass().toString().equals(ClassDescription.class.toString())) {
+	public void setValue(Object array[]) {
+		this.array = array;
+	}
+	
+	public void putToJson(ObjectNode node) {
+		if (value != null || array != null) {
+			if (value != null && value.getClass().toString().equals(ClassDescription.class.toString())) {
 				ClassDescription desc = (ClassDescription) value;
-				obj.put(variable, desc.getJSONObject());
-			} else {
-				obj.put(variable, value);
+				node.put(variable, desc.getJsonNode());
+			} else if (value != null) {
+				node.put(variable, value.toString());
+			} else if (array != null) {
+				node.put(variable, Arrays.toString(array));
 			}
 		} else {
-			obj.put(variable, "NON_IMPLEMENTED");
+			node.put(variable, "NOT_IMPLEMENTED");
 		}
 	}
 	
@@ -72 +80 @@
 			if (value.getClass().toString().equals(ClassDescription.class.toString())) {
 				ClassDescription desc = (ClassDescription) value;
 				result += desc.toString();
-			} else {
+			} else if (value != null) {
 				result += value;
+			} else if (array != null) {
+				result += Arrays.toString(array);
 			}
 		}