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.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@125302 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 23 insertions, 19 deletions

diff --git a/libjava/gnu/java/awt/peer/gtk/CairoSurface.h b/libjava/gnu/java/awt/peer/gtk/CairoSurface.h
index bc33bdb6391..7e34ee923b4 100644
--- a/libjava/gnu/java/awt/peer/gtk/CairoSurface.h
+++ b/libjava/gnu/java/awt/peer/gtk/CairoSurface.h
@@ -33,11 +33,15 @@ extern "Java"
     namespace awt
     {
         class Graphics2D;
+        class Point;
+        class Rectangle;
       namespace image
       {
           class BufferedImage;
           class ColorModel;
+          class Raster;
           class SampleModel;
+          class WritableRaster;
       }
     }
   }
@@ -46,25 +50,18 @@ extern "Java"
 class gnu::java::awt::peer::gtk::CairoSurface : public ::java::awt::image::WritableRaster
 {
 
-  void create(jint, jint, jint);
-  void destroy(jlong, jlong);
-  jint nativeGetElem(jlong, jint);
-  void nativeSetElem(jlong, jint, jint);
+  void create(jint, jint, jint, JArray< jint > *);
+  void destroy(jlong, JArray< jint > *);
 public:
   virtual void nativeDrawSurface(jlong, jlong, JArray< jdouble > *, jdouble, jint);
-  virtual void drawSurface(jlong, JArray< jdouble > *, jdouble, jint);
 public: // actually package-private
-  virtual JArray< jint > * nativeGetPixels(jlong, jint);
-public:
-  virtual JArray< jint > * getPixels(jint);
-public: // actually package-private
-  virtual void nativeSetPixels(jlong, JArray< jint > *);
-public:
-  virtual void setPixels(JArray< jint > *);
-public: // actually package-private
-  virtual jlong getFlippedBuffer(jlong, jint);
+  virtual void syncNativeToJava(jlong, JArray< jint > *);
+  virtual void syncJavaToNative(jlong, JArray< jint > *);
+  virtual jlong getFlippedBuffer(jlong);
 public:
   CairoSurface(jint, jint);
+  CairoSurface(jint, jint, jint, jint);
+  CairoSurface(::java::awt::image::SampleModel *, ::gnu::java::awt::peer::gtk::CairoSurface *, ::java::awt::Rectangle *, ::java::awt::Point *);
 public: // actually package-private
   CairoSurface(::gnu::java::awt::peer::gtk::GtkImage *);
 public:
@@ -73,6 +70,7 @@ public: // actually protected
   virtual void finalize();
 public:
   virtual ::gnu::java::awt::peer::gtk::GtkImage * getGtkImage();
+  virtual JArray< jint > * getData();
   static ::java::awt::image::BufferedImage * getBufferedImage(jint, jint);
   static ::java::awt::image::BufferedImage * getBufferedImage(::gnu::java::awt::peer::gtk::GtkImage *);
   static ::java::awt::image::BufferedImage * getBufferedImage(::gnu::java::awt::peer::gtk::CairoSurface *);
@@ -81,19 +79,25 @@ public: // actually package-private
   virtual jlong nativeNewCairoContext(jlong);
 public:
   virtual jlong newCairoContext();
+  virtual void copyAreaNative(jint, jint, jint, jint, jint, jint, jint);
 public: // actually package-private
   virtual void copyAreaNative2(jlong, jint, jint, jint, jint, jint, jint, jint);
-public:
-  virtual void copyAreaNative(jint, jint, jint, jint, jint, jint, jint);
 public: // actually protected
   static ::java::awt::image::SampleModel * createCairoSampleModel(jint, jint);
+public:
+  static jboolean isCompatibleColorModel(::java::awt::image::ColorModel *);
+  static jboolean isCompatibleSampleModel(::java::awt::image::SampleModel *);
+  virtual ::java::awt::image::Raster * createChild(jint, jint, jint, jint, jint, jint, JArray< jint > *);
+  virtual ::java::awt::image::WritableRaster * createCompatibleWritableRaster();
+  virtual ::java::awt::image::WritableRaster * createCompatibleWritableRaster(jint, jint, jint, jint);
+  virtual ::java::awt::image::Raster * createTranslatedChild(jint, jint);
+  virtual ::java::awt::image::WritableRaster * createWritableChild(jint, jint, jint, jint, jint, jint, JArray< jint > *);
+  virtual ::java::awt::image::WritableRaster * createWritableTranslatedChild(jint, jint);
 public: // actually package-private
-  static jint access$0(::gnu::java::awt::peer::gtk::CairoSurface *, jlong, jint);
-  static void access$1(::gnu::java::awt::peer::gtk::CairoSurface *, jlong, jint, jint);
   jint __attribute__((aligned(__alignof__( ::java::awt::image::WritableRaster)))) width;
   jint height;
   jlong surfacePointer;
-  jlong bufferPointer;
+  jboolean sharedBuffer;
   static ::java::awt::image::ColorModel * cairoColorModel;
   static ::java::awt::image::ColorModel * cairoCM_pre;
   static ::java::awt::image::ColorModel * cairoCM_opaque;