Added the JAVA_JNI_LOADLIBRARY macro for the jniclasscode pragma included in _upm.i for all java SWIG interface files.

src/_upm.i

@@ -1,9 +1,8 @@
-/* Macro for adding JAVA runnables.
+/* Macro for adding JAVA run
-    example usage: JAVA_ADD_INSTALLISR(upm::A110x)
+    usage: JAVA_ADD_INSTALLISR(javaupm_a110x)
-        UPMClassName - UPM class name w/namespace.
 */
-%define JAVA_ADD_INSTALLISR(UPMClassName)
+%define JAVA_ADD_INSTALLISR(UPM_Classname)
-%extend UPMClassName {
+%extend UPM_Classname {
     void installISR(jobject runnable)
     {
         $self->installISR(mraa_java_isr_callback, runnable);
@@ -11,17 +10,16 @@
 }
 %enddef
 
-/* Macro for adding JNI loadLibrary dependency.
+/* Macro for adding JNI loadLibrary dependency
-    example usage: JAVA_JNI_LOADLIBRARY(javaupm_rhusb)
+    usage: JAVA_JNI_LOADLIBRARY(javaupm_rhusb)
-        PackageName: Target UPM JAVA package.
 */
-%define JAVA_JNI_LOADLIBRARY(PackageName)
+%define JAVA_JNI_LOADLIBRARY(MyModuleName)
 %pragma(java) jniclasscode=%{
 static {
     try {
-        System.loadLibrary("PackageName");
+        System.loadLibrary("MyModuleName");
     } catch (UnsatisfiedLinkError e) {
-        System.err.println("Native code library (PackageName) failed to load. \n" + e);
+        System.err.println("Native code library (MyModuleName) failed to load. \n" + e);
         System.exit(1);
     }
 }

src/abp/javaupm_abp.i

@@ -8,13 +8,4 @@
 %}
 %include "abp.hpp"
 
-%pragma(java) jniclasscode=%{
+JAVA_JNI_LOADLIBRARY(javaupm_abp)
-    static {
-        try {
-            System.loadLibrary("javaupm_abp");
-        } catch (UnsatisfiedLinkError e) {
-            System.err.println("Native code library failed to load. \n" + e);
-            System.exit(1);
-        }
-    }
-%}

src/ad8232/javaupm_ad8232.i

@@ -7,13 +7,4 @@
 
 %include "ad8232.hpp"
 
-%pragma(java) jniclasscode=%{
+JAVA_JNI_LOADLIBRARY(javaupm_ad8232)
-    static {
-        try {
-            System.loadLibrary("javaupm_ad8232");
-        } catch (UnsatisfiedLinkError e) {
-            System.err.println("Native code library failed to load. \n" + e);
-            System.exit(1);
-        }
-    }
-%}

src/adafruitms1438/javaupm_adafruitms1438.i

@@ -7,13 +7,4 @@
 
 %include "adafruitms1438.hpp"
 
-%pragma(java) jniclasscode=%{
+JAVA_JNI_LOADLIBRARY(javaupm_adafruitms1438)
-    static {
-        try {
-            System.loadLibrary("javaupm_adafruitms1438");
-        } catch (UnsatisfiedLinkError e) {
-            System.err.println("Native code library failed to load. \n" + e);
-            System.exit(1);
-        }
-    }
-%}

src/adafruitss/javaupm_adafruitss.i

@@ -6,13 +6,4 @@
     #include "adafruitss.hpp"
 %}
 
-%pragma(java) jniclasscode=%{
+JAVA_JNI_LOADLIBRARY(javaupm_adafruitss)
-    static {
-        try {
-            System.loadLibrary("javaupm_adafruitss");
-        } catch (UnsatisfiedLinkError e) {
-            System.err.println("Native code library failed to load. \n" + e);
-            System.exit(1);
-        }
-    }
-%}

src/adc121c021/javaupm_adc121c021.i

@@ -8,13 +8,4 @@
 
 %include "adc121c021.hpp"
 
-%pragma(java) jniclasscode=%{
+JAVA_JNI_LOADLIBRARY(javaupm_adc121c021)
-    static {
-        try {
-            System.loadLibrary("javaupm_adc121c021");
-        } catch (UnsatisfiedLinkError e) {
-            System.err.println("Native code library failed to load. \n" + e);
-            System.exit(1);
-        }
-    }
-%}

src/adis16448/javaupm_adis16448.i

@@ -7,13 +7,4 @@
 
 %include "adis16448.hpp"
 
-%pragma(java) jniclasscode=%{
+JAVA_JNI_LOADLIBRARY(javaupm_adis16448)
-    static {
-        try {
-            System.loadLibrary("javaupm_adis16448");
-        } catch (UnsatisfiedLinkError e) {
-            System.err.println("Native code library failed to load. \n" + e);
-            System.exit(1);
-        }
-    }
-%}

src/ads1x15/javaupm_ads1x15.i

@@ -18,13 +18,4 @@ import upm_interfaces.*;
 %include "ads1015.hpp"
 %include "ads1115.hpp"
 
-%pragma(java) jniclasscode=%{
+JAVA_JNI_LOADLIBRARY(javaupm_ads1x15)
-    static {
-        try {
-            System.loadLibrary("javaupm_ads1x15");
-        } catch (UnsatisfiedLinkError e) {
-            System.err.println("Native code library failed to load. \n" + e);
-            System.exit(1);
-        }
-    }
-%}

src/adxl335/javaupm_adxl335.i

@@ -42,13 +42,4 @@
 
 %include "adxl335.hpp"
 
-%pragma(java) jniclasscode=%{
+JAVA_JNI_LOADLIBRARY(javaupm_adxl335)
-    static {
-        try {
-            System.loadLibrary("javaupm_adxl335");
-        } catch (UnsatisfiedLinkError e) {
-            System.err.println("Native code library failed to load. \n" + e);
-            System.exit(1);
-        }
-    }
-%}

src/adxl345/javaupm_adxl345.i

@@ -35,13 +35,4 @@
 
 %include "adxl345.hpp"
 
-%pragma(java) jniclasscode=%{
+JAVA_JNI_LOADLIBRARY(javaupm_adxl345)
-    static {
-        try {
-            System.loadLibrary("javaupm_adxl345");
-        } catch (UnsatisfiedLinkError e) {
-            System.err.println("Native code library failed to load. \n" + e);
-            System.exit(1);
-        }
-    }
-%}

src/adxrs610/javaupm_adxrs610.i

@@ -7,13 +7,4 @@
 
 %include "adxrs610.hpp"
 
-%pragma(java) jniclasscode=%{
+JAVA_JNI_LOADLIBRARY(javaupm_adxrs610)
-    static {
-        try {
-            System.loadLibrary("javaupm_adxrs610");
-        } catch (UnsatisfiedLinkError e) {
-            System.err.println("Native code library failed to load. \n" + e);
-            System.exit(1);
-        }
-    }
-%}

src/am2315/javaupm_am2315.i

@@ -7,13 +7,4 @@
 
 %include "am2315.hpp"
 
-%pragma(java) jniclasscode=%{
+JAVA_JNI_LOADLIBRARY(javaupm_am2315)
-    static {
-        try {
-            System.loadLibrary("javaupm_am2315");
-        } catch (UnsatisfiedLinkError e) {
-            System.err.println("Native code library failed to load. \n" + e);
-            System.exit(1);
-        }
-    }
-%}

src/apa102/javaupm_apa102.i

@@ -18,13 +18,4 @@
 
 %include "apa102.hpp"
 
-%pragma(java) jniclasscode=%{
+JAVA_JNI_LOADLIBRARY(javaupm_apa102)
-    static {
-        try {
-            System.loadLibrary("javaupm_apa102");
-        } catch (UnsatisfiedLinkError e) {
-            System.err.println("Native code library failed to load. \n" + e);
-            System.exit(1);
-        }
-    }
-%}

src/apds9002/javaupm_apds9002.i

@@ -7,13 +7,4 @@
 
 %include "apds9002.hpp"
 
-%pragma(java) jniclasscode=%{
+JAVA_JNI_LOADLIBRARY(javaupm_apds9002)
-    static {
-        try {
-            System.loadLibrary("javaupm_apds9002");
-        } catch (UnsatisfiedLinkError e) {
-            System.err.println("Native code library failed to load. \n" + e);
-            System.exit(1);
-        }
-    }
-%}

src/apds9930/javaupm_apds9930.i

@@ -6,13 +6,4 @@
 %}
 %include "apds9930.hpp"
 
