PatchSet 7456 
Date: 2007/01/04 07:56:04
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
resynced with gnu classpath until 2006-09-16

2007-01-04  Dalibor Topic  <[EMAIL PROTECTED]>

        * libraries/javalib/external/classpath/ : Resynced with GNU Classpath 
until
        2006-09-16.

Members: 
        ChangeLog:1.4956->1.4957 
        libraries/javalib/external/classpath/ChangeLog:1.37->1.38 
        
libraries/javalib/external/classpath/external/sax/org/xml/sax/AttributeList.java:1.37->1.38
 
        
libraries/javalib/external/classpath/external/sax/org/xml/sax/Attributes.java:1.37->1.38
 
        
libraries/javalib/external/classpath/external/sax/org/xml/sax/ContentHandler.java:1.37->1.38
 
        
libraries/javalib/external/classpath/external/sax/org/xml/sax/DTDHandler.java:1.37->1.38
 
        
libraries/javalib/external/classpath/external/sax/org/xml/sax/DocumentHandler.java:1.37->1.38
 
        
libraries/javalib/external/classpath/external/sax/org/xml/sax/EntityResolver.java:1.37->1.38
 
        
libraries/javalib/external/classpath/external/sax/org/xml/sax/ErrorHandler.java:1.37->1.38
 
        
libraries/javalib/external/classpath/external/sax/org/xml/sax/HandlerBase.java:1.37->1.38
 
        
libraries/javalib/external/classpath/external/sax/org/xml/sax/InputSource.java:1.37->1.38
 
        
libraries/javalib/external/classpath/external/sax/org/xml/sax/Locator.java:1.37->1.38
 
        
libraries/javalib/external/classpath/external/sax/org/xml/sax/Parser.java:1.37->1.38
 
        
libraries/javalib/external/classpath/external/sax/org/xml/sax/SAXException.java:1.37->1.38
 
        
libraries/javalib/external/classpath/external/sax/org/xml/sax/SAXNotRecognizedException.java:1.37->1.38
 
        
libraries/javalib/external/classpath/external/sax/org/xml/sax/SAXNotSupportedException.java:1.37->1.38
 
        
libraries/javalib/external/classpath/external/sax/org/xml/sax/SAXParseException.java:1.37->1.38
 
        
libraries/javalib/external/classpath/external/sax/org/xml/sax/XMLFilter.java:1.37->1.38
 
        
libraries/javalib/external/classpath/external/sax/org/xml/sax/XMLReader.java:1.37->1.38
 
        
libraries/javalib/external/classpath/external/sax/org/xml/sax/package.html:1.37->1.38
 
        
libraries/javalib/external/classpath/external/sax/org/xml/sax/ext/Attributes2.java:1.37->1.38
 
        
libraries/javalib/external/classpath/external/sax/org/xml/sax/ext/Attributes2Impl.java:1.37->1.38
 
        
libraries/javalib/external/classpath/external/sax/org/xml/sax/ext/DeclHandler.java:1.37->1.38
 
        
libraries/javalib/external/classpath/external/sax/org/xml/sax/ext/DefaultHandler2.java:1.37->1.38
 
        
libraries/javalib/external/classpath/external/sax/org/xml/sax/ext/EntityResolver2.java:1.37->1.38
 
        
libraries/javalib/external/classpath/external/sax/org/xml/sax/ext/LexicalHandler.java:1.37->1.38
 
        
libraries/javalib/external/classpath/external/sax/org/xml/sax/ext/Locator2.java:1.37->1.38
 
        
libraries/javalib/external/classpath/external/sax/org/xml/sax/ext/Locator2Impl.java:1.37->1.38
 
        
libraries/javalib/external/classpath/external/sax/org/xml/sax/ext/package.html:1.37->1.38
 
        
libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/AttributeListImpl.java:1.37->1.38
 
        
libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/AttributesImpl.java:1.37->1.38
 
        
libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/DefaultHandler.java:1.37->1.38
 
        
libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/LocatorImpl.java:1.37->1.38
 
        
libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/NamespaceSupport.java:1.37->1.38
 
        
libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/NewInstance.java:1.37->1.38
 
        
libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/ParserAdapter.java:1.37->1.38
 
        
libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/ParserFactory.java:1.37->1.38
 
        
libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/XMLFilterImpl.java:1.37->1.38
 
        
libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/XMLReaderAdapter.java:1.37->1.38
 
        
libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/XMLReaderFactory.java:1.37->1.38
 
        
libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/package.html:1.37->1.38
 
        
libraries/javalib/external/classpath/gnu/java/awt/java2d/TexturePaintContext.java:1.1->1.2
 
        
libraries/javalib/external/classpath/gnu/java/awt/peer/gtk/CairoGraphics2D.java:1.4->1.5
 
        
libraries/javalib/external/classpath/gnu/java/awt/peer/gtk/CairoSurface.java:1.7->1.8
 
        
libraries/javalib/external/classpath/gnu/java/rmi/server/ActivatableRef.java:1.1->1.2
 
        libraries/javalib/external/classpath/gnu/xml/dom/DomNode.java:1.7->1.8 
        
libraries/javalib/external/classpath/gnu/xml/transform/StreamSerializer.java:1.3->1.4
 
        
libraries/javalib/external/classpath/include/gnu_java_awt_peer_gtk_CairoGraphics2D.h:1.3->1.4
 
        
libraries/javalib/external/classpath/include/gnu_java_awt_peer_gtk_CairoSurface.h:1.4->1.5
 
        libraries/javalib/external/classpath/java/awt/Menu.java:1.3->1.4 
        
libraries/javalib/external/classpath/java/awt/image/BandCombineOp.java:1.3->1.4 
        
libraries/javalib/external/classpath/java/awt/image/ConvolveOp.java:1.4->1.5 
        
libraries/javalib/external/classpath/java/awt/image/RescaleOp.java:1.3->1.4 
        
libraries/javalib/external/classpath/java/io/InputStreamReader.java:1.5->1.6 
        
libraries/javalib/external/classpath/java/io/ObjectStreamClass.java:1.6->1.7 
        
libraries/javalib/external/classpath/java/io/PipedInputStream.java:1.1->1.2 
        libraries/javalib/external/classpath/java/io/PipedReader.java:1.1->1.2 
        
libraries/javalib/external/classpath/java/net/Inet4Address.java:1.2->1.3 
        
libraries/javalib/external/classpath/java/net/Inet6Address.java:1.4->1.5 
        libraries/javalib/external/classpath/java/net/InetAddress.java:1.6->1.7 
        
libraries/javalib/external/classpath/java/net/NetworkInterface.java:1.1->1.2 
        
libraries/javalib/external/classpath/java/net/ServerSocket.java:1.2->1.3 
        libraries/javalib/external/classpath/java/net/Socket.java:1.3->1.4 
        
libraries/javalib/external/classpath/java/net/SocketPermission.java:1.4->1.5 
        
