diff options
author | Tom Tromey <tromey@redhat.com> | 2003-03-01 22:14:21 +0000 |
---|---|---|
committer | Tom Tromey <tromey@gcc.gnu.org> | 2003-03-01 22:14:21 +0000 |
commit | 2759b2605e4d287628bce47af67cb27fbcdf2e58 (patch) | |
tree | 0a2283c36b183fa1062ced6bc9c1d645a85e2cff /libjava/java | |
parent | 11522327310925f7a6547e072e703dd35871ea95 (diff) | |
download | gcc-2759b2605e4d287628bce47af67cb27fbcdf2e58.zip gcc-2759b2605e4d287628bce47af67cb27fbcdf2e58.tar.gz gcc-2759b2605e4d287628bce47af67cb27fbcdf2e58.tar.bz2 |
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
Diffstat (limited to 'libjava/java')
26 files changed, 272 insertions, 129 deletions
diff --git a/libjava/java/awt/dnd/peer/DragSourceContextPeer.java b/libjava/java/awt/dnd/peer/DragSourceContextPeer.java index da9e098..971882d 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 ad166d9..36b303f 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 + * <code>DropTargetListener</code>. Occurs when a <code>Component</code> + * with an associated <code>DropTarget</code> and visible geometry is first + * intersected by a logical cursor. + * * @author Michael Koch <konqueror@gmx.de> */ 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 0000000..5666bdc --- /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 e7479ef..2824839 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 4cd833e..b150a8b 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 7f1e287..4ffd79c 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 7b8c949..228311c 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 257d608..e6f79d1 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 23a8746..b691b89 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 8b3a07b..b97798e 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 e99d44b..49fa01f 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 4bb72f7..c354275 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 2d12c78..5eefcd0 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 6c0217f..1ba86ae 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 764e6fe..de6e5bc 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 4ac4fd8..5db9e71 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 7dc2006..7038f93 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 532672b..ee8a900 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 dec5d0e..46278da 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 0000000..ee90347 --- /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 94d5cac..411f443 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 8a1a13cb..c81eaa9 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 0a6286b..425c70f 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 3fd7a2a..1dd2e44 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 6ec03a0..302e3a6 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 95a0acc..aa0004e 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 |