-%pragma(java) jniclasscode=%{
+JAVA_JNI_LOADLIBRARY(javaupm_apds9930)
-    static {
-        try {
-            System.loadLibrary("javaupm_apds9930");
-        } catch (UnsatisfiedLinkError e) {
-            System.err.println("Native code library failed to load. \n" + e);
-            System.exit(1);
-        }
-    }
-%}

src/at42qt1070/javaupm_at42qt1070.i

@@ -7,13 +7,4 @@
 
 %include "at42qt1070.hpp"
 
-%pragma(java) jniclasscode=%{
+JAVA_JNI_LOADLIBRARY(javaupm_at42qt1070)
-    static {
-        try {
-            System.loadLibrary("javaupm_at42qt1070");
-        } catch (UnsatisfiedLinkError e) {
-            System.err.println("Native code library failed to load. \n" + e);
-            System.exit(1);
-        }
-    }
-%}

src/bacnetmstp/javaupm_bacnetmstp.i

@@ -11,13 +11,4 @@
 %include "bacnetmstp.hpp"
 %include "bacnetutil.hpp"
 
-%pragma(java) jniclasscode=%{
+JAVA_JNI_LOADLIBRARY(javaupm_bacnetmstp)
-    static {
-        try {
-            System.loadLibrary("javaupm_bacnetmstp");
-        } catch (UnsatisfiedLinkError e) {
-            System.err.println("Native code library failed to load. \n" + e);
-            System.exit(1);
-        }
-    }
-%}

src/bh1750/javaupm_bh1750.i

@@ -10,13 +10,4 @@
 %}
 
 
-%pragma(java) jniclasscode=%{
+JAVA_JNI_LOADLIBRARY(javaupm_bh1750)
-    static {
-        try {
-            System.loadLibrary("javaupm_bh1750");
-        } catch (UnsatisfiedLinkError e) {
-            System.err.println("Native code library failed to load. \n" + e);
-            System.exit(1);
-        }
-    }
-%}

src/biss0001/javaupm_biss0001.i

@@ -7,13 +7,4 @@
 
 %include "biss0001.hpp"
 
-%pragma(java) jniclasscode=%{
+JAVA_JNI_LOADLIBRARY(javaupm_biss0001)
-    static {
-        try {
-            System.loadLibrary("javaupm_biss0001");
-        } catch (UnsatisfiedLinkError e) {
-            System.err.println("Native code library failed to load. \n" + e);
-            System.exit(1);
-        }
-    }
-%}

src/bma220/javaupm_bma220.i

@@ -30,13 +30,4 @@
 
 %include "bma220.hpp"
 
-%pragma(java) jniclasscode=%{
+JAVA_JNI_LOADLIBRARY(javaupm_bma220)
-    static {
-        try {
-            System.loadLibrary("javaupm_bma220");
-        } catch (UnsatisfiedLinkError e) {
-            System.err.println("Native code library failed to load. \n" + e);
-            System.exit(1);
-        }
-    }
-%}

src/bma250e/javaupm_bma250e.i

@@ -26,13 +26,4 @@ import java.lang.Float;
     #include "bma250e.hpp"
 %}
 
-%pragma(java) jniclasscode=%{
+JAVA_JNI_LOADLIBRARY(javaupm_bma250e)
-    static {
-        try {
-            System.loadLibrary("javaupm_bma250e");
-        } catch (UnsatisfiedLinkError e) {
-            System.err.println("Native code library failed to load. \n" + e);
-            System.exit(1);
-        }
-    }
-%}

src/bmg160/javaupm_bmg160.i

@@ -26,13 +26,4 @@ import java.lang.Float;
     #include "bmg160.hpp"
 %}
 
-%pragma(java) jniclasscode=%{
+JAVA_JNI_LOADLIBRARY(javaupm_bmg160)
-    static {
-        try {
-            System.loadLibrary("javaupm_bmg160");
-        } catch (UnsatisfiedLinkError e) {
-            System.err.println("Native code library failed to load. \n" + e);
-            System.exit(1);
-        }
-    }
-%}

src/bmi160/javaupm_bmi160.i

@@ -30,13 +30,4 @@
 
 %include "bmi160.hpp"
 
-%pragma(java) jniclasscode=%{
+JAVA_JNI_LOADLIBRARY(javaupm_bmi160)
-    static {
-        try {
-            System.loadLibrary("javaupm_bmi160");
-        } catch (UnsatisfiedLinkError e) {
-            System.err.println("Native code library failed to load. \n" + e);
-            System.exit(1);
-        }
-    }
-%}

src/bmm150/javaupm_bmm150.i

@@ -26,13 +26,4 @@ import java.lang.Float;
     #include "bmm150.hpp"
 %}
 
