Merge branch 'kh/builders-of-mobile-base' of [email protected]:CommonWealthRobotics/bowler-script-kernel.git into kh/builders-of-mobile-base

Author: madhephaestus

src/main/java/com/neuronrobotics/bowlerstudio/scripting/CaDoodleLoader.java

@@ -22,13 +22,17 @@ public class CaDoodleLoader implements IScriptingLanguage {
 	@Override
 	public Object inlineScriptRun(File code, ArrayList<Object> args) throws Exception {
 		CaDoodleFile loaded = CaDoodleFile.fromFile(code);
-		return process(loaded);
+		Object process = process(loaded);
+		loaded.close();
+		return process;
 	}
 
 	@Override
 	public Object inlineScriptRun(String code, ArrayList<Object> args) throws Exception {
 		CaDoodleFile loaded = CaDoodleFile.fromJsonString(code);
-		return process(loaded);
+		Object process = process(loaded);
+		loaded.close();
+		return process;
 	}
 
 	public static Object process(CaDoodleFile loaded) {

src/main/java/com/neuronrobotics/bowlerstudio/scripting/cadoodle/AbstractAddFrom.java

@@ -8,7 +8,7 @@
 
 import com.google.gson.annotations.Expose;
 
-public abstract class AbstractAddFrom  implements ICaDoodleOpperation {
+public abstract class AbstractAddFrom  extends AbstractCaDoodleFileAccepter{
 	@Expose (serialize = false, deserialize = false)
 	protected HashSet<String> namesAdded = new HashSet<>();
 	@Expose (serialize = false, deserialize = false)

src/main/java/com/neuronrobotics/bowlerstudio/scripting/cadoodle/AbstractCaDoodleFileAccepter.java

@@ -0,0 +1,14 @@
+package com.neuronrobotics.bowlerstudio.scripting.cadoodle;
+
+public abstract class AbstractCaDoodleFileAccepter implements ICaDoodleOpperation{
+	private CaDoodleFile cf = null;
+
+	public CaDoodleFile getCaDoodleFile() {
+		return cf;
+	}
+
+	public void setCaDoodleFile(CaDoodleFile cf) {
+		this.cf = cf;
+	}
+	
+}

src/main/java/com/neuronrobotics/bowlerstudio/scripting/cadoodle/AddFromFile.java

@@ -28,7 +28,7 @@
 import eu.mihosoft.vrl.v3d.parametrics.CSGDatabaseInstance;
 import eu.mihosoft.vrl.v3d.parametrics.StringParameter;
 
-public class AddFromFile extends AbstractAddFrom implements ICaDoodleOpperation {
+public class AddFromFile extends AbstractAddFrom {
 	@Expose(serialize = true, deserialize = true)
 	private TransformNR location = null;
 	private ArrayList<String> options = new ArrayList<String>();

src/main/java/com/neuronrobotics/bowlerstudio/scripting/cadoodle/AddFromScript.java

@@ -21,7 +21,7 @@
 import eu.mihosoft.vrl.v3d.parametrics.CSGDatabase;
 import eu.mihosoft.vrl.v3d.parametrics.CSGDatabaseInstance;
 
-public class AddFromScript extends AbstractAddFrom implements ICaDoodleOpperation {
+public class AddFromScript extends AbstractAddFrom {
 	@Expose(serialize = true, deserialize = true)
 	private String gitULR = "";
 	@Expose(serialize = true, deserialize = true)

src/main/java/com/neuronrobotics/bowlerstudio/scripting/cadoodle/Allign.java

@@ -13,7 +13,7 @@
 import eu.mihosoft.vrl.v3d.CSG;
 import eu.mihosoft.vrl.v3d.Transform;
 
-public class Allign implements ICaDoodleOpperation {
+public class Allign extends AbstractCaDoodleFileAccepter{
 	@Expose (serialize = true, deserialize = true)
 	private List<String> names = new ArrayList<String>();
 	@Expose (serialize = true, deserialize = true)

src/main/java/com/neuronrobotics/bowlerstudio/scripting/cadoodle/CaDoodleFile.java

@@ -55,7 +55,7 @@
 public class CaDoodleFile {
 	public static final String NO_NAME = "NoName";
 	@Expose(serialize = true, deserialize = true)
-	private ArrayList<ICaDoodleOpperation> opperations = new ArrayList<ICaDoodleOpperation>();
+	private ArrayList<AbstractCaDoodleFileAccepter> opperations = new ArrayList<AbstractCaDoodleFileAccepter>();
 	@Expose(serialize = true, deserialize = true)
 	private int currentIndex = 0;
 	@Expose(serialize = true, deserialize = true)
@@ -65,24 +65,23 @@ public class CaDoodleFile {
 	@Expose(serialize = true, deserialize = true)
 	private TransformNR rulerLocation = new TransformNR();
 	@Expose(serialize = true, deserialize = true)
+	
+	// Non Serialised private variables
 	private TransformNR workplane = new TransformNR();
-	@Expose(serialize = false, deserialize = false)
 	private File selfInternal;
 //	@Expose (serialize = false, deserialize = false)
 //	private List<CSG> currentState = new ArrayList<CSG>();
-	@Expose(serialize = false, deserialize = false)
 	private double percentInitialized = 0;
-	@Expose(serialize = false, deserialize = false)
-	private HashMap<ICaDoodleOpperation, List<CSG>> cache = new HashMap<ICaDoodleOpperation, List<CSG>>();
+	private final HashMap<AbstractCaDoodleFileAccepter, List<CSG>> cache = new HashMap<AbstractCaDoodleFileAccepter, List<CSG>>();
 	private static Type TT_CaDoodleFile = new TypeToken<CaDoodleFile>() {
 	}.getType();
 	private static Gson gson = new GsonBuilder().disableHtmlEscaping().setPrettyPrinting()
 			.excludeFieldsWithoutExposeAnnotation().registerTypeAdapterFactory(new ICaDoodleOperationAdapterFactory())
 			.create();
-	private ArrayList<ICaDoodleStateUpdate> listeners = new ArrayList<ICaDoodleStateUpdate>();
+	private final ArrayList<ICaDoodleStateUpdate> listeners = new ArrayList<ICaDoodleStateUpdate>();
 	private final ArrayList<Thread> opperationRunner = new ArrayList<Thread>();
 	private boolean regenerating;
-	private CopyOnWriteArrayList<ICaDoodleOpperation> toProcess = new CopyOnWriteArrayList<ICaDoodleOpperation>();
+	private final CopyOnWriteArrayList<AbstractCaDoodleFileAccepter> toProcess = new CopyOnWriteArrayList<AbstractCaDoodleFileAccepter>();
 	private javafx.scene.image.WritableImage img;
 	private boolean initializing;
 	private static HashMap<String, VitaminBomManager> bomManagers = new HashMap<>();
@@ -100,18 +99,20 @@ public void renderSplashFrame(int percent, String message) {
 	private boolean timelineOpen = false;
 
 	public void close() {
+		//new Exception("CaDoodle File Closed here").printStackTrace();
+		for(AbstractCaDoodleFileAccepter op:getOpperations()) {
+			op.setCaDoodleFile(null);
+		}
 		for (ICaDoodleOpperation op : cache.keySet()) {
 			cache.get(op).clear();
 		}
 		cache.clear();
-		cache = null;
 		clearListeners();
-		listeners = null;
 		toProcess.clear();
-		toProcess = null;
 		img = null;
 		for (Thread t : opperationRunner)
 			t.interrupt();
+		
 	}
 
 	public CaDoodleFile clearListeners() {
@@ -158,7 +159,7 @@ public void initialize() {
 		if (indexStarting > opperations.size())
 			indexStarting = opperations.size();
 		for (int i = 0; i < getOpperations().size(); i++) {
-			ICaDoodleOpperation op = getOpperations().get(i);
+			AbstractCaDoodleFileAccepter op = getOpperations().get(i);
 			if (op == null)
 				continue;
 			setPercentInitialized(((double) i) / (double) getOpperations().size());
@@ -245,6 +246,8 @@ public Thread regenerateFrom(ICaDoodleOpperation source) {
 //					.printStackTrace();
 		}
 		Thread t = null;
+		CaDoodleFile cf = this;
+
 		t = new Thread() {
 			public void run() {
 				this.setName("Regeneration Threads");
@@ -270,11 +273,12 @@ public void run() {
 							setPercentInitialized(((double) getCurrentIndex()) / size);
 							// com.neuronrobotics.sdk.common.Log.error("Regenerating "+currentIndex);
 							int currentIndex2 = getCurrentIndex() - 1;
-							ICaDoodleOpperation op = getOpperations().get(currentIndex2);
+							AbstractCaDoodleFileAccepter op = getOpperations().get(currentIndex2);
 							getSaveUpdate().renderSplashFrame(percent,
 									"Regenerating " + op.getType() + " " + currentIndex2);
 							getTimelineImageFile(op).delete();
 							try {
+								op.setCaDoodleFile(cf);
 								List<CSG> process = op.process(getPreviouState());
 								storeResultInCache(op, process);
 								setCurrentState(op, process);
@@ -318,6 +322,7 @@ public Thread regenerateCurrent() {
 		}
 		fireRegenerateStart();
 		Thread t = null;
+		CaDoodleFile cf = this;
 		t = new Thread() {
 			public void run() {
 				timeOfLastUpdate = System.currentTimeMillis();
@@ -326,8 +331,9 @@ public void run() {
 
 				this.setName("regenerateCurrent Thread");
 
-				ICaDoodleOpperation op = getCurrentOpperation();
+				AbstractCaDoodleFileAccepter op = getCurrentOpperation();
 				TickToc.tic("Start regenerate");
+				op.setCaDoodleFile(cf);
 				List<CSG> process = op.process(getPreviouState());
 				TickToc.tic("Finish regenerate");
 				int currentIndex2 = getCurrentIndex();
@@ -350,7 +356,8 @@ public void run() {
 
 	}
 
-	private void process(ICaDoodleOpperation op) {
+	private void process(AbstractCaDoodleFileAccepter op) {
+		op.setCaDoodleFile(this);
 		List<CSG> process = op.process(getCurrentState());
 		int currentIndex2 = getCurrentIndex();
 		storeResultInCache(op, process);
@@ -377,7 +384,7 @@ public boolean isOperationRunning() {
 		return false;
 	}
 
-	public Thread addOpperation(ICaDoodleOpperation o) throws CadoodleConcurrencyException {
+	public Thread addOpperation(AbstractCaDoodleFileAccepter o) throws CadoodleConcurrencyException {
 		if (o == null)
 			throw new NullPointerException();
 		toProcess.add(o);
@@ -393,7 +400,7 @@ public void run() {
 				while (toProcess.size() > 0) {
 					result = OperationResult.APPEND;
 					this.setName("addOpperation Thread " + toProcess.size());
-					ICaDoodleOpperation op = toProcess.remove(0);
+					AbstractCaDoodleFileAccepter op = toProcess.remove(0);
 					if (getCurrentIndex() != getOpperations().size()) {
 						try {
 							fireRegenerateStart();
@@ -578,9 +585,9 @@ private OperationResult pruneForward(ICaDoodleOpperation op) throws Exception {
 				imageCache.delete();
 			}
 		if (res == OperationResult.PRUNE) {
-			List<ICaDoodleOpperation> subList = (List<ICaDoodleOpperation>) getOpperations().subList(0,
+			List<AbstractCaDoodleFileAccepter> subList = (List<AbstractCaDoodleFileAccepter>) getOpperations().subList(0,
 					getCurrentIndex());
-			ArrayList<ICaDoodleOpperation> newList = new ArrayList<ICaDoodleOpperation>();
+			ArrayList<AbstractCaDoodleFileAccepter> newList = new ArrayList<AbstractCaDoodleFileAccepter>();
 			newList.addAll(subList);
 			setOpperations(newList);
 			com.neuronrobotics.sdk.common.Log.error("Pruning forward here!");
@@ -589,7 +596,7 @@ private OperationResult pruneForward(ICaDoodleOpperation op) throws Exception {
 		return res;
 	}
 
-	private void storeResultInCache(ICaDoodleOpperation op, List<CSG> process) {
+	private void storeResultInCache(AbstractCaDoodleFileAccepter op, List<CSG> process) {
 		ArrayList<CSG> cachedCopy = new ArrayList<CSG>();
 		HashSet<String> names = new HashSet<>();
 		for (CSG c : process) {
@@ -678,7 +685,7 @@ private void updateCurrentFromCache() {
 		setCurrentState(key, getCurrentState());
 	}
 
-	public ICaDoodleOpperation getCurrentOpperation() {
+	public AbstractCaDoodleFileAccepter getCurrentOpperation() {
 		if (getCurrentIndex() == 0)
 			return null;
 		return getOpperations().get(getCurrentIndex() - 1);
@@ -1039,11 +1046,11 @@ public static CaDoodleFile fromFile(File f, ICaDoodleStateUpdate listener, boole
 		return file;
 	}
 
-	public ArrayList<ICaDoodleOpperation> getOpperations() {
+	public ArrayList<AbstractCaDoodleFileAccepter> getOpperations() {
 		return opperations;
 	}
 
-	public void setOpperations(ArrayList<ICaDoodleOpperation> opperations) {
+	public void setOpperations(ArrayList<AbstractCaDoodleFileAccepter> opperations) {
 		this.opperations = opperations;
 		currentIndex = opperations.size();
 	}

src/main/java/com/neuronrobotics/bowlerstudio/scripting/cadoodle/Delete.java

@@ -13,7 +13,7 @@
 
 import eu.mihosoft.vrl.v3d.CSG;
 
-public class Delete implements ICaDoodleOpperation {
+public class Delete extends AbstractCaDoodleFileAccepter {
 	@Expose(serialize = true, deserialize = true)
 	private TransformNR location = new TransformNR();
 	@Expose(serialize = true, deserialize = true)

src/main/java/com/neuronrobotics/bowlerstudio/scripting/cadoodle/Group.java

@@ -12,7 +12,7 @@
 import eu.mihosoft.vrl.v3d.parametrics.IParametric;
 import javafx.scene.paint.Color;
 
-public class Group extends AbstractAddFrom implements ICaDoodleOpperation {
+public class Group extends AbstractAddFrom {
 	@Expose(serialize = true, deserialize = true)
 	private List<String> names = new ArrayList<String>();
 	@Expose(serialize = true, deserialize = true)

src/main/java/com/neuronrobotics/bowlerstudio/scripting/cadoodle/Hide.java

@@ -7,7 +7,7 @@
 
 import eu.mihosoft.vrl.v3d.CSG;
 
-public class Hide implements ICaDoodleOpperation {
+public class Hide extends AbstractCaDoodleFileAccepter{
 	@Expose (serialize = true, deserialize = true)
 	private List<String> names = new ArrayList<String>();
 	@Override