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

29 files changed, 350 insertions, 1 deletions

diff --git a/libjava/java/awt/Dialog$ModalExclusionType.h b/libjava/java/awt/Dialog$ModalExclusionType.h
new file mode 100644
index 00000000000..a47a2b4aec4
--- /dev/null
+++ b/libjava/java/awt/Dialog$ModalExclusionType.h
@@ -0,0 +1,39 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __java_awt_Dialog$ModalExclusionType__
+#define __java_awt_Dialog$ModalExclusionType__
+
+#pragma interface
+
+#include <java/lang/Enum.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Dialog$ModalExclusionType;
+    }
+  }
+}
+
+class java::awt::Dialog$ModalExclusionType : public ::java::lang::Enum
+{
+
+  Dialog$ModalExclusionType(::java::lang::String *, jint);
+public:
+  static JArray< ::java::awt::Dialog$ModalExclusionType * > * values();
+  static ::java::awt::Dialog$ModalExclusionType * valueOf(::java::lang::String *);
+  static ::java::awt::Dialog$ModalExclusionType * APPLICATION_EXCLUDE;
+  static ::java::awt::Dialog$ModalExclusionType * NO_EXCLUDE;
+  static ::java::awt::Dialog$ModalExclusionType * TOOLKIT_EXCLUDE;
+private:
+  static JArray< ::java::awt::Dialog$ModalExclusionType * > * ENUM$VALUES;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __java_awt_Dialog$ModalExclusionType__
diff --git a/libjava/java/awt/Dialog$ModalityType.h b/libjava/java/awt/Dialog$ModalityType.h
new file mode 100644
index 00000000000..e7a3b736ee1
--- /dev/null
+++ b/libjava/java/awt/Dialog$ModalityType.h
@@ -0,0 +1,40 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __java_awt_Dialog$ModalityType__
+#define __java_awt_Dialog$ModalityType__
+
+#pragma interface
+
+#include <java/lang/Enum.h>
+#include <gcj/array.h>
+
+extern "Java"
+{
+  namespace java
+  {
+    namespace awt
+    {
+        class Dialog$ModalityType;
+    }
+  }
+}
+
+class java::awt::Dialog$ModalityType : public ::java::lang::Enum
+{
+
+  Dialog$ModalityType(::java::lang::String *, jint);
+public:
+  static JArray< ::java::awt::Dialog$ModalityType * > * values();
+  static ::java::awt::Dialog$ModalityType * valueOf(::java::lang::String *);
+  static ::java::awt::Dialog$ModalityType * APPLICATION_MODAL;
+  static ::java::awt::Dialog$ModalityType * DOCUMENT_MODAL;
+  static ::java::awt::Dialog$ModalityType * MODELESS;
+  static ::java::awt::Dialog$ModalityType * TOOLKIT_MODAL;
+private:
+  static JArray< ::java::awt::Dialog$ModalityType * > * ENUM$VALUES;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __java_awt_Dialog$ModalityType__
diff --git a/libjava/java/awt/Font.h b/libjava/java/awt/Font.h
index 07c651f5837..c3b46bf7c75 100644
--- a/libjava/java/awt/Font.h
+++ b/libjava/java/awt/Font.h
@@ -66,6 +66,9 @@ public: // actually package-private
 public:
   static ::java::awt::Font * getFont(::java::lang::String *, ::java::awt::Font *);
   static ::java::awt::Font * getFont(::java::lang::String *);
+public: // actually protected
+  Font(::java::awt::Font *);
+public:
   Font(::java::lang::String *, jint, jint);
   Font(::java::util::Map *);
 public: // actually package-private
@@ -80,6 +83,7 @@ public:
   virtual ::java::lang::String * getFamily();
   virtual jint getStyle();
   virtual jboolean canDisplay(jchar);
+  virtual jboolean canDisplay(jint);
   virtual jint canDisplayUpTo(::java::lang::String *);
   virtual jint canDisplayUpTo(JArray< jchar > *, jint, jint);
   virtual jint canDisplayUpTo(::java::text::CharacterIterator *, jint, jint);
@@ -123,6 +127,7 @@ public:
   virtual jboolean equals(::java::lang::Object *);
   virtual ::java::lang::String * toString();
   virtual ::java::awt::font::LineMetrics * getLineMetrics(::java::lang::String *, ::java::awt::font::FontRenderContext *);
+  virtual jboolean hasLayoutAttributes();
 private:
   void readObject(::java::io::ObjectInputStream *);
 public:
@@ -138,6 +143,11 @@ public:
   static const jint LAYOUT_RIGHT_TO_LEFT = 1;
   static const jint LAYOUT_NO_START_CONTEXT = 2;
   static const jint LAYOUT_NO_LIMIT_CONTEXT = 4;
+  static ::java::lang::String * DIALOG;
+  static ::java::lang::String * DIALOG_INPUT;
+  static ::java::lang::String * MONOSPACED;
+  static ::java::lang::String * SANS_SERIF;
+  static ::java::lang::String * SERIF;
 public: // actually protected
   ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) name;
   jint size;
diff --git a/libjava/java/awt/Toolkit.h b/libjava/java/awt/Toolkit.h
index 80528fe0571..844ebe81571 100644
--- a/libjava/java/awt/Toolkit.h
+++ b/libjava/java/awt/Toolkit.h
@@ -39,6 +39,8 @@ extern "Java"
         class Cursor;
         class Desktop;
         class Dialog;
+        class Dialog$ModalExclusionType;
+        class Dialog$ModalityType;
         class Dimension;
         class EventQueue;
         class FileDialog;
@@ -229,6 +231,8 @@ public: // actually package-private
   virtual void globalDispatchEvent(::java::awt::AWTEvent *);
 public:
   virtual ::java::util::Map * mapInputMethodHighlight(::java::awt::im::InputMethodHighlight *) = 0;
+  virtual jboolean isModalExclusionTypeSupported(::java::awt::Dialog$ModalExclusionType *) = 0;
+  virtual jboolean isModalityTypeSupported(::java::awt::Dialog$ModalityType *) = 0;
 private:
   static void initAccessibility();
   static ::java::lang::String * default_toolkit_name;
diff --git a/libjava/java/awt/event/MouseEvent.h b/libjava/java/awt/event/MouseEvent.h
index 439fc50ca39..82ef6c22d12 100644
--- a/libjava/java/awt/event/MouseEvent.h
+++ b/libjava/java/awt/event/MouseEvent.h
@@ -29,8 +29,12 @@ class java::awt::event::MouseEvent : public ::java::awt::event::InputEvent
 public:
   MouseEvent(::java::awt::Component *, jint, jlong, jint, jint, jint, jint, jboolean, jint);
   MouseEvent(::java::awt::Component *, jint, jlong, jint, jint, jint, jint, jboolean);
+  MouseEvent(::java::awt::Component *, jint, jlong, jint, jint, jint, jint, jint, jint, jboolean, jint);
   virtual jint getX();
   virtual jint getY();
+  virtual ::java::awt::Point * getLocationOnScreen();
+  virtual jint getXOnScreen();
+  virtual jint getYOnScreen();
   virtual ::java::awt::Point * getPoint();
   virtual void translatePoint(jint, jint);
   virtual jint getClickCount();
@@ -59,6 +63,8 @@ public:
 private:
   jint __attribute__((aligned(__alignof__( ::java::awt::event::InputEvent)))) x;
   jint y;
+  jint absX;
+  jint absY;
   jint clickCount;
   jint button;
   jboolean popupTrigger;
diff --git a/libjava/java/awt/peer/ButtonPeer.h b/libjava/java/awt/peer/ButtonPeer.h
index 1f5c203e055..781fd0e6fcb 100644
--- a/libjava/java/awt/peer/ButtonPeer.h
+++ b/libjava/java/awt/peer/ButtonPeer.h
@@ -46,6 +46,13 @@ extern "Java"
       }
     }
   }
