libjava/

2007-08-04  Matthias Klose  <doko@ubuntu.com>

	Import GNU Classpath (libgcj-import-20070727).

	* Regenerate class and header files.
	* Regenerate auto* files.

	* include/jvm.h:
	* jni-libjvm.cc (Jv_JNI_InvokeFunctions): Rename type.
	* jni.cc (_Jv_JNIFunctions, _Jv_JNI_InvokeFunctions): Likewise.
	* jni.cc (_Jv_JNI_CallAnyMethodA, _Jv_JNI_CallAnyVoidMethodA,
	_Jv_JNI_CallMethodA, _Jv_JNI_CallVoidMethodA,
	_Jv_JNI_CallStaticMethodA, _Jv_JNI_CallStaticVoidMethodA,
	_Jv_JNI_NewObjectA, _Jv_JNI_SetPrimitiveArrayRegion): Constify
	jvalue parameter.
	* java/lang/reflect/natMethod.cc (_Jv_CallAnyMethodA): Likewise.

	* java/lang/VMFloat.java (toString, parseFloat): New.

	* gnu/awt/xlib/XToolkit.java (setAlwaysOnTop, isModalityTypeSupported,
	isModalExclusionTypeSupported): New (stub only).
	* gnu/awt/xlib/XCanvasPeer.java (requestFocus): Likewise.
	* gnu/awt/xlib/XFramePeer.java (updateMinimumSize, updateIconImages,
	updateFocusableWindowState, setModalBlocked, getBoundsPrivate,
	setAlwaysOnTop): Likewise.
	* gnu/awt/xlib/XFontPeer.java (canDisplay): Update signature.

	* scripts/makemake.tcl: Ignore gnu/javax/sound/sampled/gstreamer,
	ignore javax.sound.sampled.spi.MixerProvider, ignore .in files.

	* HACKING: Mention --enable-gstreamer-peer, removal of generated files.


libjava/classpath/

2007-08-04  Matthias Klose  <doko@ubuntu.com>

	* java/util/EnumMap.java (clone): Add cast.


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

11 files changed, 62 insertions, 4 deletions

diff --git a/libjava/gnu/java/awt/peer/gtk/FreetypeGlyphVector.h b/libjava/gnu/java/awt/peer/gtk/FreetypeGlyphVector.h
index 47b452ee712..f782b9cbd61 100644
--- a/libjava/gnu/java/awt/peer/gtk/FreetypeGlyphVector.h
+++ b/libjava/gnu/java/awt/peer/gtk/FreetypeGlyphVector.h
@@ -91,6 +91,9 @@ public:
   virtual ::java::awt::geom::Point2D * getGlyphPosition(jint);
   virtual JArray< jfloat > * getGlyphPositions(jint, jint, JArray< jfloat > *);
   virtual ::java::awt::geom::AffineTransform * getGlyphTransform(jint);
+public: // actually protected
+  virtual jboolean hasTransforms();
+public:
   virtual ::java::awt::Shape * getGlyphVisualBounds(jint);
   virtual ::java::awt::geom::Rectangle2D * getLogicalBounds();
   virtual jint getNumGlyphs();
