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, 8 insertions, 38 deletions

diff --git a/gnu/xml/stream/EntityReferenceImpl.java b/gnu/xml/stream/EntityReferenceImpl.java
index 4b40bfa52..38e1f00b1 100644
--- a/gnu/xml/stream/EntityReferenceImpl.java
+++ b/gnu/xml/stream/EntityReferenceImpl.java
@@ -1,5 +1,5 @@
 /* EntityReferenceImpl.java -- 
-   Copyright (C) 2005  Free Software Foundation, Inc.
+   Copyright (C) 2005,2006  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -41,7 +41,7 @@ import java.io.IOException;
 import java.io.Writer;
 import javax.xml.stream.Location;
 import javax.xml.stream.XMLStreamException;
-//import javax.xml.stream.events.EntityDeclaration;
+import javax.xml.stream.events.EntityDeclaration;
 import javax.xml.stream.events.EntityReference;
 
 /**
@@ -54,26 +54,16 @@ public class EntityReferenceImpl
   implements EntityReference
 {
 
-  //protected final EntityDeclaration decl;
+  protected final EntityDeclaration decl;
   protected final String name;
-  protected final String baseUri;
-  protected final String publicId;
-  protected final String systemId;
-  protected final String replacementText;
 
   protected EntityReferenceImpl(Location location,
-                                //EntityDeclaration decl,
-                                String name,
-                                String baseUri, String publicId,
-                                String systemId, String replacementText)
+                                EntityDeclaration decl,
+                                String name)
   {
     super(location);
-    //this.decl = decl;
+    this.decl = decl;
     this.name = name;
-    this.baseUri = baseUri;
-    this.publicId = publicId;
-    this.systemId = systemId;
-    this.replacementText = replacementText;
   }
 
   public int getEventType()
@@ -81,36 +71,16 @@ public class EntityReferenceImpl
     return ENTITY_REFERENCE;
   }
 
-  /*public EntityDeclaration getDeclaration()
+  public EntityDeclaration getDeclaration()
   {
     return decl;
-  }*/
+  }
 
   public String getName()
   {
     return name;
   }
 
-  public String getBaseUri()
-  {
-    return baseUri;
-  }
-
-  public String getPublicId()
-  {
-    return publicId;
-  }
-
-  public String getSystemId()
-  {
-    return systemId;
-  }
-
-  public String getReplacementText()
-  {
-    return replacementText;
-  }
-  
   public void writeAsEncodedUnicode(Writer writer)
     throws XMLStreamException
   {