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

15 files changed, 187 insertions, 15 deletions

diff --git a/libjava/java/awt/Canvas.h b/libjava/java/awt/Canvas.h
index 97726a2..d7e0310 100644
--- a/libjava/java/awt/Canvas.h
+++ b/libjava/java/awt/Canvas.h
@@ -38,9 +38,6 @@ class java::awt::Canvas : public ::java::awt::Component
 public:
   Canvas();
   Canvas(::java::awt::GraphicsConfiguration *);
-public: // actually package-private
-  virtual ::java::awt::GraphicsConfiguration * getGraphicsConfigurationImpl();
-public:
   virtual void addNotify();
   virtual void paint(::java::awt::Graphics *);
   virtual ::javax::accessibility::AccessibleContext * getAccessibleContext();
@@ -55,8 +52,7 @@ private:
   static const jlong serialVersionUID = -2284879212465893870LL;
   static jlong next_canvas_number;
 public: // actually package-private
-  ::java::awt::GraphicsConfiguration * __attribute__((aligned(__alignof__( ::java::awt::Component)))) graphicsConfiguration;
-  ::java::awt::image::BufferStrategy * bufferStrategy;
+  ::java::awt::image::BufferStrategy * __attribute__((aligned(__alignof__( ::java::awt::Component)))) bufferStrategy;
 public:
   static ::java::lang::Class class$;
 };
diff --git a/libjava/java/awt/Component.h b/libjava/java/awt/Component.h
index 4b14757..f5889d2 100644
--- a/libjava/java/awt/Component.h
+++ b/libjava/java/awt/Component.h
@@ -350,7 +350,6 @@ public:
 public: // actually package-private
   virtual ::java::lang::String * generateName();
   virtual void setPeer(::java::awt::peer::ComponentPeer *);
-  virtual ::java::awt::GraphicsConfiguration * getGraphicsConfigurationImpl();
   static ::java::awt::Event * translateEvent(::java::awt::AWTEvent *);
   virtual void dispatchEventImpl(::java::awt::AWTEvent *);
   virtual jboolean eventTypeEnabled(jint);
diff --git a/libjava/java/awt/Desktop$Action.h b/libjava/java/awt/Desktop$Action.h
new file mode 100644
index 0000000..f862b4d
--- /dev/null
+++ b/libjava/java/awt/Desktop$Action.h
@@ -0,0 +1,41 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __java_awt_Desktop$Action__
+#define __java_awt_Desktop$Action__
+
+#pragma interface
+
+#include <java/lang/Enum.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Desktop$Action;
+    }
+  }
+}
+
+class java::awt::Desktop$Action : public ::java::lang::Enum
+{
+
+  Desktop$Action(::java::lang::String *, jint);
+public:
+  static JArray< ::java::awt::Desktop$Action * > * values();
+  static ::java::awt::Desktop$Action * valueOf(::java::lang::String *);
+  static ::java::awt::Desktop$Action * BROWSE;
+  static ::java::awt::Desktop$Action * EDIT;
+  static ::java::awt::Desktop$Action * MAIL;
+  static ::java::awt::Desktop$Action * OPEN;
+  static ::java::awt::Desktop$Action * PRINT;
+private:
+  static JArray< ::java::awt::Desktop$Action * > * ENUM$VALUES;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __java_awt_Desktop$Action__
diff --git a/libjava/java/awt/Desktop.h b/libjava/java/awt/Desktop.h
new file mode 100644
index 0000000..8b5927d
--- /dev/null
+++ b/libjava/java/awt/Desktop.h
@@ -0,0 +1,52 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __java_awt_Desktop__
+#define __java_awt_Desktop__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Desktop;
+        class Desktop$Action;
+      namespace peer
+      {
+          class DesktopPeer;
+      }
+    }
+    namespace net
+    {
+        class URI;
+    }
+  }
+}
+
+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 *);
+  virtual void mail();
+  virtual void mail(::java::net::URI *);
+  virtual void open(::java::io::File *);
+  virtual void print(::java::io::File *);
+private:
+  ::java::awt::peer::DesktopPeer * __attribute__((aligned(__alignof__( ::java::lang::Object)))) peer;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __java_awt_Desktop__
diff --git a/libjava/java/awt/Frame.h b/libjava/java/awt/Frame.h
index ffbf38d..5b15866 100644
--- a/libjava/java/awt/Frame.h
+++ b/libjava/java/awt/Frame.h
@@ -57,6 +57,8 @@ public: // actually protected
   virtual ::java::lang::String * paramString();
 private:
   static void noteFrame(::java::awt::Frame *);
