rooty/Arduino
1
0
Fork 0
mirror of https://github.com/arduino/Arduino.git synced 2025-02-20 14:54:31 +01:00
Code Issues Releases Activity

Refactored Base.getDefaultSketchbookFolder() method.

Browse Source
This commit is contained in:
Claudio Indellicati 2014-08-26 12:14:24 +02:00 committed by Cristian Maglie
parent 20582630a5
commit 26a8b37d18
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -222,7 +222,7 @@ public class Base {
// If no path is set, get the default sketchbook folder for this platform // If no path is set, get the default sketchbook folder for this platform
if (sketchbookPath == null) { if (sketchbookPath == null) {
File defaultFolder = getDefaultSketchbookFolder(); File defaultFolder = getDefaultSketchbookFolderOrPromptForIt();
if (BaseNoGui.getPortableFolder() != null) if (BaseNoGui.getPortableFolder() != null)
Preferences.set("sketchbook.path", BaseNoGui.getPortableSketchbookFolder()); Preferences.set("sketchbook.path", BaseNoGui.getPortableSketchbookFolder());
else else
@ -1896,6 +1896,14 @@ public class Base {
sketchbookFolder = getPlatform().getDefaultSketchbookFolder(); sketchbookFolder = getPlatform().getDefaultSketchbookFolder();
} catch (Exception e) { } } catch (Exception e) { }
return sketchbookFolder;
}
protected File getDefaultSketchbookFolderOrPromptForIt() {
File sketchbookFolder = getDefaultSketchbookFolder();
if (sketchbookFolder == null) { if (sketchbookFolder == null) {
sketchbookFolder = promptSketchbookLocation(); sketchbookFolder = promptSketchbookLocation();
} }

2
app/src/processing/app/Preferences.java
View File

@ -578,7 +578,7 @@ public class Preferences {
String newPath = sketchbookLocationField.getText(); String newPath = sketchbookLocationField.getText();
if (newPath.isEmpty()) { if (newPath.isEmpty()) {
if (Base.getPortableFolder() == null) if (Base.getPortableFolder() == null)
newPath = editor.base.getDefaultSketchbookFolder().toString(); newPath = editor.base.getDefaultSketchbookFolderOrPromptForIt().toString();
else else
newPath = Base.getPortableSketchbookFolder(); newPath = Base.getPortableSketchbookFolder();
} }