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

19 files changed, 203 insertions, 21 deletions

diff --git a/libjava/java/awt/Desktop.h b/libjava/java/awt/Desktop.h
index 8b5927d88bc..b50a063ff4e 100644
--- a/libjava/java/awt/Desktop.h
+++ b/libjava/java/awt/Desktop.h
@@ -33,9 +33,7 @@ class java::awt::Desktop : public ::java::lang::Object
   Desktop();
 public:
   static ::java::awt::Desktop * getDesktop();
-private:
   static jboolean isDesktopSupported();
-public:
   virtual jboolean isSupported(::java::awt::Desktop$Action *);
   virtual void browse(::java::net::URI *);
   virtual void edit(::java::io::File *);
diff --git a/libjava/java/awt/Font.h b/libjava/java/awt/Font.h
index c3b46bf7c75..46f81a1b846 100644
--- a/libjava/java/awt/Font.h
+++ b/libjava/java/awt/Font.h
@@ -156,6 +156,7 @@ public: // actually protected
 private:
   static const jlong serialVersionUID = -4206021311591459213LL;
   ::gnu::java::awt::peer::ClasspathFontPeer * peer;
+  jint hashCode__;
 public:
   static ::java::lang::Class class$;
 };
diff --git a/libjava/java/awt/LightweightDispatcher.h b/libjava/java/awt/LightweightDispatcher.h
index 0a0bc5026e4..4fee8f8b43f 100644
--- a/libjava/java/awt/LightweightDispatcher.h
+++ b/libjava/java/awt/LightweightDispatcher.h
@@ -44,6 +44,8 @@ private:
   static ::java::util::WeakHashMap * instances;
   ::java::awt::Component * __attribute__((aligned(__alignof__( ::java::lang::Object)))) lastTarget;
   ::java::awt::Component * mouseEventTarget;
+public: // actually package-private
+  static jboolean $assertionsDisabled;
 public:
   static ::java::lang::Class class$;
 };
diff --git a/libjava/java/beans/beancontext/BeanContextServicesSupport$BCSSProxyServiceProvider.h b/libjava/java/beans/beancontext/BeanContextServicesSupport$BCSSProxyServiceProvider.h
index f5b8392f1ba..5576f65398b 100644
--- a/libjava/java/beans/beancontext/BeanContextServicesSupport$BCSSProxyServiceProvider.h
+++ b/libjava/java/beans/beancontext/BeanContextServicesSupport$BCSSProxyServiceProvider.h
@@ -28,7 +28,8 @@ extern "Java"
 class java::beans::beancontext::BeanContextServicesSupport$BCSSProxyServiceProvider : public ::java::lang::Object
 {
 
-  BeanContextServicesSupport$BCSSProxyServiceProvider(::java::beans::beancontext::BeanContextServicesSupport *, ::java::beans::beancontext::BeanContextServiceProvider *);
+public: // actually protected
+  BeanContextServicesSupport$BCSSProxyServiceProvider(::java::beans::beancontext::BeanContextServicesSupport *);
 public:
   virtual ::java::util::Iterator * getCurrentServiceSelectors(::java::beans::beancontext::BeanContextServices *, ::java::lang::Class *);
   virtual ::java::lang::Object * getService(::java::beans::beancontext::BeanContextServices *, ::java::lang::Object *, ::java::lang::Class *, ::java::lang::Object *);
diff --git a/libjava/java/io/BufferedReader.h b/libjava/java/io/BufferedReader.h
index 66d77663a7d..11047737711 100644
--- a/libjava/java/io/BufferedReader.h
+++ b/libjava/java/io/BufferedReader.h
@@ -40,8 +40,6 @@ public: // actually package-private
   jint limit;
   jint markPos;
   static const jint DEFAULT_BUFFER_SIZE = 8192;
-private:
-  ::java::lang::StringBuffer * sbuf;
 public:
   static ::java::lang::Class class$;
 };
diff --git a/libjava/java/io/DataInputStream.h b/libjava/java/io/DataInputStream.h
index a7b84590f01..12371ff9557 100644
--- a/libjava/java/io/DataInputStream.h
+++ b/libjava/java/io/DataInputStream.h
@@ -32,6 +32,11 @@ public:
   virtual jint readUnsignedShort();
   virtual ::java::lang::String * readUTF();
   static ::java::lang::String * readUTF(::java::io::DataInput *);