+public: // actually package-private
+  static jboolean hasDisplayableFrames();
 public:
   static JArray< ::java::awt::Frame * > * getFrames();
   virtual void setState(jint);
@@ -110,6 +112,7 @@ private:
   jboolean undecorated;
   static jlong next_frame_number;
   static ::java::util::ArrayList * weakFrames;
+  static ::java::lang::ref::ReferenceQueue * weakFramesQueue;
 public:
   static ::java::lang::Class class$;
 };
diff --git a/libjava/java/awt/GraphicsConfiguration.h b/libjava/java/awt/GraphicsConfiguration.h
index 58c9122..603577a 100644
--- a/libjava/java/awt/GraphicsConfiguration.h
+++ b/libjava/java/awt/GraphicsConfiguration.h
@@ -43,6 +43,7 @@ public:
   virtual ::java::awt::image::VolatileImage * createCompatibleVolatileImage(jint, jint) = 0;
   virtual ::java::awt::image::VolatileImage * createCompatibleVolatileImage(jint, jint, ::java::awt::ImageCapabilities *);
   virtual ::java::awt::image::VolatileImage * createCompatibleVolatileImage(jint, jint, jint) = 0;
+  virtual ::java::awt::image::VolatileImage * createCompatibleVolatileImage(jint, jint, ::java::awt::ImageCapabilities *, jint);
   virtual ::java::awt::image::BufferedImage * createCompatibleImage(jint, jint, jint) = 0;
   virtual ::java::awt::image::ColorModel * getColorModel() = 0;
   virtual ::java::awt::image::ColorModel * getColorModel(jint) = 0;
diff --git a/libjava/java/awt/Toolkit.h b/libjava/java/awt/Toolkit.h
index d8af0cd..80528fe 100644
--- a/libjava/java/awt/Toolkit.h
+++ b/libjava/java/awt/Toolkit.h
@@ -37,6 +37,7 @@ extern "Java"
         class Component;
         class Container;
         class Cursor;
+        class Desktop;
         class Dialog;
         class Dimension;
         class EventQueue;
@@ -101,6 +102,7 @@ extern "Java"
           class CheckboxMenuItemPeer;
           class CheckboxPeer;
           class ChoicePeer;
+          class DesktopPeer;
           class DialogPeer;
           class FileDialogPeer;
           class FontPeer;
@@ -139,6 +141,7 @@ class java::awt::Toolkit : public ::java::lang::Object
 public:
   Toolkit();
 public: // actually protected
+  virtual ::java::awt::peer::DesktopPeer * createDesktopPeer(::java::awt::Desktop *) = 0;
   virtual ::java::awt::peer::ButtonPeer * createButton(::java::awt::Button *) = 0;
   virtual ::java::awt::peer::TextFieldPeer * createTextField(::java::awt::TextField *) = 0;
   virtual ::java::awt::peer::LabelPeer * createLabel(::java::awt::Label *) = 0;
diff --git a/libjava/java/awt/Window.h b/libjava/java/awt/Window.h
index bf369ed..c1c7399 100644
--- a/libjava/java/awt/Window.h
+++ b/libjava/java/awt/Window.h
@@ -57,9 +57,6 @@ public:
   Window(::java::awt::Frame *);
   Window(::java::awt::Window *);
   Window(::java::awt::Window *, ::java::awt::GraphicsConfiguration *);
-public: // actually package-private
-  virtual ::java::awt::GraphicsConfiguration * getGraphicsConfigurationImpl();
-public:
   virtual void addNotify();
   virtual void pack();
   virtual void show();