+  namespace sun
+  {
+    namespace awt
+    {
+        class CausedFocusEvent$Cause;
+    }
+  }
 }
 
 class java::awt::peer::ButtonPeer : public ::java::lang::Object
@@ -104,6 +111,7 @@ public:
   virtual void setBounds(jint, jint, jint, jint, jint) = 0;
   virtual jboolean isReparentSupported() = 0;
   virtual void layout() = 0;
+  virtual jboolean requestFocus(::java::awt::Component *, jboolean, jboolean, jlong, ::sun::awt::CausedFocusEvent$Cause *) = 0;
   static ::java::lang::Class class$;
 } __attribute__ ((java_interface));
 
diff --git a/libjava/java/awt/peer/CanvasPeer.h b/libjava/java/awt/peer/CanvasPeer.h
index 503b48a561d..2f9ba7c1398 100644
--- a/libjava/java/awt/peer/CanvasPeer.h
+++ b/libjava/java/awt/peer/CanvasPeer.h
@@ -46,6 +46,13 @@ extern "Java"
       }
     }
   }
+  namespace sun
+  {
+    namespace awt
+    {
+        class CausedFocusEvent$Cause;
+    }
+  }
 }
 
 class java::awt::peer::CanvasPeer : public ::java::lang::Object
@@ -103,6 +110,7 @@ public:
   virtual void setBounds(jint, jint, jint, jint, jint) = 0;
   virtual jboolean isReparentSupported() = 0;
   virtual void layout() = 0;
