Index: javax/xml/stream/XMLEventFactory.java =================================================================== RCS file: /cvsroot/classpath/classpath/javax/xml/stream/XMLEventFactory.java,v retrieving revision 1.1 diff -u -r1.1 XMLEventFactory.java --- javax/xml/stream/XMLEventFactory.java 3 Sep 2005 10:04:19 -0000 1.1 +++ javax/xml/stream/XMLEventFactory.java 4 Sep 2005 09:39:15 -0000 @@ -67,6 +67,10 @@ public abstract class XMLEventFactory { + protected XMLEventFactory() + { + } + /** * Create a new factory instance. * @see #newInstance(String,ClassLoader) @@ -317,8 +321,10 @@ /** * Create an entity reference event. */ + //public abstract EntityReference createEntityReference(String name, + // EntityDeclaration declaration); public abstract EntityReference createEntityReference(String name, - EntityDeclaration declaration); + String replacementText); /** * Create a comment event. Index: javax/xml/stream/XMLEventWriter.java =================================================================== RCS file: /cvsroot/classpath/classpath/javax/xml/stream/XMLEventWriter.java,v retrieving revision 1.1 diff -u -r1.1 XMLEventWriter.java --- javax/xml/stream/XMLEventWriter.java 3 Sep 2005 10:04:19 -0000 1.1 +++ javax/xml/stream/XMLEventWriter.java 4 Sep 2005 09:39:15 -0000 @@ -39,11 +39,13 @@ import javax.xml.namespace.NamespaceContext; import javax.xml.stream.events.XMLEvent; +import javax.xml.stream.util.XMLEventConsumer; /** * Interface for writing XML documents from a series of events. */ public interface XMLEventWriter + extends XMLEventConsumer { /** Index: javax/xml/stream/XMLInputFactory.java =================================================================== RCS file: /cvsroot/classpath/classpath/javax/xml/stream/XMLInputFactory.java,v retrieving revision 1.1 diff -u -r1.1 XMLInputFactory.java --- javax/xml/stream/XMLInputFactory.java 3 Sep 2005 10:04:19 -0000 1.1 +++ javax/xml/stream/XMLInputFactory.java 4 Sep 2005 09:39:15 -0000 @@ -444,6 +444,16 @@ * Returns the event allocator. */ public abstract XMLEventAllocator getEventAllocator(); + + /** + * Sets whether text will be coalesced. + */ + public abstract void setCoalescing(boolean coalescing); + + /** + * Indicates whether text will be coalesced. + */ + public abstract boolean isCoalescing(); } Index: javax/xml/stream/XMLOutputFactory.java =================================================================== RCS file: /cvsroot/classpath/classpath/javax/xml/stream/XMLOutputFactory.java,v retrieving revision 1.1 diff -u -r1.1 XMLOutputFactory.java --- javax/xml/stream/XMLOutputFactory.java 3 Sep 2005 10:04:19 -0000 1.1 +++ javax/xml/stream/XMLOutputFactory.java 4 Sep 2005 09:39:15 -0000 @@ -46,7 +46,7 @@ import java.io.OutputStream; import java.io.Writer; import java.util.Properties; -import javax.xml.transform.Result; +//import javax.xml.transform.Result; /** * Factory for obtaining XML stream and event writers for various kinds of @@ -77,8 +77,8 @@ * If true, the writer will create a namespace declaration for any * attribute that doesn't have a namespace declaration in scope. */ - public static final java.lang.String IS_REPAIRING_NAMESPACES = - "javax.xml.stream.isRepairingNamespaces"; + public static final java.lang.String IS_PREFIX_DEFAULTING = + "javax.xml.stream.isPrefixDefaulting"; protected XMLOutputFactory() { @@ -220,16 +220,16 @@ * @exception UnsupportedOperationException if this method is not * supported */ - public abstract XMLStreamWriter createXMLStreamWriter(Result result) - throws XMLStreamException; + //public abstract XMLStreamWriter createXMLStreamWriter(Result result) + // throws XMLStreamException; /** * Creates a new event writer. * @exception UnsupportedOperationException if this method is not * supported */ - public abstract XMLEventWriter createXMLEventWriter(Result result) - throws XMLStreamException; + //public abstract XMLEventWriter createXMLEventWriter(Result result) + // throws XMLStreamException; /** * Creates a new event writer. @@ -265,9 +265,23 @@ throws IllegalArgumentException; /** + * Indicates whether writers created by this factory will perform prefix + * defaulting. + * @see #IS_PREFIX_DEFAULTING + */ + public abstract boolean isPrefixDefaulting(); + + /** * Indicates whether the specified property is supported. */ public abstract boolean isPropertySupported(String name); + + /** + * Sets whether writers created by this factory will perform prefix + * defaulting. + * @see #IS_PREFIX_DEFAULTING + */ + public abstract void setPrefixDefaulting(boolean value); } Index: javax/xml/stream/XMLResolver.java =================================================================== RCS file: /cvsroot/classpath/classpath/javax/xml/stream/XMLResolver.java,v retrieving revision 1.1 diff -u -r1.1 XMLResolver.java --- javax/xml/stream/XMLResolver.java 3 Sep 2005 10:04:19 -0000 1.1 +++ javax/xml/stream/XMLResolver.java 4 Sep 2005 09:39:15 -0000 @@ -37,6 +37,8 @@ package javax.xml.stream; +import java.io.InputStream; + /** * Interface used to resolve XML external entities during parsing. */ @@ -57,9 +59,27 @@ * @param systemID the system ID of the external entity * @param baseURI the absolute base URI of the referring entity * @param namespace the namespace of the external entity - */ + * Object resolveEntity(String publicID, String systemID, String baseURI, String namespace) + throws XMLStreamException;*/ + + /** + * Retrieves a resource from the specified URI. + */ + XMLEventReader resolveAsXMLEventReader(String uri) + throws XMLStreamException; + + /** + * Retrieves a resource from the specified URI. + */ + XMLStreamReader resolveAsXMLStreamReader(String uri) + throws XMLStreamException; + + /** + * Retrieves a resource from the specified URI. + */ + InputStream resolve(String uri) throws XMLStreamException; } Index: javax/xml/stream/XMLStreamConstants.java =================================================================== RCS file: /cvsroot/classpath/classpath/javax/xml/stream/XMLStreamConstants.java,v retrieving revision 1.1 diff -u -r1.1 XMLStreamConstants.java --- javax/xml/stream/XMLStreamConstants.java 3 Sep 2005 10:04:19 -0000 1.1 +++ javax/xml/stream/XMLStreamConstants.java 4 Sep 2005 09:39:15 -0000 @@ -109,14 +109,24 @@ static final int NAMESPACE = 13; /** + * A start-entity event. + */ + static final int START_ENTITY = 14; + + /** + * An end-entity event. + */ + static final int END_ENTITY = 15; + + /** * A notation declaration event. */ - static final int NOTATION_DECLARATION = 14; + static final int NOTATION_DECLARATION = 16; /** * An entity declaration event. */ - static final int ENTITY_DECLARATION = 15; + static final int ENTITY_DECLARATION = 17; } Index: javax/xml/stream/events/Attribute.java =================================================================== RCS file: /cvsroot/classpath/classpath/javax/xml/stream/events/Attribute.java,v retrieving revision 1.1 diff -u -r1.1 Attribute.java --- javax/xml/stream/events/Attribute.java 3 Sep 2005 10:04:19 -0000 1.1 +++ javax/xml/stream/events/Attribute.java 4 Sep 2005 09:39:15 -0000 @@ -59,7 +59,7 @@ /** * Returns the type of this attribute. */ - String getDTDType(); + QName getDTDType(); /** * Indicates whether this attribute was specified in the input source, or Index: javax/xml/stream/events/EndEntity.java =================================================================== RCS file: javax/xml/stream/events/EndEntity.java diff -N javax/xml/stream/events/EndEntity.java --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ javax/xml/stream/events/EndEntity.java 4 Sep 2005 09:39:15 -0000 @@ -0,0 +1,53 @@ +/* EndEntity.java -- + Copyright (C) 2005 Free Software Foundation, Inc. + +This file is part of GNU Classpath. + +GNU Classpath is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2, or (at your option) +any later version. + +GNU Classpath is distributed in the hope that it will be useful, but +WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +General Public License for more details. + +You should have received a copy of the GNU General Public License +along with GNU Classpath; see the file COPYING. If not, write to the +Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +02110-1301 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ + +package javax.xml.stream.events; + +/** + * An end-entity event. + */ +public interface EndEntity + extends XMLEvent +{ + + /** + * Returns the entity name. + */ + String getName(); + +} + Index: javax/xml/stream/events/EntityDeclaration.java =================================================================== RCS file: /cvsroot/classpath/classpath/javax/xml/stream/events/EntityDeclaration.java,v retrieving revision 1.1 diff -u -r1.1 EntityDeclaration.java --- javax/xml/stream/events/EntityDeclaration.java 3 Sep 2005 10:04:19 -0000 1.1 +++ javax/xml/stream/events/EntityDeclaration.java 4 Sep 2005 09:39:15 -0000 @@ -67,12 +67,12 @@ /** * Returns the replacement text for the entity. */ - String getReplacementText(); + //String getReplacementText(); /** * Returns the base URI for the entity. */ - String getBaseURI(); + //String getBaseURI(); } Index: javax/xml/stream/events/EntityReference.java =================================================================== RCS file: /cvsroot/classpath/classpath/javax/xml/stream/events/EntityReference.java,v retrieving revision 1.1 diff -u -r1.1 EntityReference.java --- javax/xml/stream/events/EntityReference.java 3 Sep 2005 10:04:19 -0000 1.1 +++ javax/xml/stream/events/EntityReference.java 4 Sep 2005 09:39:15 -0000 @@ -45,14 +45,34 @@ { /** + * Returns the base URI for the entity. + */ + String getBaseUri(); + + /** + * Returns the public identifier for the entity. + */ + String getPublicId(); + + /** + * Returns the system identifierfor the entity. + */ + String getSystemId(); + + /** * Returns the declaration of this reference. */ - EntityDeclaration getDeclaration(); + //EntityDeclaration getDeclaration(); /** * Returns the entity name. */ String getName(); + + /** + * Returns the replacement text for the entity. + */ + String getReplacementText(); } Index: javax/xml/stream/events/StartEntity.java =================================================================== RCS file: javax/xml/stream/events/StartEntity.java diff -N javax/xml/stream/events/StartEntity.java --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ javax/xml/stream/events/StartEntity.java 4 Sep 2005 09:39:15 -0000 @@ -0,0 +1,53 @@ +/* StartEntity.java -- + Copyright (C) 2005 Free Software Foundation, Inc. + +This file is part of GNU Classpath. + +GNU Classpath is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2, or (at your option) +any later version. + +GNU Classpath is distributed in the hope that it will be useful, but +WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +General Public License for more details. + +You should have received a copy of the GNU General Public License +along with GNU Classpath; see the file COPYING. If not, write to the +Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +02110-1301 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ + +package javax.xml.stream.events; + +/** + * An start-entity event. + */ +public interface StartEntity + extends XMLEvent +{ + + /** + * Returns the entity name. + */ + String getName(); + +} + Index: javax/xml/stream/events/XMLEvent.java =================================================================== RCS file: /cvsroot/classpath/classpath/javax/xml/stream/events/XMLEvent.java,v retrieving revision 1.1 diff -u -r1.1 XMLEvent.java --- javax/xml/stream/events/XMLEvent.java 3 Sep 2005 10:04:19 -0000 1.1 +++ javax/xml/stream/events/XMLEvent.java 4 Sep 2005 09:39:15 -0000 @@ -106,6 +106,16 @@ boolean isEndDocument(); /** + * Indicates whether this event is a start-entity event. + */ + boolean isStartEntity(); + + /** + * Indicates whether this event is an end-entity event. + */ + boolean isEndEntity(); + + /** * Returns this event as a start-element event. */ StartElement asStartElement(); Index: javax/xml/stream/util/EventReaderDelegate.java =================================================================== RCS file: /cvsroot/classpath/classpath/javax/xml/stream/util/EventReaderDelegate.java,v retrieving revision 1.1 diff -u -r1.1 EventReaderDelegate.java --- javax/xml/stream/util/EventReaderDelegate.java 3 Sep 2005 10:04:19 -0000 1.1 +++ javax/xml/stream/util/EventReaderDelegate.java 4 Sep 2005 09:39:15 -0000 @@ -74,6 +74,14 @@ parent = reader; } + /** + * Returns the parent. + */ + public XMLEventReader getParent() + { + return parent; + } + public XMLEvent next() throws XMLStreamException {