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

Merge remote-tracking branch 'remotes/upstream/master'

Browse Source
This commit is contained in:
Sean McKenna
2014-03-31 12:05:45 -06:00
parent 71320d9b45 0d4d0eac91
commit a15b66bebd
9 changed files with 32 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/processing/mode/java/JavaBuild.java
View File

@@ -531,6 +531,8 @@ public class JavaBuild {
if (pkg.startsWith("processing.data.")) return true;
if (pkg.startsWith("processing.event.")) return true;
if (pkg.startsWith("processing.opengl.")) return true;
// if (pkg.startsWith("com.jogamp.")) return true;
// // ignore core, data, and opengl packages
// String[] coreImports = preprocessor.getCoreImports();

2
app/src/processing/mode/java/runner/Runner.java
View File

@@ -923,7 +923,7 @@ public class Runner implements MessageConsumer {
ObjectReference ref = (ObjectReference)val;
method = ((ClassType) ref.referenceType()).concreteMethodByName("getFileName", "()Ljava/lang/String;");
StringReference strref = (StringReference) ref.invokeMethod(thread, method, new ArrayList<Value>(), ObjectReference.INVOKE_SINGLE_THREADED);
String filename = strref.value();
String filename = strref == null ? "Unknown Source" : strref.value();
method = ((ClassType) ref.referenceType()).concreteMethodByName("getLineNumber", "()I");
IntegerValue intval = (IntegerValue) ref.invokeMethod(thread, method, new ArrayList<Value>(), ObjectReference.INVOKE_SINGLE_THREADED);
int lineNumber = intval.intValue() - 1;