+  virtual jboolean requestFocus(::java::awt::Component *, jboolean, jboolean, jlong, ::sun::awt::CausedFocusEvent$Cause *) = 0;
   static ::java::lang::Class class$;
 } __attribute__ ((java_interface));
 
diff --git a/libjava/java/awt/peer/CheckboxPeer.h b/libjava/java/awt/peer/CheckboxPeer.h
index a397322e497..72e05ee204a 100644
--- a/libjava/java/awt/peer/CheckboxPeer.h
+++ b/libjava/java/awt/peer/CheckboxPeer.h
@@ -47,6 +47,13 @@ extern "Java"
       }
     }
   }
+  namespace sun
+  {
+    namespace awt
+    {
+        class CausedFocusEvent$Cause;
+    }
+  }
 }
 
 class java::awt::peer::CheckboxPeer : public ::java::lang::Object
@@ -107,6 +114,7 @@ public:
   virtual void setBounds(jint, jint, jint, jint, jint) = 0;
   virtual jboolean isReparentSupported() = 0;
   virtual void layout() = 0;
+  virtual jboolean requestFocus(::java::awt::Component *, jboolean, jboolean, jlong, ::sun::awt::CausedFocusEvent$Cause *) = 0;
   static ::java::lang::Class class$;
 } __attribute__ ((java_interface));
 
diff --git a/libjava/java/awt/peer/ChoicePeer.h b/libjava/java/awt/peer/ChoicePeer.h
index 78dca416d05..9a152d69322 100644
--- a/libjava/java/awt/peer/ChoicePeer.h
+++ b/libjava/java/awt/peer/ChoicePeer.h
@@ -46,6 +46,13 @@ extern "Java"
       }
     }
   }
+  namespace sun
+  {
+    namespace awt
+    {
+        class CausedFocusEvent$Cause;
+    }
+  }
 }
 
 class java::awt::peer::ChoicePeer : public ::java::lang::Object
@@ -108,6 +115,7 @@ public:
   virtual void setBounds(jint, jint, jint, jint, jint) = 0;
   virtual jboolean isReparentSupported() = 0;
   virtual void layout() = 0;
+  virtual jboolean requestFocus(::java::awt::Component *, jboolean, jboolean, jlong, ::sun::awt::CausedFocusEvent$Cause *) = 0;
   static ::java::lang::Class class$;
 } __attribute__ ((java_interface));
 
diff --git a/libjava/java/awt/peer/ComponentPeer.h b/libjava/java/awt/peer/ComponentPeer.h
index 3d3c22d9d2b..5bcd8876f4f 100644
--- a/libjava/java/awt/peer/ComponentPeer.h
+++ b/libjava/java/awt/peer/ComponentPeer.h
@@ -46,6 +46,13 @@ extern "Java"
       }
     }
   }
+  namespace sun
+  {
+    namespace awt
+    {
+        class CausedFocusEvent$Cause;
+    }
+  }
 }
 
 class java::awt::peer::ComponentPeer : public ::java::lang::Object
@@ -103,6 +110,7 @@ public:
   virtual void setBounds(jint, jint, jint, jint, jint) = 0;
   virtual jboolean isReparentSupported() = 0;
   virtual void layout() = 0;
+  virtual jboolean requestFocus(::java::awt::Component *, jboolean, jboolean, jlong, ::sun::awt::CausedFocusEvent$Cause *) = 0;
   static ::java::lang::Class class$;
 } __attribute__ ((java_interface));
 
diff --git a/libjava/java/awt/peer/ContainerPeer.h b/libjava/java/awt/peer/ContainerPeer.h
index 6d6e9df4580..d1d26a02bd8 100644
--- a/libjava/java/awt/peer/ContainerPeer.h
+++ b/libjava/java/awt/peer/ContainerPeer.h
@@ -46,6 +46,13 @@ extern "Java"
       }
     }
   }
+  namespace sun
+  {
+    namespace awt
+    {
+        class CausedFocusEvent$Cause;
+    }
+  }
 }
 
 class java::awt::peer::ContainerPeer : public ::java::lang::Object
@@ -113,6 +120,7 @@ public:
   virtual void setBounds(jint, jint, jint, jint, jint) = 0;
   virtual jboolean isReparentSupported() = 0;
   virtual void layout() = 0;