-%pragma(java) jniclasscode=%{
+JAVA_JNI_LOADLIBRARY(javaupm_bmm150)
-    static {
-        try {
-            System.loadLibrary("javaupm_bmm150");
-        } catch (UnsatisfiedLinkError e) {
-            System.err.println("Native code library failed to load. \n" + e);
-            System.exit(1);
-        }
-    }
-%}

src/bmp280/javaupm_bmp280.i

@@ -26,13 +26,4 @@
     #include "bme280.hpp"
 %}
 
-%pragma(java) jniclasscode=%{
+JAVA_JNI_LOADLIBRARY(javaupm_bmp280)
-    static {
-        try {
-            System.loadLibrary("javaupm_bmp280");
-        } catch (UnsatisfiedLinkError e) {
-            System.err.println("Native code library failed to load. \n" + e);
-            System.exit(1);
-        }
-    }
-%}

src/bmpx8x/javaupm_bmpx8x.i

@@ -15,13 +15,4 @@ import upm_interfaces.*;
 %include "bmpx8x_defs.h"
 %include "bmpx8x.hpp"
 
-%pragma(java) jniclasscode=%{
+JAVA_JNI_LOADLIBRARY(javaupm_bmpx8x)
-    static {
-        try {
-            System.loadLibrary("javaupm_bmpx8x");
-        } catch (UnsatisfiedLinkError e) {
-            System.err.println("Native code library failed to load. \n" + e);
-            System.exit(1);
-        }
-    }
-%}

src/bmx055/javaupm_bmx055.i

@@ -44,13 +44,4 @@ import java.lang.Float;
     #include "bmi055.hpp"
 %}
 
-%pragma(java) jniclasscode=%{
+JAVA_JNI_LOADLIBRARY(javaupm_bmx055)
-    static {
-        try {
-            System.loadLibrary("javaupm_bmx055");
-        } catch (UnsatisfiedLinkError e) {
-            System.err.println("Native code library failed to load. \n" + e);
-            System.exit(1);
-        }
-    }
-%}

src/bno055/javaupm_bno055.i

@@ -24,13 +24,4 @@
     #include "bno055.hpp"
 %}
 
-%pragma(java) jniclasscode=%{
+JAVA_JNI_LOADLIBRARY(javaupm_bno055)
-    static {
-        try {
-            System.loadLibrary("javaupm_bno055");
-        } catch (UnsatisfiedLinkError e) {
-            System.err.println("Native code library failed to load. \n" + e);
-            System.exit(1);
-        }
-    }
-%}

src/button/javaupm_button.i

@@ -9,13 +9,4 @@
 
 %include "button.hpp"
 
-%pragma(java) jniclasscode=%{
+JAVA_JNI_LOADLIBRARY(javaupm_button)
-    static {
-        try {
-            System.loadLibrary("javaupm_button");
-        } catch (UnsatisfiedLinkError e) {
-            System.err.println("Native code library failed to load. \n" + e);
-            System.exit(1);
-        }
-    }
-%}

src/buzzer/javaupm_buzzer.i

@@ -8,13 +8,4 @@
     #include "buzzer.hpp"
 %}
 
-%pragma(java) jniclasscode=%{
+JAVA_JNI_LOADLIBRARY(javaupm_buzzer)
-    static {
-        try {
-            System.loadLibrary("javaupm_buzzer");
-        } catch (UnsatisfiedLinkError e) {
-            System.err.println("Native code library failed to load. \n" + e);
-            System.exit(1);
-        }
-    }
-%}

src/cjq4435/javaupm_cjq4435.i

@@ -7,13 +7,4 @@
 
 %include "cjq4435.hpp"
 
-%pragma(java) jniclasscode=%{
+JAVA_JNI_LOADLIBRARY(javaupm_cjq4435)
-    static {
-        try {
-            System.loadLibrary("javaupm_cjq4435");
-        } catch (UnsatisfiedLinkError e) {
-            System.err.println("Native code library failed to load. \n" + e);
-            System.exit(1);
-        }
-    }
-%}

src/collision/javaupm_collision.i

@@ -7,13 +7,4 @@
 
 %include "collision.hpp"
 
-%pragma(java) jniclasscode=%{
+JAVA_JNI_LOADLIBRARY(javaupm_collision)
-    static {
-        try {
-            System.loadLibrary("javaupm_collision");
-        } catch (UnsatisfiedLinkError e) {
-            System.err.println("Native code library failed to load. \n" + e);
-            System.exit(1);
-        }
-    }
-%}

src/curieimu/javaupm_curieimu.i

@@ -30,13 +30,4 @@
 
 %include "curieimu.hpp"
 
-%pragma(java) jniclasscode=%{
+JAVA_JNI_LOADLIBRARY(javaupm_curieimu)
-    static {
-        try {
-            System.loadLibrary("javaupm_curieimu");
-        } catch (UnsatisfiedLinkError e) {
-            System.err.println("Native code library failed to load. \n" + e);
-            System.exit(1);
-        }
-    }
-%}

src/cwlsxxa/javaupm_cwlsxxa.i

@@ -7,13 +7,4 @@
     #include "cwlsxxa.hpp"
 %}
 
-%pragma(java) jniclasscode=%{
+JAVA_JNI_LOADLIBRARY(javaupm_cwlsxxa)
-    static {
-        try {
-            System.loadLibrary("javaupm_cwlsxxa");
-        } catch (UnsatisfiedLinkError e) {
-            System.err.println("Native code library failed to load. \n" + e);
-            System.exit(1);
-        }
-    }
-%}

src/dfrec/javaupm_dfrec.i

@@ -9,13 +9,4 @@
     #include "dfrec.hpp"
 %}
 
-%pragma(java) jniclasscode=%{
+JAVA_JNI_LOADLIBRARY(javaupm_dfrec)
-    static {
-        try {
-            System.loadLibrary("javaupm_dfrec");
-        } catch (UnsatisfiedLinkError e) {
-            System.err.println("Native code library failed to load. \n" + e);
-            System.exit(1);
-        }
-    }
-%}

src/dfrorp/javaupm_dfrorp.i

@@ -9,13 +9,4 @@
     #include "dfrorp.hpp"
 %}
 
-%pragma(java) jniclasscode=%{
+JAVA_JNI_LOADLIBRARY(javaupm_dfrorp)
-    static {
-        try {
-            System.loadLibrary("javaupm_dfrorp");
-        } catch (UnsatisfiedLinkError e) {
-            System.err.println("Native code library failed to load. \n" + e);
-            System.exit(1);
-        }
-    }
-%}