libraries/javalib/external/classpath/java/text/AttributedCharacterIterator.java:1.2->1.3
 
        
libraries/javalib/external/classpath/java/text/AttributedString.java:1.3->1.4 
        
libraries/javalib/external/classpath/java/text/AttributedStringIterator.java:1.2->1.3
 
        
libraries/javalib/external/classpath/javax/swing/AbstractButton.java:1.9->1.10 
        
libraries/javalib/external/classpath/javax/swing/AbstractSpinnerModel.java:1.3->1.4
 
        
libraries/javalib/external/classpath/javax/swing/plaf/metal/DefaultMetalTheme.java:1.1->1.2
 
        
libraries/javalib/external/classpath/javax/swing/plaf/metal/MetalIconFactory.java:1.5->1.6
 
        
libraries/javalib/external/classpath/javax/swing/plaf/metal/OceanTheme.java:1.4->1.5
 
        libraries/javalib/external/classpath/native/fdlibm/mprec.h:1.7->1.8 
        
libraries/javalib/external/classpath/native/jni/gtk-peer/cairographics2d.h:1.2->1.3
 
        
libraries/javalib/external/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoGraphics2D.c:1.4->1.5
 
        
libraries/javalib/external/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoSurface.c:1.4->1.5
 
        
libraries/javalib/external/classpath/native/jni/java-lang/java_lang_VMDouble.c:1.3->1.4
 
        
libraries/javalib/external/classpath/native/target/.cvsignore:1.3->1.4(DEAD) 
        
libraries/javalib/external/classpath/native/target/Makefile.in:1.25->1.26(DEAD) 
        
libraries/javalib/external/classpath/native/target/generic/.cvsignore:1.3->1.4(DEAD)
 
        
libraries/javalib/external/classpath/native/target/generic/Makefile.in:1.25->1.26(DEAD)
 
        
libraries/javalib/external/classpath/resource/gnu/java/util/regex/MessagesBundle_it.properties:1.3->1.4
 
        
libraries/javalib/external/classpath/scripts/classpath.spec.in:1.37->1.38 
        
libraries/javalib/external/classpath/tools/gnu/classpath/tools/javah/FieldHelper.java:1.1->1.2
 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.4956 kaffe/ChangeLog:1.4957
--- kaffe/ChangeLog:1.4956      Wed Jan  3 23:02:07 2007
+++ kaffe/ChangeLog     Thu Jan  4 07:56:04 2007
@@ -1,3 +1,8 @@
+2007-01-04  Dalibor Topic  <[EMAIL PROTECTED]>
+
+       * libraries/javalib/external/classpath/ : Resynced with GNU Classpath 
until
+        2006-09-16.
+
 2007-01-03  Dalibor Topic  <[EMAIL PROTECTED]>
 
        * configure.ac: Removed CLASSPATH_INCLUDES. Removed