+  virtual jboolean requestFocus(::java::awt::Component *, jboolean, jboolean, jlong, ::sun::awt::CausedFocusEvent$Cause *) = 0;
   static ::java::lang::Class class$;
 } __attribute__ ((java_interface));
 
diff --git a/libjava/java/awt/peer/DialogPeer.h b/libjava/java/awt/peer/DialogPeer.h
index 2212ec95bcb..95f9e0c1c85 100644
--- a/libjava/java/awt/peer/DialogPeer.h
+++ b/libjava/java/awt/peer/DialogPeer.h
@@ -19,6 +19,7 @@ extern "Java"
         class Color;
         class Component;
         class Cursor;
+        class Dialog;
         class Dimension;
         class Font;
         class FontMetrics;
@@ -47,6 +48,13 @@ extern "Java"
       }
     }
   }
+  namespace sun
+  {
+    namespace awt
+    {
+        class CausedFocusEvent$Cause;
+    }
+  }
 }
 
 class java::awt::peer::DialogPeer : public ::java::lang::Object
@@ -59,6 +67,11 @@ public:
   virtual void toFront() = 0;
   virtual void updateAlwaysOnTop() = 0;
   virtual jboolean requestWindowFocus() = 0;
+  virtual void setAlwaysOnTop(jboolean) = 0;
+  virtual void updateFocusableWindowState() = 0;
+  virtual void setModalBlocked(::java::awt::Dialog *, jboolean) = 0;
+  virtual void updateMinimumSize() = 0;
+  virtual void updateIconImages() = 0;
   virtual ::java::awt::Insets * insets() = 0;
   virtual ::java::awt::Insets * getInsets() = 0;
   virtual void beginValidate() = 0;
@@ -120,6 +133,7 @@ public:
   virtual void setBounds(jint, jint, jint, jint, jint) = 0;
   virtual jboolean isReparentSupported() = 0;
   virtual void layout() = 0;
+  virtual jboolean requestFocus(::java::awt::Component *, jboolean, jboolean, jlong, ::sun::awt::CausedFocusEvent$Cause *) = 0;
   static ::java::lang::Class class$;
 } __attribute__ ((java_interface));
 
diff --git a/libjava/java/awt/peer/FileDialogPeer.h b/libjava/java/awt/peer/FileDialogPeer.h
index b2419e42f41..22575b60041 100644
--- a/libjava/java/awt/peer/FileDialogPeer.h
+++ b/libjava/java/awt/peer/FileDialogPeer.h
@@ -19,6 +19,7 @@ extern "Java"
         class Color;
         class Component;
         class Cursor;
+        class Dialog;
         class Dimension;
         class Font;
         class FontMetrics;
@@ -47,6 +48,13 @@ extern "Java"
       }
     }
   }
+  namespace sun
+  {
+    namespace awt
+    {
+        class CausedFocusEvent$Cause;
+    }
+  }
 }
 
 class java::awt::peer::FileDialogPeer : public ::java::lang::Object
@@ -62,6 +70,11 @@ public:
   virtual void toFront() = 0;
   virtual void updateAlwaysOnTop() = 0;
   virtual jboolean requestWindowFocus() = 0;
+  virtual void setAlwaysOnTop(jboolean) = 0;
+  virtual void updateFocusableWindowState() = 0;
+  virtual void setModalBlocked(::java::awt::Dialog *, jboolean) = 0;
+  virtual void updateMinimumSize() = 0;
+  virtual void updateIconImages() = 0;
   virtual ::java::awt::Insets * insets() = 0;
   virtual ::java::awt::Insets * getInsets() = 0;
   virtual void beginValidate() = 0;
@@ -123,6 +136,7 @@ public:
   virtual void setBounds(jint, jint, jint, jint, jint) = 0;
   virtual jboolean isReparentSupported() = 0;
   virtual void layout() = 0;
+  virtual jboolean requestFocus(::java::awt::Component *, jboolean, jboolean, jlong, ::sun::awt::CausedFocusEvent$Cause *) = 0;
   static ::java::lang::Class class$;
 } __attribute__ ((java_interface));
 
diff --git a/libjava/java/awt/peer/FramePeer.h b/libjava/java/awt/peer/FramePeer.h
index a80ca5540f1..e340e134b9d 100644
--- a/libjava/java/awt/peer/FramePeer.h
+++ b/libjava/java/awt/peer/FramePeer.h
@@ -19,6 +19,7 @@ extern "Java"
         class Color;
         class Component;
         class Cursor;
+        class Dialog;
         class Dimension;
         class Font;
         class FontMetrics;
