noisymime
/
Arduino
mirror of https://github.com/noisymime/Arduino.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Moved getDefaultSketchbookFolder() from Base to BaseNoGui and other minor fixes.

This commit is contained in:
Claudio Indellicati 2014-08-26 12:19:53 +02:00 committed by Cristian Maglie
parent 26a8b37d18
commit 035e57e909
2 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/src/processing/app/Base.java
View File

@ -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();

18
app/src/processing/app/BaseNoGui.java
View File

@ -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()) {