Index: kaffe/libraries/javalib/external/classpath/ChangeLog
diff -u kaffe/libraries/javalib/external/classpath/ChangeLog:1.37 
kaffe/libraries/javalib/external/classpath/ChangeLog:1.38
--- kaffe/libraries/javalib/external/classpath/ChangeLog:1.37   Wed Jan  3 
23:02:19 2007
+++ kaffe/libraries/javalib/external/classpath/ChangeLog        Thu Jan  4 
07:56:04 2007
@@ -1,3 +1,229 @@
+2006-09-16  Chris Burdess  <[EMAIL PROTECTED]>
+
+       Fixes PR 28572.
+       * gnu/xml/transform/StreamSerializer.java: Don't escape XML entities
+         when in text output mode.
+
+2006-09-16  Chris Burdess  <[EMAIL PROTECTED]>
+
+       Fixes PR 27293.
+       * gnu/xml/dom/DomNode.java: Increment length of node during insert.
+
+2006-09-14  Michael Koch  <[EMAIL PROTECTED]>
+
+       * include/gnu_java_awt_peer_gtk_CairoGraphics2D.h: Recreated.
+
+2006-09-15  Chistian Elias Naur  <[EMAIL PROTECTED]>
+
+       * java/io/ObjectStreamClass.java (setClass(Class, ObjectStreamClass)):
+       Added !cl.isArray() to serialVersionUID mismatch check.
+
+2006-09-14  Francis Kung  <[EMAIL PROTECTED]>
+
+       * native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoGraphics2D.c
+       (gnu_java_awt_peer_gtk_CairoGraphics2D_setGradient): Updated constants 
to
+       be compatibe with Cairo 1.2.x.
+
+2006-09-14  Francis Kung  <[EMAIL PROTECTED]>
+
+       * gnu/java/awt/peer/gtk/CairoGraphics2D.java: Added interpolation 
constants.
+       (cairoSurfaceSetFilter): Removed method.
+       (drawImage): Pass interpolation type as argument to drawing methods.
+       (drawPixels): Added interpolation parameter.
+       (drawRaster): Pass interpolation type as argument to drawing method.
+       (getInterpolation): New method.
+       (setRenderingHint): Store hints, but do not set interpolation in cairo.
+       (setRenderingHints): Store hints, but do not set interpolation in cairo.
+       * gnu/java/awt/peer/gtk/CairoSurface.java
+       (drawSurface): Added interpolation parameter.
+       (nativeDrawSurface): Added interpolation parameter.
+       * include/gnu_java_awt_peer_gtk_CairoGraphics2D.h
+       (Java_gnu_java_awt_peer_gtk_CairoGraphics2D_drawPixels): Added 
interpolation
+       parameter.
+       (Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoSurfaceSetFilter): 
Removed.
+       * native/jni/gtk-peer/cairographics2d.h
+       (java_awt_rendering_hints_filter): Added bicubic interpolation constant.
+       * native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoGraphics2D.c
+       (Java_gnu_java_awt_peer_gtk_CairoGraphics2D_drawPixels): Added 
interpolation
+       parameter.
+       (Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoSurfaceSetFilter): 
Removed.
+       * native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoSurface.c
+       (Java_gnu_java_awt_peer_gtk_CairoSurface_nativeDrawSurface): Added
+       interpolation parameter.
+
+2006-09-14  Gary Benson  <[EMAIL PROTECTED]>
+
+       * java/net/InetAddress.java
+       (internalGetCanonicalHostName): New method.
+       (getCanonicalHostName): Use internalGetCanonicalHostName.
+       (getByLiteral): New method.
+       (getAllByName): Use getByLiteral.
+       * java/net/SocketPermission.java
+       (host): Replaced with...
+       (hostname, address): New fields.
+       (equals, hashcode): Reflect the above.
+       (setHostPort): Parse host into hostname or address.
+       (implies): Rewrite host checks.
+
+2006-09-14  David Gilbert  <[EMAIL PROTECTED]>
+
+       Fixes PR28699
+       * java/awt/Menu.java
+       (insert(MenuItem, int)): Fixed loop range,
+       (insert(String, int)): Updated API docs.
+
+2006-09-14  Christian Thalinger  <[EMAIL PROTECTED]>
+
+       Fixes PR22800
+       * native/fdlibm/mprec.h (Storeinc): Define correctly for LE
+       architectures (like Arm).
+       * native/jni/java-lang/java_lang_VMDouble.c (doubleToLongBits):
+       Reverted SWAP_DOUBLE patch.
+       (doubleToRawLongBits): Likewise.
+       (longBitsToDouble): Likewise.
+
+2006-09-14  David Gilbert  <[EMAIL PROTECTED]>
+
+       * java/awt/Menu.java: Reformatted source file.
+
+2006-09-14  Jeroen Frijters  <[EMAIL PROTECTED]>
+
+       * gnu/java/rmi/server/ActivatableRef.java
+       (readExternal, writeExternal): Partial fix for serialization format.
+
+2006-09-14  Jeroen Frijters  <[EMAIL PROTECTED]>
+
+       PR classpath/28984
+       * java/io/InputStreamReader.java
+       (read(char[],int,int)): Fixed bug.
+
+2006-09-13  Francis Kung  <[EMAIL PROTECTED]>
+
+       * java/awt/image/BandCombineOp.java: Updated documentation.
+       (filter(Raster, WritableRaster)): Use int arrays, and added simple 
cache.
+
+2006-09-13  Tom Tromey  <[EMAIL PROTECTED]>
+
+       PR classpath/29034:
+       * java/io/PipedReader.java (read): Return early if len==0.
+       * java/io/PipedInputStream.java (read): Return early if len==0.
+
+2006-09-13  Francis Kung  <[EMAIL PROTECTED]>
+
+       * java/awt/image/ConvolveOp.java (filter(Raster, WritableRaster)):
+       Removed hard-coded max sample value.
+       * java/awt/image/RescaleOp.java (filter(Raster, WritableRaster)): 
+       Fixed finding of max sample value.
+
+2006-09-12  David Gilbert  <[EMAIL PROTECTED]>
+
+       * gnu/java/awt/peer/gtk/CairoGraphics2D.java
+       (setPaint): Check null argument ('p').
+
+2006-09-12  Francis Kung  <[EMAIL PROTECTED]>
+
+       PR 27940
+       * gnu/java/awt/java2d/TexturePaintContext.java
+       (constructor): Fixed typo, getMinY instead of getMaxX.
+       * gnu/java/awt/peer/gtk/CairoGraphics2D.java
+       (setPaint): Implemented support for custom Paint classes.
+       (setPaintPixels): Renamed from setTexturePixels, added repeat parameter.
+       (setTexturePixels): Renamed to setPaintPixels, added repeat parameter.
+       * include/gnu_java_awt_peer_gtk_CairoGraphics2D.h: Renamed 
setTexturePixels
+       to setPaintPixels, and added repeat parameter.
+       * native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoGraphics2D.c:
+        Renamed setTexturePixels to setPaintPixels, and added repeat parameter.
+
+2006-09-12  Gary Benson  <[EMAIL PROTECTED]>
+
+       * java/net/NetworkInterface.java (getInetAddresses):
+       Fix port used in security check.
+
+2006-09-12  David Gilbert  <[EMAIL PROTECTED]>
+
+       * javax/swing/plaf/metal/DefaultMetalTheme.java
+       (CONTROL_TEXT_FONT): Renamed 'controlTextFont',
+       (MENU_TEXT_FONT): Renamed 'menuTextFont',
+       (getControlTextFont): Check 'swing.boldMetal' setting before 
+       initialising font,
+       (getMenuTextFont): Likewise.
+
+2006-09-12  David Gilbert  <[EMAIL PROTECTED]>
+
+       * javax/swing/plaf/metal/OceanTheme.java
+       (addCustomEntriesToTable): Added 'List.focusCellHighlightBorder' entry.
+
+2006-09-12  David Gilbert  <[EMAIL PROTECTED]>
+
+       * javax/swing/plaf/metal/MetalIconFactory.java
+       (InternalFrameDefaultMenuIcon.paintIcon): Use theme colors.
+
+2006-09-12  David Gilbert  <[EMAIL PROTECTED]>
+
+       * javax/swing/AbstractSpinnerModel.java: API doc updates.
+
+2006-09-12  David Gilbert  <[EMAIL PROTECTED]>
+
+       * javax/swing/AbstractButton.java
+       (AbstractButton): Initialise textIconGap field.
+
+2006-09-11  Tom Tromey  <[EMAIL PROTECTED]>
+
+       * tools/gnu/classpath/tools/javah/FieldHelper.java (print): Print
+       "volatile" when needed.
+
+2006-09-11  David Gilbert  <[EMAIL PROTECTED]>
+
+       * java/text/AttributedCharacterIterator.java
+       (LANGUAGE): Initialise with lower case string,
+       (INPUT_METHOD_SEGMENT): Likewise,
+       (READING): Likewise,
+       * java/text/AttributedStringIterator.java
+       (getRunLimit): Check all attributes for changes.
+
+2006-09-11  David Gilbert  <[EMAIL PROTECTED]>
+
+       * java/text/AttributedCharacterIterator.java: Added @since tag, 
+       renamed some variables (no underscores) and removed some spaces to
+       match the common style,
+       * java/text/AttributedString.java: Likewise,
+       * java/text/AttributedStringIterator.java: Likewise.
+
+2006-09-11  Gary Benson  <[EMAIL PROTECTED]>
+
+       * java/net/Inet4Address.java
+       (FAMILY): Renamed back to AF_INET.
+       (<init>, writeReplace): Reflect the above.
+       * java/net/Inet6Address.java
+       (FAMILY): Renamed back to AF_INET6.
+       (<init>): Reflect the above.
+
+2006-09-11  Cameron McCormack  <[EMAIL PROTECTED]>
+
+       Fixes PR29010
+       * java/text/AttributedString.java
+       (AttributedString(AttributedCharacterIterator, int, int, 
+       AttributedCharacterIterator.Attribute[])): Fixed check for defined 
+       attribute.
+
+2006-09-11  Gary Benson  <[EMAIL PROTECTED]>
+
+       * java/net/Inet4Address.java
+       (AF_INET): Renamed to FAMILY.
+       (<init>, writeReplace): Reflect the above.
+       * java/net/Inet6Address.java
+       (AF_INET6): Renamed to FAMILY.
+       (<init>): Reflect the above.
+
+2006-09-10  Ito Kazumitsu  <[EMAIL PROTECTED]>
+
+       Fixes bug #28867
+       Originally in Kaffe: 2004-04-16  Helmer Kraemer <[EMAIL PROTECTED]>
+       * java/net/ServerSocket.java(implAccept): Deleted socket.implCreated.
+       * java/net/Socket.java: Avoid creating a redundant file descriptor.
+       (implCreated): Deleted, (getImpl): Don't check impleCreated,
+       (bind): Call getImpl().create(true).
+
 2006-09-09  Chris Burdess  <[EMAIL PROTECTED]>
 
        * gnu/xml/xpath/Expr.java: Ensure that node-set evaluation returns
Index: 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/AttributeList.java
diff -u 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/AttributeList.java:1.37
 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/AttributeList.java:1.38