@@ -48,6 +49,13 @@ extern "Java"
       }
     }
   }
+  namespace sun
+  {
+    namespace awt
+    {
+        class CausedFocusEvent$Cause;
+    }
+  }
 }
 
 class java::awt::peer::FramePeer : public ::java::lang::Object
@@ -63,10 +71,16 @@ public:
   virtual void setMaximizedBounds(::java::awt::Rectangle *) = 0;
   virtual jboolean isRestackSupported() = 0;
   virtual void setBoundsPrivate(jint, jint, jint, jint) = 0;
+  virtual ::java::awt::Rectangle * getBoundsPrivate() = 0;
   virtual void toBack() = 0;
   virtual void toFront() = 0;
   virtual void updateAlwaysOnTop() = 0;
   virtual jboolean requestWindowFocus() = 0;
+  virtual void setAlwaysOnTop(jboolean) = 0;
+  virtual void updateFocusableWindowState() = 0;
+  virtual void setModalBlocked(::java::awt::Dialog *, jboolean) = 0;
+  virtual void updateMinimumSize() = 0;
+  virtual void updateIconImages() = 0;
   virtual ::java::awt::Insets * insets() = 0;
   virtual ::java::awt::Insets * getInsets() = 0;
   virtual void beginValidate() = 0;
@@ -127,6 +141,7 @@ public:
   virtual void setBounds(jint, jint, jint, jint, jint) = 0;
   virtual jboolean isReparentSupported() = 0;
   virtual void layout() = 0;
+  virtual jboolean requestFocus(::java::awt::Component *, jboolean, jboolean, jlong, ::sun::awt::CausedFocusEvent$Cause *) = 0;
   static ::java::lang::Class class$;
 } __attribute__ ((java_interface));
 
diff --git a/libjava/java/awt/peer/LabelPeer.h b/libjava/java/awt/peer/LabelPeer.h
index 426772d0e09..5247a0d0965 100644
--- a/libjava/java/awt/peer/LabelPeer.h
+++ b/libjava/java/awt/peer/LabelPeer.h
@@ -46,6 +46,13 @@ extern "Java"
       }
     }
   }
+  namespace sun
+  {
+    namespace awt
+    {
+        class CausedFocusEvent$Cause;
+    }
+  }
 }
 
 class java::awt::peer::LabelPeer : public ::java::lang::Object
@@ -105,6 +112,7 @@ public:
   virtual void setBounds(jint, jint, jint, jint, jint) = 0;
   virtual jboolean isReparentSupported() = 0;
   virtual void layout() = 0;
+  virtual jboolean requestFocus(::java::awt::Component *, jboolean, jboolean, jlong, ::sun::awt::CausedFocusEvent$Cause *) = 0;
   static ::java::lang::Class class$;
 } __attribute__ ((java_interface));
 
diff --git a/libjava/java/awt/peer/LightweightPeer.h b/libjava/java/awt/peer/LightweightPeer.h
index 9c743d97f3d..b18182f8271 100644
--- a/libjava/java/awt/peer/LightweightPeer.h
+++ b/libjava/java/awt/peer/LightweightPeer.h
@@ -46,6 +46,13 @@ extern "Java"
       }
     }
   }
+  namespace sun
+  {
+    namespace awt
+    {
+        class CausedFocusEvent$Cause;
+    }
+  }
 }
 
 class java::awt::peer::LightweightPeer : public ::java::lang::Object
@@ -103,6 +110,7 @@ public:
   virtual void setBounds(jint, jint, jint, jint, jint) = 0;
   virtual jboolean isReparentSupported() = 0;
   virtual void layout() = 0;
+  virtual jboolean requestFocus(::java::awt::Component *, jboolean, jboolean, jlong, ::sun::awt::CausedFocusEvent$Cause *) = 0;
   static ::java::lang::Class class$;
 } __attribute__ ((java_interface));
 
diff --git a/libjava/java/awt/peer/ListPeer.h b/libjava/java/awt/peer/ListPeer.h
index 3dd6bad7aa2..0edfd625168 100644
--- a/libjava/java/awt/peer/ListPeer.h
+++ b/libjava/java/awt/peer/ListPeer.h
@@ -48,6 +48,13 @@ extern "Java"
       }
     }
   }
+  namespace sun
+  {
+    namespace awt
+    {
+        class CausedFocusEvent$Cause;
+    }
+  }
 }
 
 class java::awt::peer::ListPeer : public ::java::lang::Object
@@ -120,6 +127,7 @@ public:
   virtual void setBounds(jint, jint, jint, jint, jint) = 0;
   virtual jboolean isReparentSupported() = 0;
   virtual void layout() = 0;
