summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTor Andersson <tor.andersson@artifex.com>2016-02-22 14:58:33 +0100
committerTor Andersson <tor.andersson@artifex.com>2016-02-29 16:03:34 +0100
commite45a2f494d0a4f7e11c544d2098b0f5d1d199e58 (patch)
treef8516071dafdf758ff00237b9af7375d3c3f6d76
parenta6e15a6c904f700543429d94c703a4d1911e1ac2 (diff)
downloadmupdf-e45a2f494d0a4f7e11c544d2098b0f5d1d199e58.tar.xz
jni: Move java bindings to platform/java.
Move the platform independent java code from platform/android to platform/java. The plan is that we can call 'make mupdf.jar' (or 'nmake mupdf.jar') there, and then use the resultant mupdf.jar/mupdf_native.h files in whatever platform specific project (such as the android bindings) we like. Keep the android specific class (AndroidDrawDevice) in the usual place in platform/android. Update the android ant script to include mupdf.jar.
-rw-r--r--platform/java/com/artifex/mupdf/fitz/Annotation.java (renamed from platform/android/src/com/artifex/mupdf/fitz/Annotation.java)0
-rw-r--r--platform/java/com/artifex/mupdf/fitz/AwtDrawDevice.java (renamed from platform/android/src/com/artifex/mupdf/fitz/AwtDrawDevice.java)0
-rw-r--r--platform/java/com/artifex/mupdf/fitz/CDevice.java (renamed from platform/android/src/com/artifex/mupdf/fitz/CDevice.java)0
-rw-r--r--platform/java/com/artifex/mupdf/fitz/ColorSpace.java (renamed from platform/android/src/com/artifex/mupdf/fitz/ColorSpace.java)0
-rw-r--r--platform/java/com/artifex/mupdf/fitz/Context.java (renamed from platform/android/src/com/artifex/mupdf/fitz/Context.java)0
-rw-r--r--platform/java/com/artifex/mupdf/fitz/Cookie.java (renamed from platform/android/src/com/artifex/mupdf/fitz/Cookie.java)2
-rw-r--r--platform/java/com/artifex/mupdf/fitz/Device.java (renamed from platform/android/src/com/artifex/mupdf/fitz/Device.java)0
-rw-r--r--platform/java/com/artifex/mupdf/fitz/DisplayList.java (renamed from platform/android/src/com/artifex/mupdf/fitz/DisplayList.java)0
-rw-r--r--platform/java/com/artifex/mupdf/fitz/DisplayListDevice.java (renamed from platform/android/src/com/artifex/mupdf/fitz/DisplayListDevice.java)0
-rw-r--r--platform/java/com/artifex/mupdf/fitz/Document.java (renamed from platform/android/src/com/artifex/mupdf/fitz/Document.java)0
-rw-r--r--platform/java/com/artifex/mupdf/fitz/Font.java (renamed from platform/android/src/com/artifex/mupdf/fitz/Font.java)0
-rw-r--r--platform/java/com/artifex/mupdf/fitz/Image.java (renamed from platform/android/src/com/artifex/mupdf/fitz/Image.java)0
-rw-r--r--platform/java/com/artifex/mupdf/fitz/Link.java (renamed from platform/android/src/com/artifex/mupdf/fitz/Link.java)0
-rw-r--r--platform/java/com/artifex/mupdf/fitz/Matrix.java (renamed from platform/android/src/com/artifex/mupdf/fitz/Matrix.java)0
-rw-r--r--platform/java/com/artifex/mupdf/fitz/Outline.java (renamed from platform/android/src/com/artifex/mupdf/fitz/Outline.java)0
-rw-r--r--platform/java/com/artifex/mupdf/fitz/Page.java (renamed from platform/android/src/com/artifex/mupdf/fitz/Page.java)0
-rw-r--r--platform/java/com/artifex/mupdf/fitz/Path.java (renamed from platform/android/src/com/artifex/mupdf/fitz/Path.java)0
-rw-r--r--platform/java/com/artifex/mupdf/fitz/PathProcessor.java (renamed from platform/android/src/com/artifex/mupdf/fitz/PathProcessor.java)0
-rw-r--r--platform/java/com/artifex/mupdf/fitz/Point.java (renamed from platform/android/src/com/artifex/mupdf/fitz/Point.java)0
-rw-r--r--platform/java/com/artifex/mupdf/fitz/Rect.java (renamed from platform/android/src/com/artifex/mupdf/fitz/Rect.java)0
-rw-r--r--platform/java/com/artifex/mupdf/fitz/RectI.java (renamed from platform/android/src/com/artifex/mupdf/fitz/RectI.java)0
-rw-r--r--platform/java/com/artifex/mupdf/fitz/Shade.java (renamed from platform/android/src/com/artifex/mupdf/fitz/Shade.java)0
-rw-r--r--platform/java/com/artifex/mupdf/fitz/StrokeState.java (renamed from platform/android/src/com/artifex/mupdf/fitz/StrokeState.java)0
-rw-r--r--platform/java/com/artifex/mupdf/fitz/Text.java (renamed from platform/android/src/com/artifex/mupdf/fitz/Text.java)0
-rw-r--r--platform/java/com/artifex/mupdf/fitz/TryLaterException.java (renamed from platform/android/src/com/artifex/mupdf/fitz/TryLaterException.java)0
-rw-r--r--platform/java/mupdf_native.c (renamed from platform/android/jni/mupdf_native.c)4
26 files changed, 3 insertions, 3 deletions
diff --git a/platform/android/src/com/artifex/mupdf/fitz/Annotation.java b/platform/java/com/artifex/mupdf/fitz/Annotation.java
index 6e6dd1c1..6e6dd1c1 100644
--- a/platform/android/src/com/artifex/mupdf/fitz/Annotation.java
+++ b/platform/java/com/artifex/mupdf/fitz/Annotation.java
diff --git a/platform/android/src/com/artifex/mupdf/fitz/AwtDrawDevice.java b/platform/java/com/artifex/mupdf/fitz/AwtDrawDevice.java
index 4e6fb33d..4e6fb33d 100644
--- a/platform/android/src/com/artifex/mupdf/fitz/AwtDrawDevice.java
+++ b/platform/java/com/artifex/mupdf/fitz/AwtDrawDevice.java
diff --git a/platform/android/src/com/artifex/mupdf/fitz/CDevice.java b/platform/java/com/artifex/mupdf/fitz/CDevice.java
index 3bfe9c70..3bfe9c70 100644
--- a/platform/android/src/com/artifex/mupdf/fitz/CDevice.java
+++ b/platform/java/com/artifex/mupdf/fitz/CDevice.java
diff --git a/platform/android/src/com/artifex/mupdf/fitz/ColorSpace.java b/platform/java/com/artifex/mupdf/fitz/ColorSpace.java
index cad952c0..cad952c0 100644
--- a/platform/android/src/com/artifex/mupdf/fitz/ColorSpace.java
+++ b/platform/java/com/artifex/mupdf/fitz/ColorSpace.java
diff --git a/platform/android/src/com/artifex/mupdf/fitz/Context.java b/platform/java/com/artifex/mupdf/fitz/Context.java
index 1baafb01..1baafb01 100644
--- a/platform/android/src/com/artifex/mupdf/fitz/Context.java
+++ b/platform/java/com/artifex/mupdf/fitz/Context.java
diff --git a/platform/android/src/com/artifex/mupdf/fitz/Cookie.java b/platform/java/com/artifex/mupdf/fitz/Cookie.java
index a072e018..b6761b42 100644
--- a/platform/android/src/com/artifex/mupdf/fitz/Cookie.java
+++ b/platform/java/com/artifex/mupdf/fitz/Cookie.java
@@ -26,5 +26,5 @@ public class Cookie
finalize();
nativeCookie = 0;
}
-
+
}
diff --git a/platform/android/src/com/artifex/mupdf/fitz/Device.java b/platform/java/com/artifex/mupdf/fitz/Device.java
index 366022e9..366022e9 100644
--- a/platform/android/src/com/artifex/mupdf/fitz/Device.java
+++ b/platform/java/com/artifex/mupdf/fitz/Device.java
diff --git a/platform/android/src/com/artifex/mupdf/fitz/DisplayList.java b/platform/java/com/artifex/mupdf/fitz/DisplayList.java
index 8a2515e4..8a2515e4 100644
--- a/platform/android/src/com/artifex/mupdf/fitz/DisplayList.java
+++ b/platform/java/com/artifex/mupdf/fitz/DisplayList.java
diff --git a/platform/android/src/com/artifex/mupdf/fitz/DisplayListDevice.java b/platform/java/com/artifex/mupdf/fitz/DisplayListDevice.java
index de3142dc..de3142dc 100644
--- a/platform/android/src/com/artifex/mupdf/fitz/DisplayListDevice.java
+++ b/platform/java/com/artifex/mupdf/fitz/DisplayListDevice.java
diff --git a/platform/android/src/com/artifex/mupdf/fitz/Document.java b/platform/java/com/artifex/mupdf/fitz/Document.java
index 8c3136df..8c3136df 100644
--- a/platform/android/src/com/artifex/mupdf/fitz/Document.java
+++ b/platform/java/com/artifex/mupdf/fitz/Document.java
diff --git a/platform/android/src/com/artifex/mupdf/fitz/Font.java b/platform/java/com/artifex/mupdf/fitz/Font.java
index 7630dfa5..7630dfa5 100644
--- a/platform/android/src/com/artifex/mupdf/fitz/Font.java
+++ b/platform/java/com/artifex/mupdf/fitz/Font.java
diff --git a/platform/android/src/com/artifex/mupdf/fitz/Image.java b/platform/java/com/artifex/mupdf/fitz/Image.java
index a736ce5f..a736ce5f 100644
--- a/platform/android/src/com/artifex/mupdf/fitz/Image.java
+++ b/platform/java/com/artifex/mupdf/fitz/Image.java
diff --git a/platform/android/src/com/artifex/mupdf/fitz/Link.java b/platform/java/com/artifex/mupdf/fitz/Link.java
index 7c63fcf9..7c63fcf9 100644
--- a/platform/android/src/com/artifex/mupdf/fitz/Link.java
+++ b/platform/java/com/artifex/mupdf/fitz/Link.java
diff --git a/platform/android/src/com/artifex/mupdf/fitz/Matrix.java b/platform/java/com/artifex/mupdf/fitz/Matrix.java
index ede57ccc..ede57ccc 100644
--- a/platform/android/src/com/artifex/mupdf/fitz/Matrix.java
+++ b/platform/java/com/artifex/mupdf/fitz/Matrix.java
diff --git a/platform/android/src/com/artifex/mupdf/fitz/Outline.java b/platform/java/com/artifex/mupdf/fitz/Outline.java
index 1b808d7f..1b808d7f 100644
--- a/platform/android/src/com/artifex/mupdf/fitz/Outline.java
+++ b/platform/java/com/artifex/mupdf/fitz/Outline.java
diff --git a/platform/android/src/com/artifex/mupdf/fitz/Page.java b/platform/java/com/artifex/mupdf/fitz/Page.java
index 46d598ee..46d598ee 100644
--- a/platform/android/src/com/artifex/mupdf/fitz/Page.java
+++ b/platform/java/com/artifex/mupdf/fitz/Page.java
diff --git a/platform/android/src/com/artifex/mupdf/fitz/Path.java b/platform/java/com/artifex/mupdf/fitz/Path.java
index 17257f10..17257f10 100644
--- a/platform/android/src/com/artifex/mupdf/fitz/Path.java
+++ b/platform/java/com/artifex/mupdf/fitz/Path.java
diff --git a/platform/android/src/com/artifex/mupdf/fitz/PathProcessor.java b/platform/java/com/artifex/mupdf/fitz/PathProcessor.java
index 71d03c50..71d03c50 100644
--- a/platform/android/src/com/artifex/mupdf/fitz/PathProcessor.java
+++ b/platform/java/com/artifex/mupdf/fitz/PathProcessor.java
diff --git a/platform/android/src/com/artifex/mupdf/fitz/Point.java b/platform/java/com/artifex/mupdf/fitz/Point.java
index 08989dd7..08989dd7 100644
--- a/platform/android/src/com/artifex/mupdf/fitz/Point.java
+++ b/platform/java/com/artifex/mupdf/fitz/Point.java
diff --git a/platform/android/src/com/artifex/mupdf/fitz/Rect.java b/platform/java/com/artifex/mupdf/fitz/Rect.java
index eb9138cf..eb9138cf 100644
--- a/platform/android/src/com/artifex/mupdf/fitz/Rect.java
+++ b/platform/java/com/artifex/mupdf/fitz/Rect.java
diff --git a/platform/android/src/com/artifex/mupdf/fitz/RectI.java b/platform/java/com/artifex/mupdf/fitz/RectI.java
index 1f91c778..1f91c778 100644
--- a/platform/android/src/com/artifex/mupdf/fitz/RectI.java
+++ b/platform/java/com/artifex/mupdf/fitz/RectI.java
diff --git a/platform/android/src/com/artifex/mupdf/fitz/Shade.java b/platform/java/com/artifex/mupdf/fitz/Shade.java
index bfadebc7..bfadebc7 100644
--- a/platform/android/src/com/artifex/mupdf/fitz/Shade.java
+++ b/platform/java/com/artifex/mupdf/fitz/Shade.java
diff --git a/platform/android/src/com/artifex/mupdf/fitz/StrokeState.java b/platform/java/com/artifex/mupdf/fitz/StrokeState.java
index 2f2fcf96..2f2fcf96 100644
--- a/platform/android/src/com/artifex/mupdf/fitz/StrokeState.java
+++ b/platform/java/com/artifex/mupdf/fitz/StrokeState.java
diff --git a/platform/android/src/com/artifex/mupdf/fitz/Text.java b/platform/java/com/artifex/mupdf/fitz/Text.java
index eada4635..eada4635 100644
--- a/platform/android/src/com/artifex/mupdf/fitz/Text.java
+++ b/platform/java/com/artifex/mupdf/fitz/Text.java
diff --git a/platform/android/src/com/artifex/mupdf/fitz/TryLaterException.java b/platform/java/com/artifex/mupdf/fitz/TryLaterException.java
index 644c6af1..644c6af1 100644
--- a/platform/android/src/com/artifex/mupdf/fitz/TryLaterException.java
+++ b/platform/java/com/artifex/mupdf/fitz/TryLaterException.java
diff --git a/platform/android/jni/mupdf_native.c b/platform/java/mupdf_native.c
index b6ac0966..c1931702 100644
--- a/platform/android/jni/mupdf_native.c
+++ b/platform/java/mupdf_native.c
@@ -537,7 +537,7 @@ static inline jobject Path_from_fz_path(fz_context *ctx, JNIEnv *env, fz_path *p
{
jobject jobj;
fz_path *new_path;
-
+
if (ctx == NULL)
return NULL;
@@ -617,7 +617,7 @@ static inline jobject Text_from_fz_text(fz_context *ctx, JNIEnv *env, fz_text *t
{
jobject jobj;
fz_text *new_text;
-
+
if (ctx == NULL)
return NULL;