--- 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/AttributeList.java:1.37
 Wed Jan  3 23:02:20 2007
+++ 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/AttributeList.java
      Thu Jan  4 07:56:04 2007
@@ -1,7 +1,7 @@
 // SAX Attribute List Interface.
 // http://www.saxproject.org
 // No warranty; no copyright -- use this as you will.
-// $Id: AttributeList.java,v 1.37 2007/01/03 23:02:20 robilad Exp $
+// $Id: AttributeList.java,v 1.38 2007/01/04 07:56:04 robilad Exp $
 
 package org.xml.sax;
 
Index: 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/Attributes.java
diff -u 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/Attributes.java:1.37
 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/Attributes.java:1.38
--- 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/Attributes.java:1.37
    Wed Jan  3 23:02:20 2007
+++ 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/Attributes.java
 Thu Jan  4 07:56:05 2007
@@ -2,7 +2,7 @@
 // http://www.saxproject.org
 // Written by David Megginson
 // NO WARRANTY!  This class is in the public domain.
-// $Id: Attributes.java,v 1.37 2007/01/03 23:02:20 robilad Exp $
+// $Id: Attributes.java,v 1.38 2007/01/04 07:56:05 robilad Exp $
 
 package org.xml.sax;
 
Index: 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/ContentHandler.java
diff -u 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/ContentHandler.java:1.37
 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/ContentHandler.java:1.38
--- 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/ContentHandler.java:1.37
        Wed Jan  3 23:02:20 2007
+++ 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/ContentHandler.java
     Thu Jan  4 07:56:05 2007
@@ -2,7 +2,7 @@
 // http://www.saxproject.org
 // Written by David Megginson
 // NO WARRANTY!  This class is in the public domain.
-// $Id: ContentHandler.java,v 1.37 2007/01/03 23:02:20 robilad Exp $
+// $Id: ContentHandler.java,v 1.38 2007/01/04 07:56:05 robilad Exp $
 
 package org.xml.sax;
 
Index: 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/DTDHandler.java
diff -u 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/DTDHandler.java:1.37
 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/DTDHandler.java:1.38
--- 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/DTDHandler.java:1.37
    Wed Jan  3 23:02:20 2007
+++ 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/DTDHandler.java
 Thu Jan  4 07:56:05 2007
@@ -1,7 +1,7 @@
 // SAX DTD handler.
 // http://www.saxproject.org
 // No warranty; no copyright -- use this as you will.
-// $Id: DTDHandler.java,v 1.37 2007/01/03 23:02:20 robilad Exp $
+// $Id: DTDHandler.java,v 1.38 2007/01/04 07:56:05 robilad Exp $
 
 package org.xml.sax;
 
Index: 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/DocumentHandler.java
diff -u 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/DocumentHandler.java:1.37
 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/DocumentHandler.java:1.38
--- 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/DocumentHandler.java:1.37
       Wed Jan  3 23:02:20 2007
+++ 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/DocumentHandler.java
    Thu Jan  4 07:56:05 2007
@@ -1,7 +1,7 @@
 // SAX document handler.
 // http://www.saxproject.org
 // No warranty; no copyright -- use this as you will.
-// $Id: DocumentHandler.java,v 1.37 2007/01/03 23:02:20 robilad Exp $
+// $Id: DocumentHandler.java,v 1.38 2007/01/04 07:56:05 robilad Exp $
 
 package org.xml.sax;
 
Index: 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/EntityResolver.java
diff -u 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/EntityResolver.java:1.37
 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/EntityResolver.java:1.38
--- 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/EntityResolver.java:1.37
        Wed Jan  3 23:02:20 2007
+++ 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/EntityResolver.java
     Thu Jan  4 07:56:05 2007
@@ -1,7 +1,7 @@
 // SAX entity resolver.
 // http://www.saxproject.org
 // No warranty; no copyright -- use this as you will.
-// $Id: EntityResolver.java,v 1.37 2007/01/03 23:02:20 robilad Exp $
+// $Id: EntityResolver.java,v 1.38 2007/01/04 07:56:05 robilad Exp $
 
 package org.xml.sax;
 
Index: 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/ErrorHandler.java
diff -u 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/ErrorHandler.java:1.37
 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/ErrorHandler.java:1.38
--- 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/ErrorHandler.java:1.37
  Wed Jan  3 23:02:20 2007
+++ 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/ErrorHandler.java
       Thu Jan  4 07:56:05 2007
@@ -1,7 +1,7 @@
 // SAX error handler.
 // http://www.saxproject.org
 // No warranty; no copyright -- use this as you will.
-// $Id: ErrorHandler.java,v 1.37 2007/01/03 23:02:20 robilad Exp $
+// $Id: ErrorHandler.java,v 1.38 2007/01/04 07:56:05 robilad Exp $
 
 package org.xml.sax;
 
Index: 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/HandlerBase.java
diff -u 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/HandlerBase.java:1.37
 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/HandlerBase.java:1.38
--- 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/HandlerBase.java:1.37
   Wed Jan  3 23:02:21 2007
+++ 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/HandlerBase.java
        Thu Jan  4 07:56:05 2007
@@ -1,7 +1,7 @@
 // SAX default handler base class.
 // http://www.saxproject.org
 // No warranty; no copyright -- use this as you will.
-// $Id: HandlerBase.java,v 1.37 2007/01/03 23:02:21 robilad Exp $
+// $Id: HandlerBase.java,v 1.38 2007/01/04 07:56:05 robilad Exp $
 
 package org.xml.sax;
 
Index: 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/InputSource.java
diff -u 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/InputSource.java:1.37
 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/InputSource.java:1.38
--- 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/InputSource.java:1.37
   Wed Jan  3 23:02:21 2007
+++ 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/InputSource.java
        Thu Jan  4 07:56:05 2007
@@ -1,7 +1,7 @@
 // SAX input source.
 // http://www.saxproject.org
 // No warranty; no copyright -- use this as you will.
-// $Id: InputSource.java,v 1.37 2007/01/03 23:02:21 robilad Exp $
+// $Id: InputSource.java,v 1.38 2007/01/04 07:56:05 robilad Exp $
 
 package org.xml.sax;
 
Index: 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/Locator.java
diff -u 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/Locator.java:1.37
 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/Locator.java:1.38
--- 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/Locator.java:1.37
       Wed Jan  3 23:02:21 2007
+++ 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/Locator.java
    Thu Jan  4 07:56:05 2007
@@ -1,7 +1,7 @@
 // SAX locator interface for document events.
 // http://www.saxproject.org
 // No warranty; no copyright -- use this as you will.
-// $Id: Locator.java,v 1.37 2007/01/03 23:02:21 robilad Exp $
+// $Id: Locator.java,v 1.38 2007/01/04 07:56:05 robilad Exp $
 
 package org.xml.sax;
 
Index: 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/Parser.java
diff -u 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/Parser.java:1.37
 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/Parser.java:1.38
--- 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/Parser.java:1.37
        Wed Jan  3 23:02:21 2007
+++ 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/Parser.java 
    Thu Jan  4 07:56:05 2007
