Moved portableSketchbookFolder from Base to BaseNoGui.

Author: bitron

app/src/processing/app/Base.java

@@ -94,8 +94,6 @@ public class Base {
   List<Editor> editors = Collections.synchronizedList(new ArrayList<Editor>());
   Editor activeEditor;
 
-  static final String portableSketchbookFolder = "sketchbook";
-
   static public void main(String args[]) throws Exception {
     BaseNoGui.initLogger();
 
@@ -226,7 +224,7 @@ public Base(String[] args) throws Exception {
     if (sketchbookPath == null) {
       File defaultFolder = getDefaultSketchbookFolder();
       if (BaseNoGui.getPortableFolder() != null)
-        Preferences.set("sketchbook.path", portableSketchbookFolder);
+        Preferences.set("sketchbook.path", BaseNoGui.getPortableSketchbookFolder());
       else
         Preferences.set("sketchbook.path", defaultFolder.getAbsolutePath());
       if (!defaultFolder.exists()) {
@@ -1865,7 +1863,7 @@ static public File getPortableFolder() {
 
 
   static public String getPortableSketchbookFolder() {
-    return portableSketchbookFolder;
+    return BaseNoGui.getPortableSketchbookFolder();
   }
 
 
@@ -1891,7 +1889,7 @@ static public File getSketchbookHardwareFolder() {
 
   protected File getDefaultSketchbookFolder() {
     if (BaseNoGui.getPortableFolder() != null)
-      return new File(BaseNoGui.getPortableFolder(), portableSketchbookFolder);
+      return new File(BaseNoGui.getPortableFolder(), BaseNoGui.getPortableSketchbookFolder());
 
     File sketchbookFolder = null;
     try {

app/src/processing/app/BaseNoGui.java

@@ -69,6 +69,8 @@ public class BaseNoGui {
 
   static File portableFolder = null;
 
+  static final String portableSketchbookFolder = "sketchbook";
+
   // Returns a File object for the given pathname. If the pathname
   // is not absolute, it is interpreted relative to the current
   // directory when starting the IDE (which is not the same as the
@@ -187,6 +189,10 @@ static public File getPortableFolder() {
     return portableFolder;
   }
 
+  static public String getPortableSketchbookFolder() {
+    return portableSketchbookFolder;
+  }
+
   /**
    * Convenience method to get a File object for the specified filename inside
    * the settings folder.