eessppeelllloo/processing4
1
0
Fork 0
mirror of https://github.com/processing/processing4.git synced 2026-02-26 00:35:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix for size regex, streampump edits, additional todo items

Browse Source
This commit is contained in:
benfry
2010-07-17 20:19:31 +00:00
parent bac102ce33
commit cf5b59fd39
3 changed files with 24 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
app/src/processing/app/Sketch.java
View File

@@ -46,6 +46,16 @@ import javax.swing.border.TitledBorder;
public class Sketch {
static private File tempBuildFolder;
/**
* Regular expression for parsing the size() method. This should match
* against any uses of the size() function, whether numbers or variables
* or whatever. This way, no warning is shown if size() isn't actually used
* in the sketch, which is the case especially for anyone who is cutting
* and pasting from the reference.
*/
public static final String SIZE_REGEX =
"(?:^|\\s|;)size\\s*\\(\\s*(\\S+)\\s*,\\s*([^\\s,\\)]+),?\\s*([^\\)]*)\\s*\\)\\s*\\;";
private Editor editor;
private boolean foundMain = false;
@@ -1582,7 +1592,7 @@ public class Sketch {
return exportApplet(new File(folder, "applet").getAbsolutePath());
}
/**
* Handle export to applet.
*/
@@ -1625,15 +1635,8 @@ public class Sketch {
int high = PApplet.DEFAULT_HEIGHT;
String renderer = "";
// This matches against any uses of the size() function, whether numbers
// or variables or whatever. This way, no warning is shown if size() isn't
// actually used in the applet, which is the case especially for anyone
// who is cutting/pasting from the reference.
String sizeRegex =
"(?:^|\\s|;)size\\s*\\(\\s*(\\S+)\\s*,\\s*(\\d+),?\\s*([^\\)]*)\\s*\\)";
String scrubbed = scrubComments(code[0].getProgram());
String[] matches = PApplet.match(scrubbed, sizeRegex);
String[] matches = PApplet.match(scrubbed, SIZE_REGEX);
if (matches != null) {
try {
@@ -1642,6 +1645,7 @@ public class Sketch {
// Adding back the trim() for 0136 to handle Bug #769
if (matches.length == 4) renderer = matches[3].trim();
// Actually, matches.length should always be 4...
} catch (NumberFormatException e) {
// found a reference to size, but it didn't

1
app/src/processing/app/exec/StreamPump.java
View File

@@ -12,7 +12,6 @@ import java.util.concurrent.CopyOnWriteArrayList;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.ThreadFactory;
import processing.app.EditorConsole;
/**