libjava/classpath/ChangeLog.gcj:

2007-05-31  Matthias Klose  <doko@ubuntu.com>

        * javax/management/NotificationBroadcasterSupport.java
        (getNotificationInfo): Add cast.
        * native/jni/qt-peer/Makefile.am (AM_CXXFLAGS): Add libstdc++ include
        directories.
        * native/jni/qt-peer/Makefile.in: Regenerate.

libjava/ChangeLog:

2007-06-03  Matthias Klose  <doko@ubuntu.com>

        * java/io/natFileWin32.cc (setFilePermissions): New (stub only).
        _access: Handle EXEC query, stub only.

2007-06-03  Matthias Klose  <doko@ubuntu.com>

        Merged from classpath:
        * gnu/java/nio/SelectorProviderImpl.java: Whitespace merge.
        * java/lang/System.java(inheritedChannel): New.
        * java/lang/Character.java: Remove stray`;'.
        * java/net/MulticastSocket.java: Merged.
        * java/text/DateFormatSymbols.java(getInstance): New, comment updates.
        * java/text/Collator.java(getInstance): Merged.
        * java/util/Calendar.java: New attributes ALL_STYLES, SHORT, LONG.
        getDisplayName, getDisplayNames: New.
        * java/util/logging/Logger.java: Merged.
        * Regenerate .class and .h files.

2007-06-03  Matthias Klose  <doko@ubuntu.com>

        * java/io/File.java: Merge with classpath-0.95, new method
        setFilePermissions, new attribute EXEC.
        * java/io/natFilePosix.cc (setFilePermissions): New.
        _access: Handle EXEC query.
        * classpath/lib/java/io/File.class, java/io/File.h: Regenerate.

2007-06-03  Matthias Klose  <doko@ubuntu.com>

        Imported GNU Classpath 0.95.

        * classpath/Makefile.in,
        classpath/native/jni/midi-dssi/Makefile.in,
        classpath/native/jni/classpath/Makefile.in,
        classpath/native/jni/Makefile.in,
        classpath/native/jni/gconf-peer/Makefile.in,
        classpath/native/jni/java-io/Makefile.in,
        classpath/native/jni/native-lib/Makefile.in,
        classpath/native/jni/java-util/Makefile.in,
        classpath/native/jni/midi-alsa/Makefile.in,
        classpath/native/jni/java-lang/Makefile.in,
        classpath/native/jni/java-nio/Makefile.in,
        classpath/native/jni/java-net/Makefile.in,
        classpath/native/jni/xmlj/Makefile.in,
        classpath/native/jni/qt-peer/Makefile.in,
        classpath/native/jni/gtk-peer/Makefile.in,
        classpath/native/Makefile.in, classpath/native/jawt/Makefile.in,
        classpath/native/fdlibm/Makefile.in,
        classpath/native/plugin/Makefile.in,
        classpath/resource/Makefile.in, classpath/scripts/Makefile.in,
        classpath/tools/Makefile.in, classpath/doc/Makefile.in,
        classpath/doc/api/Makefile.in, classpath/lib/Makefile.in,
        classpath/external/Makefile.in, classpath/external/jsr166/Makefile.in,
        classpath/external/sax/Makefile.in,
        classpath/external/w3c_dom/Makefile.in,
        classpath/external/relaxngDatatype/Makefile.in,
        classpath/include/Makefile.in,
        classpath/examples/Makefile.in: Regenerate.
        * classpath/config.guess, classpath/config.sub,
        classpath/ltmain.sh : Update.
        * classpath/configure, classpath/depcomp, classpath/missing,
        classpath/aclocal.m4, classpath/install-sh: Regenerate.

        * gnu/classpath/Configuration.java (CLASSPATH_VERSION): Now 0.95.
        * sources.am: Regenerate.
        * Makefile.in: Regenerate.

        * Update the .class files and generated CNI header files, add new
        .class and generated CNI header files.
        * Remove generated files for removed java source files:
        classpath/gnu/java/net/BASE64.java,
        classpath/gnu/java/security/util/Base64.java,
        classpath/gnu/java/awt/peer/gtk/GThreadMutex.java,
        classpath/gnu/java/awt/peer/gtk/GThreadNativeMethodRunner.java,
        classpath/gnu/java/awt/font/autofit/Scaler.java,
        classpath/gnu/classpath/jdwp/util/Value.java,
        classpath/gnu/javax/net/ssl/Base64.java.
        * Remove empty directories.

        * Makefile.am(nat_source_files): Add natVMOperatingSystemMXBeanImpl.cc.
        * java/lang/Class.java(setAccessible): Merge from classpath.
        * java/util/Locale.java: Remove.
        * gnu/java/lang/management/VMOperatingSystemMXBeanImpl.java,
        gnu/java/lang/management/natVMOperatingSystemMXBeanImpl.cc: New.
        * gcj/javaprims.h: Update class declarations.
        * scripts/classes.pl: Update usage.
        * HACKING: Mention to build all peers.

From-SVN: r125302

7 files changed, 7 insertions, 200 deletions

diff --git a/libjava/javax/swing/plaf/basic/BasicComboPopup.h b/libjava/javax/swing/plaf/basic/BasicComboPopup.h
index 4c878ca..7dfc525 100644
--- a/libjava/javax/swing/plaf/basic/BasicComboPopup.h
+++ b/libjava/javax/swing/plaf/basic/BasicComboPopup.h
@@ -103,9 +103,7 @@ public: // actually protected
   virtual ::java::awt::Rectangle * computePopupBounds(jint, jint, jint, jint);
   virtual void updateListBoxSelectionForEvent(::java::awt::event::MouseEvent *, jboolean);
 private:
-  void uninstallListeners();
   void uninstallListListeners();
-  void uninstallComboBoxListeners();
 public: // actually package-private
   virtual void syncListSelection();
 public: // actually protected
diff --git a/libjava/javax/swing/plaf/basic/BasicLabelUI.h b/libjava/javax/swing/plaf/basic/BasicLabelUI.h
index e0d39a2..5c67114 100644
--- a/libjava/javax/swing/plaf/basic/BasicLabelUI.h
+++ b/libjava/javax/swing/plaf/basic/BasicLabelUI.h
@@ -16,6 +16,7 @@ extern "Java"
         class Dimension;
         class FontMetrics;
         class Graphics;
+        class Insets;
         class Rectangle;
     }
     namespace beans
@@ -70,12 +71,15 @@ public: // actually protected
   virtual void uninstallListeners(::javax::swing::JLabel *);
 public:
   virtual void propertyChange(::java::beans::PropertyChangeEvent *);
+private:
+  ::java::awt::FontMetrics * getFontMetrics(::javax::swing::JLabel *);
 public: // actually protected
   static ::javax::swing::plaf::basic::BasicLabelUI * labelUI;
 private:
   ::java::awt::Rectangle * __attribute__((aligned(__alignof__( ::javax::swing::plaf::LabelUI)))) vr;
   ::java::awt::Rectangle * ir;
   ::java::awt::Rectangle * tr;
+  ::java::awt::Insets * cachedInsets;
 public:
   static ::java::lang::Class class$;
 };
diff --git a/libjava/javax/swing/plaf/basic/BasicRadioButtonUI.h b/libjava/javax/swing/plaf/basic/BasicRadioButtonUI.h
index 62b3a3c..deea385 100644
--- a/libjava/javax/swing/plaf/basic/BasicRadioButtonUI.h
+++ b/libjava/javax/swing/plaf/basic/BasicRadioButtonUI.h
@@ -49,6 +49,9 @@ public: // actually protected
 public:
   virtual ::javax::swing::Icon * getDefaultIcon();
   virtual void paint(::java::awt::Graphics *, ::javax::swing::JComponent *);
+private:
+  ::javax::swing::Icon * getCurrentIcon(::javax::swing::AbstractButton *);
+public:
   virtual ::java::awt::Dimension * getPreferredSize(::javax::swing::JComponent *);
 public: // actually protected
   virtual void paintFocus(::java::awt::Graphics *, ::java::awt::Rectangle *, ::java::awt::Dimension *);
diff --git a/libjava/javax/swing/plaf/basic/BasicTextUI$1.h b/libjava/javax/swing/plaf/basic/BasicTextUI$1.h
deleted file mode 100644
index 8736761..0000000
--- a/libjava/javax/swing/plaf/basic/BasicTextUI$1.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicTextUI$1__
-#define __javax_swing_plaf_basic_BasicTextUI$1__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-      namespace event
-      {
-          class FocusEvent;
-      }
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicTextUI;
-            class BasicTextUI$1;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicTextUI$1 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  BasicTextUI$1(::javax::swing::plaf::basic::BasicTextUI *);
-public:
-  void focusGained(::java::awt::event::FocusEvent *);
-  void focusLost(::java::awt::event::FocusEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicTextUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicTextUI$1__
diff --git a/libjava/javax/swing/plaf/basic/BasicTextUI$DocumentHandler.h b/libjava/javax/swing/plaf/basic/BasicTextUI$DocumentHandler.h
deleted file mode 100644
index 38e9f49..0000000
--- a/libjava/javax/swing/plaf/basic/BasicTextUI$DocumentHandler.h
+++ /dev/null
@@ -1,47 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicTextUI$DocumentHandler__
-#define __javax_swing_plaf_basic_BasicTextUI$DocumentHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace event
-      {
-          class DocumentEvent;
-      }
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicTextUI;
-            class BasicTextUI$DocumentHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicTextUI$DocumentHandler : public ::java::lang::Object
-{
-
-public: // actually package-private
-  BasicTextUI$DocumentHandler(::javax::swing::plaf::basic::BasicTextUI *);
-public:
-  virtual void changedUpdate(::javax::swing::event::DocumentEvent *);
-  virtual void insertUpdate(::javax::swing::event::DocumentEvent *);
-  virtual void removeUpdate(::javax::swing::event::DocumentEvent *);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicTextUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicTextUI$DocumentHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicTextUI$PropertyChangeHandler.h b/libjava/javax/swing/plaf/basic/BasicTextUI$PropertyChangeHandler.h
deleted file mode 100644
index bba4ad4..0000000
--- a/libjava/javax/swing/plaf/basic/BasicTextUI$PropertyChangeHandler.h
+++ /dev/null
@@ -1,48 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicTextUI$PropertyChangeHandler__
-#define __javax_swing_plaf_basic_BasicTextUI$PropertyChangeHandler__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace beans
-    {
-        class PropertyChangeEvent;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicTextUI;
-            class BasicTextUI$PropertyChangeHandler;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicTextUI$PropertyChangeHandler : public ::java::lang::Object
-{
-
-  BasicTextUI$PropertyChangeHandler(::javax::swing::plaf::basic::BasicTextUI *);
-public:
-  virtual void propertyChange(::java::beans::PropertyChangeEvent *);
-public: // actually package-private
-  BasicTextUI$PropertyChangeHandler(::javax::swing::plaf::basic::BasicTextUI *, ::javax::swing::plaf::basic::BasicTextUI$PropertyChangeHandler *);
-  ::javax::swing::plaf::basic::BasicTextUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicTextUI$PropertyChangeHandler__
diff --git a/libjava/javax/swing/plaf/basic/BasicTreeUI$2.h b/libjava/javax/swing/plaf/basic/BasicTreeUI$2.h
deleted file mode 100644
index d71232d..0000000
--- a/libjava/javax/swing/plaf/basic/BasicTreeUI$2.h
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_plaf_basic_BasicTreeUI$2__
-#define __javax_swing_plaf_basic_BasicTreeUI$2__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace awt
-    {
-        class Component;
-        class Graphics;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace plaf
-      {
-        namespace basic
-        {
-            class BasicTreeUI;
-            class BasicTreeUI$2;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::plaf::basic::BasicTreeUI$2 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  BasicTreeUI$2(::javax::swing::plaf::basic::BasicTreeUI *);
-public:
-  jint getIconHeight();
-  jint getIconWidth();
-  void paintIcon(::java::awt::Component *, ::java::awt::Graphics *, jint, jint);
-public: // actually package-private
-  ::javax::swing::plaf::basic::BasicTreeUI * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_plaf_basic_BasicTreeUI$2__