mirror of
https://github.com/esp8266/Arduino.git
synced 2025-07-30 16:24:09 +03:00
Merging r327:r331 of the branches/processing-sync into the trunk. This adds the Processing core, and some new features including printing, copy for discourse, better auto-format, improved keyboard shortcuts, etc.
This commit is contained in:
@ -23,7 +23,7 @@
|
||||
|
||||
package processing.app;
|
||||
|
||||
//import processing.core.*;
|
||||
import processing.core.*;
|
||||
|
||||
import java.awt.*;
|
||||
import java.awt.event.*;
|
||||
@ -40,7 +40,7 @@ import com.oroinc.text.regex.*;
|
||||
*/
|
||||
public class Runner implements MessageConsumer {
|
||||
|
||||
//PApplet applet;
|
||||
PApplet applet;
|
||||
RunnerException exception;
|
||||
Window window;
|
||||
PrintStream leechErr;
|
||||
@ -497,6 +497,7 @@ java.lang.NullPointerException
|
||||
}
|
||||
|
||||
if (codeIndex != -1) {
|
||||
//System.out.println("got line num " + lineNumber);
|
||||
// in case this was a tab that got embedded into the main .java
|
||||
lineNumber -= sketch.code[codeIndex].preprocOffset;
|
||||
|
||||
|
Reference in New Issue
Block a user