diff --git a/src/main/java/com/neuronrobotics/bowlerstudio/scripting/CaDoodleLoader.java b/src/main/java/com/neuronrobotics/bowlerstudio/scripting/CaDoodleLoader.java index 3ed1a246..905f4847 100644 --- a/src/main/java/com/neuronrobotics/bowlerstudio/scripting/CaDoodleLoader.java +++ b/src/main/java/com/neuronrobotics/bowlerstudio/scripting/CaDoodleLoader.java @@ -65,7 +65,7 @@ public boolean getIsTextFile() { */ public String getDefaultContents() { return "{\n" - + " \"opperations\": [],\n" + + " \"operations\": [],\n" + " \"currentIndex\": 0,\n" + " \"projectName\": \"A Test Project\"\n" + "}"; diff --git a/src/main/java/com/neuronrobotics/bowlerstudio/scripting/cadoodle/CaDoodleFile.java b/src/main/java/com/neuronrobotics/bowlerstudio/scripting/cadoodle/CaDoodleFile.java index 62f24952..63090c75 100644 --- a/src/main/java/com/neuronrobotics/bowlerstudio/scripting/cadoodle/CaDoodleFile.java +++ b/src/main/java/com/neuronrobotics/bowlerstudio/scripting/cadoodle/CaDoodleFile.java @@ -68,7 +68,7 @@ public class CaDoodleFile { public static final String NO_NAME = "NoName"; @Expose(serialize = true, deserialize = true) - private ArrayList opperations = new ArrayList(); + private ArrayList operations = new ArrayList(); @Expose(serialize = true, deserialize = true) private int currentIndex = 0; @Expose(serialize = true, deserialize = true) @@ -94,7 +94,7 @@ public class CaDoodleFile { .excludeFieldsWithoutExposeAnnotation() .registerTypeAdapterFactory(new CaDoodleJsonOperationAdapterFactory()).create(); private final ArrayList listeners = new ArrayList(); - private final ArrayList opperationRunner = new ArrayList(); + private final ArrayList operationRunner = new ArrayList(); private boolean regenerating; private final CopyOnWriteArrayList toProcess = new CopyOnWriteArrayList(); private javafx.scene.image.WritableImage img; @@ -126,13 +126,13 @@ public String toString() { } public void deleteTailFromCurrent() { - fireRegenerateStart(getCurrentOpperation()); + fireRegenerateStart(getCurrentOperation()); IAcceptPruneForward oldAccept = getAccept(); setAccept(() -> OperationResult.PRUNE); try { - pruneForward(getCurrentOpperation()); + pruneForward(getCurrentOperation()); } catch (Exception ex) { com.neuronrobotics.sdk.common.Log.error("Failed to prune tail" + ex); } @@ -151,7 +151,7 @@ public ArrayList getMobileBases() { public void close() { // new Exception("CaDoodle File Closed here").printStackTrace(); - for (CaDoodleOperation op : getOpperations()) { + for (CaDoodleOperation op : getOperations()) { op.setCaDoodleFile(null); } // for (CaDoodleOperation op : cache.keySet()) { @@ -161,14 +161,14 @@ public void close() { clearListeners(); toProcess.clear(); img = null; - for (Thread t : opperationRunner) + for (Thread t : operationRunner) t.interrupt(); } private int opToIndex(CaDoodleOperation op) { - for (int i = 0; i < opperations.size(); i++) { - if (op == opperations.get(i)) + for (int i = 0; i < operations.size(); i++) { + if (op == operations.get(i)) return i; } throw new IndexOutOfBoundsException(); @@ -211,7 +211,7 @@ private List getCachedCSGs(CaDoodleOperation op) { private void memoryCheck() { if (getFreeMemory() > 85) { com.neuronrobotics.sdk.common.Log.error("\n\nClearing Memory use: " + getFreeMemory() + "\n\n"); - CaDoodleOperation op = getCurrentOpperation(); + CaDoodleOperation op = getCurrentOperation(); List back = cache.get(op); cache.clear(); @@ -295,20 +295,20 @@ public void initialize() { } int indexStarting = getCurrentIndex(); if (indexStarting == 0) { - indexStarting = opperations.size(); + indexStarting = operations.size(); } this.currentIndex = 0; setPercentInitialized(0); - opperations = opperations.stream().filter(Objects::nonNull).collect(Collectors.toCollection(ArrayList::new)); - if (indexStarting > opperations.size()) - indexStarting = opperations.size(); + operations = operations.stream().filter(Objects::nonNull).collect(Collectors.toCollection(ArrayList::new)); + if (indexStarting > operations.size()) + indexStarting = operations.size(); ArrayList toRem = new ArrayList(); - for (int i = 0; i < getOpperations().size(); i++) { - CaDoodleOperation op = getOpperations().get(i); + for (int i = 0; i < getOperations().size(); i++) { + CaDoodleOperation op = getOperations().get(i); if (op == null) continue; op.setCaDoodleFile(this); - setPercentInitialized(((double) i) / (double) getOpperations().size()); + setPercentInitialized(((double) i) / (double) getOperations().size()); // if(!inCache(op)) try { process(op); @@ -319,9 +319,9 @@ public void initialize() { // toRem.add(op); } } - // opperations.removeAll(toRem); -// if(indexStarting>opperations.size()) { -// indexStarting = opperations.size(); + // operations.removeAll(toRem); +// if(indexStarting>operations.size()) { +// indexStarting = operations.size(); // } setCurrentIndex(indexStarting); updateCurrentFromCache(); @@ -392,7 +392,7 @@ public Thread regenerateFrom(CaDoodleOperation source) { } fireRegenerateStart(source); int endIndex = getCurrentIndex(); - double size = getOpperations().size(); + double size = getOperations().size(); if (endIndex != size) { // new Exception("Regenerationg from a position back in time " + endIndex + " but have " + size) // .printStackTrace(); @@ -410,7 +410,7 @@ public void run() { // "+source.getType()); int opIndex = 0; for (int i = 0; i < size; i++) { - CaDoodleOperation op = getOpperations().get(i); + CaDoodleOperation op = getOperations().get(i); if (source == op) { opIndex = i; break; @@ -419,13 +419,13 @@ public void run() { setCurrentIndex(opIndex); try { for (; getCurrentIndex() < size;) { - int percent = (int) (((double) getCurrentIndex()) / ((double) getOpperations().size()) + int percent = (int) (((double) getCurrentIndex()) / ((double) getOperations().size()) * 100.0); setCurrentIndex(getCurrentIndex() + 1); setPercentInitialized(((double) getCurrentIndex()) / size); // com.neuronrobotics.sdk.common.Log.error("Regenerating "+currentIndex); int currentIndex2 = getCurrentIndex() - 1; - CaDoodleOperation op = getOpperations().get(currentIndex2); + CaDoodleOperation op = getOperations().get(currentIndex2); getSaveUpdate().renderSplashFrame(percent, "Regenerating " + op.getType() + " " + currentIndex2); getTimelineImageFile(op).delete(); @@ -455,10 +455,10 @@ public void run() { } catch (Throwable th) { com.neuronrobotics.sdk.common.Log.error(th); } - opperationRunner.remove(this); + operationRunner.remove(this); } }; - opperationRunner.add(t); + operationRunner.add(t); t.start(); return t; } @@ -467,14 +467,14 @@ public Thread regenerateCurrent() { if (isOperationRunning()) { com.neuronrobotics.sdk.common.Log.error(new Exception("Operation Running, bailing")); - return opperationRunner.get(0); + return operationRunner.get(0); } if (initializing) { Thread t = new Thread(); t.start(); return t; } - CaDoodleOperation op = getCurrentOpperation(); + CaDoodleOperation op = getCurrentOperation(); fireRegenerateStart(op); Thread t = null; @@ -502,10 +502,10 @@ public void run() { TickToc.tic("Fired save suggestion"); fireRegenerateDone(); TickToc.tic("Fired regeneration Done"); - opperationRunner.remove(this); + operationRunner.remove(this); } }; - opperationRunner.add(t); + operationRunner.add(t); t.start(); return t; @@ -539,11 +539,11 @@ private void process(CaDoodleOperation op) throws Exception { } public boolean isOperationRunning() { - for (int i = 0; i < opperationRunner.size(); i++) { - Thread t = opperationRunner.get(i); + for (int i = 0; i < operationRunner.size(); i++) { + Thread t = operationRunner.get(i); if (t != null) { if (!t.isAlive()) { - opperationRunner.remove(t); + operationRunner.remove(t); // new Exception("Thread failed to remove itself // "+t.getName()).printStackTrace(); continue; @@ -556,13 +556,13 @@ public boolean isOperationRunning() { return false; } - public Thread addOpperation(CaDoodleOperation o) throws CadoodleConcurrencyException { + public Thread addOperation(CaDoodleOperation o) throws CadoodleConcurrencyException { if (o == null) throw new NullPointerException(); toProcess.add(o); if (isOperationRunning()) { com.neuronrobotics.sdk.common.Log.error(new Exception("Operation Running, bailing")); - return opperationRunner.get(0); + return operationRunner.get(0); } Thread t = null; t = new Thread() { @@ -571,10 +571,10 @@ public void run() { timeOfLastUpdate = System.currentTimeMillis(); while (toProcess.size() > 0) { result = OperationResult.APPEND; - this.setName("addOpperation Thread " + toProcess.size()); + this.setName("addOperation Thread " + toProcess.size()); CaDoodleOperation op = toProcess.remove(0); com.neuronrobotics.sdk.common.Log.debug("Adding Operation " + op); - if (getCurrentIndex() != getOpperations().size()) { + if (getCurrentIndex() != getOperations().size()) { try { fireRegenerateStart(op); setResult(pruneForward(op)); @@ -585,7 +585,7 @@ public void run() { } if (getResult() == OperationResult.APPEND || getResult() == OperationResult.PRUNE) { try { - getOpperations().add(op); + getOperations().add(op); process(op); } catch (Exception ex) { com.neuronrobotics.sdk.common.Log.error(ex); @@ -593,7 +593,7 @@ public void run() { } } if (getResult() == OperationResult.INSERT) { - getOpperations().add(getCurrentIndex(), op); + getOperations().add(getCurrentIndex(), op); try { process(op); } catch (Exception e) { @@ -608,16 +608,16 @@ public void run() { updateCurrentFromCache(); } if (getResult() == OperationResult.ABORT) { - setCurrentState(getCurrentOpperation(), getCurrentState()); + setCurrentState(getCurrentOperation(), getCurrentState()); } updateBoM(); fireSaveSuggestion(); fireRegenerateDone(); } - opperationRunner.remove(this); + operationRunner.remove(this); } }; - opperationRunner.add(t); + operationRunner.add(t); t.start(); return t; } @@ -627,24 +627,24 @@ public Thread deleteOperation(CaDoodleOperation op) { throw new NullPointerException(); if (isOperationRunning()) { com.neuronrobotics.sdk.common.Log.error(new Exception("Operation Running, bailing")); - return opperationRunner.get(0); + return operationRunner.get(0); } Thread t = null; t = new Thread() { public void run() { timeOfLastUpdate = System.currentTimeMillis(); - this.setName("deleteOpperation Thread " + toProcess.size()); + this.setName("deleteOperation Thread " + toProcess.size()); int index = 0; - for (int i = 0; i < getOpperations().size(); i++) - if (getOpperations().get(i) == op) + for (int i = 0; i < getOperations().size(); i++) + if (getOperations().get(i) == op) index = i; - getOpperations().remove(op); + getOperations().remove(op); op.pruneCleanup(); -// if (index == getOpperations().size()) +// if (index == getOperations().size()) // index -= 1; if (index < 1) index = 1; - CaDoodleOperation newTar = getOpperations().get(index - 1); + CaDoodleOperation newTar = getOperations().get(index - 1); setCurrentIndex(index); try { regenerateFrom(newTar).join(); @@ -654,10 +654,10 @@ public void run() { updateCurrentFromCache(); updateBoM(); fireSaveSuggestion(); - opperationRunner.remove(this); + operationRunner.remove(this); } }; - opperationRunner.add(t); + operationRunner.add(t); t.start(); return t; } @@ -731,8 +731,8 @@ public static int applyToAllConstituantElements(boolean addRet, String targetNam } public File getTimelineImageFile(CaDoodleOperation test) { - for (int i = 0; i < getOpperations().size(); i++) { - CaDoodleOperation key = getOpperations().get(i); + for (int i = 0; i < getOperations().size(); i++) { + CaDoodleOperation key = getOperations().get(i); if (key == test) { File file = getTimelineImageFile(i); return file; @@ -757,8 +757,8 @@ private OperationResult pruneForward(CaDoodleOperation op) throws Exception { } } if (getCurrentIndex() > 0) - for (int i = getCurrentIndex() - 1; i < getOpperations().size(); i++) { - CaDoodleOperation key = getOpperations().get(i); + for (int i = getCurrentIndex() - 1; i < getOperations().size(); i++) { + CaDoodleOperation key = getOperations().get(i); if (i >= getCurrentIndex()) { clearCache(key); } @@ -767,13 +767,13 @@ private OperationResult pruneForward(CaDoodleOperation op) throws Exception { imageCache.delete(); } if (res == OperationResult.PRUNE) { - List subList = (List) getOpperations().subList(0, getCurrentIndex()); - for (int i = getCurrentIndex(); i < getOpperations().size(); i++) { - getOpperations().get(i).pruneCleanup(); + List subList = (List) getOperations().subList(0, getCurrentIndex()); + for (int i = getCurrentIndex(); i < getOperations().size(); i++) { + getOperations().get(i).pruneCleanup(); } ArrayList newList = new ArrayList(); newList.addAll(subList); - setOpperations(newList); + setOperations(newList); com.neuronrobotics.sdk.common.Log.error("Pruning forward here!"); fireSaveSuggestion(); } @@ -846,7 +846,7 @@ private CSG cloneCSG(CSG dyingCSG) { } public void back() { - CaDoodleOperation op = getCurrentOpperation(); + CaDoodleOperation op = getCurrentOperation(); if (isBackAvailible()) setCurrentIndex(getCurrentIndex() - 1); updateCurrentFromCache(); @@ -861,7 +861,7 @@ public void forward() { if (isForwardAvailible()) setCurrentIndex(getCurrentIndex() + 1); updateCurrentFromCache(); - CaDoodleOperation op = getCurrentOpperation(); + CaDoodleOperation op = getCurrentOperation(); if (ICadoodleOperationUndo.class.isInstance(op)) { ICadoodleOperationUndo un = (ICadoodleOperationUndo) op; un.redo(); @@ -870,7 +870,7 @@ public void forward() { } public void moveToOpIndex(int newIndex) { - if (newIndex > getOpperations().size()) + if (newIndex > getOperations().size()) return; if (newIndex < 0) return; @@ -880,7 +880,7 @@ public void moveToOpIndex(int newIndex) { if (forward) { for (int i = ci; i < ni + 1; i++) { try { - CaDoodleOperation op = opperations.get(i - 1); + CaDoodleOperation op = operations.get(i - 1); if (ICadoodleOperationUndo.class.isInstance(op)) { ICadoodleOperationUndo un = (ICadoodleOperationUndo) op; un.redo(); @@ -891,7 +891,7 @@ public void moveToOpIndex(int newIndex) { } } else { for (int i = ni; i < ci + 1; i++) { - CaDoodleOperation op = opperations.get(i - 1); + CaDoodleOperation op = operations.get(i - 1); if (ICadoodleOperationUndo.class.isInstance(op)) { ICadoodleOperationUndo un = (ICadoodleOperationUndo) op; un.undo(); @@ -908,21 +908,21 @@ public boolean isBackAvailible() { } private void updateCurrentFromCache() { - CaDoodleOperation key = getCurrentOpperation(); + CaDoodleOperation key = getCurrentOperation(); if (key == null) return; - com.neuronrobotics.sdk.common.Log.debug("Current opperation results: " + key.getType()); + com.neuronrobotics.sdk.common.Log.debug("Current operation results: " + key.getType()); setCurrentState(key, getCurrentState()); } - public CaDoodleOperation getCurrentOpperation() { + public CaDoodleOperation getCurrentOperation() { if (getCurrentIndex() == 0) return null; - return getOpperations().get(getCurrentIndex() - 1); + return getOperations().get(getCurrentIndex() - 1); } public boolean isForwardAvailible() { - return getCurrentIndex() < getOpperations().size(); + return getCurrentIndex() < getOperations().size(); } public File getSelf() { @@ -943,7 +943,7 @@ public CaDoodleFile setSelf(File self) { } public List getCurrentState() { - return getStateAtOperation(getCurrentOpperation()); + return getStateAtOperation(getCurrentOperation()); } public List getStateAtOperation(CaDoodleOperation op) { @@ -972,7 +972,7 @@ public List getSelect(List selectedSnapshot) { public List getPreviouState() { if (getCurrentIndex() < 2) return new ArrayList(); - CaDoodleOperation key = getOpperations().get(getCurrentIndex() - 2); + CaDoodleOperation key = getOperations().get(getCurrentIndex() - 2); return getCachedCSGs(key); } @@ -1095,12 +1095,12 @@ public File save() throws IOException, SaveOverwriteException { FileUtils.write(getSelf(), contents, StandardCharsets.UTF_8, false); // } int num = 0; - for (int i = 0; i < opperations.size(); i++) { + for (int i = 0; i < operations.size(); i++) { File f = getTimelineImageFile(i); - CaDoodleOperation op = opperations.get(i); + CaDoodleOperation op = operations.get(i); if (!f.exists() && cache.get(op) != null) try { - int percent = (int) (((double) i) / ((double) opperations.size()) * 100.0); + int percent = (int) (((double) i) / ((double) operations.size()) * 100.0); List process = getCachedCSGs(op); num++; if (isTimelineOpen()) @@ -1153,8 +1153,8 @@ private void setSaveImage(List currentState, CaDoodleOperation op) throws I if (getSelf() == null) return; int currentIndex2 = 0; - for (int i = 0; i < getOpperations().size(); i++) - if (getOpperations().get(i) == op) { + for (int i = 0; i < getOperations().size(); i++) + if (getOperations().get(i) == op) { currentIndex2 = i; break; } @@ -1187,7 +1187,7 @@ private void setSaveImage(List currentState, CaDoodleOperation op) throws I return; } } while (!imageCache.exists()); - if (getOpperations().get(getOpperations().size() - 1) == op) { + if (getOperations().get(getOperations().size() - 1) == op) { Files.copy(imageCache.toPath(), image.toPath(), StandardCopyOption.REPLACE_EXISTING); } System.err.println("Thumbnail saved successfully to " + imageCache.getAbsolutePath()); @@ -1279,13 +1279,13 @@ public static CaDoodleFile fromFile(File f, ICaDoodleStateUpdate listener, boole return file; } - public ArrayList getOpperations() { - return opperations; + public ArrayList getOperations() { + return operations; } - public void setOpperations(ArrayList opperations) { - this.opperations = opperations; - currentIndex = opperations.size(); + public void setOperations(ArrayList operations) { + this.operations = operations; + currentIndex = operations.size(); } public TransformNR getWorkplane() { @@ -1307,7 +1307,7 @@ public int getCurrentIndex() { public void setCurrentIndex(int currentIndex) { // if(currentIndex==0) // new Exception("Current Index set to " + currentIndex).printStackTrace(); - if ((currentIndex - 1) >= getOpperations().size()) + if ((currentIndex - 1) >= getOperations().size()) throw new RuntimeException("Fail! Can not set an index greater than the availible operations"); this.currentIndex = currentIndex; } @@ -1396,7 +1396,7 @@ public void setSaveUpdate(ICadoodleSaveStatusUpdate saveUpdate) { this.saveUpdate = saveUpdate; } - public void setTimelineVisable(boolean timelineOpen) { + public void setTimelineVisible(boolean timelineOpen) { Log.debug("Setting timeline state " + timelineOpen); this.timelineOpen = timelineOpen; } diff --git a/test/java/src/junit/bowler/CaDoodleWorkflowTest.java b/test/java/src/junit/bowler/CaDoodleWorkflowTest.java index cf6cf8f4..f9dc0701 100644 --- a/test/java/src/junit/bowler/CaDoodleWorkflowTest.java +++ b/test/java/src/junit/bowler/CaDoodleWorkflowTest.java @@ -70,12 +70,12 @@ public void test() throws Exception { AddFromScript cube2 = new AddFromScript() .set("https://github.com/madhephaestus/CaDoodle-Example-Objects.git", "sphere.groovy"); - cf.addOpperation(cube1).join(); + cf.addOperation(cube1).join(); Listback= cf.getCurrentState(); if(back.size()!=1) fail("Adding a cube should have added one!"); String nameOne = back.get(0).getName(); - cf.addOpperation(cube2).join();; + cf.addOperation(cube2).join();; back=cf.getCurrentState(); if(back.size()!=2) fail("Adding a cube should have added one more!"); @@ -89,7 +89,7 @@ public void test() throws Exception { .setLocation(new TransformNR(distaance,0,0)) .setNames(Arrays.asList(nameTwo),cf) ; - cf.addOpperation(move).join();; + cf.addOperation(move).join();; back=cf.getCurrentState(); if(back.size()!=2) fail("Same number of objects after"); @@ -106,14 +106,14 @@ public void test() throws Exception { if(!self.exists()) fail("Doodle file does not exist, save failed! "+self.getAbsolutePath()); CaDoodleFile loaded = CaDoodleFile.fromFile(self); - if(!MoveCenter.class.isInstance(loaded.getOpperations().get(2))) { - fail("Third Opperation is supposed to be a move"); + if(!MoveCenter.class.isInstance(loaded.getOperations().get(2))) { + fail("Third Operation is supposed to be a move"); } - if(!AddFromScript.class.isInstance(loaded.getOpperations().get(1))) { - fail(" Opperation is supposed to be a AddFromScript"); + if(!AddFromScript.class.isInstance(loaded.getOperations().get(1))) { + fail(" Operation is supposed to be a AddFromScript"); } - if(!AddFromScript.class.isInstance(loaded.getOpperations().get(0))) { - fail(" Opperation is supposed to be a AddFromScript"); + if(!AddFromScript.class.isInstance(loaded.getOperations().get(0))) { + fail(" Operation is supposed to be a AddFromScript"); } loaded.back(); MoveCenter move2 = new MoveCenter() @@ -124,9 +124,9 @@ public void test() throws Exception { .setLocation(new TransformNR(0,0,0,new RotationNR(0,45,0))) .setNames(Arrays.asList(nameOne),loaded) ; - loaded.addOpperation(move3).join();; + loaded.addOperation(move3).join();; back=loaded.getCurrentState(); - loaded.addOpperation(move2).join();; + loaded.addOperation(move2).join();; back=loaded.getCurrentState(); double centerX2 = back.get(1).getCenterX(); if(centerX2!=distaance) @@ -134,10 +134,10 @@ public void test() throws Exception { if(back.get(1).getCenterY()!=distaance) fail("Move failed "); ToHole hole= new ToHole().setNames(Arrays.asList(nameOne)); - loaded.addOpperation(hole).join();; + loaded.addOperation(hole).join();; back=loaded.getCurrentState(); Group group = new Group().setNames(Arrays.asList(nameOne,nameTwo)); - loaded.addOpperation(group).join();; + loaded.addOperation(group).join();; back=loaded.getCurrentState(); if(back.size()!=3) fail("Group Failed "); @@ -162,15 +162,15 @@ public void test() throws Exception { .setResize(height, leftFront, rightRear) .setNames(Arrays.asList(groupName)) ; - loaded.addOpperation(resize).join();; + loaded.addOperation(resize).join();; back=loaded.getCurrentState(); ToSolid solid = new ToSolid() .setNames(Arrays.asList(groupName)) .setColor(Color.BLUE); - loaded.addOpperation(solid).join();; + loaded.addOperation(solid).join();; back=loaded.getCurrentState(); UnGroup ug = new UnGroup().setNames(Arrays.asList(groupName)); - loaded.addOpperation(ug).join();; + loaded.addOperation(ug).join();; back=loaded.getCurrentState(); if(back.get(0).isInGroup()) { fail("THis should not be in a group anymore"); @@ -180,7 +180,7 @@ public void test() throws Exception { } - loaded.addOpperation( + loaded.addOperation( new Group() .setNames(Arrays.asList(nameOne,nameTwo)) ).join();; @@ -189,7 +189,7 @@ public void test() throws Exception { String newGroupName = cacheOfGroup.get(cacheOfGroup.size()-1).getName(); - loaded.addOpperation( + loaded.addOperation( new Paste().setNames(Arrays.asList(newGroupName))).join();; back=loaded.getCurrentState(); ArrayList selectAll = new ArrayList(); @@ -197,7 +197,7 @@ public void test() throws Exception { if(c.isGroupResult()) selectAll.add(c.getName()); } - loaded.addOpperation( + loaded.addOperation( new UnGroup().setNames(selectAll)).join();; back=loaded.getCurrentState(); if(back.get(0).isInGroup()) { @@ -213,7 +213,7 @@ public void test() throws Exception { fail("THis should not be in a group anymore"); } ToHole h= new ToHole().setNames(Arrays.asList(nameTwo)); - loaded.addOpperation(h).join();; + loaded.addOperation(h).join();; back=loaded.getCurrentState(); loaded.save(); @@ -261,11 +261,11 @@ public void test() throws Exception { MakeRobot mr = new MakeRobot(); mr.setNames(selectAll); - loaded.addOpperation(mr).join(); + loaded.addOperation(mr).join(); ModelNotes setText = new ModelNotes() .setLocation(new TransformNR(0, 0, 20)) .setText("A note is here"); - loaded.addOpperation(setText).join(); + loaded.addOperation(setText).join(); loaded.save(); ScriptingEngine.pull(ControllerOption.URL_OF_OPTIONS); @@ -275,7 +275,7 @@ public void test() throws Exception { AddRobotController con = new AddRobotController() .setNames(selectAll) .setController(o); - loaded.addOpperation(con).join(); + loaded.addOperation(con).join(); System.out.println("Added!"); } loaded.save(); @@ -290,7 +290,7 @@ public void test() throws Exception { .setLimb(o) .setNames(selectAll) .setLocation(tf); - loaded.addOpperation(limb).join(); + loaded.addOperation(limb).join(); }else { System.out.println("Unsupported limb "+o); }