diff --git a/app/src/processing/app/Base.java b/app/src/processing/app/Base.java index 949e43220..007f172a5 100644 --- a/app/src/processing/app/Base.java +++ b/app/src/processing/app/Base.java @@ -3,7 +3,7 @@ /* Part of the Processing project - http://processing.org - Copyright (c) 2004-13 Ben Fry and Casey Reas + Copyright (c) 2004-14 Ben Fry and Casey Reas Copyright (c) 2001-04 Massachusetts Institute of Technology This program is free software; you can redistribute it and/or @@ -46,9 +46,9 @@ import processing.mode.java.JavaMode; public class Base { // Added accessors for 0218 because the UpdateCheck class was not properly // updating the values, due to javac inlining the static final values. - static private final int REVISION = 231; + static private final int REVISION = 232; /** This might be replaced by main() if there's a lib/version.txt file. */ - static private String VERSION_NAME = "0231"; //$NON-NLS-1$ + static private String VERSION_NAME = "0232"; //$NON-NLS-1$ /** Set true if this a proper release rather than a numbered revision. */ // static private boolean RELEASE = false; @@ -124,7 +124,7 @@ public class Base { /** The built-in modes. coreModes[0] will be considered the 'default'. */ private Mode[] coreModes; protected ArrayList modeContribs; - + protected ArrayList exampleContribs; private JMenu sketchbookMenu; @@ -173,10 +173,10 @@ public class Base { // Make sure a full JDK is installed initRequirements(); - + // Load the languages Language.init(); - + // run static initialization that grabs all the prefs Preferences.init(); @@ -282,14 +282,14 @@ public class Base { ModeContribution.load(this, getContentFile("modes/java"), //$NON-NLS-1$ "processing.mode.java.JavaMode").getMode(); //$NON-NLS-1$ - // PDE X calls getModeList() while it's loading, so coreModes must be set + // PDE X calls getModeList() while it's loading, so coreModes must be set coreModes = new Mode[] { javaMode }; - - Mode pdexMode = + + Mode pdexMode = ModeContribution.load(this, getContentFile("modes/ExperimentalMode"), //$NON-NLS-1$ "processing.mode.experimental.ExperimentalMode").getMode(); //$NON-NLS-1$ - // Safe to remove the old Java mode here? + // Safe to remove the old Java mode here? //coreModes = new Mode[] { pdexMode }; coreModes = new Mode[] { pdexMode, javaMode }; } @@ -348,7 +348,7 @@ public class Base { ContributionManager.cleanup(this); buildCoreModes(); rebuildContribModes(); - + rebuildContribExamples(); // Needs to happen after the sketchbook folder has been located. @@ -600,7 +600,7 @@ public class Base { if (!nextMode.equals(getDefaultMode())) { saveModeSettings(new File(newbieDir, "sketch.properties"), nextMode); } - + String path = newbieFile.getAbsolutePath(); /*Editor editor =*/ handleOpen(path, true); @@ -622,13 +622,13 @@ public class Base { System.err.println("While creating " + sketchProps + ": " + e.getMessage()); } } - - + + public Mode getDefaultMode() { return coreModes[0]; } - - + + /** Used by ThinkDifferent so that it can have a Sketchbook menu. */ public Mode getNextMode() { return nextMode; @@ -1592,7 +1592,7 @@ public class Base { // . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . - /** + /** * Get the directory that can store settings. (Library on OS X, App Data or * something similar on Windows, a dot folder on Linux.) Removed this as a * preference for 3.0a3 because we need this to be stable. diff --git a/core/done.txt b/core/done.txt index d25b47616..c6fb29dd3 100644 --- a/core/done.txt +++ b/core/done.txt @@ -1,3 +1,9 @@ +0231 core (3.0a4) +X RuntimeException thrown for open arcs under specific parameters in P2D +X https://github.com/processing/processing/issues/2854 +X update to new version of JOGL (Andres) + + 0230 core (3.0a3) X add another NaN check when sorting FloatList/Dict classes X if all values were NaN, an ArrayIndexOutOfBoundsException was thrown diff --git a/core/todo.txt b/core/todo.txt index 156c6e6d7..bf95c20bd 100644 --- a/core/todo.txt +++ b/core/todo.txt @@ -1,7 +1,4 @@ -0231 core (3.0a4 or 3.0b1) -X RuntimeException thrown for open arcs under specific parameters in P2D -X https://github.com/processing/processing/issues/2854 -X update to new version of JOGL (Andres) +0232 core (3.0a5) applet/component diff --git a/done.txt b/done.txt index a99a00a1b..cb033569f 100644 --- a/done.txt +++ b/done.txt @@ -1,3 +1,55 @@ +0231 pde (3.0a4) +X add new download redirect for contribs.txt +X https://github.com/processing/processing/issues/2850 +X contribs for 3.0 need to come from a different location +X https://github.com/processing/processing/issues/2849 +X add the separate contribs.txt link on download.processing.org +X fix inside ContributionListing.java +X change default mode handling to use experimental as the default +X remove isDefaultMode(), since it was doing the wrong thing +X make a new preference setting for the default mode +X this will set folks to the PDE X mode, and prevent conflicts w/ 2.0 +X change last.sketch.mode to mode.last +X fix OS X default File menu to be the same order as the other File menu +X TGAs from saveFrame() create transparent/black movies with Movie Maker +X https://github.com/processing/processing/issues/2851 +X fix export problem on Windows with PDE X +X https://github.com/processing/processing/issues/2806 +X turn off code completion by default (and reset the preference) + +pulls +X Optimize creation of boxed primitives +X https://github.com/processing/processing/pull/2826 +X Add static modifier to inner classes that don't access parent +X https://github.com/processing/processing/pull/2839 +X Fix localization in OS X (requires writing property files) +X https://github.com/processing/processing/pull/2844 +X black font outline appears with large VLW font and OpenGL renderer +X https://github.com/processing/processing/issues/2845 +X https://github.com/processing/processing/pull/2856 +X updates to Spanish translation +X https://github.com/processing/processing/pull/2857 + +cleaning +X single line of code with no semicolon dies with "unexpected token: null" +X http://code.google.com/p/processing/issues/detail?id=1312 +X https://github.com/processing/processing/issues/1350 +X closed by Dan post-3.0a3 +X move sketchbook into its own window +X move recent into the sketchbook menu +X try installing 10.7.3 on Mac Mini and check whether things run +X make sure it's only running on 64-bit machines? + +gsoc +X remove dependency on oscp5 library for tweak mode +X https://github.com/processing/processing/issues/2730 +X https://github.com/processing/processing/pull/2808 +X https://github.com/processing/processing/pull/2855 +X A few fixes for Contributions Manager +X https://github.com/processing/processing/issues/2798 +X https://github.com/processing/processing/issues/2831 + + 0230 pde (3.0a3) X remove toolbar buttons except for start/stop X rename sketchbook tree name, re-order menu, add language hooks diff --git a/todo.txt b/todo.txt index 9820b21ad..319ec54a9 100644 --- a/todo.txt +++ b/todo.txt @@ -1,53 +1,4 @@ -0231 pde (3.0a4) -X add new download redirect for contribs.txt -X https://github.com/processing/processing/issues/2850 -X contribs for 3.0 need to come from a different location -X https://github.com/processing/processing/issues/2849 -X add the separate contribs.txt link on download.processing.org -X fix inside ContributionListing.java -X change default mode handling to use experimental as the default -X remove isDefaultMode(), since it was doing the wrong thing -X make a new preference setting for the default mode -X this will set folks to the PDE X mode, and prevent conflicts w/ 2.0 -X change last.sketch.mode to mode.last -X fix OS X default File menu to be the same order as the other File menu -X TGAs from saveFrame() create transparent/black movies with Movie Maker -X https://github.com/processing/processing/issues/2851 -X fix export problem on Windows with PDE X -X https://github.com/processing/processing/issues/2806 -X turn off code completion by default (and reset the preference) - -pulls -X Optimize creation of boxed primitives -X https://github.com/processing/processing/pull/2826 -X Add static modifier to inner classes that don't access parent -X https://github.com/processing/processing/pull/2839 -X Fix localization in OS X (requires writing property files) -X https://github.com/processing/processing/pull/2844 -X black font outline appears with large VLW font and OpenGL renderer -X https://github.com/processing/processing/issues/2845 -X https://github.com/processing/processing/pull/2856 -X updates to Spanish translation -X https://github.com/processing/processing/pull/2857 - -cleaning -X single line of code with no semicolon dies with "unexpected token: null" -X http://code.google.com/p/processing/issues/detail?id=1312 -X https://github.com/processing/processing/issues/1350 -X closed by Dan post-3.0a3 -X move sketchbook into its own window -X move recent into the sketchbook menu -X try installing 10.7.3 on Mac Mini and check whether things run -X make sure it's only running on 64-bit machines? - -gsoc -X remove dependency on oscp5 library for tweak mode -X https://github.com/processing/processing/issues/2730 -X https://github.com/processing/processing/pull/2808 -X https://github.com/processing/processing/pull/2855 -X A few fixes for Contributions Manager -X https://github.com/processing/processing/issues/2798 -X https://github.com/processing/processing/issues/2831 +0232 pde (3.0a5) pulls