+  virtual jboolean requestFocus(::java::awt::Component *, jboolean, jboolean, jlong, ::sun::awt::CausedFocusEvent$Cause *) = 0;
   static ::java::lang::Class class$;
 } __attribute__ ((java_interface));
 
diff --git a/libjava/java/awt/peer/PanelPeer.h b/libjava/java/awt/peer/PanelPeer.h
index 57e4ff7687a..b90c0570aa1 100644
--- a/libjava/java/awt/peer/PanelPeer.h
+++ b/libjava/java/awt/peer/PanelPeer.h
@@ -47,6 +47,13 @@ extern "Java"
       }
     }
   }
+  namespace sun
+  {
+    namespace awt
+    {
+        class CausedFocusEvent$Cause;
+    }
+  }
 }
 
 class java::awt::peer::PanelPeer : public ::java::lang::Object
@@ -114,6 +121,7 @@ public:
   virtual void setBounds(jint, jint, jint, jint, jint) = 0;
   virtual jboolean isReparentSupported() = 0;
   virtual void layout() = 0;
+  virtual jboolean requestFocus(::java::awt::Component *, jboolean, jboolean, jlong, ::sun::awt::CausedFocusEvent$Cause *) = 0;
   static ::java::lang::Class class$;
 } __attribute__ ((java_interface));
 
diff --git a/libjava/java/awt/peer/RobotPeer.h b/libjava/java/awt/peer/RobotPeer.h
index f0f810ae384..7947c5031c3 100644
--- a/libjava/java/awt/peer/RobotPeer.h
+++ b/libjava/java/awt/peer/RobotPeer.h
@@ -36,6 +36,7 @@ public:
   virtual void keyRelease(jint) = 0;
   virtual jint getRGBPixel(jint, jint) = 0;
   virtual JArray< jint > * getRGBPixels(::java::awt::Rectangle *) = 0;
+  virtual void dispose() = 0;
   static ::java::lang::Class class$;
 } __attribute__ ((java_interface));
 
diff --git a/libjava/java/awt/peer/ScrollPanePeer.h b/libjava/java/awt/peer/ScrollPanePeer.h
index f6387a50468..25f9431f549 100644
--- a/libjava/java/awt/peer/ScrollPanePeer.h
+++ b/libjava/java/awt/peer/ScrollPanePeer.h
@@ -48,6 +48,13 @@ extern "Java"
       }
     }
   }
+  namespace sun
+  {
+    namespace awt
+    {
+        class CausedFocusEvent$Cause;
+    }
+  }
 }
 
 class java::awt::peer::ScrollPanePeer : public ::java::lang::Object
@@ -121,6 +128,7 @@ public:
   virtual void setBounds(jint, jint, jint, jint, jint) = 0;
   virtual jboolean isReparentSupported() = 0;
   virtual void layout() = 0;
+  virtual jboolean requestFocus(::java::awt::Component *, jboolean, jboolean, jlong, ::sun::awt::CausedFocusEvent$Cause *) = 0;
   static ::java::lang::Class class$;
 } __attribute__ ((java_interface));
 
diff --git a/libjava/java/awt/peer/ScrollbarPeer.h b/libjava/java/awt/peer/ScrollbarPeer.h
index 9e0c7c76c1b..b030ca5d90f 100644
--- a/libjava/java/awt/peer/ScrollbarPeer.h
+++ b/libjava/java/awt/peer/ScrollbarPeer.h
@@ -46,6 +46,13 @@ extern "Java"
       }
     }
   }
+  namespace sun
+  {
+    namespace awt
+    {
+        class CausedFocusEvent$Cause;
+    }
+  }
 }
 
 class java::awt::peer::ScrollbarPeer : public ::java::lang::Object
@@ -106,6 +113,7 @@ public:
   virtual void setBounds(jint, jint, jint, jint, jint) = 0;
   virtual jboolean isReparentSupported() = 0;
   virtual void layout() = 0;
+  virtual jboolean requestFocus(::java::awt::Component *, jboolean, jboolean, jlong, ::sun::awt::CausedFocusEvent$Cause *) = 0;
   static ::java::lang::Class class$;
 } __attribute__ ((java_interface));
 
diff --git a/libjava/java/awt/peer/TextAreaPeer.h b/libjava/java/awt/peer/TextAreaPeer.h
index 1954909b9bc..24fb100d711 100644
--- a/libjava/java/awt/peer/TextAreaPeer.h
+++ b/libjava/java/awt/peer/TextAreaPeer.h
@@ -50,6 +50,13 @@ extern "Java"
       }
     }
   }