+public: // actually package-private
+  virtual ::java::lang::String * readUTFLong();
+private:
+  static ::java::lang::String * readUTF(::java::io::DataInput *, jint);
+public:
   virtual jint skipBytes(jint);
 public: // actually package-private
   static jboolean convertToBoolean(jint);
diff --git a/libjava/java/io/DataOutputStream.h b/libjava/java/io/DataOutputStream.h
index 0d89dca32bc..aebd234dbcc 100644
--- a/libjava/java/io/DataOutputStream.h
+++ b/libjava/java/io/DataOutputStream.h
@@ -29,10 +29,15 @@ public:
   virtual void writeDouble(jdouble);
   virtual void writeBytes(::java::lang::String *);
   virtual void writeChars(::java::lang::String *);
-private:
-  jint getUTFlength(::java::lang::String *, jint, jint);
+public: // actually package-private
+  virtual jlong getUTFlength(::java::lang::String *, jint, jlong);
 public:
   virtual void writeUTF(::java::lang::String *);
+public: // actually package-private
+  virtual void writeUTFShort(::java::lang::String *, jint);
+  virtual void writeUTFLong(::java::lang::String *, jlong);
+private:
+  void writeUTFBytes(::java::lang::String *);
 public: // actually protected
   jint __attribute__((aligned(__alignof__( ::java::io::FilterOutputStream)))) written;
 private:
diff --git a/libjava/java/io/PipedInputStream.h b/libjava/java/io/PipedInputStream.h
index 9531667af4b..4055fa4ca4d 100644
--- a/libjava/java/io/PipedInputStream.h
+++ b/libjava/java/io/PipedInputStream.h
@@ -15,7 +15,9 @@ class java::io::PipedInputStream : public ::java::io::InputStream
 
 public:
   PipedInputStream();
+  PipedInputStream(jint);
   PipedInputStream(::java::io::PipedOutputStream *);
+  PipedInputStream(::java::io::PipedOutputStream *, jint);
   virtual void connect(::java::io::PipedOutputStream *);
 public: // actually protected
   virtual void receive(jint);
diff --git a/libjava/java/lang/Throwable.h b/libjava/java/lang/Throwable.h
index 0b8fdca68e7..097f9d2f2e7 100644
--- a/libjava/java/lang/Throwable.h
+++ b/libjava/java/lang/Throwable.h
@@ -28,7 +28,7 @@ public:
   virtual void printStackTrace(::java::io::PrintWriter *);
 private:
   ::java::lang::String * stackTraceString();
-  static void stackTraceStringBuffer(::java::lang::StringBuffer *, ::java::lang::String *, JArray< ::java::lang::StackTraceElement * > *, jint);
+  static void stackTraceStringBuffer(::java::lang::StringBuilder *, ::java::lang::String *, JArray< ::java::lang::StackTraceElement * > *, jint);
 public:
   virtual ::java::lang::Throwable * fillInStackTrace();
   virtual JArray< ::java::lang::StackTraceElement * > * getStackTrace();
