Cleanup of JNI code for consistency.

 * Make sure that arguments are checked for NULL before being
   passed to ->Get JNI-functions (as these may crash on NULL).
 * Remove unused argument to from_Device().
 * Consistently use jint and jfloat in JNIEXPORTed functions.
 * Check ctx for NULL in all relevant functions.
 * Throw Java exception when constructors fail.
 * to_*_safe() means that the function doesn't fz_throw().
 * to_*_own() means that the function takes ownership of the object.
 * Make sure that jprefixing of argument identifies does not
   clash with jprefixing of types, specifically jstring.
 * Rename (j)colorspace -> (j)cs, (j)shade -> (j)shd,
   (j)device -> (j)dev.
 * Always check that the context is available in bindings.
 * Always check that required arguments are non-NULL or have
   decent default values (e.g. for fz_matrix and fz_rect).

7 files changed, 23 insertions, 23 deletions

diff --git a/platform/java/com/artifex/mupdf/fitz/Device.java b/platform/java/com/artifex/mupdf/fitz/Device.java
index 71f0ba54..295226fe 100644
--- a/platform/java/com/artifex/mupdf/fitz/Device.java
+++ b/platform/java/com/artifex/mupdf/fitz/Device.java
@@ -48,7 +48,7 @@ public class Device
 	public void clipText(Text text, Matrix ctm) {}
 	public void clipStrokeText(Text text, StrokeState stroke, Matrix ctm) {}
 	public void ignoreText(Text text, Matrix ctm) {}
-	public void fillShade(Shade shade, Matrix ctm, float alpha) {}
+	public void fillShade(Shade shd, Matrix ctm, float alpha) {}
 	public void fillImage(Image img, Matrix ctm, float alpha) {}
 	public void fillImageMask(Image img, Matrix ctm, ColorSpace cs, float color[], float alpha) {}
 	public void clipImageMask(Image img, Matrix ctm) {}
diff --git a/platform/java/com/artifex/mupdf/fitz/DisplayList.java b/platform/java/com/artifex/mupdf/fitz/DisplayList.java
index 3f36fa3d..1933f9ae 100644
--- a/platform/java/com/artifex/mupdf/fitz/DisplayList.java
+++ b/platform/java/com/artifex/mupdf/fitz/DisplayList.java
@@ -2,7 +2,7 @@ package com.artifex.mupdf.fitz;
 
 public class DisplayList
 {
-	protected long pointer;
+	private long pointer;
 
 	protected native void finalize();
 
@@ -17,9 +17,9 @@ public class DisplayList
 		pointer = newNative();
 	}
 
-	public native void run(Device device, Matrix ctm, Rect scissor, Cookie cookie);
+	public native void run(Device dev, Matrix ctm, Rect scissor, Cookie cookie);
 
-	public void run(Device device, Matrix ctm, Cookie cookie) {
-		run(device, ctm, null, cookie);
+	public void run(Device dev, Matrix ctm, Cookie cookie) {
+		run(dev, ctm, null, cookie);
 	}
 }
diff --git a/platform/java/com/artifex/mupdf/fitz/Document.java b/platform/java/com/artifex/mupdf/fitz/Document.java
index efa2a425..22d2f9bf 100644
--- a/platform/java/com/artifex/mupdf/fitz/Document.java
+++ b/platform/java/com/artifex/mupdf/fitz/Document.java
@@ -11,7 +11,7 @@ public class Document
 	public static final String META_INFO_AUTHOR = "info:Author";
 	public static final String META_INFO_TITLE = "info:Title";
 
-	protected long pointer;
+	private long pointer;
 
 	protected native void finalize();
 
diff --git a/platform/java/com/artifex/mupdf/fitz/NativeDevice.java b/platform/java/com/artifex/mupdf/fitz/NativeDevice.java
index 6ea7b0a5..0d2b9159 100644
--- a/platform/java/com/artifex/mupdf/fitz/NativeDevice.java
+++ b/platform/java/com/artifex/mupdf/fitz/NativeDevice.java
@@ -30,7 +30,7 @@ public class NativeDevice extends Device
 	public native final void clipStrokeText(Text text, StrokeState stroke, Matrix ctm);
 	public native final void ignoreText(Text text, Matrix ctm);
 
-	public native final void fillShade(Shade shade, Matrix ctm, float alpha);
+	public native final void fillShade(Shade shd, Matrix ctm, float alpha);
 	public native final void fillImage(Image img, Matrix ctm, float alpha);
 	public native final void fillImageMask(Image img, Matrix ctm, ColorSpace cs, float color[], float alpha);
 	public native final void clipImageMask(Image img, Matrix ctm);