src/dfrph/javaupm_dfrph.i

@@ -7,13 +7,4 @@
 
 %include "dfrph.hpp"
 
-%pragma(java) jniclasscode=%{
+JAVA_JNI_LOADLIBRARY(javaupm_dfrph)
-    static {
-        try {
-            System.loadLibrary("javaupm_dfrph");
-        } catch (UnsatisfiedLinkError e) {
-            System.err.println("Native code library failed to load. \n" + e);
-            System.exit(1);
-        }
-    }
-%}

src/ds1307/javaupm_ds1307.i

@@ -9,13 +9,4 @@
 
 %include "ds1307.hpp"
 
-%pragma(java) jniclasscode=%{
+JAVA_JNI_LOADLIBRARY(javaupm_ds1307)
-    static {
-        try {
-            System.loadLibrary("javaupm_ds1307");
-        } catch (UnsatisfiedLinkError e) {
-            System.err.println("Native code library failed to load. \n" + e);
-            System.exit(1);
-        }
-    }
-%}

src/ds1808lc/javaupm_ds1808lc.i

@@ -18,13 +18,4 @@ import upm_interfaces.*;
 
 %include "ds1808lc.hpp"
 
-%pragma(java) jniclasscode=%{
+JAVA_JNI_LOADLIBRARY(javaupm_ds1808lc)
-    static {
-        try {
-            System.loadLibrary("javaupm_ds1808lc");
-        } catch (UnsatisfiedLinkError e) {
-            System.err.println("Native code library failed to load. \n" + e);
-            System.exit(1);
-        }
-    }
-%}

src/ds18b20/javaupm_ds18b20.i

@@ -11,13 +11,4 @@
 
 %array_class(char, charArray);
 
-%pragma(java) jniclasscode=%{
+JAVA_JNI_LOADLIBRARY(javaupm_ds18b20)
-    static {
-        try {
-            System.loadLibrary("javaupm_ds18b20");
-        } catch (UnsatisfiedLinkError e) {
-            System.err.println("Native code library failed to load. \n" + e);
-            System.exit(1);
-        }
-    }
-%}

src/ds2413/javaupm_ds2413.i

@@ -10,13 +10,4 @@
 %include "ds2413.hpp"
 %array_class(char, charArray);
 
-%pragma(java) jniclasscode=%{
+JAVA_JNI_LOADLIBRARY(javaupm_ds2413)
-    static {
-        try {
-            System.loadLibrary("javaupm_ds2413");
-        } catch (UnsatisfiedLinkError e) {
-            System.err.println("Native code library failed to load. \n" + e);
-            System.exit(1);
-        }
-    }
-%}

src/e50hx/javaupm_e50hx.i

@@ -22,13 +22,4 @@
 %}
 
 
-%pragma(java) jniclasscode=%{
+JAVA_JNI_LOADLIBRARY(javaupm_e50hx)
-    static {
-        try {
-            System.loadLibrary("javaupm_e50hx");
-        } catch (UnsatisfiedLinkError e) {
-            System.err.println("Native code library failed to load. \n" + e);
-            System.exit(1);
-        }
-    }
-%}

src/ecezo/javaupm_ecezo.i

@@ -10,13 +10,4 @@
     #include "ecezo.hpp"
 %}
 
-%pragma(java) jniclasscode=%{
+JAVA_JNI_LOADLIBRARY(javaupm_ecezo)
-    static {
-        try {
-            System.loadLibrary("javaupm_ecezo");
-        } catch (UnsatisfiedLinkError e) {
-            System.err.println("Native code library failed to load. \n" + e);
-            System.exit(1);
-        }
-    }
-%}

src/ecs1030/javaupm_ecs1030.i

@@ -7,13 +7,4 @@
 
 %include "ecs1030.hpp"
 
-%pragma(java) jniclasscode=%{
+JAVA_JNI_LOADLIBRARY(javaupm_ecs1030)
-    static {
-        try {
-            System.loadLibrary("javaupm_ecs1030");
-        } catch (UnsatisfiedLinkError e) {
-            System.err.println("Native code library failed to load. \n" + e);
-            System.exit(1);
-        }
-    }
-%}

src/ehr/javaupm_ehr.i

@@ -9,13 +9,4 @@
 
 %include "ehr.hpp"
 
-%pragma(java) jniclasscode=%{
+JAVA_JNI_LOADLIBRARY(javaupm_ehr)
-    static {
-        try {
-            System.loadLibrary("javaupm_ehr");
-        } catch (UnsatisfiedLinkError e) {
-            System.err.println("Native code library failed to load. \n" + e);
-            System.exit(1);
-        }
-    }
-%}

src/eldriver/javaupm_eldriver.i

@@ -7,13 +7,4 @@
 
 %include "eldriver.hpp"
 
-%pragma(java) jniclasscode=%{
+JAVA_JNI_LOADLIBRARY(javaupm_eldriver)
-    static {
-        try {
-            System.loadLibrary("javaupm_eldriver");
-        } catch (UnsatisfiedLinkError e) {
-            System.err.println("Native code library failed to load. \n" + e);
-            System.exit(1);
-        }
-    }
-%}

src/electromagnet/javaupm_electromagnet.i

@@ -7,13 +7,4 @@
 
 %include "electromagnet.hpp"
 
-%pragma(java) jniclasscode=%{
+JAVA_JNI_LOADLIBRARY(javaupm_electromagnet)
-    static {
-        try {
-            System.loadLibrary("javaupm_electromagnet");
-        } catch (UnsatisfiedLinkError e) {
-            System.err.println("Native code library failed to load. \n" + e);
-            System.exit(1);
-        }
-    }
-%}

src/emg/javaupm_emg.i

@@ -7,13 +7,4 @@
 
 %include "emg.hpp"
 
-%pragma(java) jniclasscode=%{
+JAVA_JNI_LOADLIBRARY(javaupm_emg)
-    static {
-        try {
-            System.loadLibrary("javaupm_emg");
-        } catch (UnsatisfiedLinkError e) {
-            System.err.println("Native code library failed to load. \n" + e);
-            System.exit(1);
-        }
-    }
-%}

src/enc03r/javaupm_enc03r.i

@@ -7,13 +7,4 @@
 
 %include "enc03r.hpp"
 
-%pragma(java) jniclasscode=%{
+JAVA_JNI_LOADLIBRARY(javaupm_enc03r)
-    static {
-        try {
-            System.loadLibrary("javaupm_enc03r");
-        } catch (UnsatisfiedLinkError e) {
-            System.err.println("Native code library failed to load. \n" + e);
-            System.exit(1);
-        }
-    }
-%}