diff --git a/libjava/java/lang/management/ThreadInfo.h b/libjava/java/lang/management/ThreadInfo.h
index c3902b3d61f..4d87277be16 100644
--- a/libjava/java/lang/management/ThreadInfo.h
+++ b/libjava/java/lang/management/ThreadInfo.h
@@ -28,9 +28,6 @@ extern "Java"
 class java::lang::management::ThreadInfo : public ::java::lang::Object
 {
 
-  ThreadInfo(::java::lang::Thread *, jlong, jlong, ::java::lang::Object *, ::java::lang::Thread *, jlong, jlong, jboolean, jboolean, JArray< ::java::lang::StackTraceElement * > *);
-  ThreadInfo(::java::lang::Thread *, jlong, jlong, ::java::lang::Object *, ::java::lang::Thread *, jlong, jlong, jboolean, jboolean, JArray< ::java::lang::StackTraceElement * > *, JArray< ::java::lang::management::MonitorInfo * > *, JArray< ::java::lang::management::LockInfo * > *);
-  ThreadInfo(jlong, ::java::lang::String *, ::java::lang::Thread$State *, jlong, jlong, ::java::lang::String *, jlong, ::java::lang::String *, jlong, jlong, jboolean, jboolean, JArray< ::java::lang::StackTraceElement * > *);
   ThreadInfo(jlong, ::java::lang::String *, ::java::lang::Thread$State *, jlong, jlong, ::java::lang::String *, jlong, ::java::lang::String *, jlong, jlong, jboolean, jboolean, JArray< ::java::lang::StackTraceElement * > *, JArray< ::java::lang::management::MonitorInfo * > *, JArray< ::java::lang::management::LockInfo * > *);
 public: // actually package-private
   static void checkAttribute(::javax::management::openmbean::CompositeType *, ::java::lang::String *, ::javax::management::openmbean::OpenType *);
diff --git a/libjava/java/net/URI.h b/libjava/java/net/URI.h
index d955dce503c..8417042ed38 100644
--- a/libjava/java/net/URI.h
+++ b/libjava/java/net/URI.h
@@ -44,7 +44,7 @@ public:
   ::java::net::URI * normalize();
 private:
   ::java::lang::String * normalizePath(::java::lang::String *);
-  void removeLastSegment(::java::lang::StringBuffer *);
+  void removeLastSegment(::java::lang::StringBuilder *);
 public:
   ::java::net::URI * resolve(::java::net::URI *);
   ::java::net::URI * resolve(::java::lang::String *);
diff --git a/libjava/java/security/VMSecureRandom.java b/libjava/java/security/VMSecureRandom.java
index dc67d871968..5eeb158bc81 100644
--- a/libjava/java/security/VMSecureRandom.java
+++ b/libjava/java/security/VMSecureRandom.java
@@ -38,11 +38,6 @@ exception statement from your version.  */
 
 package java.security;
 
-import gnu.classpath.SystemProperties;
-import gnu.java.security.action.GetSecurityPropertyAction;
-
-import java.net.URL;
-
 /**
  * VM-specific methods for generating real (or almost real) random
  * seeds. VM implementors should write a version of this class that
diff --git a/libjava/java/text/CollationElementIterator.h b/libjava/java/text/CollationElementIterator.h
index 19d92b8cab6..a3b75de189e 100644
--- a/libjava/java/text/CollationElementIterator.h
+++ b/libjava/java/text/CollationElementIterator.h
@@ -28,6 +28,7 @@ class java::text::CollationElementIterator : public ::java::lang::Object
 
 public: // actually package-private
   CollationElementIterator(::java::text::RuleBasedCollator *, ::java::lang::String *);
+  CollationElementIterator(::java::text::RuleBasedCollator *, ::java::text::CharacterIterator *);
   ::java::text::RuleBasedCollator$CollationElement * nextBlock();
   ::java::text::RuleBasedCollator$CollationElement * previousBlock();
 public:
@@ -45,7 +46,7 @@ public:
   static const jint NULLORDER = -1;
 public: // actually package-private
   ::java::text::RuleBasedCollator * __attribute__((aligned(__alignof__( ::java::lang::Object)))) collator;
-  ::java::lang::String * text;
+  ::java::text::CharacterIterator * text;
   jint index;
   jint textIndex;
 private:
diff --git a/libjava/java/util/concurrent/CopyOnWriteArrayList$1.h b/libjava/java/util/concurrent/CopyOnWriteArrayList$1.h
new file mode 100644
index 00000000000..4f3d1b63790
--- /dev/null
+++ b/libjava/java/util/concurrent/CopyOnWriteArrayList$1.h
@@ -0,0 +1,35 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __java_util_concurrent_CopyOnWriteArrayList$1__
+#define __java_util_concurrent_CopyOnWriteArrayList$1__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+
+class java::util::concurrent::CopyOnWriteArrayList$1 : public ::java::lang::Object
+{
+
+public: // actually package-private
+  CopyOnWriteArrayList$1(::java::util::concurrent::CopyOnWriteArrayList$SubList *, jint);
+public:
+  jboolean hasNext();
+  jboolean hasPrevious();
+  ::java::lang::Object * next();
+  ::java::lang::Object * previous();
+  jint nextIndex();
+  jint previousIndex();
+  void remove();
+  void set(::java::lang::Object *);
+  void add(::java::lang::Object *);
+private:
+  ::java::util::ListIterator * __attribute__((aligned(__alignof__( ::java::lang::Object)))) i;
+  jint position;
+public: // actually package-private
+  ::java::util::concurrent::CopyOnWriteArrayList$SubList * this$1;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __java_util_concurrent_CopyOnWriteArrayList$1__
diff --git a/libjava/java/util/concurrent/CopyOnWriteArrayList$2.h b/libjava/java/util/concurrent/CopyOnWriteArrayList$2.h
new file mode 100644
index 00000000000..ecebfbee8d0
--- /dev/null
+++ b/libjava/java/util/concurrent/CopyOnWriteArrayList$2.h
@@ -0,0 +1,30 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __java_util_concurrent_CopyOnWriteArrayList$2__
+#define __java_util_concurrent_CopyOnWriteArrayList$2__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+
+class java::util::concurrent::CopyOnWriteArrayList$2 : public ::java::lang::Object
+{
+
+public: // actually package-private
+  CopyOnWriteArrayList$2(::java::util::concurrent::CopyOnWriteArrayList *);
+public:
+  jboolean hasNext();
+  ::java::lang::Object * next();
+  void remove();
+public: // actually package-private
+  JArray< ::java::lang::Object * > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) iteratorData;
+  jint currentElement;
+  ::java::util::concurrent::CopyOnWriteArrayList * this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __java_util_concurrent_CopyOnWriteArrayList$2__
diff --git a/libjava/java/util/concurrent/CopyOnWriteArrayList$3.h b/libjava/java/util/concurrent/CopyOnWriteArrayList$3.h
new file mode 100644
index 00000000000..c6abfefba00
--- /dev/null
+++ b/libjava/java/util/concurrent/CopyOnWriteArrayList$3.h
@@ -0,0 +1,36 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __java_util_concurrent_CopyOnWriteArrayList$3__
+#define __java_util_concurrent_CopyOnWriteArrayList$3__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+#include <gcj/array.h>
+
+
+class java::util::concurrent::CopyOnWriteArrayList$3 : public ::java::lang::Object
+{
+
+public: // actually package-private
+  CopyOnWriteArrayList$3(::java::util::concurrent::CopyOnWriteArrayList *, jint);
+public:
+  void add(::java::lang::Object *);
+  jboolean hasNext();
+  jboolean hasPrevious();
+  ::java::lang::Object * next();
+  jint nextIndex();
+  ::java::lang::Object * previous();
+  jint previousIndex();
+  void remove();
+  void set(::java::lang::Object *);
+public: // actually package-private
+  JArray< ::java::lang::Object * > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) iteratorData;
+  jint currentElement;
+  ::java::util::concurrent::CopyOnWriteArrayList * this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __java_util_concurrent_CopyOnWriteArrayList$3__
diff --git a/libjava/java/util/concurrent/CopyOnWriteArrayList$RandomAccessSubList.h b/libjava/java/util/concurrent/CopyOnWriteArrayList$RandomAccessSubList.h
new file mode 100644
index 00000000000..66adf020961
--- /dev/null
+++ b/libjava/java/util/concurrent/CopyOnWriteArrayList$RandomAccessSubList.h
@@ -0,0 +1,20 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __java_util_concurrent_CopyOnWriteArrayList$RandomAccessSubList__
+#define __java_util_concurrent_CopyOnWriteArrayList$RandomAccessSubList__
+
+#pragma interface
+
+#include <java/util/concurrent/CopyOnWriteArrayList$SubList.h>
+
+class java::util::concurrent::CopyOnWriteArrayList$RandomAccessSubList : public ::java::util::concurrent::CopyOnWriteArrayList$SubList
+{
+
+public: // actually package-private
+  CopyOnWriteArrayList$RandomAccessSubList(::java::util::concurrent::CopyOnWriteArrayList *, jint, jint);
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __java_util_concurrent_CopyOnWriteArrayList$RandomAccessSubList__
diff --git a/libjava/java/util/concurrent/CopyOnWriteArrayList$SubList.h b/libjava/java/util/concurrent/CopyOnWriteArrayList$SubList.h
new file mode 100644
index 00000000000..de285a9f85a
--- /dev/null
+++ b/libjava/java/util/concurrent/CopyOnWriteArrayList$SubList.h
@@ -0,0 +1,42 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __java_util_concurrent_CopyOnWriteArrayList$SubList__
+#define __java_util_concurrent_CopyOnWriteArrayList$SubList__
+
+#pragma interface
+
+#include <java/util/AbstractList.h>
+#include <gcj/array.h>
+
+
+class java::util::concurrent::CopyOnWriteArrayList$SubList : public ::java::util::AbstractList
+{
+
+public: // actually package-private
+  CopyOnWriteArrayList$SubList(::java::util::concurrent::CopyOnWriteArrayList *, jint, jint);
+  virtual void checkMod();
+private:
+  void checkBoundsInclusive(jint);
+  void checkBoundsExclusive(jint);
+public:
+  virtual jint size();
+  virtual void clear();
+  virtual ::java::lang::Object * set(jint, ::java::lang::Object *);
+  virtual ::java::lang::Object * get(jint);
+  virtual void add(jint, ::java::lang::Object *);
+  virtual ::java::lang::Object * remove(jint);
+  virtual jboolean addAll(jint, ::java::util::Collection *);
+  virtual jboolean addAll(::java::util::Collection *);
+  virtual ::java::util::Iterator * iterator();
+  virtual ::java::util::ListIterator * listIterator(jint);
+public: // actually package-private
+  ::java::util::concurrent::CopyOnWriteArrayList * __attribute__((aligned(__alignof__( ::java::util::AbstractList)))) backingList;
+  jint offset;
+  jint size__;
+  JArray< ::java::lang::Object * > * data;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __java_util_concurrent_CopyOnWriteArrayList$SubList__
diff --git a/libjava/java/util/concurrent/CopyOnWriteArrayList.h b/libjava/java/util/concurrent/CopyOnWriteArrayList.h
index 924ba480e96..95eec88d98c 100644
--- a/libjava/java/util/concurrent/CopyOnWriteArrayList.h
+++ b/libjava/java/util/concurrent/CopyOnWriteArrayList.h
@@ -6,11 +6,11 @@
 
 #pragma interface
 
-#include <java/util/AbstractList.h>
+#include <java/lang/Object.h>
 #include <gcj/array.h>
 
 
-class java::util::concurrent::CopyOnWriteArrayList : public ::java::util::AbstractList
+class java::util::concurrent::CopyOnWriteArrayList : public ::java::lang::Object
 {
 
 public:
@@ -20,6 +20,7 @@ public:
   virtual jint size();
   virtual jboolean isEmpty();
   virtual jboolean contains(::java::lang::Object *);
+  virtual jboolean containsAll(::java::util::Collection *);
   virtual jint indexOf(::java::lang::Object *);
   virtual jint indexOf(::java::lang::Object *, jint);
   virtual jint lastIndexOf(::java::lang::Object *);
@@ -32,19 +33,32 @@ public:
   virtual jboolean add(::java::lang::Object *);
   virtual void add(jint, ::java::lang::Object *);
   virtual ::java::lang::Object * remove(jint);
+  virtual jboolean remove(::java::lang::Object *);
+  virtual jboolean removeAll(::java::util::Collection *);
+  virtual jboolean retainAll(::java::util::Collection *);
   virtual void clear();
   virtual jboolean addAll(::java::util::Collection *);
   virtual jboolean addAll(jint, ::java::util::Collection *);
   virtual jboolean addIfAbsent(::java::lang::Object *);
   virtual jint addAllAbsent(::java::util::Collection *);
+  virtual ::java::lang::String * toString();
+  virtual jboolean equals(::java::lang::Object *);
+  virtual jint hashCode();
+  virtual ::java::util::Iterator * iterator();
+  virtual ::java::util::ListIterator * listIterator();
+  virtual ::java::util::ListIterator * listIterator(jint);
+  virtual ::java::util::List * subList(jint, jint);
 private:
   void writeObject(::java::io::ObjectOutputStream *);
   void readObject(::java::io::ObjectInputStream *);
 public: // actually package-private
   static jboolean equals(::java::lang::Object *, ::java::lang::Object *);
   virtual JArray< ::java::lang::Object * > * getArray();
+  static JArray< ::java::lang::Object * > * access$0(::java::util::concurrent::CopyOnWriteArrayList *);
+  static void access$1(::java::util::concurrent::CopyOnWriteArrayList *, JArray< ::java::lang::Object * > *);
 private:
-  JArray< ::java::lang::Object * > * __attribute__((aligned(__alignof__( ::java::util::AbstractList)))) data;
+  static const jlong serialVersionUID = 8673264195747942595LL;
+  JArray< ::java::lang::Object * > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) data;
 public:
   static ::java::lang::Class class$;
 };