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

5 files changed, 1 insertions, 197 deletions

diff --git a/libjava/javax/swing/text/AbstractDocument$1.h b/libjava/javax/swing/text/AbstractDocument$1.h
deleted file mode 100644
index b433e142189..00000000000
--- a/libjava/javax/swing/text/AbstractDocument$1.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_AbstractDocument$1__
-#define __javax_swing_text_AbstractDocument$1__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class AbstractDocument;
-          class AbstractDocument$1;
-      }
-    }
-  }
-}
-
-class javax::swing::text::AbstractDocument$1 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  AbstractDocument$1(::javax::swing::text::AbstractDocument *);
-public:
-  jint getOffset();
-public: // actually package-private
-  ::javax::swing::text::AbstractDocument * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_AbstractDocument$1__
diff --git a/libjava/javax/swing/text/AbstractDocument$2.h b/libjava/javax/swing/text/AbstractDocument$2.h
deleted file mode 100644
index dc504ce9eea..00000000000
--- a/libjava/javax/swing/text/AbstractDocument$2.h
+++ /dev/null
@@ -1,38 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_AbstractDocument$2__
-#define __javax_swing_text_AbstractDocument$2__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class AbstractDocument;
-          class AbstractDocument$2;
-      }
-    }
-  }
-}
-
-class javax::swing::text::AbstractDocument$2 : public ::java::lang::Object
-{
-
-public: // actually package-private
-  AbstractDocument$2(::javax::swing::text::AbstractDocument *);
-public:
-  jint getOffset();
-public: // actually package-private
-  ::javax::swing::text::AbstractDocument * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_AbstractDocument$2__
diff --git a/libjava/javax/swing/text/DefaultStyledDocument$Edit.h b/libjava/javax/swing/text/DefaultStyledDocument$Edit.h
deleted file mode 100644
index 7d63ab29ef0..00000000000
--- a/libjava/javax/swing/text/DefaultStyledDocument$Edit.h
+++ /dev/null
@@ -1,52 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_DefaultStyledDocument$Edit__
-#define __javax_swing_text_DefaultStyledDocument$Edit__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-#include <gcj/array.h>
-
-extern "Java"
-{
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class DefaultStyledDocument;
-          class DefaultStyledDocument$Edit;
-          class Element;
-      }
-    }
-  }
-}
-
-class javax::swing::text::DefaultStyledDocument$Edit : public ::java::lang::Object
-{
-
-public:
-  virtual JArray< ::javax::swing::text::Element * > * getRemovedElements();
-  virtual JArray< ::javax::swing::text::Element * > * getAddedElements();
-private:
-  jboolean contains(::java::util::Vector *, ::javax::swing::text::Element *);
-public:
-  virtual void addRemovedElement(::javax::swing::text::Element *);
-  virtual void addRemovedElements(JArray< ::javax::swing::text::Element * > *);
-  virtual void addAddedElement(::javax::swing::text::Element *);
-  virtual void addAddedElements(JArray< ::javax::swing::text::Element * > *);
-  DefaultStyledDocument$Edit(::javax::swing::text::DefaultStyledDocument *, ::javax::swing::text::Element *, jint, JArray< ::javax::swing::text::Element * > *, JArray< ::javax::swing::text::Element * > *);
-public: // actually package-private
-  ::javax::swing::text::Element * __attribute__((aligned(__alignof__( ::java::lang::Object)))) e;
-  jint index;
-  ::java::util::Vector * removed;
-  ::java::util::Vector * added;
-  ::javax::swing::text::DefaultStyledDocument * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_DefaultStyledDocument$Edit__
diff --git a/libjava/javax/swing/text/InternationalFormatter.h b/libjava/javax/swing/text/InternationalFormatter.h
index 48f4726d6c5..e0c44dd44e1 100644
--- a/libjava/javax/swing/text/InternationalFormatter.h
+++ b/libjava/javax/swing/text/InternationalFormatter.h
@@ -49,6 +49,7 @@ public:
   virtual ::java::lang::String * valueToString(::java::lang::Object *);
   virtual ::java::lang::Object * stringToValue(::java::lang::String *);
   virtual JArray< ::java::text::Format$Field * > * getFields(jint);
+  virtual ::java::lang::Object * clone();
 public: // actually protected
   virtual JArray< ::javax::swing::Action * > * getActions();
 private:
diff --git a/libjava/javax/swing/text/html/StyleSheet$CssParser.h b/libjava/javax/swing/text/html/StyleSheet$CssParser.h
deleted file mode 100644
index 5d2fded39da..00000000000
--- a/libjava/javax/swing/text/html/StyleSheet$CssParser.h
+++ /dev/null
@@ -1,69 +0,0 @@
-
-// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
-
-#ifndef __javax_swing_text_html_StyleSheet$CssParser__
-#define __javax_swing_text_html_StyleSheet$CssParser__
-
-#pragma interface
-
-#include <java/lang/Object.h>
-extern "Java"
-{
-  namespace java
-  {
-    namespace net
-    {
-        class URL;
-    }
-  }
-  namespace javax
-  {
-    namespace swing
-    {
-      namespace text
-      {
-          class AttributeSet;
-          class MutableAttributeSet;
-        namespace html
-        {
-            class CSSParser;
-            class StyleSheet;
-            class StyleSheet$CssParser;
-        }
-      }
-    }
-  }
-}
-
-class javax::swing::text::html::StyleSheet$CssParser : public ::java::lang::Object
-{
-
-public: // actually package-private
-  StyleSheet$CssParser(::javax::swing::text::html::StyleSheet *);
-public:
-  virtual ::javax::swing::text::AttributeSet * parseDeclaration(::java::lang::String *);
-  virtual ::javax::swing::text::AttributeSet * parseDeclaration(::java::io::Reader *);
-  virtual void parse(::java::net::URL *, ::java::io::Reader *, jboolean, jboolean);
-  virtual void handleImport(::java::lang::String *);
-  virtual void handleSelector(::java::lang::String *);
-  virtual void startRule();
-  virtual void handleProperty(::java::lang::String *);
-  virtual void handleValue(::java::lang::String *);
-  virtual void endRule();
-private:
-  void addSelector();
-public: // actually package-private
-  ::java::util::Vector * __attribute__((aligned(__alignof__( ::java::lang::Object)))) selectors;
-  ::java::util::Vector * selectorTokens;
-  ::java::lang::String * propertyName;
-  ::javax::swing::text::MutableAttributeSet * declaration;
-  jboolean parsingDeclaration;
-  jboolean isLink;
-  ::java::net::URL * base;
-  ::javax::swing::text::html::CSSParser * parser;
-  ::javax::swing::text::html::StyleSheet * this$0;
-public:
-  static ::java::lang::Class class$;
-};
-
-#endif // __javax_swing_text_html_StyleSheet$CssParser__