@@ -1,7 +1,7 @@
 // SAX parser interface.
 // http://www.saxproject.org
 // No warranty; no copyright -- use this as you will.
-// $Id: Parser.java,v 1.37 2007/01/03 23:02:21 robilad Exp $
+// $Id: Parser.java,v 1.38 2007/01/04 07:56:05 robilad Exp $
 
 package org.xml.sax;
 
Index: 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/SAXException.java
diff -u 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/SAXException.java:1.37
 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/SAXException.java:1.38
--- 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/SAXException.java:1.37
  Wed Jan  3 23:02:21 2007
+++ 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/SAXException.java
       Thu Jan  4 07:56:05 2007
@@ -1,7 +1,7 @@
 // SAX exception class.
 // http://www.saxproject.org
 // No warranty; no copyright -- use this as you will.
-// $Id: SAXException.java,v 1.37 2007/01/03 23:02:21 robilad Exp $
+// $Id: SAXException.java,v 1.38 2007/01/04 07:56:05 robilad Exp $
 
 package org.xml.sax;
 
Index: 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/SAXNotRecognizedException.java
diff -u 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/SAXNotRecognizedException.java:1.37
 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/SAXNotRecognizedException.java:1.38
--- 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/SAXNotRecognizedException.java:1.37
     Wed Jan  3 23:02:21 2007
+++ 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/SAXNotRecognizedException.java
  Thu Jan  4 07:56:05 2007
@@ -2,7 +2,7 @@
 // http://www.saxproject.org
 // Written by David Megginson
 // NO WARRANTY!  This class is in the Public Domain.
-// $Id: SAXNotRecognizedException.java,v 1.37 2007/01/03 23:02:21 robilad Exp $
+// $Id: SAXNotRecognizedException.java,v 1.38 2007/01/04 07:56:05 robilad Exp $
 
 package org.xml.sax;
 
Index: 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/SAXNotSupportedException.java
diff -u 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/SAXNotSupportedException.java:1.37
 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/SAXNotSupportedException.java:1.38
--- 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/SAXNotSupportedException.java:1.37
      Wed Jan  3 23:02:21 2007
+++ 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/SAXNotSupportedException.java
   Thu Jan  4 07:56:05 2007
@@ -2,7 +2,7 @@
 // http://www.saxproject.org
 // Written by David Megginson
 // NO WARRANTY!  This class is in the Public Domain.
-// $Id: SAXNotSupportedException.java,v 1.37 2007/01/03 23:02:21 robilad Exp $
+// $Id: SAXNotSupportedException.java,v 1.38 2007/01/04 07:56:05 robilad Exp $
 
 package org.xml.sax;
 
Index: 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/SAXParseException.java
diff -u 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/SAXParseException.java:1.37
 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/SAXParseException.java:1.38
--- 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/SAXParseException.java:1.37
     Wed Jan  3 23:02:21 2007
+++ 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/SAXParseException.java
  Thu Jan  4 07:56:05 2007
@@ -1,7 +1,7 @@
 // SAX exception class.
 // http://www.saxproject.org
 // No warranty; no copyright -- use this as you will.
-// $Id: SAXParseException.java,v 1.37 2007/01/03 23:02:21 robilad Exp $
+// $Id: SAXParseException.java,v 1.38 2007/01/04 07:56:05 robilad Exp $
 
 package org.xml.sax;
 
Index: 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/XMLFilter.java
diff -u 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/XMLFilter.java:1.37
 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/XMLFilter.java:1.38
--- 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/XMLFilter.java:1.37
     Wed Jan  3 23:02:21 2007
+++ 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/XMLFilter.java
  Thu Jan  4 07:56:05 2007
@@ -2,7 +2,7 @@
 // http://www.saxproject.org
 // Written by David Megginson
 // NO WARRANTY!  This class is in the Public Domain.
-// $Id: XMLFilter.java,v 1.37 2007/01/03 23:02:21 robilad Exp $
+// $Id: XMLFilter.java,v 1.38 2007/01/04 07:56:05 robilad Exp $
 
 package org.xml.sax;
 
Index: 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/XMLReader.java
diff -u 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/XMLReader.java:1.37
 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/XMLReader.java:1.38
--- 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/XMLReader.java:1.37
     Wed Jan  3 23:02:21 2007
+++ 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/XMLReader.java
  Thu Jan  4 07:56:05 2007
@@ -2,7 +2,7 @@
 // http://www.saxproject.org
 // Written by David Megginson
 // NO WARRANTY!  This class is in the Public Domain.
-// $Id: XMLReader.java,v 1.37 2007/01/03 23:02:21 robilad Exp $
+// $Id: XMLReader.java,v 1.38 2007/01/04 07:56:05 robilad Exp $
 
 package org.xml.sax;
 
Index: 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/package.html
diff -u 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/package.html:1.37
 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/package.html:1.38
--- 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/package.html:1.37
       Wed Jan  3 23:02:21 2007
+++ 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/package.html
    Thu Jan  4 07:56:05 2007
@@ -1,5 +1,5 @@
 <html><head>
-<!-- $Id: package.html,v 1.37 2007/01/03 23:02:21 robilad Exp $ -->
+<!-- $Id: package.html,v 1.38 2007/01/04 07:56:05 robilad Exp $ -->
 </head><body>
 
 <p> This package provides the core SAX APIs.
Index: 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/ext/Attributes2.java
diff -u 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/ext/Attributes2.java:1.37
 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/ext/Attributes2.java:1.38
--- 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/ext/Attributes2.java:1.37
       Wed Jan  3 23:02:21 2007
+++ 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/ext/Attributes2.java
    Thu Jan  4 07:56:05 2007
@@ -1,7 +1,7 @@
 // Attributes2.java - extended Attributes
 // http://www.saxproject.org
 // Public Domain: no warranty.
-// $Id: Attributes2.java,v 1.37 2007/01/03 23:02:21 robilad Exp $
+// $Id: Attributes2.java,v 1.38 2007/01/04 07:56:05 robilad Exp $
 
 package org.xml.sax.ext;
 
Index: 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/ext/Attributes2Impl.java
diff -u 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/ext/Attributes2Impl.java:1.37
 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/ext/Attributes2Impl.java:1.38
--- 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/ext/Attributes2Impl.java:1.37
   Wed Jan  3 23:02:21 2007
+++ 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/ext/Attributes2Impl.java
        Thu Jan  4 07:56:05 2007
@@ -1,7 +1,7 @@
 // Attributes2Impl.java - extended AttributesImpl
 // http://www.saxproject.org
 // Public Domain: no warranty.
-// $Id: Attributes2Impl.java,v 1.37 2007/01/03 23:02:21 robilad Exp $
+// $Id: Attributes2Impl.java,v 1.38 2007/01/04 07:56:05 robilad Exp $
 
 package org.xml.sax.ext;
 
Index: 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/ext/DeclHandler.java
diff -u 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/ext/DeclHandler.java:1.37
 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/ext/DeclHandler.java:1.38
