diff options
35 files changed, 97 insertions, 75 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index cef7d571079..5b8e96e277f 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,41 @@ +2003-06-05 Michael Koch <konqueror@gmx.de> + + * java/awt/Button.java, + java/awt/Checkbox.java, + java/awt/CheckboxMenuItem.java, + java/awt/Choice.java, + java/awt/Container.java, + java/awt/Dialog.java, + java/awt/EventQueue.java, + java/awt/FileDialog.java, + java/awt/Frame.java, + java/awt/Label.java, + java/awt/List.java, + java/awt/Menu.java, + java/awt/MenuItem.java, + java/awt/Panel.java, + java/awt/PopupMenu.java, + java/awt/Rectangle.java, + java/awt/ScrollPane.java, + java/awt/Scrollbar.java, + java/awt/TextArea.java, + java/awt/TextField.java, + java/awt/Window.java, + java/awt/datatransfer/DataFlavor.java, + java/awt/dnd/DragSource.java, + java/awt/dnd/DragSourceContext.java, + java/awt/event/HierarchyEvent.java, + java/awt/event/MouseWheelEvent.java, + java/awt/im/InputContext.java, + java/awt/image/BufferedImage.java, + java/awt/image/ComponentColorModel.java, + java/awt/image/Raster.java, + java/awt/image/WritableRaster.java, + java/awt/peer/ComponentPeer.java, + java/awt/print/PageFormat.java, + java/awt/print/PrinterJob.java: + New versions from Classpath. + 2003-06-05 Scott Gilbertson <scottg@mantatest.com> * java/text/SimpleDateFormat.java (SimpleDateFormat): Added diff --git a/libjava/java/awt/Button.java b/libjava/java/awt/Button.java index 989fbc95173..e4085e5f61e 100644 --- a/libjava/java/awt/Button.java +++ b/libjava/java/awt/Button.java @@ -41,7 +41,6 @@ package java.awt; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.awt.peer.ButtonPeer; -import java.awt.peer.ComponentPeer; import java.lang.reflect.Array; import java.util.EventListener; diff --git a/libjava/java/awt/Checkbox.java b/libjava/java/awt/Checkbox.java index 9c7f994e39c..5e80e1661f6 100644 --- a/libjava/java/awt/Checkbox.java +++ b/libjava/java/awt/Checkbox.java @@ -38,10 +38,9 @@ exception statement from your version. */ package java.awt; -import java.awt.peer.CheckboxPeer; -import java.awt.peer.ComponentPeer; import java.awt.event.ItemEvent; import java.awt.event.ItemListener; +import java.awt.peer.CheckboxPeer; import java.io.Serializable; /** diff --git a/libjava/java/awt/CheckboxMenuItem.java b/libjava/java/awt/CheckboxMenuItem.java index 4f41568218a..c7df075b310 100644 --- a/libjava/java/awt/CheckboxMenuItem.java +++ b/libjava/java/awt/CheckboxMenuItem.java @@ -38,11 +38,10 @@ exception statement from your version. */ package java.awt; -import java.awt.peer.CheckboxMenuItemPeer; -import java.awt.peer.MenuItemPeer; -import java.awt.peer.MenuComponentPeer; import java.awt.event.ItemEvent; import java.awt.event.ItemListener; +import java.awt.peer.CheckboxMenuItemPeer; +import java.awt.peer.MenuItemPeer; import java.util.EventListener; /** diff --git a/libjava/java/awt/Choice.java b/libjava/java/awt/Choice.java index cb8bb036491..0b5e3d61dad 100644 --- a/libjava/java/awt/Choice.java +++ b/libjava/java/awt/Choice.java @@ -38,13 +38,12 @@ exception statement from your version. */ package java.awt; -import java.awt.peer.ChoicePeer; -import java.awt.peer.ComponentPeer; import java.awt.event.ItemEvent; import java.awt.event.ItemListener; +import java.awt.peer.ChoicePeer; import java.io.Serializable; -import java.util.Vector; import java.util.EventListener; +import java.util.Vector; /** * This class implements a drop down choice list. diff --git a/libjava/java/awt/Container.java b/libjava/java/awt/Container.java index 9bad369e53f..e27a10e095f 100644 --- a/libjava/java/awt/Container.java +++ b/libjava/java/awt/Container.java @@ -41,7 +41,6 @@ import java.awt.event.AWTEventListener; import java.awt.event.ContainerEvent; import java.awt.event.ContainerListener; import java.awt.event.MouseEvent; -import java.awt.peer.ComponentPeer; import java.awt.peer.ContainerPeer; import java.awt.peer.LightweightPeer; import java.beans.PropertyChangeListener; diff --git a/libjava/java/awt/Dialog.java b/libjava/java/awt/Dialog.java index 5c64dc97a87..aba409812aa 100644 --- a/libjava/java/awt/Dialog.java +++ b/libjava/java/awt/Dialog.java @@ -39,9 +39,6 @@ exception statement from your version. */ package java.awt; import java.awt.peer.DialogPeer; -import java.awt.peer.WindowPeer; -import java.awt.peer.ContainerPeer; -import java.awt.peer.ComponentPeer; /** * A dialog box widget class. diff --git a/libjava/java/awt/EventQueue.java b/libjava/java/awt/EventQueue.java index 90ba6eafcf1..d6204cefd9a 100644 --- a/libjava/java/awt/EventQueue.java +++ b/libjava/java/awt/EventQueue.java @@ -37,9 +37,9 @@ exception statement from your version. */ package java.awt; -import java.awt.event.*; -import java.util.EmptyStackException; +import java.awt.event.InvocationEvent; import java.lang.reflect.InvocationTargetException; +import java.util.EmptyStackException; /* Written using on-line Java 2 Platform Standard Edition v1.3 API * Specification, as well as "The Java Class Libraries", 2nd edition @@ -376,4 +376,4 @@ public class EventQueue // XXX For now, this ONLY does the current time. return System.currentTimeMillis(); } -} // class EventQueue +} diff --git a/libjava/java/awt/FileDialog.java b/libjava/java/awt/FileDialog.java index 764424c82c3..6ff2b766748 100644 --- a/libjava/java/awt/FileDialog.java +++ b/libjava/java/awt/FileDialog.java @@ -40,9 +40,6 @@ package java.awt; import java.awt.peer.FileDialogPeer; import java.awt.peer.DialogPeer; -import java.awt.peer.WindowPeer; -import java.awt.peer.ContainerPeer; -import java.awt.peer.ComponentPeer; import java.io.FilenameFilter; /** diff --git a/libjava/java/awt/Frame.java b/libjava/java/awt/Frame.java index 5aab5ef49a9..d162df76d18 100644 --- a/libjava/java/awt/Frame.java +++ b/libjava/java/awt/Frame.java @@ -39,9 +39,6 @@ exception statement from your version. */ package java.awt; import java.awt.peer.FramePeer; -import java.awt.peer.WindowPeer; -import java.awt.peer.ContainerPeer; -import java.awt.peer.ComponentPeer; import java.util.Enumeration; import java.util.Vector; diff --git a/libjava/java/awt/Label.java b/libjava/java/awt/Label.java index 47f6733da16..37ff4ec5bd1 100644 --- a/libjava/java/awt/Label.java +++ b/libjava/java/awt/Label.java @@ -39,7 +39,6 @@ exception statement from your version. */ package java.awt; import java.awt.peer.LabelPeer; -import java.awt.peer.ComponentPeer; import javax.accessibility.Accessible; /** diff --git a/libjava/java/awt/List.java b/libjava/java/awt/List.java index b57cc89f555..2f4932ef29f 100644 --- a/libjava/java/awt/List.java +++ b/libjava/java/awt/List.java @@ -38,13 +38,11 @@ exception statement from your version. */ package java.awt; -import java.io.Serializable; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.awt.event.ItemEvent; import java.awt.event.ItemListener; import java.awt.peer.ListPeer; -import java.awt.peer.ComponentPeer; import java.util.EventListener; import java.util.Vector; import javax.accessibility.Accessible; diff --git a/libjava/java/awt/Menu.java b/libjava/java/awt/Menu.java index 2ca9467e2b1..40253c493b0 100644 --- a/libjava/java/awt/Menu.java +++ b/libjava/java/awt/Menu.java @@ -39,11 +39,8 @@ exception statement from your version. */ package java.awt; import java.awt.peer.MenuPeer; -import java.awt.peer.MenuItemPeer; -import java.awt.peer.MenuComponentPeer; import java.io.Serializable; import java.util.Vector; -import java.util.Enumeration; /** * This class represents a pull down or tear off menu in Java's AWT. diff --git a/libjava/java/awt/MenuItem.java b/libjava/java/awt/MenuItem.java index ffef30ecf8c..55e2666af91 100644 --- a/libjava/java/awt/MenuItem.java +++ b/libjava/java/awt/MenuItem.java @@ -38,10 +38,9 @@ exception statement from your version. */ package java.awt; -import java.awt.peer.MenuItemPeer; -import java.awt.peer.MenuComponentPeer; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; +import java.awt.peer.MenuItemPeer; import java.lang.reflect.Array; import java.util.EventListener; diff --git a/libjava/java/awt/Panel.java b/libjava/java/awt/Panel.java index 23336bc6bd6..b84c0d0a6a3 100644 --- a/libjava/java/awt/Panel.java +++ b/libjava/java/awt/Panel.java @@ -38,10 +38,6 @@ exception statement from your version. */ package java.awt; -import java.awt.peer.PanelPeer; -import java.awt.peer.ContainerPeer; -import java.awt.peer.ComponentPeer; -import java.io.Serializable; import javax.accessibility.Accessible; import javax.accessibility.AccessibleContext; import javax.accessibility.AccessibleRole; diff --git a/libjava/java/awt/PopupMenu.java b/libjava/java/awt/PopupMenu.java index 75e565d3e9b..cde79e3f109 100644 --- a/libjava/java/awt/PopupMenu.java +++ b/libjava/java/awt/PopupMenu.java @@ -38,10 +38,9 @@ exception statement from your version. */ package java.awt; -import java.awt.peer.PopupMenuPeer; import java.awt.peer.MenuPeer; -import java.awt.peer.MenuItemPeer; -import java.awt.peer.MenuComponentPeer; +import java.awt.peer.PopupMenuPeer; + /** * This class implement an AWT popup menu widget * diff --git a/libjava/java/awt/Rectangle.java b/libjava/java/awt/Rectangle.java index 451f116e6ce..48a2fbec0d4 100644 --- a/libjava/java/awt/Rectangle.java +++ b/libjava/java/awt/Rectangle.java @@ -38,7 +38,6 @@ exception statement from your version. */ package java.awt; -import java.awt.geom.AffineTransform; import java.awt.geom.Rectangle2D; import java.io.Serializable; diff --git a/libjava/java/awt/ScrollPane.java b/libjava/java/awt/ScrollPane.java index 930ace7d1b5..ceb45680514 100644 --- a/libjava/java/awt/ScrollPane.java +++ b/libjava/java/awt/ScrollPane.java @@ -39,9 +39,8 @@ exception statement from your version. */ package java.awt; import java.awt.event.MouseEvent; -import java.awt.peer.ScrollPanePeer; -import java.awt.peer.ContainerPeer; import java.awt.peer.ComponentPeer; +import java.awt.peer.ScrollPanePeer; import javax.accessibility.Accessible; /** @@ -367,8 +366,8 @@ removeNotify() * @param index The index at which to add the child, which is ignored * in this implementation. */ -public final void -addImpl(Component component, Object constraints, int index) + protected final void addImpl (Component component, Object constraints, + int index) { Component[] list = getComponents(); if ((list != null) && (list.length > 0)) @@ -465,7 +464,7 @@ paramString() * * @since 1.4 */ - public boolean eventTypeEnabled (int type) + protected boolean eventTypeEnabled (int type) { if (type == MouseEvent.MOUSE_WHEEL) return wheelScrollingEnabled; diff --git a/libjava/java/awt/Scrollbar.java b/libjava/java/awt/Scrollbar.java index e8d408e5d26..85ac117e683 100644 --- a/libjava/java/awt/Scrollbar.java +++ b/libjava/java/awt/Scrollbar.java @@ -38,10 +38,9 @@ exception statement from your version. */ package java.awt; -import java.awt.peer.ScrollbarPeer; -import java.awt.peer.ComponentPeer; import java.awt.event.AdjustmentListener; import java.awt.event.AdjustmentEvent; +import java.awt.peer.ScrollbarPeer; import java.util.EventListener; import javax.accessibility.Accessible; diff --git a/libjava/java/awt/TextArea.java b/libjava/java/awt/TextArea.java index ec87f87d491..f72475331f4 100644 --- a/libjava/java/awt/TextArea.java +++ b/libjava/java/awt/TextArea.java @@ -38,9 +38,8 @@ exception statement from your version. */ package java.awt; -import java.awt.peer.TextAreaPeer; -import java.awt.peer.TextComponentPeer; import java.awt.peer.ComponentPeer; +import java.awt.peer.TextAreaPeer; /** * This implements a multi-line text entry widget. diff --git a/libjava/java/awt/TextField.java b/libjava/java/awt/TextField.java index 13275e3104a..7575e24d4c1 100644 --- a/libjava/java/awt/TextField.java +++ b/libjava/java/awt/TextField.java @@ -41,7 +41,6 @@ package java.awt; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.awt.peer.TextFieldPeer; -import java.awt.peer.TextComponentPeer; import java.awt.peer.ComponentPeer; import java.util.EventListener; diff --git a/libjava/java/awt/Window.java b/libjava/java/awt/Window.java index fcb9c1aefdb..44946528f77 100644 --- a/libjava/java/awt/Window.java +++ b/libjava/java/awt/Window.java @@ -43,7 +43,6 @@ import java.awt.event.WindowFocusListener; import java.awt.event.WindowListener; import java.awt.event.WindowStateListener; import java.awt.peer.WindowPeer; -import java.awt.peer.ComponentPeer; import java.util.EventListener; import java.util.Locale; import java.util.ResourceBundle; @@ -655,7 +654,7 @@ public class Window extends Container * * @since 1.4 */ - public boolean isFocusableWindow () + public final boolean isFocusableWindow () { if (getFocusableWindowState () == false) return false; diff --git a/libjava/java/awt/datatransfer/DataFlavor.java b/libjava/java/awt/datatransfer/DataFlavor.java index 2603b6e3954..e56f9759a50 100644 --- a/libjava/java/awt/datatransfer/DataFlavor.java +++ b/libjava/java/awt/datatransfer/DataFlavor.java @@ -49,7 +49,6 @@ import java.io.StringReader; import java.io.UnsupportedEncodingException; import java.nio.ByteBuffer; import java.nio.CharBuffer; -import java.nio.charset.Charset; /** * This class represents a particular data format used for transferring diff --git a/libjava/java/awt/dnd/DragSource.java b/libjava/java/awt/dnd/DragSource.java index f6083f674f6..6ce93be277c 100644 --- a/libjava/java/awt/dnd/DragSource.java +++ b/libjava/java/awt/dnd/DragSource.java @@ -49,9 +49,6 @@ import java.awt.datatransfer.FlavorMap; import java.awt.datatransfer.SystemFlavorMap; import java.awt.datatransfer.Transferable; import java.awt.dnd.peer.DragSourceContextPeer; -import java.io.IOException; -import java.io.ObjectInputStream; -import java.io.ObjectOutputStream; import java.io.Serializable; import java.util.EventListener; diff --git a/libjava/java/awt/dnd/DragSourceContext.java b/libjava/java/awt/dnd/DragSourceContext.java index 1760cd02065..02f4ac351cb 100644 --- a/libjava/java/awt/dnd/DragSourceContext.java +++ b/libjava/java/awt/dnd/DragSourceContext.java @@ -44,9 +44,6 @@ import java.awt.Image; import java.awt.Point; import java.awt.datatransfer.Transferable; import java.awt.dnd.peer.DragSourceContextPeer; -import java.io.IOException; -import java.io.ObjectInputStream; -import java.io.ObjectOutputStream; import java.io.Serializable; import java.util.TooManyListenersException; diff --git a/libjava/java/awt/event/HierarchyEvent.java b/libjava/java/awt/event/HierarchyEvent.java index fcb7db951d2..aadcc71703d 100644 --- a/libjava/java/awt/event/HierarchyEvent.java +++ b/libjava/java/awt/event/HierarchyEvent.java @@ -35,8 +35,12 @@ 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.event; -import java.awt.*; + +import java.awt.AWTEvent; +import java.awt.Component; +import java.awt.Container; /** * This class represents an event generated for an ancestor component which diff --git a/libjava/java/awt/event/MouseWheelEvent.java b/libjava/java/awt/event/MouseWheelEvent.java index be2366a19ee..88d31a5467a 100644 --- a/libjava/java/awt/event/MouseWheelEvent.java +++ b/libjava/java/awt/event/MouseWheelEvent.java @@ -39,7 +39,6 @@ exception statement from your version. */ package java.awt.event; import java.awt.Component; -import java.awt.Point; /** * This event is generated for a mouse wheel rotation. The wheel (the middle diff --git a/libjava/java/awt/im/InputContext.java b/libjava/java/awt/im/InputContext.java index e4431f9c374..6218847a079 100644 --- a/libjava/java/awt/im/InputContext.java +++ b/libjava/java/awt/im/InputContext.java @@ -46,7 +46,6 @@ import java.io.BufferedReader; import java.io.InputStreamReader; import java.io.IOException; import java.net.URL; -import java.net.URLConnection; import java.util.ArrayList; import java.util.Enumeration; import java.util.HashMap; diff --git a/libjava/java/awt/image/BufferedImage.java b/libjava/java/awt/image/BufferedImage.java index 5d72288f589..1fd7b9bfcf5 100644 --- a/libjava/java/awt/image/BufferedImage.java +++ b/libjava/java/awt/image/BufferedImage.java @@ -37,10 +37,15 @@ exception statement from your version. */ package java.awt.image; -import java.awt.*; -import java.awt.color.*; -import java.util.*; - +import java.awt.Graphics; +import java.awt.Graphics2D; +import java.awt.Image; +import java.awt.Point; +import java.awt.Rectangle; +import java.awt.Transparency; +import java.awt.color.ColorSpace; +import java.util.Hashtable; +import java.util.Vector; import gnu.java.awt.ComponentDataBlitOp; /** diff --git a/libjava/java/awt/image/ComponentColorModel.java b/libjava/java/awt/image/ComponentColorModel.java index 090f49d8a0a..cc96ab15516 100644 --- a/libjava/java/awt/image/ComponentColorModel.java +++ b/libjava/java/awt/image/ComponentColorModel.java @@ -34,10 +34,11 @@ 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; -import java.awt.color.*; import java.awt.Point; +import java.awt.color.ColorSpace; import gnu.java.awt.Buffers; public class ComponentColorModel extends ColorModel diff --git a/libjava/java/awt/image/Raster.java b/libjava/java/awt/image/Raster.java index 52fff590850..1b3d2f03ddf 100644 --- a/libjava/java/awt/image/Raster.java +++ b/libjava/java/awt/image/Raster.java @@ -34,9 +34,11 @@ 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; -import java.awt.*; +import java.awt.Point; +import java.awt.Rectangle; /** * @author Rolf W. Rasmussen <rolfwr@ii.uib.no> diff --git a/libjava/java/awt/image/WritableRaster.java b/libjava/java/awt/image/WritableRaster.java index 887ee8fa1cd..a8864408e70 100644 --- a/libjava/java/awt/image/WritableRaster.java +++ b/libjava/java/awt/image/WritableRaster.java @@ -34,9 +34,11 @@ 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; -import java.awt.*; +import java.awt.Point; +import java.awt.Rectangle; /** * @author Rolf W. Rasmussen <rolfwr@ii.uib.no> @@ -138,10 +140,10 @@ public class WritableRaster extends Raster public void setRect(Raster srcRaster) { - setRect(srcRaster, 0, 0); + setRect(0, 0, srcRaster); } - public void setRect(Raster srcRaster, int dx, int dy) + public void setRect(int dx, int dy, Raster srcRaster) { Rectangle targetUnclipped = new Rectangle(srcRaster.getMinX()+dx, srcRaster.getMinY()+dy, diff --git a/libjava/java/awt/peer/ComponentPeer.java b/libjava/java/awt/peer/ComponentPeer.java index e6f79d1d116..fc3c5f9e981 100644 --- a/libjava/java/awt/peer/ComponentPeer.java +++ b/libjava/java/awt/peer/ComponentPeer.java @@ -38,9 +38,22 @@ exception statement from your version. */ package java.awt.peer; -import java.awt.*; +import java.awt.AWTEvent; +import java.awt.Color; +import java.awt.Cursor; +import java.awt.Dimension; +import java.awt.Font; +import java.awt.FontMetrics; +import java.awt.Graphics; +import java.awt.GraphicsConfiguration; +import java.awt.Image; +import java.awt.Point; +import java.awt.Toolkit; import java.awt.event.PaintEvent; -import java.awt.image.*; +import java.awt.image.ColorModel; +import java.awt.image.ImageObserver; +import java.awt.image.ImageProducer; +import java.awt.image.VolatileImage; public interface ComponentPeer { diff --git a/libjava/java/awt/print/PageFormat.java b/libjava/java/awt/print/PageFormat.java index 7328ab5287e..d9ca50bea30 100644 --- a/libjava/java/awt/print/PageFormat.java +++ b/libjava/java/awt/print/PageFormat.java @@ -183,8 +183,7 @@ getImageableWidth() * * @return The imageable height of the paper. */ -public double -getImageableHeigth() +public double getImageableHeight() { return(paper.getImageableHeight()); } diff --git a/libjava/java/awt/print/PrinterJob.java b/libjava/java/awt/print/PrinterJob.java index ccaf5dcb782..3ad456788e4 100644 --- a/libjava/java/awt/print/PrinterJob.java +++ b/libjava/java/awt/print/PrinterJob.java @@ -98,8 +98,7 @@ getCopies(); * * @param copies The number of copies to be printed. */ -public abstract void -setCopies(); +public abstract void setCopies (int copies); /*************************************************************************/ |
