From 2759b2605e4d287628bce47af67cb27fbcdf2e58 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Sat, 1 Mar 2003 22:14:21 +0000 Subject: [PATCH] XPanelPeer.java (beginLayout, [...]): New methods. * gnu/awt/xlib/XPanelPeer.java (beginLayout, endLayout, isPaintPending): New methods. * gnu/awt/xlib/XFramePeer.java (getState, setState, setMaximizedBounds): New methods. (beginLayout, endLayout, isPaintPending): Likewise. * gnu/awt/xlib/XCanvasPeer.java (isFocusable): New method. (requestFocus): Likewise. (isObscured): Likewise. (canDetermineObscurity): Likewise. (coalescePaintEvent): Likewise. (updateCursorImmediately): Likewise. (createVolatileImage): Likewise. (handlesWheelScrolling): Likewise. (createBuffers): Likewise. (getBackBuffer): Likewise. (flip): Likewise. (destroyBuffers): Likewise. * Makefile.in: Rebuilt. * Makefile.am (awt_java_source_files): Added DropTargetPeer.java, RobotPeer.java. * gnu/java/awt/GLightweightPeer.java, gnu/java/awt/peer/gtk/GtkChoicePeer.java, gnu/java/awt/peer/gtk/GtkComponentPeer.java, gnu/java/awt/peer/gtk/GtkContainerPeer.java, gnu/java/awt/peer/gtk/GtkFramePeer.java, gnu/java/awt/peer/gtk/GtkPopupMenuPeer.java, gnu/java/awt/peer/gtk/GtkTextComponentPeer.java, java/awt/dnd/peer/DragSourceContextPeer.java, java/awt/dnd/peer/DropTargetContextPeer.java, java/awt/peer/ButtonPeer.java, java/awt/peer/CheckboxMenuItemPeer.java, java/awt/peer/CheckboxPeer.java, java/awt/peer/ChoicePeer.java, java/awt/peer/ComponentPeer.java, java/awt/peer/ContainerPeer.java, java/awt/peer/DialogPeer.java, java/awt/peer/FileDialogPeer.java, java/awt/peer/FramePeer.java, java/awt/peer/LabelPeer.java, java/awt/peer/ListPeer.java, java/awt/peer/MenuBarPeer.java, java/awt/peer/MenuComponentPeer.java, java/awt/peer/MenuItemPeer.java, java/awt/peer/MenuPeer.java, java/awt/peer/PopupMenuPeer.java, java/awt/peer/ScrollPanePeer.java, java/awt/peer/ScrollbarPeer.java, java/awt/peer/TextAreaPeer.java, java/awt/peer/TextComponentPeer.java, java/awt/peer/TextFieldPeer.java, java/awt/peer/WindowPeer.java: New versions from Classpath. * java/awt/dnd/peer/DropTargetPeer.java: New file from Classpath. * java/awt/peer/RobotPeer.java: Likewise. From-SVN: r63627 --- libjava/ChangeLog | 51 +++++++++++++++ libjava/Makefile.am | 2 + libjava/Makefile.in | 4 +- libjava/gnu/awt/xlib/XCanvasPeer.java | 61 +++++++++++++++++- libjava/gnu/awt/xlib/XFramePeer.java | 19 +++++- libjava/gnu/awt/xlib/XPanelPeer.java | 6 +- libjava/gnu/java/awt/GLightweightPeer.java | 32 ++++++++++ .../gnu/java/awt/peer/gtk/GtkChoicePeer.java | 2 + .../java/awt/peer/gtk/GtkComponentPeer.java | 63 +++++++++++++++++++ .../java/awt/peer/gtk/GtkContainerPeer.java | 4 ++ .../gnu/java/awt/peer/gtk/GtkFramePeer.java | 15 +++++ .../java/awt/peer/gtk/GtkPopupMenuPeer.java | 5 ++ .../awt/peer/gtk/GtkTextComponentPeer.java | 15 +++++ .../awt/dnd/peer/DragSourceContextPeer.java | 10 +-- .../awt/dnd/peer/DropTargetContextPeer.java | 24 ++++++- libjava/java/awt/dnd/peer/DropTargetPeer.java | 48 ++++++++++++++ libjava/java/awt/peer/ButtonPeer.java | 4 +- .../java/awt/peer/CheckboxMenuItemPeer.java | 4 +- libjava/java/awt/peer/CheckboxPeer.java | 8 +-- libjava/java/awt/peer/ChoicePeer.java | 11 ++-- libjava/java/awt/peer/ComponentPeer.java | 40 ++++++++++-- libjava/java/awt/peer/ContainerPeer.java | 11 ++-- libjava/java/awt/peer/DialogPeer.java | 6 +- libjava/java/awt/peer/FileDialogPeer.java | 8 +-- libjava/java/awt/peer/FramePeer.java | 14 +++-- libjava/java/awt/peer/LabelPeer.java | 6 +- libjava/java/awt/peer/ListPeer.java | 31 ++++----- libjava/java/awt/peer/MenuBarPeer.java | 8 +-- libjava/java/awt/peer/MenuComponentPeer.java | 4 +- libjava/java/awt/peer/MenuItemPeer.java | 10 ++- libjava/java/awt/peer/MenuPeer.java | 6 +- libjava/java/awt/peer/PopupMenuPeer.java | 11 +++- libjava/java/awt/peer/RobotPeer.java | 54 ++++++++++++++++ libjava/java/awt/peer/ScrollPanePeer.java | 14 ++--- libjava/java/awt/peer/ScrollbarPeer.java | 8 +-- libjava/java/awt/peer/TextAreaPeer.java | 18 +++--- libjava/java/awt/peer/TextComponentPeer.java | 23 ++++--- libjava/java/awt/peer/TextFieldPeer.java | 14 ++--- libjava/java/awt/peer/WindowPeer.java | 6 +- 39 files changed, 547 insertions(+), 133 deletions(-) create mode 100644 libjava/java/awt/dnd/peer/DropTargetPeer.java create mode 100644 libjava/java/awt/peer/RobotPeer.java diff --git a/libjava/ChangeLog b/libjava/ChangeLog index aa79a0692dd..f02656db2e2 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,54 @@ +2003-03-01 Tom Tromey + + * gnu/awt/xlib/XPanelPeer.java (beginLayout, endLayout, + isPaintPending): New methods. + * gnu/awt/xlib/XFramePeer.java (getState, setState, + setMaximizedBounds): New methods. + (beginLayout, endLayout, isPaintPending): Likewise. + * gnu/awt/xlib/XCanvasPeer.java (isFocusable): New method. + (requestFocus): Likewise. + (isObscured): Likewise. + (canDetermineObscurity): Likewise. + (coalescePaintEvent): Likewise. + (updateCursorImmediately): Likewise. + (createVolatileImage): Likewise. + (handlesWheelScrolling): Likewise. + (createBuffers): Likewise. + (getBackBuffer): Likewise. + (flip): Likewise. + (destroyBuffers): Likewise. + + * Makefile.in: Rebuilt. + * Makefile.am (awt_java_source_files): Added DropTargetPeer.java, + RobotPeer.java. + * gnu/java/awt/GLightweightPeer.java, + gnu/java/awt/peer/gtk/GtkChoicePeer.java, + gnu/java/awt/peer/gtk/GtkComponentPeer.java, + gnu/java/awt/peer/gtk/GtkContainerPeer.java, + gnu/java/awt/peer/gtk/GtkFramePeer.java, + gnu/java/awt/peer/gtk/GtkPopupMenuPeer.java, + gnu/java/awt/peer/gtk/GtkTextComponentPeer.java, + java/awt/dnd/peer/DragSourceContextPeer.java, + java/awt/dnd/peer/DropTargetContextPeer.java, + java/awt/peer/ButtonPeer.java, + java/awt/peer/CheckboxMenuItemPeer.java, + java/awt/peer/CheckboxPeer.java, java/awt/peer/ChoicePeer.java, + java/awt/peer/ComponentPeer.java, + java/awt/peer/ContainerPeer.java, java/awt/peer/DialogPeer.java, + java/awt/peer/FileDialogPeer.java, java/awt/peer/FramePeer.java, + java/awt/peer/LabelPeer.java, java/awt/peer/ListPeer.java, + java/awt/peer/MenuBarPeer.java, + java/awt/peer/MenuComponentPeer.java, + java/awt/peer/MenuItemPeer.java, java/awt/peer/MenuPeer.java, + java/awt/peer/PopupMenuPeer.java, + java/awt/peer/ScrollPanePeer.java, + java/awt/peer/ScrollbarPeer.java, java/awt/peer/TextAreaPeer.java, + java/awt/peer/TextComponentPeer.java, + java/awt/peer/TextFieldPeer.java, java/awt/peer/WindowPeer.java: + New versions from Classpath. + * java/awt/dnd/peer/DropTargetPeer.java: New file from Classpath. + * java/awt/peer/RobotPeer.java: Likewise. + 2003-03-01 Mark Wielaard * java/io/ObjectInputStream.java: Reindent. diff --git a/libjava/Makefile.am b/libjava/Makefile.am index 297bc4acff8..d6054ccbb0b 100644 --- a/libjava/Makefile.am +++ b/libjava/Makefile.am @@ -992,6 +992,7 @@ java/awt/peer/MenuItemPeer.java \ java/awt/peer/MenuPeer.java \ java/awt/peer/PanelPeer.java \ java/awt/peer/PopupMenuPeer.java \ +java/awt/peer/RobotPeer.java \ java/awt/peer/ScrollPanePeer.java \ java/awt/peer/ScrollbarPeer.java \ java/awt/peer/TextAreaPeer.java \ @@ -1034,6 +1035,7 @@ java/awt/Stroke.java \ java/awt/TexturePaint.java \ java/awt/dnd/peer/DragSourceContextPeer.java \ java/awt/dnd/peer/DropTargetContextPeer.java \ +java/awt/dnd/peer/DropTargetPeer.java \ java/awt/dnd/DnDConstants.java \ java/awt/dnd/DragGestureEvent.java \ java/awt/dnd/DragGestureListener.java \ diff --git a/libjava/Makefile.in b/libjava/Makefile.in index 333e0a36592..d07f68d31af 100644 --- a/libjava/Makefile.in +++ b/libjava/Makefile.in @@ -803,6 +803,7 @@ java/awt/Stroke.java \ java/awt/TexturePaint.java \ java/awt/dnd/peer/DragSourceContextPeer.java \ java/awt/dnd/peer/DropTargetContextPeer.java \ +java/awt/dnd/peer/DropTargetPeer.java \ java/awt/dnd/DnDConstants.java \ java/awt/dnd/DragGestureEvent.java \ java/awt/dnd/DragGestureListener.java \ @@ -2598,7 +2599,7 @@ libgcj-test.spec.in libgcj.spec.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) -TAR = tar +TAR = gtar GZIP_ENV = --best DIST_SUBDIRS = @DIRLTDL@ testsuite gcj include @DIRLTDL@ gcj include DEP_FILES = .deps/$(srcdir)/$(CONVERT_DIR)/gen-from-JIS.P \ @@ -3061,6 +3062,7 @@ DEP_FILES = .deps/$(srcdir)/$(CONVERT_DIR)/gen-from-JIS.P \ .deps/java/awt/dnd/MouseDragGestureRecognizer.P \ .deps/java/awt/dnd/peer/DragSourceContextPeer.P \ .deps/java/awt/dnd/peer/DropTargetContextPeer.P \ +.deps/java/awt/dnd/peer/DropTargetPeer.P \ .deps/java/awt/event/AWTEventListener.P \ .deps/java/awt/event/AWTEventListenerProxy.P \ .deps/java/awt/event/ActionEvent.P \ diff --git a/libjava/gnu/awt/xlib/XCanvasPeer.java b/libjava/gnu/awt/xlib/XCanvasPeer.java index a208be5c103..4c141a4c0d8 100644 --- a/libjava/gnu/awt/xlib/XCanvasPeer.java +++ b/libjava/gnu/awt/xlib/XCanvasPeer.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2000, 2002 Free Software Foundation +/* Copyright (C) 2000, 2002, 2003 Free Software Foundation This file is part of libgcj. @@ -9,6 +9,7 @@ details. */ package gnu.awt.xlib; import java.awt.Dimension; +import java.awt.BufferCapabilities; import java.awt.Component; import java.awt.EventQueue; import java.awt.Rectangle; @@ -411,6 +412,64 @@ public class XCanvasPeer implements CanvasPeer setVisible (false); } + public boolean isFocusable () + { + return false; + } + + public boolean requestFocus (Component source, boolean b1, + boolean b2, long x) + { + return false; + } + + public boolean isObscured () + { + return false; + } + + public boolean canDetermineObscurity () + { + return false; + } + + public void coalescePaintEvent (PaintEvent e) + { + } + + public void updateCursorImmediately () + { + } + + public VolatileImage createVolatileImage (int width, int height) + { + return null; + } + + public boolean handlesWheelScrolling () + { + return false; + } + + public void createBuffers (int x, BufferCapabilities capabilities) + throws java.awt.AWTException + + { + } + + public Image getBackBuffer () + { + return null; + } + + public void flip (BufferCapabilities.FlipContents contents) + { + } + + public void destroyBuffers () + { + } + static class DoMap implements Runnable { Window window; diff --git a/libjava/gnu/awt/xlib/XFramePeer.java b/libjava/gnu/awt/xlib/XFramePeer.java index 80a972425e5..ec159078aba 100644 --- a/libjava/gnu/awt/xlib/XFramePeer.java +++ b/libjava/gnu/awt/xlib/XFramePeer.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2000, 2002 Free Software Foundation +/* Copyright (C) 2000, 2002, 2003 Free Software Foundation This file is part of libgcj. @@ -176,4 +176,21 @@ public class XFramePeer extends XCanvasPeer implements FramePeer } sizeHints.applyNormalHints(window); } + + public int getState () + { + return 0; + } + + public void setState (int state) + { + } + + public void setMaximizedBounds (Rectangle r) + { + } + + public void beginLayout () { } + public void endLayout () { } + public boolean isPaintPending () { return false; } } diff --git a/libjava/gnu/awt/xlib/XPanelPeer.java b/libjava/gnu/awt/xlib/XPanelPeer.java index f4d3b4bffb1..0b775f87264 100644 --- a/libjava/gnu/awt/xlib/XPanelPeer.java +++ b/libjava/gnu/awt/xlib/XPanelPeer.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2000, 2002 Free Software Foundation +/* Copyright (C) 2000, 2002, 2003 Free Software Foundation This file is part of libgcj. @@ -54,4 +54,8 @@ public class XPanelPeer extends XCanvasPeer implements PanelPeer { // NOP } + + public void beginLayout () { } + public void endLayout () { } + public boolean isPaintPending () { return false; } } diff --git a/libjava/gnu/java/awt/GLightweightPeer.java b/libjava/gnu/java/awt/GLightweightPeer.java index 45c051714db..cb1aac544f3 100644 --- a/libjava/gnu/java/awt/GLightweightPeer.java +++ b/libjava/gnu/java/awt/GLightweightPeer.java @@ -37,6 +37,7 @@ exception statement from your version. */ package gnu.java.awt; import java.awt.*; +import java.awt.event.PaintEvent; import java.awt.peer.*; import java.awt.image.*; @@ -111,6 +112,11 @@ public class GLightweightPeer implements LightweightPeer public void hide() {} + public boolean isFocusable() + { + return false; + } + public boolean isFocusTraversable() { return false; @@ -140,6 +146,8 @@ public class GLightweightPeer implements LightweightPeer public void requestFocus() {} + public boolean requestFocus(java.awt.Component source, boolean bool1, boolean bool2, long x) { return false; } + public void reshape(int x, int y, int width, int height) {} public void setBackground(Color color) {} @@ -164,4 +172,28 @@ public class GLightweightPeer implements LightweightPeer { return null; } + + public boolean isObscured() { return false; } + + public boolean canDetermineObscurity() { return false; } + + public void coalescePaintEvent(PaintEvent e) { } + + public void updateCursorImmediately() { } + + public VolatileImage createVolatileImage(int width, int height) + { + return null; + } + + public boolean handlesWheelScrolling() { return false; } + + public void createBuffers(int x, java.awt.BufferCapabilities capabilities) + throws java.awt.AWTException { } + + public java.awt.Image getBackBuffer() { return null; } + + public void flip(java.awt.BufferCapabilities.FlipContents contents) { } + + public void destroyBuffers() { } } diff --git a/libjava/gnu/java/awt/peer/gtk/GtkChoicePeer.java b/libjava/gnu/java/awt/peer/gtk/GtkChoicePeer.java index 19e1a56d2e1..afa90a56c3f 100644 --- a/libjava/gnu/java/awt/peer/gtk/GtkChoicePeer.java +++ b/libjava/gnu/java/awt/peer/gtk/GtkChoicePeer.java @@ -66,6 +66,8 @@ public class GtkChoicePeer extends GtkComponentPeer native public void add (String item, int index); native public void remove (int index); native public void select (int position); + + public void removeAll () { } public void addItem (String item, int position) { diff --git a/libjava/gnu/java/awt/peer/gtk/GtkComponentPeer.java b/libjava/gnu/java/awt/peer/gtk/GtkComponentPeer.java index b3a4525314e..779bc8b5d96 100644 --- a/libjava/gnu/java/awt/peer/gtk/GtkComponentPeer.java +++ b/libjava/gnu/java/awt/peer/gtk/GtkComponentPeer.java @@ -394,4 +394,67 @@ public class GtkComponentPeer extends GtkGenericPeer { // FIXME: just a stub for now. } + + public boolean isFocusable () + { + return false; + } + + public boolean requestFocus (Component source, boolean b1, + boolean b2, long x) + { + return false; + } + + public boolean isObscured () + { + return false; + } + + public boolean canDetermineObscurity () + { + return false; + } + + public void coalescePaintEvent (PaintEvent e) + { + + } + + public void updateCursorImmediately () + { + + } + + public VolatileImage createVolatileImage (int width, int height) + { + return null; + } + + public boolean handlesWheelScrolling () + { + return false; + } + + public void createBuffers (int x, BufferCapabilities capabilities) + throws java.awt.AWTException + + { + + } + + public Image getBackBuffer () + { + return null; + } + + public void flip (BufferCapabilities.FlipContents contents) + { + + } + + public void destroyBuffers () + { + + } } diff --git a/libjava/gnu/java/awt/peer/gtk/GtkContainerPeer.java b/libjava/gnu/java/awt/peer/gtk/GtkContainerPeer.java index fef88cd6a39..caf5dc37943 100644 --- a/libjava/gnu/java/awt/peer/gtk/GtkContainerPeer.java +++ b/libjava/gnu/java/awt/peer/gtk/GtkContainerPeer.java @@ -122,4 +122,8 @@ public class GtkContainerPeer extends GtkComponentPeer break; } } + + public void beginLayout () { } + public void endLayout () { } + public boolean isPaintPending () { return false; } } diff --git a/libjava/gnu/java/awt/peer/gtk/GtkFramePeer.java b/libjava/gnu/java/awt/peer/gtk/GtkFramePeer.java index e16a570938e..6c6802d20ee 100644 --- a/libjava/gnu/java/awt/peer/gtk/GtkFramePeer.java +++ b/libjava/gnu/java/awt/peer/gtk/GtkFramePeer.java @@ -127,6 +127,21 @@ public class GtkFramePeer extends GtkWindowPeer y + insets.top, width, height))); } + + public int getState () + { + return 0; + } + + public void setState (int state) + { + + } + + public void setMaximizedBounds (Rectangle r) + { + + } } diff --git a/libjava/gnu/java/awt/peer/gtk/GtkPopupMenuPeer.java b/libjava/gnu/java/awt/peer/gtk/GtkPopupMenuPeer.java index c7a645a7cf4..e29d749c791 100644 --- a/libjava/gnu/java/awt/peer/gtk/GtkPopupMenuPeer.java +++ b/libjava/gnu/java/awt/peer/gtk/GtkPopupMenuPeer.java @@ -62,4 +62,9 @@ public class GtkPopupMenuPeer extends GtkMenuPeer Point abs = origin.getLocationOnScreen (); show (abs.x + x, abs.y + y, 0); } + + public void show (Event e) + { + + } } diff --git a/libjava/gnu/java/awt/peer/gtk/GtkTextComponentPeer.java b/libjava/gnu/java/awt/peer/gtk/GtkTextComponentPeer.java index b9205cc46ca..d9ebd40aa72 100644 --- a/libjava/gnu/java/awt/peer/gtk/GtkTextComponentPeer.java +++ b/libjava/gnu/java/awt/peer/gtk/GtkTextComponentPeer.java @@ -76,4 +76,19 @@ public class GtkTextComponentPeer extends GtkComponentPeer args.add ("text_position", tc.getCaretPosition ()); args.add ("editable", tc.isEditable ()); } + + public int getIndexAtPoint(int x, int y) + { + return 0; // FIXME + } + + public Rectangle getCharacterBounds (int pos) + { + return null; + } + + public long filterEvents (long filter) + { + return filter; // FIXME + } } diff --git a/libjava/java/awt/dnd/peer/DragSourceContextPeer.java b/libjava/java/awt/dnd/peer/DragSourceContextPeer.java index da9e09833fd..971882d7b5a 100644 --- a/libjava/java/awt/dnd/peer/DragSourceContextPeer.java +++ b/libjava/java/awt/dnd/peer/DragSourceContextPeer.java @@ -42,14 +42,16 @@ import java.awt.Cursor; import java.awt.Image; import java.awt.Point; import java.awt.dnd.DragSourceContext; +import java.awt.dnd.InvalidDnDOperationException; /** * STUBBED */ public interface DragSourceContextPeer { - void startDrag(DragSourceContext context, Cursor c, Image i, Point p); - Cursor getCursor(); - void setCursor(Cursor c); - void transferablesFlavorsChanged(); + public void startDrag(DragSourceContext context, Cursor c, Image i, Point p) + throws InvalidDnDOperationException; + public Cursor getCursor(); + public void setCursor(Cursor c) throws InvalidDnDOperationException; + public void transferablesFlavorsChanged(); } // interface DragSourceContextPeer diff --git a/libjava/java/awt/dnd/peer/DropTargetContextPeer.java b/libjava/java/awt/dnd/peer/DropTargetContextPeer.java index ad166d98002..36b303f25de 100644 --- a/libjava/java/awt/dnd/peer/DropTargetContextPeer.java +++ b/libjava/java/awt/dnd/peer/DropTargetContextPeer.java @@ -37,9 +37,31 @@ exception statement from your version. */ package java.awt.dnd.peer; +import java.awt.dnd.DropTarget; +import java.awt.datatransfer.DataFlavor; +import java.awt.datatransfer.Transferable; +import java.awt.dnd.InvalidDnDOperationException; + + /** + * Used to control state of recipient protocol from the + * DropTargetListener. Occurs when a Component + * with an associated DropTarget and visible geometry is first + * intersected by a logical cursor. + * * @author Michael Koch */ public interface DropTargetContextPeer { -} // interface DropTargetContextPeer + public void setTargetActions(int actions); + public int getTargetActions(); + public DropTarget getDropTarget(); + public DataFlavor[] getTransferDataFlavors(); + public Transferable getTransferable() throws InvalidDnDOperationException; + public boolean isTransferableJVMLocal(); + public void acceptDrag(int dragAction); + public void rejectDrag(); + public void acceptDrop(int dropAction); + public void rejectDrop(); + public void dropComplete(boolean success); +} diff --git a/libjava/java/awt/dnd/peer/DropTargetPeer.java b/libjava/java/awt/dnd/peer/DropTargetPeer.java new file mode 100644 index 00000000000..5666bdc4b09 --- /dev/null +++ b/libjava/java/awt/dnd/peer/DropTargetPeer.java @@ -0,0 +1,48 @@ +/* DropTargetPeer.java -- interface for drag-and-drop peers + Copyright (C) 2002 Free Software Foundation, Inc. + +This file is part of GNU Classpath. + +GNU Classpath is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2, or (at your option) +any later version. + +GNU Classpath is distributed in the hope that it will be useful, but +WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +General Public License for more details. + +You should have received a copy of the GNU General Public License +along with GNU Classpath; see the file COPYING. If not, write to the +Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA +02111-1307 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ + +package java.awt.dnd.peer; + +import java.awt.dnd.DropTarget; + +/** + */ +public interface DropTargetPeer +{ + public void addDropTarget (DropTarget target); + public void removeDropTarget (DropTarget target); +} // interface DropTargetContextPeer diff --git a/libjava/java/awt/peer/ButtonPeer.java b/libjava/java/awt/peer/ButtonPeer.java index e7479ef1902..2824839bb74 100644 --- a/libjava/java/awt/peer/ButtonPeer.java +++ b/libjava/java/awt/peer/ButtonPeer.java @@ -40,8 +40,6 @@ package java.awt.peer; public interface ButtonPeer extends ComponentPeer { - -public abstract void setLabel(String label); - + public void setLabel(String label); } // interface ButtonPeer diff --git a/libjava/java/awt/peer/CheckboxMenuItemPeer.java b/libjava/java/awt/peer/CheckboxMenuItemPeer.java index 4cd833e9bfa..b150a8bf7b6 100644 --- a/libjava/java/awt/peer/CheckboxMenuItemPeer.java +++ b/libjava/java/awt/peer/CheckboxMenuItemPeer.java @@ -40,8 +40,6 @@ package java.awt.peer; public interface CheckboxMenuItemPeer extends MenuItemPeer { - -public abstract void setState(boolean state); - + public void setState(boolean state); } // interface CheckboxMenuItemPeer diff --git a/libjava/java/awt/peer/CheckboxPeer.java b/libjava/java/awt/peer/CheckboxPeer.java index 7f1e2875420..4ffd79cfefc 100644 --- a/libjava/java/awt/peer/CheckboxPeer.java +++ b/libjava/java/awt/peer/CheckboxPeer.java @@ -40,10 +40,8 @@ package java.awt.peer; public interface CheckboxPeer extends ComponentPeer { - -public abstract void setCheckboxGroup(java.awt.CheckboxGroup group); -public abstract void setLabel(String label); -public abstract void setState(boolean state); - + public void setCheckboxGroup(java.awt.CheckboxGroup group); + public void setLabel(String label); + public void setState(boolean state); } // interface CheckboxPeer diff --git a/libjava/java/awt/peer/ChoicePeer.java b/libjava/java/awt/peer/ChoicePeer.java index 7b8c949420c..228311cc551 100644 --- a/libjava/java/awt/peer/ChoicePeer.java +++ b/libjava/java/awt/peer/ChoicePeer.java @@ -40,11 +40,10 @@ package java.awt.peer; public interface ChoicePeer extends ComponentPeer { - -public abstract void add(String item, int index); -public abstract void addItem(String item, int index); -public abstract void remove(int index); -public abstract void select(int index); - + public void add(String item, int index); + public void addItem(String item, int index); + public void remove(int index); + public void removeAll(); + public void select(int index); } // interface ChoicePeer diff --git a/libjava/java/awt/peer/ComponentPeer.java b/libjava/java/awt/peer/ComponentPeer.java index 257d608060d..e6f79d1d116 100644 --- a/libjava/java/awt/peer/ComponentPeer.java +++ b/libjava/java/awt/peer/ComponentPeer.java @@ -39,6 +39,7 @@ exception statement from your version. */ package java.awt.peer; import java.awt.*; +import java.awt.event.PaintEvent; import java.awt.image.*; public interface ComponentPeer @@ -57,23 +58,38 @@ public interface ComponentPeer public Dimension getMinimumSize(); public Dimension getPreferredSize(); public Toolkit getToolkit(); - // The JCL says that handleEvent returns boolean. However, we've - // experimentally determined that it in fact actually returns void. public void handleEvent(AWTEvent e); public void hide(); + + /** + * Part of the earlier 1.1 API, replaced by isFocusable(). + */ public boolean isFocusTraversable(); + public boolean isFocusable(); public Dimension minimumSize(); public Dimension preferredSize(); public void paint(Graphics graphics); public boolean prepareImage(Image img, int width, int height, - ImageObserver ob); + ImageObserver ob); public void print(Graphics graphics); public void repaint(long tm, int x, int y, int width, int height); + + /** + * Part of the earlier 1.1 API, apparently replaced by argument + * form of the same method. + */ public void requestFocus(); + public boolean requestFocus(java.awt.Component source, boolean bool1, boolean bool2, long x); + public void reshape(int x, int y, int width, int height); public void setBackground(Color color); public void setBounds(int x, int y, int width, int height); + + /** + * Part of the earlier 1.1 API, apparently no longer needed. + */ public void setCursor(Cursor cursor); + public void setEnabled(boolean enabled); public void setFont(Font font); public void setForeground(Color color); @@ -84,7 +100,23 @@ public interface ComponentPeer * Get the graphics configuration of the component. The color model * of the component can be derived from the configuration. */ - GraphicsConfiguration getGraphicsConfiguration(); + public GraphicsConfiguration getGraphicsConfiguration(); + /** + * Part of an older API, no longer needed. + */ public void setEventMask (long mask); + + // Methods below are introduced since 1.1 + public boolean isObscured(); + public boolean canDetermineObscurity(); + public void coalescePaintEvent(PaintEvent e); + public void updateCursorImmediately(); + public VolatileImage createVolatileImage(int width, int height); + public boolean handlesWheelScrolling(); + public void createBuffers(int x, java.awt.BufferCapabilities capabilities) throws java.awt.AWTException; + public java.awt.Image getBackBuffer(); + public void flip(java.awt.BufferCapabilities.FlipContents contents); + public void destroyBuffers(); + } diff --git a/libjava/java/awt/peer/ContainerPeer.java b/libjava/java/awt/peer/ContainerPeer.java index 23a8746a7b1..b691b897158 100644 --- a/libjava/java/awt/peer/ContainerPeer.java +++ b/libjava/java/awt/peer/ContainerPeer.java @@ -41,9 +41,12 @@ import java.awt.Insets; public interface ContainerPeer extends ComponentPeer { - public abstract Insets insets(); - public abstract Insets getInsets(); - public abstract void beginValidate(); - public abstract void endValidate(); + public Insets insets(); + public Insets getInsets(); + public void beginValidate(); + public void endValidate(); + public void beginLayout(); + public void endLayout(); + public boolean isPaintPending(); } // interface ContainerPeer diff --git a/libjava/java/awt/peer/DialogPeer.java b/libjava/java/awt/peer/DialogPeer.java index 8b3a07b1a10..b97798ea1ac 100644 --- a/libjava/java/awt/peer/DialogPeer.java +++ b/libjava/java/awt/peer/DialogPeer.java @@ -40,9 +40,7 @@ package java.awt.peer; public interface DialogPeer extends WindowPeer { - -public abstract void setResizable(boolean resizeable); -public abstract void setTitle(String title); - + public void setResizable(boolean resizeable); + public void setTitle(String title); } // interface DialogPeer diff --git a/libjava/java/awt/peer/FileDialogPeer.java b/libjava/java/awt/peer/FileDialogPeer.java index e99d44ba80c..49fa01f266a 100644 --- a/libjava/java/awt/peer/FileDialogPeer.java +++ b/libjava/java/awt/peer/FileDialogPeer.java @@ -42,10 +42,8 @@ import java.io.FilenameFilter; public interface FileDialogPeer extends DialogPeer { - -public abstract void setFile(String file); -public abstract void setDirectory(String dir); -public abstract void setFilenameFilter(FilenameFilter ff); - + public void setFile(String file); + public void setDirectory(String dir); + public void setFilenameFilter(FilenameFilter ff); } // interface FileDialogPeer diff --git a/libjava/java/awt/peer/FramePeer.java b/libjava/java/awt/peer/FramePeer.java index 4bb72f7e72b..c354275a7eb 100644 --- a/libjava/java/awt/peer/FramePeer.java +++ b/libjava/java/awt/peer/FramePeer.java @@ -40,14 +40,16 @@ package java.awt.peer; import java.awt.Image; import java.awt.MenuBar; +import java.awt.Rectangle; public interface FramePeer extends WindowPeer { - -public abstract void setIconImage(Image image); -public abstract void setMenuBar(MenuBar mb); -public abstract void setResizable(boolean resizable); -public abstract void setTitle(String title); - + public void setIconImage(Image image); + public void setMenuBar(MenuBar mb); + public void setResizable(boolean resizable); + public void setTitle(String title); + public int getState(); + public void setState(int state); + public void setMaximizedBounds(Rectangle r); } // interface FramePeer diff --git a/libjava/java/awt/peer/LabelPeer.java b/libjava/java/awt/peer/LabelPeer.java index 2d12c78d6d5..5eefcd02d3b 100644 --- a/libjava/java/awt/peer/LabelPeer.java +++ b/libjava/java/awt/peer/LabelPeer.java @@ -40,9 +40,7 @@ package java.awt.peer; public interface LabelPeer extends ComponentPeer { - -public abstract void setAlignment(int alignment); -public abstract void setText(String text); - + public void setAlignment(int alignment); + public void setText(String text); } // interface LabelPeer diff --git a/libjava/java/awt/peer/ListPeer.java b/libjava/java/awt/peer/ListPeer.java index 6c0217f9aa7..1ba86ae6ee3 100644 --- a/libjava/java/awt/peer/ListPeer.java +++ b/libjava/java/awt/peer/ListPeer.java @@ -42,20 +42,21 @@ import java.awt.Dimension; public interface ListPeer extends ComponentPeer { - -public abstract void add(String item, int index); -public abstract void addItem(String item, int index); -public abstract void clear(); -public abstract void delItems(int start_index, int end_index); -public abstract void deselect(int index); -public abstract int[] getSelectedIndexes(); -public abstract void makeVisible(int index); -public abstract Dimension minimumSize(int s); -public abstract Dimension preferredSize(int s); -public abstract void removeAll(); -public abstract void select(int index); -public abstract void setMultipleMode(boolean multi); -public abstract void setMultipleSelections(boolean multi); - + + public void add(String item, int index); + public void addItem(String item, int index); + public void clear(); + public void delItems(int start_index, int end_index); + public void deselect(int index); + public int[] getSelectedIndexes(); + public void makeVisible(int index); + public Dimension minimumSize(int s); + public Dimension preferredSize(int s); + public void removeAll(); + public void select(int index); + public void setMultipleMode(boolean multi); + public void setMultipleSelections(boolean multi); + public Dimension getPreferredSize(int s); + public Dimension getMinimumSize(int s); } // interface ListPeer diff --git a/libjava/java/awt/peer/MenuBarPeer.java b/libjava/java/awt/peer/MenuBarPeer.java index 764e6fe9b5d..de6e5bc4418 100644 --- a/libjava/java/awt/peer/MenuBarPeer.java +++ b/libjava/java/awt/peer/MenuBarPeer.java @@ -42,10 +42,8 @@ import java.awt.Menu; public interface MenuBarPeer extends MenuComponentPeer { - -public abstract void addHelpMenu(Menu menu); -public abstract void addMenu(Menu menu); -public abstract void delMenu(int index); - + public void addHelpMenu(Menu menu); + public void addMenu(Menu menu); + public void delMenu(int index); } // interface MenuBarPeer diff --git a/libjava/java/awt/peer/MenuComponentPeer.java b/libjava/java/awt/peer/MenuComponentPeer.java index 4ac4fd870af..5db9e71f755 100644 --- a/libjava/java/awt/peer/MenuComponentPeer.java +++ b/libjava/java/awt/peer/MenuComponentPeer.java @@ -40,8 +40,6 @@ package java.awt.peer; public interface MenuComponentPeer { - -public abstract void dispose(); - + public void dispose(); } // interface MenuComponentPeer diff --git a/libjava/java/awt/peer/MenuItemPeer.java b/libjava/java/awt/peer/MenuItemPeer.java index 7dc2006220c..7038f93017e 100644 --- a/libjava/java/awt/peer/MenuItemPeer.java +++ b/libjava/java/awt/peer/MenuItemPeer.java @@ -40,11 +40,9 @@ package java.awt.peer; public interface MenuItemPeer extends MenuComponentPeer { - -public abstract void disable(); -public abstract void enable(); -public abstract void setEnabled(boolean enabled); -public abstract void setLabel(String text); - + public void disable(); + public void enable(); + public void setEnabled(boolean enabled); + public void setLabel(String text); } // interface MenuItemPeer diff --git a/libjava/java/awt/peer/MenuPeer.java b/libjava/java/awt/peer/MenuPeer.java index 532672ba52e..ee8a9005e31 100644 --- a/libjava/java/awt/peer/MenuPeer.java +++ b/libjava/java/awt/peer/MenuPeer.java @@ -42,8 +42,8 @@ import java.awt.MenuItem; public interface MenuPeer extends MenuItemPeer { - public abstract void addItem (MenuItem item); - public abstract void addSeparator (); - public abstract void delItem (int index); + public void addItem (MenuItem item); + public void addSeparator (); + public void delItem (int index); } diff --git a/libjava/java/awt/peer/PopupMenuPeer.java b/libjava/java/awt/peer/PopupMenuPeer.java index dec5d0e55e7..46278da2e91 100644 --- a/libjava/java/awt/peer/PopupMenuPeer.java +++ b/libjava/java/awt/peer/PopupMenuPeer.java @@ -39,10 +39,15 @@ exception statement from your version. */ package java.awt.peer; import java.awt.Component; +import java.awt.Event; + public interface PopupMenuPeer extends MenuPeer { - -public abstract void show (Component origin, int x, int y); - + + /** + * Part of the older API, replaced by event version instead. + */ + public void show (Component origin, int x, int y); + public void show (Event e); } // interface PopupMenuPeer diff --git a/libjava/java/awt/peer/RobotPeer.java b/libjava/java/awt/peer/RobotPeer.java new file mode 100644 index 00000000000..ee9034724a8 --- /dev/null +++ b/libjava/java/awt/peer/RobotPeer.java @@ -0,0 +1,54 @@ +/* RobotPeer.java -- Interface for programatically driving GUI + Copyright (C) 2003 Free Software Foundation, Inc. + +This file is part of GNU Classpath. + +GNU Classpath is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2, or (at your option) +any later version. + +GNU Classpath is distributed in the hope that it will be useful, but +WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +General Public License for more details. + +You should have received a copy of the GNU General Public License +along with GNU Classpath; see the file COPYING. If not, write to the +Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA +02111-1307 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ + + +package java.awt.peer; + +import java.awt.Rectangle; + +public interface RobotPeer +{ + public void mouseMove (int x, int y); + public void mousePress (int x); + public void mouseRelease (int x); + public void mouseWheel (int x); + public void keyPress (int x); + public void keyRelease (int x); + public int getRGBPixel (int x, int y); + public int[] getRGBPixels (Rectangle r); +} // interface RobotPeer + diff --git a/libjava/java/awt/peer/ScrollPanePeer.java b/libjava/java/awt/peer/ScrollPanePeer.java index 94d5cac5e05..411f443daf1 100644 --- a/libjava/java/awt/peer/ScrollPanePeer.java +++ b/libjava/java/awt/peer/ScrollPanePeer.java @@ -42,13 +42,11 @@ import java.awt.Adjustable; public interface ScrollPanePeer extends ContainerPeer { - -public abstract int getHScrollbarHeight(); -public abstract int getVScrollbarWidth(); -public abstract void setScrollPosition(int h, int v); -public abstract void childResized(int width, int height); -public abstract void setUnitIncrement(Adjustable item, int inc); -public abstract void setValue(Adjustable item, int value); - + public int getHScrollbarHeight(); + public int getVScrollbarWidth(); + public void setScrollPosition(int h, int v); + public void childResized(int width, int height); + public void setUnitIncrement(Adjustable item, int inc); + public void setValue(Adjustable item, int value); } // interface ScollPanePeer diff --git a/libjava/java/awt/peer/ScrollbarPeer.java b/libjava/java/awt/peer/ScrollbarPeer.java index 8a1a13cbb4b..c81eaa94065 100644 --- a/libjava/java/awt/peer/ScrollbarPeer.java +++ b/libjava/java/awt/peer/ScrollbarPeer.java @@ -40,10 +40,8 @@ package java.awt.peer; public interface ScrollbarPeer extends ComponentPeer { - -public abstract void setLineIncrement(int inc); -public abstract void setPageIncrement(int inc); -public abstract void setValues(int value, int visible, int min, int max); - + public void setLineIncrement(int inc); + public void setPageIncrement(int inc); + public void setValues(int value, int visible, int min, int max); } // interface ScrollbarPeer diff --git a/libjava/java/awt/peer/TextAreaPeer.java b/libjava/java/awt/peer/TextAreaPeer.java index 0a6286b8a09..425c70fadd8 100644 --- a/libjava/java/awt/peer/TextAreaPeer.java +++ b/libjava/java/awt/peer/TextAreaPeer.java @@ -42,14 +42,12 @@ import java.awt.Dimension; public interface TextAreaPeer extends TextComponentPeer { - -public abstract void insert(String text, int pos); -public abstract void insertText(String text, int pos); -public abstract Dimension minimumSize(int rows, int cols); -public abstract Dimension getMinimumSize(int rows, int cols); -public abstract Dimension preferredSize(int rows, int cols); -public abstract Dimension getPreferredSize(int rows, int cols); -public abstract void replaceRange(String text, int start_pos, int end_pos); -public abstract void replaceText(String text, int start_pos, int end_pos); - + public void insert(String text, int pos); + public void insertText(String text, int pos); + public Dimension minimumSize(int rows, int cols); + public Dimension getMinimumSize(int rows, int cols); + public Dimension preferredSize(int rows, int cols); + public Dimension getPreferredSize(int rows, int cols); + public void replaceRange(String text, int start_pos, int end_pos); + public void replaceText(String text, int start_pos, int end_pos); } // interface TextAreaPeer diff --git a/libjava/java/awt/peer/TextComponentPeer.java b/libjava/java/awt/peer/TextComponentPeer.java index 3fd7a2a6c53..1dd2e44e80c 100644 --- a/libjava/java/awt/peer/TextComponentPeer.java +++ b/libjava/java/awt/peer/TextComponentPeer.java @@ -38,17 +38,20 @@ exception statement from your version. */ package java.awt.peer; +import java.awt.Rectangle; + public interface TextComponentPeer extends ComponentPeer { - -public abstract int getSelectionEnd(); -public abstract int getSelectionStart(); -public abstract String getText(); -public abstract void setText(String text); -public abstract void select(int start_pos, int end_pos); -public abstract void setEditable(boolean editable); -public abstract int getCaretPosition(); -public abstract void setCaretPosition(int pos); - + public int getSelectionEnd(); + public int getSelectionStart(); + public String getText(); + public void setText(String text); + public void select(int start_pos, int end_pos); + public void setEditable(boolean editable); + public int getCaretPosition(); + public void setCaretPosition(int pos); + public int getIndexAtPoint(int x, int y); + public Rectangle getCharacterBounds(int pos); + public long filterEvents(long filter); } // interface TextComponentPeer diff --git a/libjava/java/awt/peer/TextFieldPeer.java b/libjava/java/awt/peer/TextFieldPeer.java index 6ec03a06636..302e3a6cf52 100644 --- a/libjava/java/awt/peer/TextFieldPeer.java +++ b/libjava/java/awt/peer/TextFieldPeer.java @@ -42,13 +42,11 @@ import java.awt.Dimension; public interface TextFieldPeer extends TextComponentPeer { - -public abstract Dimension minimumSize(int len); -public abstract Dimension preferredSize(int len); -public abstract Dimension getMinimumSize(int len); -public abstract Dimension getPreferredSize(int len); -public abstract void setEchoChar(char echo_char); -public abstract void setEchoCharacter(char echo_char); - + public Dimension minimumSize(int len); + public Dimension preferredSize(int len); + public Dimension getMinimumSize(int len); + public Dimension getPreferredSize(int len); + public void setEchoChar(char echo_char); + public void setEchoCharacter(char echo_char); } // interface TextFieldPeer diff --git a/libjava/java/awt/peer/WindowPeer.java b/libjava/java/awt/peer/WindowPeer.java index 95a0acccdc3..aa0004e1087 100644 --- a/libjava/java/awt/peer/WindowPeer.java +++ b/libjava/java/awt/peer/WindowPeer.java @@ -40,9 +40,7 @@ package java.awt.peer; public interface WindowPeer extends ContainerPeer { - -public abstract void toBack(); -public abstract void toFront(); - + public void toBack(); + public void toFront(); } // interface WindowPeer -- 2.30.2