--- 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/ext/DeclHandler.java:1.37
       Wed Jan  3 23:02:21 2007
+++ 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/ext/DeclHandler.java
    Thu Jan  4 07:56:05 2007
@@ -1,7 +1,7 @@
 // DeclHandler.java - Optional handler for DTD declaration events.
 // http://www.saxproject.org
 // Public Domain: no warranty.
-// $Id: DeclHandler.java,v 1.37 2007/01/03 23:02:21 robilad Exp $
+// $Id: DeclHandler.java,v 1.38 2007/01/04 07:56:05 robilad Exp $
 
 package org.xml.sax.ext;
 
Index: 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/ext/DefaultHandler2.java
diff -u 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/ext/DefaultHandler2.java:1.37
 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/ext/DefaultHandler2.java:1.38
--- 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/ext/DefaultHandler2.java:1.37
   Wed Jan  3 23:02:21 2007
+++ 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/ext/DefaultHandler2.java
        Thu Jan  4 07:56:05 2007
@@ -1,7 +1,7 @@
 // DefaultHandler2.java - extended DefaultHandler
 // http://www.saxproject.org
 // Public Domain: no warranty.
-// $Id: DefaultHandler2.java,v 1.37 2007/01/03 23:02:21 robilad Exp $
+// $Id: DefaultHandler2.java,v 1.38 2007/01/04 07:56:05 robilad Exp $
 
 package org.xml.sax.ext;
 
Index: 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/ext/EntityResolver2.java
diff -u 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/ext/EntityResolver2.java:1.37
 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/ext/EntityResolver2.java:1.38
--- 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/ext/EntityResolver2.java:1.37
   Wed Jan  3 23:02:21 2007
+++ 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/ext/EntityResolver2.java
        Thu Jan  4 07:56:05 2007
@@ -1,7 +1,7 @@
 // EntityResolver2.java - Extended SAX entity resolver.
 // http://www.saxproject.org
 // No warranty; no copyright -- use this as you will.
-// $Id: EntityResolver2.java,v 1.37 2007/01/03 23:02:21 robilad Exp $
+// $Id: EntityResolver2.java,v 1.38 2007/01/04 07:56:05 robilad Exp $
 
 package org.xml.sax.ext;
 
Index: 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/ext/LexicalHandler.java
diff -u 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/ext/LexicalHandler.java:1.37
 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/ext/LexicalHandler.java:1.38
--- 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/ext/LexicalHandler.java:1.37
    Wed Jan  3 23:02:21 2007
+++ 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/ext/LexicalHandler.java
 Thu Jan  4 07:56:05 2007
@@ -1,7 +1,7 @@
 // LexicalHandler.java - optional handler for lexical parse events.
 // http://www.saxproject.org
 // Public Domain: no warranty.
-// $Id: LexicalHandler.java,v 1.37 2007/01/03 23:02:21 robilad Exp $
+// $Id: LexicalHandler.java,v 1.38 2007/01/04 07:56:05 robilad Exp $
 
 package org.xml.sax.ext;
 
Index: 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/ext/Locator2.java
diff -u 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/ext/Locator2.java:1.37
 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/ext/Locator2.java:1.38
--- 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/ext/Locator2.java:1.37
  Wed Jan  3 23:02:21 2007
+++ 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/ext/Locator2.java
       Thu Jan  4 07:56:05 2007
@@ -1,7 +1,7 @@
 // Locator2.java - extended Locator
 // http://www.saxproject.org
 // Public Domain: no warranty.
-// $Id: Locator2.java,v 1.37 2007/01/03 23:02:21 robilad Exp $
+// $Id: Locator2.java,v 1.38 2007/01/04 07:56:05 robilad Exp $
 
 package org.xml.sax.ext;
 
Index: 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/ext/Locator2Impl.java
diff -u 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/ext/Locator2Impl.java:1.37
 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/ext/Locator2Impl.java:1.38
--- 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/ext/Locator2Impl.java:1.37
      Wed Jan  3 23:02:21 2007
+++ 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/ext/Locator2Impl.java
   Thu Jan  4 07:56:05 2007
@@ -1,7 +1,7 @@
 // Locator2Impl.java - extended LocatorImpl
 // http://www.saxproject.org
 // Public Domain: no warranty.
-// $Id: Locator2Impl.java,v 1.37 2007/01/03 23:02:21 robilad Exp $
+// $Id: Locator2Impl.java,v 1.38 2007/01/04 07:56:05 robilad Exp $
 
 package org.xml.sax.ext;
 
Index: 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/ext/package.html
diff -u 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/ext/package.html:1.37
 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/ext/package.html:1.38
--- 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/ext/package.html:1.37
   Wed Jan  3 23:02:21 2007
+++ 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/ext/package.html
        Thu Jan  4 07:56:05 2007
@@ -1,5 +1,5 @@
 <HTML><HEAD>
-<!-- $Id: package.html,v 1.37 2007/01/03 23:02:21 robilad Exp $ -->
+<!-- $Id: package.html,v 1.38 2007/01/04 07:56:05 robilad Exp $ -->
 </HEAD><BODY>
 
 <p>
Index: 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/AttributeListImpl.java
diff -u 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/AttributeListImpl.java:1.37
 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/AttributeListImpl.java:1.38
--- 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/AttributeListImpl.java:1.37
     Wed Jan  3 23:02:21 2007
+++ 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/AttributeListImpl.java
  Thu Jan  4 07:56:05 2007
@@ -1,7 +1,7 @@
 // SAX default implementation for AttributeList.
 // http://www.saxproject.org
 // No warranty; no copyright -- use this as you will.
-// $Id: AttributeListImpl.java,v 1.37 2007/01/03 23:02:21 robilad Exp $
+// $Id: AttributeListImpl.java,v 1.38 2007/01/04 07:56:05 robilad Exp $
 
 package org.xml.sax.helpers;
 
Index: 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/AttributesImpl.java
diff -u 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/AttributesImpl.java:1.37
 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/AttributesImpl.java:1.38
--- 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/AttributesImpl.java:1.37
        Wed Jan  3 23:02:21 2007
+++ 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/AttributesImpl.java
     Thu Jan  4 07:56:05 2007
@@ -2,7 +2,7 @@
 // http://www.saxproject.org
 // Written by David Megginson
 // NO WARRANTY!  This class is in the public domain.
-// $Id: AttributesImpl.java,v 1.37 2007/01/03 23:02:21 robilad Exp $
+// $Id: AttributesImpl.java,v 1.38 2007/01/04 07:56:05 robilad Exp $
 
 package org.xml.sax.helpers;
 
Index: 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/DefaultHandler.java
diff -u 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/DefaultHandler.java:1.37
 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/DefaultHandler.java:1.38
--- 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/DefaultHandler.java:1.37
        Wed Jan  3 23:02:21 2007
+++ 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/DefaultHandler.java
     Thu Jan  4 07:56:05 2007
@@ -2,7 +2,7 @@
 // http://www.saxproject.org
 // Written by David Megginson
 // NO WARRANTY!  This class is in the public domain.
