From 6a8b491282ecf20dc680f6ee81ae1e20f55bae4b Mon Sep 17 00:00:00 2001 From: Ben Fry Date: Wed, 24 Jun 2015 11:12:55 -0400 Subject: [PATCH] change category to categories and other housekeeping notes --- .../processing/app/contrib/Contribution.java | 6 +++- .../mode/java/preproc/PdePreprocessor.java | 2 ++ todo.txt | 28 +++++++++++++------ 3 files changed, 26 insertions(+), 10 deletions(-) diff --git a/app/src/processing/app/contrib/Contribution.java b/app/src/processing/app/contrib/Contribution.java index 065e3eb5a..47364fee1 100644 --- a/app/src/processing/app/contrib/Contribution.java +++ b/app/src/processing/app/contrib/Contribution.java @@ -31,7 +31,8 @@ import processing.app.Language; abstract public class Contribution { static final String IMPORTS_PROPERTY = "imports"; - static final String CATEGORIES_PROPERTY = "category"; +// static final String CATEGORIES_PROPERTY = "category"; + static final String CATEGORIES_PROPERTY = "categories"; //static final String MODES_PROPERTY = "compatibleModesList"; static final String MODES_PROPERTY = "modes"; //static final String AUTHORS_PROPERTY = "authorList"; @@ -252,6 +253,9 @@ abstract public class Contribution { StringList outgoing = new StringList(); String categoryStr = properties.get(CATEGORIES_PROPERTY); + if (categoryStr == null) { + categoryStr = properties.get("category"); // try the old way + } if (categoryStr != null) { String[] listing = PApplet.trim(PApplet.split(categoryStr, ',')); for (String category : listing) { diff --git a/java/src/processing/mode/java/preproc/PdePreprocessor.java b/java/src/processing/mode/java/preproc/PdePreprocessor.java index 0c68d6990..89d4c775c 100644 --- a/java/src/processing/mode/java/preproc/PdePreprocessor.java +++ b/java/src/processing/mode/java/preproc/PdePreprocessor.java @@ -288,10 +288,12 @@ public class PdePreprocessor { char[] c = searchArea.toCharArray(); int depth = 0; int closeBrace = -1; +// boolean literal; // inside a quoted literal? StringBuilder sb = new StringBuilder(); for (int i = openBrace; i < c.length; i++) { if (c[i] == '{') { depth++; +// } else if (c[i] == '\'') { } else if (c[i] == '}') { depth--; if (depth == 0) { diff --git a/todo.txt b/todo.txt index 75d57e4b8..ce2caf7f9 100644 --- a/todo.txt +++ b/todo.txt @@ -9,15 +9,16 @@ X https://github.com/processing/processing/issues/3383 X Show "not compatible" error message in the manager X https://github.com/processing/processing/issues/3386 X Add more code for handling low-level errors on startup +X update the "Supported Platforms" wiki page with current status manager X changed compatibleModesList to modes in examples.properties X changed authorList to authors to keep in line w/ the others -`authorList` has now changed to `authors` (though `authorList` still works to keep compatibility) Oddly enough, authorList was not a list (it's free-form text that might be a list), yet others that were lists didn't have 'list' in the name -_ need to make a note of these -_ should we change category to categories? +X changed category to categories X send list of installed Libraries, Modes, Tools, and Examples on update X https://github.com/processing/processing/issues/3365 +X disable contrib manager updates when "check for updates" is turned off +X update the FAQ to cover the changes contribs X Use correct localized strings in JavaEditor.java @@ -26,6 +27,10 @@ X dim edit menus as appropriate during selection/no selection/etc o http://code.google.com/p/processing/issues/detail?id=14 X https://github.com/processing/processing/issues/53 X https://github.com/processing/processing/pull/3419 +X Internationalize MovieMaker.java +X https://github.com/processing/processing/pull/3424 +X Auto-completion does not seem to be working +X https://github.com/processing/processing/issues/3111 gsoc X Mode problems window wasn't doing line breaks @@ -36,6 +41,12 @@ X https://github.com/processing/processing/pull/3392 X Examples window shows contributed examples X https://github.com/processing/processing/pull/3421 X https://github.com/processing/processing/pull/3421 +X reworking the Contribution Manager according to Scott's redesign +X https://github.com/processing/processing/pull/3423 +X finish adding 'examples' contribs +X https://github.com/processing/processing/issues/2953 +o don't return here, allow contrib types to fail: +o https://github.com/processing/processing/blob/master/app/src/processing/app/contrib/ContributionListing.java#L509 cleaning o libraries in java tabs (separate .java files) are reported missing @@ -43,8 +54,6 @@ o need to scan the .java files for imports that need to be included o http://code.google.com/p/processing/issues/detail?id=459 X https://github.com/processing/processing/issues/498 -"OS X v10.11 is the last major release of OS X that will support the previously deprecated Java 6 runtime and tools provided by Apple. Applications or features that depend upon Java 6 may not function properly or will not launch when Java 6 is removed." https://developer.apple.com/library/prerelease/mac/releasenotes/General/rn-osx-10.11/index.html - beta _ add "welcome" or "what's new" window to explain features in 3 @@ -100,7 +109,12 @@ _ recent menu gets huge with other p5 versions on osx pde/build _ error message caused by curly bracket in a println string +_ ((?