From 10af59f6fae41cfa4fc9e5c7df8add3aeb60507a Mon Sep 17 00:00:00 2001
From: Claudio Indellicati <bitron.it@gmail.com>
Date: Tue, 26 Aug 2014 11:27:08 +0200
Subject: [PATCH] Moved some code from Base to BaseNoGui into new
 getSketchbookPath() method.

---
 app/src/processing/app/Base.java      | 22 +--------------------
 app/src/processing/app/BaseNoGui.java | 28 ++++++++++++++++++++++++++-
 2 files changed, 28 insertions(+), 22 deletions(-)

diff --git a/app/src/processing/app/Base.java b/app/src/processing/app/Base.java
index 5354f2fb5..94ee44a15 100644
--- a/app/src/processing/app/Base.java
+++ b/app/src/processing/app/Base.java
@@ -220,27 +220,7 @@ public class Base {
     if (OSUtils.isMacOS())
       ThinkDifferent.init(this);
 
-    // Get the sketchbook path, and make sure it's set properly
-    String sketchbookPath = Preferences.get("sketchbook.path");
-
-    // If a value is at least set, first check to see if the folder exists.
-    // If it doesn't, warn the user that the sketchbook folder is being reset.
-    if (sketchbookPath != null) {
-      File sketchbookFolder;
-      if (BaseNoGui.getPortableFolder() != null)
-        sketchbookFolder = new File(BaseNoGui.getPortableFolder(), sketchbookPath);
-      else
-        sketchbookFolder = absoluteFile(sketchbookPath);
-      if (!sketchbookFolder.exists()) {
-        showWarning(_("Sketchbook folder disappeared"),
-                    _("The sketchbook folder no longer exists.\n" +
-                      "Arduino will switch to the default sketchbook\n" +
-                      "location, and create a new sketchbook folder if\n" +
-                      "necessary. Arduino will then stop talking about\n" +
-                      "himself in the third person."), null);
-        sketchbookPath = null;
-      }
-    }
+    String sketchbookPath = BaseNoGui.getSketchbookPath();
 
     // If no path is set, get the default sketchbook folder for this platform
     if (sketchbookPath == null) {
diff --git a/app/src/processing/app/BaseNoGui.java b/app/src/processing/app/BaseNoGui.java
index b59985b4c..633f253bd 100644
--- a/app/src/processing/app/BaseNoGui.java
+++ b/app/src/processing/app/BaseNoGui.java
@@ -254,6 +254,32 @@ public class BaseNoGui {
     return libdir;
   }
 
+  static public String getSketchbookPath() {
+    // Get the sketchbook path, and make sure it's set properly
+    String sketchbookPath = Preferences.get("sketchbook.path");
+
+    // If a value is at least set, first check to see if the folder exists.
+    // If it doesn't, warn the user that the sketchbook folder is being reset.
+    if (sketchbookPath != null) {
+      File sketchbookFolder;
+      if (BaseNoGui.getPortableFolder() != null)
+        sketchbookFolder = new File(BaseNoGui.getPortableFolder(), sketchbookPath);
+      else
+        sketchbookFolder = absoluteFile(sketchbookPath);
+      if (!sketchbookFolder.exists()) {
+        showWarning(_("Sketchbook folder disappeared"),
+                    _("The sketchbook folder no longer exists.\n" +
+                      "Arduino will switch to the default sketchbook\n" +
+                      "location, and create a new sketchbook folder if\n" +
+                      "necessary. Arduino will then stop talking about\n" +
+                      "himself in the third person."), null);
+        sketchbookPath = null;
+      }
+    }
+
+    return sketchbookPath;
+  }
+
   public static TargetBoard getTargetBoard() {
     String boardId = PreferencesData.get("board");
     return getTargetPlatform().getBoard(boardId);
@@ -552,7 +578,7 @@ public class BaseNoGui {
         if (targetBoard.getMenuLabel(key, value) == null)
           showError(null, I18n.format(_("{0}: Invalid option for \"{1}\" option for board \"{2}\""), value, key, targetBoard.getId()), 3);
 
-        Preferences.set("custom_" + key, targetBoard.getId() + "_" + value);
+        PreferencesData.set("custom_" + key, targetBoard.getId() + "_" + value);
       }
     }
   }