Patch: FYI: Classpath AWT re-merge
Tom Tromey
tromey@redhat.com
Sat Mar 1 21:16:00 GMT 2003
I'm checking this in to the trunk.
This pulls in some recent Classpath AWT changes: some reindentations,
a couple new files, some API conformance fixes, and a few peer
additions.
Tom
Index: ChangeLog
from Tom Tromey <tromey@redhat.com>
* 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.
Index: Makefile.am
===================================================================
RCS file: /cvs/gcc/gcc/libjava/Makefile.am,v
retrieving revision 1.281
diff -u -r1.281 Makefile.am
--- Makefile.am 28 Feb 2003 11:38:55 -0000 1.281
+++ Makefile.am 1 Mar 2003 21:14:42 -0000
@@ -992,6 +992,7 @@
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/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 \
Index: Makefile.in
===================================================================
RCS file: /cvs/gcc/gcc/libjava/Makefile.in,v
retrieving revision 1.302
diff -u -r1.302 Makefile.in
--- Makefile.in 28 Feb 2003 11:38:55 -0000 1.302
+++ Makefile.in 1 Mar 2003 21:14:43 -0000
@@ -803,6 +803,7 @@
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 @@
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 @@
.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 \
Index: gnu/java/awt/GLightweightPeer.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/gnu/java/awt/GLightweightPeer.java,v
retrieving revision 1.2
diff -u -r1.2 GLightweightPeer.java
--- gnu/java/awt/GLightweightPeer.java 22 Jan 2002 22:39:48 -0000 1.2
+++ gnu/java/awt/GLightweightPeer.java 1 Mar 2003 21:14:43 -0000
@@ -37,6 +37,7 @@
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 void hide() {}
+ public boolean isFocusable()
+ {
+ return false;
+ }
+
public boolean isFocusTraversable()
{
return false;
@@ -140,6 +146,8 @@
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 @@
{
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() { }
}
Index: gnu/java/awt/peer/gtk/GtkChoicePeer.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/gnu/java/awt/peer/gtk/GtkChoicePeer.java,v
retrieving revision 1.1
diff -u -r1.1 GtkChoicePeer.java
--- gnu/java/awt/peer/gtk/GtkChoicePeer.java 31 Jan 2003 17:54:13 -0000 1.1
+++ gnu/java/awt/peer/gtk/GtkChoicePeer.java 1 Mar 2003 21:14:43 -0000
@@ -66,6 +66,8 @@
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)
{
Index: gnu/java/awt/peer/gtk/GtkComponentPeer.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/gnu/java/awt/peer/gtk/GtkComponentPeer.java,v
retrieving revision 1.2
diff -u -r1.2 GtkComponentPeer.java
--- gnu/java/awt/peer/gtk/GtkComponentPeer.java 19 Feb 2003 00:35:35 -0000 1.2
+++ gnu/java/awt/peer/gtk/GtkComponentPeer.java 1 Mar 2003 21:14:43 -0000
@@ -394,4 +394,67 @@
{
// 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 ()
+ {
+
+ }
}
Index: gnu/java/awt/peer/gtk/GtkContainerPeer.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/gnu/java/awt/peer/gtk/GtkContainerPeer.java,v
retrieving revision 1.1
diff -u -r1.1 GtkContainerPeer.java
--- gnu/java/awt/peer/gtk/GtkContainerPeer.java 31 Jan 2003 17:54:13 -0000 1.1
+++ gnu/java/awt/peer/gtk/GtkContainerPeer.java 1 Mar 2003 21:14:43 -0000
@@ -122,4 +122,8 @@
break;
}
}
+
+ public void beginLayout () { }
+ public void endLayout () { }
+ public boolean isPaintPending () { return false; }
}
Index: gnu/java/awt/peer/gtk/GtkFramePeer.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/gnu/java/awt/peer/gtk/GtkFramePeer.java,v
retrieving revision 1.1
diff -u -r1.1 GtkFramePeer.java
--- gnu/java/awt/peer/gtk/GtkFramePeer.java 31 Jan 2003 17:54:13 -0000 1.1
+++ gnu/java/awt/peer/gtk/GtkFramePeer.java 1 Mar 2003 21:14:43 -0000
@@ -127,6 +127,21 @@
y + insets.top,
width, height)));
}
+
+ public int getState ()
+ {
+ return 0;
+ }
+
+ public void setState (int state)
+ {
+
+ }
+
+ public void setMaximizedBounds (Rectangle r)
+ {
+
+ }
}
Index: gnu/java/awt/peer/gtk/GtkPopupMenuPeer.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/gnu/java/awt/peer/gtk/GtkPopupMenuPeer.java,v
retrieving revision 1.1
diff -u -r1.1 GtkPopupMenuPeer.java
--- gnu/java/awt/peer/gtk/GtkPopupMenuPeer.java 31 Jan 2003 17:54:13 -0000 1.1
+++ gnu/java/awt/peer/gtk/GtkPopupMenuPeer.java 1 Mar 2003 21:14:43 -0000
@@ -62,4 +62,9 @@
Point abs = origin.getLocationOnScreen ();
show (abs.x + x, abs.y + y, 0);
}
+
+ public void show (Event e)
+ {
+
+ }
}
Index: gnu/java/awt/peer/gtk/GtkTextComponentPeer.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/gnu/java/awt/peer/gtk/GtkTextComponentPeer.java,v
retrieving revision 1.1
diff -u -r1.1 GtkTextComponentPeer.java
--- gnu/java/awt/peer/gtk/GtkTextComponentPeer.java 31 Jan 2003 17:54:13 -0000 1.1
+++ gnu/java/awt/peer/gtk/GtkTextComponentPeer.java 1 Mar 2003 21:14:43 -0000
@@ -76,4 +76,19 @@
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
+ }
}
Index: java/awt/dnd/peer/DragSourceContextPeer.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/awt/dnd/peer/DragSourceContextPeer.java,v
retrieving revision 1.1
diff -u -r1.1 DragSourceContextPeer.java
--- java/awt/dnd/peer/DragSourceContextPeer.java 9 Aug 2002 04:26:15 -0000 1.1
+++ java/awt/dnd/peer/DragSourceContextPeer.java 1 Mar 2003 21:14:44 -0000
@@ -42,14 +42,16 @@
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
Index: java/awt/dnd/peer/DropTargetContextPeer.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/awt/dnd/peer/DropTargetContextPeer.java,v
retrieving revision 1.1
diff -u -r1.1 DropTargetContextPeer.java
--- java/awt/dnd/peer/DropTargetContextPeer.java 3 Oct 2002 14:40:43 -0000 1.1
+++ java/awt/dnd/peer/DropTargetContextPeer.java 1 Mar 2003 21:14:44 -0000
@@ -37,9 +37,31 @@
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);
+}
Index: java/awt/dnd/peer/DropTargetPeer.java
===================================================================
RCS file: java/awt/dnd/peer/DropTargetPeer.java
diff -N java/awt/dnd/peer/DropTargetPeer.java
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ java/awt/dnd/peer/DropTargetPeer.java 1 Mar 2003 21:14:44 -0000
@@ -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
Index: java/awt/peer/ButtonPeer.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/awt/peer/ButtonPeer.java,v
retrieving revision 1.3
diff -u -r1.3 ButtonPeer.java
--- java/awt/peer/ButtonPeer.java 22 Jan 2002 22:58:09 -0000 1.3
+++ java/awt/peer/ButtonPeer.java 1 Mar 2003 21:14:44 -0000
@@ -40,8 +40,6 @@
public interface ButtonPeer extends ComponentPeer
{
-
-public abstract void setLabel(String label);
-
+ public void setLabel(String label);
} // interface ButtonPeer
Index: java/awt/peer/CheckboxMenuItemPeer.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/awt/peer/CheckboxMenuItemPeer.java,v
retrieving revision 1.3
diff -u -r1.3 CheckboxMenuItemPeer.java
--- java/awt/peer/CheckboxMenuItemPeer.java 22 Jan 2002 22:58:09 -0000 1.3
+++ java/awt/peer/CheckboxMenuItemPeer.java 1 Mar 2003 21:14:44 -0000
@@ -40,8 +40,6 @@
public interface CheckboxMenuItemPeer extends MenuItemPeer
{
-
-public abstract void setState(boolean state);
-
+ public void setState(boolean state);
} // interface CheckboxMenuItemPeer
Index: java/awt/peer/CheckboxPeer.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/awt/peer/CheckboxPeer.java,v
retrieving revision 1.3
diff -u -r1.3 CheckboxPeer.java
--- java/awt/peer/CheckboxPeer.java 22 Jan 2002 22:58:09 -0000 1.3
+++ java/awt/peer/CheckboxPeer.java 1 Mar 2003 21:14:44 -0000
@@ -40,10 +40,8 @@
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
Index: java/awt/peer/ChoicePeer.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/awt/peer/ChoicePeer.java,v
retrieving revision 1.4
diff -u -r1.4 ChoicePeer.java
--- java/awt/peer/ChoicePeer.java 22 Jan 2002 22:58:09 -0000 1.4
+++ java/awt/peer/ChoicePeer.java 1 Mar 2003 21:14:44 -0000
@@ -40,11 +40,10 @@
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
Index: java/awt/peer/ComponentPeer.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/awt/peer/ComponentPeer.java,v
retrieving revision 1.9
diff -u -r1.9 ComponentPeer.java
--- java/awt/peer/ComponentPeer.java 22 Jan 2002 22:58:09 -0000 1.9
+++ java/awt/peer/ComponentPeer.java 1 Mar 2003 21:14:44 -0000
@@ -39,6 +39,7 @@
package java.awt.peer;
import java.awt.*;
+import java.awt.event.PaintEvent;
import java.awt.image.*;
public interface ComponentPeer
@@ -57,23 +58,38 @@
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 @@
* 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();
+
}
Index: java/awt/peer/ContainerPeer.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/awt/peer/ContainerPeer.java,v
retrieving revision 1.8
diff -u -r1.8 ContainerPeer.java
--- java/awt/peer/ContainerPeer.java 7 Nov 2002 13:01:34 -0000 1.8
+++ java/awt/peer/ContainerPeer.java 1 Mar 2003 21:14:44 -0000
@@ -41,9 +41,12 @@
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
Index: java/awt/peer/DialogPeer.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/awt/peer/DialogPeer.java,v
retrieving revision 1.3
diff -u -r1.3 DialogPeer.java
--- java/awt/peer/DialogPeer.java 22 Jan 2002 22:58:09 -0000 1.3
+++ java/awt/peer/DialogPeer.java 1 Mar 2003 21:14:44 -0000
@@ -40,9 +40,7 @@
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
Index: java/awt/peer/FileDialogPeer.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/awt/peer/FileDialogPeer.java,v
retrieving revision 1.3
diff -u -r1.3 FileDialogPeer.java
--- java/awt/peer/FileDialogPeer.java 22 Jan 2002 22:58:09 -0000 1.3
+++ java/awt/peer/FileDialogPeer.java 1 Mar 2003 21:14:44 -0000
@@ -42,10 +42,8 @@
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
Index: java/awt/peer/FramePeer.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/awt/peer/FramePeer.java,v
retrieving revision 1.6
diff -u -r1.6 FramePeer.java
--- java/awt/peer/FramePeer.java 22 Jan 2002 22:58:09 -0000 1.6
+++ java/awt/peer/FramePeer.java 1 Mar 2003 21:14:44 -0000
@@ -40,14 +40,16 @@
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
Index: java/awt/peer/LabelPeer.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/awt/peer/LabelPeer.java,v
retrieving revision 1.3
diff -u -r1.3 LabelPeer.java
--- java/awt/peer/LabelPeer.java 22 Jan 2002 22:58:09 -0000 1.3
+++ java/awt/peer/LabelPeer.java 1 Mar 2003 21:14:44 -0000
@@ -40,9 +40,7 @@
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
Index: java/awt/peer/ListPeer.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/awt/peer/ListPeer.java,v
retrieving revision 1.4
diff -u -r1.4 ListPeer.java
--- java/awt/peer/ListPeer.java 22 Jan 2002 22:58:09 -0000 1.4
+++ java/awt/peer/ListPeer.java 1 Mar 2003 21:14:44 -0000
@@ -42,20 +42,21 @@
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
Index: java/awt/peer/MenuBarPeer.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/awt/peer/MenuBarPeer.java,v
retrieving revision 1.4
diff -u -r1.4 MenuBarPeer.java
--- java/awt/peer/MenuBarPeer.java 22 Jan 2002 22:58:09 -0000 1.4
+++ java/awt/peer/MenuBarPeer.java 1 Mar 2003 21:14:44 -0000
@@ -42,10 +42,8 @@
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
Index: java/awt/peer/MenuComponentPeer.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/awt/peer/MenuComponentPeer.java,v
retrieving revision 1.3
diff -u -r1.3 MenuComponentPeer.java
--- java/awt/peer/MenuComponentPeer.java 22 Jan 2002 22:58:09 -0000 1.3
+++ java/awt/peer/MenuComponentPeer.java 1 Mar 2003 21:14:44 -0000
@@ -40,8 +40,6 @@
public interface MenuComponentPeer
{
-
-public abstract void dispose();
-
+ public void dispose();
} // interface MenuComponentPeer
Index: java/awt/peer/MenuItemPeer.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/awt/peer/MenuItemPeer.java,v
retrieving revision 1.4
diff -u -r1.4 MenuItemPeer.java
--- java/awt/peer/MenuItemPeer.java 22 Jan 2002 22:58:09 -0000 1.4
+++ java/awt/peer/MenuItemPeer.java 1 Mar 2003 21:14:44 -0000
@@ -40,11 +40,9 @@
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
Index: java/awt/peer/MenuPeer.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/awt/peer/MenuPeer.java,v
retrieving revision 1.4
diff -u -r1.4 MenuPeer.java
--- java/awt/peer/MenuPeer.java 22 Jan 2002 22:58:09 -0000 1.4
+++ java/awt/peer/MenuPeer.java 1 Mar 2003 21:14:44 -0000
@@ -42,8 +42,8 @@
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);
}
Index: java/awt/peer/PopupMenuPeer.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/awt/peer/PopupMenuPeer.java,v
retrieving revision 1.3
diff -u -r1.3 PopupMenuPeer.java
--- java/awt/peer/PopupMenuPeer.java 22 Jan 2002 22:58:09 -0000 1.3
+++ java/awt/peer/PopupMenuPeer.java 1 Mar 2003 21:14:44 -0000
@@ -39,10 +39,15 @@
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
Index: java/awt/peer/RobotPeer.java
===================================================================
RCS file: java/awt/peer/RobotPeer.java
diff -N java/awt/peer/RobotPeer.java
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ java/awt/peer/RobotPeer.java 1 Mar 2003 21:14:44 -0000
@@ -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
+
Index: java/awt/peer/ScrollPanePeer.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/awt/peer/ScrollPanePeer.java,v
retrieving revision 1.5
diff -u -r1.5 ScrollPanePeer.java
--- java/awt/peer/ScrollPanePeer.java 22 Jan 2002 22:58:09 -0000 1.5
+++ java/awt/peer/ScrollPanePeer.java 1 Mar 2003 21:14:44 -0000
@@ -42,13 +42,11 @@
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
Index: java/awt/peer/ScrollbarPeer.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/awt/peer/ScrollbarPeer.java,v
retrieving revision 1.3
diff -u -r1.3 ScrollbarPeer.java
--- java/awt/peer/ScrollbarPeer.java 22 Jan 2002 22:58:09 -0000 1.3
+++ java/awt/peer/ScrollbarPeer.java 1 Mar 2003 21:14:44 -0000
@@ -40,10 +40,8 @@
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
Index: java/awt/peer/TextAreaPeer.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/awt/peer/TextAreaPeer.java,v
retrieving revision 1.4
diff -u -r1.4 TextAreaPeer.java
--- java/awt/peer/TextAreaPeer.java 22 Jan 2002 22:58:09 -0000 1.4
+++ java/awt/peer/TextAreaPeer.java 1 Mar 2003 21:14:44 -0000
@@ -42,14 +42,12 @@
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
Index: java/awt/peer/TextComponentPeer.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/awt/peer/TextComponentPeer.java,v
retrieving revision 1.3
diff -u -r1.3 TextComponentPeer.java
--- java/awt/peer/TextComponentPeer.java 22 Jan 2002 22:58:09 -0000 1.3
+++ java/awt/peer/TextComponentPeer.java 1 Mar 2003 21:14:44 -0000
@@ -38,17 +38,20 @@
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
Index: java/awt/peer/TextFieldPeer.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/awt/peer/TextFieldPeer.java,v
retrieving revision 1.4
diff -u -r1.4 TextFieldPeer.java
--- java/awt/peer/TextFieldPeer.java 22 Jan 2002 22:58:09 -0000 1.4
+++ java/awt/peer/TextFieldPeer.java 1 Mar 2003 21:14:44 -0000
@@ -42,13 +42,11 @@
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
Index: java/awt/peer/WindowPeer.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/awt/peer/WindowPeer.java,v
retrieving revision 1.6
diff -u -r1.6 WindowPeer.java
--- java/awt/peer/WindowPeer.java 22 Jan 2002 22:58:09 -0000 1.6
+++ java/awt/peer/WindowPeer.java 1 Mar 2003 21:14:44 -0000
@@ -40,9 +40,7 @@
public interface WindowPeer extends ContainerPeer
{
-
-public abstract void toBack();
-public abstract void toFront();
-
+ public void toBack();
+ public void toFront();
} // interface WindowPeer
More information about the Java-patches
mailing list