Revize cdc987da

re #7879

Soubor instance.java změněn.

demo_jh/Deserializer_tests/src/app/App.java

@@ -6 +6 @@
 import java.io.IOException;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
-import java.util.ArrayList;
 import java.util.List;
 import org.codehaus.jackson.map.ObjectMapper;
 import org.codehaus.jackson.map.ObjectWriter;

demo_jh/Deserializer_tests/src/samples/ok/Simple.java

@@ -2 +2 @@
 
 import java.io.Serializable;
 
-public class Simple implements Serializable
+public class Simple extends SimpleChild implements Serializable
 {
     enum Level {
         LOW,

demo_jh/Deserializer_tests/src/samples/ok/SimpleChild.java

@@ -1 +1 @@
 package samples.ok;
 
-public class SimpleChild extends Simple {
+import java.io.Serializable;
+
+public class SimpleChild implements Serializable {
     String navic = "AHOJ, jsem tu navic";
 }

project/Deserializer/bcha.json

@@ -1 +1 @@
 {
-	class samples.ok.SimpleChild extends samples.ok.Simple : {
-		"navic" : "AHOJ, jsem tu navic"
-	},
+	class samples.ok.Simple extends samples.ok.SimpleChild : {
+		"testDouble" : 1.0, 
+		"testInt" : 123, 
+		"intArray" : [ 5, 10, 15 ], 
+		"locInnerClassInstance" : {
+			class samples.ok.Inner : {
+				"vnitrni" : "INNER STRING AM I"
+			}
+		}, 
+		"localEnum" : LOW, 
+		"pozdrav" : "AHOJ", 
+		"stringArray" : [ "A", "B", "C" ]
+	}
+},
 {
-		class samples.ok.Simple : {
-			"testDouble" : 1.0, 
-			"testInt" : 123, 
-			"pozdrav" : "AHOJ"
-		}	
-}
+	class samples.ok.SimpleChild : {
+		"navic" : "AHOJ, jsem tu navic"
+	}
 }

project/Deserializer/src/Deserializer.java

@@ -159 +159 @@
 		});
 		
 		//tests
-		Converter thread = new Converter(this, new File("Deserializer/simpleChild.out"), new File("Deserializer/bcha.json"));
+		Converter thread = new Converter(this, new File("Deserializer/simple.out"), new File("Deserializer/bcha.json"));
 		thread.start();
 	}
 	

project/Deserializer/src/jdeserialize/classdesc.java

@@ -228 +228 @@
     {
         StringBuffer sb = new StringBuffer();
         String val = "";
-        
+
+        sb.append(indentation).append("{\n");
+
         indentation += "\t";
 
         // ClassName
-        sb.append("{\n").append(indentation).append("class ").append(this.name);
+        sb.append(indentation).append("class ").append(this.name);
         // extends
         if (this.superclass != null) {
             sb.append(" extends ").append(this.superclass.name);
@@ -274 +276 @@
         indentation = indentation.substring(0, indentation.length() - 1);
 
         sb.append("\n").append(indentation).append("}");
-        
 
         if(this.superclass != null)
         {
+            indentation = indentation.substring(0, indentation.length() - 1);
+            sb.append("\n}");
             sb.append(",\n");
             sb.append(this.superclass.toJson(indentation, fielddata));
         }
-        
-        indentation = indentation.substring(0, indentation.length() - 1);
-        sb.append(indentation).append("\n}");
+        else 
+        {
+            indentation = indentation.substring(0, indentation.length() - 1);
+            sb.append("\n").append(indentation).append("}");
+        }
 
         return sb.toString();
     }