rooty/Arduino
1
0
Fork 0
mirror of https://github.com/arduino/Arduino.git synced 2024-11-28 09:24:14 +01:00
Code Issues Releases Activity

Moving a sketch to another folder should move all files

Browse Source 
Fixes #6402
This commit is contained in:
Martino Facchin 2017-06-21 10:42:03 +02:00
parent 73f40ac32e
commit c4f5cafd33
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/processing/app/Editor.java
View File

@ -72,6 +72,8 @@ import java.util.ArrayList;
import static processing.app.I18n.tr; import static processing.app.I18n.tr;
import static processing.app.Theme.scale; import static processing.app.Theme.scale;
import processing.app.helpers.FileUtils;
/** /**
* Main editor panel for the Processing Development Environment. * Main editor panel for the Processing Development Environment.
*/ */
@ -1935,7 +1937,7 @@ public class Editor extends JFrame implements RunnerListener {
// copy the sketch inside // copy the sketch inside
File properPdeFile = new File(properFolder, sketchFile.getName()); File properPdeFile = new File(properFolder, sketchFile.getName());
try { try {
Base.copyFile(sketchFile, properPdeFile); FileUtils.copy(new File(sketchFile.getParent()), properFolder);
} catch (IOException e) { } catch (IOException e) {
Base.showWarning(tr("Error"), tr("Could not copy to a proper location."), e); Base.showWarning(tr("Error"), tr("Could not copy to a proper location."), e);
return false; return false;

4
arduino-core/src/processing/app/helpers/FileUtils.java
View File

@ -58,6 +58,10 @@ public class FileUtils {
public static void copy(File sourceFolder, File destFolder) throws IOException { public static void copy(File sourceFolder, File destFolder) throws IOException {
for (File file : sourceFolder.listFiles()) { for (File file : sourceFolder.listFiles()) {
File destFile = new File(destFolder, file.getName()); File destFile = new File(destFolder, file.getName());
if ((destFolder.getPath().equals(file.getPath()))) {
// Avoid recursive copy of folders
continue;
}
if (file.isDirectory() && !SOURCE_CONTROL_FOLDERS.contains(file.getName())) { if (file.isDirectory() && !SOURCE_CONTROL_FOLDERS.contains(file.getName())) {
if (!destFile.exists() && !destFile.mkdir()) { if (!destFile.exists() && !destFile.mkdir()) {
throw new IOException("Unable to create folder: " + destFile); throw new IOException("Unable to create folder: " + destFile);