[cairo-commit] cairo-java/src/java/org/freedesktop/cairo Status.java, 1.6, 1.7 PDFSurface.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-serv6999/src/java/org/freedesktop/cairo

Modified Files:
	Status.java PDFSurface.java 
Log Message:
updated bindings to match upstream changes.

Index: Status.java
===================================================================
RCS file: /cvs/cairo/cairo-java/src/java/org/freedesktop/cairo/Status.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- Status.java	7 May 2005 00:27:02 -0000	1.6
+++ Status.java	2 Jun 2005 17:51:06 -0000	1.7
@@ -40,13 +40,11 @@
     static final public Status SURFACE_FINISHED = new Status (_SURFACE_FINISHED);
     static final private int _SURFACE_TYPE_MISMATCH = 13;
     static final public Status SURFACE_TYPE_MISMATCH = new Status (_SURFACE_TYPE_MISMATCH);
-    static final private int _BAD_NESTING = 14;
-    static final public Status BAD_NESTING = new Status (_BAD_NESTING);
 
     static final private Status[] theInterned = new Status[] {
         SUCCESS, NO_MEMORY, INVALID_RESTORE, INVALID_POP_GROUP, NO_CURRENT_POINT,
         INVALID_MATRIX, NO_TARGET_SURFACE, NULL_POINTER, INVALID_STRING, INVALID_PATH_DATA,
-        READ_ERROR, WRITE_ERROR, SURFACE_FINISHED, SURFACE_TYPE_MISMATCH, BAD_NESTING
+        READ_ERROR, WRITE_ERROR, SURFACE_FINISHED, SURFACE_TYPE_MISMATCH
     };
     static private java.util.Hashtable theInternedExtras;
     static final private Status theSacrificialOne = new Status (0);

Index: PDFSurface.java
===================================================================
RCS file: /cvs/cairo/cairo-java/src/java/org/freedesktop/cairo/PDFSurface.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- PDFSurface.java	16 May 2005 14:44:13 -0000	1.3
+++ PDFSurface.java	2 Jun 2005 17:51:06 -0000	1.4
@@ -17,20 +17,9 @@
  */
 public class PDFSurface extends Surface {
 
-	private String filename;
-	private double width;
-	private double height;
-	
 	public PDFSurface(String filename, double widthInches, double heightInches)
 				throws IOException {
 		super(initialize(filename, widthInches, heightInches));
-		this.filename = filename;
-		width = widthInches;
-		height = heightInches;
-	}
-	
-	public void close() {
-		close(getHandle());
 	}
 	
 	public void setPPI(double xPPI, double yPPI) {
@@ -68,6 +57,5 @@
 	 */
 	native static final private Handle cairo_pdf_surface_create(String filename,
 				double width_inches, double height_inches);
-	native static final private void close(Handle handle);
 	native static final private void cairo_pdf_surface_set_ppi(Handle handle, double x, double y);
 }