+  namespace sun
+  {
+    namespace awt
+    {
+        class CausedFocusEvent$Cause;
+    }
+  }
 }
 
 class java::awt::peer::TextAreaPeer : public ::java::lang::Object
@@ -127,6 +134,7 @@ public:
   virtual void setBounds(jint, jint, jint, jint, jint) = 0;
   virtual jboolean isReparentSupported() = 0;
   virtual void layout() = 0;
+  virtual jboolean requestFocus(::java::awt::Component *, jboolean, jboolean, jlong, ::sun::awt::CausedFocusEvent$Cause *) = 0;
   static ::java::lang::Class class$;
 } __attribute__ ((java_interface));
 
diff --git a/libjava/java/awt/peer/TextComponentPeer.h b/libjava/java/awt/peer/TextComponentPeer.h
index 37e0310bde1..71afe17f5a0 100644
--- a/libjava/java/awt/peer/TextComponentPeer.h
+++ b/libjava/java/awt/peer/TextComponentPeer.h
@@ -50,6 +50,13 @@ extern "Java"
       }
     }
   }
+  namespace sun
+  {
+    namespace awt
+    {
+        class CausedFocusEvent$Cause;
+    }
+  }
 }
 
 class java::awt::peer::TextComponentPeer : public ::java::lang::Object
@@ -119,6 +126,7 @@ public:
   virtual void setBounds(jint, jint, jint, jint, jint) = 0;
   virtual jboolean isReparentSupported() = 0;
   virtual void layout() = 0;
+  virtual jboolean requestFocus(::java::awt::Component *, jboolean, jboolean, jlong, ::sun::awt::CausedFocusEvent$Cause *) = 0;
   static ::java::lang::Class class$;
 } __attribute__ ((java_interface));
 
diff --git a/libjava/java/awt/peer/TextFieldPeer.h b/libjava/java/awt/peer/TextFieldPeer.h
index a3718929d64..a2785b1b6bc 100644
--- a/libjava/java/awt/peer/TextFieldPeer.h
+++ b/libjava/java/awt/peer/TextFieldPeer.h
@@ -50,6 +50,13 @@ extern "Java"
       }
     }
   }
+  namespace sun
+  {
+    namespace awt
+    {
+        class CausedFocusEvent$Cause;
+    }
+  }
 }
 
 class java::awt::peer::TextFieldPeer : public ::java::lang::Object
@@ -125,6 +132,7 @@ public:
   virtual void setBounds(jint, jint, jint, jint, jint) = 0;
   virtual jboolean isReparentSupported() = 0;
   virtual void layout() = 0;
+  virtual jboolean requestFocus(::java::awt::Component *, jboolean, jboolean, jlong, ::sun::awt::CausedFocusEvent$Cause *) = 0;
   static ::java::lang::Class class$;
 } __attribute__ ((java_interface));
 
diff --git a/libjava/java/awt/peer/WindowPeer.h b/libjava/java/awt/peer/WindowPeer.h
index c900a1cecab..0257d8cb88c 100644
--- a/libjava/java/awt/peer/WindowPeer.h
+++ b/libjava/java/awt/peer/WindowPeer.h
@@ -19,6 +19,7 @@ extern "Java"
         class Color;
         class Component;
         class Cursor;
+        class Dialog;
         class Dimension;
         class Font;
         class FontMetrics;
@@ -47,6 +48,13 @@ extern "Java"
       }
     }
   }
+  namespace sun
+  {
+    namespace awt
+    {
+        class CausedFocusEvent$Cause;
+    }
+  }
 }
 
 class java::awt::peer::WindowPeer : public ::java::lang::Object
@@ -57,6 +65,11 @@ public:
   virtual void toFront() = 0;
   virtual void updateAlwaysOnTop() = 0;
   virtual jboolean requestWindowFocus() = 0;
+  virtual void setAlwaysOnTop(jboolean) = 0;
+  virtual void updateFocusableWindowState() = 0;
+  virtual void setModalBlocked(::java::awt::Dialog *, jboolean) = 0;
+  virtual void updateMinimumSize() = 0;
+  virtual void updateIconImages() = 0;
   virtual ::java::awt::Insets * insets() = 0;
   virtual ::java::awt::Insets * getInsets() = 0;
   virtual void beginValidate() = 0;
@@ -118,6 +131,7 @@ public:
   virtual void setBounds(jint, jint, jint, jint, jint) = 0;
   virtual jboolean isReparentSupported() = 0;
   virtual void layout() = 0;