@@ -133,7 +130,6 @@ private:
   ::java::awt::event::WindowListener * windowListener;
   ::java::awt::event::WindowFocusListener * windowFocusListener;
   ::java::awt::event::WindowStateListener * windowStateListener;
-  ::java::awt::GraphicsConfiguration * graphicsConfiguration;
   jboolean shown;
 public: // actually package-private
   ::java::awt::Component * windowFocusOwner;
diff --git a/libjava/java/awt/datatransfer/SystemFlavorMap$1.h b/libjava/java/awt/datatransfer/SystemFlavorMap$1.h
new file mode 100644
index 0000000..bd5deaf
--- /dev/null
+++ b/libjava/java/awt/datatransfer/SystemFlavorMap$1.h
@@ -0,0 +1,38 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __java_awt_datatransfer_SystemFlavorMap$1__
+#define __java_awt_datatransfer_SystemFlavorMap$1__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+      namespace datatransfer
+      {
+          class SystemFlavorMap;
+          class SystemFlavorMap$1;
+      }
+    }
+  }
+}
+
+class java::awt::datatransfer::SystemFlavorMap$1 : public ::java::lang::Object
+{
+
+public: // actually package-private
+  SystemFlavorMap$1(::java::awt::datatransfer::SystemFlavorMap *);
+public:
+  ::java::lang::Object * run();
+public: // actually package-private
+  ::java::awt::datatransfer::SystemFlavorMap * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$0;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __java_awt_datatransfer_SystemFlavorMap$1__
diff --git a/libjava/java/awt/datatransfer/SystemFlavorMap.h b/libjava/java/awt/datatransfer/SystemFlavorMap.h
index 62009ad..de2495c 100644
--- a/libjava/java/awt/datatransfer/SystemFlavorMap.h
+++ b/libjava/java/awt/datatransfer/SystemFlavorMap.h
@@ -29,6 +29,8 @@ class java::awt::datatransfer::SystemFlavorMap : public ::java::lang::Object
 {
 
   SystemFlavorMap();
+public: // actually package-private
+  void setupMapping(::java::util::Properties *);
 public:
   ::java::util::Map * getNativesForFlavors(JArray< ::java::awt::datatransfer::DataFlavor * > *);
   ::java::util::Map * getFlavorsForNatives(JArray< ::java::lang::String * > *);
diff --git a/libjava/java/awt/image/ComponentSampleModel.h b/libjava/java/awt/image/ComponentSampleModel.h
index 4a1d2c6..39fe6cd 100644
--- a/libjava/java/awt/image/ComponentSampleModel.h
+++ b/libjava/java/awt/image/ComponentSampleModel.h
@@ -44,8 +44,6 @@ public:
   virtual jint getPixelStride();
   virtual jint getNumDataElements();
   virtual ::java::lang::Object * getDataElements(jint, jint, ::java::lang::Object *, ::java::awt::image::DataBuffer *);
-  virtual ::java::lang::Object * getDataElements(jint, jint, jint, jint, ::java::lang::Object *, ::java::awt::image::DataBuffer *);
-  virtual void setDataElements(jint, jint, jint, jint, ::java::lang::Object *, ::java::awt::image::DataBuffer *);
   virtual JArray< jint > * getPixel(jint, jint, JArray< jint > *, ::java::awt::image::DataBuffer *);
   virtual JArray< jint > * getPixels(jint, jint, jint, jint, JArray< jint > *, ::java::awt::image::DataBuffer *);
   virtual jint getSample(jint, jint, jint, ::java::awt::image::DataBuffer *);
@@ -61,8 +59,6 @@ public: // actually protected
   jint numBanks;
   jint scanlineStride;
   jint pixelStride;
-private:
-  jboolean tightPixelPacking;
 public:
   static ::java::lang::Class class$;
 };
diff --git a/libjava/java/awt/image/IndexColorModel.h b/libjava/java/awt/image/IndexColorModel.h
index cbb2fac..a79a531 100644
--- a/libjava/java/awt/image/IndexColorModel.h
+++ b/libjava/java/awt/image/IndexColorModel.h
@@ -60,6 +60,7 @@ public:
   virtual ::java::awt::image::SampleModel * createCompatibleSampleModel(jint, jint);
 private:
   void setTransparentPixel(jint);
+  JArray< jint > * createColorMap(jint, jint);
   jint __attribute__((aligned(__alignof__( ::java::awt::image::ColorModel)))) map_size;
   jboolean opaque;
   jint trans;
diff --git a/libjava/java/awt/image/SinglePixelPackedSampleModel.h b/libjava/java/awt/image/SinglePixelPackedSampleModel.h
index 6995032..c7bf07c 100644
--- a/libjava/java/awt/image/SinglePixelPackedSampleModel.h
+++ b/libjava/java/awt/image/SinglePixelPackedSampleModel.h
@@ -42,7 +42,6 @@ public:
   virtual jint getScanlineStride();
   virtual ::java::awt::image::SampleModel * createSubsetSampleModel(JArray< jint > *);
   virtual ::java::lang::Object * getDataElements(jint, jint, ::java::lang::Object *, ::java::awt::image::DataBuffer *);
-  virtual ::java::lang::Object * getDataElements(jint, jint, jint, jint, ::java::lang::Object *, ::java::awt::image::DataBuffer *);
   virtual JArray< jint > * getPixel(jint, jint, JArray< jint > *, ::java::awt::image::DataBuffer *);
   virtual JArray< jint > * getPixels(jint, jint, jint, jint, JArray< jint > *, ::java::awt::image::DataBuffer *);
   virtual jint getSample(jint, jint, jint, ::java::awt::image::DataBuffer *);
diff --git a/libjava/java/awt/peer/DesktopPeer.h b/libjava/java/awt/peer/DesktopPeer.h
new file mode 100644
index 0000000..fa5529a
--- /dev/null
+++ b/libjava/java/awt/peer/DesktopPeer.h
@@ -0,0 +1,43 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __java_awt_peer_DesktopPeer__
+#define __java_awt_peer_DesktopPeer__
+
+#pragma interface
+
+#include <java/lang/Object.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Desktop$Action;
+      namespace peer
+      {
+          class DesktopPeer;
+      }
+    }
+    namespace net
+    {
+        class URI;
+    }
+  }
+}
+
+class java::awt::peer::DesktopPeer : public ::java::lang::Object
+{
+
+public:
+  virtual void browse(::java::net::URI *) = 0;
+  virtual void edit(::java::io::File *) = 0;
+  virtual jboolean isSupported(::java::awt::Desktop$Action *) = 0;
+  virtual void mail(::java::net::URI *) = 0;
+  virtual void mail() = 0;
+  virtual void open(::java::io::File *) = 0;
+  virtual void print(::java::io::File *) = 0;
+  static ::java::lang::Class class$;
+} __attribute__ ((java_interface));
+
+#endif // __java_awt_peer_DesktopPeer__
diff --git a/libjava/java/awt/print/PrinterJob.h b/libjava/java/awt/print/PrinterJob.h
index a319de3..39bb9a0 100644
--- a/libjava/java/awt/print/PrinterJob.h
+++ b/libjava/java/awt/print/PrinterJob.h
@@ -29,6 +29,7 @@ extern "Java"
     namespace print
     {
         class PrintService;
+        class StreamPrintServiceFactory;
       namespace attribute
       {
           class PrintRequestAttributeSet;
@@ -63,6 +64,7 @@ public:
   virtual void setPrintable(::java::awt::print::Printable *, ::java::awt::print::PageFormat *) = 0;
   virtual ::java::awt::print::PageFormat * validatePage(::java::awt::print::PageFormat *) = 0;
   static JArray< ::javax::print::PrintService * > * lookupPrintServices();
+  static JArray< ::javax::print::StreamPrintServiceFactory * > * lookupStreamPrintServices(::java::lang::String *);
   virtual ::javax::print::PrintService * getPrintService();
   virtual void setPrintService(::javax::print::PrintService *);
 private: