From 8c5c9e9c2dbcc3876128bb06db52e82fa211b76c Mon Sep 17 00:00:00 2001
From: Philipp Spohr <spohr.philipp@web.de>
Date: Sun, 6 Aug 2017 16:41:04 +0200
Subject: [PATCH] Added JNI java-side
---
.../ba/yoshikoWrapper/core/YoshikoInterface.java | 2 +-
.../ba/yoshikoWrapper/swig/LibraryInterface.java | 16 ++++++++++++++++
.../swig/LibraryInterfaceConstants.java | 13 +++++++++++++
.../yoshikoWrapper/swig/LibraryInterfaceJNI.java | 14 ++++++++++++++
.../hhu/ba/yoshikoWrapper/swig/package-info.java | 5 +++++
5 files changed, 49 insertions(+), 1 deletion(-)
create mode 100644 src/main/java/de/hhu/ba/yoshikoWrapper/swig/LibraryInterface.java
create mode 100644 src/main/java/de/hhu/ba/yoshikoWrapper/swig/LibraryInterfaceConstants.java
create mode 100644 src/main/java/de/hhu/ba/yoshikoWrapper/swig/LibraryInterfaceJNI.java
create mode 100644 src/main/java/de/hhu/ba/yoshikoWrapper/swig/package-info.java
diff --git a/src/main/java/de/hhu/ba/yoshikoWrapper/core/YoshikoInterface.java b/src/main/java/de/hhu/ba/yoshikoWrapper/core/YoshikoInterface.java
index 736716d..1fa5855 100644
--- a/src/main/java/de/hhu/ba/yoshikoWrapper/core/YoshikoInterface.java
+++ b/src/main/java/de/hhu/ba/yoshikoWrapper/core/YoshikoInterface.java
@@ -21,7 +21,7 @@ public class YoshikoInterface {
public void loadLibrary(String libPath) {
try {
- System.loadLibrary(libPath);
+ System.load(libPath);
libraryLoaded = true;
}
catch(Exception e) {
diff --git a/src/main/java/de/hhu/ba/yoshikoWrapper/swig/LibraryInterface.java b/src/main/java/de/hhu/ba/yoshikoWrapper/swig/LibraryInterface.java
new file mode 100644
index 0000000..fe8185a
--- /dev/null
+++ b/src/main/java/de/hhu/ba/yoshikoWrapper/swig/LibraryInterface.java
@@ -0,0 +1,16 @@
+/* ----------------------------------------------------------------------------
+ * This file was automatically generated by SWIG (http://www.swig.org).
+ * Version 3.0.8
+ *
+ * Do not make changes to this file unless you know what you are doing--modify
+ * the SWIG interface file instead.
+ * ----------------------------------------------------------------------------- */
+
+package de.hhu.ba.yoshikoWrapper.swig;
+
+public class LibraryInterface implements LibraryInterfaceConstants {
+ public static String getVersionString() {
+ return LibraryInterfaceJNI.getVersionString();
+ }
+
+}
diff --git a/src/main/java/de/hhu/ba/yoshikoWrapper/swig/LibraryInterfaceConstants.java b/src/main/java/de/hhu/ba/yoshikoWrapper/swig/LibraryInterfaceConstants.java
new file mode 100644
index 0000000..2f4b3fd
--- /dev/null
+++ b/src/main/java/de/hhu/ba/yoshikoWrapper/swig/LibraryInterfaceConstants.java
@@ -0,0 +1,13 @@
+/* ----------------------------------------------------------------------------
+ * This file was automatically generated by SWIG (http://www.swig.org).
+ * Version 3.0.8
+ *
+ * Do not make changes to this file unless you know what you are doing--modify
+ * the SWIG interface file instead.
+ * ----------------------------------------------------------------------------- */
+
+package de.hhu.ba.yoshikoWrapper.swig;
+
+public interface LibraryInterfaceConstants {
+ public final static String YOSHIKO_VERSION = LibraryInterfaceJNI.YOSHIKO_VERSION_get();
+}
diff --git a/src/main/java/de/hhu/ba/yoshikoWrapper/swig/LibraryInterfaceJNI.java b/src/main/java/de/hhu/ba/yoshikoWrapper/swig/LibraryInterfaceJNI.java
new file mode 100644
index 0000000..c451b04
--- /dev/null
+++ b/src/main/java/de/hhu/ba/yoshikoWrapper/swig/LibraryInterfaceJNI.java
@@ -0,0 +1,14 @@
+/* ----------------------------------------------------------------------------
+ * This file was automatically generated by SWIG (http://www.swig.org).
+ * Version 3.0.8
+ *
+ * Do not make changes to this file unless you know what you are doing--modify
+ * the SWIG interface file instead.
+ * ----------------------------------------------------------------------------- */
+
+package de.hhu.ba.yoshikoWrapper.swig;
+
+public class LibraryInterfaceJNI {
+ public final static native String YOSHIKO_VERSION_get();
+ public final static native String getVersionString();
+}
diff --git a/src/main/java/de/hhu/ba/yoshikoWrapper/swig/package-info.java b/src/main/java/de/hhu/ba/yoshikoWrapper/swig/package-info.java
new file mode 100644
index 0000000..43df405
--- /dev/null
+++ b/src/main/java/de/hhu/ba/yoshikoWrapper/swig/package-info.java
@@ -0,0 +1,5 @@
+/**
+ * @author Philipp Spohr, Aug 6, 2017
+ *
+ */
+package de.hhu.ba.yoshikoWrapper.swig;
\ No newline at end of file
--
GitLab