From aae0bc4c478e685567e00c5c11dddb108a6e2a02 Mon Sep 17 00:00:00 2001 From: Matthijs Kooijman Date: Tue, 29 Dec 2015 17:02:49 +0100 Subject: [PATCH] Rename `SketchFile.deleteFile()` to `delete()` The extra "File" in the name was a bit redundant, and this is more consistent with `Sketch.delete()`. --- app/src/processing/app/SketchController.java | 2 +- arduino-core/src/processing/app/SketchFile.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/processing/app/SketchController.java b/app/src/processing/app/SketchController.java index 0a0ba6f45..50d4ac307 100644 --- a/app/src/processing/app/SketchController.java +++ b/app/src/processing/app/SketchController.java @@ -253,7 +253,7 @@ public class SketchController { editor.base.handleClose(editor); } else { // delete the file - if (!current.deleteFile(BaseNoGui.getBuildFolder(sketch).toPath())) { + if (!current.delete(BaseNoGui.getBuildFolder(sketch).toPath())) { Base.showMessage(tr("Couldn't do it"), I18n.format(tr("Could not delete \"{0}\"."), current.getFileName())); return; diff --git a/arduino-core/src/processing/app/SketchFile.java b/arduino-core/src/processing/app/SketchFile.java index 607e87005..8fba34296 100644 --- a/arduino-core/src/processing/app/SketchFile.java +++ b/arduino-core/src/processing/app/SketchFile.java @@ -128,7 +128,7 @@ public class SketchFile { } - protected boolean deleteFile(Path tempBuildFolder) throws IOException { + protected boolean delete(Path tempBuildFolder) throws IOException { if (!file.delete()) { return false; }