[cairo-commit] cairo-java/src/java/org/freedesktop/cairo Cairo.java, 1.9, 1.10 Matrix.java, 1.1, 1.2 FillRule.java, 1.1, 1.2 FontSlant.java, 1.1, 1.2 FontWeight.java, 1.1, 1.2 Pattern.java, 1.1, 1.2 LineCap.java, 1.1, 1.2 Font.java, 1.1, 1.2 PngSurface.java, 1.3, 1.4 LineJoin.java, 1.1, 1.2 PsSurface.java, 1.2, 1.3 Operator.java, 1.1, 1.2 Extend.java, 1.1, 1.2 CairoObject.java, 1.1, 1.2 Filter.java, 1.1, 1.2 PdfSurface.java, 1.4, 1.5 TextExtents.java, 1.2, 1.3 Surface.java, 1.2, 1.3 ImageSurface.java, 1.1, 1.2 FreetypeFont.java, 1.2, 1.3 FontExtents.java, 1.1, 1.2 Status.java, 1.3, 1.4 Glyph.java, 1.2, 1.3 Format.java, 1.1, 1.2

Jeffrey Morgan commit at pdx.freedesktop.org
Thu Mar 24 10:11:42 PST 2005 

Committed by: kuzman

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

Modified Files:
	Cairo.java Matrix.java FillRule.java FontSlant.java 
	FontWeight.java Pattern.java LineCap.java Font.java 
	PngSurface.java LineJoin.java PsSurface.java Operator.java 
	Extend.java CairoObject.java Filter.java PdfSurface.java 
	TextExtents.java Surface.java ImageSurface.java 
	FreetypeFont.java FontExtents.java Status.java Glyph.java 
	Format.java 
Log Message:
changes to use new java-gnome utility library

Index: Cairo.java
===================================================================
RCS file: /cvs/cairo/cairo-java/src/java/org/freedesktop/cairo/Cairo.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- Cairo.java	14 Mar 2005 21:16:43 -0000	1.9
+++ Cairo.java	24 Mar 2005 18:11:40 -0000	1.10
@@ -8,8 +8,8 @@
  */
 package org.freedesktop.cairo;
 
-import org.gnu.glib.GObject;
-import org.gnu.glib.Handle;
+import org.gnu.javagnome.Struct;
+import org.gnu.javagnome.Handle;
 
 public class Cairo extends CairoObject {
 	
@@ -48,7 +48,7 @@
     }
 
     static private Handle copy(Cairo copy) {
-    	Handle hndl = GObject.getNullHandle();
+    	Handle hndl = Struct.getNullHandle();
     	cairo_copy(hndl, copy.getHandle());
     	return hndl;
     }
@@ -505,7 +505,7 @@
      *            relative y co-ordinate of the end point
      */
     public void relQuadTo(double dx1, double dy1, double dx2, double dy2) {
-        cairo_rel_quad_to(handle, dx1, dy1, dx2, dy2);
+        cairo_rel_quad_to(getHandle(), dx1, dy1, dx2, dy2);
     }
 
     public void relQuadTo(Point p1, Point p2) {
@@ -734,7 +734,7 @@
 	}
 
 	public FontExtents getFontExtents() {
-		Handle hndl = GObject.getNullHandle();
+		Handle hndl = Struct.getNullHandle();
 		cairo_get_font_extents(getHandle(), hndl);
 		return new FontExtents(hndl);
 	}
@@ -752,13 +752,13 @@
      * @return The extents of the given string
      */
 	public TextExtents getTextExtents(String text) {
-		Handle hndl = GObject.getNullHandle();
+		Handle hndl = Struct.getNullHandle();
 		cairo_text_extents(getHandle(), text, hndl);
 		return new TextExtents(hndl);
 	}
 
 	public TextExtents getGlyphExtents(Glyph[] glyphs) {
-		Handle hndl = GObject.getNullHandle();
+		Handle hndl = Struct.getNullHandle();
 		Handle[] gHndls = new Handle[glyphs.length];
 		for (int i = 0; i < glyphs.length; i++)
 			gHndls[i] = glyphs[i].getHandle();
@@ -880,7 +880,7 @@
 	}
 
 	public Matrix getMatrix() {
-		Handle hndl = GObject.getNullHandle();
+		Handle hndl = Struct.getNullHandle();
 		cairo_get_matrix(getHandle(), hndl);
 		return new Matrix(hndl);
 	}

Index: Matrix.java
===================================================================
RCS file: /cvs/cairo/cairo-java/src/java/org/freedesktop/cairo/Matrix.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Matrix.java	23 Feb 2005 18:17:52 -0000	1.1
+++ Matrix.java	24 Mar 2005 18:11:40 -0000	1.2
@@ -8,8 +8,8 @@
  */
 package org.freedesktop.cairo;
 
