diff options
24 files changed, 205 insertions, 152 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 78d5b34..6dae0331 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,5 +1,32 @@ 2003-10-11 Michael Koch <konqueror@gmx.de> + * java/awt/peer/ButtonPeer.java, + java/awt/peer/CheckboxMenuItemPeer.java, + java/awt/peer/CheckboxPeer.java, + java/awt/peer/ChoicePeer.java, + java/awt/peer/ComponentPeer.java, + java/awt/peer/ContainerPeer.java, + java/awt/peer/DialogPeer.java, + java/awt/peer/FileDialogPeer.java, + java/awt/peer/FramePeer.java, + java/awt/peer/LabelPeer.java, + java/awt/peer/ListPeer.java, + java/awt/peer/MenuBarPeer.java, + java/awt/peer/MenuComponentPeer.java, + java/awt/peer/MenuItemPeer.java, + java/awt/peer/MenuPeer.java, + java/awt/peer/PopupMenuPeer.java, + java/awt/peer/RobotPeer.java, + java/awt/peer/ScrollPanePeer.java, + java/awt/peer/ScrollbarPeer.java, + java/awt/peer/TextAreaPeer.java, + java/awt/peer/TextComponentPeer.java, + java/awt/peer/TextFieldPeer.java, + java/awt/peer/WindowPeer.java: + Removed redundant modifiers. + +2003-10-11 Michael Koch <konqueror@gmx.de> + * gnu/java/nio/NIOSocket.java (setChannel): Initialize impl. * gnu/java/nio/ServerSocketChannelImpl.java (serverSocket): Made it a NIOServerSocket. diff --git a/libjava/java/awt/peer/ButtonPeer.java b/libjava/java/awt/peer/ButtonPeer.java index 2824839..42eabc8 100644 --- a/libjava/java/awt/peer/ButtonPeer.java +++ b/libjava/java/awt/peer/ButtonPeer.java @@ -40,6 +40,7 @@ package java.awt.peer; public interface ButtonPeer extends ComponentPeer { - public void setLabel(String label); + void setLabel (String label); + } // interface ButtonPeer diff --git a/libjava/java/awt/peer/CheckboxMenuItemPeer.java b/libjava/java/awt/peer/CheckboxMenuItemPeer.java index b150a8b..f791d38 100644 --- a/libjava/java/awt/peer/CheckboxMenuItemPeer.java +++ b/libjava/java/awt/peer/CheckboxMenuItemPeer.java @@ -40,6 +40,7 @@ package java.awt.peer; public interface CheckboxMenuItemPeer extends MenuItemPeer { - public void setState(boolean state); + void setState (boolean state); + } // interface CheckboxMenuItemPeer diff --git a/libjava/java/awt/peer/CheckboxPeer.java b/libjava/java/awt/peer/CheckboxPeer.java index 4ffd79c..ad245be 100644 --- a/libjava/java/awt/peer/CheckboxPeer.java +++ b/libjava/java/awt/peer/CheckboxPeer.java @@ -38,10 +38,15 @@ exception statement from your version. */ package java.awt.peer; +import java.awt.CheckboxGroup; + public interface CheckboxPeer extends ComponentPeer { - public void setCheckboxGroup(java.awt.CheckboxGroup group); - public void setLabel(String label); - public void setState(boolean state); + void setCheckboxGroup (CheckboxGroup group); + + void setLabel (String label); + + void setState (boolean state); + } // interface CheckboxPeer diff --git a/libjava/java/awt/peer/ChoicePeer.java b/libjava/java/awt/peer/ChoicePeer.java index 228311c..c4a4cc0 100644 --- a/libjava/java/awt/peer/ChoicePeer.java +++ b/libjava/java/awt/peer/ChoicePeer.java @@ -40,10 +40,15 @@ package java.awt.peer; public interface ChoicePeer extends ComponentPeer { - public void add(String item, int index); - public void addItem(String item, int index); - public void remove(int index); - public void removeAll(); - public void select(int index); + void add (String item, int index); + + void addItem (String item, int index); + + void remove (int index); + + void removeAll(); + + void select (int index); + } // interface ChoicePeer diff --git a/libjava/java/awt/peer/ComponentPeer.java b/libjava/java/awt/peer/ComponentPeer.java index fc3c5f9..0776904 100644 --- a/libjava/java/awt/peer/ComponentPeer.java +++ b/libjava/java/awt/peer/ComponentPeer.java @@ -39,7 +39,10 @@ exception statement from your version. */ package java.awt.peer; import java.awt.AWTEvent; +import java.awt.AWTException; +import java.awt.BufferCapabilities; import java.awt.Color; +import java.awt.Component; import java.awt.Cursor; import java.awt.Dimension; import java.awt.Font; @@ -57,79 +60,79 @@ import java.awt.image.VolatileImage; public interface ComponentPeer { - public int checkImage(Image img, int width, int height, - ImageObserver ob); - public Image createImage(ImageProducer prod); - public Image createImage(int width, int height); - public void disable(); - public void dispose(); - public void enable(); - public ColorModel getColorModel(); - public FontMetrics getFontMetrics(Font f); - public Graphics getGraphics(); - public Point getLocationOnScreen(); - public Dimension getMinimumSize(); - public Dimension getPreferredSize(); - public Toolkit getToolkit(); - public void handleEvent(AWTEvent e); - public void hide(); + int checkImage(Image img, int width, int height, + ImageObserver ob); + Image createImage(ImageProducer prod); + Image createImage(int width, int height); + void disable(); + void dispose(); + void enable(); + ColorModel getColorModel(); + FontMetrics getFontMetrics(Font f); + Graphics getGraphics(); + Point getLocationOnScreen(); + Dimension getMinimumSize(); + Dimension getPreferredSize(); + Toolkit getToolkit(); + void handleEvent(AWTEvent e); + void hide(); /** * Part of the earlier 1.1 API, replaced by isFocusable(). */ - public boolean isFocusTraversable(); - public boolean isFocusable(); - public Dimension minimumSize(); - public Dimension preferredSize(); - public void paint(Graphics graphics); - public boolean prepareImage(Image img, int width, int height, + boolean isFocusTraversable(); + boolean isFocusable(); + Dimension minimumSize(); + Dimension preferredSize(); + void paint(Graphics graphics); + boolean prepareImage(Image img, int width, int height, ImageObserver ob); - public void print(Graphics graphics); - public void repaint(long tm, int x, int y, int width, int height); + void print(Graphics graphics); + void repaint(long tm, int x, int y, int width, int height); /** * Part of the earlier 1.1 API, apparently replaced by argument * form of the same method. */ - public void requestFocus(); - public boolean requestFocus(java.awt.Component source, boolean bool1, boolean bool2, long x); + void requestFocus(); + boolean requestFocus (Component source, boolean bool1, boolean bool2, long x); - public void reshape(int x, int y, int width, int height); - public void setBackground(Color color); - public void setBounds(int x, int y, int width, int height); + void reshape(int x, int y, int width, int height); + void setBackground(Color color); + void setBounds(int x, int y, int width, int height); /** * Part of the earlier 1.1 API, apparently no longer needed. */ - public void setCursor(Cursor cursor); + void setCursor(Cursor cursor); - public void setEnabled(boolean enabled); - public void setFont(Font font); - public void setForeground(Color color); - public void setVisible(boolean visible); - public void show(); + void setEnabled(boolean enabled); + void setFont(Font font); + void setForeground(Color color); + void setVisible(boolean visible); + void show(); /** * Get the graphics configuration of the component. The color model * of the component can be derived from the configuration. */ - public GraphicsConfiguration getGraphicsConfiguration(); + GraphicsConfiguration getGraphicsConfiguration(); /** * Part of an older API, no longer needed. */ - public void setEventMask (long mask); + void setEventMask (long mask); // Methods below are introduced since 1.1 - public boolean isObscured(); - public boolean canDetermineObscurity(); - public void coalescePaintEvent(PaintEvent e); - public void updateCursorImmediately(); - public VolatileImage createVolatileImage(int width, int height); - public boolean handlesWheelScrolling(); - public void createBuffers(int x, java.awt.BufferCapabilities capabilities) throws java.awt.AWTException; - public java.awt.Image getBackBuffer(); - public void flip(java.awt.BufferCapabilities.FlipContents contents); - public void destroyBuffers(); + boolean isObscured(); + boolean canDetermineObscurity(); + void coalescePaintEvent(PaintEvent e); + void updateCursorImmediately(); + VolatileImage createVolatileImage(int width, int height); + boolean handlesWheelScrolling(); + void createBuffers(int x, BufferCapabilities capabilities) throws AWTException; + Image getBackBuffer(); + void flip(BufferCapabilities.FlipContents contents); + void destroyBuffers(); } diff --git a/libjava/java/awt/peer/ContainerPeer.java b/libjava/java/awt/peer/ContainerPeer.java index b691b89..f06fe2f 100644 --- a/libjava/java/awt/peer/ContainerPeer.java +++ b/libjava/java/awt/peer/ContainerPeer.java @@ -41,12 +41,19 @@ import java.awt.Insets; public interface ContainerPeer extends ComponentPeer { - public Insets insets(); - public Insets getInsets(); - public void beginValidate(); - public void endValidate(); - public void beginLayout(); - public void endLayout(); - public boolean isPaintPending(); + Insets insets(); + + Insets getInsets(); + + void beginValidate(); + + void endValidate(); + + void beginLayout(); + + void endLayout(); + + boolean isPaintPending(); + } // interface ContainerPeer diff --git a/libjava/java/awt/peer/DialogPeer.java b/libjava/java/awt/peer/DialogPeer.java index b97798e..86d5dcd 100644 --- a/libjava/java/awt/peer/DialogPeer.java +++ b/libjava/java/awt/peer/DialogPeer.java @@ -40,7 +40,9 @@ package java.awt.peer; public interface DialogPeer extends WindowPeer { - public void setResizable(boolean resizeable); - public void setTitle(String title); + void setResizable (boolean resizeable); + + void setTitle (String title); + } // interface DialogPeer diff --git a/libjava/java/awt/peer/FileDialogPeer.java b/libjava/java/awt/peer/FileDialogPeer.java index 49fa01f..cfce642 100644 --- a/libjava/java/awt/peer/FileDialogPeer.java +++ b/libjava/java/awt/peer/FileDialogPeer.java @@ -42,8 +42,11 @@ import java.io.FilenameFilter; public interface FileDialogPeer extends DialogPeer { - public void setFile(String file); - public void setDirectory(String dir); - public void setFilenameFilter(FilenameFilter ff); + void setFile (String file); + + void setDirectory (String dir); + + void setFilenameFilter (FilenameFilter ff); + } // interface FileDialogPeer diff --git a/libjava/java/awt/peer/FramePeer.java b/libjava/java/awt/peer/FramePeer.java index c354275..4d1af2b 100644 --- a/libjava/java/awt/peer/FramePeer.java +++ b/libjava/java/awt/peer/FramePeer.java @@ -44,12 +44,12 @@ import java.awt.Rectangle; public interface FramePeer extends WindowPeer { - public void setIconImage(Image image); - public void setMenuBar(MenuBar mb); - public void setResizable(boolean resizable); - public void setTitle(String title); - public int getState(); - public void setState(int state); - public void setMaximizedBounds(Rectangle r); + void setIconImage(Image image); + void setMenuBar(MenuBar mb); + void setResizable(boolean resizable); + void setTitle(String title); + int getState(); + void setState(int state); + void setMaximizedBounds(Rectangle r); } // interface FramePeer diff --git a/libjava/java/awt/peer/LabelPeer.java b/libjava/java/awt/peer/LabelPeer.java index 5eefcd0..3020bc6 100644 --- a/libjava/java/awt/peer/LabelPeer.java +++ b/libjava/java/awt/peer/LabelPeer.java @@ -40,7 +40,7 @@ package java.awt.peer; public interface LabelPeer extends ComponentPeer { - public void setAlignment(int alignment); - public void setText(String text); + void setAlignment(int alignment); + void setText(String text); } // interface LabelPeer diff --git a/libjava/java/awt/peer/ListPeer.java b/libjava/java/awt/peer/ListPeer.java index 1ba86ae..f1c2dfe 100644 --- a/libjava/java/awt/peer/ListPeer.java +++ b/libjava/java/awt/peer/ListPeer.java @@ -42,21 +42,20 @@ import java.awt.Dimension; public interface ListPeer extends ComponentPeer { - - public void add(String item, int index); - public void addItem(String item, int index); - public void clear(); - public void delItems(int start_index, int end_index); - public void deselect(int index); - public int[] getSelectedIndexes(); - public void makeVisible(int index); - public Dimension minimumSize(int s); - public Dimension preferredSize(int s); - public void removeAll(); - public void select(int index); - public void setMultipleMode(boolean multi); - public void setMultipleSelections(boolean multi); - public Dimension getPreferredSize(int s); - public Dimension getMinimumSize(int s); + void add(String item, int index); + void addItem(String item, int index); + void clear(); + void delItems(int start_index, int end_index); + void deselect(int index); + int[] getSelectedIndexes(); + void makeVisible(int index); + Dimension minimumSize(int s); + Dimension preferredSize(int s); + void removeAll(); + void select(int index); + void setMultipleMode(boolean multi); + void setMultipleSelections(boolean multi); + Dimension getPreferredSize(int s); + Dimension getMinimumSize(int s); } // interface ListPeer diff --git a/libjava/java/awt/peer/MenuBarPeer.java b/libjava/java/awt/peer/MenuBarPeer.java index de6e5bc..38f57ec 100644 --- a/libjava/java/awt/peer/MenuBarPeer.java +++ b/libjava/java/awt/peer/MenuBarPeer.java @@ -42,8 +42,8 @@ import java.awt.Menu; public interface MenuBarPeer extends MenuComponentPeer { - public void addHelpMenu(Menu menu); - public void addMenu(Menu menu); - public void delMenu(int index); + void addHelpMenu(Menu menu); + void addMenu(Menu menu); + void delMenu(int index); } // interface MenuBarPeer diff --git a/libjava/java/awt/peer/MenuComponentPeer.java b/libjava/java/awt/peer/MenuComponentPeer.java index 5db9e71..ebc21b6 100644 --- a/libjava/java/awt/peer/MenuComponentPeer.java +++ b/libjava/java/awt/peer/MenuComponentPeer.java @@ -40,6 +40,6 @@ package java.awt.peer; public interface MenuComponentPeer { - public void dispose(); + void dispose(); } // interface MenuComponentPeer diff --git a/libjava/java/awt/peer/MenuItemPeer.java b/libjava/java/awt/peer/MenuItemPeer.java index 7038f93..e34c2e7 100644 --- a/libjava/java/awt/peer/MenuItemPeer.java +++ b/libjava/java/awt/peer/MenuItemPeer.java @@ -40,9 +40,9 @@ package java.awt.peer; public interface MenuItemPeer extends MenuComponentPeer { - public void disable(); - public void enable(); - public void setEnabled(boolean enabled); - public void setLabel(String text); + void disable(); + void enable(); + void setEnabled(boolean enabled); + void setLabel(String text); } // interface MenuItemPeer diff --git a/libjava/java/awt/peer/MenuPeer.java b/libjava/java/awt/peer/MenuPeer.java index ee8a900..67f213f 100644 --- a/libjava/java/awt/peer/MenuPeer.java +++ b/libjava/java/awt/peer/MenuPeer.java @@ -42,8 +42,8 @@ import java.awt.MenuItem; public interface MenuPeer extends MenuItemPeer { - public void addItem (MenuItem item); - public void addSeparator (); - public void delItem (int index); + void addItem (MenuItem item); + void addSeparator (); + void delItem (int index); } diff --git a/libjava/java/awt/peer/PopupMenuPeer.java b/libjava/java/awt/peer/PopupMenuPeer.java index 46278da..bb8202e 100644 --- a/libjava/java/awt/peer/PopupMenuPeer.java +++ b/libjava/java/awt/peer/PopupMenuPeer.java @@ -43,11 +43,11 @@ import java.awt.Event; public interface PopupMenuPeer extends MenuPeer { - /** * Part of the older API, replaced by event version instead. */ - public void show (Component origin, int x, int y); - public void show (Event e); + void show (Component origin, int x, int y); + + void show (Event e); } // interface PopupMenuPeer diff --git a/libjava/java/awt/peer/RobotPeer.java b/libjava/java/awt/peer/RobotPeer.java index ee90347..2daa14d 100644 --- a/libjava/java/awt/peer/RobotPeer.java +++ b/libjava/java/awt/peer/RobotPeer.java @@ -42,13 +42,13 @@ import java.awt.Rectangle; public interface RobotPeer { - public void mouseMove (int x, int y); - public void mousePress (int x); - public void mouseRelease (int x); - public void mouseWheel (int x); - public void keyPress (int x); - public void keyRelease (int x); - public int getRGBPixel (int x, int y); - public int[] getRGBPixels (Rectangle r); + void mouseMove (int x, int y); + void mousePress (int x); + void mouseRelease (int x); + void mouseWheel (int x); + void keyPress (int x); + void keyRelease (int x); + int getRGBPixel (int x, int y); + int[] getRGBPixels (Rectangle r); } // interface RobotPeer diff --git a/libjava/java/awt/peer/ScrollPanePeer.java b/libjava/java/awt/peer/ScrollPanePeer.java index 411f443..a81b91f 100644 --- a/libjava/java/awt/peer/ScrollPanePeer.java +++ b/libjava/java/awt/peer/ScrollPanePeer.java @@ -42,11 +42,11 @@ import java.awt.Adjustable; public interface ScrollPanePeer extends ContainerPeer { - public int getHScrollbarHeight(); - public int getVScrollbarWidth(); - public void setScrollPosition(int h, int v); - public void childResized(int width, int height); - public void setUnitIncrement(Adjustable item, int inc); - public void setValue(Adjustable item, int value); + int getHScrollbarHeight(); + int getVScrollbarWidth(); + void setScrollPosition(int h, int v); + void childResized(int width, int height); + void setUnitIncrement(Adjustable item, int inc); + void setValue(Adjustable item, int value); } // interface ScollPanePeer diff --git a/libjava/java/awt/peer/ScrollbarPeer.java b/libjava/java/awt/peer/ScrollbarPeer.java index c81eaa9..fc8c54f 100644 --- a/libjava/java/awt/peer/ScrollbarPeer.java +++ b/libjava/java/awt/peer/ScrollbarPeer.java @@ -40,8 +40,8 @@ package java.awt.peer; public interface ScrollbarPeer extends ComponentPeer { - public void setLineIncrement(int inc); - public void setPageIncrement(int inc); - public void setValues(int value, int visible, int min, int max); + void setLineIncrement(int inc); + void setPageIncrement(int inc); + void setValues(int value, int visible, int min, int max); } // interface ScrollbarPeer diff --git a/libjava/java/awt/peer/TextAreaPeer.java b/libjava/java/awt/peer/TextAreaPeer.java index 425c70f..2500914 100644 --- a/libjava/java/awt/peer/TextAreaPeer.java +++ b/libjava/java/awt/peer/TextAreaPeer.java @@ -42,12 +42,12 @@ import java.awt.Dimension; public interface TextAreaPeer extends TextComponentPeer { - public void insert(String text, int pos); - public void insertText(String text, int pos); - public Dimension minimumSize(int rows, int cols); - public Dimension getMinimumSize(int rows, int cols); - public Dimension preferredSize(int rows, int cols); - public Dimension getPreferredSize(int rows, int cols); - public void replaceRange(String text, int start_pos, int end_pos); - public void replaceText(String text, int start_pos, int end_pos); + void insert(String text, int pos); + void insertText(String text, int pos); + Dimension minimumSize(int rows, int cols); + Dimension getMinimumSize(int rows, int cols); + Dimension preferredSize(int rows, int cols); + Dimension getPreferredSize(int rows, int cols); + void replaceRange(String text, int start_pos, int end_pos); + void replaceText(String text, int start_pos, int end_pos); } // interface TextAreaPeer diff --git a/libjava/java/awt/peer/TextComponentPeer.java b/libjava/java/awt/peer/TextComponentPeer.java index 1dd2e44..62a2f42 100644 --- a/libjava/java/awt/peer/TextComponentPeer.java +++ b/libjava/java/awt/peer/TextComponentPeer.java @@ -42,16 +42,16 @@ import java.awt.Rectangle; public interface TextComponentPeer extends ComponentPeer { - public int getSelectionEnd(); - public int getSelectionStart(); - public String getText(); - public void setText(String text); - public void select(int start_pos, int end_pos); - public void setEditable(boolean editable); - public int getCaretPosition(); - public void setCaretPosition(int pos); - public int getIndexAtPoint(int x, int y); - public Rectangle getCharacterBounds(int pos); - public long filterEvents(long filter); + int getSelectionEnd(); + int getSelectionStart(); + String getText(); + void setText(String text); + void select(int start_pos, int end_pos); + void setEditable(boolean editable); + int getCaretPosition(); + void setCaretPosition(int pos); + int getIndexAtPoint(int x, int y); + Rectangle getCharacterBounds(int pos); + long filterEvents(long filter); } // interface TextComponentPeer diff --git a/libjava/java/awt/peer/TextFieldPeer.java b/libjava/java/awt/peer/TextFieldPeer.java index 302e3a6..a29bb55 100644 --- a/libjava/java/awt/peer/TextFieldPeer.java +++ b/libjava/java/awt/peer/TextFieldPeer.java @@ -42,11 +42,11 @@ import java.awt.Dimension; public interface TextFieldPeer extends TextComponentPeer { - public Dimension minimumSize(int len); - public Dimension preferredSize(int len); - public Dimension getMinimumSize(int len); - public Dimension getPreferredSize(int len); - public void setEchoChar(char echo_char); - public void setEchoCharacter(char echo_char); + Dimension minimumSize(int len); + Dimension preferredSize(int len); + Dimension getMinimumSize(int len); + Dimension getPreferredSize(int len); + void setEchoChar(char echo_char); + void setEchoCharacter(char echo_char); } // interface TextFieldPeer diff --git a/libjava/java/awt/peer/WindowPeer.java b/libjava/java/awt/peer/WindowPeer.java index aa0004e..c98b1dac 100644 --- a/libjava/java/awt/peer/WindowPeer.java +++ b/libjava/java/awt/peer/WindowPeer.java @@ -40,7 +40,7 @@ package java.awt.peer; public interface WindowPeer extends ContainerPeer { - public void toBack(); - public void toFront(); + void toBack(); + void toFront(); } // interface WindowPeer |