further modularization and bug fixes

Author: SimplyProgrammer

.classpath

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>

.project

@@ -5,13 +5,19 @@
 	<projects>
 	</projects>
 	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.m2e.core.maven2Builder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 	</natures>
 </projectDescription>

.settings/org.eclipse.core.resources.prefs

@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8

.settings/org.eclipse.jdt.core.prefs

@@ -0,0 +1,8 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore
+org.eclipse.jdt.core.compiler.release=disabled
+org.eclipse.jdt.core.compiler.source=1.8

Changelog.md

@@ -0,0 +1,6 @@
+eclipse.preferences.version=1
+encoding//src/main/java=UTF-8
+encoding//src/main/resources=UTF-8
+encoding//src/test/java=UTF-8
+encoding//src/test/resources=UTF-8
+encoding/<project>=UTF-8

SerialX-core/.settings/org.eclipse.core.resources.prefs

@@ -3,11 +3,13 @@
   <parent>
     <groupId>org.ugp</groupId>
     <artifactId>serialx</artifactId>
-    <version>1.3.7</version>
+    <version>${revision}</version>
   </parent>
+  
   <groupId>org.ugp.serialx</groupId>
   <artifactId>core</artifactId>
+  <version>1.3.7</version>
 
-  <name>SerialX-core</name>
+  <name>SerialX core</name>
   <description>Core of SerialX</description>
 </project>

SerialX-core/pom.xml

@@ -314,7 +314,7 @@ public boolean containsIndependentValue(ValT value)
 	 * @since 1.2.0
 	 */
 	@SuppressWarnings("unchecked")
-	public <V> V get(int valueIndex)
+	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;

SerialX-core/src/main/java/org/ugp/serialx/GenericScope.java

@@ -25,16 +25,11 @@
 import org.ugp.serialx.converters.DataParser;
 import org.ugp.serialx.converters.DataParser.ParserRegistry;
 import org.ugp.serialx.converters.ObjectConverter;
-import org.ugp.serialx.converters.StringConverter;
 import org.ugp.serialx.converters.imports.ImportConverter;
-import org.ugp.serialx.converters.operators.ArithmeticOperators;
-import org.ugp.serialx.converters.operators.ComparisonOperators;
-import org.ugp.serialx.converters.operators.ConditionalAssignmentOperators;
-import org.ugp.serialx.converters.operators.LogicalOperators;
+import org.ugp.serialx.converters.imports.ImportConverter.Imports;
+import org.ugp.serialx.converters.imports.ImportsProvider;
 import org.ugp.serialx.protocols.SerializationProtocol.ProtocolRegistry;
 
-import javafx.beans.binding.When;
-
 /**
  * This is implementation of {@link Serializer} for serializing in default SerialX API implementation known as JUSS (Java universal serial script) which is Json like domain specific language that has extended functionality!
  * It should generate and work with .juss or .srlx files!
@@ -44,17 +39,39 @@
  * @since 1.3.2
  */
 @SuppressWarnings("serial")
-public class JussSerializer extends Serializer 
+public class JussSerializer extends Serializer implements ImportsProvider
 {
-	public static final ParserRegistry JUSS_PARSERS = DataParser.REGISTRY.clone(), JUSS_PARSERS_AND_OPERATORS;
+	/**
+	 * {@link ParserRegistry} with all parsers required to parse JUSS!
+	 * 
+	 * @since 1.3.2
+	 */
+	public static final ParserRegistry JUSS_PARSERS = DataParser.REGISTRY.clone();
+	
+	/**
+	 * {@link ParserRegistry} with all parsers required to parse JUSS with additional operators.
+	 * <br>
+	 * Since 1.3.7 this requires "org.ugp.serialx.converters.Operators" from SerialX "operators" modules to be present on the classpath!
+	 * 
+	 * @since 1.3.2
+	 */
+	public static final ParserRegistry JUSS_PARSERS_AND_OPERATORS;
 
 	static
 	{
 		JUSS_PARSERS.add(0, new ImportConverter());
 		JUSS_PARSERS_AND_OPERATORS = JUSS_PARSERS.clone();
-		JUSS_PARSERS_AND_OPERATORS.addAllBefore(StringConverter.class, true, new ConditionalAssignmentOperators(), new LogicalOperators(), new ComparisonOperators(), new ArithmeticOperators());
+		
+		try 
+		{
+			InvokeStaticFunc(Class.forName("org.ugp.serialx.converters.Operators"), "install", JUSS_PARSERS_AND_OPERATORS);
+		} 
+		catch (Exception e) 
+		{}
 	}
 
+	protected Imports imports;
+	
 	/**
 	 * Set this on true and program will generate comments and report!<br>
 	 * Note: Keep this on false to achieve the best performance!
@@ -158,6 +175,14 @@ public ParserRegistry getParsers()
 		return parsers != null ? parsers : (parsers = JUSS_PARSERS.clone());
 	}
 
+	@Override
+	public Imports getImports() 
+	{
+		if (imports == null)
+			imports = ImportConverter.IMPORTS.clone();
+		return imports;
+	}
+	
 	/**
 	 * @param absoluteClone | If true this scope will be cloned using {@link Serializer#Clone(Object, Registry, Object[], Object...)}, if false {@link Scope#clone()}!
 	 * 
@@ -785,7 +810,7 @@ <th>Obtained serializer content (return)</th>
 			</tr>
 		</table>
 	 *	
-	 * @throws When something went wrong during deserialization!
+	 * @throws If something went wrong during deserialization!
 	 * 
 	 * @since 1.3.5
 	 */