Revize 4bbee803

#7794 Got rid of simpleToString.
Rewrote the toString() instead (no need to re-cast Object types)

demo_jh/Deserializer_tests/src/app/App.java

@@ -131 +131 @@
         try {
             System.out.println("Starting...");
 
-            this.serialize(new samples.ok.SimpleChild(), "serialized/simpleChild.out");
+            this.serialize(new samples.ok.Simple(), "serialized/simple_arrays.out");
 
-            samples.ok.SimpleChild test1 = this.deserialize("serialized/simple.out");
+            //samples.ok.SimpleChild test1 = this.deserialize("serialized/simple.out");
 
         } catch (Exception e) {
             System.out.println(e.toString());

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

@@ -9 +9 @@
     private String pozdrav = "AHOJ";
     private int testInt = 123;
     private double testDouble = 1.00;
+    private int[] intArray = new int[3];
+    private String[] stringArray = new String[3];
 
     public Simple() 
     {
         int locInt = 5;
+        this.intArray[0] = 5;
+        this.intArray[1] = 10;
+        this.intArray[2] = 15;
+
+        this.stringArray[0] = "A";
+        this.stringArray[1] = "B";
+        this.stringArray[2] = "C";
     }
 }

project/Deserializer/bcha.json

@@ -1 +1 @@
 {
 	class samples.ok.Simple : {
-		"double testDouble" : 1.0, 
-		"int testInt" : 123, 
-		"null pozdrav" : [String 0x7e0003: "AHOJ"]
+		"testDouble" : "1.0", 
+		"testInt" : "123", 
+		"intArray" : "[5,10,15]", 
+		"pozdrav" : "AHOJ", 
+		"stringArray" : "[A,B,C]"
 	}
 }

project/Deserializer/src/Converter.java

@@ -28 +28 @@
 		try {
 			String json = convert(FileWorker.loadByteArray(input));
 			
-			String title = "Ulo?en? JSON";
+			String title = "Ulo�en� JSON";
 			if (FileWorker.saveJson(output, json)) {
 				System.out.println("The JSON file was saved correctly.");
-				Report.info(title, null, "Ulo?en? JSON souboru prob?hlo v po??dku.");
+				Report.info(title, null, "Ulo�en� JSON souboru prob�hlo v po��dku.");
 			} else {
 				System.out.println("There was an error saving the JSON file.");
-				Report.error(title, null, "P?i ukl?d?n? JSON souboru nastala chyba.");
+				Report.error(title, null, "P�i ukl�d�n� JSON souboru nastala chyba.");
 			}
 		} catch (IOException e) {
 			System.out.println("There was an error loading the file.");
 			e.printStackTrace();
-			Report.error("Na??t?n? souboru", null, "P?i na??t?n? souboru do?lo k chyb?.");
+			Report.error("Na��t�n� souboru", null, "P�i na��t�n� souboru do�lo k chyb�.");
 		}
 
 		main.convertIsComplete();
@@ -62 +62 @@
 			{
 				if(cnt != null)
 				{
-					json += cnt.simpleFormatToString();
+					json += cnt.toString();
 				}
 			}
 

project/Deserializer/src/Deserializer.java

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

project/Deserializer/src/jdeserialize/arrayobj.java

@@ -25 +25 @@
         this.data = data;
     }
     public String toString() {
-        return "[array " + jdeserialize.hex(handle) + " classdesc " + classdesc.toString() + ": " 
-            + data.toString() + "]";
+        StringBuilder sb = new StringBuilder();
+        sb.append("[");
+        for(Object el : this.data)
+        {
+            sb.append(el);
+            if(!el.equals(this.data.get(this.data.size()-1)))
+            {
+                sb.append(',');
+            }
+        }
+        sb.append("]");
+        return sb.toString();
     }
 }
 

project/Deserializer/src/jdeserialize/content.java

@@ -64 +64 @@
      * @param value the new value to use
      */
     public void setIsExceptionObject(boolean value);
-
-    /**
-     * Jan Havlicek, 200406 for Java object universal deserializer project.
-     * Added because of wanted format of string representation fo objects.
-     */
-    public String simpleFormatToString();
 }
 

project/Deserializer/src/jdeserialize/contentbase.java

@@ -24 +24 @@
     }
     public void validate() throws ValidityException {
     }
-
-    @Override
-    public String simpleFormatToString() {
-        // TODO Auto-generated method stub
-        return "";
-    }
 }
 

project/Deserializer/src/jdeserialize/instance.java

@@ -1 +1 @@
 package jdeserialize;
-import java.lang.reflect.Field;
 import java.util.*;
 
 /**
@@ -27 +26 @@
     }
     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();
-    }
-    /**
-     * Object annotation data.
-     */
-    public Map<classdesc, List<content>> annotations;
-
-
-    @Override
-    public String simpleFormatToString()
-    {
-        StringBuffer sb = new StringBuffer();
         
         //ClassName
         sb.append("{\n\tclass ").append(classdesc.name);
@@ -63 +47 @@
 
         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
-            String val = this.fielddata.get(classdesc).get(f).toString();
-
-            sb.append("\n\t\t");
-            sb.append("\"").append(f.type.getJavaType()).append(" ").append(f.name).append("\"");
-            sb.append(" : ");
-            sb.append(val);
+            /*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("\"");
+            }*/
 
             if(!f.equals(classdesc.fields[classdesc.fields.length-1]))
             {
@@ -83 +78 @@
         
         return sb.toString();
     }
-}
+    /**
+     * Object annotation data.
+     */
+    public Map<classdesc, List<content>> annotations;
+}

project/Deserializer/src/jdeserialize/stringobj.java

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