2006-03-03 Chris Burdess <dog@gnu.org>

	Fixes PR 26503
	* gnu/xml/stream/EntityReferenceImpl.java,
	  gnu/xml/stream/FilteredEventReader.java,
	  gnu/xml/stream/SAXParser.java,
	  gnu/xml/stream/XIncludeFilter.java,
	  gnu/xml/stream/XMLEventAllocatorImpl.java,
	  gnu/xml/stream/XMLEventFactoryImpl.java,
	  gnu/xml/stream/XMLEventImpl.java,
	  gnu/xml/stream/XMLEventReaderImpl.java,
	  gnu/xml/stream/XMLEventWriterImpl.java,
	  gnu/xml/stream/XMLInputFactoryImpl.java,
	  gnu/xml/stream/XMLOutputFactoryImpl.java,
	  gnu/xml/stream/XMLParser.java,
	  javax/xml/stream/EventFilter.java,
	  javax/xml/stream/Location.java,
	  javax/xml/stream/StreamFilter.java,
	  javax/xml/stream/XMLEventFactory.java,
	  javax/xml/stream/XMLEventReader.java,
	  javax/xml/stream/XMLEventWriter.java,
	  javax/xml/stream/XMLInputFactory.java,
	  javax/xml/stream/XMLOutputFactory.java,
	  javax/xml/stream/XMLReporter.java,
	  javax/xml/stream/XMLResolver.java,
	  javax/xml/stream/XMLStreamConstants.java,
	  javax/xml/stream/XMLStreamReader.java,
	  javax/xml/stream/events/EntityDeclaration.java,
	  javax/xml/stream/events/EntityReference.java,
	  javax/xml/stream/events/XMLEvent.java,
	  javax/xml/stream/util/EventReaderDelegate.java,
	  javax/xml/stream/util/ReaderDelegate.java: Updated to final version of
	  StAX API as specified in JWSDP 2.0.
	* gnu/xml/stream/EndEntityImpl.java,
	  gnu/xml/stream/LocationImpl.java,
	  gnu/xml/stream/StartEntityImpl.java,
	  gnu/xml/stream/XMLStreamReaderImpl.java,
	  javax/xml/stream/XMLFilter.java,
	  javax/xml/stream/XMLIterator.java,
	  javax/xml/stream/events/EndEntity.java,
	  javax/xml/stream/events/StartEntity.java: Removed legacy files.

1 files changed, 37 insertions, 3 deletions

diff --git a/gnu/xml/stream/XMLOutputFactoryImpl.java b/gnu/xml/stream/XMLOutputFactoryImpl.java
index 05b6d6c0f..c8c651fb1 100644
--- a/gnu/xml/stream/XMLOutputFactoryImpl.java
+++ b/gnu/xml/stream/XMLOutputFactoryImpl.java
@@ -42,6 +42,8 @@ import java.io.OutputStreamWriter;
 import java.io.Writer;
 import java.io.UnsupportedEncodingException;
 
+import javax.xml.transform.Result;
+import javax.xml.transform.stream.StreamResult;
 import javax.xml.stream.XMLEventWriter;
 import javax.xml.stream.XMLOutputFactory;
 import javax.xml.stream.XMLStreamException;
@@ -94,6 +96,22 @@ public class XMLOutputFactoryImpl
       }
   }
 
+  public XMLStreamWriter createXMLStreamWriter(Result result)
+    throws XMLStreamException
+  {
+    if (result instanceof StreamResult)
+      {
+        StreamResult sr = (StreamResult) result;
+        OutputStream out = sr.getOutputStream();
+        if (out != null)
+          return createXMLStreamWriter(out);
+        Writer writer = sr.getWriter();
+        if (writer != null)
+          return createXMLStreamWriter(writer);
+      }
+    throw new UnsupportedOperationException();
+  }
+
   public XMLEventWriter createXMLEventWriter(OutputStream stream)
     throws XMLStreamException
   {
@@ -116,10 +134,26 @@ public class XMLOutputFactoryImpl
     return new XMLEventWriterImpl(writer);
   }
 
+  public XMLEventWriter createXMLEventWriter(Result result)
+    throws XMLStreamException
+  {
+    if (result instanceof StreamResult)
+      {
+        StreamResult sr = (StreamResult) result;
+        OutputStream out = sr.getOutputStream();
+        if (out != null)
+          return createXMLEventWriter(out);
+        Writer writer = sr.getWriter();
+        if (writer != null)
+          return createXMLEventWriter(writer);
+      }
+    throw new UnsupportedOperationException();
+  }
+  
   public void setProperty(String name, Object value)
     throws IllegalArgumentException
   {
-    if (IS_PREFIX_DEFAULTING.equals(name))
+    if (IS_REPAIRING_NAMESPACES.equals(name))
       prefixDefaulting = ((Boolean) value).booleanValue();
     else
       throw new IllegalArgumentException(name);
@@ -128,14 +162,14 @@ public class XMLOutputFactoryImpl
   public Object getProperty(String name)
     throws IllegalArgumentException
   {
-    if (IS_PREFIX_DEFAULTING.equals(name))
+    if (IS_REPAIRING_NAMESPACES.equals(name))
       return new Boolean(prefixDefaulting);
     throw new IllegalArgumentException(name);
   }
 
   public boolean isPropertySupported(String name)
   {
-    if (IS_PREFIX_DEFAULTING.equals(name))
+    if (IS_REPAIRING_NAMESPACES.equals(name))
       return true;
     return false;
   }