From 035e57e9098940ce13f4ada9c6193668193063b1 Mon Sep 17 00:00:00 2001
From: Claudio Indellicati <bitron.it@gmail.com>
Date: Tue, 26 Aug 2014 12:19:53 +0200
Subject: [PATCH] Moved getDefaultSketchbookFolder() from Base to BaseNoGui and
 other minor fixes.

---
 app/src/processing/app/Base.java      | 15 +--------------
 app/src/processing/app/BaseNoGui.java | 18 +++++++++++++++---
 2 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/app/src/processing/app/Base.java b/app/src/processing/app/Base.java
index 14691e0ee..e1c79956f 100644
--- a/app/src/processing/app/Base.java
+++ b/app/src/processing/app/Base.java
@@ -1887,22 +1887,9 @@ public class Base {
   }
 
 
-  protected File getDefaultSketchbookFolder() {
-    if (BaseNoGui.getPortableFolder() != null)
-      return new File(BaseNoGui.getPortableFolder(), BaseNoGui.getPortableSketchbookFolder());
-
-    File sketchbookFolder = null;
-    try {
-      sketchbookFolder = getPlatform().getDefaultSketchbookFolder();
-    } catch (Exception e) { }
-
-    return sketchbookFolder;
-  }
-
-
   protected File getDefaultSketchbookFolderOrPromptForIt() {
 
-    File sketchbookFolder = getDefaultSketchbookFolder();
+    File sketchbookFolder = BaseNoGui.getDefaultSketchbookFolder();
 
     if (sketchbookFolder == null) {
       sketchbookFolder = promptSketchbookLocation();
diff --git a/app/src/processing/app/BaseNoGui.java b/app/src/processing/app/BaseNoGui.java
index 0c843be00..287ad1fb5 100644
--- a/app/src/processing/app/BaseNoGui.java
+++ b/app/src/processing/app/BaseNoGui.java
@@ -143,6 +143,18 @@ public class BaseNoGui {
     return getTargetPlatform(pack, PreferencesData.get("target_platform"));
   }
 
+  static public  File getDefaultSketchbookFolder() {
+    if (getPortableFolder() != null)
+      return new File(getPortableFolder(), getPortableSketchbookFolder());
+
+    File sketchbookFolder = null;
+    try {
+      sketchbookFolder = getPlatform().getDefaultSketchbookFolder();
+    } catch (Exception e) { }
+
+    return sketchbookFolder;
+  }
+
   public static DiscoveryManager getDiscoveryManager() {
     return discoveryManager;
   }
@@ -262,14 +274,14 @@ public class BaseNoGui {
 
   static public String getSketchbookPath() {
     // Get the sketchbook path, and make sure it's set properly
-    String sketchbookPath = Preferences.get("sketchbook.path");
+    String sketchbookPath = PreferencesData.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);
+      if (getPortableFolder() != null)
+        sketchbookFolder = new File(getPortableFolder(), sketchbookPath);
       else
         sketchbookFolder = absoluteFile(sketchbookPath);
       if (!sketchbookFolder.exists()) {