Skip to content

Commit a3a32b5

Browse files
benfrybenfry
committed
move utility functions out of Base and into Util
1 parent a312594 commit a3a32b5

25 files changed

+720
-797
lines changed

‎app/src/processing/app/Base.java‎

Lines changed: 1 addition & 703 deletions
Large diffs are not rendered by default.

‎app/src/processing/app/Language.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ static private String loadLanguage() {
144144
*/
145145
static public void saveLanguage(String language) {
146146
try {
147-
Base.saveFile(language, prefFile);
147+
Util.saveFile(language, prefFile);
148148
} catch (Exception e) {
149149
e.printStackTrace();
150150
}

‎app/src/processing/app/Library.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ private Library(File folder, String groupName) {
116116

117117
File exportSettings = new File(libraryFolder, "export.txt");
118118
StringDict exportTable = exportSettings.exists() ?
119-
Base.readSettings(exportSettings) : new StringDict();
119+
Util.readSettings(exportSettings) : new StringDict();
120120

121121
exportList = new HashMap<String, String[]>();
122122

@@ -214,7 +214,7 @@ private Library(File folder, String groupName) {
214214
// }
215215

216216
// get the path for all .jar files in this code folder
217-
packageList = Base.packageListFromClassPath(getClassPath());
217+
packageList = Util.packageListFromClassPath(getClassPath());
218218
}
219219

220220

‎app/src/processing/app/Mode.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1399,7 +1399,7 @@ public void prepareExportFolder(File targetFolder) {
13991399
// Nuke the old applet/application folder because it can cause trouble
14001400
if (Preferences.getBoolean("export.delete_target_folder")) {
14011401
// System.out.println("temporarily skipping deletion of " + targetFolder);
1402-
Base.removeDir(targetFolder);
1402+
Util.removeDir(targetFolder);
14031403
// targetFolder.renameTo(dest);
14041404
}
14051405
// Create a fresh output folder (needed before preproc is run next)

‎app/src/processing/app/Platform.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ final public boolean deleteFile(File file) throws IOException {
173173
return true;
174174

175175
} else if (file.isDirectory()) {
176-
Base.removeDir(file);
176+
Util.removeDir(file);
177177
return true;
178178

179179
} else {

‎app/src/processing/app/Sketch.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -652,7 +652,7 @@ public void handleDeleteCode() {
652652
// to do a save on the handleNew()
653653

654654
// delete the entire sketch
655-
Base.removeDir(folder);
655+
Util.removeDir(folder);
656656

657657
// get the changes into the sketchbook menu
658658
//sketchbook.rebuildMenus();
@@ -898,7 +898,7 @@ public boolean saveAs() throws IOException {
898898
// if the new folder already exists, then first remove its contents before
899899
// copying everything over (user will have already been warned).
900900
if (newFolder.exists()) {
901-
Base.removeDir(newFolder);
901+
Util.removeDir(newFolder);
902902
}
903903
// in fact, you can't do this on Windows because the file dialog
904904
// will instead put you inside the folder, but it happens on OS X a lot.
@@ -1148,7 +1148,7 @@ public boolean addFile(File sourceFile) {
11481148
// https://github.com/processing/processing/issues/3383
11491149
if (!sourceFile.equals(destFile)) {
11501150
try {
1151-
Base.copyFile(sourceFile, destFile);
1151+
Util.copyFile(sourceFile, destFile);
11521152

11531153
} catch (IOException e) {
11541154
Base.showWarning(Language.text("add_file.messages.error_adding"),

‎app/src/processing/app/SketchCode.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ public class SketchCode {
5454

5555
/** Last time this tab was visited */
5656
long visited;
57-
57+
5858
/** The last time this tab was saved to disk */
5959
private long lastModified;
6060

@@ -136,7 +136,7 @@ protected boolean renameTo(File what, String ext) {
136136

137137

138138
public void copyTo(File dest) throws IOException {
139-
Base.saveFile(program, dest);
139+
Util.saveFile(program, dest);
140140
}
141141

142142

@@ -179,7 +179,7 @@ public String getSavedProgram() {
179179

180180

181181
public int getLineCount() {
182-
return Base.countLines(program);
182+
return Util.countLines(program);
183183
}
184184

185185

@@ -275,7 +275,7 @@ public long lastVisited() {
275275
* Load this piece of code from a file.
276276
*/
277277
public void load() throws IOException {
278-
program = Base.loadFile(file);
278+
program = Util.loadFile(file);
279279

280280
// Remove NUL characters because they'll cause problems,
281281
// and their presence is very difficult to debug.
@@ -309,7 +309,7 @@ public void save() throws IOException {
309309
// TODO re-enable history
310310
//history.record(s, SketchHistory.SAVE);
311311

312-
Base.saveFile(program, file);
312+
Util.saveFile(program, file);
313313
savedProgram = program;
314314
lastModified = file.lastModified();
315315
setModified(false);
@@ -320,7 +320,7 @@ public void save() throws IOException {
320320
* Save this file to another location, used by Sketch.saveAs()
321321
*/
322322
public void saveAs(File newFile) throws IOException {
323-
Base.saveFile(program, newFile);
323+
Util.saveFile(program, newFile);
324324
savedProgram = program;
325325
file = newFile;
326326
makePrettyName();
@@ -336,7 +336,7 @@ public void saveAs(File newFile) throws IOException {
336336
public void setFolder(File sketchFolder) {
337337
file = new File(sketchFolder, file.getName());
338338
}
339-
339+
340340
/**
341341
* Used to determine whether this file was modified externally
342342
* @return The time the file was last modified

0 commit comments

Comments
 (0)