Add PDFPage and PDFAnnotation subclasses.

5 files changed, 76 insertions, 3 deletions

diff --git a/platform/java/src/com/artifex/mupdf/fitz/Annotation.java b/platform/java/src/com/artifex/mupdf/fitz/Annotation.java
index 855ff5a1..f517ece5 100644
--- a/platform/java/src/com/artifex/mupdf/fitz/Annotation.java
+++ b/platform/java/src/com/artifex/mupdf/fitz/Annotation.java
@@ -11,7 +11,7 @@ public class Annotation
 		pointer = 0;
 	}
 
-	private Annotation(long p) {
+	protected Annotation(long p) {
 		pointer = p;
 	}
 
diff --git a/platform/java/src/com/artifex/mupdf/fitz/PDFAnnotation.java b/platform/java/src/com/artifex/mupdf/fitz/PDFAnnotation.java
new file mode 100644
index 00000000..5f001a2c
--- /dev/null
+++ b/platform/java/src/com/artifex/mupdf/fitz/PDFAnnotation.java
@@ -0,0 +1,64 @@
+package com.artifex.mupdf.fitz;
+
+public class PDFAnnotation extends Annotation
+{
+	private PDFAnnotation(long p) { super(p); }
+
+	/* IMPORTANT: Keep in sync with mupdf/pdf/annot.h */
+	public static final int TYPE_TEXT = 0;
+	public static final int TYPE_LINK = 1;
+	public static final int TYPE_FREE_TEXT = 2;
+	public static final int TYPE_LINE = 3;
+	public static final int TYPE_SQUARE = 4;
+	public static final int TYPE_CIRCLE = 5;
+	public static final int TYPE_POLYGON = 6;
+	public static final int TYPE_POLY_LINE = 7;
+	public static final int TYPE_HIGHLIGHT = 8;
+	public static final int TYPE_UNDERLINE = 9;
+	public static final int TYPE_SQUIGGLY = 10;
+	public static final int TYPE_STRIKE_OUT = 11;
+	public static final int TYPE_STAMP = 12;
+	public static final int TYPE_CARET = 13;
+	public static final int TYPE_INK = 14;
+	public static final int TYPE_POPUP = 15;
+	public static final int TYPE_FILE_ATTACHMENT = 16;
+	public static final int TYPE_SOUND = 17;
+	public static final int TYPE_MOVIE = 18;
+	public static final int TYPE_WIDGET = 19;
+	public static final int TYPE_SCREEN = 20;
+	public static final int TYPE_PRINTER_MARK = 21;
+	public static final int TYPE_TRAP_NET = 22;
+	public static final int TYPE_WATERMARK = 23;
+	public static final int TYPE_3D = 24;
+
+	public native int getType();
+	public native int getFlags();
+	public native int setFlags(int flags);
+	public native String getContents();
+	public native void setContents(String contents);
+	public native Rect getRect();
+	public native void setRect(Rect rect);
+	public native float getBorder();
+	public native void setBorder(float width);
+	public native float[] getColor();
+	public native void setColor(float[] color);
+	public native float[] getInteriorColor();
+	public native void setInteriorColor(float[] color);
+
+	public native int[] getLineEndingStyles();
+	public native void setLineEndingStyles(int startStyle, int endStyle);
+
+	public native float[] getVertices();
+	public native void setVertices(float[] vertices);
+	public native float[] getQuadPoints();
+	public native void setQuadPoints(float[] quadPoints);
+	public native float[][] getInkList();
+	public native void setInkList(float[][] inkList);
+
+	public native String getIcon();
+	public native void setIcon(String icon);
+	public native boolean isOpen();
+	public native void setIsOpen(boolean open);
+
+	public native void updateAppearance();
+}
diff --git a/platform/java/src/com/artifex/mupdf/fitz/PDFPage.java b/platform/java/src/com/artifex/mupdf/fitz/PDFPage.java
new file mode 100644
index 00000000..2175e217
--- /dev/null
+++ b/platform/java/src/com/artifex/mupdf/fitz/PDFPage.java
@@ -0,0 +1,9 @@
+package com.artifex.mupdf.fitz;
+
+public class PDFPage extends Page
+{
+	private PDFPage(long p) { super(p); }
+
+	public native PDFAnnotation createAnnotation(int type);
+	public native void deleteAnnotation(Annotation annot);
+}
diff --git a/platform/java/src/com/artifex/mupdf/fitz/Page.java b/platform/java/src/com/artifex/mupdf/fitz/Page.java
index e86209d6..60241355 100644
--- a/platform/java/src/com/artifex/mupdf/fitz/Page.java
+++ b/platform/java/src/com/artifex/mupdf/fitz/Page.java
@@ -11,7 +11,7 @@ public class Page
 		pointer = 0;
 	}
 
-	private Page(long p) {
+	protected Page(long p) {
 		pointer = p;
 	}
 
diff --git a/platform/java/src/com/artifex/mupdf/fitz/android/AndroidDrawDevice.java b/platform/java/src/com/artifex/mupdf/fitz/android/AndroidDrawDevice.java
index e3afb637..38bb0447 100644
--- a/platform/java/src/com/artifex/mupdf/fitz/android/AndroidDrawDevice.java
+++ b/platform/java/src/com/artifex/mupdf/fitz/android/AndroidDrawDevice.java
@@ -13,7 +13,7 @@ public final class AndroidDrawDevice extends NativeDevice
 {
 	private native long newNative(Bitmap bitmap, int xOrigin, int yOrigin, int patchX0, int patchY0, int patchX1, int patchY1);
 
-	public AndroidDrawDevice (Bitmap bitmap, int xOrigin, int yOrigin, int patchX0, int patchY0, int patchX1, int patchY1) {
+	public AndroidDrawDevice(Bitmap bitmap, int xOrigin, int yOrigin, int patchX0, int patchY0, int patchX1, int patchY1) {
 		super(0);
 		pointer = newNative(bitmap, xOrigin, yOrigin, patchX0, patchY0, patchX1, patchY1);
 	}