Revize 53949177

#re#7831 Indetation OK, format OK

project/Deserializer/bcha.json

@@ -4 +4 @@
 		"testInt" : 123, 
 		"intArray" : [ 5, 10, 15 ], 
 		"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

@@ -1 +1 @@
 import java.io.File;
+import java.io.FileDescriptor;
+import java.io.FileOutputStream;
 import java.io.IOException;
+import java.io.OutputStream;
+import java.io.PrintStream;
 import java.util.List;
 
 import jdeserialize.content;
@@ -46 +50 @@
 		String json = "";
 		try {
 			System.out.println("Deserialization begins.");
+
+			//Redirectovany system.out do null streamu. Mozno redirect do souboru
+			System.setOut(new PrintStream(OutputStream.nullOutputStream()));
+			System.out.println("TEST STRING NOT SHOWING");
 			jdeserialize deserializer = new jdeserialize(buffer);
+			System.setOut(new PrintStream(new FileOutputStream(FileDescriptor.out)));
 			
 			// gets the "contents" into an array - returnes the deserialization of all
             // 'writes' into serialized object via objectOutputStream
@@ -59 +68 @@
 			{
 				if(cnt != null)
 				{
+					//Parametrizovany toJson pomoci dictionary
+					//replace VS parametr
+					//Pustit 2X s parametrem nenabori vnitrni data (kde muzou byt html znacky)
+					//Ciste HTML / Cisty JSON
 					json += cnt.toJson("");
 				}
 			}

project/Deserializer/src/jdeserialize/instance.java

@@ -30 +30 @@
     {
         StringBuffer sb = new StringBuffer();
         String val = "";
+        
+        indentation += "\t";
 
         /*if (classdesc.getType() == contenttype.CLASSDESC && !instance.indentedClasses.contains(classdesc.name)) {*/
-            indentation += "\t";
            /* instance.indentedClasses.add(classdesc.name);
         }*/
 
@@ -53 +54 @@
             //System.out.println(sb.toString());
         }
         sb.append(" : {"); // ending of first line
+        
+        indentation += "\t";
         //System.out.println(sb.toString());
 
         for (field f : classdesc.fields) {
@@ -70 +73 @@
                 val = locVal.toString();
             }
 
-            sb.append("\n\t").append(indentation);
+            sb.append("\n").append(indentation);
             sb.append("\"").append(f.name).append("\"");
             sb.append(" : ");
             sb.append(val);
@@ -81 +84 @@
                 //System.out.println(sb.toString());
             }
         }
+        indentation = indentation.substring(0, indentation.length() - 1);
 
-        sb.append("\n").append(indentation).append("}\n}");
+        sb.append("\n").append(indentation).append("}\n");
+        indentation = indentation.substring(0, indentation.length() - 1);
+        sb.append(indentation).append("}");
         //System.out.println(sb.toString());
 
         /*if (classdesc.getType() == contenttype.CLASSDESC && instance.indentedClasses.contains(classdesc.name)) {*/
-            indentation.replaceFirst("\t", "");
+        
             /*instance.indentedClasses.remove(classdesc.name);
         }*/