From a07a9ff89599f3e006c85f764824559c5a2ec68d Mon Sep 17 00:00:00 2001
From: Matthijs Kooijman <matthijs@stdin.nl>
Date: Thu, 17 Dec 2015 13:00:47 +0100
Subject: [PATCH] Move `SketchController.prepareDataFolder()` to Sketch

---
 app/src/processing/app/SketchController.java | 12 +-----------
 arduino-core/src/processing/app/Sketch.java  | 12 ++++++++++++
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/app/src/processing/app/SketchController.java b/app/src/processing/app/SketchController.java
index 34958886a..323cda875 100644
--- a/app/src/processing/app/SketchController.java
+++ b/app/src/processing/app/SketchController.java
@@ -704,7 +704,7 @@ public class SketchController {
     if (FileUtils.hasExtension(sourceFile, Sketch.EXTENSIONS)) {
       destFile = new File(sketch.getFolder(), filename);
     } else {
-      prepareDataFolder();
+      sketch.prepareDataFolder();
       destFile = new File(sketch.getDataFolder(), filename);
       isData = true;
     }
@@ -1044,16 +1044,6 @@ public class SketchController {
 
   // . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
 
-  /**
-   * Create the data folder if it does not exist already. As a convenience,
-   * it also returns the data folder, since it's likely about to be used.
-   */
-  private File prepareDataFolder() {
-    if (!sketch.getDataFolder().exists()) {
-      sketch.getDataFolder().mkdirs();
-    }
-    return sketch.getDataFolder();
-  }
 
 
   private void setUntitled(boolean u) {
diff --git a/arduino-core/src/processing/app/Sketch.java b/arduino-core/src/processing/app/Sketch.java
index fd312b7a0..a7e2850af 100644
--- a/arduino-core/src/processing/app/Sketch.java
+++ b/arduino-core/src/processing/app/Sketch.java
@@ -140,6 +140,18 @@ public class Sketch {
     return new ArrayList<>(result);
   }
 
+  /**
+   * Create the data folder if it does not exist already. As a
+   * convenience, it also returns the data folder, since it's likely
+   * about to be used.
+   */
+  public File prepareDataFolder() {
+    if (!dataFolder.exists()) {
+      dataFolder.mkdirs();
+    }
+    return dataFolder;
+  }
+
   public void save() throws IOException {
     for (SketchCode code : getCodes()) {
       if (code.isModified())