java_interfaces: Moved ifdefs for swig version

Moved the SWIG version check from each sensor library .i file to
the base SWIG .i file (per interface).  This cleans up the number
of #if SWIG_VERSION's across the code base, and will make cleanup
of these easier at a later date.

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

src/ads1x15/javaupm_ads1x15.i

@@ -1,9 +1,7 @@
 %module javaupm_ads1x15
 %include "../upm.i"
 
-#if SWIG_VERSION >= 0x030009
 %include "../interfaces/javaupm_iADC.i"
-#endif
 
 %include "typemaps.i"
 

src/bmp280/javaupm_bmp280.i

@@ -1,16 +1,9 @@
 %module javaupm_bmp280
 %include "../upm.i"
 
-#if SWIG_VERSION >= 0x030009
 %include "../interfaces/javaupm_iTemperatureSensor.i"
 %include "../interfaces/javaupm_iHumiditySensor.i"
 %include "../interfaces/javaupm_iPressureSensor.i"
-#else
-%include "iModuleStatus.hpp"
-%include "iTemperatureSensor.hpp"
-%include "iPressureSensor.hpp"
-%include "iHumiditySensor.hpp"
-#endif
 
 %include "cpointer.i"
 %include "typemaps.i"

src/bmpx8x/javaupm_bmpx8x.i

@@ -1,10 +1,8 @@
 %module javaupm_bmpx8x
 %include "../upm.i"
 
-#if SWIG_VERSION >= 0x030009
 %include "../interfaces/javaupm_iTemperatureSensor.i"
 %include "../interfaces/javaupm_iPressureSensor.i"
