Rename the delete and call it for freecad files at start

CommonWealthRobotics · Jul 9, 2024 · b85b318 · b85b318
1 parent d3fb9af
commit b85b318
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/main/java/com/neuronrobotics/bowlerstudio/scripting/ScriptingFileWidget.java b/src/main/java/com/neuronrobotics/bowlerstudio/scripting/ScriptingFileWidget.java
@@ -317,8 +317,8 @@ private void convertResults(String fileType) throws Exception {
 		if(freecad) {
 			String file = fileNameBox.getText()+"."+fileType;
 			File newFile = ScriptingEngine.fileFromGit(url, file);
-			if(newFile.exists() && !freecad) {
-				if(DeleteExisting(file)) {
+			if(newFile.exists() ) {
+				if(askToDeleteFile(file)) {
 					newFile.delete();
 				}
 			}
@@ -337,7 +337,7 @@ private void convertResults(String fileType) throws Exception {
 			try {
 				File newFile = ScriptingEngine.fileFromGit(url, file);
 				if(newFile.exists() && !freecad) {
-					if(DeleteExisting(file)) {
+					if(askToDeleteFile(file)) {
 						newFile.delete();
 					}else
 						continue;
@@ -361,7 +361,7 @@ private void convertResults(String fileType) throws Exception {
 		}
 	}
 
-	public static boolean DeleteExisting(String name) {
+	public static boolean askToDeleteFile(String name) {
 		CompletableFuture<Boolean> future = new CompletableFuture<>();
 
 		Platform.runLater(() -> {

diff --git a/src/main/java/com/neuronrobotics/bowlerstudio/scripting/external/BlenderExternalEditor.java b/src/main/java/com/neuronrobotics/bowlerstudio/scripting/external/BlenderExternalEditor.java
@@ -46,7 +46,7 @@ public void launch(File file, Button advanced) {
 
 			if(filename.toLowerCase().endsWith(".stl")) {
 				File blenderfile = new File(dir.getAbsolutePath()+delim()+file.getName()+".blend");
-				if(ScriptingFileWidget.DeleteExisting(blenderfile.getName())) {
+				if(ScriptingFileWidget.askToDeleteFile(blenderfile.getName())) {
 					blenderfile.delete();
 				}
 				BlenderLoader.toBlenderFile(file, blenderfile);