Skip to content

Commit a767e17

Browse files
Move SketchController.prepareDataFolder() to Sketch
1 parent 61285f2 commit a767e17

File tree

2 files changed

+13
-11
lines changed

2 files changed

+13
-11
lines changed

app/src/processing/app/SketchController.java

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -705,7 +705,7 @@ public boolean addFile(File sourceFile) {
705705
if (FileUtils.hasExtension(sourceFile, Sketch.EXTENSIONS)) {
706706
destFile = new File(sketch.getFolder(), filename);
707707
} else {
708-
prepareDataFolder();
708+
sketch.prepareDataFolder();
709709
destFile = new File(sketch.getDataFolder(), filename);
710710
isData = true;
711711
}
@@ -1036,16 +1036,6 @@ private boolean sketchFilesAreReadOnly() {
10361036

10371037
// . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
10381038

1039-
/**
1040-
* Create the data folder if it does not exist already. As a convenience,
1041-
* it also returns the data folder, since it's likely about to be used.
1042-
*/
1043-
private File prepareDataFolder() {
1044-
if (!sketch.getDataFolder().exists()) {
1045-
sketch.getDataFolder().mkdirs();
1046-
}
1047-
return sketch.getDataFolder();
1048-
}
10491039

10501040

10511041
private void setUntitled(boolean u) {

arduino-core/src/processing/app/Sketch.java

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,18 @@ private List<SketchCode> listSketchFiles(boolean showWarnings) throws IOExceptio
140140
return new ArrayList<>(result);
141141
}
142142

143+
/**
144+
* Create the data folder if it does not exist already. As a
145+
* convenience, it also returns the data folder, since it's likely
146+
* about to be used.
147+
*/
148+
public File prepareDataFolder() {
149+
if (!dataFolder.exists()) {
150+
dataFolder.mkdirs();
151+
}
152+
return dataFolder;
153+
}
154+
143155
public void save() throws IOException {
144156
for (SketchCode code : getCodes()) {
145157
if (code.isModified())

0 commit comments

Comments
 (0)