SWIGJAVA: Remove the last JAVA ifdefs from src

Removed all references to #ifdef SWIGJAVA and JAVACALLBACK from the
library source.  All java-specific source code has been moved to the
corresponding library's .i file for java.

    * Update library source
    * Update examples where necessary
    * The function pointer methodology has been remove from libraries
      which provided callbacks as both a class and a function pointer
      implementation.  Examples were updated to use the class version
      of callbacks.
    * Updated documentation for SWIGJAVA

Signed-off-by: Noel Eck <noel.eck@intel.com>

src/nrf24l01/Callback.hpp

@@ -1,6 +1,5 @@
 #pragma once
 
-#if defined(SWIGJAVA) || defined(JAVACALLBACK)
 class Callback
 {
   public:
@@ -13,10 +12,9 @@ class Callback
 };
 
 
-static void generic_callback (Callback* callback)
+void generic_callback (Callback* callback)
 {
     if (callback == NULL)
         return;
     callback->run();
 }
-#endif

src/nrf24l01/nrf24l01.cxx

@@ -134,20 +134,12 @@ NRF24L01::setPayload (uint8_t payload) {
     m_payload = payload;
 }
 
-#ifdef JAVACALLBACK
 void
 NRF24L01::setDataReceivedHandler (Callback *call_obj)
 {
     callback_obj = call_obj;
     dataReceivedHandler = &generic_callback;
 }
-#else
-void
-NRF24L01::setDataReceivedHandler (funcPtrVoidVoid handler)
-{
-    dataReceivedHandler = handler;
-}
-#endif
 
 bool
 NRF24L01::dataReady () {
@@ -316,11 +308,8 @@ void
 NRF24L01::pollListener() {
     if (dataReady()) {
         getData (m_rxBuffer);
-#ifdef JAVACALLBACK
+
         dataReceivedHandler (callback_obj); /* let know that data arrived */
-#else
-        dataReceivedHandler (); /* let know that data arrived */
-#endif
     }
 }
 

src/nrf24l01/nrf24l01.hpp

@@ -33,9 +33,7 @@
 #include <mraa/spi.hpp>
 #include <cstring>
 
-#if defined(SWIGJAVA) || defined(JAVACALLBACK)
 #include "Callback.hpp"
-#endif
 
 /* Memory Map */
 #define CONFIG              0x00
@@ -142,11 +140,7 @@
 
 namespace upm {
 
-#if defined(SWIGJAVA) || defined(JAVACALLBACK)
 typedef void (* funcPtrVoidVoid) (Callback *);
-#else
-typedef void (* funcPtrVoidVoid) ();
-#endif
 
 typedef enum {
     NRF_250KBPS = 0,
@@ -257,21 +251,13 @@ class NRF24L01 {
          */
         void    setPayload (uint8_t load);
 
-#if defined(SWIGJAVA) || defined(JAVACALLBACK)
         /**
          * Sets the handler to be called when data has been
          * received
          * @param call_obj Object used for callback - Java
          */
         void setDataReceivedHandler (Callback *call_obj);
-#else
-        /**
-         * Sets the handler to be called when data has been
-         * received
-         * @param handler Handler used for callback
-         */
-        void setDataReceivedHandler (funcPtrVoidVoid handler);
-#endif
+
         /**
          * Checks if the data has arrived
          */
@@ -374,11 +360,12 @@ class NRF24L01 {
         uint8_t     m_bleBuffer [32];       /**< BLE buffer */
 
     private:
-#if defined(SWIGJAVA) || defined(JAVACALLBACK)
-        /**< Callback object to use for setting the handler from Java */
+
+        /* Callback object to use for setting the handler from Java */
         Callback *callback_obj;
-#endif
-        funcPtrVoidVoid dataReceivedHandler; /**< Data arrived handler */
+
+        /** Data arrived handler */
+        funcPtrVoidVoid dataReceivedHandler;
 
         /**
          * Writes bytes to an SPI device