+  virtual jboolean requestFocus(::java::awt::Component *, jboolean, jboolean, jlong, ::sun::awt::CausedFocusEvent$Cause *) = 0;
   static ::java::lang::Class class$;
 } __attribute__ ((java_interface));
 
diff --git a/libjava/java/lang/VMFloat.h b/libjava/java/lang/VMFloat.h
index 58e7ba9bbcc..fec037b2cf1 100644
--- a/libjava/java/lang/VMFloat.h
+++ b/libjava/java/lang/VMFloat.h
@@ -16,6 +16,8 @@ public: // actually package-private
   static jint floatToIntBits(jfloat);
   static jint floatToRawIntBits(jfloat);
   static jfloat intBitsToFloat(jint);
+  static ::java::lang::String * toString(jfloat);
+  static jfloat parseFloat(::java::lang::String *);
 public:
   static ::java::lang::Class class$;
 };
diff --git a/libjava/java/lang/VMFloat.java b/libjava/java/lang/VMFloat.java
index a6570f929c6..72a8c3c6b18 100644
--- a/libjava/java/lang/VMFloat.java
+++ b/libjava/java/lang/VMFloat.java
@@ -96,4 +96,26 @@ final class VMFloat
    */
   static native float intBitsToFloat(int bits);
 
+  /**
+   * @param f the <code>float</code> to convert
+   * @return the <code>String</code> representing the <code>float</code>
+   */
+  static String toString(float f)
+  {
+    return VMDouble.toString(f, true);
+  }
+
+  /**
+   * @param str the <code>String</code> to convert
+   * @return the <code>float</code> value of <code>s</code>
+   * @throws NumberFormatException if <code>str</code> cannot be parsed as a
+   *         <code>float</code>
+   * @throws NullPointerException if <code>str</code> is null
+   */
+  static float parseFloat(String str)
+  {
+    // XXX Rounding parseDouble() causes some errors greater than 1 ulp from
+    // the infinitely precise decimal.
+    return (float) Double.parseDouble(str);
+  }
 } // class VMFloat
diff --git a/libjava/java/lang/reflect/natMethod.cc b/libjava/java/lang/reflect/natMethod.cc
index 4593da7f49e..d95c92f8468 100644
--- a/libjava/java/lang/reflect/natMethod.cc
+++ b/libjava/java/lang/reflect/natMethod.cc
@@ -359,7 +359,7 @@ _Jv_CallAnyMethodA (jobject obj,
 		    jboolean is_constructor,
 		    jboolean is_virtual_call,
 		    JArray<jclass> *parameter_types,
-		    jvalue *args,
+		    const jvalue *args,
 		    jvalue *result,
 		    jboolean is_jni_call,
 		    jclass iface)
diff --git a/libjava/java/nio/CharSequenceBuffer.h b/libjava/java/nio/CharSequenceBuffer.h
new file mode 100644
index 00000000000..b46b2b60d65
--- /dev/null
+++ b/libjava/java/nio/CharSequenceBuffer.h
@@ -0,0 +1,48 @@
+
+// DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*-
+
+#ifndef __java_nio_CharSequenceBuffer__
+#define __java_nio_CharSequenceBuffer__
+
+#pragma interface
+
+#include <java/nio/CharBuffer.h>
+extern "Java"
+{
+  namespace java
+  {
+    namespace nio
+    {
+        class ByteOrder;
+        class CharBuffer;
+        class CharSequenceBuffer;
+    }
+  }
+}
+
+class java::nio::CharSequenceBuffer : public ::java::nio::CharBuffer
+{
+
+public: // actually package-private
+  CharSequenceBuffer(::java::lang::CharSequence *, jint, jint, jint, jint, jint);
+  CharSequenceBuffer(::java::lang::CharSequence *, jint, jint);
+public:
+  ::java::nio::CharBuffer * asReadOnlyBuffer();
+  ::java::nio::CharBuffer * compact();
+  ::java::nio::CharBuffer * duplicate();
+  jchar get();
+  jchar get(jint);
+  jboolean isDirect();
+  ::java::nio::ByteOrder * order();
+  ::java::nio::CharBuffer * put(jchar);
+  ::java::nio::CharBuffer * put(jint, jchar);
+  ::java::nio::CharBuffer * slice();
+  ::java::lang::CharSequence * subSequence(jint, jint);
+  jboolean isReadOnly();
+private:
+  ::java::lang::CharSequence * __attribute__((aligned(__alignof__( ::java::nio::CharBuffer)))) charSequence;
+public:
+  static ::java::lang::Class class$;
+};
+
+#endif // __java_nio_CharSequenceBuffer__