src/flex/javaupm_flex.i

@@ -7,13 +7,4 @@
 
 %include "flex.hpp"
 
-%pragma(java) jniclasscode=%{
+JAVA_JNI_LOADLIBRARY(javaupm_flex)
-    static {
-        try {
-            System.loadLibrary("javaupm_flex");
-        } catch (UnsatisfiedLinkError e) {
-            System.err.println("Native code library failed to load. \n" + e);
-            System.exit(1);
-        }
-    }
-%}

src/gas/javaupm_gas.i

@@ -56,13 +56,4 @@
 %include "mq9.hpp"
 %include "tp401.hpp"
 
-%pragma(java) jniclasscode=%{
+JAVA_JNI_LOADLIBRARY(javaupm_gas)
-    static {
-        try {
-            System.loadLibrary("javaupm_gas");
-        } catch (UnsatisfiedLinkError e) {
-            System.err.println("Native code library failed to load. \n" + e);
-            System.exit(1);
-        }
-    }
-%}

src/gp2y0a/javaupm_gp2y0a.i

@@ -7,13 +7,4 @@
 
 %include "gp2y0a.hpp"
 
-%pragma(java) jniclasscode=%{
+JAVA_JNI_LOADLIBRARY(javaupm_gp2y0a)
-    static {
-        try {
-            System.loadLibrary("javaupm_gp2y0a");
-        } catch (UnsatisfiedLinkError e) {
-            System.err.println("Native code library failed to load. \n" + e);
-            System.exit(1);
-        }
-    }
-%}

src/gprs/javaupm_gprs.i

@@ -10,13 +10,4 @@
 %include "gprs.hpp"
 %array_class(char, charArray);
 
-%pragma(java) jniclasscode=%{
+JAVA_JNI_LOADLIBRARY(javaupm_gprs)
-    static {
-        try {
-            System.loadLibrary("javaupm_gprs");
-        } catch (UnsatisfiedLinkError e) {
-            System.err.println("Native code library failed to load. \n" + e);
-            System.exit(1);
-        }
-    }
-%}

src/grove/javaupm_grove.i

@@ -49,13 +49,4 @@
     #include "grovetemp.hpp"
 %}
 
-%pragma(java) jniclasscode=%{
+JAVA_JNI_LOADLIBRARY(javaupm_grove)
-    static {
-        try {
-            System.loadLibrary("javaupm_grove");
-        } catch (UnsatisfiedLinkError e) {
-            System.err.println("Native code library failed to load. \n" + e);
-            System.exit(1);
-        }
-    }
-%}

src/grovecollision/javaupm_grovecollision.i

@@ -7,13 +7,4 @@
 
 %include "grovecollision.hpp"
 
-%pragma(java) jniclasscode=%{
+JAVA_JNI_LOADLIBRARY(javaupm_grovecollision)
-    static {
-        try {
-            System.loadLibrary("javaupm_grovecollision");
-        } catch (UnsatisfiedLinkError e) {
-            System.err.println("Native code library failed to load. \n" + e);
-            System.exit(1);
-        }
-    }
-%}

src/groveehr/javaupm_groveehr.i

@@ -9,13 +9,4 @@
 
 %include "groveehr.hpp"
 
-%pragma(java) jniclasscode=%{
+JAVA_JNI_LOADLIBRARY(javaupm_groveehr)
-    static {
-        try {
-            System.loadLibrary("javaupm_groveehr");
-        } catch (UnsatisfiedLinkError e) {
-            System.err.println("Native code library failed to load. \n" + e);
-            System.exit(1);
-        }
-    }
-%}

src/groveeldriver/javaupm_groveeldriver.i

@@ -7,13 +7,4 @@
 
 %include "groveeldriver.hpp"
 
-%pragma(java) jniclasscode=%{
+JAVA_JNI_LOADLIBRARY(javaupm_groveeldriver)
-    static {
-        try {
-            System.loadLibrary("javaupm_groveeldriver");
-        } catch (UnsatisfiedLinkError e) {
-            System.err.println("Native code library failed to load. \n" + e);
-            System.exit(1);
-        }
-    }
-%}

src/groveelectromagnet/javaupm_groveelectromagnet.i

@@ -7,13 +7,4 @@
 
 %include "groveelectromagnet.hpp"
 
-%pragma(java) jniclasscode=%{
+JAVA_JNI_LOADLIBRARY(javaupm_groveelectromagnet)
-    static {
-        try {
-            System.loadLibrary("javaupm_groveelectromagnet");
-        } catch (UnsatisfiedLinkError e) {
-            System.err.println("Native code library failed to load. \n" + e);
-            System.exit(1);
-        }
-    }
-%}

src/groveemg/javaupm_groveemg.i

@@ -7,13 +7,4 @@
 
 %include "groveemg.hpp"
 
-%pragma(java) jniclasscode=%{
+JAVA_JNI_LOADLIBRARY(javaupm_groveemg)
-    static {
-        try {
-            System.loadLibrary("javaupm_groveemg");
-        } catch (UnsatisfiedLinkError e) {
-            System.err.println("Native code library failed to load. \n" + e);
-            System.exit(1);
-        }
-    }
-%}

src/grovegprs/javaupm_grovegprs.i

@@ -10,13 +10,4 @@
 %include "grovegprs.hpp"
 %array_class(char, charArray);
 
-%pragma(java) jniclasscode=%{
+JAVA_JNI_LOADLIBRARY(javaupm_grovegprs)
-    static {
-        try {
-            System.loadLibrary("javaupm_grovegprs");
-        } catch (UnsatisfiedLinkError e) {
-            System.err.println("Native code library failed to load. \n" + e);
-            System.exit(1);
-        }
-    }
-%}

src/grovegsr/javaupm_grovegsr.i

@@ -7,13 +7,4 @@
 
 %include "grovegsr.hpp"
 
-%pragma(java) jniclasscode=%{
+JAVA_JNI_LOADLIBRARY(javaupm_grovegsr)
-    static {
-        try {
-            System.loadLibrary("javaupm_grovegsr");
-        } catch (UnsatisfiedLinkError e) {
-            System.err.println("Native code library failed to load. \n" + e);
-            System.exit(1);
-        }
-    }
-%}

src/grovelinefinder/javaupm_grovelinefinder.i

@@ -7,13 +7,4 @@
 
 %include "grovelinefinder.hpp"
 
-%pragma(java) jniclasscode=%{
+JAVA_JNI_LOADLIBRARY(javaupm_grovelinefinder)
-    static {
-        try {
-            System.loadLibrary("javaupm_grovelinefinder");
-        } catch (UnsatisfiedLinkError e) {
-            System.err.println("Native code library failed to load. \n" + e);
-            System.exit(1);
-        }
-    }
-%}

