[cairo-commit] cairo-java/src/java/org/freedesktop/cairo FontExtents.java, 1.3, 1.4 CurrentPath.java, 1.2, NONE Context.java, 1.5, 1.6

[Jeffrey Morgan]

Committed by: kuzman

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

Modified Files:
	FontExtents.java Context.java 
Removed Files:
	CurrentPath.java 
Log Message:
Removed CurrentPath and added a few native methods

Index: FontExtents.java
===================================================================
RCS file: /cvs/cairo/cairo-java/src/java/org/freedesktop/cairo/FontExtents.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- FontExtents.java	9 May 2005 14:47:03 -0000	1.3
+++ FontExtents.java	10 May 2005 01:01:59 -0000	1.4
@@ -15,6 +15,13 @@
 	FontExtents(Handle hndl) {
 		super(hndl);
 	}
+	
+	protected void finalize() throws Throwable {
+		free(getHandle());
+		super.finalize();
+	}
+
+
 
 	public double getAscent() {
 		return get_ascent(getHandle());
@@ -39,9 +46,7 @@
 	/*
 	 * Native calls
 	 */
-    // TODO: free resources
     native static final private void free(Handle obj);
-    
 	native static final private double get_ascent(Handle obj);
 	native static final private double get_descent(Handle obj);
 	native static final private double get_height(Handle obj);

--- CurrentPath.java DELETED ---

Index: Context.java
===================================================================
RCS file: /cvs/cairo/cairo-java/src/java/org/freedesktop/cairo/Context.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- Context.java	9 May 2005 14:47:03 -0000	1.5
+++ Context.java	10 May 2005 01:01:59 -0000	1.6
@@ -437,9 +437,9 @@
      * Draws a cubic bezier curve from the current point to p3 using 2
      * control points p1 and p2. The co-ordinates are specified
      * relative to current point in the path.
-     * @param dx1 relative co-ordinate of the first control point
-     * @param dx2 relative co-ordinate of the second control point
-     * @param dx3 relative co-ordinate of the end point
+     * @param p1 relative co-ordinate of the first control point
+     * @param p2 relative co-ordinate of the second control point
+     * @param p3 relative co-ordinate of the end point
      */
 	public void relCurveTo(Point p1, Point p2, Point p3) {
 		cairo_rel_curve_to(getHandle(), p1.getX(), p1.getY(), 
@@ -729,7 +729,7 @@
      * Replaces the current FontFace object in the context with
      * fontFace. The replaced font face in the context will be
      * destroyed if there are no other references to it.
-	 * @param font
+	 * @param fontFace
 	 */
 	public void setFontFace(FontFace fontFace) {
 		cairo_set_font_face(getHandle(), fontFace.getHandle());
@@ -1005,7 +1005,6 @@
     native static final private int cairo_get_line_join(Handle obj);
     native static final private double cairo_get_miter_limit(Handle obj);
     native static final private void cairo_get_matrix(Handle obj, Handle matrix);
-    // TODO: JNI
     native static final private Handle cairo_get_target(Handle obj);
     native static final private int cairo_status(Handle obj);
     native static final private String cairo_status_string(Handle obj);