Imported GNU Classpath 0.90

       Imported GNU Classpath 0.90
       * scripts/makemake.tcl: Set gnu/java/awt/peer/swing to ignore.
       * gnu/classpath/jdwp/VMFrame.java (SIZE): New constant.
       * java/lang/VMCompiler.java: Use gnu.java.security.hash.MD5.
       * java/lang/Math.java: New override file.
       * java/lang/Character.java: Merged from Classpath.
       (start, end): Now 'int's.
       (canonicalName): New field.
       (CANONICAL_NAME, NO_SPACES_NAME, CONSTANT_NAME): New constants.
       (UnicodeBlock): Added argument.
       (of): New overload.
       (forName): New method.
       Updated unicode blocks.
       (sets): Updated.
       * sources.am: Regenerated.
       * Makefile.in: Likewise.

From-SVN: r111942

1 files changed, 2 insertions, 22 deletions

diff --git a/libjava/classpath/javax/xml/stream/XMLResolver.java b/libjava/classpath/javax/xml/stream/XMLResolver.java
index 148afc6..2dabaee 100644
--- a/libjava/classpath/javax/xml/stream/XMLResolver.java
+++ b/libjava/classpath/javax/xml/stream/XMLResolver.java
@@ -1,5 +1,5 @@
 /* XMLResolver.java -- 
-   Copyright (C) 2005  Free Software Foundation, Inc.
+   Copyright (C) 2005,2006  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -37,8 +37,6 @@ exception statement from your version. */
 
 package javax.xml.stream;
 
-import java.io.InputStream;
-
 /**
  * Interface used to resolve XML external entities during parsing.
  */
@@ -59,28 +57,10 @@ public interface XMLResolver
    * @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;
-  
 }