diff --git a/app/src/processing/app/Base.java b/app/src/processing/app/Base.java index 8b22e0979..de0680b1f 100644 --- a/app/src/processing/app/Base.java +++ b/app/src/processing/app/Base.java @@ -75,8 +75,6 @@ public class Base { // so that the errors while building don't show up again. boolean builtOnce; -// static File buildFolder; - // Location for untitled items static File untitledFolder; @@ -249,10 +247,10 @@ public class Base { // Create a new empty window (will be replaced with any files to be opened) if (!opened) { - System.out.println("opening a new window"); +// System.out.println("opening a new window"); handleNew(); - } else { - System.out.println("something else was opened"); +// } else { +// System.out.println("something else was opened"); } // check for updates @@ -974,8 +972,7 @@ public class Base { protected void rebuildSketchbookMenu() { try { - System.err.println("sketchbook: " + sketchbookFolder); - +// System.err.println("sketchbook: " + sketchbookFolder); sketchbookMenu.removeAll(); addSketches(sketchbookMenu, sketchbookFolder, false); } catch (IOException e) { @@ -1367,7 +1364,7 @@ public class Base { sketchbookFolder.mkdirs(); } } - System.err.println("sketchbook: " + sketchbookFolder); +// System.err.println("sketchbook: " + sketchbookFolder); } diff --git a/app/src/processing/app/Library.java b/app/src/processing/app/Library.java index c094eb93e..069bd368e 100644 --- a/app/src/processing/app/Library.java +++ b/app/src/processing/app/Library.java @@ -97,7 +97,7 @@ public class Library { // get the list of files just in the library root String[] baseList = libraryFolder.list(standardFilter); - System.out.println("Loading " + name + "..."); +// System.out.println("Loading " + name + "..."); // PApplet.println(baseList); String appletExportStr = exportTable.get("applet"); diff --git a/app/src/processing/app/Mode.java b/app/src/processing/app/Mode.java index 333625a1a..61c1fd061 100644 --- a/app/src/processing/app/Mode.java +++ b/app/src/processing/app/Mode.java @@ -93,7 +93,7 @@ public abstract class Mode { public void rebuildLibraryList() { - System.out.println("rebuildLibraryList()"); +// System.out.println("rebuildLibraryList()"); // reset the table mapping imports to libraries importToLibraryTable = new HashMap(); @@ -150,25 +150,31 @@ public abstract class Mode { } }); toolbarMenu.add(item); + + JMenu examplesMenu = new JMenu("Examples"); + rebuildExamplesMenu(examplesMenu); + toolbarMenu.add(examplesMenu); + toolbarMenu.addSeparator(); // Add a list of all sketches and subfolders try { - boolean sketches = base.addSketches(toolbarMenu, base.getSketchbookFolder(), true); - if (sketches) { - toolbarMenu.addSeparator(); - } + base.addSketches(toolbarMenu, base.getSketchbookFolder(), true); +// boolean sketches = base.addSketches(toolbarMenu, base.getSketchbookFolder(), true); +// if (sketches) { +// toolbarMenu.addSeparator(); +// } } catch (IOException e) { e.printStackTrace(); } //System.out.println("rebuilding examples menu"); // Add each of the subfolders of examples directly to the menu - try { - base.addSketches(toolbarMenu, examplesFolder, true); - } catch (IOException e) { - e.printStackTrace(); - } +// try { +// base.addSketches(toolbarMenu, examplesFolder, true); +// } catch (IOException e) { +// e.printStackTrace(); +// } } @@ -235,7 +241,7 @@ public abstract class Mode { //base.addSketches(menu, examplesFolder, false); // break down the examples folder for examples - System.out.println("checking examples folder " + examplesFolder); +// System.out.println("checking examples folder " + examplesFolder); File[] subfolders = examplesFolder.listFiles(new FilenameFilter() { public boolean accept(File dir, String name) { return dir.isDirectory() && name.charAt(0) != '.'; @@ -372,7 +378,7 @@ public abstract class Mode { public Font getFont(String attribute) { - System.out.println("getFont(" + attribute + ") -> " + theme.getFont(attribute)); +// System.out.println("getFont(" + attribute + ") -> " + theme.getFont(attribute)); return theme.getFont(attribute); } diff --git a/app/src/processing/mode/java/Compiler.java b/app/src/processing/mode/java/Compiler.java index 9f6b1a416..1b0f55301 100644 --- a/app/src/processing/mode/java/Compiler.java +++ b/app/src/processing/mode/java/Compiler.java @@ -149,8 +149,8 @@ public class Compiler { String errorMessage = pieces[4]; exception = build.placeException(errorMessage, - dotJavaFilename, - dotJavaLineIndex); + dotJavaFilename, + dotJavaLineIndex); /* int codeIndex = 0; //-1; int codeLine = -1; diff --git a/app/src/processing/mode/java/JavaBuild.java b/app/src/processing/mode/java/JavaBuild.java index a630259ff..42414a825 100644 --- a/app/src/processing/mode/java/JavaBuild.java +++ b/app/src/processing/mode/java/JavaBuild.java @@ -155,8 +155,8 @@ public class JavaBuild { this.srcFolder = srcFolder; this.binFolder = binFolder; - Base.openFolder(srcFolder); - Base.openFolder(binFolder); +// Base.openFolder(srcFolder); +// Base.openFolder(binFolder); // run the preprocessor String classNameFound = preprocess(srcFolder); @@ -647,7 +647,8 @@ public class JavaBuild { // if (codeLine == -1 && !dotJavaFilename.equals(name + ".java")) { // return null; // } - return new SketchException(message, codeIndex, codeLine); +// return new SketchException(message, codeIndex, codeLine); + return new SketchException(message, codeIndex, codeLine, -1, false); // changed for 0194 for compile errors, but... }