src/grovemd/javaupm_grovemd.i

@@ -7,13 +7,4 @@
 
 %include "grovemd.hpp"
 
-%pragma(java) jniclasscode=%{
+JAVA_JNI_LOADLIBRARY(javaupm_grovemd)
-    static {
-        try {
-            System.loadLibrary("javaupm_grovemd");
-        } catch (UnsatisfiedLinkError e) {
-            System.err.println("Native code library failed to load. \n" + e);
-            System.exit(1);
-        }
-    }
-%}

src/grovemoisture/javaupm_grovemoisture.i

@@ -7,13 +7,4 @@
 
 %include "grovemoisture.hpp"
 
-%pragma(java) jniclasscode=%{
+JAVA_JNI_LOADLIBRARY(javaupm_grovemoisture)
-    static {
-        try {
-            System.loadLibrary("javaupm_grovemoisture");
-        } catch (UnsatisfiedLinkError e) {
-            System.err.println("Native code library failed to load. \n" + e);
-            System.exit(1);
-        }
-    }
-%}

src/groveo2/javaupm_groveo2.i

@@ -7,13 +7,4 @@
 
 %include "groveo2.hpp"
 
-%pragma(java) jniclasscode=%{
+JAVA_JNI_LOADLIBRARY(javaupm_groveo2)
-    static {
-        try {
-            System.loadLibrary("javaupm_groveo2");
-        } catch (UnsatisfiedLinkError e) {
-            System.err.println("Native code library failed to load. \n" + e);
-            System.exit(1);
-        }
-    }
-%}

src/grovescam/javaupm_grovescam.i

@@ -8,13 +8,4 @@
 
 %include "grovescam.hpp"
 
-%pragma(java) jniclasscode=%{
+JAVA_JNI_LOADLIBRARY(javaupm_grovescam)
-    static {
-        try {
-            System.loadLibrary("javaupm_grovescam");
-        } catch (UnsatisfiedLinkError e) {
-            System.err.println("Native code library failed to load. \n" + e);
-            System.exit(1);
-        }
-    }
-%}

src/grovespeaker/javaupm_grovespeaker.i

@@ -7,13 +7,4 @@
 
 %include "grovespeaker.hpp"
 
-%pragma(java) jniclasscode=%{
+JAVA_JNI_LOADLIBRARY(javaupm_grovespeaker)
-    static {
-        try {
-            System.loadLibrary("javaupm_grovespeaker");
-        } catch (UnsatisfiedLinkError e) {
-            System.err.println("Native code library failed to load. \n" + e);
-            System.exit(1);
-        }
-    }
-%}

src/groveultrasonic/javaupm_groveultrasonic.i

@@ -9,13 +9,4 @@
 
 %include "groveultrasonic.hpp"
 
-%pragma(java) jniclasscode=%{
+JAVA_JNI_LOADLIBRARY(javaupm_groveultrasonic)
-    static {
-        try {
-            System.loadLibrary("javaupm_groveultrasonic");
-        } catch (UnsatisfiedLinkError e) {
-            System.err.println("Native code library failed to load. \n" + e);
-            System.exit(1);
-        }
-    }
-%}

src/grovevdiv/javaupm_grovevdiv.i

@@ -7,13 +7,4 @@
 
 %include "grovevdiv.hpp"
 
-%pragma(java) jniclasscode=%{
+JAVA_JNI_LOADLIBRARY(javaupm_grovevdiv)
-    static {
-        try {
-            System.loadLibrary("javaupm_grovevdiv");
-        } catch (UnsatisfiedLinkError e) {
-            System.err.println("Native code library failed to load. \n" + e);
-            System.exit(1);
-        }
-    }
-%}

src/grovewater/javaupm_grovewater.i

@@ -7,13 +7,4 @@
 
 %include "grovewater.hpp"
 
-%pragma(java) jniclasscode=%{
+JAVA_JNI_LOADLIBRARY(javaupm_grovewater)
-    static {
-        try {
-            System.loadLibrary("javaupm_grovewater");
-        } catch (UnsatisfiedLinkError e) {
-            System.err.println("Native code library failed to load. \n" + e);
-            System.exit(1);
-        }
-    }
-%}

src/grovewfs/javaupm_grovewfs.i

@@ -9,13 +9,4 @@
 
 %include "grovewfs.hpp"
 
-%pragma(java) jniclasscode=%{
+JAVA_JNI_LOADLIBRARY(javaupm_grovewfs)
-    static {
-        try {
-            System.loadLibrary("javaupm_grovewfs");
-        } catch (UnsatisfiedLinkError e) {
-            System.err.println("Native code library failed to load. \n" + e);
-            System.exit(1);
-        }
-    }
-%}

src/gsr/javaupm_gsr.i

@@ -7,13 +7,4 @@
 
 %include "gsr.hpp"
 
-%pragma(java) jniclasscode=%{
+JAVA_JNI_LOADLIBRARY(javaupm_gsr)
-    static {
-        try {
-            System.loadLibrary("javaupm_gsr");
-        } catch (UnsatisfiedLinkError e) {
-            System.err.println("Native code library failed to load. \n" + e);
-            System.exit(1);
-        }
-    }
-%}

src/guvas12d/javaupm_guvas12d.i

@@ -7,13 +7,4 @@
 
 %include "guvas12d.hpp"
 
-%pragma(java) jniclasscode=%{
+JAVA_JNI_LOADLIBRARY(javaupm_guvas12d)
-    static {
-        try {
-            System.loadLibrary("javaupm_guvas12d");
-        } catch (UnsatisfiedLinkError e) {
-            System.err.println("Native code library failed to load. \n" + e);
-            System.exit(1);
-        }
-    }
-%}

src/h3lis331dl/javaupm_h3lis331dl.i

@@ -50,13 +50,4 @@
 
 %include "h3lis331dl.hpp"
 
-%pragma(java) jniclasscode=%{
+JAVA_JNI_LOADLIBRARY(javaupm_h3lis331dl)
-    static {
-        try {
-            System.loadLibrary("javaupm_h3lis331dl");
-        } catch (UnsatisfiedLinkError e) {
-            System.err.println("Native code library failed to load. \n" + e);
-            System.exit(1);
-        }
-    }
-%}

src/h803x/javaupm_h803x.i

@@ -8,13 +8,4 @@
 
 %include "h803x.hpp"
 
