[cairo-commit] cairo-java ChangeLog,1.36,1.37 Makefile.am,1.4,1.5

[Jeffrey Morgan]

Committed by: kuzman

Update of /cvs/cairo/cairo-java
In directory gabe:/tmp/cvs-serv10446

Modified Files:
	ChangeLog Makefile.am 
Log Message:
Changes to match upstream API changes

Index: ChangeLog
===================================================================
RCS file: /cvs/cairo/cairo-java/ChangeLog,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- ChangeLog	6 Apr 2005 22:35:00 -0000	1.36
+++ ChangeLog	11 Apr 2005 00:47:22 -0000	1.37
@@ -1,3 +1,31 @@
+2005-04-10  Jeffrey Morgan  <kuzman at gmail.com>
+
+	* Makefile.am: Renamed class
+	* src/java/org/freedesktop/cairo/Cairo.java: (Cairo),
+	(Cairo.selectFontFace), (Cairo.setFontSize), (Cairo.setFontMatrix),
+	(Cairo.getFontFace), (Cairo.getFontExtents), (Cairo.setFont):
+	updated several methods to match upstream
+	* src/java/org/freedesktop/cairo/Font.java: renamed FontFace
+	* src/java/org/freedesktop/cairo/FreetypeFont.java: (FreetypeFont):
+	* src/java/org/freedesktop/cairo/Matrix.java: (Matrix.copy),
+	(Matrix.setIdentity), (Matrix.setAffine), (Matrix.translate),
+	(Matrix.scale), (Matrix.rotate), (Matrix.invert),
+	(Matrix.multiply), (Matrix): Updated native methods to match
+	upstream
+	* src/java/org/freedesktop/cairo/PngSurface.java:
+	(PngSurface.PngSurface), (PngSurface), (PngSurface.write): changes to
+	match upstream
+	* src/jni/org_freedesktop_cairo_Cairo.c:
+	* src/jni/org_freedesktop_cairo_Font.c:
+	* src/jni/org_freedesktop_cairo_FreetypeFont.c:
+	* src/jni/org_freedesktop_cairo_Matrix.c:
+	* src/jni/org_freedesktop_cairo_PngSurface.c:
+	* test/kapow/Kapow.java: (Kapow.Kapow): Updated example with
+	new API
+	* test/snippets/Snippets.java: (Snippets..text),
+	(Snippets..text_align_center), (Snippets..text_extents): updated
+	example with new API
+
 2005-04-06  Jeffrey Morgan  <kuzman at gmail.com>
 
 	* src/jni/org_freedesktop_cairo_Cairo.c: changed casts to

Index: Makefile.am
===================================================================
RCS file: /cvs/cairo/cairo-java/Makefile.am,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- Makefile.am	25 Mar 2005 16:18:03 -0000	1.4
+++ Makefile.am	11 Apr 2005 00:47:22 -0000	1.5
@@ -17,8 +17,8 @@
 	src/java/org/freedesktop/cairo/Extend.java \
 	src/java/org/freedesktop/cairo/FillRule.java \
 	src/java/org/freedesktop/cairo/Filter.java \
-	src/java/org/freedesktop/cairo/Font.java \
 	src/java/org/freedesktop/cairo/FontExtents.java \
+	src/java/org/freedesktop/cairo/FontFace.java \
 	src/java/org/freedesktop/cairo/FontSlant.java \
 	src/java/org/freedesktop/cairo/FontWeight.java \
 	src/java/org/freedesktop/cairo/Format.java \
@@ -41,8 +41,8 @@
 
 jni_cairo_source_files = \
 	src/jni/org_freedesktop_cairo_Cairo.c \
-	src/jni/org_freedesktop_cairo_Font.c \
 	src/jni/org_freedesktop_cairo_FontExtents.c \
+	src/jni/org_freedesktop_cairo_FontFace.c \
 	src/jni/org_freedesktop_cairo_FreetypeFont.c \
 	src/jni/org_freedesktop_cairo_Glyph.c \
 	src/jni/org_freedesktop_cairo_ImageSurface.c \