[cairo-commit] cairo-java/src/java/org/freedesktop/cairo Surface.java, 1.14, 1.15 PDFSurface.java, 1.4, 1.5 Status.java, 1.9, 1.10 FontFace.java, 1.3, 1.4

[Jeffrey Morgan]

Committed by: kuzman

Update of /cvs/cairo/cairo-java/src/java/org/freedesktop/cairo
In directory gabe:/tmp/cvs-serv18581/src/java/org/freedesktop/cairo

Modified Files:
	Surface.java PDFSurface.java Status.java FontFace.java 
Log Message:
Numerous updates and bug fixes (thanks Owen)

Index: Surface.java
===================================================================
RCS file: /cvs/cairo/cairo-java/src/java/org/freedesktop/cairo/Surface.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- Surface.java	13 Aug 2005 22:35:13 -0000	1.14
+++ Surface.java	17 Aug 2005 00:23:44 -0000	1.15
@@ -16,10 +16,6 @@
  */
 public class Surface extends CairoObject {
 	
-    public Surface() {
-        super(alloc());
-    }
-    
     Surface(Handle hndl) {
     	super(hndl);
     }
@@ -66,7 +62,6 @@
      * Native calls
      */
     native static final private Handle cairo_surface_create_similar(Handle other, int format, int width, int height);
-    native static final private Handle alloc();
     native static final private void cairo_surface_destroy(Handle obj);
     native static final private int cairo_surface_finish(Handle obj);
 	

Index: PDFSurface.java
===================================================================
RCS file: /cvs/cairo/cairo-java/src/java/org/freedesktop/cairo/PDFSurface.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- PDFSurface.java	2 Jun 2005 17:51:06 -0000	1.4
+++ PDFSurface.java	17 Aug 2005 00:23:44 -0000	1.5
@@ -22,8 +22,8 @@
 		super(initialize(filename, widthInches, heightInches));
 	}
 	
-	public void setPPI(double xPPI, double yPPI) {
-		cairo_pdf_surface_set_ppi(getHandle(), xPPI, yPPI);
+	public void setDPI(double xDPI, double yDPI) {
+		cairo_pdf_surface_set_dpi(getHandle(), xDPI, yDPI);
 	}
 	
 	private static Handle initialize(String filename, double widthInches, double heightInches)
@@ -57,5 +57,5 @@
 	 */
 	native static final private Handle cairo_pdf_surface_create(String filename,
 				double width_inches, double height_inches);
-	native static final private void cairo_pdf_surface_set_ppi(Handle handle, double x, double y);
+	native static final private void cairo_pdf_surface_set_dpi(Handle handle, double x, double y);
 }

Index: Status.java
===================================================================
RCS file: /cvs/cairo/cairo-java/src/java/org/freedesktop/cairo/Status.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- Status.java	13 Aug 2005 22:11:21 -0000	1.9
+++ Status.java	17 Aug 2005 00:23:44 -0000	1.10
@@ -82,4 +82,10 @@
     public boolean test (Status other) {
         return (value_ & other.value_) == other.value_;
     }
+    
+    public String toString() {
+        return cairo_status_to_string(value_);
+    }
+    
+    native static final private String cairo_status_to_string(int status);
 }

Index: FontFace.java
===================================================================
RCS file: /cvs/cairo/cairo-java/src/java/org/freedesktop/cairo/FontFace.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- FontFace.java	9 May 2005 14:47:03 -0000	1.3
+++ FontFace.java	17 Aug 2005 00:23:44 -0000	1.4
@@ -17,10 +17,6 @@
  */
 public class FontFace extends CairoObject {
 
-    public FontFace() {
-        super(alloc());
-    }
-    
 	FontFace(Handle hndl) {
 		super(hndl);
 	}
@@ -33,8 +29,6 @@
     /*
      * Native calls
      */
-    // TODO: alloc
-    native static final private Handle alloc();
 	native static final private void cairo_font_face_destroy(Handle obj);
 
 }