diff --git a/platform/java/com/artifex/mupdf/fitz/Page.java b/platform/java/com/artifex/mupdf/fitz/Page.java
index 44abc572..71f39857 100644
--- a/platform/java/com/artifex/mupdf/fitz/Page.java
+++ b/platform/java/com/artifex/mupdf/fitz/Page.java
@@ -20,7 +20,7 @@ public class Page
 
 	public native Rect getBounds();
 
-	public native Pixmap toPixmap(Matrix ctm, ColorSpace colorspace, boolean alpha);
+	public native Pixmap toPixmap(Matrix ctm, ColorSpace cs, boolean alpha);
 
 	public native void run(Device dev, Matrix ctm, Cookie cookie);
 	public native void runPageContents(Device dev, Matrix ctm, Cookie cookie);
diff --git a/platform/java/com/artifex/mupdf/fitz/Pixmap.java b/platform/java/com/artifex/mupdf/fitz/Pixmap.java
index 5e23ca21..ac14e95c 100644
--- a/platform/java/com/artifex/mupdf/fitz/Pixmap.java
+++ b/platform/java/com/artifex/mupdf/fitz/Pixmap.java
@@ -17,28 +17,28 @@ public class Pixmap
 		pointer = p;
 	}
 
-	public Pixmap(ColorSpace colorspace, int x, int y, int w, int h, boolean alpha) {
-		pointer = newNative(colorspace, x, y, w, h, alpha);
+	public Pixmap(ColorSpace cs, int x, int y, int w, int h, boolean alpha) {
+		pointer = newNative(cs, x, y, w, h, alpha);
 	}
 
-	public Pixmap(ColorSpace colorspace, int x, int y, int w, int h) {
-		this(colorspace, x, y, w, h, false);
+	public Pixmap(ColorSpace cs, int x, int y, int w, int h) {
+		this(cs, x, y, w, h, false);
 	}
 
-	public Pixmap(ColorSpace colorspace, int w, int h, boolean alpha) {
-		this(colorspace, 0, 0, w, h, alpha);
+	public Pixmap(ColorSpace cs, int w, int h, boolean alpha) {
+		this(cs, 0, 0, w, h, alpha);
 	}
 
-	public Pixmap(ColorSpace colorspace, int w, int h) {
-		this(colorspace, 0, 0, w, h, false);
+	public Pixmap(ColorSpace cs, int w, int h) {
+		this(cs, 0, 0, w, h, false);
 	}
 
-	public Pixmap(ColorSpace colorspace, Rect rect, boolean alpha) {
-		this(colorspace, (int)rect.x0, (int)rect.y0, (int)(rect.x1 - rect.x0), (int)(rect.y1 - rect.y0), alpha);
+	public Pixmap(ColorSpace cs, Rect rect, boolean alpha) {
+		this(cs, (int)rect.x0, (int)rect.y0, (int)(rect.x1 - rect.x0), (int)(rect.y1 - rect.y0), alpha);
 	}
 
-	public Pixmap(ColorSpace colorspace, Rect rect) {
-		this(colorspace, rect, false);
+	public Pixmap(ColorSpace cs, Rect rect) {
+		this(cs, rect, false);
 	}
 
 	public native void clear();
diff --git a/platform/java/com/artifex/mupdf/fitz/Text.java b/platform/java/com/artifex/mupdf/fitz/Text.java
index 9a79bda2..5bbe8abe 100644
--- a/platform/java/com/artifex/mupdf/fitz/Text.java
+++ b/platform/java/com/artifex/mupdf/fitz/Text.java
@@ -27,7 +27,7 @@ public class Text implements TextWalker
 	}
 
 	public native void showGlyph(Font font, Matrix trm, int glyph, int unicode, boolean wmode);
-	public native void showString(Font font, Matrix trm, String string, boolean wmode);
+	public native void showString(Font font, Matrix trm, String str, boolean wmode);
 
 	public native Rect getBounds(StrokeState stroke, Matrix ctm);
 
@@ -35,8 +35,8 @@ public class Text implements TextWalker
 		showGlyph(font, trm, glyph, unicode, false);
 	}
 
-	public void showString(Font font, Matrix trm, String string) {
-		showString(font, trm, string, false);
+	public void showString(Font font, Matrix trm, String str) {
+		showString(font, trm, str, false);
 	}
 
 	public native void walk(TextWalker walker);