diff --git a/app/src/processing/mode/java/Commander.java b/app/src/processing/mode/java/Commander.java index f27b28cca..a63dbd5db 100644 --- a/app/src/processing/mode/java/Commander.java +++ b/app/src/processing/mode/java/Commander.java @@ -25,6 +25,7 @@ package processing.mode.java; import java.io.File; import java.io.IOException; import java.io.PrintStream; +import java.io.UnsupportedEncodingException; import processing.app.*; import processing.app.contrib.ModeContribution; @@ -60,6 +61,9 @@ public class Commander implements RunnerListener { static final int EXPORT = 4; Sketch sketch; + + PrintStream systemOut; + PrintStream systemErr; static public void main(String[] args) { @@ -106,6 +110,17 @@ public class Commander implements RunnerListener { int platformBits = 0; int task = HELP; + // Turns out the output goes as MacRoman or something else useless. + // http://code.google.com/p/processing/issues/detail?id=1418 + try { + systemOut = new PrintStream(System.out, true, "UTF-8"); + systemErr = new PrintStream(System.err, true, "UTF-8"); + + } catch (UnsupportedEncodingException e) { + e.printStackTrace(); + System.exit(1); + } + for (String arg : args) { if (arg.length() == 0) { // ignore it, just the crappy shell script @@ -183,7 +198,7 @@ public class Commander implements RunnerListener { // runArg + ", or " + presentArg + "."); // } if (task == HELP) { - printCommandLine(System.out); + printCommandLine(systemOut); System.exit(0); } @@ -269,7 +284,7 @@ public class Commander implements RunnerListener { if (!success) { // error already printed System.exit(1); } - System.out.println("Finished."); + systemOut.println("Finished."); System.exit(0); } catch (SketchException re) { @@ -284,12 +299,12 @@ public class Commander implements RunnerListener { public void statusNotice(String message) { - System.err.println(message); + systemErr.println(message); } public void statusError(String message) { - System.err.println(message); + systemErr.println(message); } @@ -304,7 +319,7 @@ public class Commander implements RunnerListener { int column = re.getCodeColumn() + 1; //if (column == -1) column = 0; // TODO if column not specified, should just select the whole line. - System.err.println(filename + ":" + + systemErr.println(filename + ":" + line + ":" + column + ":" + line + ":" + column + ":" + " " + re.getMessage()); } else { @@ -313,11 +328,11 @@ public class Commander implements RunnerListener { } - static void complainAndQuit(String lastWords, boolean schoolEmFirst) { + void complainAndQuit(String lastWords, boolean schoolEmFirst) { if (schoolEmFirst) { - printCommandLine(System.err); + printCommandLine(systemErr); } - System.err.println(lastWords); + systemErr.println(lastWords); System.exit(1); } diff --git a/build/shared/revisions.txt b/build/shared/revisions.txt index 3348cffb7..ca5be0c08 100644 --- a/build/shared/revisions.txt +++ b/build/shared/revisions.txt @@ -74,6 +74,9 @@ PROCESSING 2.0b7 (REV 0215) - 25 November 2012 + Add mouseEntered/Exited on the desktop. http://code.google.com/p/processing/issues/detail?id=500 ++ Change output from processing-java to be UTF-8 encoded. + http://code.google.com/p/processing/issues/detail?id=1418 + [ bug fixes ] + mouseButton not being set properly in mouseClicked. @@ -111,10 +114,10 @@ PROCESSING 2.0b7 (REV 0215) - 25 November 2012 + Implement anisotropic filtering when using OPENGL. http://code.google.com/p/processing/issues/detail?id=502 -+ Update reference for begin/endContour ++ Update reference for begin/endContour. http://code.google.com/p/processing/issues/detail?id=1396 -+ "expecting EOF, found 'import'" error on previously working sketch ++ Fix "expecting EOF, found 'import'" error on previously working sketch. http://code.google.com/p/processing/issues/detail?id=1376 + Prevent potential race condition when resizing sketches. @@ -167,6 +170,15 @@ PROCESSING 2.0b7 (REV 0215) - 25 November 2012 + Use of pixels[] array breaks after resize in OpenGL. http://code.google.com/p/processing/issues/detail?id=1119 ++ No stroke with OpenGL sketches on a 2007 Mac Mini (GMA 950) + http://code.google.com/p/processing/issues/detail?id=1222 + ++ ortho() displays strange line widths. + http://code.google.com/p/processing/issues/detail?id=1285 + ++ Resizeable frame crashes sketch with AMD video card. + http://code.google.com/p/processing/issues/detail?id=1175 + [ android ] + Like the desktop release, removed default imports. This includes: diff --git a/core/todo.txt b/core/todo.txt index 9891a7263..3cc1f5a64 100644 --- a/core/todo.txt +++ b/core/todo.txt @@ -68,6 +68,13 @@ A beginContour() behaves differently in immediate and retained modes A http://code.google.com/p/processing/issues/detail?id=1417 A use to pixels array breaks after resize A http://code.google.com/p/processing/issues/detail?id=1119 +A no stroke with OpenGL sketches on a 2007 Mac Mini (GMA 950) +A http://code.google.com/p/processing/issues/detail?id=1222 +A ortho() displays strange line widths +A http://code.google.com/p/processing/issues/detail?id=1285 +A resizeable frame crashes sketch with AMD video card +A http://code.google.com/p/processing/issues/detail?id=1175 + _ implement mousePressed(Event) etc _ better to do this instead of bringing back the magic event diff --git a/todo.txt b/todo.txt index 3e48196df..74943ebae 100644 --- a/todo.txt +++ b/todo.txt @@ -53,6 +53,8 @@ X change syntax highlighting so it differentiates keyPressed and keyPressed() X syntax highlight with parens also helps "String line" vs "line()" X although nothing in here to prevent "String line" from coloring X try to make KEYWORD4 and KEYWORD5 work +X change output from processing-java to be UTF-8 encoded +X http://code.google.com/p/processing/issues/detail?id=1418 earlier X The sketch name can't begin with '_' (underscore)