Revize 47d370ef

#7843 #7842
Output format - String and array implemented.

project/Deserializer/results.json

@@ -1 +1 @@
 {
-  "handle" : 8257537,
-  "isExceptionObject" : false,
-  "type" : "INSTANCE",
-  "fielddata" : {
-    "[cd 0x7e0000: name java.util.Hashtable uid 1421746759512286392]" : {
-      "jdeserialize.field@6d99bf4b" : 0.75,
-      "jdeserialize.field@39df2fe" : 8
-    }
-  },
-  "classdesc" : {
-    "handle" : 8257536,
-    "isExceptionObject" : false,
-    "type" : "CLASSDESC",
-    "classtype" : "NORMALCLASS",
-    "name" : "java.util.Hashtable",
-    "serialVersionUID" : 1421746759512286392,
-    "descflags" : 3,
-    "fields" : [ {
-      "type" : "FLOAT",
-      "name" : "loadFactor",
-      "classname" : null,
-      "javaType" : "float",
-      "innerClassReference" : false
-    }, {
-      "type" : "INTEGER",
-      "name" : "threshold",
-      "classname" : null,
-      "javaType" : "int",
-      "innerClassReference" : false
-    } ],
-    "innerclasses" : [ ],
-    "annotations" : [ ],
-    "superclass" : null,
-    "interfaces" : null,
-    "enumconstants" : [ ],
-    "arrayClass" : false,
-    "innerClass" : false,
-    "staticMemberClass" : false,
-    "localInnerClass" : false,
-    "exceptionObject" : false
-  },
-  "annotations" : {
-    "[cd 0x7e0000: name java.util.Hashtable uid 1421746759512286392]" : [ {
-      "handle" : 0,
-      "isExceptionObject" : false,
-      "type" : "BLOCKDATA",
-      "buf" : "AAAACwAAAAA=",
-      "exceptionObject" : false
-    } ]
-  },
-  "exceptionObject" : false
-}
+	class java.util.Hashtable : {
+		"loadFactor" : "0.75", 
+		"threshold" : "8"
+	}
+}{
+	class java.util.Hashtable : {
+		"loadFactor" : "0.75", 
+		"threshold" : "17"
+	}
+}{
+	class java.util.Hashtable : {
+		"loadFactor" : "0.75", 
+		"threshold" : "8"
+	}
+}[blockdata 0x00: 8 bytes]{
+	class java.util.Hashtable : {
+		"loadFactor" : "0.75", 
+		"threshold" : "8"
+	}
+}{
+	class java.util.Hashtable : {
+		"loadFactor" : "0.75", 
+		"threshold" : "8"
+	}
+}[blockdata 0x00: 8 bytes]{
+	class java.util.Hashtable : {
+		"loadFactor" : "0.75", 
+		"threshold" : "8"
+	}
+}{
+	class java.util.Hashtable : {
+		"loadFactor" : "0.75", 
+		"threshold" : "8"
+	}
+}[blockdata 0x00: 8 bytes]{
+	class java.util.Hashtable : {
+		"loadFactor" : "0.75", 
+		"threshold" : "8"
+	}
+}{
+	class java.util.Hashtable : {
+		"loadFactor" : "0.75", 
+		"threshold" : "8"
+	}
+}[blockdata 0x00: 8 bytes]{
+	class java.util.Hashtable : {
+		"loadFactor" : "0.75", 
+		"threshold" : "8"
+	}
+}{
+	class java.util.Hashtable : {
+		"loadFactor" : "0.75", 
+		"threshold" : "8"
+	}
+}[blockdata 0x00: 8 bytes]{
+	class java.util.Hashtable : {
+		"loadFactor" : "0.75", 
+		"threshold" : "8"
+	}
+}{
+	class java.util.Hashtable : {
+		"loadFactor" : "0.75", 
+		"threshold" : "8"
+	}
+}[blockdata 0x00: 8 bytes]{
+	class java.util.Hashtable : {
+		"loadFactor" : "0.75", 
+		"threshold" : "8"
+	}
+}{
+	class java.util.Hashtable : {
+		"loadFactor" : "0.75", 
+		"threshold" : "8"
+	}
+}[blockdata 0x00: 8 bytes]{
+	class java.util.Hashtable : {
+		"loadFactor" : "0.75", 
+		"threshold" : "8"
+	}
+}{
+	class java.util.Hashtable : {
+		"loadFactor" : "0.75", 
+		"threshold" : "8"
+	}
+}[blockdata 0x00: 8 bytes]{
+	class java.util.Hashtable : {
+		"loadFactor" : "0.75", 
+		"threshold" : "8"
+	}
+}{
+	class java.util.Hashtable : {
+		"loadFactor" : "0.75", 
+		"threshold" : "8"
+	}
+}[blockdata 0x00: 8 bytes]{
+	class java.util.Hashtable : {
+		"loadFactor" : "0.75", 
+		"threshold" : "8"
+	}
+}{
+	class java.util.Hashtable : {
+		"loadFactor" : "0.75", 
+		"threshold" : "8"
+	}
+}[blockdata 0x00: 8 bytes]

