Index: java/awt/AWTKeyStroke.java =================================================================== RCS file: /cvsroot/classpath/classpath/java/awt/AWTKeyStroke.java,v retrieving revision 1.5 diff -u -r1.5 AWTKeyStroke.java --- java/awt/AWTKeyStroke.java 31 Jul 2004 16:39:15 -0000 1.5 +++ java/awt/AWTKeyStroke.java 27 Sep 2004 14:58:49 -0000 @@ -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: java/awt/Canvas.java =================================================================== RCS file: /cvsroot/classpath/classpath/java/awt/Canvas.java,v retrieving revision 1.8 diff -u -r1.8 Canvas.java --- java/awt/Canvas.java 6 Sep 2004 17:00:08 -0000 1.8 +++ java/awt/Canvas.java 27 Sep 2004 14:58:49 -0000 @@ -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: java/awt/CardLayout.java =================================================================== RCS file: /cvsroot/classpath/classpath/java/awt/CardLayout.java,v retrieving revision 1.10 diff -u -r1.10 CardLayout.java --- java/awt/CardLayout.java 19 Mar 2004 21:22:24 -0000 1.10 +++ java/awt/CardLayout.java 27 Sep 2004 14:58:49 -0000 @@ -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: java/awt/CheckboxMenuItem.java =================================================================== RCS file: /cvsroot/classpath/classpath/java/awt/CheckboxMenuItem.java,v retrieving revision 1.13 diff -u -r1.13 CheckboxMenuItem.java --- java/awt/CheckboxMenuItem.java 22 Sep 2004 11:38:58 -0000 1.13 +++ java/awt/CheckboxMenuItem.java 27 Sep 2004 14:58:49 -0000 @@ -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: java/awt/Component.java =================================================================== RCS file: /cvsroot/classpath/classpath/java/awt/Component.java,v retrieving revision 1.44 diff -u -r1.44 Component.java --- java/awt/Component.java 23 Sep 2004 23:18:44 -0000 1.44 +++ java/awt/Component.java 27 Sep 2004 14:58:51 -0000 @@ -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: java/awt/Container.java =================================================================== RCS file: /cvsroot/classpath/classpath/java/awt/Container.java,v retrieving revision 1.42 diff -u -r1.42 Container.java --- java/awt/Container.java 23 Sep 2004 23:18:44 -0000 1.42 +++ java/awt/Container.java 27 Sep 2004 14:58:51 -0000 @@ -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: java/awt/DefaultKeyboardFocusManager.java =================================================================== RCS file: /cvsroot/classpath/classpath/java/awt/DefaultKeyboardFocusManager.java,v retrieving revision 1.9 diff -u -r1.9 DefaultKeyboardFocusManager.java --- java/awt/DefaultKeyboardFocusManager.java 23 Sep 2004 23:18:44 -0000 1.9 +++ java/awt/DefaultKeyboardFocusManager.java 27 Sep 2004 14:58:51 -0000 @@ -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: java/awt/EventDispatchThread.java =================================================================== RCS file: /cvsroot/classpath/classpath/java/awt/EventDispatchThread.java,v retrieving revision 1.4 diff -u -r1.4 EventDispatchThread.java --- java/awt/EventDispatchThread.java 31 May 2004 21:11:46 -0000 1.4 +++ java/awt/EventDispatchThread.java 27 Sep 2004 14:58:51 -0000 @@ -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: java/awt/FileDialog.java =================================================================== RCS file: /cvsroot/classpath/classpath/java/awt/FileDialog.java,v retrieving revision 1.10 diff -u -r1.10 FileDialog.java --- java/awt/FileDialog.java 25 Apr 2004 15:18:15 -0000 1.10 +++ java/awt/FileDialog.java 27 Sep 2004 14:58:54 -0000 @@ -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: java/awt/FlowLayout.java =================================================================== RCS file: /cvsroot/classpath/classpath/java/awt/FlowLayout.java,v retrieving revision 1.11 diff -u -r1.11 FlowLayout.java --- java/awt/FlowLayout.java 26 Dec 2003 17:16:40 -0000 1.11 +++ java/awt/FlowLayout.java 27 Sep 2004 14:58:54 -0000 @@ -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 + * @author Tom Tromey (tromey@redhat.com) * @author Aaron M. Renn (arenn@urbanophile.com) */ public class FlowLayout implements LayoutManager, Serializable Index: java/awt/Font.java =================================================================== RCS file: /cvsroot/classpath/classpath/java/awt/Font.java,v retrieving revision 1.18 diff -u -r1.18 Font.java --- java/awt/Font.java 30 Jul 2004 16:01:47 -0000 1.18 +++ java/awt/Font.java 27 Sep 2004 14:58:54 -0000 @@ -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@urbanophile.com) - * @author Warren Levy - * @author Graydon Hoare - */ + * This class represents a windowing system font. + * + * @author Aaron M. Renn (arenn@urbanophile.com) + * @author Warren Levy (warrenl@cygnus.com) + * @author Graydon Hoare (graydon@redhat.com) + */ public class Font implements Serializable { Index: java/awt/Frame.java =================================================================== RCS file: /cvsroot/classpath/classpath/java/awt/Frame.java,v retrieving revision 1.23 diff -u -r1.23 Frame.java --- java/awt/Frame.java 22 Sep 2004 11:03:10 -0000 1.23 +++ java/awt/Frame.java 27 Sep 2004 14:58:54 -0000 @@ -39,7 +39,6 @@ package java.awt; import java.awt.peer.FramePeer; -import java.util.Enumeration; import java.util.Vector; /** Index: java/awt/Graphics2D.java =================================================================== RCS file: /cvsroot/classpath/classpath/java/awt/Graphics2D.java,v retrieving revision 1.5 diff -u -r1.5 Graphics2D.java --- java/awt/Graphics2D.java 21 Feb 2003 11:59:26 -0000 1.5 +++ java/awt/Graphics2D.java 27 Sep 2004 14:58:54 -0000 @@ -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: java/awt/GraphicsEnvironment.java =================================================================== RCS file: /cvsroot/classpath/classpath/java/awt/GraphicsEnvironment.java,v retrieving revision 1.2 diff -u -r1.2 GraphicsEnvironment.java --- java/awt/GraphicsEnvironment.java 19 Mar 2004 21:22:24 -0000 1.2 +++ java/awt/GraphicsEnvironment.java 27 Sep 2004 14:58:54 -0000 @@ -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 + * @author Eric Blake (ebb9@email.byu.edu) * @see GraphicsDevice * @see GraphicsConfiguration * @since 1.4 Index: java/awt/GridBagConstraints.java =================================================================== RCS file: /cvsroot/classpath/classpath/java/awt/GridBagConstraints.java,v retrieving revision 1.5 diff -u -r1.5 GridBagConstraints.java --- java/awt/GridBagConstraints.java 13 Feb 2003 07:07:08 -0000 1.5 +++ java/awt/GridBagConstraints.java 27 Sep 2004 14:58:54 -0000 @@ -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: java/awt/GridBagLayout.java =================================================================== RCS file: /cvsroot/classpath/classpath/java/awt/GridBagLayout.java,v retrieving revision 1.15 diff -u -r1.15 GridBagLayout.java --- java/awt/GridBagLayout.java 22 Jul 2004 19:45:38 -0000 1.15 +++ java/awt/GridBagLayout.java 27 Sep 2004 14:58:54 -0000 @@ -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 Index: java/awt/GridLayout.java =================================================================== RCS file: /cvsroot/classpath/classpath/java/awt/GridLayout.java,v retrieving revision 1.11 diff -u -r1.11 GridLayout.java --- java/awt/GridLayout.java 10 Nov 2002 23:11:12 -0000 1.11 +++ java/awt/GridLayout.java 27 Sep 2004 14:58:54 -0000 @@ -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: java/awt/Image.java =================================================================== RCS file: /cvsroot/classpath/classpath/java/awt/Image.java,v retrieving revision 1.7 diff -u -r1.7 Image.java --- java/awt/Image.java 31 May 2004 21:11:46 -0000 1.7 +++ java/awt/Image.java 27 Sep 2004 14:58:54 -0000 @@ -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: java/awt/KeyboardFocusManager.java =================================================================== RCS file: /cvsroot/classpath/classpath/java/awt/KeyboardFocusManager.java,v retrieving revision 1.8 diff -u -r1.8 KeyboardFocusManager.java --- java/awt/KeyboardFocusManager.java 23 Sep 2004 23:18:44 -0000 1.8 +++ java/awt/KeyboardFocusManager.java 27 Sep 2004 14:58:54 -0000 @@ -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: java/awt/Label.java =================================================================== RCS file: /cvsroot/classpath/classpath/java/awt/Label.java,v retrieving revision 1.14 diff -u -r1.14 Label.java --- java/awt/Label.java 6 Sep 2004 17:00:08 -0000 1.14 +++ java/awt/Label.java 27 Sep 2004 14:58:54 -0000 @@ -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: java/awt/List.java =================================================================== RCS file: /cvsroot/classpath/classpath/java/awt/List.java,v retrieving revision 1.18 diff -u -r1.18 List.java --- java/awt/List.java 3 Feb 2004 17:17:29 -0000 1.18 +++ java/awt/List.java 27 Sep 2004 14:58:54 -0000 @@ -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: java/awt/MediaTracker.java =================================================================== RCS file: /cvsroot/classpath/classpath/java/awt/MediaTracker.java,v retrieving revision 1.8 diff -u -r1.8 MediaTracker.java --- java/awt/MediaTracker.java 26 Jun 2004 16:06:48 -0000 1.8 +++ java/awt/MediaTracker.java 27 Sep 2004 14:58:54 -0000 @@ -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: java/awt/Menu.java =================================================================== RCS file: /cvsroot/classpath/classpath/java/awt/Menu.java,v retrieving revision 1.16 diff -u -r1.16 Menu.java --- java/awt/Menu.java 22 Sep 2004 12:13:42 -0000 1.16 +++ java/awt/Menu.java 27 Sep 2004 14:58:54 -0000 @@ -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: java/awt/MenuBar.java =================================================================== RCS file: /cvsroot/classpath/classpath/java/awt/MenuBar.java,v retrieving revision 1.13 diff -u -r1.13 MenuBar.java --- java/awt/MenuBar.java 23 Sep 2004 22:57:12 -0000 1.13 +++ java/awt/MenuBar.java 27 Sep 2004 14:58:54 -0000 @@ -141,10 +141,11 @@ helpMenu.removeNotify (); helpMenu.parent = null; } - helpMenu = menu; if (menu.parent != null) menu.parent.remove (menu); + if (menu.parent != null) + menu.parent.remove (menu); menu.parent = this; MenuBarPeer peer = (MenuBarPeer) getPeer (); @@ -176,7 +177,8 @@ if (peer != null) { - menu.addNotify(); + MenuBarPeer mp = (MenuBarPeer) peer; + mp.addMenu (menu); } return(menu); @@ -280,11 +282,6 @@ Menu mi = (Menu)e.nextElement(); mi.addNotify(); } - if (helpMenu != null) - { - helpMenu.addNotify(); - ((MenuBarPeer) peer).addHelpMenu(helpMenu); - } } /*************************************************************************/ Index: java/awt/MenuComponent.java =================================================================== RCS file: /cvsroot/classpath/classpath/java/awt/MenuComponent.java,v retrieving revision 1.17 diff -u -r1.17 MenuComponent.java --- java/awt/MenuComponent.java 22 Sep 2004 11:38:58 -0000 1.17 +++ java/awt/MenuComponent.java 27 Sep 2004 14:58:54 -0000 @@ -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: java/awt/Panel.java =================================================================== RCS file: /cvsroot/classpath/classpath/java/awt/Panel.java,v retrieving revision 1.10 diff -u -r1.10 Panel.java --- java/awt/Panel.java 22 Sep 2004 11:03:10 -0000 1.10 +++ java/awt/Panel.java 27 Sep 2004 14:58:54 -0000 @@ -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 * FlowLayout manager. * - * @author Aaron M. Renn - * @author Eric Blake + * @author Aaron M. Renn (arenn@urbanophile.com) + * @author Eric Blake (ebb9@email.byu.edu) * @see FlowLayout * @since 1.0 * @status updated to 1.4 Index: java/awt/PopupMenu.java =================================================================== RCS file: /cvsroot/classpath/classpath/java/awt/PopupMenu.java,v retrieving revision 1.12 diff -u -r1.12 PopupMenu.java --- java/awt/PopupMenu.java 17 Apr 2004 23:24:46 -0000 1.12 +++ java/awt/PopupMenu.java 27 Sep 2004 14:58:54 -0000 @@ -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: java/awt/ScrollPane.java =================================================================== RCS file: /cvsroot/classpath/classpath/java/awt/ScrollPane.java,v retrieving revision 1.20 diff -u -r1.20 ScrollPane.java --- java/awt/ScrollPane.java 22 Jul 2004 19:45:38 -0000 1.20 +++ java/awt/ScrollPane.java 27 Sep 2004 14:58:54 -0000 @@ -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: java/awt/Scrollbar.java =================================================================== RCS file: /cvsroot/classpath/classpath/java/awt/Scrollbar.java,v retrieving revision 1.18 diff -u -r1.18 Scrollbar.java --- java/awt/Scrollbar.java 6 Feb 2004 09:05:11 -0000 1.18 +++ java/awt/Scrollbar.java 27 Sep 2004 14:58:54 -0000 @@ -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: java/awt/SystemColor.java =================================================================== RCS file: /cvsroot/classpath/classpath/java/awt/SystemColor.java,v retrieving revision 1.7 diff -u -r1.7 SystemColor.java --- java/awt/SystemColor.java 9 Sep 2004 17:59:09 -0000 1.7 +++ java/awt/SystemColor.java 27 Sep 2004 14:58:54 -0000 @@ -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: java/awt/TextArea.java =================================================================== RCS file: /cvsroot/classpath/classpath/java/awt/TextArea.java,v retrieving revision 1.14 diff -u -r1.14 TextArea.java --- java/awt/TextArea.java 26 Jun 2004 16:06:48 -0000 1.14 +++ java/awt/TextArea.java 27 Sep 2004 14:58:55 -0000 @@ -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. */ - 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; +import java.awt.event.KeyEvent; import java.awt.peer.ComponentPeer; import java.awt.peer.TextAreaPeer; -import java.awt.event.KeyEvent; import java.util.HashSet; import java.util.Set; Index: java/awt/TextField.java =================================================================== RCS file: /cvsroot/classpath/classpath/java/awt/TextField.java,v retrieving revision 1.12 diff -u -r1.12 TextField.java --- java/awt/TextField.java 3 Feb 2004 17:17:30 -0000 1.12 +++ java/awt/TextField.java 27 Sep 2004 14:58:55 -0000 @@ -1,5 +1,5 @@ /* TextField.java -- A one line text entry field - Copyright (C) 1999, 2002 Free Software Foundation, Inc. + Copyright (C) 1999, 2002, 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -40,8 +40,8 @@ import java.awt.event.ActionEvent; import java.awt.event.ActionListener; -import java.awt.peer.TextFieldPeer; import java.awt.peer.ComponentPeer; +import java.awt.peer.TextFieldPeer; import java.util.EventListener; /** Index: java/awt/Toolkit.java =================================================================== RCS file: /cvsroot/classpath/classpath/java/awt/Toolkit.java,v retrieving revision 1.25 diff -u -r1.25 Toolkit.java --- java/awt/Toolkit.java 16 May 2004 09:51:05 -0000 1.25 +++ java/awt/Toolkit.java 27 Sep 2004 14:58:55 -0000 @@ -53,8 +53,8 @@ import java.awt.image.ImageProducer; import java.awt.peer.ButtonPeer; import java.awt.peer.CanvasPeer; -import java.awt.peer.CheckboxPeer; import java.awt.peer.CheckboxMenuItemPeer; +import java.awt.peer.CheckboxPeer; import java.awt.peer.ChoicePeer; import java.awt.peer.DialogPeer; import java.awt.peer.FileDialogPeer; @@ -63,13 +63,13 @@ import java.awt.peer.LabelPeer; import java.awt.peer.LightweightPeer; import java.awt.peer.ListPeer; -import java.awt.peer.MenuPeer; import java.awt.peer.MenuBarPeer; import java.awt.peer.MenuItemPeer; +import java.awt.peer.MenuPeer; import java.awt.peer.PanelPeer; import java.awt.peer.PopupMenuPeer; -import java.awt.peer.ScrollbarPeer; import java.awt.peer.ScrollPanePeer; +import java.awt.peer.ScrollbarPeer; import java.awt.peer.TextAreaPeer; import java.awt.peer.TextFieldPeer; import java.awt.peer.WindowPeer; Index: java/awt/Window.java =================================================================== RCS file: /cvsroot/classpath/classpath/java/awt/Window.java,v retrieving revision 1.36 diff -u -r1.36 Window.java --- java/awt/Window.java 22 Sep 2004 11:03:10 -0000 1.36 +++ java/awt/Window.java 27 Sep 2004 14:58:55 -0000 @@ -1,5 +1,5 @@ /* Window.java -- - Copyright (C) 1999, 2000, 2002, 2003 Free Software Foundation + Copyright (C) 1999, 2000, 2002, 2003, 2004 Free Software Foundation This file is part of GNU Classpath. @@ -48,11 +48,12 @@ import java.awt.peer.WindowPeer; import java.lang.ref.Reference; import java.lang.ref.WeakReference; -import java.util.Iterator; import java.util.EventListener; +import java.util.Iterator; import java.util.Locale; import java.util.ResourceBundle; import java.util.Vector; + import javax.accessibility.Accessible; import javax.accessibility.AccessibleContext; Index: java/awt/color/ICC_Profile.java =================================================================== RCS file: /cvsroot/classpath/classpath/java/awt/color/ICC_Profile.java,v retrieving revision 1.5 diff -u -r1.5 ICC_Profile.java --- java/awt/color/ICC_Profile.java 23 Dec 2002 12:45:46 -0000 1.5 +++ java/awt/color/ICC_Profile.java 27 Sep 2004 14:58:55 -0000 @@ -40,8 +40,8 @@ import java.io.FileInputStream; import java.io.FileOutputStream; -import java.io.InputStream; import java.io.IOException; +import java.io.InputStream; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; import java.io.ObjectStreamException; Index: java/awt/datatransfer/DataFlavor.java =================================================================== RCS file: /cvsroot/classpath/classpath/java/awt/datatransfer/DataFlavor.java,v retrieving revision 1.20 diff -u -r1.20 DataFlavor.java --- java/awt/datatransfer/DataFlavor.java 17 Apr 2004 15:48:57 -0000 1.20 +++ java/awt/datatransfer/DataFlavor.java 27 Sep 2004 14:58:55 -0000 @@ -39,11 +39,11 @@ package java.awt.datatransfer; import java.io.ByteArrayInputStream; +import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; -import java.io.IOException; -import java.io.ObjectOutput; import java.io.ObjectInput; +import java.io.ObjectOutput; import java.io.Reader; import java.io.StringReader; import java.io.UnsupportedEncodingException; Index: java/awt/datatransfer/StringSelection.java =================================================================== RCS file: /cvsroot/classpath/classpath/java/awt/datatransfer/StringSelection.java,v retrieving revision 1.6 diff -u -r1.6 StringSelection.java --- java/awt/datatransfer/StringSelection.java 26 Dec 2003 17:49:37 -0000 1.6 +++ java/awt/datatransfer/StringSelection.java 27 Sep 2004 14:58:55 -0000 @@ -1,5 +1,5 @@ /* StringSelection.java -- Clipboard handler for text. - Copyright (C) 1999 Free Software Foundation, Inc. + Copyright (C) 1999, 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -38,8 +38,8 @@ package java.awt.datatransfer; -import java.io.StringReader; import java.io.IOException; +import java.io.StringReader; /** * This class transfers a string as plain text using the clipboard. Index: java/awt/datatransfer/SystemFlavorMap.java =================================================================== RCS file: /cvsroot/classpath/classpath/java/awt/datatransfer/SystemFlavorMap.java,v retrieving revision 1.4 diff -u -r1.4 SystemFlavorMap.java --- java/awt/datatransfer/SystemFlavorMap.java 23 Dec 2002 12:45:46 -0000 1.4 +++ java/awt/datatransfer/SystemFlavorMap.java 27 Sep 2004 14:58:55 -0000 @@ -1,5 +1,5 @@ /* SystemFlavorMap.java -- Maps between native flavor names and MIME types. - Copyright (C) 2001 Free Software Foundation, Inc. + Copyright (C) 2001, 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -39,8 +39,8 @@ package java.awt.datatransfer; import java.util.HashMap; -import java.util.Map; import java.util.List; +import java.util.Map; /** * This class maps between native platform type names and DataFlavors. Index: java/awt/dnd/Autoscroll.java =================================================================== RCS file: /cvsroot/classpath/classpath/java/awt/dnd/Autoscroll.java,v retrieving revision 1.2 diff -u -r1.2 Autoscroll.java --- java/awt/dnd/Autoscroll.java 12 Oct 2003 13:53:38 -0000 1.2 +++ java/awt/dnd/Autoscroll.java 27 Sep 2004 14:58:55 -0000 @@ -1,5 +1,5 @@ /* Autoscroll.java -- - Copyright (C) 2002 Free Software Foundation, Inc. + Copyright (C) 2002, 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -35,10 +35,11 @@ obligated to do so. If you do not wish to do so, delete this exception statement from your version. */ + package java.awt.dnd; -import java.awt.Point; import java.awt.Insets; +import java.awt.Point; /** * During DnD operations it is possible that a user may wish to drop the Index: java/awt/dnd/DropTarget.java =================================================================== RCS file: /cvsroot/classpath/classpath/java/awt/dnd/DropTarget.java,v retrieving revision 1.7 diff -u -r1.7 DropTarget.java --- java/awt/dnd/DropTarget.java 23 Mar 2003 05:40:57 -0000 1.7 +++ java/awt/dnd/DropTarget.java 27 Sep 2004 14:58:55 -0000 @@ -1,5 +1,5 @@ /* DropTarget.java -- - Copyright (C) 2002, 2003 Free Software Foundation, Inc. + Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -35,12 +35,13 @@ obligated to do so. If you do not wish to do so, delete this exception statement from your version. */ + package java.awt.dnd; -import java.awt.Point; import java.awt.Component; import java.awt.GraphicsEnvironment; import java.awt.HeadlessException; +import java.awt.Point; import java.awt.datatransfer.FlavorMap; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; Index: java/awt/dnd/DropTargetContext.java =================================================================== RCS file: /cvsroot/classpath/classpath/java/awt/dnd/DropTargetContext.java,v retrieving revision 1.6 diff -u -r1.6 DropTargetContext.java --- java/awt/dnd/DropTargetContext.java 23 Mar 2003 05:40:57 -0000 1.6 +++ java/awt/dnd/DropTargetContext.java 27 Sep 2004 14:58:55 -0000 @@ -1,5 +1,5 @@ /* DropTargetContext.java -- - Copyright (C) 2002, 2003 Free Software Foundation + Copyright (C) 2002, 2003, 2004 Free Software Foundation This file is part of GNU Classpath. @@ -37,13 +37,12 @@ package java.awt.dnd; -import java.awt.dnd.peer.DropTargetContextPeer; -import java.io.Serializable; -import java.io.IOException; import java.awt.Component; import java.awt.datatransfer.DataFlavor; import java.awt.datatransfer.Transferable; import java.awt.datatransfer.UnsupportedFlavorException; +import java.io.IOException; +import java.io.Serializable; import java.util.Arrays; import java.util.List; Index: java/awt/dnd/DropTargetDragEvent.java =================================================================== RCS file: /cvsroot/classpath/classpath/java/awt/dnd/DropTargetDragEvent.java,v retrieving revision 1.2 diff -u -r1.2 DropTargetDragEvent.java --- java/awt/dnd/DropTargetDragEvent.java 17 Feb 2003 08:05:50 -0000 1.2 +++ java/awt/dnd/DropTargetDragEvent.java 27 Sep 2004 14:58:55 -0000 @@ -1,5 +1,5 @@ /* DropTargetDragEvent.java -- - Copyright (C) 2002 Free Software Foundation, Inc. + Copyright (C) 2002, 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -35,11 +35,12 @@ obligated to do so. If you do not wish to do so, delete this exception statement from your version. */ + package java.awt.dnd; -import java.util.List; import java.awt.Point; import java.awt.datatransfer.DataFlavor; +import java.util.List; /** * @since 1.2 Index: java/awt/dnd/peer/DropTargetContextPeer.java =================================================================== RCS file: /cvsroot/classpath/classpath/java/awt/dnd/peer/DropTargetContextPeer.java,v retrieving revision 1.3 diff -u -r1.3 DropTargetContextPeer.java --- java/awt/dnd/peer/DropTargetContextPeer.java 12 Oct 2003 13:53:38 -0000 1.3 +++ java/awt/dnd/peer/DropTargetContextPeer.java 27 Sep 2004 14:58:55 -0000 @@ -1,5 +1,5 @@ /* DropTargetContextPeer.java -- interface for drag-and-drop peers - Copyright (C) 2002 Free Software Foundation, Inc. + Copyright (C) 2002, 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -35,11 +35,12 @@ 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; import java.awt.datatransfer.DataFlavor; import java.awt.datatransfer.Transferable; +import java.awt.dnd.DropTarget; import java.awt.dnd.InvalidDnDOperationException; Index: java/awt/event/AdjustmentEvent.java =================================================================== RCS file: /cvsroot/classpath/classpath/java/awt/event/AdjustmentEvent.java,v retrieving revision 1.6 diff -u -r1.6 AdjustmentEvent.java --- java/awt/event/AdjustmentEvent.java 30 Mar 2002 12:02:29 -0000 1.6 +++ java/awt/event/AdjustmentEvent.java 27 Sep 2004 14:58:55 -0000 @@ -1,5 +1,5 @@ /* AdjustmentEvent.java -- an adjustable value was changed - 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,8 +38,8 @@ package java.awt.event; -import java.awt.Adjustable; import java.awt.AWTEvent; +import java.awt.Adjustable; /** * This class represents an event that is generated when an adjustable Index: java/awt/event/InputEvent.java =================================================================== RCS file: /cvsroot/classpath/classpath/java/awt/event/InputEvent.java,v retrieving revision 1.6 diff -u -r1.6 InputEvent.java --- java/awt/event/InputEvent.java 8 May 2002 07:53:54 -0000 1.6 +++ java/awt/event/InputEvent.java 27 Sep 2004 14:58:55 -0000 @@ -1,5 +1,5 @@ /* InputEvent.java -- common superclass of component input events - 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,10 @@ package java.awt.event; -import java.awt.Component; import gnu.java.awt.EventModifier; +import java.awt.Component; + /** * This is the common superclass for all component input classes. These are * passed to listeners before the component, so that listeners can consume Index: java/awt/event/InvocationEvent.java =================================================================== RCS file: /cvsroot/classpath/classpath/java/awt/event/InvocationEvent.java,v retrieving revision 1.6 diff -u -r1.6 InvocationEvent.java --- java/awt/event/InvocationEvent.java 1 Jul 2004 18:25:11 -0000 1.6 +++ java/awt/event/InvocationEvent.java 27 Sep 2004 14:58:56 -0000 @@ -1,5 +1,5 @@ /* InvocationEvent.java -- call a runnable when dispatched - 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,8 +38,8 @@ package java.awt.event; -import java.awt.ActiveEvent; import java.awt.AWTEvent; +import java.awt.ActiveEvent; import java.awt.EventQueue; /** Index: java/awt/event/KeyEvent.java =================================================================== RCS file: /cvsroot/classpath/classpath/java/awt/event/KeyEvent.java,v retrieving revision 1.10 diff -u -r1.10 KeyEvent.java --- java/awt/event/KeyEvent.java 18 Sep 2003 07:44:29 -0000 1.10 +++ java/awt/event/KeyEvent.java 27 Sep 2004 14:58:56 -0000 @@ -1,5 +1,5 @@ /* KeyEvent.java -- event for key presses - 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,10 +38,11 @@ package java.awt.event; +import gnu.java.awt.EventModifier; + import java.awt.Component; import java.io.IOException; import java.io.ObjectInputStream; -import gnu.java.awt.EventModifier; /** * This event is generated when a key is pressed or released. There are two Index: java/awt/event/MouseEvent.java =================================================================== RCS file: /cvsroot/classpath/classpath/java/awt/event/MouseEvent.java,v retrieving revision 1.7 diff -u -r1.7 MouseEvent.java --- java/awt/event/MouseEvent.java 22 Mar 2004 13:45:06 -0000 1.7 +++ java/awt/event/MouseEvent.java 27 Sep 2004 14:58:56 -0000 @@ -1,5 +1,5 @@ /* MouseEvent.java -- a mouse event - 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,11 +38,12 @@ package java.awt.event; +import gnu.java.awt.EventModifier; + import java.awt.Component; import java.awt.Point; import java.io.IOException; import java.io.ObjectInputStream; -import gnu.java.awt.EventModifier; /** * This event is generated for a mouse event. There are three main categories Index: java/awt/font/TextLayout.java =================================================================== RCS file: /cvsroot/classpath/classpath/java/awt/font/TextLayout.java,v retrieving revision 1.2 diff -u -r1.2 TextLayout.java --- java/awt/font/TextLayout.java 20 Nov 2003 23:52:41 -0000 1.2 +++ java/awt/font/TextLayout.java 27 Sep 2004 14:58:57 -0000 @@ -1,5 +1,5 @@ /* TextLayout.java - Copyright (C) 2003 Free Software Foundation, Inc. + Copyright (C) 2003, 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -43,12 +43,10 @@ import java.awt.Shape; import java.awt.geom.AffineTransform; import java.awt.geom.Rectangle2D; -import java.text.CharacterIterator; import java.text.AttributedCharacterIterator; import java.text.AttributedString; +import java.text.CharacterIterator; import java.util.Map; -import java.awt.font.TextAttribute; - /** * @author Michael Koch Index: java/awt/geom/GeneralPath.java =================================================================== RCS file: /cvsroot/classpath/classpath/java/awt/geom/GeneralPath.java,v retrieving revision 1.8 diff -u -r1.8 GeneralPath.java --- java/awt/geom/GeneralPath.java 7 Sep 2004 16:01:50 -0000 1.8 +++ java/awt/geom/GeneralPath.java 27 Sep 2004 14:58:57 -0000 @@ -1,39 +1,40 @@ /* GeneralPath.java -- represents a shape built from subpaths Copyright (C) 2002, 2003, 2004 Free Software Foundation - 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. */ - 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.geom; Index: java/awt/geom/Point2D.java =================================================================== RCS file: /cvsroot/classpath/classpath/java/awt/geom/Point2D.java,v retrieving revision 1.6 diff -u -r1.6 Point2D.java --- java/awt/geom/Point2D.java 8 Sep 2004 20:10:52 -0000 1.6 +++ java/awt/geom/Point2D.java 27 Sep 2004 14:58:57 -0000 @@ -1,5 +1,5 @@ /* Point2D.java -- generic point in 2-D space - Copyright (C) 1999, 2000, 2002 Free Software Foundation + Copyright (C) 1999, 2000, 2002, 2004 Free Software Foundation This file is part of GNU Classpath. @@ -35,6 +35,7 @@ obligated to do so. If you do not wish to do so, delete this exception statement from your version. */ + package java.awt.geom; /** @@ -42,8 +43,8 @@ * representation is left up to the subclass. Point includes two useful * nested classes, for float and double storage respectively. * - * @author Per Bothner - * @author Eric Blake + * @author Per Bothner (bothner@cygnus.com) + * @author Eric Blake (ebb9@email.byu.edu) * @since 1.2 * @status updated to 1.4 */ @@ -120,7 +121,7 @@ * @param y2 the y coordinate of point 2 * @return the distance from (x1,y1) to (x2,y2) */ - static public double distance(double x1, double y1, double x2, double y2) + public static double distance(double x1, double y1, double x2, double y2) { return Math.sqrt(distanceSq(x1, y1, x2, y2)); } Index: java/awt/im/InputContext.java =================================================================== RCS file: /cvsroot/classpath/classpath/java/awt/im/InputContext.java,v retrieving revision 1.6 diff -u -r1.6 InputContext.java --- java/awt/im/InputContext.java 31 Jul 2004 22:14:04 -0000 1.6 +++ java/awt/im/InputContext.java 27 Sep 2004 14:58:57 -0000 @@ -1,5 +1,5 @@ /* InputContext.java -- provides the context for text input - Copyright (C) 2002, 2003 Free Software Foundation, Inc. + Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -35,22 +35,24 @@ obligated to do so. If you do not wish to do so, delete this exception statement from your version. */ + package java.awt.im; +import gnu.java.util.EmptyEnumeration; + import java.awt.AWTEvent; import java.awt.AWTException; import java.awt.Component; import java.awt.im.spi.InputMethod; import java.awt.im.spi.InputMethodDescriptor; import java.io.BufferedReader; -import java.io.InputStreamReader; import java.io.IOException; +import java.io.InputStreamReader; import java.net.URL; import java.util.ArrayList; import java.util.Enumeration; import java.util.HashMap; import java.util.Locale; -import gnu.java.util.EmptyEnumeration; /** * Provides a context for controlling input methods and keyboard layouts. Index: java/awt/im/spi/InputMethodContext.java =================================================================== RCS file: /cvsroot/classpath/classpath/java/awt/im/spi/InputMethodContext.java,v retrieving revision 1.2 diff -u -r1.2 InputMethodContext.java --- java/awt/im/spi/InputMethodContext.java 6 May 2002 16:19:20 -0000 1.2 +++ java/awt/im/spi/InputMethodContext.java 27 Sep 2004 14:58:57 -0000 @@ -1,5 +1,5 @@ /* InputMethodContext.java -- communication between an input method and client - Copyright (C) 2002 Free Software Foundation, Inc. + Copyright (C) 2002, 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -35,13 +35,14 @@ obligated to do so. If you do not wish to do so, delete this exception statement from your version. */ + package java.awt.im.spi; -import java.awt.HeadlessException; import java.awt.Window; import java.awt.font.TextHitInfo; import java.awt.im.InputMethodRequests; import java.text.AttributedCharacterIterator; + import javax.swing.JFrame; /** @@ -49,7 +50,7 @@ * and the client component. This should be passed to * {@link InputMethod#setInputMethodContext(InputMethodContext)}. * - * @author Eric Blake + * @author Eric Blake (ebb9@email.byu.edu) * @since 1.3 * @status updated to 1.4 */ Index: java/awt/image/AffineTransformOp.java =================================================================== RCS file: /cvsroot/classpath/classpath/java/awt/image/AffineTransformOp.java,v retrieving revision 1.1 diff -u -r1.1 AffineTransformOp.java --- java/awt/image/AffineTransformOp.java 19 Mar 2004 21:22:24 -0000 1.1 +++ java/awt/image/AffineTransformOp.java 27 Sep 2004 14:58:57 -0000 @@ -1,6 +1,6 @@ /* AffineTransformOp.java -- This class performs affine - * transformation between two images or rasters in 2 - * dimensions. Copyright (C) 2004 Free Software Foundation + transformation between two images or rasters in 2 dimensions. + Copyright (C) 2004 Free Software Foundation This file is part of GNU Classpath. @@ -38,11 +38,12 @@ package java.awt.image; -import java.awt.*; -import java.awt.Graphics; import java.awt.Graphics2D; -import java.awt.geom.*; - +import java.awt.Rectangle; +import java.awt.RenderingHints; +import java.awt.geom.AffineTransform; +import java.awt.geom.Point2D; +import java.awt.geom.Rectangle2D; /** * This class performs affine transformation between two images or Index: java/awt/image/BufferedImage.java =================================================================== RCS file: /cvsroot/classpath/classpath/java/awt/image/BufferedImage.java,v retrieving revision 1.8 diff -u -r1.8 BufferedImage.java --- java/awt/image/BufferedImage.java 22 Jul 2004 19:45:38 -0000 1.8 +++ java/awt/image/BufferedImage.java 27 Sep 2004 14:58:57 -0000 @@ -1,4 +1,5 @@ -/* Copyright (C) 2000, 2002, 2003 Free Software Foundation +/* BufferedImage.java -- + Copyright (C) 2000, 2002, 2003, 2004 Free Software Foundation This file is part of GNU Classpath. @@ -37,6 +38,8 @@ package java.awt.image; +import gnu.java.awt.ComponentDataBlitOp; + import java.awt.Graphics; import java.awt.Graphics2D; import java.awt.GraphicsEnvironment; @@ -45,11 +48,10 @@ import java.awt.Rectangle; import java.awt.Transparency; import java.awt.color.ColorSpace; -import java.util.Hashtable; -import java.util.Vector; import java.util.HashSet; +import java.util.Hashtable; import java.util.Iterator; -import gnu.java.awt.ComponentDataBlitOp; +import java.util.Vector; /** * A buffered image always starts at coordinates (0, 0). @@ -59,7 +61,7 @@ * height of the image. This tile is always considered to be checked * out. * - * @author Rolf W. Rasmussen + * @author Rolf W. Rasmussen (rolfwr@ii.uib.no) */ public class BufferedImage extends Image implements WritableRenderedImage @@ -79,20 +81,20 @@ TYPE_BYTE_BINARY = 12, TYPE_BYTE_INDEXED = 13; - final static int[] bits3 = { 8, 8, 8 }; - final static int[] bits4 = { 8, 8, 8 }; - final static int[] bits1byte = { 8 }; - final static int[] bits1ushort = { 16 }; + static final int[] bits3 = { 8, 8, 8 }; + static final int[] bits4 = { 8, 8, 8 }; + static final int[] bits1byte = { 8 }; + static final int[] bits1ushort = { 16 }; - final static int[] masks_int = { 0x00ff0000, + static final int[] masks_int = { 0x00ff0000, 0x0000ff00, 0x000000ff, DataBuffer.TYPE_INT }; - final static int[] masks_565 = { 0xf800, + static final int[] masks_565 = { 0xf800, 0x07e0, 0x001f, DataBuffer.TYPE_USHORT}; - final static int[] masks_555 = { 0x7c00, + static final int[] masks_555 = { 0x7c00, 0x03e0, 0x001f, DataBuffer.TYPE_USHORT}; Index: java/awt/image/ColorModel.java =================================================================== RCS file: /cvsroot/classpath/classpath/java/awt/image/ColorModel.java,v retrieving revision 1.21 diff -u -r1.21 ColorModel.java --- java/awt/image/ColorModel.java 27 Sep 2004 08:17:36 -0000 1.21 +++ java/awt/image/ColorModel.java 27 Sep 2004 14:58:57 -0000 @@ -1,4 +1,5 @@ -/* Copyright (C) 1999, 2000, 2002, 2003 Free Software Foundation +/* ColorModel.java -- + Copyright (C) 1999, 2000, 2002, 2003, 2004 Free Software Foundation This file is part of GNU Classpath. @@ -37,11 +38,12 @@ package java.awt.image; -import java.util.Arrays; +import gnu.java.awt.Buffers; + import java.awt.Point; import java.awt.Transparency; import java.awt.color.ColorSpace; -import gnu.java.awt.Buffers; +import java.util.Arrays; /** * A color model operates with colors in several formats: @@ -76,8 +78,8 @@ * * * - * @author Rolf W. Rasmussen - * @author C. Brian Jones + * @author Rolf W. Rasmussen (rolfwr@ii.uib.no) + * @author C. Brian Jones (cbj@gnu.org) */ public abstract class ColorModel implements Transparency { Index: java/awt/image/ComponentColorModel.java =================================================================== RCS file: /cvsroot/classpath/classpath/java/awt/image/ComponentColorModel.java,v retrieving revision 1.5 diff -u -r1.5 ComponentColorModel.java --- java/awt/image/ComponentColorModel.java 27 Sep 2004 08:17:36 -0000 1.5 +++ java/awt/image/ComponentColorModel.java 27 Sep 2004 14:58:57 -0000 @@ -1,4 +1,5 @@ -/* Copyright (C) 2000, 2002, 2004 Free Software Foundation +/* ComponentColorModel.java -- + Copyright (C) 2000, 2002, 2004 Free Software Foundation This file is part of GNU Classpath. @@ -37,9 +38,10 @@ package java.awt.image; +import gnu.java.awt.Buffers; + import java.awt.Point; import java.awt.color.ColorSpace; -import gnu.java.awt.Buffers; public class ComponentColorModel extends ColorModel { Index: java/awt/image/CropImageFilter.java =================================================================== RCS file: /cvsroot/classpath/classpath/java/awt/image/CropImageFilter.java,v retrieving revision 1.6 diff -u -r1.6 CropImageFilter.java --- java/awt/image/CropImageFilter.java 31 May 2004 21:11:47 -0000 1.6 +++ java/awt/image/CropImageFilter.java 27 Sep 2004 14:58:57 -0000 @@ -1,5 +1,5 @@ /* CropImageFilter.java -- Java class for cropping image filter - Copyright (C) 1999 Free Software Foundation, Inc. + Copyright (C) 1999, 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -38,11 +38,10 @@ package java.awt.image; -import java.util.Hashtable; import java.awt.Rectangle; +import java.util.Hashtable; /** - *
* Currently this filter does almost nothing and needs to be implemented. * * @author C. Brian Jones (cbj@gnu.org) Index: java/awt/image/DirectColorModel.java =================================================================== RCS file: /cvsroot/classpath/classpath/java/awt/image/DirectColorModel.java,v retrieving revision 1.10 diff -u -r1.10 DirectColorModel.java --- java/awt/image/DirectColorModel.java 31 Jul 2004 16:47:08 -0000 1.10 +++ java/awt/image/DirectColorModel.java 27 Sep 2004 14:58:57 -0000 @@ -1,4 +1,5 @@ -/* Copyright (C) 1999, 2000, 2002 Free Software Foundation +/* DirectColorModel.java -- + Copyright (C) 1999, 2000, 2002, 2004 Free Software Foundation This file is part of GNU Classpath. @@ -37,13 +38,14 @@ package java.awt.image; +import gnu.java.awt.Buffers; + import java.awt.Point; import java.awt.Transparency; import java.awt.color.ColorSpace; -import gnu.java.awt.Buffers; /** - * @author Rolf W. Rasmussen + * @author Rolf W. Rasmussen (rolfwr@ii.uib.no) * @author C. Brian Jones (cbj@gnu.org) * @author Mark Benvenuto (mcb54@columbia.edu) */ @@ -162,7 +164,7 @@ return extractAndScaleSample(pixel, 3); } - private final int extractAndNormalizeSample(int pixel, int component) + private int extractAndNormalizeSample(int pixel, int component) { int value = extractAndScaleSample(pixel, component); if (hasAlpha() && isAlphaPremultiplied()) @@ -170,7 +172,7 @@ return value; } - private final int extractAndScaleSample(int pixel, int component) + private int extractAndScaleSample(int pixel, int component) { int field = pixel & getMask(component); int to8BitShift = @@ -303,7 +305,7 @@ * @param highBit the position of the most significant bit in the * val parameter. */ - private final int valueToField(int val, int component, int highBit) + private int valueToField(int val, int component, int highBit) { int toFieldShift = getComponentSize(component) + shifts[component] - highBit; @@ -317,7 +319,7 @@ * Converts a 16 bit value to the correct field bits based on the * information derived from the field masks. */ - private final int value16ToField(int val, int component) + private int value16ToField(int val, int component) { int toFieldShift = getComponentSize(component) + shifts[component] - 16; return (toFieldShift>0) ? Index: java/awt/image/MemoryImageSource.java =================================================================== RCS file: /cvsroot/classpath/classpath/java/awt/image/MemoryImageSource.java,v retrieving revision 1.9 diff -u -r1.9 MemoryImageSource.java --- java/awt/image/MemoryImageSource.java 31 Jul 2004 16:47:08 -0000 1.9 +++ java/awt/image/MemoryImageSource.java 27 Sep 2004 14:58:57 -0000 @@ -1,5 +1,5 @@ /* MemoryImageSource.java -- Java class for providing image data - Copyright (C) 1999 Free Software Foundation, Inc. + Copyright (C) 1999, 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -38,8 +38,6 @@ package java.awt.image; -import java.awt.Image; -import java.util.Enumeration; import java.util.Hashtable; import java.util.Vector; Index: java/awt/image/PackedColorModel.java =================================================================== RCS file: /cvsroot/classpath/classpath/java/awt/image/PackedColorModel.java,v retrieving revision 1.2 diff -u -r1.2 PackedColorModel.java --- java/awt/image/PackedColorModel.java 22 Jan 2002 22:26:59 -0000 1.2 +++ java/awt/image/PackedColorModel.java 27 Sep 2004 14:58:57 -0000 @@ -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,11 +34,13 @@ obligated to do so. If you do not wish to do so, delete this exception statement from your version. */ + package java.awt.image; +import gnu.java.awt.BitMaskExtent; + import java.awt.Point; import java.awt.color.ColorSpace; -import gnu.java.awt.BitMaskExtent; /** * @author Rolf W. Rasmussen Index: java/awt/image/PixelGrabber.java =================================================================== RCS file: /cvsroot/classpath/classpath/java/awt/image/PixelGrabber.java,v retrieving revision 1.10 diff -u -r1.10 PixelGrabber.java --- java/awt/image/PixelGrabber.java 26 Dec 2003 18:54:31 -0000 1.10 +++ java/awt/image/PixelGrabber.java 27 Sep 2004 14:58:57 -0000 @@ -1,39 +1,39 @@ /* PixelGrabber.java -- retrieve a subset of an image's data - Copyright (C) 1999, 2003 Free Software Foundation, Inc. + Copyright (C) 1999, 2003, 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. */ +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.image; Index: java/awt/image/RasterOp.java =================================================================== RCS file: /cvsroot/classpath/classpath/java/awt/image/RasterOp.java,v retrieving revision 1.3 diff -u -r1.3 RasterOp.java --- java/awt/image/RasterOp.java 12 Oct 2003 13:53:39 -0000 1.3 +++ java/awt/image/RasterOp.java 27 Sep 2004 14:58:57 -0000 @@ -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,11 +34,12 @@ obligated to do so. If you do not wish to do so, delete this exception statement from your version. */ + package java.awt.image; +import java.awt.RenderingHints; import java.awt.geom.Point2D; import java.awt.geom.Rectangle2D; -import java.awt.RenderingHints; public interface RasterOp { Index: java/awt/peer/MenuBarPeer.java =================================================================== RCS file: /cvsroot/classpath/classpath/java/awt/peer/MenuBarPeer.java,v retrieving revision 1.9 diff -u -r1.9 MenuBarPeer.java --- java/awt/peer/MenuBarPeer.java 23 Sep 2004 22:57:12 -0000 1.9 +++ java/awt/peer/MenuBarPeer.java 27 Sep 2004 14:58:57 -0000 @@ -1,5 +1,5 @@ /* MenuBarPeer.java -- Interface for menu bar peer - Copyright (C) 1999 Free Software Foundation, Inc. + Copyright (C) 1999, 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -43,6 +43,6 @@ public interface MenuBarPeer extends MenuComponentPeer { void addHelpMenu(Menu menu); + void addMenu(Menu menu); void delMenu(int index); -} // interface MenuBarPeer - +} \ No newline at end of file