From f06a83c0b2f7761510836194a6c9a8a72000937c Mon Sep 17 00:00:00 2001 From: Matthias Klose Date: Sat, 4 Aug 2007 10:53:49 +0000 Subject: Import GNU Classpath (libgcj-import-20070727). libjava/ 2007-08-04 Matthias Klose 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 * java/util/EnumMap.java (clone): Add cast. From-SVN: r127204 --- libjava/gnu/awt/xlib/XCanvasPeer.h | 8 ++++++++ libjava/gnu/awt/xlib/XCanvasPeer.java | 9 +++++++++ libjava/gnu/awt/xlib/XFontPeer.h | 2 +- libjava/gnu/awt/xlib/XFontPeer.java | 2 +- libjava/gnu/awt/xlib/XFramePeer.h | 7 +++++++ libjava/gnu/awt/xlib/XFramePeer.java | 33 +++++++++++++++++++++++++++++++++ libjava/gnu/awt/xlib/XToolkit.h | 5 +++++ libjava/gnu/awt/xlib/XToolkit.java | 20 +++++++++++++++++++- 8 files changed, 83 insertions(+), 3 deletions(-) (limited to 'libjava/gnu/awt') diff --git a/libjava/gnu/awt/xlib/XCanvasPeer.h b/libjava/gnu/awt/xlib/XCanvasPeer.h index fb01c06..509b98e 100644 --- a/libjava/gnu/awt/xlib/XCanvasPeer.h +++ b/libjava/gnu/awt/xlib/XCanvasPeer.h @@ -65,6 +65,13 @@ extern "Java" } } } + namespace sun + { + namespace awt + { + class CausedFocusEvent$Cause; + } + } } class gnu::awt::xlib::XCanvasPeer : public ::java::lang::Object @@ -119,6 +126,7 @@ public: virtual void hide(); virtual jboolean isFocusable(); virtual jboolean requestFocus(::java::awt::Component *, jboolean, jboolean, jlong); + virtual jboolean requestFocus(::java::awt::Component *, jboolean, jboolean, jlong, ::sun::awt::CausedFocusEvent$Cause *); virtual jboolean isObscured(); virtual jboolean canDetermineObscurity(); virtual void coalescePaintEvent(::java::awt::event::PaintEvent *); diff --git a/libjava/gnu/awt/xlib/XCanvasPeer.java b/libjava/gnu/awt/xlib/XCanvasPeer.java index 097ad0e..6d1fb67 100644 --- a/libjava/gnu/awt/xlib/XCanvasPeer.java +++ b/libjava/gnu/awt/xlib/XCanvasPeer.java @@ -44,6 +44,8 @@ import gnu.gcj.xlib.XImage; import gnu.awt.j2d.*; +import sun.awt.CausedFocusEvent; + public class XCanvasPeer implements CanvasPeer { static final Dimension MIN_SIZE = new Dimension(1, 1); @@ -469,6 +471,13 @@ public class XCanvasPeer implements CanvasPeer return false; } + public boolean requestFocus (Component source, boolean b1, + boolean b2, long x, + CausedFocusEvent.Cause cause) + { + return false; + } + public boolean isObscured () { return false; diff --git a/libjava/gnu/awt/xlib/XFontPeer.h b/libjava/gnu/awt/xlib/XFontPeer.h index 7a7f6b7..b497d06 100644 --- a/libjava/gnu/awt/xlib/XFontPeer.h +++ b/libjava/gnu/awt/xlib/XFontPeer.h @@ -51,7 +51,7 @@ class gnu::awt::xlib::XFontPeer : public ::gnu::java::awt::peer::ClasspathFontPe public: XFontPeer(::java::lang::String *, jint); XFontPeer(::java::lang::String *, jint, jfloat); - 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 > *); diff --git a/libjava/gnu/awt/xlib/XFontPeer.java b/libjava/gnu/awt/xlib/XFontPeer.java index 523cc22..cd05a11 100644 --- a/libjava/gnu/awt/xlib/XFontPeer.java +++ b/libjava/gnu/awt/xlib/XFontPeer.java @@ -38,7 +38,7 @@ public class XFontPeer extends ClasspathFontPeer * useful if you are sharing peers between Font objects. Otherwise it may * be ignored. */ - public boolean canDisplay (Font font, char c) + public boolean canDisplay (Font font, int c) { throw new UnsupportedOperationException (); } diff --git a/libjava/gnu/awt/xlib/XFramePeer.h b/libjava/gnu/awt/xlib/XFramePeer.h index 621d291..1ca28c6 100644 --- a/libjava/gnu/awt/xlib/XFramePeer.h +++ b/libjava/gnu/awt/xlib/XFramePeer.h @@ -31,6 +31,7 @@ extern "Java" { namespace awt { + class Dialog; class Frame; class Image; class Insets; @@ -69,8 +70,14 @@ public: virtual void endLayout(); virtual jboolean isPaintPending(); virtual void setBoundsPrivate(jint, jint, jint, jint); + virtual ::java::awt::Rectangle * getBoundsPrivate(); virtual void updateAlwaysOnTop(); virtual jboolean requestWindowFocus(); + virtual void setAlwaysOnTop(jboolean); + virtual void updateFocusableWindowState(); + virtual void setModalBlocked(::java::awt::Dialog *, jboolean); + virtual void updateMinimumSize(); + virtual void updateIconImages(); private: jboolean __attribute__((aligned(__alignof__( ::gnu::awt::xlib::XCanvasPeer)))) processingConfigureNotify; public: // actually package-private diff --git a/libjava/gnu/awt/xlib/XFramePeer.java b/libjava/gnu/awt/xlib/XFramePeer.java index e7fdc83..2f9b503 100644 --- a/libjava/gnu/awt/xlib/XFramePeer.java +++ b/libjava/gnu/awt/xlib/XFramePeer.java @@ -196,6 +196,14 @@ public class XFramePeer extends XCanvasPeer implements FramePeer */ public void setBoundsPrivate (int x, int y, int width, int height) { + // TODO: Implement this. + throw new UnsupportedOperationException("Not yet implemented."); + } + + public Rectangle getBoundsPrivate() + { + // TODO: Implement this. + throw new UnsupportedOperationException("Not yet implemented."); } /** @@ -212,4 +220,29 @@ public class XFramePeer extends XCanvasPeer implements FramePeer { return false; } + + public void setAlwaysOnTop(boolean alwaysOnTop) + { + throw new UnsupportedOperationException("not implemented yet"); + } + + public void updateFocusableWindowState() + { + throw new UnsupportedOperationException("not implemented yet"); + } + + public void setModalBlocked(Dialog blocker, boolean blocked) + { + throw new UnsupportedOperationException("not implemented yet"); + } + + public void updateMinimumSize() + { + throw new UnsupportedOperationException("not implemented yet"); + } + + public void updateIconImages() + { + throw new UnsupportedOperationException("not implemented yet"); + } } diff --git a/libjava/gnu/awt/xlib/XToolkit.h b/libjava/gnu/awt/xlib/XToolkit.h index 7bfc61e..e4e35db 100644 --- a/libjava/gnu/awt/xlib/XToolkit.h +++ b/libjava/gnu/awt/xlib/XToolkit.h @@ -53,6 +53,8 @@ extern "Java" class Choice; class Component; class Dialog; + class Dialog$ModalExclusionType; + class Dialog$ModalityType; class Dimension; class EventQueue; class FileDialog; @@ -196,6 +198,9 @@ public: virtual jboolean nativeQueueEmpty(); virtual void wakeNativeQueue(); virtual void iterateNativeQueue(::java::awt::EventQueue *, jboolean); + virtual void setAlwaysOnTop(jboolean); + virtual jboolean isModalExclusionTypeSupported(::java::awt::Dialog$ModalExclusionType *); + virtual jboolean isModalityTypeSupported(::java::awt::Dialog$ModalityType *); public: // actually package-private static ::gnu::awt::xlib::XToolkit * INSTANCE; ::gnu::gcj::xlib::Display * __attribute__((aligned(__alignof__( ::gnu::java::awt::ClasspathToolkit)))) display; diff --git a/libjava/gnu/awt/xlib/XToolkit.java b/libjava/gnu/awt/xlib/XToolkit.java index 98ef7c1..681aad6 100644 --- a/libjava/gnu/awt/xlib/XToolkit.java +++ b/libjava/gnu/awt/xlib/XToolkit.java @@ -480,5 +480,23 @@ public class XToolkit extends ClasspathToolkit // InterruptedException intentionally ignored } } - }; + } + + public void setAlwaysOnTop(boolean b) + { + // TODO: Implement properly. + } + + public boolean isModalExclusionTypeSupported + (Dialog.ModalExclusionType modalExclusionType) + { + // TODO: Implement properly. + return false; + } + + public boolean isModalityTypeSupported(Dialog.ModalityType modalityType) + { + // TODO: Implement properly. + return false; + } } -- cgit v1.1