project/Deserializer/src/Deserializer.java

@@ -42 +42 @@
 		stage.show();
 		
 		//tests
-		Converter thread = new Converter(this, new File("simple_arrays.out"), new File("bcha.json"));
-		thread.start();
+		//Converter thread = new Converter(this, new File("simple_arrays.out"), new File("bcha.json"));
+		//thread.start();
 	}
 	
 	private Scene createScene() {

project/Deserializer/src/jdeserialize/instance.java

@@ -1 +1 @@
 package jdeserialize;
+
 import java.util.*;
 
 /**
- * Represents an instance of a non-enum, non-Class, non-ObjectStreamClass, 
- * non-array class, including the non-transient field values, for all classes in its
- * hierarchy and inner classes.
+ * Represents an instance of a non-enum, non-Class, non-ObjectStreamClass,
+ * non-array class, including the non-transient field values, for all classes in
+ * its hierarchy and inner classes.
  */
 public class instance extends contentbase {
     /**
-     * Collection of field data, organized by class description.  
+     * Collection of field data, organized by class description.
      */
     public Map<classdesc, Map<field, Object>> fielddata;
 
@@ -24 +25 @@
         super(contenttype.INSTANCE);
         this.fielddata = new HashMap<classdesc, Map<field, Object>>();
     }
+
     public String toString() {
         StringBuffer sb = new StringBuffer();
-        
-        //ClassName
+
+        // ClassName
         sb.append("{\n\tclass ").append(classdesc.name);
-        //extends
-        if(classdesc.superclass != null)
-        {
+        // extends
+        if (classdesc.superclass != null) {
             sb.append(" extends ").append(classdesc.superclass.name);
         }
-        //implements
-        if(classdesc.interfaces != null)
-        {   
+        // implements
+        if (classdesc.interfaces != null) {
             sb.append(" implements ");
-            for(String str : classdesc.interfaces)
-            {
+            for (String str : classdesc.interfaces) {
                 sb.append(str);
             }
         }
-        sb.append(" : {");  //ending of first line
+        sb.append(" : {"); // ending of first line
 
-        for(field f : classdesc.fields)
-        {
-            /*if(f.type.getJavaType() != null)
-            {*/
-                //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("\"");
-                sb.append(" : ");
-                sb.append("\"").append(val).append("\"");
-            /*}
-            else if(f.classname != null)
-            {
-                content val = (content) this.fielddata.get(classdesc).get(f);
-                sb.append("\n\t\t");
-                sb.append("\"").append(f.name).append("\"");
-                sb.append(" : ");
-                sb.append("\"").append(val.toString()).append("\"");
-            }*/
+        for (field f : classdesc.fields) {
+            // 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("\"");
+            sb.append(" : ");
+            sb.append("\"").append(val).append("\"");
 
-            if(!f.equals(classdesc.fields[classdesc.fields.length-1]))
-            {
+            if (!f.equals(classdesc.fields[classdesc.fields.length - 1])) {
                 sb.append(", ");
             }
         }
 
         sb.append("\n\t}\n}");
-        
+
         return sb.toString();
     }
+
     /**
      * Object annotation data.
      */