-import org.gnu.glib.GObject;
-import org.gnu.glib.Handle;
+import org.gnu.javagnome.Struct;
+import org.gnu.javagnome.Handle;
 
 /**
  * TODO: error handling
@@ -43,7 +43,7 @@
     }
     
 	private static Handle copy(Matrix copy) {
-		Handle hndl = GObject.getNullHandle();
+		Handle hndl = Struct.getNullHandle();
 		int status = cairo_matrix_copy(hndl, copy.getHandle());
 		return hndl;
 	}
@@ -145,7 +145,7 @@
      * @return The product
      */
 	static public Matrix multiply(Matrix a, Matrix b) {
-		Handle hndl = GObject.getNullHandle();
+		Handle hndl = Struct.getNullHandle();
 		int status = cairo_matrix_multiply(hndl, a.getHandle(), b.getHandle());
 		return new Matrix(hndl);
 	}

Index: FillRule.java
===================================================================
RCS file: /cvs/cairo/cairo-java/src/java/org/freedesktop/cairo/FillRule.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- FillRule.java	23 Feb 2005 18:17:52 -0000	1.1
+++ FillRule.java	24 Mar 2005 18:11:40 -0000	1.2
@@ -8,7 +8,7 @@
  */
 package org.freedesktop.cairo;
 
