Permit implementing serialEvet and serialAvailable without having to link to Serial at buildtime.

Jonathan Feinberg · Jonathan Feinberg · commit f5927dc3e2fb · 2014-05-19T20:42:26.000-04:00
This is useful for Python mode, or any other Java-compatible Processing that doesn't allow reflection on the sketch.
diff --git a/java/libraries/serial/src/processing/serial/Serial.java b/java/libraries/serial/src/processing/serial/Serial.java
@@ -112,15 +112,21 @@ public Serial(PApplet parent, String portName, int baudRate, char parity, int da
       throw new RuntimeException("Error opening serial port " + e.getPortName() + ": " + e.getExceptionType());
     }
 
+    serialEventMethod = findCallback("serialEvent");
+    serialAvailableMethod = findCallback("serialAvailable");
+  }
+
+  private Method findCallback(final String name) {
     try {
-      serialEventMethod = parent.getClass().getMethod("serialEvent", new Class[] { this.getClass() });
+      return parent.getClass().getMethod(name, this.getClass());
     } catch (Exception e) {
     }
-
+    // Permit callback(Object) as alternative to callback(Serial).
     try {
-      serialAvailableMethod = parent.getClass().getMethod("serialAvailable", new Class[] { this.getClass() });
+      return parent.getClass().getMethod(name, Object.class);
     } catch (Exception e) {
     }
+    return null;
   }
 
   
@@ -133,7 +139,7 @@ public void pre() {
     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 void serialEvent(SerialPortEvent event) {
                 // 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());