-#endif
 
 %{
     #include "bmpx8x.hpp"

src/ds1808lc/javaupm_ds1808lc.i

@@ -1,9 +1,7 @@
 %module javaupm_ds1808lc
 %include "../upm.i"
 
-#if SWIG_VERSION >= 0x030009
 %include "../interfaces/javaupm_iLightController.i"
-#endif
 
 %include "arrays_java.i";
 %include "../java_buffer.i"

src/hlg150h/javaupm_hlg150h.i

@@ -1,9 +1,7 @@
 %module javaupm_hlg150h
 %include "../upm.i"
 
-#if SWIG_VERSION >= 0x030009
 %include "../interfaces/javaupm_iLightController.i"
-#endif
 
 %include "arrays_java.i";
 %include "../java_buffer.i"

src/interfaces/javaupm_iADC.i

@@ -1,6 +1,9 @@
-%include <swiginterface.i>
+#if SWIG_VERSION >= 0x030009
+    %include <swiginterface.i>
+    %interface_impl(upm::IADC);
+#endif
+
 %include "javaupm_interfaces.i"
 %include "javaupm_iModuleStatus.i"
-%interface_impl(upm::IADC);
 
 %include "iADC.hpp"

src/interfaces/javaupm_iCO2Sensor.i

@@ -1,6 +1,9 @@
-%include <swiginterface.i>
+#if SWIG_VERSION >= 0x030009
+    %include <swiginterface.i>
+    %interface_impl(upm::ICO2Sensor);
+#endif
+
 %include "javaupm_interfaces.i"
 %include "javaupm_iModuleStatus.i"
-%interface_impl(upm::ICO2Sensor);
 
 %include "iCO2Sensor.hpp"

src/interfaces/javaupm_iHumiditySensor.i

@@ -1,6 +1,9 @@
-%include <swiginterface.i>
+#if SWIG_VERSION >= 0x030009
+    %include <swiginterface.i>
+    %interface_impl(upm::IHumiditySensor);
+#endif
+
 %include "javaupm_interfaces.i"
 %include "javaupm_iModuleStatus.i"
-%interface_impl(upm::IHumiditySensor);
 
 %include "iHumiditySensor.hpp"

src/interfaces/javaupm_iLightController.i

@@ -1,6 +1,9 @@
-%include <swiginterface.i>
+#if SWIG_VERSION >= 0x030009
+    %include <swiginterface.i>
+    %interface_impl(upm::ILightController);
+#endif
+
 %include "javaupm_interfaces.i"
 %include "javaupm_iModuleStatus.i"
-%interface_impl(upm::ILightController);
 
 %include "iLightController.hpp"

src/interfaces/javaupm_iLightSensor.i

@@ -1,6 +1,9 @@
-%include <swiginterface.i>
+#if SWIG_VERSION >= 0x030009
+    %include <swiginterface.i>
+    %interface_impl(upm::ILightSensor);
+#endif
+
 %include "javaupm_interfaces.i"
 %include "javaupm_iModuleStatus.i"
-%interface_impl(upm::ILightSensor);
 
 %include "iLightSensor.hpp"

src/interfaces/javaupm_iModuleStatus.i

@@ -1,5 +1,6 @@
-%include <swiginterface.i>
+#if SWIG_VERSION >= 0x030009
-
+    %include <swiginterface.i>
-%interface_impl(upm::IModuleStatus);
+    %interface_impl(upm::IModuleStatus);
+#endif
 
 %include "iModuleStatus.hpp"

src/interfaces/javaupm_iPressureSensor.i

@@ -1,6 +1,9 @@
-%include <swiginterface.i>
+#if SWIG_VERSION >= 0x030009
+    %include <swiginterface.i>
+    %interface_impl(upm::IPressureSensor);
+#endif
+
 %include "javaupm_interfaces.i"
 %include "javaupm_iModuleStatus.i"
-%interface_impl(upm::IPressureSensor);
 
 %include "iPressureSensor.hpp"

src/interfaces/javaupm_iTemperatureSensor.i

@@ -1,6 +1,9 @@
-%include <swiginterface.i>
+#if SWIG_VERSION >= 0x030009
+    %include <swiginterface.i>
+    %interface_impl(upm::ITemperatureSensor);
+#endif
+
 %include "javaupm_interfaces.i"
 %include "javaupm_iModuleStatus.i"
-%interface_impl(upm::ITemperatureSensor);
 
 %include "iTemperatureSensor.hpp"

src/lp8860/javaupm_lp8860.i

@@ -1,8 +1,6 @@
 %module javaupm_lp8860
 
-#if SWIG_VERSION >= 0x030009
 %include "../interfaces/javaupm_iLightController.i"
-#endif
 
 %include "../upm.i"
 

src/max44009/javaupm_max44009.i

@@ -1,9 +1,7 @@
 %module javaupm_max44009
 %include "../upm.i"
 
-#if SWIG_VERSION >= 0x030009
 %include "../interfaces/javaupm_iLightSensor.i"
-#endif
 
 %include "arrays_java.i";
 %include "../java_buffer.i"

src/ms5611/javaupm_ms5611.i

@@ -1,10 +1,8 @@
 %module javaupm_ms5611
 %include "../upm.i"
 
-#if SWIG_VERSION >= 0x030009
 %include "../interfaces/javaupm_iTemperatureSensor.i"
 %include "../interfaces/javaupm_iPressureSensor.i"
-#endif
 
 %{
     #include "ms5611.hpp"

src/si1132/javaupm_si1132.i

@@ -1,9 +1,7 @@
 %module(directors="1") javaupm_si1132
 %include "../upm.i"
 
-#if SWIG_VERSION >= 0x030009
 %include "../interfaces/javaupm_iLightSensor.i"
-#endif
 
 %pragma(java) jniclasscode=%{
     static {

src/si7005/javaupm_si7005.i

@@ -1,10 +1,8 @@
 %module javaupm_si7005
 %include "../upm.i"
 
-#if SWIG_VERSION >= 0x030009
 %include "../interfaces/javaupm_iTemperatureSensor.i"
 %include "../interfaces/javaupm_iHumiditySensor.i"
-#endif
 
 %include "arrays_java.i";
 %include "../java_buffer.i"

src/t6713/javaupm_t6713.i

@@ -1,9 +1,7 @@
 %module javaupm_t6713
 %include "../upm.i"
 
-#if SWIG_VERSION >= 0x030009
 %include "../interfaces/javaupm_iCO2Sensor.i"
-#endif
 
 %include "arrays_java.i";
 %include "../java_buffer.i"