...

Author: SimplyProgrammer

.classpath

@@ -33,6 +33,8 @@ npm-debug.log*
 bin/
 tmp/
 .metadata
+.classpath
 .settings
+.project
 
 target/

.gitignore

@@ -1,5 +1,7 @@
 package org.ugp.serialx;
 
+import static org.ugp.serialx.Utils.Instantiate;
+
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -14,6 +16,7 @@
 import java.util.function.Function;
 import java.util.function.Predicate;
 
+import org.ugp.serialx.Utils.NULL;
 import org.ugp.serialx.converters.ArrayConverter;
 import org.ugp.serialx.converters.DataParser;
 import org.ugp.serialx.protocols.SerializationProtocol;
@@ -146,7 +149,7 @@ public GenericScope<KeyT, ValT> clone()
 	@SuppressWarnings("unchecked")
 	public <S extends GenericScope<KeyT, ValT>> S clone(Class<S> typeOfClone) throws Exception
 	{
-		S clone = Serializer.Instantiate(typeOfClone);
+		S clone = Instantiate(typeOfClone);
 		clone.values = (List<ValT>) toValList();
 		clone.variables = (Map<KeyT, ValT>) toVarMap();
 		clone.parent = getParent();
@@ -167,7 +170,7 @@ public <S extends GenericScope<KeyT, ValT>> S clone(Class<S> typeOfClone) throws
 		if (getClass() == newType)
 			return (S) this;
 
-		GenericScope<Object, Object> clone = (GenericScope<Object, Object>) Serializer.Instantiate(newType);
+		GenericScope<Object, Object> clone = (GenericScope<Object, Object>) Instantiate(newType);
 		clone.values = (List<Object>) values();
 		clone.variables = (Map<Object, Object>) variables();
 		clone.parent = getParent();
@@ -275,7 +278,7 @@ public <V extends ValT> V get(KeyT variableKey, V defaultValue)
 		V obj = (V) variables().get(variableKey);
 		if (obj == null)
 			return (V) defaultValue;
-		return obj instanceof Serializer.NULL ? null : obj;
+		return obj instanceof NULL ? null : obj;
 	}
 
 	/**
@@ -317,7 +320,7 @@ public boolean containsIndependentValue(ValT value)
 	public <V extends ValT> V get(int valueIndex)
 	{
 		V obj = (V) values().get(valueIndex < 0 ? valuesCount() + valueIndex : valueIndex);
-		return obj instanceof Serializer.NULL ? null : obj;
+		return obj instanceof NULL ? null : obj;
 	}
 
 	/**
@@ -524,7 +527,7 @@ public <V> GenericScope<KeyT, V> transform(Function<ValT, V> trans, boolean incl
 			try
 			{
 				Object obj = ent.getValue();
-				obj = obj instanceof Serializer.NULL ? null : obj;
+				obj = obj instanceof NULL ? null : obj;
 				if (obj instanceof GenericScope && includeSubScopes)
 				{ 
 					GenericScope<?, V> sc = ((GenericScope<?, ValT>) obj).transform(trans, includeSubScopes);
@@ -539,7 +542,7 @@ else if ((obj = trans.apply((ValT) obj)) != DataParser.VOID)
 
 		try 
 		{ 
-			GenericScope<KeyT, V> clone = Serializer.Instantiate(getClass());
+			GenericScope<KeyT, V> clone = Instantiate(getClass());
 			clone.values = fltVals;
 			clone.variables = fltVars;
 			clone.parent = getParent();
@@ -580,7 +583,7 @@ public <V> List<V> map(Function<ValT, V> trans, boolean includeSubScopes)
 		for (Object obj : this)
 			try
 			{	
-				obj = obj instanceof Serializer.NULL ? null : obj;
+				obj = obj instanceof NULL ? null : obj;
 				if (obj instanceof GenericScope && includeSubScopes)
 				{ 
 					GenericScope<?, V> sc = ((GenericScope<?, ValT>) obj).transform(trans, includeSubScopes);

.project

@@ -1,5 +1,9 @@
 package org.ugp.serialx;
 
+import static org.ugp.serialx.Utils.Clone;
+import static org.ugp.serialx.Utils.InvokeStaticFunc;
+import static org.ugp.serialx.Utils.indexOfNotInObj;
+import static org.ugp.serialx.Utils.multilpy;
 import static org.ugp.serialx.converters.DataParser.VOID;
 
 import java.beans.IntrospectionException;
@@ -21,6 +25,7 @@
 import java.util.Map;
 import java.util.Map.Entry;
 
+import org.ugp.serialx.Utils.NULL;
 import org.ugp.serialx.converters.DataConverter;
 import org.ugp.serialx.converters.DataParser;
 import org.ugp.serialx.converters.DataParser.ParserRegistry;
@@ -38,6 +43,7 @@
  *
  * @since 1.3.2
  */
+//TODO: Separate to SerialX-juss together with parsers and stuff
 @SuppressWarnings("serial")
 public class JussSerializer extends Serializer implements ImportsProvider
 {
@@ -483,7 +489,7 @@ else if (ch == '}' || ch == ']')
 		else
 			for (Map.Entry<?, ?> ent : parent.varEntrySet())
 				if (variables().get(ent.getKey()) == ent.getValue())
-					variables().remove(ent.getKey());
+					variables().remove(ent.getKey());//TODO: Prevent neccesity of scope parent inheritance.
 		return (S) this;
 	}
 
@@ -695,7 +701,7 @@ public <T> T cloneOf(String variableName , T defaultValue)
 		T obj = get(variableName , defaultValue);
 		if (obj == defaultValue)
 			return defaultValue;
-		return Serializer.Clone(obj, getParsers(), new Object[] {-99999, 0, this, getProtocols(), isGenerateComments()}, this, null, null, getProtocols());
+		return Clone(obj, getParsers(), new Object[] {-99999, 0, this, getProtocols(), isGenerateComments()}, this, null, null, getProtocols());
 	}
 
 	/**
@@ -711,7 +717,7 @@ public <T> T cloneOf(String variableName , T defaultValue)
 	public <T> T cloneOf(int valueIndex)
 	{
 		T obj = get(valueIndex);
-		return Serializer.Clone(obj, getParsers(), new Object[] {-99999, 0, this, getProtocols(), isGenerateComments()}, this, null, null, getProtocols());
+		return Clone(obj, getParsers(), new Object[] {-99999, 0, this, getProtocols(), isGenerateComments()}, this, null, null, getProtocols());
 	}
 
 	/**

SerialX-core/.classpath

@@ -1,5 +1,6 @@
 package org.ugp.serialx;
 
+import static org.ugp.serialx.Utils.Instantiate;
 import static org.ugp.serialx.converters.DataParser.VOID;
 
 import java.beans.IntrospectionException;
@@ -1100,7 +1101,7 @@ public static <T> T intoNew(Class<T> objCls, GenericScope<String, ?> fromScope,
 			}
 		}
 
-		return into(Serializer.Instantiate(objCls), fromScope, fieldNamesToUse);
+		return into(Instantiate(objCls), fromScope, fieldNamesToUse);
 	}
 
 	/**