diff --git a/libjava/gnu/java/awt/peer/gtk/GdkFontPeer.h b/libjava/gnu/java/awt/peer/gtk/GdkFontPeer.h
index d7168b27bcf..ebfdd2c96f9 100644
--- a/libjava/gnu/java/awt/peer/gtk/GdkFontPeer.h
+++ b/libjava/gnu/java/awt/peer/gtk/GdkFontPeer.h
@@ -13,6 +13,10 @@ extern "Java"
 {
   namespace gnu
   {
+    namespace classpath
+    {
+        class Pointer;
+    }
     namespace java
     {
       namespace awt
@@ -93,7 +97,7 @@ public:
 private:
   ::java::lang::String * getName(jint, ::java::util::Locale *);
 public:
-  virtual jboolean canDisplay(::java::awt::Font *, jchar);
+  virtual jboolean canDisplay(::java::awt::Font *, jint);
   virtual jint canDisplayUpTo(::java::awt::Font *, ::java::text::CharacterIterator *, jint, jint);
   virtual ::java::awt::font::GlyphVector * createGlyphVector(::java::awt::Font *, ::java::awt::font::FontRenderContext *, ::java::text::CharacterIterator *);
   virtual ::java::awt::font::GlyphVector * createGlyphVector(::java::awt::Font *, ::java::awt::font::FontRenderContext *, JArray< jint > *);
@@ -135,6 +139,7 @@ public: // actually package-private
   ::gnu::java::awt::peer::gtk::GdkFontPeer$GdkFontMetrics * metrics;
 private:
   ::java::nio::ByteBuffer * nameTable;
+  ::gnu::classpath::Pointer * nativeFont;
 public:
   static ::java::lang::Class class$;
 };
diff --git a/libjava/gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.h b/libjava/gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.h
index 49586fc08b1..78d947c6ef4 100644
--- a/libjava/gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.h
+++ b/libjava/gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.h
@@ -13,6 +13,10 @@ extern "Java"
 {
   namespace gnu
   {
+    namespace classpath
+    {
+        class Pointer;
+    }
     namespace java
     {
       namespace awt
@@ -49,8 +53,7 @@ extern "Java"
 class gnu::java::awt::peer::gtk::GdkGraphicsEnvironment : public ::gnu::java::awt::ClasspathGraphicsEnvironment
 {
 
-public: // actually package-private
-  static void initStaticState();
+  static void initIDs();
 public:
   GdkGraphicsEnvironment();
 public: // actually package-private
@@ -80,6 +83,7 @@ private:
   jint __attribute__((aligned(__alignof__( ::gnu::java::awt::ClasspathGraphicsEnvironment)))) native_state;
   ::gnu::java::awt::peer::gtk::GdkScreenGraphicsDevice * defaultDevice;
   JArray< ::gnu::java::awt::peer::gtk::GdkScreenGraphicsDevice * > * devices;
+  ::gnu::classpath::Pointer * display;
 public:
   static ::java::lang::Class class$;
 };
diff --git a/libjava/gnu/java/awt/peer/gtk/GdkPixbufDecoder.h b/libjava/gnu/java/awt/peer/gtk/GdkPixbufDecoder.h
index 8f7066551cb..1c5fa79395e 100644
--- a/libjava/gnu/java/awt/peer/gtk/GdkPixbufDecoder.h
+++ b/libjava/gnu/java/awt/peer/gtk/GdkPixbufDecoder.h
@@ -13,6 +13,10 @@ extern "Java"
 {
   namespace gnu
   {
+    namespace classpath
+    {
+        class Pointer;
+    }
     namespace java
     {
       namespace awt
@@ -96,6 +100,9 @@ private:
   jboolean needsClose;
 public: // actually package-private
   ::java::util::Vector * curr;
+private:
+  ::gnu::classpath::Pointer * nativeDecoder;
+public: // actually package-private
   static ::java::awt::image::ColorModel * cm;
   static ::java::util::ArrayList * imageFormatSpecs;
 private:
diff --git a/libjava/gnu/java/awt/peer/gtk/GdkRobotPeer.h b/libjava/gnu/java/awt/peer/gtk/GdkRobotPeer.h
index d961df32f29..24c6a853c35 100644
--- a/libjava/gnu/java/awt/peer/gtk/GdkRobotPeer.h
+++ b/libjava/gnu/java/awt/peer/gtk/GdkRobotPeer.h
@@ -60,6 +60,7 @@ public: // actually package-private
 public:
   virtual jint getRGBPixel(jint, jint);
   virtual JArray< jint > * getRGBPixels(::java::awt::Rectangle *);
+  virtual void dispose();
 public: // actually package-private
   static ::java::awt::image::ColorModel * cm;
 public:
diff --git a/libjava/gnu/java/awt/peer/gtk/GdkScreenGraphicsDevice.h b/libjava/gnu/java/awt/peer/gtk/GdkScreenGraphicsDevice.h
index 30c165f6e7e..ff0362b99a2 100644
--- a/libjava/gnu/java/awt/peer/gtk/GdkScreenGraphicsDevice.h
+++ b/libjava/gnu/java/awt/peer/gtk/GdkScreenGraphicsDevice.h
@@ -13,6 +13,10 @@ extern "Java"
 {
   namespace gnu
   {
+    namespace classpath
+    {
+        class Pointer;
+    }
     namespace java
     {
       namespace awt
@@ -46,7 +50,7 @@ class gnu::java::awt::peer::gtk::GdkScreenGraphicsDevice : public ::java::awt::G
 {
 
 public: // actually package-private
-  static void initStaticState();
+  static void initIDs();
   GdkScreenGraphicsDevice(::gnu::java::awt::peer::gtk::GdkGraphicsEnvironment *);
   virtual void init();
   virtual ::java::awt::DisplayMode * nativeGetFixedDisplayMode(::gnu::java::awt::peer::gtk::GdkGraphicsEnvironment *);
@@ -90,6 +94,8 @@ public: // actually package-private
   ::java::lang::String * idString;
   JArray< ::gnu::java::awt::peer::gtk::GdkScreenGraphicsDevice$X11DisplayMode * > * displayModes;
   ::java::awt::DisplayMode * fixedDisplayMode;
+private:
+  ::gnu::classpath::Pointer * screen;
 public:
   static ::java::lang::Class class$;
 };
diff --git a/libjava/gnu/java/awt/peer/gtk/GtkComponentPeer.h b/libjava/gnu/java/awt/peer/gtk/GtkComponentPeer.h
index d29f0366f40..fa35e2ad70b 100644
--- a/libjava/gnu/java/awt/peer/gtk/GtkComponentPeer.h
+++ b/libjava/gnu/java/awt/peer/gtk/GtkComponentPeer.h
@@ -67,6 +67,13 @@ extern "Java"
       }
     }
   }
+  namespace sun
+  {
+    namespace awt
+    {
+        class CausedFocusEvent$Cause;
+    }
+  }
 }
 
 class gnu::java::awt::peer::gtk::GtkComponentPeer : public ::gnu::java::awt::peer::gtk::GtkGenericPeer
@@ -182,6 +189,7 @@ public:
   virtual void setBounds(jint, jint, jint, jint, jint);
   virtual jboolean isReparentSupported();
   virtual void layout();
+  virtual jboolean requestFocus(::java::awt::Component *, jboolean, jboolean, jlong, ::sun::awt::CausedFocusEvent$Cause *);
 public: // actually package-private
   ::java::awt::image::VolatileImage * __attribute__((aligned(__alignof__( ::gnu::java::awt::peer::gtk::GtkGenericPeer)))) backBuffer;
   ::java::awt::BufferCapabilities * caps;
diff --git a/libjava/gnu/java/awt/peer/gtk/GtkFramePeer.h b/libjava/gnu/java/awt/peer/gtk/GtkFramePeer.h
index c136fa917ca..2c8ea0ee3f0 100644
--- a/libjava/gnu/java/awt/peer/gtk/GtkFramePeer.h
+++ b/libjava/gnu/java/awt/peer/gtk/GtkFramePeer.h
@@ -80,6 +80,7 @@ public:
   virtual void setMaximizedBounds(::java::awt::Rectangle *);
   virtual void setBoundsPrivate(jint, jint, jint, jint);
   virtual jboolean requestWindowFocus();
+  virtual ::java::awt::Rectangle * getBoundsPrivate();
 private:
   jint __attribute__((aligned(__alignof__( ::gnu::java::awt::peer::gtk::GtkWindowPeer)))) menuBarHeight;
   ::java::awt::peer::MenuBarPeer * menuBar;
diff --git a/libjava/gnu/java/awt/peer/gtk/GtkGenericPeer.h b/libjava/gnu/java/awt/peer/gtk/GtkGenericPeer.h
index 6c9c87dc1ef..ffb135bac0d 100644
--- a/libjava/gnu/java/awt/peer/gtk/GtkGenericPeer.h
+++ b/libjava/gnu/java/awt/peer/gtk/GtkGenericPeer.h
@@ -11,6 +11,10 @@ extern "Java"
 {
   namespace gnu
   {
+    namespace classpath
+    {
+        class Pointer;
+    }
     namespace java
     {
       namespace awt
@@ -38,6 +42,7 @@ extern "Java"
 class gnu::java::awt::peer::gtk::GtkGenericPeer : public ::java::lang::Object
 {
 
+  static void initIDs();
 public:
   virtual void dispose();
 public: // actually package-private
@@ -57,6 +62,9 @@ private:
   static jint next_native_state;
 public: // actually protected
   ::java::lang::Object * awtWidget;
+private:
+  ::gnu::classpath::Pointer * widget;
+  ::gnu::classpath::Pointer * globalRef;
 public:
   static ::java::lang::Class class$;
 };
diff --git a/libjava/gnu/java/awt/peer/gtk/GtkToolkit.h b/libjava/gnu/java/awt/peer/gtk/GtkToolkit.h
index 66b3fcbaad4..c562e059e04 100644
--- a/libjava/gnu/java/awt/peer/gtk/GtkToolkit.h
+++ b/libjava/gnu/java/awt/peer/gtk/GtkToolkit.h
@@ -44,6 +44,8 @@ extern "Java"
         class Component;
         class Cursor;
         class Dialog;
+        class Dialog$ModalExclusionType;
+        class Dialog$ModalityType;
         class Dimension;
         class EventQueue;
         class FileDialog;
@@ -144,6 +146,10 @@ public: // actually package-private
   static void gtkInit(jint, ::java::lang::Object *);
   static void gtkMain();
   static void gtkQuit();
+private:
+  static void initIDs();
+public: // actually package-private
+  static void initializeGlobalIDs();
 public:
   GtkToolkit();
   virtual void beep();
@@ -228,10 +234,13 @@ private:
   void checkHeadless();
 public:
   virtual jint getMouseNumberOfButtons();
+  virtual jboolean isModalExclusionTypeSupported(::java::awt::Dialog$ModalExclusionType *);
+  virtual jboolean isModalityTypeSupported(::java::awt::Dialog$ModalityType *);
 public: // actually package-private
   static ::java::lang::Object * GTK_LOCK;
 private:
   static ::java::awt::EventQueue * q;
+  static jboolean initializedGlobalIDs;
   ::gnu::java::awt::peer::gtk::GtkToolkit$LRUCache * __attribute__((aligned(__alignof__( ::gnu::java::awt::ClasspathToolkit)))) fontCache;
   ::gnu::java::awt::peer::gtk::GtkToolkit$LRUCache * imageCache;
 public:
diff --git a/libjava/gnu/java/awt/peer/gtk/GtkWindowPeer.h b/libjava/gnu/java/awt/peer/gtk/GtkWindowPeer.h
index da0c32556ae..3eb4c142aaf 100644
--- a/libjava/gnu/java/awt/peer/gtk/GtkWindowPeer.h
+++ b/libjava/gnu/java/awt/peer/gtk/GtkWindowPeer.h
@@ -30,6 +30,7 @@ extern "Java"
     namespace awt
     {
         class Component;
+        class Dialog;
         class Graphics;
         class Rectangle;
         class Window;
@@ -101,6 +102,11 @@ public: // actually protected
   virtual void postMouseEvent(jint, jlong, jint, jint, jint, jint, jboolean);
 public:
   virtual ::java::awt::Rectangle * getBounds();
+  virtual void updateIconImages();
+  virtual void updateMinimumSize();
+  virtual void setModalBlocked(::java::awt::Dialog *, jboolean);
+  virtual void updateFocusableWindowState();
+  virtual void setAlwaysOnTop(jboolean);
 public: // actually protected
   static const jint GDK_WINDOW_TYPE_HINT_NORMAL = 0;
   static const jint GDK_WINDOW_TYPE_HINT_DIALOG = 1;