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

4 files changed, 8 insertions, 6 deletions

diff --git a/libjava/javax/swing/tree/DefaultMutableTreeNode$BreadthFirstEnumeration.h b/libjava/javax/swing/tree/DefaultMutableTreeNode$BreadthFirstEnumeration.h
index 50c7118f8dd..9c13e759163 100644
--- a/libjava/javax/swing/tree/DefaultMutableTreeNode$BreadthFirstEnumeration.h
+++ b/libjava/javax/swing/tree/DefaultMutableTreeNode$BreadthFirstEnumeration.h
@@ -29,6 +29,7 @@ public: // actually package-private
   DefaultMutableTreeNode$BreadthFirstEnumeration(::javax::swing::tree::TreeNode *);
 public:
   virtual jboolean hasMoreElements();
+  virtual ::javax::swing::tree::TreeNode * DefaultMutableTreeNode$BreadthFirstEnumeration$nextElement();
   virtual ::java::lang::Object * nextElement();
 public: // actually package-private
   ::java::util::LinkedList * __attribute__((aligned(__alignof__( ::java::lang::Object)))) queue;
diff --git a/libjava/javax/swing/tree/DefaultMutableTreeNode$PostorderEnumeration.h b/libjava/javax/swing/tree/DefaultMutableTreeNode$PostorderEnumeration.h
index 629c2943bbc..31065d6690d 100644
--- a/libjava/javax/swing/tree/DefaultMutableTreeNode$PostorderEnumeration.h
+++ b/libjava/javax/swing/tree/DefaultMutableTreeNode$PostorderEnumeration.h
@@ -29,9 +29,11 @@ public: // actually package-private
   DefaultMutableTreeNode$PostorderEnumeration(::javax::swing::tree::TreeNode *);
 public:
   virtual jboolean hasMoreElements();
-  virtual ::java::lang::Object * nextElement();
+  virtual ::javax::swing::tree::TreeNode * DefaultMutableTreeNode$PostorderEnumeration$nextElement();
 private:
-  ::java::lang::Object * traverse(::java::util::Enumeration *);
+  ::javax::swing::tree::TreeNode * traverse(::java::util::Enumeration *);
+public:
+  virtual ::java::lang::Object * nextElement();
 public: // actually package-private
   ::java::util::Stack * __attribute__((aligned(__alignof__( ::java::lang::Object)))) nodes;
   ::java::util::Stack * childrenEnums;
diff --git a/libjava/javax/swing/tree/DefaultMutableTreeNode$PreorderEnumeration.h b/libjava/javax/swing/tree/DefaultMutableTreeNode$PreorderEnumeration.h
index 53e87c3e295..98117b06fec 100644
--- a/libjava/javax/swing/tree/DefaultMutableTreeNode$PreorderEnumeration.h
+++ b/libjava/javax/swing/tree/DefaultMutableTreeNode$PreorderEnumeration.h
@@ -29,9 +29,11 @@ public: // actually package-private
   DefaultMutableTreeNode$PreorderEnumeration(::javax::swing::tree::TreeNode *);
 public:
   virtual jboolean hasMoreElements();
-  virtual ::java::lang::Object * nextElement();
+  virtual ::javax::swing::tree::TreeNode * DefaultMutableTreeNode$PreorderEnumeration$nextElement();
 private:
   ::javax::swing::tree::TreeNode * traverse(::java::util::Enumeration *);
+public:
+  virtual ::java::lang::Object * nextElement();
 public: // actually package-private
   ::javax::swing::tree::TreeNode * __attribute__((aligned(__alignof__( ::java::lang::Object)))) next;
   ::java::util::Stack * childrenEnums;
diff --git a/libjava/javax/swing/tree/DefaultTreeCellEditor.h b/libjava/javax/swing/tree/DefaultTreeCellEditor.h
index 759439c189f..bac3f21ad97 100644
--- a/libjava/javax/swing/tree/DefaultTreeCellEditor.h
+++ b/libjava/javax/swing/tree/DefaultTreeCellEditor.h
@@ -56,7 +56,6 @@ public:
   DefaultTreeCellEditor(::javax::swing::JTree *, ::javax::swing::tree::DefaultTreeCellRenderer *);
   DefaultTreeCellEditor(::javax::swing::JTree *, ::javax::swing::tree::DefaultTreeCellRenderer *, ::javax::swing::tree::TreeCellEditor *);
 private:
-  void configureEditingComponent(::javax::swing::JTree *, ::javax::swing::tree::DefaultTreeCellRenderer *, ::javax::swing::tree::TreeCellEditor *);
   void writeObject(::java::io::ObjectOutputStream *);
   void readObject(::java::io::ObjectInputStream *);
 public:
@@ -104,8 +103,6 @@ public: // actually protected
   ::java::awt::Color * borderSelectionColor;
   ::javax::swing::Icon * editingIcon;
   ::java::awt::Font * font;
-private:
-  ::javax::swing::tree::TreePath * tPath;
 public:
   static ::java::lang::Class class$;
 };