polishing

Author: SimplyProgrammer

SerialX-core/src/main/java/org/ugp/serialx/converters/DataConverter.java

@@ -29,7 +29,7 @@ default CharSequence toString(ParserRegistry myHomeRegistry, Object obj, Object.
 	{
 		try 
 		{
-			return (CharSequence) toString(new StringBuilder().append(0), myHomeRegistry, obj, args);
+			return (CharSequence) toString(new StringBuilder(), myHomeRegistry, obj, args);
 		} 
 		catch (IOException e) 
 		{

SerialX-json/src/main/java/org/ugp/serialx/json/JsonSerializer.java

@@ -200,7 +200,7 @@ public ParserRegistry getParsers()
 	 * @since 1.3.2
 	 */
 	@Override
-	protected Appendable appandVar(Appendable source, ParserRegistry parsersToUse, Entry<String, ?> varToSerialize, int tabs, boolean isLast, Object... args) throws IOException
+	protected Appendable appandVar(Appendable source, ParserRegistry parsersToUse, Entry<String, ?> varToSerialize, int tabs, boolean isLast, Object[] args) throws IOException
 	{
 		if (format != 0)
 			source.append(multilpy('\t', tabs));
@@ -211,7 +211,7 @@ protected Appendable appandVar(Appendable source, ParserRegistry parsersToUse, E
 	}
 
 	@Override
-	protected Appendable appandVal(Appendable source, ParserRegistry parsersToUse, Object objToSerialize, int tabs, boolean isLast, Object... args) throws IOException
+	protected Appendable appandVal(Appendable source, ParserRegistry parsersToUse, Object objToSerialize, int tabs, boolean isLast, Object[] args) throws IOException
 	{
 		if (format != 0)
 			source.append(multilpy('\t', tabs));

SerialX-juss/src/main/java/org/ugp/serialx/juss/JussSerializer.java

@@ -253,10 +253,21 @@ public <T> String Var(String name, T value, boolean isValue)
 	 */
 	public String StaticMember(Class<?> cls, String staticMethodName, Object... args)
 	{
-		StringBuilder sb = new StringBuilder();
-		for (int i = 0, len = args.length; i < len; i++) 
-			sb.append(getParsers().toString(args[i], this, 0, 0, getProtocols(), getFormat())).append(i < len-1 ? " " : "");
-		return Code(cls.getName() + "::" + staticMethodName + (args.length <= 0 ? "" : " ") + sb);
+		StringBuilder sb = new StringBuilder(cls.getName()).append("::").append(staticMethodName);
+		for (int i = 0, len = args.length; i < len; i++)
+		{
+			sb.append(' ');
+			
+			try
+			{
+				getParsers().toString(sb, args[i], this, 0, 0, getProtocols(), getFormat());
+			} 
+			catch (IOException e) 
+			{
+				throw new RuntimeException(e); // No...
+			}
+		}
+		return Code(sb);
 	}
 
 	/**
@@ -316,7 +327,7 @@ else if (args[1] instanceof Integer)
 			{
 				for (Entry<String, ?> var : variables.entrySet()) //Vars
 				{
-					appandVar(source, reg.toString(var, args), var, tabs, i >= varLen-1 && valuesLen <= 0);
+					appandVar(source, reg, var, tabs, i >= varLen-1 && valuesLen <= 0, args);
 					if (!(var.getValue() instanceof Scope) || ((Scope) var.getValue()).isEmpty())
 						GenerateComment(source, reg, var);
 
@@ -328,7 +339,7 @@ else if (format != 0)
 			{
 				for (Entry<String, ?> var : variables.entrySet()) //Vars
 				{
-					appandVar(source, reg.toString(var, args), var, tabs, i >= varLen-1 && valuesLen <= 0);
+					appandVar(source, reg, var, tabs, i >= varLen-1 && valuesLen <= 0, args);
 
 					if (++i < varLen || valuesLen > 0)
 						source.append('\n');
@@ -338,7 +349,7 @@ else if (format != 0)
 			{
 				for (Entry<String, ?> var : variables.entrySet()) //Vars
 				{
-					appandVar(source, reg.toString(var, args), var, tabs, i++ >= varLen-1 && valuesLen <= 0);
+					appandVar(source, reg, var, tabs, i++ >= varLen-1 && valuesLen <= 0, args);
 				}
 			}
 		}
@@ -350,10 +361,8 @@ else if (format != 0)
 				if (i != 0)
 					source.append('\n');
 
-				Object obj = objs.get(i);
-				CharSequence serialized = reg.toString(obj, args);
-				
-				appandVal(source, serialized, obj, tabs, i == valuesLen-1);
+				Object obj;
+				appandVal(source, reg, obj = objs.get(i), tabs, i == valuesLen-1, args);
 				if (!(obj instanceof Scope) || ((Scope) obj).isEmpty())
 					GenerateComment(source, reg, obj);
 			} 
@@ -365,16 +374,14 @@ else if (format != 0)
 				if (i != 0)
 					source.append('\n');
 
-				Object obj;
-				appandVal(source, reg.toString(obj = objs.get(i), args), obj, tabs, i == valuesLen-1);
+				appandVal(source, reg, objs.get(i), tabs, i == valuesLen-1, args);
 			} 
 		}
 		else // No formating
 		{
 			for (i = 0; i < valuesLen; i++) //Values
 			{
-				Object obj;
-				appandVal(source, reg.toString(obj = objs.get(i), args), obj, tabs, i == valuesLen-1);
+				appandVal(source, reg, objs.get(i), tabs, i == valuesLen-1, args);
 			} 
 		}
 
@@ -386,31 +393,31 @@ else if (format != 0)
 	}
 
 	/**
-	 * This should append serializedVar into source based on arguments, add separator and return source!
+	 * his should stringify and append ({@link ParserRegistry#toString(Appendable, Object, Object...)}) varToSerialize into source based on arguments, add separator and return source!
 	 * 
 	 * @since 1.3.2
 	 */
-	protected Appendable appandVar(Appendable source, CharSequence serializedVar, Entry<String, ?> var, int tabs, boolean isLast) throws IOException
+	protected Appendable appandVar(Appendable source, ParserRegistry parsersToUse, Entry<String, ?> varToSerialize, int tabs, boolean isLast, Object[] args) throws IOException
 	{
 		if (format != 0)
 			source.append(multilpy('\t', tabs));
-		source.append(serializedVar);
+		source.append((CharSequence) parsersToUse.toString(new StringBuilder(), varToSerialize, args));
 		if (isLast)
 			return source;
 		return source.append(';');
 	}
 
 	/**
-	 * This should append serializedVal into source based on arguments, add separator and return source!
+	 * This should stringify and append ({@link ParserRegistry#toString(Appendable, Object, Object...)}) objToSerialize into source based on arguments, add separator and return source!
 	 * 
 	 * @since 1.3.2
 	 */
-	protected Appendable appandVal(Appendable source, CharSequence serializedVal, Object value, int tabs, boolean isLast) throws IOException
+	protected Appendable appandVal(Appendable source, ParserRegistry parsersToUse, Object objToSerialize, int tabs, boolean isLast, Object[] args) throws IOException
 	{
 		if (format != 0)
 			source.append(multilpy('\t', tabs));
-		source.append(serializedVal);
-		if (isLast || serializedVal != null && indexOfNotInObj(serializedVal, "//") != -1)
+		source.append((CharSequence) parsersToUse.toString(new StringBuilder(), objToSerialize, args));
+		if (isLast /*|| serializedVal != null && indexOfNotInObj(serializedVal, "//") != -1*/)
 			return source;
 		return source.append(';');
 	}