diff options
39 files changed, 66 insertions, 36 deletions
diff --git a/java/awt/Button.java b/java/awt/Button.java index 576a24e48..3fe194f3b 100644 --- a/java/awt/Button.java +++ b/java/awt/Button.java @@ -24,6 +24,7 @@ package java.awt; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.awt.peer.ButtonPeer; +import java.awt.peer.ComponentPeer; /** * This class provides a button widget for the AWT. @@ -191,7 +192,7 @@ addNotify() if (bp != null) return; - setPeer(getToolkit().createButton(this)); + setPeer((ComponentPeer)getToolkit().createButton(this)); } /*************************************************************************/ diff --git a/java/awt/Canvas.java b/java/awt/Canvas.java index f45522df8..3e9ca5e4e 100644 --- a/java/awt/Canvas.java +++ b/java/awt/Canvas.java @@ -21,6 +21,9 @@ package java.awt; +import java.awt.peer.CanvasPeer; +import java.awt.peer.ComponentPeer; + /** * This class implements an AWT canvas widget. * @@ -65,7 +68,7 @@ addNotify() if (getPeer() != null) return; - setPeer(getToolkit().createCanvas(this)); + setPeer((ComponentPeer)getToolkit().createCanvas(this)); } /*************************************************************************/ diff --git a/java/awt/Checkbox.java b/java/awt/Checkbox.java index a2dfccc56..749487f1e 100644 --- a/java/awt/Checkbox.java +++ b/java/awt/Checkbox.java @@ -22,6 +22,7 @@ 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.io.Serializable; @@ -282,7 +283,7 @@ addNotify() if (getPeer() != null) return; - setPeer(getToolkit().createCheckbox(this)); + setPeer((ComponentPeer)getToolkit().createCheckbox(this)); } /*************************************************************************/ diff --git a/java/awt/CheckboxMenuItem.java b/java/awt/CheckboxMenuItem.java index 10c4b8c49..1c10410dc 100644 --- a/java/awt/CheckboxMenuItem.java +++ b/java/awt/CheckboxMenuItem.java @@ -22,6 +22,8 @@ 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; diff --git a/java/awt/Choice.java b/java/awt/Choice.java index e3178943a..a190739e8 100644 --- a/java/awt/Choice.java +++ b/java/awt/Choice.java @@ -22,6 +22,7 @@ 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.io.Serializable; @@ -315,7 +316,7 @@ public void addNotify() { if (getPeer() == null) - setPeer(getToolkit().createChoice(this)); + setPeer((ComponentPeer)getToolkit().createChoice(this)); } /*************************************************************************/ diff --git a/java/awt/Dialog.java b/java/awt/Dialog.java index ee7eb91b7..1f5214f92 100644 --- a/java/awt/Dialog.java +++ b/java/awt/Dialog.java @@ -22,6 +22,9 @@ 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/java/awt/FileDialog.java b/java/awt/FileDialog.java index ed741ca72..dd3215142 100644 --- a/java/awt/FileDialog.java +++ b/java/awt/FileDialog.java @@ -22,6 +22,10 @@ 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; /** @@ -269,7 +273,7 @@ addNotify() if (getPeer() != null) return; - setPeer(getToolkit().createFileDialog(this)); + setPeer((ComponentPeer)getToolkit().createFileDialog(this)); } /*************************************************************************/ diff --git a/java/awt/Label.java b/java/awt/Label.java index d9a750007..dae2d3855 100644 --- a/java/awt/Label.java +++ b/java/awt/Label.java @@ -22,6 +22,7 @@ package java.awt; import java.awt.peer.LabelPeer; +import java.awt.peer.ComponentPeer; /** * This component is used for displaying simple text strings that cannot @@ -197,7 +198,7 @@ setText(String text) public void addNotify() { - setPeer(getToolkit().createLabel(this)); + setPeer((ComponentPeer)getToolkit().createLabel(this)); } /*************************************************************************/ diff --git a/java/awt/List.java b/java/awt/List.java index 23462cbd0..0c03f907d 100644 --- a/java/awt/List.java +++ b/java/awt/List.java @@ -27,6 +27,7 @@ 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.Vector; /** @@ -827,7 +828,7 @@ deselect(int index) public void addNotify() { - setPeer(getToolkit().createList(this)); + setPeer((ComponentPeer)getToolkit().createList(this)); } /*************************************************************************/ diff --git a/java/awt/MenuBar.java b/java/awt/MenuBar.java index 2224fc34b..efc0ea666 100644 --- a/java/awt/MenuBar.java +++ b/java/awt/MenuBar.java @@ -22,6 +22,8 @@ package java.awt; import java.awt.peer.MenuBarPeer; +import java.awt.peer.MenuComponentPeer; + import java.io.Serializable; import java.util.Enumeration; import java.util.Vector; @@ -214,7 +216,7 @@ public void addNotify() { if (getPeer() == null) - setPeer(getToolkit().createMenuBar(this)); + setPeer((MenuComponentPeer)getToolkit().createMenuBar(this)); } /*************************************************************************/ diff --git a/java/awt/Panel.java b/java/awt/Panel.java index e6eb2cb65..b2accd3b5 100644 --- a/java/awt/Panel.java +++ b/java/awt/Panel.java @@ -22,6 +22,8 @@ package java.awt; import java.awt.peer.PanelPeer; +import java.awt.peer.ContainerPeer; +import java.awt.peer.ComponentPeer; /** * A panel is a simple container class. @@ -74,7 +76,7 @@ addNotify() if (getPeer() != null) return; - setPeer(getToolkit().createPanel(this)); + setPeer((ComponentPeer)getToolkit().createPanel(this)); } } // class Panel diff --git a/java/awt/ScrollPane.java b/java/awt/ScrollPane.java index 61f480f31..efc4754c4 100644 --- a/java/awt/ScrollPane.java +++ b/java/awt/ScrollPane.java @@ -22,6 +22,8 @@ package java.awt; import java.awt.peer.ScrollPanePeer; +import java.awt.peer.ContainerPeer; +import java.awt.peer.ComponentPeer; /** * This widget provides a scrollable region that allows a single @@ -314,7 +316,7 @@ addNotify() if (getPeer() == null) return; - setPeer(getToolkit().createScrollPane(this)); + setPeer((ComponentPeer)getToolkit().createScrollPane(this)); if (hAdjustable != null) hAdjustable.addNotify(); diff --git a/java/awt/Scrollbar.java b/java/awt/Scrollbar.java index 26aace8eb..adcce56ec 100644 --- a/java/awt/Scrollbar.java +++ b/java/awt/Scrollbar.java @@ -22,6 +22,8 @@ package java.awt; import java.awt.peer.ScrollbarPeer; +import java.awt.peer.ComponentPeer; + import java.awt.event.AdjustmentListener; import java.awt.event.AdjustmentEvent; @@ -571,7 +573,7 @@ addNotify() if (getPeer() != null) return; - setPeer(getToolkit().createScrollbar(this)); + setPeer((ComponentPeer)getToolkit().createScrollbar(this)); } /*************************************************************************/ diff --git a/java/awt/TextArea.java b/java/awt/TextArea.java index 9f5af88fe..24cf44502 100644 --- a/java/awt/TextArea.java +++ b/java/awt/TextArea.java @@ -22,6 +22,8 @@ package java.awt; import java.awt.peer.TextAreaPeer; +import java.awt.peer.TextComponentPeer; +import java.awt.peer.ComponentPeer; /** * This implements a multi-line text entry widget. @@ -402,7 +404,7 @@ addNotify() if (getPeer() != null) return; - setPeer(getToolkit().createTextArea(this)); + setPeer((ComponentPeer)getToolkit().createTextArea(this)); } /*************************************************************************/ diff --git a/java/awt/TextComponent.java b/java/awt/TextComponent.java index e02e6c8f8..5b4e8571b 100644 --- a/java/awt/TextComponent.java +++ b/java/awt/TextComponent.java @@ -24,6 +24,7 @@ package java.awt; import java.awt.event.TextEvent; import java.awt.event.TextListener; import java.awt.peer.TextComponentPeer; +import java.awt.peer.ComponentPeer; /** * This class provides common functionality for widgets than diff --git a/java/awt/TextField.java b/java/awt/TextField.java index 34d8ec0e6..d2b49a5bd 100644 --- a/java/awt/TextField.java +++ b/java/awt/TextField.java @@ -24,6 +24,8 @@ 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; /** * This class implements a single line text entry field widget @@ -363,7 +365,7 @@ addNotify() if (getPeer() != null) return; - setPeer(getToolkit().createTextField(this)); + setPeer((ComponentPeer)getToolkit().createTextField(this)); } /*************************************************************************/ diff --git a/java/awt/peer/ButtonPeer.java b/java/awt/peer/ButtonPeer.java index c79b14bf3..8b851fcaf 100644 --- a/java/awt/peer/ButtonPeer.java +++ b/java/awt/peer/ButtonPeer.java @@ -21,7 +21,7 @@ package java.awt.peer; -public interface ButtonPeer implements ComponentPeer +public interface ButtonPeer extends ComponentPeer { public abstract void setLabel(String label); diff --git a/java/awt/peer/CanvasPeer.java b/java/awt/peer/CanvasPeer.java index e2ce4b92b..0e4d7cb51 100644 --- a/java/awt/peer/CanvasPeer.java +++ b/java/awt/peer/CanvasPeer.java @@ -21,7 +21,7 @@ package java.awt.peer; -public interface CanvasPeer implements ComponentPeer +public interface CanvasPeer extends ComponentPeer { } // interface CanvasPeer diff --git a/java/awt/peer/CheckboxMenuItemPeer.java b/java/awt/peer/CheckboxMenuItemPeer.java index d5584a65d..82fc51dd3 100644 --- a/java/awt/peer/CheckboxMenuItemPeer.java +++ b/java/awt/peer/CheckboxMenuItemPeer.java @@ -21,7 +21,7 @@ package java.awt.peer; -public interface CheckboxMenuItemPeer implements MenuItemPeer +public interface CheckboxMenuItemPeer extends MenuItemPeer { public abstract void setState(boolean state); diff --git a/java/awt/peer/CheckboxPeer.java b/java/awt/peer/CheckboxPeer.java index 6cc52421a..120f3e3af 100644 --- a/java/awt/peer/CheckboxPeer.java +++ b/java/awt/peer/CheckboxPeer.java @@ -21,7 +21,7 @@ package java.awt.peer; -public interface CheckboxPeer implements ComponentPeer +public interface CheckboxPeer extends ComponentPeer { public abstract void setCheckboxGroup(java.awt.CheckboxGroup group); diff --git a/java/awt/peer/ChoicePeer.java b/java/awt/peer/ChoicePeer.java index 4c877ff48..b044bc2d5 100644 --- a/java/awt/peer/ChoicePeer.java +++ b/java/awt/peer/ChoicePeer.java @@ -21,7 +21,7 @@ package java.awt.peer; -public interface ChoicePeer implements ComponentPeer +public interface ChoicePeer extends ComponentPeer { public abstract void add(String item, int index); diff --git a/java/awt/peer/ContainerPeer.java b/java/awt/peer/ContainerPeer.java index 2ee5e812a..b5fb6f422 100644 --- a/java/awt/peer/ContainerPeer.java +++ b/java/awt/peer/ContainerPeer.java @@ -23,7 +23,7 @@ package java.awt.peer; import java.awt.Insets; -public interface ContainerPeer implements ComponentPeer +public interface ContainerPeer extends ComponentPeer { public abstract Insets insets(); diff --git a/java/awt/peer/DialogPeer.java b/java/awt/peer/DialogPeer.java index ce744f3e1..02bab9bea 100644 --- a/java/awt/peer/DialogPeer.java +++ b/java/awt/peer/DialogPeer.java @@ -21,7 +21,7 @@ package java.awt.peer; -public interface DialogPeer implements WindowPeer +public interface DialogPeer extends WindowPeer { public abstract void setResizable(boolean resizeable); diff --git a/java/awt/peer/FileDialogPeer.java b/java/awt/peer/FileDialogPeer.java index 2b67220fd..4d37221bc 100644 --- a/java/awt/peer/FileDialogPeer.java +++ b/java/awt/peer/FileDialogPeer.java @@ -23,7 +23,7 @@ package java.awt.peer; import java.io.FilenameFilter; -public interface FileDialogPeer implements DialogPeer +public interface FileDialogPeer extends DialogPeer { public abstract void setFile(String file); diff --git a/java/awt/peer/FramePeer.java b/java/awt/peer/FramePeer.java index 3445ef35b..4c8a80325 100644 --- a/java/awt/peer/FramePeer.java +++ b/java/awt/peer/FramePeer.java @@ -24,7 +24,7 @@ package java.awt.peer; import java.awt.Image; import java.awt.MenuBar; -public interface FramePeer implements WindowPeer +public interface FramePeer extends WindowPeer { public abstract void setIconImage(Image image); diff --git a/java/awt/peer/LabelPeer.java b/java/awt/peer/LabelPeer.java index 684bd8c77..e6d249b33 100644 --- a/java/awt/peer/LabelPeer.java +++ b/java/awt/peer/LabelPeer.java @@ -21,7 +21,7 @@ package java.awt.peer; -public interface LabelPeer implements ComponentPeer +public interface LabelPeer extends ComponentPeer { public abstract void setAlignment(int alignment); diff --git a/java/awt/peer/LightweightPeer.java b/java/awt/peer/LightweightPeer.java index fd0f219ba..99e836f22 100644 --- a/java/awt/peer/LightweightPeer.java +++ b/java/awt/peer/LightweightPeer.java @@ -21,7 +21,7 @@ package java.awt.peer; -public interface LightweightPeer implements ComponentPeer +public interface LightweightPeer extends ComponentPeer { } // interface LightweightPeer diff --git a/java/awt/peer/ListPeer.java b/java/awt/peer/ListPeer.java index 4658d8065..05cb2a1db 100644 --- a/java/awt/peer/ListPeer.java +++ b/java/awt/peer/ListPeer.java @@ -23,7 +23,7 @@ package java.awt.peer; import java.awt.Dimension; -public interface ListPeer implements ComponentPeer +public interface ListPeer extends ComponentPeer { public abstract void add(String item, int index); diff --git a/java/awt/peer/MenuBarPeer.java b/java/awt/peer/MenuBarPeer.java index c164e59ad..e54269202 100644 --- a/java/awt/peer/MenuBarPeer.java +++ b/java/awt/peer/MenuBarPeer.java @@ -23,7 +23,7 @@ package java.awt.peer; import java.awt.Menu; -public interface MenuBarPeer implements MenuComponentPeer +public interface MenuBarPeer extends MenuComponentPeer { public abstract void addHelpMenu(Menu menu); diff --git a/java/awt/peer/MenuItemPeer.java b/java/awt/peer/MenuItemPeer.java index e72c1d86b..f7ff02317 100644 --- a/java/awt/peer/MenuItemPeer.java +++ b/java/awt/peer/MenuItemPeer.java @@ -21,7 +21,7 @@ package java.awt.peer; -public interface MenuItemPeer implements MenuComponentPeer +public interface MenuItemPeer extends MenuComponentPeer { public abstract void disable(); diff --git a/java/awt/peer/MenuPeer.java b/java/awt/peer/MenuPeer.java index da65bc98e..e96b6cdff 100644 --- a/java/awt/peer/MenuPeer.java +++ b/java/awt/peer/MenuPeer.java @@ -23,7 +23,7 @@ package java.awt.peer; import java.awt.MenuItem; -public interface MenuPeer implements MenuItemPeer +public interface MenuPeer extends MenuItemPeer { public abstract void addItem(MenuItem item); diff --git a/java/awt/peer/PanelPeer.java b/java/awt/peer/PanelPeer.java index 47aa5b2bc..cc1259809 100644 --- a/java/awt/peer/PanelPeer.java +++ b/java/awt/peer/PanelPeer.java @@ -21,7 +21,7 @@ package java.awt.peer; -public interface PanelPeer implements ContainerPeer +public interface PanelPeer extends ContainerPeer { } // interface PanelPeer diff --git a/java/awt/peer/PopupMenuPeer.java b/java/awt/peer/PopupMenuPeer.java index b89ac01f6..703d95dd8 100644 --- a/java/awt/peer/PopupMenuPeer.java +++ b/java/awt/peer/PopupMenuPeer.java @@ -23,7 +23,7 @@ package java.awt.peer; import java.awt.Event; -public interface PopupMenuPeer implements MenuPeer +public interface PopupMenuPeer extends MenuPeer { public abstract void show(java.awt.Component component, int x, int y); diff --git a/java/awt/peer/ScrollPanePeer.java b/java/awt/peer/ScrollPanePeer.java index a98f3b81d..78c333f1e 100644 --- a/java/awt/peer/ScrollPanePeer.java +++ b/java/awt/peer/ScrollPanePeer.java @@ -23,7 +23,7 @@ package java.awt.peer; import java.awt.Adjustable; -public interface ScrollPanePeer implements ContainerPeer +public interface ScrollPanePeer extends ContainerPeer { public abstract int getHScrollbarHeight(); diff --git a/java/awt/peer/ScrollbarPeer.java b/java/awt/peer/ScrollbarPeer.java index 3c37d8b39..d397d6d70 100644 --- a/java/awt/peer/ScrollbarPeer.java +++ b/java/awt/peer/ScrollbarPeer.java @@ -21,7 +21,7 @@ package java.awt.peer; -public interface ScrollbarPeer implements ComponentPeer +public interface ScrollbarPeer extends ComponentPeer { public abstract void setLineIncrement(int inc); diff --git a/java/awt/peer/TextAreaPeer.java b/java/awt/peer/TextAreaPeer.java index 7c6b06842..2869f5cf9 100644 --- a/java/awt/peer/TextAreaPeer.java +++ b/java/awt/peer/TextAreaPeer.java @@ -23,7 +23,7 @@ package java.awt.peer; import java.awt.Dimension; -public interface TextAreaPeer implements TextComponentPeer +public interface TextAreaPeer extends TextComponentPeer { public abstract void insert(String text, int pos); diff --git a/java/awt/peer/TextComponentPeer.java b/java/awt/peer/TextComponentPeer.java index 085c42d86..c590eab0e 100644 --- a/java/awt/peer/TextComponentPeer.java +++ b/java/awt/peer/TextComponentPeer.java @@ -21,7 +21,7 @@ package java.awt.peer; -public interface TextComponentPeer implements ComponentPeer +public interface TextComponentPeer extends ComponentPeer { public abstract int getSelectionEnd(); diff --git a/java/awt/peer/TextFieldPeer.java b/java/awt/peer/TextFieldPeer.java index 9234d161a..cce99fa4d 100644 --- a/java/awt/peer/TextFieldPeer.java +++ b/java/awt/peer/TextFieldPeer.java @@ -23,7 +23,7 @@ package java.awt.peer; import java.awt.Dimension; -public interface TextFieldPeer implements TextComponentPeer +public interface TextFieldPeer extends TextComponentPeer { public abstract Dimension minimumSize(int len); diff --git a/java/awt/peer/WindowPeer.java b/java/awt/peer/WindowPeer.java index 54c4350bf..ebe627f78 100644 --- a/java/awt/peer/WindowPeer.java +++ b/java/awt/peer/WindowPeer.java @@ -21,7 +21,7 @@ package java.awt.peer; -public interface WindowPeer implements ContainerPeer +public interface WindowPeer extends ContainerPeer { public abstract void toBack(); |