mirror of
https://github.com/processing/processing4.git
synced 2026-02-13 02:20:45 +01:00
remove additional imports, use a stricter list
This commit is contained in:
@@ -934,8 +934,17 @@ public class PdePreprocessor {
|
||||
|
||||
public String[] getDefaultImports() {
|
||||
// These may change in-between (if the prefs panel adds this option)
|
||||
String prefsLine = Preferences.get("preproc.imports");
|
||||
return PApplet.splitTokens(prefsLine, ", ");
|
||||
//String prefsLine = Preferences.get("preproc.imports");
|
||||
//return PApplet.splitTokens(prefsLine, ", ");
|
||||
return new String[] {
|
||||
"java.util.HashMap",
|
||||
"java.util.ArrayList",
|
||||
"java.io.BufferedReader",
|
||||
"java.io.PrintWriter",
|
||||
"java.io.InputStream",
|
||||
"java.io.OutputStream",
|
||||
"java.io.IOException"
|
||||
};
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -957,10 +966,8 @@ public class PdePreprocessor {
|
||||
* this info. In fact, we should be descending the AST passed in.
|
||||
*/
|
||||
String getFirstClassName(AST ast) {
|
||||
|
||||
String t = advClassName;
|
||||
advClassName = "";
|
||||
|
||||
return t;
|
||||
}
|
||||
|
||||
|
||||
@@ -574,6 +574,7 @@ public class Runner implements MessageConsumer {
|
||||
Value messageValue = or.getValue(messageField);
|
||||
// System.out.println("mess val " + messageValue);
|
||||
|
||||
//"java.lang.ArrayIndexOutOfBoundsException"
|
||||
int last = exceptionName.lastIndexOf('.');
|
||||
String message = exceptionName.substring(last + 1);
|
||||
if (messageValue != null) {
|
||||
@@ -630,7 +631,7 @@ public class Runner implements MessageConsumer {
|
||||
System.err.println("This version of Processing only supports libraries and JAR files compiled for Java 1.6 or earlier.");
|
||||
System.err.println("A library used by this sketch was compiled for Java 1.7 or later, ");
|
||||
System.err.println("and needs to be recompiled to be compatible with Java 1.6.");
|
||||
|
||||
|
||||
} else if (exceptionClass.equals("java.lang.NoSuchMethodError") ||
|
||||
exceptionClass.equals("java.lang.NoSuchFieldError")) {
|
||||
listener.statusError(exceptionClass.substring(10) + ": " +
|
||||
|
||||
Reference in New Issue
Block a user