[kaffe] CVS kaffe (robilad): Resynced with GNU Classpath: AWT fixes from 27th & 28th
Kaffe CVS
cvs-commits at kaffe.org
Mon Oct 4 02:06:18 PDT 2004
PatchSet 5239
Date: 2004/10/04 09:01:24
Author: robilad
Branch: HEAD
Tag: (none)
Log:
Resynced with GNU Classpath: AWT fixes from 27th & 28th
Members:
ChangeLog:1.2793->1.2794
libraries/javalib/Makefile.am:1.241->1.242
libraries/javalib/Makefile.in:1.321->1.322
libraries/javalib/all.files:1.29->1.30
libraries/javalib/java/awt/AWTKeyStroke.java:1.3->1.4
libraries/javalib/java/awt/Canvas.java:1.14->1.15
libraries/javalib/java/awt/CardLayout.java:1.9->1.10
libraries/javalib/java/awt/CheckboxMenuItem.java:1.11->1.12
libraries/javalib/java/awt/Component.java:1.39->1.40
libraries/javalib/java/awt/Container.java:1.23->1.24
libraries/javalib/java/awt/DefaultKeyboardFocusManager.java:1.5->1.6
libraries/javalib/java/awt/EventDispatchThread.java:1.10->1.11
libraries/javalib/java/awt/FileDialog.java:1.6->1.7
libraries/javalib/java/awt/FlowLayout.java:1.9->1.10
libraries/javalib/java/awt/Font.java:1.18->1.19
libraries/javalib/java/awt/Frame.java:1.19->1.20
libraries/javalib/java/awt/Graphics2D.java:1.4->1.5
libraries/javalib/java/awt/GraphicsEnvironment.java:1.2->1.3
libraries/javalib/java/awt/GridBagConstraints.java:1.7->1.8
libraries/javalib/java/awt/GridBagLayout.java:1.21->1.22
libraries/javalib/java/awt/GridLayout.java:1.8->1.9
libraries/javalib/java/awt/Image.java:1.19->1.20
libraries/javalib/java/awt/KeyboardFocusManager.java:1.5->1.6
libraries/javalib/java/awt/Label.java:1.4->1.5
libraries/javalib/java/awt/List.java:1.2->1.3
libraries/javalib/java/awt/MediaTracker.java:1.13->1.14
libraries/javalib/java/awt/Menu.java:1.10->1.11
libraries/javalib/java/awt/MenuComponent.java:1.13->1.14
libraries/javalib/java/awt/Panel.java:1.11->1.12
libraries/javalib/java/awt/PopupMenu.java:1.8->1.9
libraries/javalib/java/awt/ScrollPane.java:1.16->1.17
libraries/javalib/java/awt/Scrollbar.java:1.3->1.4
libraries/javalib/java/awt/SystemColor.java:1.7->1.8
libraries/javalib/java/awt/TextArea.java:1.2->1.3
libraries/javalib/java/awt/TextField.java:1.2->1.3
libraries/javalib/java/awt/Toolkit.java:1.19->1.20
libraries/javalib/java/awt/Window.java:1.22->1.23
libraries/javalib/java/awt/color/ICC_Profile.java:1.5->1.6
libraries/javalib/java/awt/datatransfer/DataFlavor.java:1.15->1.16
libraries/javalib/java/awt/datatransfer/StringSelection.java:1.7->1.8
libraries/javalib/java/awt/datatransfer/SystemFlavorMap.java:1.3->1.4
libraries/javalib/java/awt/dnd/Autoscroll.java:1.4->1.5
libraries/javalib/java/awt/dnd/DropTarget.java:1.5->1.6
libraries/javalib/java/awt/dnd/DropTargetContext.java:1.4->1.5
libraries/javalib/java/awt/dnd/DropTargetDragEvent.java:1.4->1.5
libraries/javalib/java/awt/event/AdjustmentEvent.java:1.6->1.7
libraries/javalib/java/awt/event/InputEvent.java:1.7->1.8
libraries/javalib/java/awt/event/InvocationEvent.java:1.3->1.4
libraries/javalib/java/awt/event/KeyEvent.java:1.10->1.11
libraries/javalib/java/awt/event/MouseEvent.java:1.11->1.12
libraries/javalib/java/awt/font/TextLayout.java:1.4->1.5
libraries/javalib/java/awt/geom/GeneralPath.java:1.4->1.5
libraries/javalib/java/awt/geom/Point2D.java:1.2->1.3
libraries/javalib/java/awt/im/InputContext.java:1.2->1.3
libraries/javalib/java/awt/image/AffineTransformOp.java:1.1->1.2
libraries/javalib/java/awt/image/BufferedImage.java:1.8->1.9
libraries/javalib/java/awt/image/CropImageFilter.java:1.4->1.5
libraries/javalib/java/awt/image/DirectColorModel.java:1.11->1.12
libraries/javalib/java/awt/image/MemoryImageSource.java:1.10->1.11
libraries/javalib/java/awt/image/PackedColorModel.java:1.3->1.4
libraries/javalib/java/awt/image/PixelGrabber.java:1.7->1.8
libraries/javalib/java/awt/image/RasterOp.java:1.4->1.5
libraries/javalib/java/awt/image/RescaleOp.java:INITIAL->1.1
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.2793 kaffe/ChangeLog:1.2794
--- kaffe/ChangeLog:1.2793 Sun Oct 3 23:23:01 2004
+++ kaffe/ChangeLog Mon Oct 4 09:01:24 2004
@@ -1,5 +1,146 @@
2004-10-03 Dalibor Topic <robilad at kaffe.org>
+ * libraries/javalib/java/awt/image/RescaleOp.java:
+ New file takes from GNU Classpath.
+
+ * libraries/javalib/java/awt/AWTKeyStroke.java,
+ libraries/javalib/java/awt/Canvas.java,
+ libraries/javalib/java/awt/CardLayout.java,
+ libraries/javalib/java/awt/CheckboxMenuItem.java,
+ libraries/javalib/java/awt/Component.java,
+ libraries/javalib/java/awt/Container.java,
+ libraries/javalib/java/awt/DefaultKeyboardFocusManager.java,
+ libraries/javalib/java/awt/EventDispatchThread.java,
+ libraries/javalib/java/awt/FileDialog.java,
+ libraries/javalib/java/awt/FlowLayout.java,
+ libraries/javalib/java/awt/Font.java,
+ libraries/javalib/java/awt/Frame.java,
+ libraries/javalib/java/awt/Graphics2D.java,
+ libraries/javalib/java/awt/GraphicsEnvironment.java,
+ libraries/javalib/java/awt/GridBagConstraints.java,
+ libraries/javalib/java/awt/GridBagLayout.java,
+ libraries/javalib/java/awt/GridLayout.java,
+ libraries/javalib/java/awt/Image.java,
+ libraries/javalib/java/awt/KeyboardFocusManager.java,
+ libraries/javalib/java/awt/Label.java,
+ libraries/javalib/java/awt/List.java,
+ libraries/javalib/java/awt/MediaTracker.java,
+ libraries/javalib/java/awt/Menu.java,
+ libraries/javalib/java/awt/MenuComponent.java,
+ libraries/javalib/java/awt/Panel.java,
+ libraries/javalib/java/awt/PopupMenu.java,
+ libraries/javalib/java/awt/ScrollPane.java,
+ libraries/javalib/java/awt/Scrollbar.java,
+ libraries/javalib/java/awt/SystemColor.java,
+ libraries/javalib/java/awt/TextArea.java,
+ libraries/javalib/java/awt/TextField.java,
+ libraries/javalib/java/awt/Toolkit.java,
+ libraries/javalib/java/awt/Window.java,
+ libraries/javalib/java/awt/color/ICC_Profile.java,
+ libraries/javalib/java/awt/datatransfer/DataFlavor.java,
+ libraries/javalib/java/awt/datatransfer/StringSelection.java,
+ libraries/javalib/java/awt/datatransfer/SystemFlavorMap.java,
+ libraries/javalib/java/awt/dnd/Autoscroll.java,
+ libraries/javalib/java/awt/dnd/DropTarget.java,
+ libraries/javalib/java/awt/dnd/DropTargetContext.java,
+ libraries/javalib/java/awt/dnd/DropTargetDragEvent.java,
+ libraries/javalib/java/awt/event/AdjustmentEvent.java,
+ libraries/javalib/java/awt/event/InputEvent.java,
+ libraries/javalib/java/awt/event/InvocationEvent.java,
+ libraries/javalib/java/awt/event/KeyEvent.java,
+ libraries/javalib/java/awt/event/MouseEvent.java,
+ libraries/javalib/java/awt/font/TextLayout.java,
+ libraries/javalib/java/awt/geom/GeneralPath.java,
+ libraries/javalib/java/awt/geom/Point2D.java,
+ libraries/javalib/java/awt/im/InputContext.java,
+ libraries/javalib/java/awt/image/AffineTransformOp.java,
+ libraries/javalib/java/awt/image/BufferedImage.java,
+ libraries/javalib/java/awt/image/CropImageFilter.java,
+ libraries/javalib/java/awt/image/DirectColorModel.java,
+ libraries/javalib/java/awt/image/MemoryImageSource.java,
+ libraries/javalib/java/awt/image/PackedColorModel.java,
+ libraries/javalib/java/awt/image/PixelGrabber.java,
+ libraries/javalib/java/awt/image/RasterOp.java:
+ Resynced with GNU Classpath.
+
+ 2004-09-28 Jerry Quinn <jlquinn at optonline.net>
+
+ * java/awt/image/IndexColorModel.java: Add class docs.
+ (getRGBs, convertToIntDiscrete): Implement.
+ (isValid, getValidPixels): Implement.
+ * java/awt/image/RescaleOp.java: Implement.
+
+ 2004-09-27 Michael Koch <konqueror at gmx.de>
+
+ * java/awt/AWTKeyStroke.java,
+ java/awt/Canvas.java,
+ java/awt/CardLayout.java,
+ java/awt/CheckboxMenuItem.java,
+ java/awt/Component.java,
+ java/awt/Container.java,
+ java/awt/DefaultKeyboardFocusManager.java,
+ java/awt/EventDispatchThread.java,
+ java/awt/FileDialog.java,
+ java/awt/FlowLayout.java,
+ java/awt/Font.java,
+ java/awt/Frame.java,
+ java/awt/Graphics2D.java,
+ java/awt/GraphicsEnvironment.java,
+ java/awt/GridBagConstraints.java,
+ java/awt/GridBagLayout.java,
+ java/awt/GridLayout.java,
+ java/awt/Image.java,
+ java/awt/KeyboardFocusManager.java,
+ java/awt/Label.java,
+ java/awt/List.java,
+ java/awt/MediaTracker.java,
+ java/awt/Menu.java,
+ java/awt/MenuBar.java,
+ java/awt/MenuComponent.java,
+ java/awt/Panel.java,
+ java/awt/PopupMenu.java,
+ java/awt/ScrollPane.java,
+ java/awt/Scrollbar.java,
+ java/awt/SystemColor.java,
+ java/awt/TextArea.java,
+ java/awt/TextField.java,
+ java/awt/Toolkit.java,
+ java/awt/Window.java,
+ java/awt/color/ICC_Profile.java,
+ java/awt/datatransfer/DataFlavor.java,
+ java/awt/datatransfer/StringSelection.java,
+ java/awt/datatransfer/SystemFlavorMap.java,
+ java/awt/dnd/Autoscroll.java,
+ java/awt/dnd/DropTarget.java,
+ java/awt/dnd/DropTargetContext.java,
+ java/awt/dnd/DropTargetDragEvent.java,
+ java/awt/dnd/peer/DropTargetContextPeer.java,
+ java/awt/event/AdjustmentEvent.java,
+ java/awt/event/InputEvent.java,
+ java/awt/event/InvocationEvent.java,
+ java/awt/event/KeyEvent.java,
+ java/awt/event/MouseEvent.java,
+ java/awt/font/TextLayout.java,
+ java/awt/geom/GeneralPath.java,
+ java/awt/geom/Point2D.java,
+ java/awt/im/InputContext.java,
+ java/awt/im/spi/InputMethodContext.java,
+ java/awt/image/AffineTransformOp.java,
+ java/awt/image/BufferedImage.java,
+ java/awt/image/ColorModel.java,
+ java/awt/image/ComponentColorModel.java,
+ java/awt/image/CropImageFilter.java,
+ java/awt/image/DirectColorModel.java,
+ java/awt/image/MemoryImageSource.java,
+ java/awt/image/PackedColorModel.java,
+ java/awt/image/PixelGrabber.java,
+ java/awt/image/RasterOp.java,
+ java/awt/peer/MenuBarPeer.java:
+ Some fixes for checkstyle. Import statement and modifier order
+ redordering.
+
+2004-10-03 Dalibor Topic <robilad at kaffe.org>
+
* libraries/javalib/javax/swing/JTable.java:
Resynced with GNU Classpath.
Index: kaffe/libraries/javalib/Makefile.am
diff -u kaffe/libraries/javalib/Makefile.am:1.241 kaffe/libraries/javalib/Makefile.am:1.242
--- kaffe/libraries/javalib/Makefile.am:1.241 Wed Sep 29 04:23:52 2004
+++ kaffe/libraries/javalib/Makefile.am Mon Oct 4 09:01:27 2004
@@ -1710,6 +1710,7 @@
java/awt/image/RasterOp.java \
java/awt/image/RenderedImage.java \
java/awt/image/ReplicateScaleFilter.java \
+ java/awt/image/RescaleOp.java \
java/awt/image/SampleModel.java \
java/awt/image/ShortLookupTable.java \
java/awt/image/SinglePixelPackedSampleModel.java \
Index: kaffe/libraries/javalib/Makefile.in
diff -u kaffe/libraries/javalib/Makefile.in:1.321 kaffe/libraries/javalib/Makefile.in:1.322
--- kaffe/libraries/javalib/Makefile.in:1.321 Wed Sep 29 04:23:52 2004
+++ kaffe/libraries/javalib/Makefile.in Mon Oct 4 09:01:28 2004
@@ -2168,6 +2168,7 @@
java/awt/image/RasterOp.java \
java/awt/image/RenderedImage.java \
java/awt/image/ReplicateScaleFilter.java \
+ java/awt/image/RescaleOp.java \
java/awt/image/SampleModel.java \
java/awt/image/ShortLookupTable.java \
java/awt/image/SinglePixelPackedSampleModel.java \
Index: kaffe/libraries/javalib/all.files
diff -u kaffe/libraries/javalib/all.files:1.29 kaffe/libraries/javalib/all.files:1.30
--- kaffe/libraries/javalib/all.files:1.29 Wed Sep 29 04:23:53 2004
+++ kaffe/libraries/javalib/all.files Mon Oct 4 09:01:28 2004
@@ -1276,6 +1276,7 @@
java/awt/image/RasterOp.java
java/awt/image/RenderedImage.java
java/awt/image/ReplicateScaleFilter.java
+java/awt/image/RescaleOp.java
java/awt/image/SampleModel.java
java/awt/image/ShortLookupTable.java
java/awt/image/SinglePixelPackedSampleModel.java
Index: kaffe/libraries/javalib/java/awt/AWTKeyStroke.java
diff -u kaffe/libraries/javalib/java/awt/AWTKeyStroke.java:1.3 kaffe/libraries/javalib/java/awt/AWTKeyStroke.java:1.4
--- kaffe/libraries/javalib/java/awt/AWTKeyStroke.java:1.3 Thu Sep 9 20:33:19 2004
+++ kaffe/libraries/javalib/java/awt/AWTKeyStroke.java Mon Oct 4 09:01:29 2004
@@ -1,5 +1,5 @@
/* AWTKeyStroke.java -- an immutable key stroke
- Copyright (C) 2002 Free Software Foundation
+ Copyright (C) 2002, 2004 Free Software Foundation
This file is part of GNU Classpath.
@@ -48,9 +48,9 @@
import java.security.PrivilegedAction;
import java.security.PrivilegedActionException;
import java.security.PrivilegedExceptionAction;
-import java.util.Map;
import java.util.HashMap;
import java.util.LinkedHashMap;
+import java.util.Map;
import java.util.StringTokenizer;
/**
Index: kaffe/libraries/javalib/java/awt/Canvas.java
diff -u kaffe/libraries/javalib/java/awt/Canvas.java:1.14 kaffe/libraries/javalib/java/awt/Canvas.java:1.15
--- kaffe/libraries/javalib/java/awt/Canvas.java:1.14 Sun Sep 12 15:10:58 2004
+++ kaffe/libraries/javalib/java/awt/Canvas.java Mon Oct 4 09:01:29 2004
@@ -1,4 +1,5 @@
-/* Copyright (C) 1999, 2000, 2002 Free Software Foundation
+/* Canvas.java --
+ Copyright (C) 1999, 2000, 2002, 2004 Free Software Foundation
This file is part of GNU Classpath.
@@ -40,6 +41,7 @@
import java.awt.image.BufferStrategy;
import java.awt.peer.ComponentPeer;
import java.io.Serializable;
+
import javax.accessibility.Accessible;
import javax.accessibility.AccessibleContext;
import javax.accessibility.AccessibleRole;
Index: kaffe/libraries/javalib/java/awt/CardLayout.java
diff -u kaffe/libraries/javalib/java/awt/CardLayout.java:1.9 kaffe/libraries/javalib/java/awt/CardLayout.java:1.10
--- kaffe/libraries/javalib/java/awt/CardLayout.java:1.9 Thu Jul 22 19:20:21 2004
+++ kaffe/libraries/javalib/java/awt/CardLayout.java Mon Oct 4 09:01:29 2004
@@ -1,6 +1,5 @@
-// CardLayout.java - Card-based layout engine
-
-/* Copyright (C) 1999, 2000, 2002, 2003 Free Software Foundation
+/* CardLayout.java -- Card-based layout engine
+ Copyright (C) 1999, 2000, 2002, 2003, 2004 Free Software Foundation
This file is part of GNU Classpath.
@@ -39,9 +38,9 @@
package java.awt;
+import java.io.Serializable;
import java.util.Enumeration;
import java.util.Hashtable;
-import java.io.Serializable;
/** This class implements a card-based layout scheme. Each included
* component is treated as a card. Only one card can be shown at a
Index: kaffe/libraries/javalib/java/awt/CheckboxMenuItem.java
diff -u kaffe/libraries/javalib/java/awt/CheckboxMenuItem.java:1.11 kaffe/libraries/javalib/java/awt/CheckboxMenuItem.java:1.12
--- kaffe/libraries/javalib/java/awt/CheckboxMenuItem.java:1.11 Mon Sep 27 17:41:06 2004
+++ kaffe/libraries/javalib/java/awt/CheckboxMenuItem.java Mon Oct 4 09:01:29 2004
@@ -1,5 +1,5 @@
/* CheckboxMenuItem.java -- A menu option with a checkbox on it.
- Copyright (C) 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
+ Copyright (C) 1999, 2000, 2001, 2002, 2004 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -41,7 +41,6 @@
import java.awt.event.ItemEvent;
import java.awt.event.ItemListener;
import java.awt.peer.CheckboxMenuItemPeer;
-import java.awt.peer.MenuItemPeer;
import java.util.EventListener;
/**
Index: kaffe/libraries/javalib/java/awt/Component.java
diff -u kaffe/libraries/javalib/java/awt/Component.java:1.39 kaffe/libraries/javalib/java/awt/Component.java:1.40
--- kaffe/libraries/javalib/java/awt/Component.java:1.39 Mon Sep 27 17:41:06 2004
+++ kaffe/libraries/javalib/java/awt/Component.java Mon Oct 4 09:01:29 2004
@@ -1,5 +1,5 @@
/* Component.java -- a graphics component
- Copyright (C) 1999, 2000, 2001, 2002, 2003 Free Software Foundation
+ Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation
This file is part of GNU Classpath.
@@ -47,16 +47,16 @@
import java.awt.event.HierarchyBoundsListener;
import java.awt.event.HierarchyEvent;
import java.awt.event.HierarchyListener;
-import java.awt.event.KeyEvent;
-import java.awt.event.KeyListener;
import java.awt.event.InputEvent;
import java.awt.event.InputMethodEvent;
import java.awt.event.InputMethodListener;
+import java.awt.event.KeyEvent;
+import java.awt.event.KeyListener;
import java.awt.event.MouseEvent;
import java.awt.event.MouseListener;
import java.awt.event.MouseMotionListener;
-import java.awt.event.MouseWheelListener;
import java.awt.event.MouseWheelEvent;
+import java.awt.event.MouseWheelListener;
import java.awt.event.PaintEvent;
import java.awt.event.WindowEvent;
import java.awt.im.InputContext;
@@ -70,8 +70,8 @@
import java.awt.peer.LightweightPeer;
import java.beans.PropertyChangeListener;
import java.beans.PropertyChangeSupport;
-import java.io.ObjectInputStream;
import java.io.IOException;
+import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
import java.io.PrintStream;
import java.io.PrintWriter;
@@ -84,6 +84,7 @@
import java.util.Locale;
import java.util.Set;
import java.util.Vector;
+
import javax.accessibility.Accessible;
import javax.accessibility.AccessibleComponent;
import javax.accessibility.AccessibleContext;
Index: kaffe/libraries/javalib/java/awt/Container.java
diff -u kaffe/libraries/javalib/java/awt/Container.java:1.23 kaffe/libraries/javalib/java/awt/Container.java:1.24
--- kaffe/libraries/javalib/java/awt/Container.java:1.23 Mon Sep 27 17:41:07 2004
+++ kaffe/libraries/javalib/java/awt/Container.java Mon Oct 4 09:01:29 2004
@@ -35,28 +35,29 @@
obligated to do so. If you do not wish to do so, delete this
exception statement from your version. */
+
package java.awt;
-import java.awt.event.AWTEventListener;
import java.awt.event.ContainerEvent;
import java.awt.event.ContainerListener;
-import java.awt.event.MouseEvent;
import java.awt.event.KeyEvent;
+import java.awt.event.MouseEvent;
import java.awt.peer.ContainerPeer;
import java.awt.peer.LightweightPeer;
import java.beans.PropertyChangeListener;
import java.beans.PropertyChangeSupport;
-import java.io.ObjectInputStream;
import java.io.IOException;
+import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
import java.io.PrintStream;
import java.io.PrintWriter;
import java.io.Serializable;
import java.util.Collections;
import java.util.EventListener;
-import java.util.Iterator;
import java.util.HashSet;
+import java.util.Iterator;
import java.util.Set;
+
import javax.accessibility.Accessible;
import javax.swing.SwingUtilities;
Index: kaffe/libraries/javalib/java/awt/DefaultKeyboardFocusManager.java
diff -u kaffe/libraries/javalib/java/awt/DefaultKeyboardFocusManager.java:1.5 kaffe/libraries/javalib/java/awt/DefaultKeyboardFocusManager.java:1.6
--- kaffe/libraries/javalib/java/awt/DefaultKeyboardFocusManager.java:1.5 Mon Sep 27 17:41:07 2004
+++ kaffe/libraries/javalib/java/awt/DefaultKeyboardFocusManager.java Mon Oct 4 09:01:29 2004
@@ -1,5 +1,5 @@
/* DefaultKeyboardFocusManager.java --
- Copyright (C) 2002 Free Software Foundation, Inc.
+ Copyright (C) 2002, 2004 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -38,8 +38,15 @@
package java.awt;
-import java.util.*;
-import java.awt.event.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.FocusEvent;
+import java.awt.event.KeyEvent;
+import java.awt.event.WindowEvent;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.Set;
+import java.util.SortedSet;
+import java.util.TreeSet;
// FIXME: finish documentation
public class DefaultKeyboardFocusManager extends KeyboardFocusManager
Index: kaffe/libraries/javalib/java/awt/EventDispatchThread.java
diff -u kaffe/libraries/javalib/java/awt/EventDispatchThread.java:1.10 kaffe/libraries/javalib/java/awt/EventDispatchThread.java:1.11
--- kaffe/libraries/javalib/java/awt/EventDispatchThread.java:1.10 Thu Jul 22 19:20:22 2004
+++ kaffe/libraries/javalib/java/awt/EventDispatchThread.java Mon Oct 4 09:01:29 2004
@@ -1,4 +1,5 @@
-/* Copyright (C) 2000, 2002 Free Software Foundation
+/* EventDispatchThread.java -
+ Copyright (C) 2000, 2002, 2004 Free Software Foundation
This file is part of GNU Classpath.
@@ -34,12 +35,12 @@
obligated to do so. If you do not wish to do so, delete this
exception statement from your version. */
-/** @author Bryce McKinlay */
-
-/* Status: believed complete, but untested. */
-
package java.awt;
+/**
+ * @author Bryce McKinlay
+ * @status believed complete, but untested.
+ */
class EventDispatchThread extends Thread
{
private static int dispatchThreadNum = 1;
Index: kaffe/libraries/javalib/java/awt/FileDialog.java
diff -u kaffe/libraries/javalib/java/awt/FileDialog.java:1.6 kaffe/libraries/javalib/java/awt/FileDialog.java:1.7
--- kaffe/libraries/javalib/java/awt/FileDialog.java:1.6 Thu Jul 22 19:20:22 2004
+++ kaffe/libraries/javalib/java/awt/FileDialog.java Mon Oct 4 09:01:29 2004
@@ -1,5 +1,5 @@
/* FileDialog.java -- A filename selection dialog box
- Copyright (C) 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
+ Copyright (C) 1999, 2000, 2001, 2002, 2004 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -39,7 +39,6 @@
package java.awt;
import java.awt.peer.FileDialogPeer;
-import java.awt.peer.DialogPeer;
import java.io.FilenameFilter;
import java.io.Serializable;
Index: kaffe/libraries/javalib/java/awt/FlowLayout.java
diff -u kaffe/libraries/javalib/java/awt/FlowLayout.java:1.9 kaffe/libraries/javalib/java/awt/FlowLayout.java:1.10
--- kaffe/libraries/javalib/java/awt/FlowLayout.java:1.9 Thu Jul 22 19:20:22 2004
+++ kaffe/libraries/javalib/java/awt/FlowLayout.java Mon Oct 4 09:01:29 2004
@@ -1,6 +1,5 @@
-// FlowLayout.java - Grid-based layout engine
-
-/* Copyright (C) 1999, 2000, 2001, 2002 Free Software Foundation
+/* FlowLayout.java -- Grid-based layout engine
+ Copyright (C) 1999, 2000, 2001, 2002, 2004 Free Software Foundation
This file is part of GNU Classpath.
@@ -47,7 +46,7 @@
* supports horizontal and vertical gaps. These are used for spacing
* between components.
*
- * @author Tom Tromey <tromey at redhat.com>
+ * @author Tom Tromey (tromey at redhat.com)
* @author Aaron M. Renn (arenn at urbanophile.com)
*/
public class FlowLayout implements LayoutManager, Serializable
Index: kaffe/libraries/javalib/java/awt/Font.java
diff -u kaffe/libraries/javalib/java/awt/Font.java:1.18 kaffe/libraries/javalib/java/awt/Font.java:1.19
--- kaffe/libraries/javalib/java/awt/Font.java:1.18 Sun Aug 8 19:45:58 2004
+++ kaffe/libraries/javalib/java/awt/Font.java Mon Oct 4 09:01:29 2004
@@ -38,35 +38,34 @@
package java.awt;
+import gnu.java.awt.ClasspathToolkit;
+import gnu.java.awt.peer.ClasspathFontPeer;
+
import java.awt.font.FontRenderContext;
import java.awt.font.GlyphVector;
import java.awt.font.LineMetrics;
import java.awt.font.TextAttribute;
-import java.awt.font.TransformAttribute;
import java.awt.geom.AffineTransform;
import java.awt.geom.Rectangle2D;
import java.awt.peer.FontPeer;
-import java.io.InputStream;
import java.io.IOException;
+import java.io.InputStream;
import java.io.Serializable;
+import java.text.AttributedCharacterIterator;
+import java.text.CharacterIterator;
+import java.text.StringCharacterIterator;
+import java.util.HashMap;
import java.util.Locale;
import java.util.Map;
-import java.util.HashMap;
import java.util.StringTokenizer;
-import java.text.CharacterIterator;
-import java.text.AttributedCharacterIterator;
-import java.text.StringCharacterIterator;
-
-import gnu.java.awt.ClasspathToolkit;
-import gnu.java.awt.peer.ClasspathFontPeer;
/**
- * This class represents a windowing system font.
- *
- * @author Aaron M. Renn (arenn at urbanophile.com)
- * @author Warren Levy <warrenl at cygnus.com>
- * @author Graydon Hoare <graydon at redhat.com>
- */
+ * This class represents a windowing system font.
+ *
+ * @author Aaron M. Renn (arenn at urbanophile.com)
+ * @author Warren Levy (warrenl at cygnus.com)
+ * @author Graydon Hoare (graydon at redhat.com)
+ */
public class Font implements Serializable
{
Index: kaffe/libraries/javalib/java/awt/Frame.java
diff -u kaffe/libraries/javalib/java/awt/Frame.java:1.19 kaffe/libraries/javalib/java/awt/Frame.java:1.20
--- kaffe/libraries/javalib/java/awt/Frame.java:1.19 Mon Sep 27 17:41:07 2004
+++ kaffe/libraries/javalib/java/awt/Frame.java Mon Oct 4 09:01:29 2004
@@ -39,7 +39,6 @@
package java.awt;
import java.awt.peer.FramePeer;
-import java.util.Enumeration;
import java.util.Vector;
/**
Index: kaffe/libraries/javalib/java/awt/Graphics2D.java
diff -u kaffe/libraries/javalib/java/awt/Graphics2D.java:1.4 kaffe/libraries/javalib/java/awt/Graphics2D.java:1.5
--- kaffe/libraries/javalib/java/awt/Graphics2D.java:1.4 Thu Jul 22 19:37:01 2004
+++ kaffe/libraries/javalib/java/awt/Graphics2D.java Mon Oct 4 09:01:29 2004
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000, 2002 Free Software Foundation
+/* Copyright (C) 2000, 2002, 2004 Free Software Foundation
This file is part of GNU Classpath.
@@ -34,6 +34,7 @@
obligated to do so. If you do not wish to do so, delete this
exception statement from your version. */
+
package java.awt;
import java.awt.font.FontRenderContext;
@@ -41,12 +42,10 @@
import java.awt.geom.AffineTransform;
import java.awt.image.BufferedImage;
import java.awt.image.BufferedImageOp;
-import java.awt.image.RenderedImage;
import java.awt.image.ImageObserver;
+import java.awt.image.RenderedImage;
import java.awt.image.renderable.RenderableImage;
-
import java.text.AttributedCharacterIterator;
-
import java.util.Map;
/**
Index: kaffe/libraries/javalib/java/awt/GraphicsEnvironment.java
diff -u kaffe/libraries/javalib/java/awt/GraphicsEnvironment.java:1.2 kaffe/libraries/javalib/java/awt/GraphicsEnvironment.java:1.3
--- kaffe/libraries/javalib/java/awt/GraphicsEnvironment.java:1.2 Thu Jul 22 19:37:01 2004
+++ kaffe/libraries/javalib/java/awt/GraphicsEnvironment.java Mon Oct 4 09:01:29 2004
@@ -1,5 +1,5 @@
/* GraphicsEnvironment.java -- information about the graphics environment
- Copyright (C) 2002 Free Software Foundation, Inc.
+ Copyright (C) 2002, 2004 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -38,16 +38,17 @@
package java.awt;
+import gnu.java.awt.ClasspathToolkit;
+
import java.awt.image.BufferedImage;
import java.util.Locale;
-import gnu.java.awt.ClasspathToolkit;
/**
* This descibes the collection of GraphicsDevice and Font objects available
* on a given platform. The resources might be local or remote, and specify
* the valid configurations for displaying graphics.
*
- * @author Eric Blake <ebb9 at email.byu.edu>
+ * @author Eric Blake (ebb9 at email.byu.edu)
* @see GraphicsDevice
* @see GraphicsConfiguration
* @since 1.4
Index: kaffe/libraries/javalib/java/awt/GridBagConstraints.java
diff -u kaffe/libraries/javalib/java/awt/GridBagConstraints.java:1.7 kaffe/libraries/javalib/java/awt/GridBagConstraints.java:1.8
--- kaffe/libraries/javalib/java/awt/GridBagConstraints.java:1.7 Thu Jul 22 19:37:01 2004
+++ kaffe/libraries/javalib/java/awt/GridBagConstraints.java Mon Oct 4 09:01:30 2004
@@ -1,6 +1,5 @@
-// GridBagConstraints.java - Constraints for GridBag layout manager
-
-/* Copyright (C) 2000, 2001, 2002 Free Software Foundation
+/* GridBagConstraints.java -- Constraints for GridBag layout manager
+ Copyright (C) 2000, 2001, 2002, 2004 Free Software Foundation
This file is part of GNU Classpath.
@@ -41,8 +40,10 @@
import java.io.Serializable;
-/** This specifies the constraints for a component managed by the
- * GridBagLayout layout manager. */
+/**
+ * This specifies the constraints for a component managed by the
+ * GridBagLayout layout manager.
+ */
public class GridBagConstraints implements Cloneable, Serializable
{
static final long serialVersionUID = -1000070633030801713L;
Index: kaffe/libraries/javalib/java/awt/GridBagLayout.java
diff -u kaffe/libraries/javalib/java/awt/GridBagLayout.java:1.21 kaffe/libraries/javalib/java/awt/GridBagLayout.java:1.22
--- kaffe/libraries/javalib/java/awt/GridBagLayout.java:1.21 Sun Jul 25 06:37:41 2004
+++ kaffe/libraries/javalib/java/awt/GridBagLayout.java Mon Oct 4 09:01:30 2004
@@ -1,5 +1,5 @@
/* GridBagLayout - Layout manager for components according to GridBagConstraints
- Copyright (C) 2002, 2003 Free Software Foundation, Inc.
+ Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -40,8 +40,8 @@
import java.io.Serializable;
import java.util.ArrayList;
-import java.util.Hashtable;
import java.util.HashMap;
+import java.util.Hashtable;
/**
* @author Michael Koch <konqueror at gmx.de>
Index: kaffe/libraries/javalib/java/awt/GridLayout.java
diff -u kaffe/libraries/javalib/java/awt/GridLayout.java:1.8 kaffe/libraries/javalib/java/awt/GridLayout.java:1.9
--- kaffe/libraries/javalib/java/awt/GridLayout.java:1.8 Thu Jul 22 19:37:01 2004
+++ kaffe/libraries/javalib/java/awt/GridLayout.java Mon Oct 4 09:01:30 2004
@@ -1,6 +1,5 @@
-// GridLayout.java - Grid-based layout engine
-
-/* Copyright (C) 1999, 2000, 2002 Free Software Foundation
+/* GridLayout.java -- Grid-based layout engine
+ Copyright (C) 1999, 2000, 2002, 2004 Free Software Foundation
This file is part of GNU Classpath.
Index: kaffe/libraries/javalib/java/awt/Image.java
diff -u kaffe/libraries/javalib/java/awt/Image.java:1.19 kaffe/libraries/javalib/java/awt/Image.java:1.20
--- kaffe/libraries/javalib/java/awt/Image.java:1.19 Thu Jul 22 19:37:01 2004
+++ kaffe/libraries/javalib/java/awt/Image.java Mon Oct 4 09:01:30 2004
@@ -1,5 +1,5 @@
/* Image.java -- superclass for images
- Copyright (C) 1999, 2002 Free Software Foundation, Inc.
+ Copyright (C) 1999, 2002, 2004 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -38,7 +38,6 @@
package java.awt;
-import java.awt.image.AreaAveragingScaleFilter;
import java.awt.image.FilteredImageSource;
import java.awt.image.ImageObserver;
import java.awt.image.ImageProducer;
Index: kaffe/libraries/javalib/java/awt/KeyboardFocusManager.java
diff -u kaffe/libraries/javalib/java/awt/KeyboardFocusManager.java:1.5 kaffe/libraries/javalib/java/awt/KeyboardFocusManager.java:1.6
--- kaffe/libraries/javalib/java/awt/KeyboardFocusManager.java:1.5 Mon Sep 27 17:41:07 2004
+++ kaffe/libraries/javalib/java/awt/KeyboardFocusManager.java Mon Oct 4 09:01:30 2004
@@ -1,5 +1,5 @@
/* KeyboardFocusManager.java -- manage component focusing via the keyboard
- Copyright (C) 2002 Free Software Foundation
+ Copyright (C) 2002, 2004 Free Software Foundation
This file is part of GNU Classpath.
@@ -38,8 +38,8 @@
package java.awt;
-import java.awt.event.KeyEvent;
import java.awt.event.FocusEvent;
+import java.awt.event.KeyEvent;
import java.beans.PropertyChangeListener;
import java.beans.PropertyChangeSupport;
import java.beans.PropertyVetoException;
Index: kaffe/libraries/javalib/java/awt/Label.java
diff -u kaffe/libraries/javalib/java/awt/Label.java:1.4 kaffe/libraries/javalib/java/awt/Label.java:1.5
--- kaffe/libraries/javalib/java/awt/Label.java:1.4 Sun Sep 12 15:10:59 2004
+++ kaffe/libraries/javalib/java/awt/Label.java Mon Oct 4 09:01:30 2004
@@ -1,5 +1,5 @@
/* Label.java -- Java label widget
- Copyright (C) 1999, 2000, 2002 Free Software Foundation, Inc.
+ Copyright (C) 1999, 2000, 2002, 2004 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -39,6 +39,7 @@
package java.awt;
import java.awt.peer.LabelPeer;
+
import javax.accessibility.Accessible;
import javax.accessibility.AccessibleContext;
import javax.accessibility.AccessibleRole;
Index: kaffe/libraries/javalib/java/awt/List.java
diff -u kaffe/libraries/javalib/java/awt/List.java:1.2 kaffe/libraries/javalib/java/awt/List.java:1.3
--- kaffe/libraries/javalib/java/awt/List.java:1.2 Thu Jul 22 19:37:01 2004
+++ kaffe/libraries/javalib/java/awt/List.java Mon Oct 4 09:01:30 2004
@@ -1,5 +1,5 @@
/* List.java -- A listbox widget
- Copyright (C) 1999, 2002 Free Software Foundation, Inc.
+ Copyright (C) 1999, 2002, 2004 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -45,6 +45,7 @@
import java.awt.peer.ListPeer;
import java.util.EventListener;
import java.util.Vector;
+
import javax.accessibility.Accessible;
/**
Index: kaffe/libraries/javalib/java/awt/MediaTracker.java
diff -u kaffe/libraries/javalib/java/awt/MediaTracker.java:1.13 kaffe/libraries/javalib/java/awt/MediaTracker.java:1.14
--- kaffe/libraries/javalib/java/awt/MediaTracker.java:1.13 Thu Jul 22 19:37:01 2004
+++ kaffe/libraries/javalib/java/awt/MediaTracker.java Mon Oct 4 09:01:30 2004
@@ -1,5 +1,5 @@
/* MediaTracker.java -- Class used for keeping track of images
- Copyright (C) 1999, 2002 Free Software Foundation, Inc.
+ Copyright (C) 1999, 2002i, 2004 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -38,8 +38,8 @@
package java.awt;
-import java.util.ArrayList;
import java.awt.image.ImageObserver;
+import java.util.ArrayList;
/**
* This class is used for keeping track of the status of various media
Index: kaffe/libraries/javalib/java/awt/Menu.java
diff -u kaffe/libraries/javalib/java/awt/Menu.java:1.10 kaffe/libraries/javalib/java/awt/Menu.java:1.11
--- kaffe/libraries/javalib/java/awt/Menu.java:1.10 Mon Sep 27 17:41:07 2004
+++ kaffe/libraries/javalib/java/awt/Menu.java Mon Oct 4 09:01:30 2004
@@ -40,8 +40,8 @@
import java.awt.peer.MenuPeer;
import java.io.Serializable;
-import java.util.Vector;
import java.util.Enumeration;
+import java.util.Vector;
/**
* This class represents a pull down or tear off menu in Java's AWT.
Index: kaffe/libraries/javalib/java/awt/MenuComponent.java
diff -u kaffe/libraries/javalib/java/awt/MenuComponent.java:1.13 kaffe/libraries/javalib/java/awt/MenuComponent.java:1.14
--- kaffe/libraries/javalib/java/awt/MenuComponent.java:1.13 Mon Sep 27 17:41:07 2004
+++ kaffe/libraries/javalib/java/awt/MenuComponent.java Mon Oct 4 09:01:30 2004
@@ -1,5 +1,5 @@
/* MenuComponent.java -- Superclass of all AWT menu components
- Copyright (C) 1999, 2000, 2002, 2003 Free Software Foundation, Inc.
+ Copyright (C) 1999, 2000, 2002, 2003, 2004 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -43,6 +43,7 @@
import java.awt.peer.MenuComponentPeer;
import java.io.Serializable;
import java.util.Locale;
+
import javax.accessibility.Accessible;
import javax.accessibility.AccessibleComponent;
import javax.accessibility.AccessibleContext;
Index: kaffe/libraries/javalib/java/awt/Panel.java
diff -u kaffe/libraries/javalib/java/awt/Panel.java:1.11 kaffe/libraries/javalib/java/awt/Panel.java:1.12
--- kaffe/libraries/javalib/java/awt/Panel.java:1.11 Mon Sep 27 17:41:07 2004
+++ kaffe/libraries/javalib/java/awt/Panel.java Mon Oct 4 09:01:30 2004
@@ -1,5 +1,5 @@
/* Panel.java -- Simple container object
- Copyright (C) 1999, 2002 Free Software Foundation, Inc.
+ Copyright (C) 1999, 2002, 2004 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -46,8 +46,8 @@
* A panel is a simple container class. It's default layout is the
* <code>FlowLayout</code> manager.
*
- * @author Aaron M. Renn <arenn at urbanophile.com>
- * @author Eric Blake <ebb9 at email.byu.edu>
+ * @author Aaron M. Renn (arenn at urbanophile.com)
+ * @author Eric Blake (ebb9 at email.byu.edu)
* @see FlowLayout
* @since 1.0
* @status updated to 1.4
Index: kaffe/libraries/javalib/java/awt/PopupMenu.java
diff -u kaffe/libraries/javalib/java/awt/PopupMenu.java:1.8 kaffe/libraries/javalib/java/awt/PopupMenu.java:1.9
--- kaffe/libraries/javalib/java/awt/PopupMenu.java:1.8 Thu Jul 22 19:37:02 2004
+++ kaffe/libraries/javalib/java/awt/PopupMenu.java Mon Oct 4 09:01:32 2004
@@ -1,5 +1,5 @@
/* PopupMenu.java -- An AWT popup menu
- Copyright (C) 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
+ Copyright (C) 1999, 2000, 2001, 2002, 2004 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -38,7 +38,6 @@
package java.awt;
-import java.awt.peer.MenuPeer;
import java.awt.peer.PopupMenuPeer;
/**
Index: kaffe/libraries/javalib/java/awt/ScrollPane.java
diff -u kaffe/libraries/javalib/java/awt/ScrollPane.java:1.16 kaffe/libraries/javalib/java/awt/ScrollPane.java:1.17
--- kaffe/libraries/javalib/java/awt/ScrollPane.java:1.16 Sun Jul 25 06:37:41 2004
+++ kaffe/libraries/javalib/java/awt/ScrollPane.java Mon Oct 4 09:01:32 2004
@@ -1,5 +1,5 @@
/* ScrollPane.java -- Scrolling window
- Copyright (C) 1999, 2002 Free Software Foundation, Inc.
+ Copyright (C) 1999, 2002, 2004 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -41,6 +41,7 @@
import java.awt.event.MouseEvent;
import java.awt.peer.ComponentPeer;
import java.awt.peer.ScrollPanePeer;
+
import javax.accessibility.Accessible;
/**
Index: kaffe/libraries/javalib/java/awt/Scrollbar.java
diff -u kaffe/libraries/javalib/java/awt/Scrollbar.java:1.3 kaffe/libraries/javalib/java/awt/Scrollbar.java:1.4
--- kaffe/libraries/javalib/java/awt/Scrollbar.java:1.3 Thu Jul 22 19:37:02 2004
+++ kaffe/libraries/javalib/java/awt/Scrollbar.java Mon Oct 4 09:01:32 2004
@@ -1,5 +1,6 @@
/* Scrollbar.java -- AWT Scrollbar widget
- Copyright (C) 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+ Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004
+ Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -38,10 +39,11 @@
package java.awt;
-import java.awt.event.AdjustmentListener;
import java.awt.event.AdjustmentEvent;
+import java.awt.event.AdjustmentListener;
import java.awt.peer.ScrollbarPeer;
import java.util.EventListener;
+
import javax.accessibility.Accessible;
/**
Index: kaffe/libraries/javalib/java/awt/SystemColor.java
diff -u kaffe/libraries/javalib/java/awt/SystemColor.java:1.7 kaffe/libraries/javalib/java/awt/SystemColor.java:1.8
--- kaffe/libraries/javalib/java/awt/SystemColor.java:1.7 Sun Sep 12 15:10:59 2004
+++ kaffe/libraries/javalib/java/awt/SystemColor.java Mon Oct 4 09:01:33 2004
@@ -1,5 +1,5 @@
/* SystemColor.java -- access dynamic system color values
- Copyright (C) 1999, 2002 Free Software Foundation, Inc.
+ Copyright (C) 1999, 2002, 2004 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -38,9 +38,9 @@
package java.awt;
-import java.awt.image.ColorModel;
import java.awt.geom.AffineTransform;
import java.awt.geom.Rectangle2D;
+import java.awt.image.ColorModel;
import java.io.Serializable;
/**
Index: kaffe/libraries/javalib/java/awt/TextArea.java
diff -u kaffe/libraries/javalib/java/awt/TextArea.java:1.2 kaffe/libraries/javalib/java/awt/TextArea.java:1.3
--- kaffe/libraries/javalib/java/awt/TextArea.java:1.2 Thu Jul 22 19:37:02 2004
+++ kaffe/libraries/javalib/java/awt/TextArea.java Mon Oct 4 09:01:33 2004
@@ -1,45 +1,46 @@
/* TextArea.java -- A multi-line text entry component
Copyright (C) 1999, 2004 Free Software Foundation, Inc.
- This file is part of GNU Classpath.
+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. */
*** Patch too long, truncated ***
More information about the kaffe
mailing list