Revize a0511590

#re#7831 Indetation problems. toString left, new toJson method
Not working yet

project/Deserializer/bcha.json

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

project/Deserializer/src/Converter.java

@@ -59 +59 @@
 			{
 				if(cnt != null)
 				{
-					json += cnt.toString();
+					json += cnt.toJson("");
 				}
 			}
 
 			System.out.println("Task completed.");
 			
 			//just for tests
-			//System.out.println(json);
+			System.out.println(json);
 			
 			return json;
 		} catch (IOException e) {

project/Deserializer/src/jdeserialize/arrayobj.java

@@ -1 +1 @@
 package jdeserialize;
 
 /**
- * <p>Represents an array instance, including the values the comprise the array.  </p>
+ * <p>
+ * Represents an array instance, including the values the comprise the array.
+ * </p>
  *
- * <p>Note that in arrays of primitives, the classdesc will be named "[x", where x is the
- * field type code representing the primitive type.  See jdeserialize.resolveJavaType()
- * for an example of analysis/generation of human-readable names from these class names.</p>
+ * <p>
+ * Note that in arrays of primitives, the classdesc will be named "[x", where x
+ * is the field type code representing the primitive type. See
+ * jdeserialize.resolveJavaType() for an example of analysis/generation of
+ * human-readable names from these class names.
+ * </p>
  */
 public class arrayobj extends contentbase {
     /**
@@ -24 +29 @@
         this.classdesc = cd;
         this.data = data;
     }
-    public String toString() {
+
+    public @Override String toJson(String indentation) {
         StringBuilder sb = new StringBuilder();
         sb.append("[ ");
-        for(Object el : this.data)
-        {
-            sb.append(el.toString());
-            if(!el.equals(this.data.get(this.data.size()-1)))
-            {
-                sb.append(", ");
+
+        for (Object el : this.data) {
+            if (el != null && el instanceof content) {
+                sb.append(((content)el).toJson(indentation));
+                // el null!
+                if (!el.equals(this.data.get(this.data.size() - 1))) {
+                    sb.append(", ");
+                }
             }
         }
         sb.append(" ]");
         return sb.toString();
     }
-}
 
+    public String toString() {
+        return "[array " + jdeserialize.hex(handle) + " classdesc " + classdesc.toString() + ": " + data.toString()
+                + "]";
+    }
+}

project/Deserializer/src/jdeserialize/content.java

@@ -64 +64 @@
      * @param value the new value to use
      */
     public void setIsExceptionObject(boolean value);
+
+    public String toJson(String indentation);
 }
 

project/Deserializer/src/jdeserialize/contentbase.java

@@ -24 +24 @@
     }
     public void validate() throws ValidityException {
     }
+
+    public @Override String toJson(String indetation)
+    {
+        return this.toString();
+    }
 }
 

project/Deserializer/src/jdeserialize/enumobj.java

@@ -31 +31 @@
         this.classdesc = cd;
         this.value = so;
     }
-    public String toString() {
+    public @Override String toJson(String indetation) {
         return this.value.value;
     }
+
+    public String toString(){
+        return "[enum " + jdeserialize.hex(handle) + ": " + value.value + "]";
+    }
 }

project/Deserializer/src/jdeserialize/instance.java

@@ -26 +26 @@
         this.fielddata = new HashMap<classdesc, Map<field, Object>>();
     }
 
-    public String toString() {
+    public @Override String toJson(String indentation)
+    {
         StringBuffer sb = new StringBuffer();
+        String val = "";
+
+        /*if (classdesc.getType() == contenttype.CLASSDESC && !instance.indentedClasses.contains(classdesc.name)) {*/
+            indentation += "\t";
+           /* instance.indentedClasses.add(classdesc.name);
+        }*/
 
         // ClassName
-        sb.append("{\n\tclass ").append(classdesc.name);
+        sb.append("{\n").append(indentation).append("class ").append(classdesc.name);
         // extends
         if (classdesc.superclass != null) {
             sb.append(" extends ").append(classdesc.superclass.name);
@@ -48 +55 @@
             // v this.fielddata najit element, jehoz key == classdesc
             // v tomto prvku fielddata najdu value (element) podle key == f
             // jeho value je chtena hodnota
-            var val = this.fielddata.get(classdesc).get(f).toString();
-            sb.append("\n\t\t");
-            // Datový typ není potřeba - json jej nepoužívá!
-            sb.append("\"")./* append(f.type.getJavaType()).append(" "). */append(f.name).append("\"");
+            
+            var locVal = this.fielddata.get(classdesc).get(f);
+
+            if(locVal instanceof content)
+            {
+                val = ((content)locVal).toJson(indentation);
+            }
+            else {
+                val = locVal.toString();
+            }
+
+            sb.append("\n\t").append(indentation);
+            sb.append("\"").append(f.name).append("\"");
             sb.append(" : ");
             sb.append(val);
 
@@ -60 +76 @@
             }
         }
 
-        sb.append("\n\t}\n}");
+        sb.append("\n").append(indentation).append("}\n}");
 
+        /*if (classdesc.getType() == contenttype.CLASSDESC && instance.indentedClasses.contains(classdesc.name)) {*/
+            indentation.replaceFirst("\t", "");
+            /*instance.indentedClasses.remove(classdesc.name);
+        }*/
+
+        return sb.toString();
+    }
+
+    public String toString() {
+        StringBuffer sb = new StringBuffer();
+        sb.append(classdesc.name).append(' ').append("_h").append(jdeserialize.hex(handle))
+            .append(" = r_").append(jdeserialize.hex(classdesc.handle)).append(";  ");
+        //sb.append("// [instance " + jdeserialize.hex(handle) + ": " + jdeserialize.hex(classdesc.handle) + "/" + classdesc.name).append("]");
         return sb.toString();
     }
 

project/Deserializer/src/jdeserialize/jdeserialize.java

@@ -837 +837 @@
                     break;
                 }
                 content c = read_Content(tc, dis, true);
-                System.out.println("read: " + c.toString());
+                //System.out.println("read: " + c.toString());
                 if(c != null && c.isExceptionObject()) {
                     c = new exceptionstate(c, lis.getRecordedData());
                 }

project/Deserializer/src/jdeserialize/stringobj.java

@@ -15 +15 @@
         }
         return x;
     }
-    public String toString() {
+
+    public @Override String toJson(String indetation)
+    {
         return "\"" + this.value + "\"";
     }
+
+    public String toString() {
+        return "[String " + jdeserialize.hex(handle) + ": \"" + value + "\"]";
+    }
     /**
      * Constructor.
      *