Revert "Moving a sketch to another folder should move all files"

This reverts commit c4f5caf.

Author: cmaglie

app/src/processing/app/Editor.java

@@ -38,7 +38,6 @@
 import java.awt.event.ActionListener;
 import java.awt.event.InputEvent;
 import java.awt.event.KeyEvent;
-import java.awt.event.KeyListener;
 import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
 import java.awt.print.PageFormat;
@@ -91,15 +90,13 @@
 import cc.arduino.packages.MonitorFactory;
 import cc.arduino.packages.Uploader;
 import cc.arduino.packages.uploaders.SerialUploader;
-import cc.arduino.view.Event;
 import cc.arduino.view.GoToLineNumber;
 import cc.arduino.view.StubMenuListener;
 import cc.arduino.view.findreplace.FindReplace;
 import jssc.SerialPortException;
 import processing.app.debug.RunnerException;
 import processing.app.forms.PasswordAuthorizationDialog;
 import processing.app.helpers.DocumentTextChangeListener;
-import processing.app.helpers.FileUtils;
 import processing.app.helpers.Keys;
 import processing.app.helpers.OSUtils;
 import processing.app.helpers.PreferencesMapException;
@@ -1782,7 +1779,7 @@ protected boolean handleOpenInternal(File sketchFile) {
         // copy the sketch inside
         File properPdeFile = new File(properFolder, sketchFile.getName());
         try {
-          FileUtils.copy(new File(sketchFile.getParent()), properFolder);
+          Base.copyFile(sketchFile, properPdeFile);
         } catch (IOException e) {
           Base.showWarning(tr("Error"), tr("Could not copy to a proper location."), e);
           return false;

arduino-core/src/processing/app/helpers/FileUtils.java

@@ -58,10 +58,6 @@ public static void copyFile(File source, File dest) throws IOException {
   public static void copy(File sourceFolder, File destFolder) throws IOException {
     for (File file : sourceFolder.listFiles()) {
       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 (!destFile.exists() && !destFile.mkdir()) {
           throw new IOException("Unable to create folder: " + destFile);