-%pragma(java) jniclasscode=%{
+JAVA_JNI_LOADLIBRARY(javaupm_h803x)
-    static {
-        try {
-            System.loadLibrary("javaupm_h803x");
-        } catch (UnsatisfiedLinkError e) {
-            System.err.println("Native code library failed to load. \n" + e);
-            System.exit(1);
-        }
-    }
-%}

src/hcsr04/javaupm_hcsr04.i

@@ -8,14 +8,5 @@
 %include "hcsr04.h"
 %include "hcsr04.hpp"
 
-%pragma(java) jniclasscode=%{
+JAVA_JNI_LOADLIBRARY(javaupm_hcsr04)
-    static {
-        try {
-            System.loadLibrary("javaupm_hcsr04");
-        } catch (UnsatisfiedLinkError e) {
-            System.err.println("Native code library failed to load. \n" + e);
-            System.exit(1);
-        }
-    }
-%}
 

src/hdc1000/javaupm_hdc1000.i

@@ -7,13 +7,4 @@
 
 %include "hdc1000.hpp"
 
-%pragma(java) jniclasscode=%{
+JAVA_JNI_LOADLIBRARY(javaupm_hdc1000)
-    static {
-        try {
-            System.loadLibrary("javaupm_hdc1000");
-        } catch (UnsatisfiedLinkError e) {
-            System.err.println("Native code library failed to load. \n" + e);
-            System.exit(1);
-        }
-    }
-%}

src/hdxxvxta/javaupm_hdxxvxta.i

@@ -9,13 +9,4 @@
 %include "hdxxvxta.hpp"
 
 
-%pragma(java) jniclasscode=%{
+JAVA_JNI_LOADLIBRARY(javaupm_hdxxvxta)
-    static {
-        try {
-            System.loadLibrary("javaupm_hdxxvxta");
-        } catch (UnsatisfiedLinkError e) {
-            System.err.println("Native code library failed to load. \n" + e);
-            System.exit(1);
-        }
-    }
-%}

src/hka5/javaupm_hka5.i

@@ -9,13 +9,4 @@
     #include "hka5.hpp"
 %}
 
-%pragma(java) jniclasscode=%{
+JAVA_JNI_LOADLIBRARY(javaupm_hka5)
-    static {
-        try {
-            System.loadLibrary("javaupm_hka5");
-        } catch (UnsatisfiedLinkError e) {
-            System.err.println("Native code library failed to load. \n" + e);
-            System.exit(1);
-        }
-    }
-%}

src/hlg150h/javaupm_hlg150h.i

@@ -18,13 +18,4 @@ import upm_interfaces.*;
 
 %include "hlg150h.hpp"
 
-%pragma(java) jniclasscode=%{
+JAVA_JNI_LOADLIBRARY(javaupm_hlg150h)
-    static {
-        try {
-            System.loadLibrary("javaupm_hlg150h");
-        } catch (UnsatisfiedLinkError e) {
-            System.err.println("Native code library failed to load. \n" + e);
-            System.exit(1);
-        }
-    }
-%}

src/hm11/javaupm_hm11.i

@@ -12,13 +12,4 @@
 speed_t int_B9600 = B9600;
 %array_class(char, charArray);
 
-%pragma(java) jniclasscode=%{
+JAVA_JNI_LOADLIBRARY(javaupm_hm11)
-    static {
-        try {
-            System.loadLibrary("javaupm_hm11");
-        } catch (UnsatisfiedLinkError e) {
-            System.err.println("Native code library failed to load. \n" + e);
-            System.exit(1);
-        }
-    }
-%}

src/hmc5883l/javaupm_hmc5883l.i

@@ -20,13 +20,4 @@
 
 %include "hmc5883l.hpp"
 
-%pragma(java) jniclasscode=%{
+JAVA_JNI_LOADLIBRARY(javaupm_hmc5883l)
-    static {
-        try {
-            System.loadLibrary("javaupm_hmc5883l");
-        } catch (UnsatisfiedLinkError e) {
-            System.err.println("Native code library failed to load. \n" + e);
-            System.exit(1);
-        }
-    }
-%}

src/hmtrp/javaupm_hmtrp.i

@@ -25,13 +25,4 @@ READDATA_EXCEPTION(getModSignalStrength())
 %include "hmtrp.hpp"
 speed_t int_B9600 = B9600;
 
-%pragma(java) jniclasscode=%{
+JAVA_JNI_LOADLIBRARY(javaupm_hmtrp)
-    static {
-        try {
-            System.loadLibrary("javaupm_hmtrp");
-        } catch (UnsatisfiedLinkError e) {
-            System.err.println("Native code library failed to load. \n" + e);
-            System.exit(1);
-        }
-    }
-%}

src/hp20x/javaupm_hp20x.i

@@ -7,13 +7,4 @@
 
 %include "hp20x.hpp"
 
-%pragma(java) jniclasscode=%{
+JAVA_JNI_LOADLIBRARY(javaupm_hp20x)
-    static {
-        try {
-            System.loadLibrary("javaupm_hp20x");
-        } catch (UnsatisfiedLinkError e) {
-            System.err.println("Native code library failed to load. \n" + e);
-            System.exit(1);
-        }
-    }
-%}

src/ht9170/javaupm_ht9170.i

@@ -7,13 +7,4 @@
 
 %include "ht9170.hpp"
 
-%pragma(java) jniclasscode=%{
+JAVA_JNI_LOADLIBRARY(javaupm_ht9170)
-    static {
-        try {
-            System.loadLibrary("javaupm_ht9170");
-        } catch (UnsatisfiedLinkError e) {
-            System.err.println("Native code library failed to load. \n" + e);
-            System.exit(1);
-        }
-    }
-%}

src/htu21d/javaupm_htu21d.i

@@ -9,13 +9,4 @@
 %}
 %include "htu21d.hpp"
 
-%pragma(java) jniclasscode=%{
+JAVA_JNI_LOADLIBRARY(javaupm_htu21d)
-    static {
-        try {
-            System.loadLibrary("javaupm_htu21d");
-        } catch (UnsatisfiedLinkError e) {
-            System.err.println("Native code library failed to load. \n" + e);
-            System.exit(1);
-        }
-    }
-%}

src/hwxpxx/javaupm_hwxpxx.i

@@ -8,13 +8,4 @@
 
 %include "hwxpxx.hpp"
 
-%pragma(java) jniclasscode=%{
+JAVA_JNI_LOADLIBRARY(javaupm_hwxpxx)
-    static {
-        try {
-            System.loadLibrary("javaupm_hwxpxx");
-        } catch (UnsatisfiedLinkError e) {
-            System.err.println("Native code library failed to load. \n" + e);
-            System.exit(1);
-        }
-    }
-%}

