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

6 files changed, 21 insertions, 2 deletions

diff --git a/libjava/gnu/java/awt/peer/qt/QtComponentPeer.h b/libjava/gnu/java/awt/peer/qt/QtComponentPeer.h
index f596e809c2a..4688b8e3f24 100644
--- a/libjava/gnu/java/awt/peer/qt/QtComponentPeer.h
+++ b/libjava/gnu/java/awt/peer/qt/QtComponentPeer.h
@@ -65,6 +65,13 @@ extern "Java"
       }
     }
   }
+  namespace sun
+  {
+    namespace awt
+    {
+        class CausedFocusEvent$Cause;
+    }
+  }
 }
 
 class gnu::java::awt::peer::qt::QtComponentPeer : public ::gnu::java::awt::peer::qt::NativeWrapper
@@ -168,6 +175,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 protected
   static const jint POPUP_TRIGGER = 3;
   ::gnu::java::awt::peer::qt::QtToolkit * __attribute__((aligned(__alignof__( ::gnu::java::awt::peer::qt::NativeWrapper)))) toolkit;
diff --git a/libjava/gnu/java/awt/peer/qt/QtFontMetrics.h b/libjava/gnu/java/awt/peer/qt/QtFontMetrics.h
index a0655f2111f..fcb30d235be 100644
--- a/libjava/gnu/java/awt/peer/qt/QtFontMetrics.h
+++ b/libjava/gnu/java/awt/peer/qt/QtFontMetrics.h
@@ -59,7 +59,7 @@ private:
   void dispose();
 public: // actually package-private
   virtual ::java::awt::geom::Rectangle2D * getStringBounds(::java::lang::String *);
-  virtual jboolean canDisplay(jchar);
+  virtual jboolean canDisplay(jint);
 public:
   virtual jint getAscent();
   virtual jint getDescent();
diff --git a/libjava/gnu/java/awt/peer/qt/QtFontPeer.h b/libjava/gnu/java/awt/peer/qt/QtFontPeer.h
index 11ca6ccf6c6..0daebcc135e 100644
--- a/libjava/gnu/java/awt/peer/qt/QtFontPeer.h
+++ b/libjava/gnu/java/awt/peer/qt/QtFontPeer.h
@@ -64,7 +64,7 @@ private:
   void create(::java::lang::String *, jint, jint);
 public:
   virtual void dispose();
-  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::lang::String * getSubFamilyName(::java::awt::Font *, ::java::util::Locale *);
   virtual ::java::lang::String * getPostScriptName(::java::awt::Font *);
diff --git a/libjava/gnu/java/awt/peer/qt/QtFramePeer.h b/libjava/gnu/java/awt/peer/qt/QtFramePeer.h
index 1b0f39e68d5..a89557c6011 100644
--- a/libjava/gnu/java/awt/peer/qt/QtFramePeer.h
+++ b/libjava/gnu/java/awt/peer/qt/QtFramePeer.h
@@ -66,6 +66,7 @@ public:
   virtual void setBoundsPrivate(jint, jint, jint, jint);
   virtual void updateAlwaysOnTop();
   virtual jboolean requestWindowFocus();
+  virtual ::java::awt::Rectangle * getBoundsPrivate();
 private:
   jint __attribute__((aligned(__alignof__( ::gnu::java::awt::peer::qt::QtWindowPeer)))) theState;
 public: // actually package-private
diff --git a/libjava/gnu/java/awt/peer/qt/QtToolkit.h b/libjava/gnu/java/awt/peer/qt/QtToolkit.h
index 471794be6c9..319318ac5ff 100644
--- a/libjava/gnu/java/awt/peer/qt/QtToolkit.h
+++ b/libjava/gnu/java/awt/peer/qt/QtToolkit.h
@@ -43,6 +43,8 @@ extern "Java"
         class CheckboxMenuItem;
         class Choice;
         class Dialog;
+        class Dialog$ModalExclusionType;
+        class Dialog$ModalityType;
         class Dimension;
         class EventQueue;
         class FileDialog;
@@ -193,6 +195,8 @@ public:
   virtual ::java::awt::Font * createFont(jint, ::java::io::InputStream *);
   virtual ::java::awt::peer::RobotPeer * createRobot(::java::awt::GraphicsDevice *);
   virtual ::gnu::java::awt::peer::EmbeddedWindowPeer * createEmbeddedWindow(::gnu::java::awt::EmbeddedWindow *);
+  virtual jboolean isModalExclusionTypeSupported(::java::awt::Dialog$ModalExclusionType *);
+  virtual jboolean isModalityTypeSupported(::java::awt::Dialog$ModalityType *);
   static ::java::awt::EventQueue * eventQueue;
   static ::gnu::java::awt::peer::qt::QtRepaintThread * repaintThread;
   static ::gnu::java::awt::peer::qt::MainQtThread * guiThread;
diff --git a/libjava/gnu/java/awt/peer/qt/QtWindowPeer.h b/libjava/gnu/java/awt/peer/qt/QtWindowPeer.h
index e451e3c6027..9e5a1474f2d 100644
--- a/libjava/gnu/java/awt/peer/qt/QtWindowPeer.h
+++ b/libjava/gnu/java/awt/peer/qt/QtWindowPeer.h
@@ -31,6 +31,7 @@ extern "Java"
     namespace awt
     {
         class Component;
+        class Dialog;
     }
   }
 }
@@ -49,6 +50,11 @@ public:
   virtual void setTitle(::java::lang::String *);
   virtual void updateAlwaysOnTop();
   virtual jboolean requestWindowFocus();
+  virtual void updateIconImages();
+  virtual void updateMinimumSize();
+  virtual void setModalBlocked(::java::awt::Dialog *, jboolean);
+  virtual void updateFocusableWindowState();
+  virtual void setAlwaysOnTop(jboolean);
   static ::java::lang::Class class$;
 };