[cairo-commit] cairo-java/src/java/org/freedesktop/cairo Cairo.java, 1.6, 1.7

[Jeffrey Morgan]

Committed by: kuzman

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

Modified Files:
	Cairo.java 
Log Message:
major upstream API changes

Index: Cairo.java
===================================================================
RCS file: /cvs/cairo/cairo-java/src/java/org/freedesktop/cairo/Cairo.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- Cairo.java	10 Mar 2005 19:04:14 -0000	1.6
+++ Cairo.java	10 Mar 2005 19:38:33 -0000	1.7
@@ -729,13 +729,13 @@
 		cairo_show_glyphs(getHandle(), hndls);
 	}
 
-	public Font getCurrentFont() {
-		return new Font(cairo_current_font(getHandle()));
+	public Font getFont() {
+		return new Font(cairo_get_font(getHandle()));
 	}
 
-	public FontExtents getCurrentFontExtents() {
+	public FontExtents getFontExtents() {
 		Handle hndl = GObject.getNullHandle();
-		cairo_current_font_extents(getHandle(), hndl);
+		cairo_get_font_extents(getHandle(), hndl);
 		return new FontExtents(hndl);
 	}
 	
@@ -797,25 +797,25 @@
      * 
      * @return The surface operator.
      */
-	public Operator getCurrentOperator() {
-		return Operator.intern(cairo_current_operator(getHandle()));
+	public Operator getOperator() {
+		return Operator.intern(cairo_get_operator(getHandle()));
 	}
 	
-	public RGBColor getCurrentRGBColor() {
+	public RGBColor getRGBColor() {
 		double[] red = new double[1];
 		double[] green = new double[1];
 		double[] blue = new double[1];
-		cairo_current_rgb_color(getHandle(), red, green, blue);
+		cairo_get_rgb_color(getHandle(), red, green, blue);
 		return new RGBColor(red[0], green[0], blue[0]);
 	}
 
-	public Pattern getCurrentPattern() {
-		Handle hndl = cairo_current_pattern(getHandle());
+	public Pattern getPattern() {
+		Handle hndl = cairo_get_pattern(getHandle());
 		return new Pattern(hndl);
 	}
 	
-	public double getCurrentAlpha() {
-		return cairo_current_alpha(getHandle());
+	public double getAlpha() {
+		return cairo_get_alpha(getHandle());
 	}
 	
     /**
@@ -823,8 +823,8 @@
      * 
      * @return tesselation tolerance
      */
-	public double getCurrentTolerance() {
-		return cairo_current_tolerance(getHandle());
+	public double getTolerance() {
+		return cairo_get_tolerance(getHandle());
 	}
 	
     /**
@@ -835,12 +835,12 @@
 	public Point getCurrentPoint() {
 		double[] x = new double[1];
 		double[] y = new double[1];
-		cairo_current_point(getHandle(), x, y);
+		cairo_get_current_point(getHandle(), x, y);
 		return new Point(x[0], y[0]);
 	}
 
-	public FillRule getCurrentFillRule() {
-		return FillRule.intern(cairo_current_fill_rule(getHandle()));
+	public FillRule getFillRule() {
+		return FillRule.intern(cairo_get_fill_rule(getHandle()));
 	}
 	
     /**
@@ -848,8 +848,8 @@
      * 
      * @return The stroke line width
      */
-	public double getCurrentLineWidth() {
-		return cairo_current_line_width(getHandle());
+	public double getLineWidth() {
+		return cairo_get_line_width(getHandle());
 	}
 
     /**
@@ -857,8 +857,8 @@
      * 
      * @return The line cap style
      */
-	public LineCap getCurrentLineCap() {
-		return LineCap.intern(cairo_current_line_cap(getHandle()));
+	public LineCap getLineCap() {
+		return LineCap.intern(cairo_get_line_cap(getHandle()));
 	}
 
     /**
@@ -866,8 +866,8 @@
      * 
      * @return Line join style
      */
-	public LineJoin getCurrentLineJoin() {
-		return LineJoin.intern(cairo_current_line_join(getHandle()));
+	public LineJoin getLineJoin() {
+		return LineJoin.intern(cairo_get_line_join(getHandle()));
 	}
 
     /**
@@ -875,13 +875,13 @@
      * 
      * @return The miter limit
      */
-	public double getCurrentMiterLimit() {
-		return cairo_current_miter_limit(getHandle());
+	public double getMiterLimit() {
+		return cairo_get_miter_limit(getHandle());
 	}
 
-	public Matrix getCurrentMatrix() {
+	public Matrix getMatrix() {
 		Handle hndl = GObject.getNullHandle();
-		cairo_current_matrix(getHandle(), hndl);
+		cairo_get_matrix(getHandle(), hndl);
 		return new Matrix(hndl);
 	}
 
@@ -891,8 +891,8 @@
      * 
      * @return The target surface of this state.
      */
-	public Surface getCurrentTargetSurface() {
-		Handle hndl = cairo_current_target_surface(getHandle());
+	public Surface getTargetSurface() {
+		Handle hndl = cairo_get_target_surface(getHandle());
 		return new Surface(hndl);
 	}
     
@@ -998,14 +998,14 @@
         return cairo_status_string(getHandle());
     }
     
-    public void setCurrentPath(CurrentPath path) {
+    public void getPath(CurrentPath path) {
     	currentPath = path;
-        cairo_current_path(getHandle(), this);
+        cairo_get_path(getHandle(), this);
     }
     
-    public void setCurrentPathFlat(CurrentPath path) {
+    public void getPathFlat(CurrentPath path) {
     	currentPath = path;
-        cairo_current_path_flat(getHandle(), this);
+        cairo_get_path_flat(getHandle(), this);
     }
 	
     private void move_to(double x, double y) {
@@ -1091,29 +1091,29 @@
 	native static final private void cairo_transform_font(Handle obj, Handle matrix);
 	native static final private void cairo_show_text(Handle obj, String utf8);
 	native static final private void cairo_show_glyphs(Handle obj, Handle[] glyphs);
-	native static final private Handle cairo_current_font(Handle obj);
-	native static final private void cairo_current_font_extents(Handle obj, Handle extents);
+	native static final private Handle cairo_get_font(Handle obj);
+	native static final private void cairo_get_font_extents(Handle obj, Handle extents);
 	native static final private void cairo_set_font(Handle obj, Handle font);
 	native static final private void cairo_text_extents(Handle obj, String utf8, Handle extents);
 	native static final private void cairo_glyph_extents(Handle obj, Handle[] glyphs, Handle extents);
 	native static final private void cairo_text_path(Handle obj, String utf8);
 	native static final private void cairo_glyph_path(Handle obj, Handle[] glyphs);
 	native static final private void cairo_show_surface(Handle obj, Handle surface, int width, int height);
-	native static final private int cairo_current_operator(Handle obj);
-	native static final private void cairo_current_rgb_color(Handle obj, double[] red, double[] green, double[] blue);
-	native static final private Handle cairo_current_pattern(Handle obj);
-	native static final private double cairo_current_alpha(Handle obj);
-	native static final private double cairo_current_tolerance(Handle obj);
-	native static final private void cairo_current_point(Handle obj, double[] x, double[] y);
-	native static final private int cairo_current_fill_rule(Handle obj);
-	native static final private double cairo_current_line_width(Handle obj);
-	native static final private int cairo_current_line_cap(Handle obj);
-	native static final private int cairo_current_line_join(Handle obj);
-	native static final private double cairo_current_miter_limit(Handle obj);
-	native static final private void cairo_current_matrix(Handle obj, Handle matrix);
-	native static final private Handle cairo_current_target_surface(Handle obj);
+	native static final private int cairo_get_operator(Handle obj);
+	native static final private void cairo_get_rgb_color(Handle obj, double[] red, double[] green, double[] blue);
+	native static final private Handle cairo_get_pattern(Handle obj);
+	native static final private double cairo_get_alpha(Handle obj);
+	native static final private double cairo_get_tolerance(Handle obj);
+	native static final private void cairo_get_current_point(Handle obj, double[] x, double[] y);
+	native static final private int cairo_get_fill_rule(Handle obj);
+	native static final private double cairo_get_line_width(Handle obj);
+	native static final private int cairo_get_line_cap(Handle obj);
+	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);
+	native static final private Handle cairo_get_target_surface(Handle obj);
 	native static final private int cairo_status(Handle obj);
 	native static final private String cairo_status_string(Handle obj);
-	native static final private void cairo_current_path(Handle obj, Object cairo);
-    native static final private void cairo_current_path_flat(Handle obj, Object cairo);
+	native static final private void cairo_get_path(Handle obj, Object cairo);
+    native static final private void cairo_get_path_flat(Handle obj, Object cairo);
 }
\ No newline at end of file