libjava/

2008-06-28  Matthias Klose  <doko@ubuntu.com>

        Import GNU Classpath (classpath-0_97_2-release).

        * Regenerate class and header files.
        * Regenerate auto* files.
        * gcj/javaprims.h: Define jobjectRefType.
        * jni.cc (_Jv_JNI_GetObjectRefType): New (stub only).
        (_Jv_JNIFunctions): Initialize GetObjectRefType.
        * gnu/classpath/jdwp/VMVirtualMachine.java,
        java/security/VMSecureRandom.java: Merge from classpath.
        * HACKING: Fix typo.
        * ChangeLog-2007: New file.
        * configure.ac: Set JAVAC, pass --disable-regen-headers to classpath.

libjava/classpath/

2008-06-28  Matthias Klose  <doko@ubuntu.com>

        * m4/ac_prog_javac.m4: Disable check for JAVAC, when
        not configured with --enable-java-maintainer-mode.
        * aclocal.m4, configure: Regenerate.
        * native/jni/gstreamer-peer/Makefile.am: Do not link with
        libclasspathnative.
        * native/jni/gstreamer-peer/Makefile.in: Regenerate.
        * tools/Makefile.am, lib/Makefile.am: Use JAVAC for setting
        JCOMPILER, drop flags not understood by gcj.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@137223 138bc75d-0d04-0410-961f-82ee72b054a4

8 files changed, 10 insertions, 31 deletions

diff --git a/libjava/classpath/gnu/xml/stream/AttributeImpl.java b/libjava/classpath/gnu/xml/stream/AttributeImpl.java
index 501575e56d8..f74aebd3526 100644
--- a/libjava/classpath/gnu/xml/stream/AttributeImpl.java
+++ b/libjava/classpath/gnu/xml/stream/AttributeImpl.java
@@ -56,11 +56,11 @@ public class AttributeImpl
 
   protected final QName name;
   protected final String value;
-  protected final QName type;
+  protected final String type;
   protected final boolean specified;
 
   protected AttributeImpl(Location location,
-                          QName name, String value, QName type,
+                          QName name, String value, String type,
                           boolean specified)
   {
     super(location);
@@ -85,7 +85,7 @@ public class AttributeImpl
     return value;
   }
 
-  public QName getDTDType()
+  public String getDTDType()
   {
     return type;
   }
diff --git a/libjava/classpath/gnu/xml/stream/EndDocumentImpl.java b/libjava/classpath/gnu/xml/stream/EndDocumentImpl.java
index 7a5e2049e10..0e3ed9630ad 100644
--- a/libjava/classpath/gnu/xml/stream/EndDocumentImpl.java
+++ b/libjava/classpath/gnu/xml/stream/EndDocumentImpl.java
@@ -37,7 +37,6 @@ exception statement from your version. */
 
 package gnu.xml.stream;
 
-import java.io.IOException;
 import java.io.Writer;
 import javax.xml.stream.Location;
 import javax.xml.stream.XMLStreamException;
diff --git a/libjava/classpath/gnu/xml/stream/SAXParser.java b/libjava/classpath/gnu/xml/stream/SAXParser.java
index af4a6af4217..ab1f86e49ed 100644
--- a/libjava/classpath/gnu/xml/stream/SAXParser.java
+++ b/libjava/classpath/gnu/xml/stream/SAXParser.java
@@ -66,7 +66,6 @@ import org.xml.sax.SAXParseException;
 import org.xml.sax.XMLReader;
 import org.xml.sax.ext.Attributes2;
 import org.xml.sax.ext.DeclHandler;
-import org.xml.sax.ext.EntityResolver2;
 import org.xml.sax.ext.LexicalHandler;
 import org.xml.sax.ext.Locator2;
 
@@ -234,7 +233,7 @@ public class SAXParser
       return baseAware ? Boolean.TRUE : Boolean.FALSE;
     if ((GNU_PROPERTIES + "document-xml-encoding").equals(name))
       return xmlEncoding;
-    throw new SAXNotSupportedException(name);
+    throw new SAXNotRecognizedException(name);
   }
 
   public boolean isXIncludeAware()
diff --git a/libjava/classpath/gnu/xml/stream/XIncludeFilter.java b/libjava/classpath/gnu/xml/stream/XIncludeFilter.java
index 86961faea91..d5c4af12c5e 100644
--- a/libjava/classpath/gnu/xml/stream/XIncludeFilter.java
+++ b/libjava/classpath/gnu/xml/stream/XIncludeFilter.java
@@ -51,7 +51,6 @@ import javax.xml.namespace.QName;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.stream.XMLInputFactory;
 import javax.xml.stream.XMLStreamConstants;
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamReader;
@@ -500,7 +499,7 @@ class XIncludeFilter
             return event;
           case XPathResult.NUMBER_TYPE:
             double nval = result.getNumberValue();
