Code cleanup

gama.annotations/src/gama/annotations/precompiler/GamlAnnotations.java

@@ -444,27 +444,6 @@ boolean internal()
 		doc[] doc() default {};
 	}
 
-	// /**
-	// * The Interface args. Describes the names of the arguments passed to an action.
-	// *
-	// * @deprecated use action.args() instead
-	// * @see action
-	// */
-	// @Retention (RetentionPolicy.RUNTIME)
-	// @Target (ElementType.METHOD)
-	// @Deprecated
-	// public static @interface args {
-	//
-	// /**
-	// * Value.
-	// *
-	// *
-	// * @return an Array of strings, each representing an argument that can be passed to a action. Used to tag the
-	// * method that will implement the action.
-	// */
-	// String[] names();
-	//
-	// }
 
 	/**
 	 *

gama.annotations/src/gama/annotations/precompiler/Reason.java

@@ -19,7 +19,7 @@
  */
 public enum Reason {
 	/**
-	 * The test on this specific artefact are actually made somewhere else, usually in custom test files written by hand
+	 * The test on this specific artifact are actually made somewhere else, usually in custom test files written by hand
 	 */
 	ALREADY_TESTED,
 	/**

gama.annotations/src/gama/annotations/precompiler/doc/DocProcessorAnnotations.java

@@ -109,7 +109,7 @@ public static org.w3c.dom.Element getDocElt(final doc docAnnot, final Document d
 			// Parse result
 			final String value = docAnnot.value();
 			final boolean masterDoc = docAnnot.masterDoc();
-			if (value != "") {
+			if ( !"".equals(value)) {
 				if (docElt.getElementsByTagName(XMLElements.RESULT).getLength() != 0) {
 					final org.w3c.dom.Element resultElt =
 							(org.w3c.dom.Element) docElt.getElementsByTagName(XMLElements.RESULT).item(0);
@@ -346,10 +346,21 @@ public static org.w3c.dom.Element getConstantElt(final constant constant, final
 		final String valCstStr = valCst == null ? "No Default Value" : valCst.toString();
 		constantElt.setAttribute(XMLElements.ATT_CST_VALUE, valCstStr);
 
-		String names = "";
+		StringBuilder strBuilder = new StringBuilder();
+		boolean firstPass = true;
 		for (final String n : constant.altNames()) {
-			names = "".equals(names) ? PREFIX_CONSTANT + n : names + "," + PREFIX_CONSTANT + n;
+
+			if (firstPass) {
+				firstPass = false;
+			}
+			else {
+				strBuilder.append(",");				
+			}
+			strBuilder.append(PREFIX_CONSTANT);
+			strBuilder.append(n);
 		}
+		final String names = strBuilder.toString();
+
 		if (!"".equals(names))
 			constantElt.setAttribute(XMLElements.ATT_CST_NAMES, names);
 
@@ -376,30 +387,36 @@ public static org.w3c.dom.Element getConstantElt(final constant constant, final
 	 */
 	public static org.w3c.dom.Element getVarsElt(final vars varsAnnot, final Document doc, final Messager mes,
 			final String skillName, final TypeConverter tc) {
-		if (varsAnnot != null) {
-			final org.w3c.dom.Element varsElt = doc.createElement(XMLElements.VARS);
-			for (final variable v : varsAnnot.value()) {
-				final org.w3c.dom.Element varElt = doc.createElement(XMLElements.VAR);
-				varElt.setAttribute(XMLElements.ATT_VAR_NAME, v.name());
-				varElt.setAttribute(XMLElements.ATT_VAR_TYPE, tc.getTypeString(Integer.valueOf(v.type())));
-				varElt.setAttribute(XMLElements.ATT_VAR_CONSTANT, "" + v.constant());
-
-				final org.w3c.dom.Element docEltVar = DocProcessorAnnotations.getDocElt(v.doc(), doc, mes,
-						"Var " + v.name() + " from " + skillName, tc, null);
-				if (docEltVar != null) {
-					varElt.appendChild(docEltVar);
-				}
+		if (varsAnnot == null) {
+			return null;
+		}
+		final org.w3c.dom.Element varsElt = doc.createElement(XMLElements.VARS);
+		for (final variable v : varsAnnot.value()) {
+			final org.w3c.dom.Element varElt = doc.createElement(XMLElements.VAR);
+			varElt.setAttribute(XMLElements.ATT_VAR_NAME, v.name());
+			varElt.setAttribute(XMLElements.ATT_VAR_TYPE, tc.getTypeString(Integer.valueOf(v.type())));
+			varElt.setAttribute(XMLElements.ATT_VAR_CONSTANT, "" + v.constant());
+
+			final org.w3c.dom.Element docEltVar = DocProcessorAnnotations.getDocElt(v.doc(), doc, mes,
+					"Var " + v.name() + " from " + skillName, tc, null);
+			if (docEltVar != null) {
+				varElt.appendChild(docEltVar);
+			}
 
-				String dependsOn = new String();
-				for (final String dependElement : v.depends_on()) {
-					dependsOn = ("".equals(dependsOn) ? "" : dependsOn + ",") + dependElement;
+			StringBuilder strBuilder = new StringBuilder();
+			for (int i = 0 ; i < v.depends_on().length; i++ ) {
+				final String dependElement = v.depends_on()[i];
+				strBuilder.append(dependElement);
+				if (i < v.depends_on().length - 1) {
+					strBuilder.append(",");
 				}
-				varElt.setAttribute(XMLElements.ATT_VAR_DEPENDS_ON, dependsOn);
-				varsElt.appendChild(varElt);
 			}
-			return varsElt;
+
+			final String dependsOn = strBuilder.toString();
+			varElt.setAttribute(XMLElements.ATT_VAR_DEPENDS_ON, dependsOn);
+			varsElt.appendChild(varElt);
 		}
-		return null;
+		return varsElt;
 	}
 
 	/**
@@ -475,12 +492,15 @@ public static org.w3c.dom.Element getFacetsElt(final facets facetsAnnot, final D
 			facetElt.setAttribute(XMLElements.ATT_FACET_TYPE, tc.getTypeString(f.type()));
 			facetElt.setAttribute(XMLElements.ATT_FACET_OPTIONAL, "" + f.optional());
 			if (f.values().length != 0) {
-				String valuesTaken = ", takes values in: {" + f.values()[0];
+				StringBuilder strBuilder = new StringBuilder();
+				strBuilder.append(", takes values in: {");
+				strBuilder.append(f.values()[0]);
 				for (int i = 1; i < f.values().length; i++) {
-					valuesTaken += ", " + f.values()[i];
+					strBuilder.append(", ");
+					strBuilder.append(f.values()[i]);
 				}
-				valuesTaken += "}";
-				facetElt.setAttribute(XMLElements.ATT_FACET_VALUES, valuesTaken);
+				strBuilder.append("}");
+				facetElt.setAttribute(XMLElements.ATT_FACET_VALUES, strBuilder.toString());
 			}
 			facetElt.setAttribute(XMLElements.ATT_FACET_OMISSIBLE,
 					f.name().equals(facetsAnnot.omissible()) ? "true" : "false");

gama.annotations/src/gama/annotations/precompiler/doc/utils/Constants.java

@@ -30,11 +30,9 @@ public class Constants {
 
 	// Repositories containing used files
 
-	/** The Constant BASE_FOLDER. */
-	public final static String BASE_FOLDER = "";
 
 	/** The Constant SRC_FOLDER. */
-	public final static String SRC_FOLDER = BASE_FOLDER + "files";
+	public final static String SRC_FOLDER = "files";
 
 	/** The Constant GEN_FOLDER. */
 	public final static String GEN_FOLDER = SRC_FOLDER + File.separator + "gen";

gama.annotations/src/gama/dev/DEBUG.java

@@ -37,7 +37,7 @@ public class DEBUG {
 	/**
 	 * A custom security manager that exposes the getClassContext() information
 	 */
-	static class MySecurityManager extends SecurityManager {
+	static private class MySecurityManager extends SecurityManager {
 
 		/**
 		 * Gets the caller class name.

gama.core/META-INF/MANIFEST.MF

@@ -755,6 +755,7 @@ Export-Package: gama.core.common;
    gama.core.kernel.experiment,
    gama.core.util.path,
    org.jgrapht.alg.drawing.model",
+ gama.gaml.operators.spatial,
  gama.gaml.skills;
   uses:="gama.core.util,
    gama.core.util.graph,

gama.core/src/gama/core/common/geometry/Envelope3D.java

@@ -39,7 +39,7 @@
 public class Envelope3D extends Envelope implements IDisposable, IIntersectable {
 
 	/** The Constant POOL. */
-	private final static PoolUtils.ObjectPool<Envelope3D> POOL =
+	private static final PoolUtils.ObjectPool<Envelope3D> POOL =
 			PoolUtils.create("Envelope 3D", true, Envelope3D::new, (from, to) -> to.set(from), null);
 
 	/** The Constant EMPTY. */

gama.core/src/gama/core/common/geometry/GamaCoordinateSequenceFactory.java

@@ -52,7 +52,7 @@ public ICoordinates create(final GamaPoint[] coordinates, final boolean copy) {
 	@Override
 	public ICoordinates create(final CoordinateSequence cs) {
 		if (cs.size() == 1) return new UniqueCoordinateSequence(cs.getDimension(), cs.getCoordinate(0));
-		if (cs instanceof GamaCoordinateSequence) return ((GamaCoordinateSequence) cs).clone();
+		if (cs instanceof GamaCoordinateSequence) return ((GamaCoordinateSequence) cs).copy();
 		return new GamaCoordinateSequence(cs.getDimension(), cs.toCoordinateArray());
 	}