-// $Id: DefaultHandler.java,v 1.37 2007/01/03 23:02:21 robilad Exp $
+// $Id: DefaultHandler.java,v 1.38 2007/01/04 07:56:05 robilad Exp $
 
 package org.xml.sax.helpers;
 
Index: 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/LocatorImpl.java
diff -u 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/LocatorImpl.java:1.37
 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/LocatorImpl.java:1.38
--- 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/LocatorImpl.java:1.37
   Wed Jan  3 23:02:21 2007
+++ 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/LocatorImpl.java
        Thu Jan  4 07:56:05 2007
@@ -1,7 +1,7 @@
 // SAX default implementation for Locator.
 // http://www.saxproject.org
 // No warranty; no copyright -- use this as you will.
-// $Id: LocatorImpl.java,v 1.37 2007/01/03 23:02:21 robilad Exp $
+// $Id: LocatorImpl.java,v 1.38 2007/01/04 07:56:05 robilad Exp $
 
 package org.xml.sax.helpers;
 
Index: 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/NamespaceSupport.java
diff -u 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/NamespaceSupport.java:1.37
 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/NamespaceSupport.java:1.38
--- 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/NamespaceSupport.java:1.37
      Wed Jan  3 23:02:21 2007
+++ 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/NamespaceSupport.java
   Thu Jan  4 07:56:06 2007
@@ -2,7 +2,7 @@
 // http://www.saxproject.org
 // Written by David Megginson
 // This class is in the Public Domain.  NO WARRANTY!
-// $Id: NamespaceSupport.java,v 1.37 2007/01/03 23:02:21 robilad Exp $
+// $Id: NamespaceSupport.java,v 1.38 2007/01/04 07:56:06 robilad Exp $
 
 package org.xml.sax.helpers;
 
Index: 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/NewInstance.java
diff -u 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/NewInstance.java:1.37
 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/NewInstance.java:1.38
--- 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/NewInstance.java:1.37
   Wed Jan  3 23:02:21 2007
+++ 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/NewInstance.java
        Thu Jan  4 07:56:06 2007
@@ -3,7 +3,7 @@
 // Written by Edwin Goei, [EMAIL PROTECTED]
 // and by David Brownell, [EMAIL PROTECTED]
 // NO WARRANTY!  This class is in the Public Domain.
-// $Id: NewInstance.java,v 1.37 2007/01/03 23:02:21 robilad Exp $
+// $Id: NewInstance.java,v 1.38 2007/01/04 07:56:06 robilad Exp $
 
 package org.xml.sax.helpers;
 
Index: 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/ParserAdapter.java
diff -u 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/ParserAdapter.java:1.37
 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/ParserAdapter.java:1.38
--- 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/ParserAdapter.java:1.37
 Wed Jan  3 23:02:21 2007
+++ 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/ParserAdapter.java
      Thu Jan  4 07:56:06 2007
@@ -2,7 +2,7 @@
 // http://www.saxproject.org
 // Written by David Megginson
 // NO WARRANTY!  This class is in the public domain.
-// $Id: ParserAdapter.java,v 1.37 2007/01/03 23:02:21 robilad Exp $
+// $Id: ParserAdapter.java,v 1.38 2007/01/04 07:56:06 robilad Exp $
 
 package org.xml.sax.helpers;
 
Index: 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/ParserFactory.java
diff -u 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/ParserFactory.java:1.37
 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/ParserFactory.java:1.38
--- 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/ParserFactory.java:1.37
 Wed Jan  3 23:02:21 2007
+++ 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/ParserFactory.java
      Thu Jan  4 07:56:06 2007
@@ -1,7 +1,7 @@
 // SAX parser factory.
 // http://www.saxproject.org
 // No warranty; no copyright -- use this as you will.
-// $Id: ParserFactory.java,v 1.37 2007/01/03 23:02:21 robilad Exp $
+// $Id: ParserFactory.java,v 1.38 2007/01/04 07:56:06 robilad Exp $
 
 package org.xml.sax.helpers;
 
Index: 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/XMLFilterImpl.java
diff -u 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/XMLFilterImpl.java:1.37
 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/XMLFilterImpl.java:1.38
--- 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/XMLFilterImpl.java:1.37
 Wed Jan  3 23:02:21 2007
+++ 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/XMLFilterImpl.java
      Thu Jan  4 07:56:06 2007
@@ -2,7 +2,7 @@
 // http://www.saxproject.org
 // Written by David Megginson
 // NO WARRANTY!  This class is in the Public Domain.
-// $Id: XMLFilterImpl.java,v 1.37 2007/01/03 23:02:21 robilad Exp $
+// $Id: XMLFilterImpl.java,v 1.38 2007/01/04 07:56:06 robilad Exp $
 
 package org.xml.sax.helpers;
 
Index: 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/XMLReaderAdapter.java
diff -u 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/XMLReaderAdapter.java:1.37
 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/XMLReaderAdapter.java:1.38
--- 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/XMLReaderAdapter.java:1.37
      Wed Jan  3 23:02:21 2007
+++ 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/XMLReaderAdapter.java
   Thu Jan  4 07:56:06 2007
@@ -2,7 +2,7 @@
 // http://www.saxproject.org
 // Written by David Megginson
 // NO WARRANTY!  This class is in the public domain.
-// $Id: XMLReaderAdapter.java,v 1.37 2007/01/03 23:02:21 robilad Exp $
+// $Id: XMLReaderAdapter.java,v 1.38 2007/01/04 07:56:06 robilad Exp $
 
 package org.xml.sax.helpers;
 
Index: 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/XMLReaderFactory.java
diff -u 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/XMLReaderFactory.java:1.37
 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/XMLReaderFactory.java:1.38
--- 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/XMLReaderFactory.java:1.37
      Wed Jan  3 23:02:21 2007
+++ 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/XMLReaderFactory.java
   Thu Jan  4 07:56:06 2007
@@ -3,7 +3,7 @@
 // Written by David Megginson
 // and by David Brownell
 // NO WARRANTY!  This class is in the Public Domain.
-// $Id: XMLReaderFactory.java,v 1.37 2007/01/03 23:02:21 robilad Exp $
+// $Id: XMLReaderFactory.java,v 1.38 2007/01/04 07:56:06 robilad Exp $
 
 package org.xml.sax.helpers;
 import java.io.BufferedReader;
Index: 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/package.html
diff -u 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/package.html:1.37
 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/package.html:1.38
--- 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/package.html:1.37
       Wed Jan  3 23:02:21 2007
+++ 
kaffe/libraries/javalib/external/classpath/external/sax/org/xml/sax/helpers/package.html
    Thu Jan  4 07:56:06 2007
@@ -1,5 +1,5 @@
 <HTML><HEAD>
-<!-- $Id: package.html,v 1.37 2007/01/03 23:02:21 robilad Exp $ -->
+<!-- $Id: package.html,v 1.38 2007/01/04 07:56:06 robilad Exp $ -->
 </HEAD><BODY>
 
 <p>This package contains "helper" classes, including