-            String ntext = new Double(nval).toString();
+            String ntext = Double.toString(nval);
             buf = ntext.toCharArray();
             len = buf.length;
             result = null;
diff --git a/libjava/classpath/gnu/xml/stream/XMLEventAllocatorImpl.java b/libjava/classpath/gnu/xml/stream/XMLEventAllocatorImpl.java
index 666bffabe23..fb1e4c28c58 100644
--- a/libjava/classpath/gnu/xml/stream/XMLEventAllocatorImpl.java
+++ b/libjava/classpath/gnu/xml/stream/XMLEventAllocatorImpl.java
@@ -165,7 +165,7 @@ public class XMLEventAllocatorImpl
           attributes.add(new AttributeImpl(location,
                                            reader.getAttributeName(i),
                                            reader.getAttributeValue(i),
-                                           QName.valueOf(reader.getAttributeType(i)),
+                                           reader.getAttributeType(i),
                                            reader.isAttributeSpecified(i)));
         return new StartElementImpl(location,
                                     reader.getName(),
diff --git a/libjava/classpath/gnu/xml/stream/XMLEventFactoryImpl.java b/libjava/classpath/gnu/xml/stream/XMLEventFactoryImpl.java
index e1d7d6ab82f..f694753c4b4 100644
--- a/libjava/classpath/gnu/xml/stream/XMLEventFactoryImpl.java
+++ b/libjava/classpath/gnu/xml/stream/XMLEventFactoryImpl.java
@@ -79,20 +79,20 @@ public class XMLEventFactoryImpl
   {
     return new AttributeImpl(location,
                              new QName(namespaceURI, localName, prefix),
-                             value, QName.valueOf("CDATA"), true);
+                             value, "CDATA", true);
   }
   
   public Attribute createAttribute(String localName, String value)
   {
     return new AttributeImpl(location,
                              new QName(localName),
-                             value, QName.valueOf("CDATA"), true);
+                             value, "CDATA", true);
   }
 
   public Attribute createAttribute(QName name, String value)
   {
     return new AttributeImpl(location, name, value,
-                             QName.valueOf("CDATA"), true);
+                             "CDATA", true);
   }
 
   public Namespace createNamespace(String namespaceURI)
diff --git a/libjava/classpath/gnu/xml/stream/XMLEventImpl.java b/libjava/classpath/gnu/xml/stream/XMLEventImpl.java
index 9f57d89d828..de2fccb7a1e 100644
--- a/libjava/classpath/gnu/xml/stream/XMLEventImpl.java
+++ b/libjava/classpath/gnu/xml/stream/XMLEventImpl.java
@@ -40,7 +40,6 @@ package gnu.xml.stream;
 import java.io.Writer;
 import javax.xml.namespace.QName;
 import javax.xml.stream.Location;
-import javax.xml.stream.XMLStreamConstants;
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.events.Characters;
 import javax.xml.stream.events.EndElement;
diff --git a/libjava/classpath/gnu/xml/stream/XMLParser.java b/libjava/classpath/gnu/xml/stream/XMLParser.java
index c1eee946e69..049575ac707 100644
--- a/libjava/classpath/gnu/xml/stream/XMLParser.java
+++ b/libjava/classpath/gnu/xml/stream/XMLParser.java
@@ -178,11 +178,6 @@ public class XMLParser
   private int event;
 
   /**
-   * Whether we are looking ahead. Used by hasNext.
-   */
-  private boolean lookahead;
-
-  /**
    * The element name stack. The first element in this stack will be the
    * root element.
    */
@@ -1013,24 +1008,12 @@ public class XMLParser
   public boolean hasNext()
     throws XMLStreamException
   {
-    if (event == XMLStreamConstants.END_DOCUMENT)
-      return false;
-    if (!lookahead)
-      {
-        next();
-        lookahead = true;
-      }
-    return event != -1;
+    return (event != XMLStreamConstants.END_DOCUMENT && event != -1);
   }
   
   public int next()
     throws XMLStreamException
   {
-    if (lookahead)
-      {
-        lookahead = false;
-        return event;
-      }
     if (event == XMLStreamConstants.END_ELEMENT)
       {
         // Pop namespace context