Ensure models load even with errors

Author: madhephaestus

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

@@ -295,6 +295,7 @@ public void initialize() {
 		opperations = opperations.stream().filter(Objects::nonNull).collect(Collectors.toCollection(ArrayList::new));
 		if (indexStarting > opperations.size())
 			indexStarting = opperations.size();
+		ArrayList<CaDoodleOperation> toRem = new ArrayList<CaDoodleOperation>();
 		for (int i = 0; i < getOpperations().size(); i++) {
 			CaDoodleOperation op = getOpperations().get(i);
 			if (op == null)
@@ -306,11 +307,15 @@ public void initialize() {
 				process(op);
 			} catch (Throwable t) {
 				com.neuronrobotics.sdk.common.Log.error(t);
-				indexStarting = i + 1;
-				break;
-				// opperations.remove(op);
+				//indexStarting = i ;
+				//break;
+				//toRem.add(op);
 			}
 		}
+		//opperations.removeAll(toRem);
+//		if(indexStarting>opperations.size()) {
+//			indexStarting = opperations.size();
+//		}
 		setCurrentIndex(indexStarting);
 		updateCurrentFromCache();
 		loadImageFromFile();
@@ -499,18 +504,31 @@ public void run() {
 
 	}
 
-	private void process(CaDoodleOperation op) {
+	private void process(CaDoodleOperation op) throws Exception{
 		op.setCaDoodleFile(this);
-		List<CSG> process = op.process(getCurrentState());
-		if (MakeRobot.class.isInstance(op)) {
-			MakeRobot mr = (MakeRobot) op;
-			getRobots().put(mr.getName(), mr.getBuilder());
+		List<CSG> process=null;
+		Exception ex=null;
+		try {
+			process= op.process(getCurrentState());
+			if (MakeRobot.class.isInstance(op)) {
+				MakeRobot mr = (MakeRobot) op;
+				getRobots().put(mr.getName(), mr.getBuilder());
+			}
+		}catch(Exception ex1) {
+			ex=ex1;
+		}
+		if(process==null) {
+			process=getCurrentState();
+		}
+		if(process.size()==0) {
+			Log.error("Nothing returned int he process step?");
 		}
 		int currentIndex2 = getCurrentIndex();
 		storeResultInCache(op, process);
 		setCurrentIndex(currentIndex2 + 1);
 		setCurrentState(op, process);
-
+		if(ex!=null)
+			throw ex;
 	}
 
 	public boolean isOperationRunning() {
@@ -569,7 +587,12 @@ public void run() {
 					}
 					if (getResult() == OperationResult.INSERT) {
 						getOpperations().add(getCurrentIndex(), op);
-						process(op);
+						try {
+							process(op);
+						} catch (Exception e) {
+							// TODO Auto-generated catch block
+							e.printStackTrace();
+						}
 						try {
 							regenerateFrom(op).join();
 						} catch (InterruptedException e) {
@@ -632,12 +655,12 @@ public void run() {
 		return t;
 	}
 
-	public static CSG getByName(List<CSG> back, String name) {
+	public static CSG getByName(List<CSG> back, String name) throws NameMissingException{
 		for (CSG c : back) {
 			if (c.getName().contentEquals(name))
 				return c;
 		}
-		throw new RuntimeException("Fail! there was no object named " + name);
+		throw new NameMissingException("Fail! there was no object named " + name);
 	}
 
 	public static int applyToAllConstituantElements(boolean addRet, List<String> targetNames, ArrayList<CSG> back,
@@ -649,10 +672,10 @@ public static int applyToAllConstituantElements(boolean addRet, List<String> tar
 				CSG c = getByName(back, s);
 				if (c.isInGroup())
 					continue;
-			} catch (Exception ex) {
-				com.neuronrobotics.sdk.common.Log.error(ex);
-				//continue;
+			}catch(NameMissingException e) {
+				continue;
 			}
+	
 			applyToAllConstituantElements(addRet, s, back, p, depth, appliedMemory);
 		}
 		return back.size();
@@ -755,8 +778,7 @@ private void storeResultInCache(CaDoodleOperation op, List<CSG> process) {
 		HashSet<String> names = new HashSet<>();
 		for (CSG c : process) {
 			if (names.contains(c.getName()))
-				throw new RuntimeException("There can not be 2 objects with the same name after an " + op.getType()
-						+ " opperation! " + c.getName());
+				continue;
 			names.add(c.getName());
 			CSG cachedVer = cloneCSG(c).setStorage(new PropertyStorage()).syncProperties(getCsgDBinstance(), c)
 					.setName(c.getName()).setRegenerate(c.getRegenerate()).setID(c);

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

@@ -0,0 +1,9 @@
+package com.neuronrobotics.bowlerstudio.scripting.cadoodle;
+
+public class NameMissingException extends Exception {
+
+	public NameMissingException(String string) {
+		super(string);
+	}
+
+}

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

@@ -54,16 +54,31 @@ public ArrayList<CSG> process(CSG ic, int depth) {
 		},1);
 
 		for (String from : cpMap.keySet()) {
-			CSG source =  CaDoodleFile.getByName(back, from);
+			CSG source;
+			try {
+				source = CaDoodleFile.getByName(back, from);
+			} catch (NameMissingException e) {
+				continue;
+			}
 			if (source.isGroupResult()) {
 				ArrayList<String> c = constituants(back, from);
 				if(c.size()<1) {
 					new RuntimeException("A group result must have at least 1 constituants!").printStackTrace();;
 					continue;
 				}
-				String newGroupName =  CaDoodleFile.getByName(back, cpMap.get(from)).getName();
+				String newGroupName;
+				try {
+					newGroupName = CaDoodleFile.getByName(back, cpMap.get(from)).getName();
+				} catch (NameMissingException e) {
+					continue;
+				}
 				for (String s : c) {
-					CSG dest =  CaDoodleFile.getByName(back, s);
+					CSG dest;
+					try {
+						dest = CaDoodleFile.getByName(back, s);
+					} catch (NameMissingException e) {
+						continue;
+					}
 					dest.removeGroupMembership(from);
 					dest.addGroupMembership(newGroupName);
 				}
@@ -75,9 +90,19 @@ public ArrayList<CSG> process(CSG ic, int depth) {
 	private ArrayList<String> constituants(ArrayList<CSG> b, String name) {
 		ArrayList<String> c = new ArrayList<String>();
 		for (String ky:cpMap.keySet()) {
-			CSG byName = CaDoodleFile.getByName(b,ky);
+			CSG byName;
+			try {
+				byName = CaDoodleFile.getByName(b,ky);
+			} catch (NameMissingException e) {
+				continue;
+			}
 			String name2 = cpMap.get(ky);
-			CSG byName2 =  CaDoodleFile.getByName(b,name2);
+			CSG byName2;
+			try {
+				byName2 = CaDoodleFile.getByName(b,name2);
+			} catch (NameMissingException e) {
+				continue;
+			}
 			for(CSG csg:Arrays.asList(byName,byName2)){
 			if (csg.checkGroupMembership(name)) {
 				// only add objects that were created by this operation