src/hx711/javaupm_hx711.i

@@ -7,13 +7,4 @@
 
 %include "hx711.hpp"
 
-%pragma(java) jniclasscode=%{
+JAVA_JNI_LOADLIBRARY(javaupm_hx711)
-    static {
-        try {
-            System.loadLibrary("javaupm_hx711");
-        } catch (UnsatisfiedLinkError e) {
-            System.err.println("Native code library failed to load. \n" + e);
-            System.exit(1);
-        }
-    }
-%}

src/ili9341/javaupm_ili9341.i

@@ -16,13 +16,4 @@
 
 %include "ili9341.hpp"
 
-%pragma(java) jniclasscode=%{
+JAVA_JNI_LOADLIBRARY(javaupm_ili9341)
-    static {
-        try {
-            System.loadLibrary("javaupm_ili9341");
-        } catch (UnsatisfiedLinkError e) {
-            System.err.println("Native code library failed to load. \n" + e);
-            System.exit(1);
-        }
-    }
-%}

src/ims/javaupm_ims.i

@@ -8,13 +8,4 @@
 %include "ims_defs.h"
 %include "ims.hpp"
 
-%pragma(java) jniclasscode=%{
+JAVA_JNI_LOADLIBRARY(javaupm_ims)
-    static {
-        try {
-            System.loadLibrary("javaupm_ims");
-        } catch (UnsatisfiedLinkError e) {
-            System.err.println("Native code library failed to load. \n" + e);
-            System.exit(1);
-        }
-    }
-%}

src/ina132/javaupm_ina132.i

@@ -7,13 +7,4 @@
 
 %include "ina132.hpp"
 
-%pragma(java) jniclasscode=%{
+JAVA_JNI_LOADLIBRARY(javaupm_ina132)
-    static {
-        try {
-            System.loadLibrary("javaupm_ina132");
-        } catch (UnsatisfiedLinkError e) {
-            System.err.println("Native code library failed to load. \n" + e);
-            System.exit(1);
-        }
-    }
-%}

src/interfaces/javaupm_interfaces.i

@@ -10,13 +10,4 @@
 %include javaupm_iTemperatureSensor.i
 
 
-%pragma(java) jniclasscode=%{
+JAVA_JNI_LOADLIBRARY(javaupm_interfaces)
-    static {
-        try {
-            System.loadLibrary("javaupm_interfaces");
-        } catch (UnsatisfiedLinkError e) {
-            System.err.println("Native code library failed to load. \n" + e);
-            System.exit(1);
-        }
-    }
-%}

src/isd1820/javaupm_isd1820.i

@@ -8,13 +8,4 @@
 %include "isd1820.hpp"
 
 
-%pragma(java) jniclasscode=%{
+JAVA_JNI_LOADLIBRARY(javaupm_isd1820)
-    static {
-        try {
-            System.loadLibrary("javaupm_isd1820");
-        } catch (UnsatisfiedLinkError e) {
-            System.err.println("Native code library failed to load. \n" + e);
-            System.exit(1);
-        }
-    }
-%}

src/itg3200/javaupm_itg3200.i

@@ -34,13 +34,4 @@
 
 %include "itg3200.hpp"
 
-%pragma(java) jniclasscode=%{
+JAVA_JNI_LOADLIBRARY(javaupm_itg3200)
-    static {
-        try {
-            System.loadLibrary("javaupm_itg3200");
-        } catch (UnsatisfiedLinkError e) {
-            System.err.println("Native code library failed to load. \n" + e);
-            System.exit(1);
-        }
-    }
-%}

src/jhd1313m1/javaupm_jhd1313m1.i

@@ -11,13 +11,4 @@
     #include "jhd1313m1.hpp"
 %}
 
-%pragma(java) jniclasscode=%{
+JAVA_JNI_LOADLIBRARY(javaupm_jhd1313m1)
-    static {
-        try {
-            System.loadLibrary("javaupm_jhd1313m1");
-        } catch (UnsatisfiedLinkError e) {
-            System.err.println("Native code library failed to load. \n" + e);
-            System.exit(1);
-        }
-    }
-%}

src/joystick12/javaupm_joystick12.i

@@ -7,13 +7,4 @@
 
 %include "joystick12.hpp"
 
-%pragma(java) jniclasscode=%{
+JAVA_JNI_LOADLIBRARY(javaupm_joystick12)
-    static {
-        try {
-            System.loadLibrary("javaupm_joystick12");
-        } catch (UnsatisfiedLinkError e) {
-            System.err.println("Native code library failed to load. \n" + e);
-            System.exit(1);
-        }
-    }
-%}

src/l298/javaupm_l298.i

@@ -7,13 +7,4 @@
 
 %include "l298.hpp"
 
-%pragma(java) jniclasscode=%{
+JAVA_JNI_LOADLIBRARY(javaupm_l298)
-    static {
-        try {
-            System.loadLibrary("javaupm_l298");
-        } catch (UnsatisfiedLinkError e) {
-            System.err.println("Native code library failed to load. \n" + e);
-            System.exit(1);
-        }
-    }
-%}

src/lcd/javaupm_i2clcd.i

@@ -38,13 +38,4 @@
 %include "ssd1306.hpp"
 %include "eboled.hpp"
 
-%pragma(java) jniclasscode=%{
+JAVA_JNI_LOADLIBRARY(javaupm_i2clcd)
-    static {
-        try {
-            System.loadLibrary("javaupm_i2clcd");
-        } catch (UnsatisfiedLinkError e) {
-            System.err.println("Native code library failed to load. \n" + e);
-            System.exit(1);
-        }
-    }
-%}

src/lcdks/javaupm_lcdks.i

@@ -11,13 +11,4 @@
     #include "lcdks.hpp"
 %}
 
-%pragma(java) jniclasscode=%{
+JAVA_JNI_LOADLIBRARY(javaupm_lcdks)
-    static {
-        try {
-            System.loadLibrary("javaupm_lcdks");
-        } catch (UnsatisfiedLinkError e) {
-            System.err.println("Native code library failed to load. \n" + e);
-            System.exit(1);
-        }
-    }
-%}

src/lcm1602/javaupm_lcm1602.i

@@ -11,13 +11,4 @@
     #include "lcm1602.hpp"
 %}
 
-%pragma(java) jniclasscode=%{
+JAVA_JNI_LOADLIBRARY(javaupm_lcm1602)
-    static {
-        try {
-            System.loadLibrary("javaupm_lcm1602");
-        } catch (UnsatisfiedLinkError e) {
-            System.err.println("Native code library failed to load. \n" + e);
-            System.exit(1);
-        }
-    }
-%}