Index: 
kaffe/libraries/javalib/external/classpath/gnu/java/awt/java2d/TexturePaintContext.java
diff -u 
kaffe/libraries/javalib/external/classpath/gnu/java/awt/java2d/TexturePaintContext.java:1.1
 
kaffe/libraries/javalib/external/classpath/gnu/java/awt/java2d/TexturePaintContext.java:1.2
--- 
kaffe/libraries/javalib/external/classpath/gnu/java/awt/java2d/TexturePaintContext.java:1.1
 Sun Jun  4 23:51:45 2006
+++ 
kaffe/libraries/javalib/external/classpath/gnu/java/awt/java2d/TexturePaintContext.java
     Thu Jan  4 07:56:06 2007
@@ -104,7 +104,7 @@
         double scaleY = anchor.getHeight() / image.getHeight();
         transform = (AffineTransform) xform.clone();
         transform.scale(scaleX, scaleY);
-        transform.translate(-anchor.getMinX(), -anchor.getMaxX());
+        transform.translate(-anchor.getMinX(), -anchor.getMinY());
         transform = transform.createInverse();
       }
     catch (NoninvertibleTransformException ex)
Index: 
kaffe/libraries/javalib/external/classpath/gnu/java/awt/peer/gtk/CairoGraphics2D.java
diff -u 
kaffe/libraries/javalib/external/classpath/gnu/java/awt/peer/gtk/CairoGraphics2D.java:1.4
 
kaffe/libraries/javalib/external/classpath/gnu/java/awt/peer/gtk/CairoGraphics2D.java:1.5
--- 
kaffe/libraries/javalib/external/classpath/gnu/java/awt/peer/gtk/CairoGraphics2D.java:1.4
   Fri Dec  8 01:57:45 2006
+++ 
kaffe/libraries/javalib/external/classpath/gnu/java/awt/peer/gtk/CairoGraphics2D.java
       Thu Jan  4 07:56:06 2007
@@ -53,6 +53,8 @@
 import java.awt.GraphicsConfiguration;
 import java.awt.Image;
 import java.awt.Paint;
+import java.awt.PaintContext;
+import java.awt.Point;
 import java.awt.Polygon;
 import java.awt.Rectangle;
 import java.awt.RenderingHints;
@@ -190,6 +192,18 @@
                                                  0xFF000000);
 
   /**
+   * Native constants for interpolation methods.
+   * Note, this corresponds to an enum in native/jni/gtk-peer/cairographics2d.h
+   */
+  public static final int INTERPOLATION_NEAREST         = 0,
+                          INTERPOLATION_BILINEAR        = 1,
+                          INTERPOLATION_BICUBIC         = 5,
+                          ALPHA_INTERPOLATION_SPEED     = 2,
+                          ALPHA_INTERPOLATION_QUALITY   = 3,
+                          ALPHA_INTERPOLATION_DEFAULT   = 4;
+  // TODO: Does ALPHA_INTERPOLATION really correspond to 
CAIRO_FILTER_FAST/BEST/GOOD?
+  
+  /**
    * Constructor does nothing.
    */
   public CairoGraphics2D()
@@ -309,15 +323,16 @@
    * @param i2u - affine transform array
    */
   private native void drawPixels(long pointer, int[] pixels, int w, int h,
-                                 int stride, double[] i2u, double alpha);
+                                 int stride, double[] i2u, double alpha,
+                                 int interpolation);
 
   private native void setGradient(long pointer, double x1, double y1,
                                   double x2, double y2,
                                   int r1, int g1, int b1, int a1, int r2,
                                   int g2, int b2, int a2, boolean cyclic);
   
-  private native void setTexturePixels(long pointer, int[] pixels, int w,
-                                       int h, int stride);
+  private native void setPaintPixels(long pointer, int[] pixels, int w,
+                                       int h, int stride, boolean repeat);
 
   /**
    * Set the current transform matrix
@@ -441,11 +456,6 @@
   private native void cairoResetClip(long pointer);
 
   /**
-   * Set interpolation types
-   */
-  private native void cairoSurfaceSetFilter(long pointer, int filter);
-
-  /**
    * Draws a line from (x1,y1) to (x2,y2).
    *
    * @param pointer the native pointer
@@ -666,7 +676,7 @@
 
   public void setPaint(Paint p)
   {
-    if (paint == null)
+    if (p == null)
       return;
 
     paint = p;
@@ -690,7 +700,7 @@
        AffineTransformOp op = new AffineTransformOp(at, getRenderingHints());
        BufferedImage texture = op.filter(img, null);
        int[] pixels = texture.getRGB(0, 0, width, height, null, 0, width);
-       setTexturePixels(nativePointer, pixels, width, height, width);
+       setPaintPixels(nativePointer, pixels, width, height, width, true);
       }
     else if (paint instanceof GradientPaint)
       {
@@ -705,7 +715,52 @@
                     gp.isCyclic());
       }
     else
-      throw new java.lang.UnsupportedOperationException();
+      {
+        // Get bounds in device space
+        int minX = 0;
+        int minY = 0;
+        int width = (int)getRealBounds().getWidth();
+        int height = (int)getRealBounds().getHeight();
+        
+        Point2D origin = transform.transform(new Point2D.Double(minX, minY),
+                                             null);
+        Point2D extreme = transform.transform(new Point2D.Double(width + minX,
+                                                                 height + 
minY),
+                                              null);
+        minX = (int)origin.getX();
+        minY = (int)origin.getY();
+        width = (int)extreme.getX() - minX;
+        height = (int)extreme.getY() - minY;
+
+        // Get raster of the paint background
+        PaintContext pc = paint.createContext(ColorModel.getRGBdefault(),
+                                              new Rectangle(minX, minY,
+                                                            width, height),
+                                              getRealBounds(),
+                                              transform, hints);
+        
+        Raster raster = pc.getRaster(minX, minY, width, height);
+        
+        // Work around colorspace issues, and force use of the
+        // BufferedImage.getRGB method... this can be improved upon.
+        WritableRaster wr = 
Raster.createWritableRaster(raster.getSampleModel(),
+                                                        new 
Point(raster.getMinX(),
+                                                                  
raster.getMinY()));
+        wr.setRect(raster);
+        
+        BufferedImage img2 = new BufferedImage(pc.getColorModel(), wr,
+                                               
pc.getColorModel().isAlphaPremultiplied(),
+                                               null);
+        
+        // Set pixels in cairo
+        setPaintPixels(nativePointer,
+                       img2.getRGB(0, 0, width, height, null, 0, width),
+                       width, height, width, false);
+        //  setPaintPixels(nativePointer,
+        //                 raster.getPixels(0, 0, width, height, (int[])null),
+        //                 width, height, width, false);
+        // doesn't work... but would be much more efficient!
+      }
   }
 
   public Stroke getStroke()
@@ -1150,32 +1205,10 @@
 
   ///////////////////////// RENDERING HINTS ///////////////////////////////////
 

*** Patch too long, truncated ***

_______________________________________________
kaffe mailing list
[email protected]
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe

Reply via email to