mirror of
https://github.com/processing/processing4.git
synced 2026-02-02 21:29:17 +01:00
Permit implementing serialEvet and serialAvailable without having to link to Serial at buildtime.
This is useful for Python mode, or any other Java-compatible Processing that doesn't allow reflection on the sketch.
This commit is contained in:
@@ -112,15 +112,21 @@ public class Serial implements SerialPortEventListener {
|
||||
throw new RuntimeException("Error opening serial port " + e.getPortName() + ": " + e.getExceptionType());
|
||||
}
|
||||
|
||||
try {
|
||||
serialEventMethod = parent.getClass().getMethod("serialEvent", new Class[] { this.getClass() });
|
||||
} catch (Exception e) {
|
||||
}
|
||||
serialEventMethod = findCallback("serialEvent");
|
||||
serialAvailableMethod = findCallback("serialAvailable");
|
||||
}
|
||||
|
||||
private Method findCallback(final String name) {
|
||||
try {
|
||||
serialAvailableMethod = parent.getClass().getMethod("serialAvailable", new Class[] { this.getClass() });
|
||||
return parent.getClass().getMethod(name, this.getClass());
|
||||
} catch (Exception e) {
|
||||
}
|
||||
// Permit callback(Object) as alternative to callback(Serial).
|
||||
try {
|
||||
return parent.getClass().getMethod(name, Object.class);
|
||||
} catch (Exception e) {
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
|
||||
@@ -133,7 +139,7 @@ public class Serial implements SerialPortEventListener {
|
||||
if (serialAvailableMethod != null && invokeSerialAvailable) {
|
||||
invokeSerialAvailable = false;
|
||||
try {
|
||||
serialAvailableMethod.invoke(parent, new Object[] { this });
|
||||
serialAvailableMethod.invoke(parent, this);
|
||||
} catch (Exception e) {
|
||||
System.err.println("Error, disabling serialAvailable() for "+port.getPortName());
|
||||
System.err.println(e.getLocalizedMessage());
|
||||
@@ -392,7 +398,7 @@ public class Serial implements SerialPortEventListener {
|
||||
// available() and read() inside draw - but this function has no
|
||||
// thread-safety issues since it's being invoked during pre in the context
|
||||
// of the Processing applet
|
||||
serialEventMethod.invoke(parent, new Object[] { this });
|
||||
serialEventMethod.invoke(parent, this);
|
||||
} catch (Exception e) {
|
||||
System.err.println("Error, disabling serialEvent() for "+port.getPortName());
|
||||
System.err.println(e.getLocalizedMessage());
|
||||
|
||||
Reference in New Issue
Block a user