diff options
22 files changed, 174 insertions, 149 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index cd571a3..23c46a2 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,28 @@ +2003-10-12 Michael Koch <konqueror@gmx.de> + + * javax/swing/Action.java, + javax/swing/BoundedRangeModel.java, + javax/swing/CellEditor.java, + javax/swing/ComboBoxEditor.java, + javax/swing/ComboBoxModel.java, + javax/swing/DesktopManager.java, + javax/swing/JComboBox.java, + javax/swing/ListCellRenderer.java, + javax/swing/ListSelectionModel.java, + javax/swing/MenuElement.java, + javax/swing/MutableComboBoxModel.java, + javax/swing/Renderer.java, + javax/swing/RootPaneContainer.java, + javax/swing/ScrollPaneConstants.java, + javax/swing/SingleSelectionModel.java, + javax/swing/SpinnerModel.java, + javax/swing/SwingConstants.java, + javax/swing/UIDefaults.java, + javax/swing/WindowConstants.java, + javax/swing/border/Border.java, + javax/swing/colorchooser/ColorSelectionModel.java: + Removed redundant modifiers. + 2003-10-11 Michael Koch <konqueror@gmx.de> * javax/transaction/Status.java, diff --git a/libjava/javax/swing/Action.java b/libjava/javax/swing/Action.java index c091a261e..d1650b2 100644 --- a/libjava/javax/swing/Action.java +++ b/libjava/javax/swing/Action.java @@ -56,42 +56,42 @@ public interface Action extends ActionListener { /** * DEFAULT */ - public static final String DEFAULT = "Default"; + String DEFAULT = "Default"; /** * LONG_DESCRIPTION */ - public static final String LONG_DESCRIPTION = "LongDescription"; + String LONG_DESCRIPTION = "LongDescription"; /** * NAME */ - public static final String NAME = "Name"; + String NAME = "Name"; /** * SHORT_DESCRIPTION */ - public static final String SHORT_DESCRIPTION = "ShortDescription"; + String SHORT_DESCRIPTION = "ShortDescription"; /** * SMALL_ICON */ - public static final String SMALL_ICON = "SmallIcon"; + String SMALL_ICON = "SmallIcon"; /** * ACCELERATOR_KEY */ - public static final String ACCELERATOR_KEY = "AcceleratorKey"; + String ACCELERATOR_KEY = "AcceleratorKey"; /** * ACTION_COMMAND_KEY */ - public static final String ACTION_COMMAND_KEY = "ActionCommandKey"; + String ACTION_COMMAND_KEY = "ActionCommandKey"; /** * MNEMONIC_KEY */ - public static final String MNEMONIC_KEY = "MnemonicKey"; + String MNEMONIC_KEY = "MnemonicKey"; //------------------------------------------------------------- @@ -103,38 +103,38 @@ public interface Action extends ActionListener { * @param key TODO * @returns TODO */ - public Object getValue(String key); + Object getValue(String key); /** * setValue * @param key TODO * @param value TODO */ - public void putValue(String key, Object value); + void putValue(String key, Object value); /** * isEnabled * @returns TODO */ - public boolean isEnabled(); + boolean isEnabled(); /** * setEnabled * @param b TODO */ - public void setEnabled(boolean b); + void setEnabled(boolean b); /** * addPropertyChangeListener * @param listener TODO */ - public void addPropertyChangeListener(PropertyChangeListener listener); + void addPropertyChangeListener(PropertyChangeListener listener); /** * removePropertyChangeListener * @param listener TODO */ - public void removePropertyChangeListener(PropertyChangeListener listener); + void removePropertyChangeListener(PropertyChangeListener listener); } // Action diff --git a/libjava/javax/swing/BoundedRangeModel.java b/libjava/javax/swing/BoundedRangeModel.java index d2db876..76bbb20 100644 --- a/libjava/javax/swing/BoundedRangeModel.java +++ b/libjava/javax/swing/BoundedRangeModel.java @@ -55,61 +55,61 @@ public interface BoundedRangeModel { * getValue * @returns int */ - public int getValue(); + int getValue(); /** * setValue * @param value TODO */ - public void setValue(int value); + void setValue(int value); /** * getMinimum * @returns int */ - public int getMinimum(); + int getMinimum(); /** * setMinimum * @param minimum TODO */ - public void setMinimum(int minimum); + void setMinimum(int minimum); /** * getMaximum * @returns int */ - public int getMaximum(); + int getMaximum(); /** * setMaximum * @param maximum TODO */ - public void setMaximum(int maximum); + void setMaximum(int maximum); /** * getValueIsAdjusting * @returns boolean */ - public boolean getValueIsAdjusting(); + boolean getValueIsAdjusting(); /** * setValueIsAdjusting * @param adjusting TODO */ - public void setValueIsAdjusting(boolean adjusting); + void setValueIsAdjusting(boolean adjusting); /** * getExtent * @returns int */ - public int getExtent(); + int getExtent(); /** * setExtent * @param extent TODO */ - public void setExtent(int extent); + void setExtent(int extent); /** * setRangeProperties @@ -119,20 +119,20 @@ public interface BoundedRangeModel { * @param max TODO * @param adjusting TODO */ - public void setRangeProperties(int value, int extent, int min, + void setRangeProperties(int value, int extent, int min, int max, boolean adjusting); /** * addChangeListener * @param listener TODO */ - public void addChangeListener(ChangeListener listener); + void addChangeListener(ChangeListener listener); /** * removeChangeListener * @param listener TODO */ - public void removeChangeListener(ChangeListener listener); + void removeChangeListener(ChangeListener listener); } // BoundedRangeModel diff --git a/libjava/javax/swing/CellEditor.java b/libjava/javax/swing/CellEditor.java index 63a1ff4..e1c3ece 100644 --- a/libjava/javax/swing/CellEditor.java +++ b/libjava/javax/swing/CellEditor.java @@ -56,44 +56,44 @@ public interface CellEditor { * getCellEditorValue * @returns Object */ - public Object getCellEditorValue(); + Object getCellEditorValue(); /** * isCellEditable * @param event TODO * @returns boolean */ - public boolean isCellEditable(EventObject event); + boolean isCellEditable(EventObject event); /** * shouldSelectCell * @param event TODO * @returns boolean */ - public boolean shouldSelectCell(EventObject event); + boolean shouldSelectCell(EventObject event); /** * stopCellEditing * @returns boolean */ - public boolean stopCellEditing(); + boolean stopCellEditing(); /** * cancelCellEditing */ - public void cancelCellEditing(); + void cancelCellEditing(); /** * addCellEditorListener * @param value0 TODO */ - public void addCellEditorListener(CellEditorListener listener); + void addCellEditorListener(CellEditorListener listener); /** * removeCellEditorListener * @param listener TODO */ - public void removeCellEditorListener(CellEditorListener listener); + void removeCellEditorListener(CellEditorListener listener); } // CellEditor diff --git a/libjava/javax/swing/ComboBoxEditor.java b/libjava/javax/swing/ComboBoxEditor.java index 8235273..080e615 100644 --- a/libjava/javax/swing/ComboBoxEditor.java +++ b/libjava/javax/swing/ComboBoxEditor.java @@ -56,36 +56,36 @@ public interface ComboBoxEditor { * getEditorComponent * @returns Component */ - public Component getEditorComponent(); + Component getEditorComponent(); /** * setItem * @param item TODO */ - public void setItem(Object item); + void setItem(Object item); /** * getItem * @returns Object */ - public Object getItem(); + Object getItem(); /** * selectAll */ - public void selectAll(); + void selectAll(); /** * addActionListener * @param listener TODO */ - public void addActionListener(ActionListener listener); + void addActionListener(ActionListener listener); /** * removeActionListener * @param listener TODO */ - public void removeActionListener(ActionListener listener); + void removeActionListener(ActionListener listener); } // ComboBoxEditor diff --git a/libjava/javax/swing/ComboBoxModel.java b/libjava/javax/swing/ComboBoxModel.java index f208aa9..b3b2112 100644 --- a/libjava/javax/swing/ComboBoxModel.java +++ b/libjava/javax/swing/ComboBoxModel.java @@ -52,13 +52,13 @@ public interface ComboBoxModel extends ListModel { * setSelectedItem * @param item TODO */ - public void setSelectedItem(Object item); + void setSelectedItem(Object item); /** * getSelectedItem * @returns Object */ - public Object getSelectedItem(); + Object getSelectedItem(); } // ComboBoxModel diff --git a/libjava/javax/swing/DesktopManager.java b/libjava/javax/swing/DesktopManager.java index 898d79e..222039d 100644 --- a/libjava/javax/swing/DesktopManager.java +++ b/libjava/javax/swing/DesktopManager.java @@ -52,55 +52,55 @@ public interface DesktopManager { * openFrame * @param frame TODO */ - public void openFrame(JInternalFrame frame); + void openFrame(JInternalFrame frame); /** * closeFrame * @param frame TODO */ - public void closeFrame(JInternalFrame frame); + void closeFrame(JInternalFrame frame); /** * maximizeFrame * @param frame TODO */ - public void maximizeFrame(JInternalFrame frame); + void maximizeFrame(JInternalFrame frame); /** * minimizeFrame * @param frame TODO */ - public void minimizeFrame(JInternalFrame frame); + void minimizeFrame(JInternalFrame frame); /** * iconifyFrame * @param frame TODO */ - public void iconifyFrame(JInternalFrame frame); + void iconifyFrame(JInternalFrame frame); /** * deiconifyFrame * @param frame TODO */ - public void deiconifyFrame(JInternalFrame frame); + void deiconifyFrame(JInternalFrame frame); /** * activateFrame * @param frame TODO */ - public void activateFrame(JInternalFrame vframe); + void activateFrame(JInternalFrame vframe); /** * deactivateFrame * @param frame TODO */ - public void deactivateFrame(JInternalFrame frame); + void deactivateFrame(JInternalFrame frame); /** * beginDraggingFrame * @param frame TODO */ - public void beginDraggingFrame(JComponent frame); + void beginDraggingFrame(JComponent frame); /** * dragFrame @@ -108,20 +108,20 @@ public interface DesktopManager { * @param x TODO * @param y TODO */ - public void dragFrame(JComponent frame, int x, int y); + void dragFrame(JComponent frame, int x, int y); /** * endDraggingFrame * @param frame TODO */ - public void endDraggingFrame(JComponent frame); + void endDraggingFrame(JComponent frame); /** * beginResizingFrame * @param frame TODO * @param direction TODO */ - public void beginResizingFrame(JComponent frame, int direction); + void beginResizingFrame(JComponent frame, int direction); /** * resizeFrame @@ -131,14 +131,14 @@ public interface DesktopManager { * @param width TODO * @param height TODO */ - public void resizeFrame(JComponent frame, int x, int y, + void resizeFrame(JComponent frame, int x, int y, int width, int height); /** * endResizingFrame * @param frame TODO */ - public void endResizingFrame(JComponent frame); + void endResizingFrame(JComponent frame); /** * setBoundsForFrame @@ -148,7 +148,7 @@ public interface DesktopManager { * @param width TODO * @param height TODO */ - public void setBoundsForFrame(JComponent frame, int x, int y, + void setBoundsForFrame(JComponent frame, int x, int y, int width, int height); diff --git a/libjava/javax/swing/JComboBox.java b/libjava/javax/swing/JComboBox.java index c854520..6da2b2e 100644 --- a/libjava/javax/swing/JComboBox.java +++ b/libjava/javax/swing/JComboBox.java @@ -232,7 +232,7 @@ public class JComboBox extends JComponent * @param value1 TODO * @returns int */ - public abstract int selectionForKey(char value0, ComboBoxModel value1); + int selectionForKey(char value0, ComboBoxModel value1); } // KeySelectionManager diff --git a/libjava/javax/swing/ListCellRenderer.java b/libjava/javax/swing/ListCellRenderer.java index 20cb97e..36bc964 100644 --- a/libjava/javax/swing/ListCellRenderer.java +++ b/libjava/javax/swing/ListCellRenderer.java @@ -41,7 +41,7 @@ import java.awt.*; public interface ListCellRenderer { - public Component getListCellRendererComponent(JList list, + Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, diff --git a/libjava/javax/swing/ListSelectionModel.java b/libjava/javax/swing/ListSelectionModel.java index f456847..4314667 100644 --- a/libjava/javax/swing/ListSelectionModel.java +++ b/libjava/javax/swing/ListSelectionModel.java @@ -42,9 +42,9 @@ import javax.swing.event.ListSelectionListener; public interface ListSelectionModel { - final static int SINGLE_SELECTION = 0; - final static int SINGLE_INTERVAL_SELECTION = 1; - final static int MULTIPLE_INTERVAL_SELECTION = 1; + int SINGLE_SELECTION = 0; + int SINGLE_INTERVAL_SELECTION = 1; + int MULTIPLE_INTERVAL_SELECTION = 1; void setSelectionMode(int a); int getSelectionMode(); diff --git a/libjava/javax/swing/MenuElement.java b/libjava/javax/swing/MenuElement.java index 24fd6e0..3f198a7 100644 --- a/libjava/javax/swing/MenuElement.java +++ b/libjava/javax/swing/MenuElement.java @@ -58,7 +58,7 @@ public interface MenuElement { * @param path TODO * @param manager TODO */ - public void processMouseEvent(MouseEvent event, + void processMouseEvent(MouseEvent event, MenuElement[] path, MenuSelectionManager manager); /** @@ -67,26 +67,26 @@ public interface MenuElement { * @param path TODO * @param manager TODO */ - public abstract void processKeyEvent(KeyEvent event, + void processKeyEvent(KeyEvent event, MenuElement[] path, MenuSelectionManager manager); /** * menuSelectionChanged * @param included TODO */ - public abstract void menuSelectionChanged(boolean included); + void menuSelectionChanged(boolean included); /** * getSubElements * @returns MenuElement[] */ - public abstract MenuElement[] getSubElements(); + MenuElement[] getSubElements(); /** * getComponent * @returns Component */ - public abstract Component getComponent(); + Component getComponent(); } // MenuElement diff --git a/libjava/javax/swing/MutableComboBoxModel.java b/libjava/javax/swing/MutableComboBoxModel.java index f722e9c..678aeaf 100644 --- a/libjava/javax/swing/MutableComboBoxModel.java +++ b/libjava/javax/swing/MutableComboBoxModel.java @@ -52,26 +52,26 @@ public interface MutableComboBoxModel extends ComboBoxModel { * addElement * @param object TODO */ - public void addElement(Object object); + void addElement(Object object); /** * removeElementAt * @param index TODO */ - public void removeElementAt(int index); + void removeElementAt(int index); /** * insertElementAt * @param object TODO * @param index TODO */ - public void insertElementAt(Object object, int index); + void insertElementAt(Object object, int index); /** * removeElement * @param object TODO */ - public void removeElement(Object object); + void removeElement(Object object); } // MutableComboBoxModel diff --git a/libjava/javax/swing/Renderer.java b/libjava/javax/swing/Renderer.java index 1c66779..4cf5d5e 100644 --- a/libjava/javax/swing/Renderer.java +++ b/libjava/javax/swing/Renderer.java @@ -56,13 +56,13 @@ public interface Renderer { * @param value TODO * @param selected TODO */ - public void setValue(Object value, boolean selected); + void setValue(Object value, boolean selected); /** * getComponent * @returns Component */ - public Component getComponent(); + Component getComponent(); } // Renderer diff --git a/libjava/javax/swing/RootPaneContainer.java b/libjava/javax/swing/RootPaneContainer.java index 983e971..0bc37c9 100644 --- a/libjava/javax/swing/RootPaneContainer.java +++ b/libjava/javax/swing/RootPaneContainer.java @@ -55,43 +55,43 @@ public interface RootPaneContainer { * getRootPane * @returns JRootPane */ - public JRootPane getRootPane(); + JRootPane getRootPane(); /** * setContentPane * @param contentPane TODO */ - public void setContentPane(Container contentPane); + void setContentPane(Container contentPane); /** * getContentPane * @returns Container */ - public Container getContentPane(); + Container getContentPane(); /** * setLayeredPane * @param layeredPane TODO */ - public void setLayeredPane(JLayeredPane layeredPane); + void setLayeredPane(JLayeredPane layeredPane); /** * getLayeredPane * @returns JLayeredPane */ - public JLayeredPane getLayeredPane(); + JLayeredPane getLayeredPane(); /** * setGlassPane * @param glassPane TODO */ - public void setGlassPane(Component glassPane); + void setGlassPane(Component glassPane); /** * getGlassPane * @returns Component */ - public Component getGlassPane(); + Component getGlassPane(); } // RootPaneContainer diff --git a/libjava/javax/swing/ScrollPaneConstants.java b/libjava/javax/swing/ScrollPaneConstants.java index 6f9edb8..e08fedb 100644 --- a/libjava/javax/swing/ScrollPaneConstants.java +++ b/libjava/javax/swing/ScrollPaneConstants.java @@ -51,107 +51,107 @@ public interface ScrollPaneConstants { /** * VIEWPORT */ - public static final String VIEWPORT = "VIEWPORT"; + String VIEWPORT = "VIEWPORT"; /** * VERTICAL_SCROLLBAR */ - public static final String VERTICAL_SCROLLBAR = "VERTICAL_SCROLLBAR"; + String VERTICAL_SCROLLBAR = "VERTICAL_SCROLLBAR"; /** * HORIZONTAL_SCROLLBAR */ - public static final String HORIZONTAL_SCROLLBAR = "HORIZONTAL_SCROLLBAR"; + String HORIZONTAL_SCROLLBAR = "HORIZONTAL_SCROLLBAR"; /** * ROW_HEADER */ - public static final String ROW_HEADER = "ROW_HEADER"; + String ROW_HEADER = "ROW_HEADER"; /** * COLUMN_HEADER */ - public static final String COLUMN_HEADER = "COLUMN_HEADER"; + String COLUMN_HEADER = "COLUMN_HEADER"; /** * LOWER_LEFT_CORNER */ - public static final String LOWER_LEFT_CORNER = "LOWER_LEFT_CORNER"; + String LOWER_LEFT_CORNER = "LOWER_LEFT_CORNER"; /** * LOWER_RIGHT_CORNER */ - public static final String LOWER_RIGHT_CORNER = "LOWER_RIGHT_CORNER"; + String LOWER_RIGHT_CORNER = "LOWER_RIGHT_CORNER"; /** * UPPER_LEFT_CORNER */ - public static final String UPPER_LEFT_CORNER = "UPPER_LEFT_CORNER"; + String UPPER_LEFT_CORNER = "UPPER_LEFT_CORNER"; /** * UPPER_RIGHT_CORNER */ - public static final String UPPER_RIGHT_CORNER = "UPPER_RIGHT_CORNER"; + String UPPER_RIGHT_CORNER = "UPPER_RIGHT_CORNER"; /** * LOWER_LEADING_CORNER */ - public static final String LOWER_LEADING_CORNER = "LOWER_LEADING_CORNER"; + String LOWER_LEADING_CORNER = "LOWER_LEADING_CORNER"; /** * LOWER_TRAILING_CORNER */ - public static final String LOWER_TRAILING_CORNER = "LOWER_TRAILING_CORNER"; + String LOWER_TRAILING_CORNER = "LOWER_TRAILING_CORNER"; /** * UPPER_LEADING_CORNER */ - public static final String UPPER_LEADING_CORNER = "UPPER_LEADING_CORNER"; + String UPPER_LEADING_CORNER = "UPPER_LEADING_CORNER"; /** * UPPER_TRAILING_CORNER */ - public static final String UPPER_TRAILING_CORNER = "UPPER_TRAILING_CORNER"; + String UPPER_TRAILING_CORNER = "UPPER_TRAILING_CORNER"; /** * VERTICAL_SCROLLBAR_POLICY */ - public static final String VERTICAL_SCROLLBAR_POLICY = "VERTICAL_SCROLLBAR_POLICY"; + String VERTICAL_SCROLLBAR_POLICY = "VERTICAL_SCROLLBAR_POLICY"; /** * HORIZONTAL_SCROLLBAR_POLICY */ - public static final String HORIZONTAL_SCROLLBAR_POLICY = "HORIZONTAL_SCROLLBAR_POLICY"; + String HORIZONTAL_SCROLLBAR_POLICY = "HORIZONTAL_SCROLLBAR_POLICY"; /** * VERTICAL_SCROLLBAR_AS_NEEDED */ - public static final int VERTICAL_SCROLLBAR_AS_NEEDED = 20; + int VERTICAL_SCROLLBAR_AS_NEEDED = 20; /** * VERTICAL_SCROLLBAR_NEVER */ - public static final int VERTICAL_SCROLLBAR_NEVER = 21; + int VERTICAL_SCROLLBAR_NEVER = 21; /** * VERTICAL_SCROLLBAR_ALWAYS */ - public static final int VERTICAL_SCROLLBAR_ALWAYS = 22; + int VERTICAL_SCROLLBAR_ALWAYS = 22; /** * HORIZONTAL_SCROLLBAR_AS_NEEDED */ - public static final int HORIZONTAL_SCROLLBAR_AS_NEEDED = 30; + int HORIZONTAL_SCROLLBAR_AS_NEEDED = 30; /** * HORIZONTAL_SCROLLBAR_NEVER */ - public static final int HORIZONTAL_SCROLLBAR_NEVER = 31; + int HORIZONTAL_SCROLLBAR_NEVER = 31; /** * HORIZONTAL_SCROLLBAR_ALWAYS */ - public static final int HORIZONTAL_SCROLLBAR_ALWAYS = 32; + int HORIZONTAL_SCROLLBAR_ALWAYS = 32; } // ScrollPaneConstants diff --git a/libjava/javax/swing/SingleSelectionModel.java b/libjava/javax/swing/SingleSelectionModel.java index 8cc7f46..b3dc1f7 100644 --- a/libjava/javax/swing/SingleSelectionModel.java +++ b/libjava/javax/swing/SingleSelectionModel.java @@ -55,36 +55,36 @@ public interface SingleSelectionModel { * getSelectedIndex * @returns int */ - public int getSelectedIndex(); + int getSelectedIndex(); /** * setSelectedIndex * @param index TODO */ - public void setSelectedIndex(int index); + void setSelectedIndex(int index); /** * clearSelection */ - public void clearSelection(); + void clearSelection(); /** * isSelected * @returns boolean */ - public boolean isSelected(); + boolean isSelected(); /** * addChangeListener * @param listener TODO */ - public void addChangeListener(ChangeListener listener); + void addChangeListener(ChangeListener listener); /** * removeChangeListener * @param listener TODO */ - public void removeChangeListener(ChangeListener listener); + void removeChangeListener(ChangeListener listener); } // SingleSelectionModel diff --git a/libjava/javax/swing/SpinnerModel.java b/libjava/javax/swing/SpinnerModel.java index 87d5930..5f8929e 100644 --- a/libjava/javax/swing/SpinnerModel.java +++ b/libjava/javax/swing/SpinnerModel.java @@ -45,10 +45,10 @@ import javax.swing.event.ChangeListener; */ public interface SpinnerModel { - public void setValue (Object value); + void setValue (Object value); public Object getValue (); public Object getNextValue (); public Object getPreviousValue (); - public void addChangeListener (ChangeListener listener); - public void removeChangeListener (ChangeListener listener); + void addChangeListener (ChangeListener listener); + void removeChangeListener (ChangeListener listener); } diff --git a/libjava/javax/swing/SwingConstants.java b/libjava/javax/swing/SwingConstants.java index fb7c23b..969c388 100644 --- a/libjava/javax/swing/SwingConstants.java +++ b/libjava/javax/swing/SwingConstants.java @@ -40,25 +40,25 @@ package javax.swing; public interface SwingConstants { - public static final int CENTER = 0; - public static final int TOP = 1; - public static final int LEFT = 2; - public static final int BOTTOM = 3; - public static final int RIGHT = 4; + int CENTER = 0; + int TOP = 1; + int LEFT = 2; + int BOTTOM = 3; + int RIGHT = 4; - public static final int NORTH = 1; - public static final int NORTH_EAST = 2; - public static final int EAST = 3; - public static final int SOUTH_EAST = 4; - public static final int SOUTH = 5; - public static final int SOUTH_WEST = 6; - public static final int WEST = 7; - public static final int NORTH_WEST = 8; + int NORTH = 1; + int NORTH_EAST = 2; + int EAST = 3; + int SOUTH_EAST = 4; + int SOUTH = 5; + int SOUTH_WEST = 6; + int WEST = 7; + int NORTH_WEST = 8; - public static final int HORIZONTAL = 0; - public static final int VERTICAL = 1; + int HORIZONTAL = 0; + int VERTICAL = 1; - public static final int LEADING = 10; - public static final int TRAILING = 11; + int LEADING = 10; + int TRAILING = 11; } diff --git a/libjava/javax/swing/UIDefaults.java b/libjava/javax/swing/UIDefaults.java index 71f0955..80f31fe 100644 --- a/libjava/javax/swing/UIDefaults.java +++ b/libjava/javax/swing/UIDefaults.java @@ -56,7 +56,7 @@ import javax.swing.plaf.ComponentUI; */ public class UIDefaults extends Hashtable { - public interface ActiveValue + interface ActiveValue { Object createValue(UIDefaults table); } // interface ActiveValue @@ -72,7 +72,7 @@ public class UIDefaults extends Hashtable } } // class LazyInputMap - public interface LazyValue + interface LazyValue { Object createValue(UIDefaults table); } // interface LazyValue @@ -128,7 +128,7 @@ public class UIDefaults extends Hashtable throw new Error("not implemented"); } - public void putDefaults(Object[] list) + void putDefaults(Object[] list) { throw new Error("not implemented"); } @@ -193,13 +193,13 @@ public class UIDefaults extends Hashtable return o instanceof String ? (String) o : null; } - public int getInt(Object key) + int getInt(Object key) { Object o = get(key); return o instanceof Integer ? ((Integer) o).intValue() : 0; } - public int getInt(Object key, Locale l) + int getInt(Object key, Locale l) { Object o = get(key, l); return o instanceof Integer ? ((Integer) o).intValue() : 0; @@ -263,12 +263,12 @@ public class UIDefaults extends Hashtable return p; } - public void addPropertyChangeListener(PropertyChangeListener l) + void addPropertyChangeListener(PropertyChangeListener l) { throw new Error("not implemented"); } - public void removePropertyChangeListener(PropertyChangeListener l) + void removePropertyChangeListener(PropertyChangeListener l) { throw new Error("not implemented"); } @@ -283,17 +283,17 @@ public class UIDefaults extends Hashtable throw new Error("not implemented"); } - public void addResourceBundle(String name) + void addResourceBundle(String name) { throw new Error("not implemented"); } - public void removeResourceBundle(String name) + void removeResourceBundle(String name) { throw new Error("not implemented"); } - public void setDefaultLocale(Locale l) + void setDefaultLocale(Locale l) { throw new Error("not implemented"); } diff --git a/libjava/javax/swing/WindowConstants.java b/libjava/javax/swing/WindowConstants.java index 1eec7f6..3f9936c 100644 --- a/libjava/javax/swing/WindowConstants.java +++ b/libjava/javax/swing/WindowConstants.java @@ -51,22 +51,22 @@ public interface WindowConstants { /** * DO_NOTHING_ON_CLOSE */ - public static final int DO_NOTHING_ON_CLOSE = 0; + int DO_NOTHING_ON_CLOSE = 0; /** * HIDE_ON_CLOSE */ - public static final int HIDE_ON_CLOSE = 1; + int HIDE_ON_CLOSE = 1; /** * DISPOSE_ON_CLOSE */ - public static final int DISPOSE_ON_CLOSE = 2; + int DISPOSE_ON_CLOSE = 2; /** * EXIT_ON_CLOSE */ - public static final int EXIT_ON_CLOSE =3; + int EXIT_ON_CLOSE =3; } // WindowConstants diff --git a/libjava/javax/swing/border/Border.java b/libjava/javax/swing/border/Border.java index 1f2fb82..a9ad6e5 100644 --- a/libjava/javax/swing/border/Border.java +++ b/libjava/javax/swing/border/Border.java @@ -44,7 +44,7 @@ import java.awt.Insets; /** - * An interface for decorative or spacing borders around a Component. + * An public interface for decorative or spacing borders around a Component. * * <p>To reduce memory consumption, several Components may share a * single Border instance. {@link javax.swing.BorderFactory} is a @@ -77,7 +77,7 @@ public interface Border * @param width the width of the available area for painting the border. * @param height the height of the available area for painting the border. */ - public void paintBorder(Component c, Graphics g, + void paintBorder(Component c, Graphics g, int x, int y, int width, int height); @@ -90,7 +90,7 @@ public interface Border * <code>top</code> and <code>bottom</code> fields indicate the * width of the border at the respective edge. */ - public Insets getBorderInsets(Component c); + Insets getBorderInsets(Component c); /** @@ -101,5 +101,5 @@ public interface Border * <code>false</code> if some pixels of the background * can shine through the border. */ - public boolean isBorderOpaque(); + boolean isBorderOpaque(); } diff --git a/libjava/javax/swing/colorchooser/ColorSelectionModel.java b/libjava/javax/swing/colorchooser/ColorSelectionModel.java index d04266b..bd9abdd 100644 --- a/libjava/javax/swing/colorchooser/ColorSelectionModel.java +++ b/libjava/javax/swing/colorchooser/ColorSelectionModel.java @@ -56,25 +56,25 @@ public interface ColorSelectionModel { * getSelectedColor * @returns Color */ - public abstract Color getSelectedColor(); + Color getSelectedColor(); /** * setSelectedColor * @param color TODO */ - public abstract void setSelectedColor(Color color); + void setSelectedColor(Color color); /** * addChangeListener * @param listener TODO */ - public abstract void addChangeListener(ChangeListener listener); + void addChangeListener(ChangeListener listener); /** * removeChangeListener * @param listener TODO */ - public abstract void removeChangeListener(ChangeListener listener); + void removeChangeListener(ChangeListener listener); } // ColorSelectionModel |