-import org.gnu.glib.Enum;
+import org.gnu.javagnome.Enum;
 
 public class FillRule extends Enum {
 

Index: FontSlant.java
===================================================================
RCS file: /cvs/cairo/cairo-java/src/java/org/freedesktop/cairo/FontSlant.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- FontSlant.java	23 Feb 2005 18:17:52 -0000	1.1
+++ FontSlant.java	24 Mar 2005 18:11:40 -0000	1.2
@@ -8,7 +8,7 @@
 */
 package org.freedesktop.cairo;
 
-import org.gnu.glib.Enum;
+import org.gnu.javagnome.Enum;
 
 public class FontSlant extends Enum {
     static final private int _NORMAL = 0;

Index: FontWeight.java
===================================================================
RCS file: /cvs/cairo/cairo-java/src/java/org/freedesktop/cairo/FontWeight.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- FontWeight.java	23 Feb 2005 18:17:52 -0000	1.1
+++ FontWeight.java	24 Mar 2005 18:11:40 -0000	1.2
@@ -8,7 +8,7 @@
 */
 package org.freedesktop.cairo;
 
-import org.gnu.glib.Enum;
+import org.gnu.javagnome.Enum;
 
 public class FontWeight extends Enum {
     static final private int _NORMAL = 0;

Index: Pattern.java
===================================================================
RCS file: /cvs/cairo/cairo-java/src/java/org/freedesktop/cairo/Pattern.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Pattern.java	23 Feb 2005 18:17:52 -0000	1.1
+++ Pattern.java	24 Mar 2005 18:11:40 -0000	1.2
@@ -8,8 +8,8 @@
  */
 package org.freedesktop.cairo;
 
-import org.gnu.glib.GObject;
-import org.gnu.glib.Handle;
+import org.gnu.javagnome.Struct;
+import org.gnu.javagnome.Handle;
 
 /**
  * TODO: error handling
@@ -64,7 +64,7 @@
      * @return The transformation matrix for the pattern.
      */
 	public Matrix getMatrix() {
-		Handle hndl = GObject.getNullHandle();
+		Handle hndl = Struct.getNullHandle();
 		int status = cairo_pattern_get_matrix(getHandle(), hndl);
 		return new Matrix(hndl);
 	}

Index: LineCap.java
===================================================================
RCS file: /cvs/cairo/cairo-java/src/java/org/freedesktop/cairo/LineCap.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- LineCap.java	23 Feb 2005 18:17:52 -0000	1.1
+++ LineCap.java	24 Mar 2005 18:11:40 -0000	1.2
@@ -8,7 +8,7 @@
  */
 package org.freedesktop.cairo;
 
-import org.gnu.glib.Enum;
+import org.gnu.javagnome.Enum;
 
 public class LineCap extends Enum {
 

Index: Font.java
===================================================================
RCS file: /cvs/cairo/cairo-java/src/java/org/freedesktop/cairo/Font.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Font.java	23 Feb 2005 18:17:52 -0000	1.1
+++ Font.java	24 Mar 2005 18:11:40 -0000	1.2
@@ -8,8 +8,8 @@
 */
 package org.freedesktop.cairo;
 
-import org.gnu.glib.GObject;
-import org.gnu.glib.Handle;
+import org.gnu.javagnome.Struct;
+import org.gnu.javagnome.Handle;
 
 public class Font extends CairoObject {
 	
@@ -22,7 +22,7 @@
 	}
 	
 	public FontExtents getFontExtents(Matrix fontMatrix) throws CairoException {
-		Handle hndl = GObject.getNullHandle();
+		Handle hndl = Struct.getNullHandle();
 		int status = cairo_font_extents(getHandle(), fontMatrix.getHandle(), hndl);
 		if (status == Status.SUCCESS.getValue())
 			return new FontExtents(hndl);
@@ -33,7 +33,7 @@
 		Handle[] hndls = new Handle[glyphs.length];
 		for (int i = 0; i < glyphs.length; i++)
 			hndls[i] = glyphs[i].getHandle();
-		Handle te = GObject.getNullHandle();
+		Handle te = Struct.getNullHandle();
 		cairo_font_glyph_extents(getHandle(), fontMatrix.getHandle(), hndls, te);
 		return new TextExtents(te);
 	}

Index: PngSurface.java
===================================================================
RCS file: /cvs/cairo/cairo-java/src/java/org/freedesktop/cairo/PngSurface.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- PngSurface.java	4 Mar 2005 23:01:41 -0000	1.3
+++ PngSurface.java	24 Mar 2005 18:11:40 -0000	1.4
@@ -11,7 +11,7 @@
 import java.io.File;
 import java.io.IOException;
 
-import org.gnu.glib.Handle;
+import org.gnu.javagnome.Handle;
 
 /**
  */

Index: LineJoin.java
===================================================================
RCS file: /cvs/cairo/cairo-java/src/java/org/freedesktop/cairo/LineJoin.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- LineJoin.java	23 Feb 2005 18:17:52 -0000	1.1
+++ LineJoin.java	24 Mar 2005 18:11:40 -0000	1.2
@@ -8,7 +8,7 @@
 */
 package org.freedesktop.cairo;
 
-import org.gnu.glib.Enum;
+import org.gnu.javagnome.Enum;
 
 public class LineJoin extends Enum {
 

Index: PsSurface.java
===================================================================
RCS file: /cvs/cairo/cairo-java/src/java/org/freedesktop/cairo/PsSurface.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- PsSurface.java	8 Mar 2005 20:47:44 -0000	1.2
+++ PsSurface.java	24 Mar 2005 18:11:40 -0000	1.3
@@ -11,7 +11,7 @@
 import java.io.File;
 import java.io.IOException;
 
-import org.gnu.glib.Handle;
+import org.gnu.javagnome.Handle;
 
 /**
  */

Index: Operator.java
===================================================================
RCS file: /cvs/cairo/cairo-java/src/java/org/freedesktop/cairo/Operator.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Operator.java	23 Feb 2005 18:17:52 -0000	1.1
+++ Operator.java	24 Mar 2005 18:11:40 -0000	1.2
@@ -8,7 +8,7 @@
  */
 package org.freedesktop.cairo;
 
-import org.gnu.glib.Enum;
+import org.gnu.javagnome.Enum;
 
 /**
  */

Index: Extend.java
===================================================================
RCS file: /cvs/cairo/cairo-java/src/java/org/freedesktop/cairo/Extend.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Extend.java	23 Feb 2005 18:17:52 -0000	1.1
+++ Extend.java	24 Mar 2005 18:11:40 -0000	1.2
@@ -8,7 +8,7 @@
  */
 package org.freedesktop.cairo;
 
-import org.gnu.glib.Enum;
+import org.gnu.javagnome.Enum;
 
 /**
  */

Index: CairoObject.java
===================================================================
RCS file: /cvs/cairo/cairo-java/src/java/org/freedesktop/cairo/CairoObject.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- CairoObject.java	23 Feb 2005 18:17:52 -0000	1.1
+++ CairoObject.java	24 Mar 2005 18:11:40 -0000	1.2
@@ -9,12 +9,12 @@
 
 package org.freedesktop.cairo;
 
-import org.gnu.glib.Boxed;
-import org.gnu.glib.Handle;
+import org.gnu.javagnome.Struct;
+import org.gnu.javagnome.Handle;
 
 /**
  */
-class CairoObject extends Boxed {
+class CairoObject extends Struct {
 
 	CairoObject(Handle hndl) {
 		super(hndl);

Index: Filter.java
===================================================================
RCS file: /cvs/cairo/cairo-java/src/java/org/freedesktop/cairo/Filter.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Filter.java	23 Feb 2005 18:17:52 -0000	1.1
+++ Filter.java	24 Mar 2005 18:11:40 -0000	1.2
@@ -8,7 +8,7 @@
  */
 package org.freedesktop.cairo;
 
-import org.gnu.glib.Enum;
+import org.gnu.javagnome.Enum;
 
 /**
  */

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	4 Mar 2005 23:01:41 -0000	1.4
+++ PdfSurface.java	24 Mar 2005 18:11:40 -0000	1.5
@@ -11,7 +11,7 @@
 import java.io.File;
 import java.io.IOException;
 
-import org.gnu.glib.Handle;
+import org.gnu.javagnome.Handle;
 
 /**
  */

Index: TextExtents.java
===================================================================
RCS file: /cvs/cairo/cairo-java/src/java/org/freedesktop/cairo/TextExtents.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- TextExtents.java	14 Mar 2005 16:24:06 -0000	1.2
+++ TextExtents.java	24 Mar 2005 18:11:40 -0000	1.3
@@ -9,7 +9,7 @@
 
 package org.freedesktop.cairo;
 
-import org.gnu.glib.Handle;
+import org.gnu.javagnome.Handle;
 
 public class TextExtents extends CairoObject {
 

Index: Surface.java
===================================================================
RCS file: /cvs/cairo/cairo-java/src/java/org/freedesktop/cairo/Surface.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Surface.java	17 Mar 2005 01:32:09 -0000	1.2
+++ Surface.java	24 Mar 2005 18:11:40 -0000	1.3
@@ -8,8 +8,8 @@
  */
 package org.freedesktop.cairo;
 
-import org.gnu.glib.GObject;
-import org.gnu.glib.Handle;
+import org.gnu.javagnome.Struct;
+import org.gnu.javagnome.Handle;
 
 /**
  * The Surface class represents an Cairo drawing surface. A Cairo object
@@ -64,7 +64,7 @@
      * @return The transformation matrix.
      */
     public Matrix getMatrix() {
-    	Handle hndl = GObject.getNullHandle();
+    	Handle hndl = Struct.getNullHandle();
     	int status = cairo_surface_get_matrix(getHandle(), hndl);
     	return new Matrix(hndl);
     }

Index: ImageSurface.java
===================================================================
RCS file: /cvs/cairo/cairo-java/src/java/org/freedesktop/cairo/ImageSurface.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ImageSurface.java	23 Feb 2005 18:17:52 -0000	1.1
+++ ImageSurface.java	24 Mar 2005 18:11:40 -0000	1.2
@@ -9,7 +9,7 @@
 
 package org.freedesktop.cairo;
 
-import org.gnu.glib.Handle;
+import org.gnu.javagnome.Handle;
 
 /**
  */

Index: FreetypeFont.java
===================================================================
RCS file: /cvs/cairo/cairo-java/src/java/org/freedesktop/cairo/FreetypeFont.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- FreetypeFont.java	4 Mar 2005 23:01:41 -0000	1.2
+++ FreetypeFont.java	24 Mar 2005 18:11:40 -0000	1.3
@@ -8,7 +8,7 @@
  */
 package org.freedesktop.cairo;
 
-import org.gnu.glib.Handle;
+import org.gnu.javagnome.Handle;
 
 /**
  */

Index: FontExtents.java
===================================================================
RCS file: /cvs/cairo/cairo-java/src/java/org/freedesktop/cairo/FontExtents.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- FontExtents.java	23 Feb 2005 18:17:52 -0000	1.1
+++ FontExtents.java	24 Mar 2005 18:11:40 -0000	1.2
@@ -8,7 +8,7 @@
 */
 package org.freedesktop.cairo;
 
-import org.gnu.glib.Handle;
+import org.gnu.javagnome.Handle;
 
 public class FontExtents extends CairoObject {
 	

Index: Status.java
===================================================================
RCS file: /cvs/cairo/cairo-java/src/java/org/freedesktop/cairo/Status.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Status.java	17 Mar 2005 01:32:09 -0000	1.3
+++ Status.java	24 Mar 2005 18:11:40 -0000	1.4
@@ -9,7 +9,7 @@
 
 package org.freedesktop.cairo;
 
-import org.gnu.glib.Enum;
+import org.gnu.javagnome.Enum;
 
 public class Status extends Enum {
     static final private int _SUCCESS = 0;

Index: Glyph.java
===================================================================
RCS file: /cvs/cairo/cairo-java/src/java/org/freedesktop/cairo/Glyph.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Glyph.java	14 Mar 2005 21:16:43 -0000	1.2
+++ Glyph.java	24 Mar 2005 18:11:40 -0000	1.3
@@ -8,7 +8,7 @@
 */
 package org.freedesktop.cairo;
 
-import org.gnu.glib.Handle;
+import org.gnu.javagnome.Handle;
 
 public class Glyph extends CairoObject {
 	

Index: Format.java
===================================================================
RCS file: /cvs/cairo/cairo-java/src/java/org/freedesktop/cairo/Format.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Format.java	23 Feb 2005 18:17:52 -0000	1.1
+++ Format.java	24 Mar 2005 18:11:40 -0000	1.2
@@ -8,7 +8,7 @@
  */
 package org.freedesktop.cairo;
 
-import org.gnu.glib.Enum;
+import org.gnu.javagnome.Enum;
 
 public class Format extends Enum {

More information about the cairo-commit mailing list