From: Michael Koch Date: Wed, 11 Jun 2003 13:20:41 +0000 (+0000) Subject: AbstractAction.java, [...]: New versions from classpath. X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=d6c2458f4ec1bce5dc4ee8c61bc03083ca224d7c;p=gcc.git AbstractAction.java, [...]: New versions from classpath. 2003-06-11 Michael Koch * javax/swing/AbstractAction.java, javax/swing/AbstractButton.java, javax/swing/AbstractCellEditor.java, javax/swing/AbstractListModel.java, javax/swing/BorderFactory.java, javax/swing/Box.java, javax/swing/BoxLayout.java, javax/swing/ButtonGroup.java, javax/swing/DefaultButtonModel.java, javax/swing/DefaultListModel.java, javax/swing/DefaultListSelectionModel.java, javax/swing/FocusManager.java, javax/swing/ImageIcon.java, javax/swing/InputMap.java, javax/swing/JApplet.java, javax/swing/JButton.java, javax/swing/JCheckBox.java, javax/swing/JCheckBoxMenuItem.java, javax/swing/JColorChooser.java, javax/swing/JComboBox.java, javax/swing/JComponent.java, javax/swing/JDesktopPane.java, javax/swing/JDialog.java, javax/swing/JEditorPane.java, javax/swing/JFileChooser.java, javax/swing/JFormattedTextField.java, javax/swing/JFrame.java, javax/swing/JLabel.java, javax/swing/JLayeredPane.java, javax/swing/JList.java, javax/swing/JMenuBar.java, javax/swing/JMenuItem.java, javax/swing/JOptionPane.java, javax/swing/JPanel.java, javax/swing/JPasswordField.java, javax/swing/JPopupMenu.java, javax/swing/JProgressBar.java, javax/swing/JRadioButton.java, javax/swing/JRadioButtonMenuItem.java, javax/swing/JRootPane.java, javax/swing/JScrollBar.java, javax/swing/JScrollPane.java, javax/swing/JSeparator.java, javax/swing/JSlider.java, javax/swing/JTabbedPane.java, javax/swing/JTable.java, javax/swing/JTextField.java, javax/swing/JToggleButton.java, javax/swing/JToolBar.java, javax/swing/JToolTip.java, javax/swing/JTree.java, javax/swing/JViewport.java, javax/swing/JWindow.java, javax/swing/KeyStroke.java, javax/swing/ListSelectionModel.java, javax/swing/LookAndFeel.java, javax/swing/RepaintManager.java, javax/swing/ScrollPaneLayout.java, javax/swing/SizeRequirements.java, javax/swing/SwingConstants.java, javax/swing/Timer.java, javax/swing/UIDefaults.java, javax/swing/UIManager.java, javax/swing/border/AbstractBorder.java, javax/swing/border/CompoundBorder.java, javax/swing/colorchooser/AbstractColorChooserPanel.java, javax/swing/colorchooser/ColorChooserComponentFactory.java, javax/swing/colorchooser/ColorSelectionModel.java, javax/swing/colorchooser/DefaultColorSelectionModel.java, javax/swing/event/AncestorEvent.java, javax/swing/event/HyperlinkEvent.java, javax/swing/event/InternalFrameAdapter.java, javax/swing/event/InternalFrameEvent.java, javax/swing/event/ListDataEvent.java, javax/swing/event/MouseInputAdapter.java, javax/swing/event/SwingPropertyChangeSupport.java, javax/swing/event/TableModelEvent.java, javax/swing/event/TreeWillExpandListener.java, javax/swing/event/UndoableEditEvent.java, javax/swing/filechooser/FileFilter.java, javax/swing/filechooser/FileSystemView.java, javax/swing/filechooser/FileView.java, javax/swing/plaf/BorderUIResource.java, javax/swing/plaf/basic/BasicDefaults.java, javax/swing/table/AbstractTableModel.java, javax/swing/table/DefaultTableCellRenderer.java, javax/swing/table/DefaultTableColumnModel.java, javax/swing/table/DefaultTableModel.java, javax/swing/table/TableColumn.java, javax/swing/text/JTextComponent.java, javax/swing/tree/AbstractLayoutCache.java, javax/swing/tree/DefaultMutableTreeNode.java, javax/swing/tree/DefaultTreeCellEditor.java, javax/swing/tree/DefaultTreeCellRenderer.java, javax/swing/tree/DefaultTreeModel.java, javax/swing/tree/DefaultTreeSelectionModel.java, javax/swing/tree/FixedHeightLayoutCache.java, javax/swing/tree/TreeCellEditor.java, javax/swing/tree/TreeModel.java, javax/swing/tree/TreeNode.java, javax/swing/tree/TreePath.java, javax/swing/tree/TreeSelectionModel.java, javax/swing/tree/VariableHeightLayoutCache.java, javax/swing/undo/AbstractUndoableEdit.java, javax/swing/undo/CompoundEdit.java, javax/swing/undo/StateEdit.java, javax/swing/undo/UndoManager.java, javax/swing/undo/UndoableEditSupport.java: New versions from classpath. * javax/swing/table/JTableHeader.java: New file from classpath. * Makefile.am (java_awt_sources): Added javax/swing/table/JTableHeader.java. * Makefile.in: Regenerated. From-SVN: r67769 --- diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 9b4af5b8fad..242b5cd12fa 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,120 @@ +2003-06-11 Michael Koch + + * javax/swing/AbstractAction.java, + javax/swing/AbstractButton.java, + javax/swing/AbstractCellEditor.java, + javax/swing/AbstractListModel.java, + javax/swing/BorderFactory.java, + javax/swing/Box.java, + javax/swing/BoxLayout.java, + javax/swing/ButtonGroup.java, + javax/swing/DefaultButtonModel.java, + javax/swing/DefaultListModel.java, + javax/swing/DefaultListSelectionModel.java, + javax/swing/FocusManager.java, + javax/swing/ImageIcon.java, + javax/swing/InputMap.java, + javax/swing/JApplet.java, + javax/swing/JButton.java, + javax/swing/JCheckBox.java, + javax/swing/JCheckBoxMenuItem.java, + javax/swing/JColorChooser.java, + javax/swing/JComboBox.java, + javax/swing/JComponent.java, + javax/swing/JDesktopPane.java, + javax/swing/JDialog.java, + javax/swing/JEditorPane.java, + javax/swing/JFileChooser.java, + javax/swing/JFormattedTextField.java, + javax/swing/JFrame.java, + javax/swing/JLabel.java, + javax/swing/JLayeredPane.java, + javax/swing/JList.java, + javax/swing/JMenuBar.java, + javax/swing/JMenuItem.java, + javax/swing/JOptionPane.java, + javax/swing/JPanel.java, + javax/swing/JPasswordField.java, + javax/swing/JPopupMenu.java, + javax/swing/JProgressBar.java, + javax/swing/JRadioButton.java, + javax/swing/JRadioButtonMenuItem.java, + javax/swing/JRootPane.java, + javax/swing/JScrollBar.java, + javax/swing/JScrollPane.java, + javax/swing/JSeparator.java, + javax/swing/JSlider.java, + javax/swing/JTabbedPane.java, + javax/swing/JTable.java, + javax/swing/JTextField.java, + javax/swing/JToggleButton.java, + javax/swing/JToolBar.java, + javax/swing/JToolTip.java, + javax/swing/JTree.java, + javax/swing/JViewport.java, + javax/swing/JWindow.java, + javax/swing/KeyStroke.java, + javax/swing/ListSelectionModel.java, + javax/swing/LookAndFeel.java, + javax/swing/RepaintManager.java, + javax/swing/ScrollPaneLayout.java, + javax/swing/SizeRequirements.java, + javax/swing/SwingConstants.java, + javax/swing/Timer.java, + javax/swing/UIDefaults.java, + javax/swing/UIManager.java, + javax/swing/border/AbstractBorder.java, + javax/swing/border/CompoundBorder.java, + javax/swing/colorchooser/AbstractColorChooserPanel.java, + javax/swing/colorchooser/ColorChooserComponentFactory.java, + javax/swing/colorchooser/ColorSelectionModel.java, + javax/swing/colorchooser/DefaultColorSelectionModel.java, + javax/swing/event/AncestorEvent.java, + javax/swing/event/HyperlinkEvent.java, + javax/swing/event/InternalFrameAdapter.java, + javax/swing/event/InternalFrameEvent.java, + javax/swing/event/ListDataEvent.java, + javax/swing/event/MouseInputAdapter.java, + javax/swing/event/SwingPropertyChangeSupport.java, + javax/swing/event/TableModelEvent.java, + javax/swing/event/TreeWillExpandListener.java, + javax/swing/event/UndoableEditEvent.java, + javax/swing/filechooser/FileFilter.java, + javax/swing/filechooser/FileSystemView.java, + javax/swing/filechooser/FileView.java, + javax/swing/plaf/BorderUIResource.java, + javax/swing/plaf/basic/BasicDefaults.java, + javax/swing/table/AbstractTableModel.java, + javax/swing/table/DefaultTableCellRenderer.java, + javax/swing/table/DefaultTableColumnModel.java, + javax/swing/table/DefaultTableModel.java, + javax/swing/table/TableColumn.java, + javax/swing/text/JTextComponent.java, + javax/swing/tree/AbstractLayoutCache.java, + javax/swing/tree/DefaultMutableTreeNode.java, + javax/swing/tree/DefaultTreeCellEditor.java, + javax/swing/tree/DefaultTreeCellRenderer.java, + javax/swing/tree/DefaultTreeModel.java, + javax/swing/tree/DefaultTreeSelectionModel.java, + javax/swing/tree/FixedHeightLayoutCache.java, + javax/swing/tree/TreeCellEditor.java, + javax/swing/tree/TreeModel.java, + javax/swing/tree/TreeNode.java, + javax/swing/tree/TreePath.java, + javax/swing/tree/TreeSelectionModel.java, + javax/swing/tree/VariableHeightLayoutCache.java, + javax/swing/undo/AbstractUndoableEdit.java, + javax/swing/undo/CompoundEdit.java, + javax/swing/undo/StateEdit.java, + javax/swing/undo/UndoManager.java, + javax/swing/undo/UndoableEditSupport.java: + New versions from classpath. + * javax/swing/table/JTableHeader.java: + New file from classpath. + * Makefile.am + (java_awt_sources): Added javax/swing/table/JTableHeader.java. + * Makefile.in: Regenerated. + 2003-06-11 Michael Koch * java/nio/MappedByteBuffer.java, diff --git a/libjava/javax/swing/AbstractAction.java b/libjava/javax/swing/AbstractAction.java index cf9308d0685..7ba652b926a 100644 --- a/libjava/javax/swing/AbstractAction.java +++ b/libjava/javax/swing/AbstractAction.java @@ -35,9 +35,9 @@ 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 javax.swing; -// Imports import java.awt.event.*; import java.beans.*; import java.io.*; @@ -207,12 +207,4 @@ public abstract class AbstractAction public synchronized void removePropertyChangeListener(PropertyChangeListener listener) { changeSupport.removePropertyChangeListener(listener); } // removePropertyChangeListener() - - /** - * actionPerformed - * @param event TODO - */ - public abstract void actionPerformed(ActionEvent event); - - -} // AbstractAction +} diff --git a/libjava/javax/swing/AbstractButton.java b/libjava/javax/swing/AbstractButton.java index b675d808a42..951650dbdbd 100644 --- a/libjava/javax/swing/AbstractButton.java +++ b/libjava/javax/swing/AbstractButton.java @@ -35,18 +35,33 @@ 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 javax.swing; - -import java.awt.*; -import java.awt.event.*; -import javax.swing.event.*; -import javax.swing.plaf.*; -import javax.swing.text.*; -import javax.accessibility.*; +package javax.swing; -import java.util.*; -import java.beans.*; +import java.awt.Graphics; +import java.awt.Image; +import java.awt.Insets; +import java.awt.ItemSelectable; +import java.awt.Point; +import java.awt.Rectangle; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.awt.event.FocusEvent; +import java.awt.event.FocusListener; +import java.awt.event.ItemEvent; +import java.awt.event.ItemListener; +import java.awt.event.MouseEvent; +import java.beans.PropertyChangeListener; +import javax.accessibility.AccessibleAction; +import javax.accessibility.AccessibleIcon; +import javax.accessibility.AccessibleStateSet; +import javax.accessibility.AccessibleRelationSet; +import javax.accessibility.AccessibleText; +import javax.accessibility.AccessibleValue; +import javax.swing.event.ChangeEvent; +import javax.swing.event.ChangeListener; +import javax.swing.plaf.ButtonUI; +import javax.swing.text.AttributeSet; /** * Provides basic button functionality @@ -54,7 +69,7 @@ import java.beans.*; * @author Ronald Veldema (rveldema@cs.vu.nl) */ public abstract class AbstractButton extends JComponent - implements ItemSelectable, SwingConstants + implements ItemSelectable, SwingConstants { Icon default_icon, pressed_button, disabled_button, selected_button, disabled_selected_button, current_icon; diff --git a/libjava/javax/swing/AbstractCellEditor.java b/libjava/javax/swing/AbstractCellEditor.java index e25e97b18b3..026ab30f804 100644 --- a/libjava/javax/swing/AbstractCellEditor.java +++ b/libjava/javax/swing/AbstractCellEditor.java @@ -35,12 +35,14 @@ 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 javax.swing; -// Imports -import java.io.*; -import java.util.*; -import javax.swing.event.*; +import java.io.Serializable; +import java.util.EventObject; +import javax.swing.event.CellEditorListener; +import javax.swing.event.ChangeEvent; +import javax.swing.event.EventListenerList; /** * AbstractCellEditor diff --git a/libjava/javax/swing/AbstractListModel.java b/libjava/javax/swing/AbstractListModel.java index 4e227b4dda7..da85a4def95 100644 --- a/libjava/javax/swing/AbstractListModel.java +++ b/libjava/javax/swing/AbstractListModel.java @@ -189,17 +189,4 @@ public abstract class AbstractListModel { return (ListDataListener[]) getListeners (ListDataListener.class); } - - /** - * getElementAt - * @param index TODO - * @returns Object - */ - public abstract Object getElementAt (int index); - - /** - * getSize - * @returns int - */ - public abstract int getSize (); } diff --git a/libjava/javax/swing/BorderFactory.java b/libjava/javax/swing/BorderFactory.java index 808144fdd7a..1cc6cbf420d 100644 --- a/libjava/javax/swing/BorderFactory.java +++ b/libjava/javax/swing/BorderFactory.java @@ -38,332 +38,406 @@ exception statement from your version. */ package javax.swing; -import java.awt.*; -import java.awt.font.*; -import javax.swing.border.*; - +import java.awt.Color; +import java.awt.Font; +import javax.swing.border.BevelBorder; +import javax.swing.border.Border; +import javax.swing.border.CompoundBorder; +import javax.swing.border.EmptyBorder; +import javax.swing.border.EtchedBorder; +import javax.swing.border.LineBorder; +import javax.swing.border.MatteBorder; +import javax.swing.border.TitledBorder; public class BorderFactory { + /** + * Creates a line border withe the specified color. + * + * @param color A color to use for the line. + * + * @return The Border object + */ public static Border createLineBorder(Color color) - { /* - Creates a line border withe the specified color. - - Parameters: - color - a Color to use for the lineReturns: - the Border object -createLineBorder - */ - return null; - } - -public static Border createLineBorder(Color color, - int thickness) - { /* - - Creates a line border withe the specified color and width. The width applies to all 4 sides of the border. To specify widths individually for the top, bottom, left, and right, use createMatteBorder(int,int,int,int,Color). - - Parameters: - color - a Color to use for the linethickness - an int specifying the width in pixelsReturns: - the Border object -createRaisedBevelBorder - */ + { return null; } + /** + * Creates a line border withe the specified color and width. The width + * applies to all 4 sides of the border. To specify widths individually for + * the top, bottom, left, and right, use + * createMatteBorder(int,int,int,int,Color). + * + * @param color A color to use for the line. + * @param thickness An int specifying the width in pixels. + * + * @return The Border object + */ + public static Border createLineBorder (Color color, int thickness) + { + return new LineBorder (color, thickness); + } -public static Border createRaisedBevelBorder() - { /* - - Created a border with a raised beveled edge, using brighter shades of the component's current background color for highlighting, and darker shading for shadows. (In a raised border, highlights are on top and shadows are underneath.) - - Returns: - the Border object -createLoweredBevelBorder - - */ - return null; - } - -public static Border createLoweredBevelBorder() - { /* - - Created a border with a lowered beveled edge, using brighter shades of the component's current background color for highlighting, and darker shading for shadows. (In a lowered border, shadows are on top and highlights are underneath.) - - Returns: - the Border object -createBevelBorder - - */ - return null; - } - -public static Border createBevelBorder(int type) - - { /* - Create a beveled border of the specified type, using brighter shades of the component's current background color for highlighting, and darker shading for shadows. (In a lowered border, shadows are on top and highlights are underneath.). - - Parameters: - type - an int specifying either BevelBorder.LOWERED or BevelBorder.LOWEREDReturns: - the Border object -createBevelBorder - - */ - return null; - } - -public static Border createBevelBorder(int type, - Color highlight, - Color shadow) - { /* - - Create a beveled border of the specified type, using the specified highlighting and shadowing. The outer edge of the highlighted area uses a brighter shade of the highlight color. The inner edge of the shadow area uses a brighter shade of the shadaw color. - - Parameters: - type - an int specifying either BevelBorder.LOWERED or BevelBorder.LOWEREDhighlight - a Color object for highlightsshadow - a Color object for shadowsReturns: - the Border object -createBevelBorder - - */ - return null; - } - -public static Border createBevelBorder(int type, - Color highlightOuter, - Color highlightInner, - Color shadowOuter, - Color shadowInner) - { /* - - Create a beveled border of the specified type, using the specified colors for the inner and outer highlight and shadow areas. - - Parameters: - type - an int specifying either BevelBorder.LOWERED or BevelBorder.LOWEREDhighlightOuter - a Color object for the outer edge of the highlight areahighlightInner - a Color object for the inner edge of the highlight areashadowOuter - a Color object for the outer edge of the shadow areashadowInner - a Color object for the inner edge of the shadow areaReturns: - the Border object -createEtchedBorder - */ - return null; - } - - -public static Border createEtchedBorder() - { /* - - Create a border with an "etched" look using the component's current background color for highlighting and shading. - - Returns: - the Border object -createEtchedBorder - - */ - return null; - } - -public static Border createEtchedBorder(Color highlight, - Color shadow) - { /* - - Create a border with an "etched" look using the specified highlighting and shading colors. - - Parameters: - highlight - a Color object for the border highlightsshadow - a Color object for the border shadowsReturns: - the Border object -createTitledBorder - - */ - return null; - } - - public static TitledBorder createTitledBorder(String title) - { /* - Create a new title border specifying the text of the title, using the default border (etched), using the default text position (sitting on the top line) and default justification (left) and using the default font and text color determined by the current look and feel. - - Parameters: - title - a String containing the text of the titleReturns: - the TitledBorder object -createTitledBorder - - */ - return null; - } - - public static TitledBorder createTitledBorder(Border border) - { /* - - Create a new title border with an empty title specifying the border object, using the default text position (sitting on the top line) and default justification (left) and using the default font, text color, and border determined by the current look and feel. (The Motif and Windows look and feels use an etched border; The Java look and feel use a gray border.) - - Parameters: - border - the Border object to add the title toReturns: - the TitledBorder object -createTitledBorder - - */ - return null; - } - -public static TitledBorder createTitledBorder(Border border, - String title) - { /* - - Add a title to an existing border, specifying the text of the title, using the default positioning (sitting on the top line) and default justification (left) and using the default font and text color determined by the current look and feel. - - Parameters: - border - the Border object to add the title totitle - a String containing the text of the titleReturns: - the TitledBorder object -createTitledBorder - - */ - return null; - } - -public static TitledBorder createTitledBorder(Border border, - String title, - int titleJustification, - int titlePosition) - { /* - - Add a title to an existing border, specifying the text of the title along with its positioning, using the default font and text color determined by the current look and feel. - - Parameters: - border - the Border object to add the title totitle - a String containing the text of the titletitleJustification - an int specifying the left/right position of the title -- one of TitledBorder.LEFT, TitledBorder.CENTER, or TitledBorder.RIGHT, TitledBorder.DEFAULT_JUSTIFICATION (left).titlePosition - an int specifying the vertical position of the text in relation to the border -- one of: TitledBorder.ABOVE_TOP, TitledBorder.TOP (sitting on the top line), TitledBorder.BELOW_TOP, TitledBorder.ABOVE_BOTTOM, TitledBorder.BOTTOM (sitting on the bottom line), TitledBorder.BELOW_BOTTOM, or TitledBorder.DEFAULT_POSITION (top).Returns: - the TitledBorder object -createTitledBorder - - */ - return null; - } - -public static TitledBorder createTitledBorder(Border border, - String title, - int titleJustification, - int titlePosition, - Font titleFont) - { /* - - Add a title to an existing border, specifying the text of the title along with its positioning and font, using the default text color determined by the current look and feel. - - Parameters: - border - the Border object to add the title totitle - a String containing the text of the titletitleJustification - an int specifying the left/right position of the title -- one of TitledBorder.LEFT, TitledBorder.CENTER, or TitledBorder.RIGHT, TitledBorder.DEFAULT_JUSTIFICATION (left).titlePosition - an int specifying the vertical position of the text in relation to the border -- one of: TitledBorder.ABOVE_TOP, TitledBorder.TOP (sitting on the top line), TitledBorder.BELOW_TOP, TitledBorder.ABOVE_BOTTOM, TitledBorder.BOTTOM (sitting on the bottom line), TitledBorder.BELOW_BOTTOM, or TitledBorder.DEFAULT_POSITION (top).titleFont - a Font object specifying the title fontReturns: - the TitledBorder object -createTitledBorder - - */ - return null; - } - -public static TitledBorder createTitledBorder(Border border, - String title, - int titleJustification, - int titlePosition, - Font titleFont, - Color titleColor) - { /* - - Add a title to an existing border, specifying the text of the title along with its positioning, font, and color. - - Parameters: - border - the Border object to add the title totitle - a String containing the text of the titletitleJustification - an int specifying the left/right position of the title -- one of TitledBorder.LEFT, TitledBorder.CENTER, or TitledBorder.RIGHT, TitledBorder.DEFAULT_JUSTIFICATION (left).titlePosition - an int specifying the vertical position of the text in relation to the border -- one of: TitledBorder.ABOVE_TOP, TitledBorder.TOP (sitting on the top line), TitledBorder.BELOW_TOP, TitledBorder.ABOVE_BOTTOM, TitledBorder.BOTTOM (sitting on the bottom line), TitledBorder.BELOW_BOTTOM, or TitledBorder.DEFAULT_POSITION (top).titleFont - a Font object specifying the title fonttitleColor - a Color object specifying the title colorReturns: - the TitledBorder object -createEmptyBorder - - */ - return null; - } - -public static Border createEmptyBorder() - { /* - - Creates an empty border that takes up no space. (The width of the top, bottom, left, and right sides are all zero.) - - Returns: - the Border object -createEmptyBorder - - */ - return null; - } - -public static Border createEmptyBorder(int top, - int left, - int bottom, - int right) - { /* - - Creates an empty border that takes up no space but which does no drawing, specifying the width of the top, left, bottom, and right sides. + /** + * Created a border with a raised beveled edge, using brighter shades of + * the component's current background color for highlighting, and darker + * shading for shadows. (In a raised border, highlights are on top and + * shadows are underneath.) + * + * @return The Border object + */ + public static Border createRaisedBevelBorder () + { + return new BevelBorder (BevelBorder.RAISED); + } - Parameters: - top - an int specifying the width of the top in pixelsleft - an int specifying the width of the left side in pixelsbottom - an int specifying the width of the right side in pixelsright - an int specifying the width of the bottom in pixelsReturns: - the Border object -createCompoundBorder + /** + * Created a border with a lowered beveled edge, using brighter shades of + * the component's current background color for highlighting, and darker + * shading for shadows. (In a lowered border, shadows are on top and + * highlights are underneath.) + * + * @return The Border object + */ + public static Border createLoweredBevelBorder () + { + return new BevelBorder (BevelBorder.LOWERED); + } - */ - return null; - } + /** + * Create a beveled border of the specified type, using brighter shades of + * the component's current background color for highlighting, and darker + * shading for shadows. (In a lowered border, shadows are on top and + * highlights are underneath.). + * + * @param type An int specifying either BevelBorder.LOWERED or + * BevelBorder.RAISED + * + * @Return The Border object + */ + public static Border createBevelBorder (int type) + { + return new BevelBorder (type); + } -public static CompoundBorder createCompoundBorder() - { /* + /** + * Create a beveled border of the specified type, using the specified + * highlighting and shadowing. The outer edge of the highlighted area uses + * a brighter shade of the highlight color. The inner edge of the shadow + * area uses a brighter shade of the shadaw color. + * + * @param type An int specifying either BevelBorder.LOWERED or + * BevelBorder.RAISED + * @param highlight A Color object for highlights + * @param shadow A Color object for shadows + * + * @return The Border object + */ + public static Border createBevelBorder (int type, Color highlight, + Color shadow) + { + return new BevelBorder (type, highlight, shadow); + } - Create a compound border with a null inside edge and a null outside edge. + /** + * Create a beveled border of the specified type, using the specified colors + * for the inner and outer highlight and shadow areas. + * + * @param type An int specifying either BevelBorder.LOWERED or + * BevelBorder.RAISED + * @param highlightOuter A Color object for the outer edge of the + * highlight area + * @param highlightInner A Color object for the inner edge of the + * highlight area + * @param shadowOuter A Color object for the outer edge of the shadow area + * @param shadowInner A Color object for the inner edge of the shadow area + * + * @return The Border object + */ + public static Border createBevelBorder (int type, Color highlightOuter, + Color highlightInner, + Color shadowOuter, Color shadowInner) + { + return new BevelBorder (type, highlightOuter, highlightInner, shadowOuter, + shadowInner); + } - Returns: - the CompoundBorder object -createCompoundBorder - */ - return null; - } + /** + * Create a border with an "etched" look using the component's current + * background color for highlighting and shading. + * + * @return The Border object + */ + public static Border createEtchedBorder () + { + return new EtchedBorder (); + } + /** + * Create a border with an "etched" look using the component's current + * background color for highlighting and shading. + * + * @return The Border object + */ + public static Border createEtchedBorder (int etchType) + { + return new EtchedBorder (etchType); + } -public static CompoundBorder createCompoundBorder(Border outsideBorder, - Border insideBorder) - { /* + /** + * Create a border with an "etched" look using the specified highlighting and + * shading colors. + * + * @param highlight A Color object for the border highlights + * @param shadow A Color object for the border shadows + * + * @return The Border object + */ + public static Border createEtchedBorder (Color highlight, Color shadow) + { + return new EtchedBorder (highlight, shadow); + } - Create a compound border specifying the border objects to use for the outside and inside edges. + /** + * Create a border with an "etched" look using the specified highlighting and + * shading colors. + * + * @param highlight A Color object for the border highlights + * @param shadow A Color object for the border shadows + * + * @return The Border object + */ + public static Border createEtchedBorder (int etchType, Color highlight, + Color shadow) + { + return new EtchedBorder (etchType, highlight, shadow); + } - Parameters: - outsideBorder - a Border object for the outer edge of the compound borderinsideBorder - a Border object for the inner edge of the compound borderReturns: - the CompoundBorder object -createMatteBorder - */ - return null; - } + /** + * Create a new title border specifying the text of the title, using the + * default border (etched), using the default text position (sitting on the + * top line) and default justification (left) and using the default font and + * text color determined by the current look and feel. + * + * @param title A String containing the text of the title + * + * @return The TitledBorder object + */ + public static TitledBorder createTitledBorder (String title) + { + return new TitledBorder (title); + } + /** + * Create a new title border with an empty title specifying the border + * object, using the default text position (sitting on the top line) and + * default justification (left) and using the default font, text color, + * and border determined by the current look and feel. (The Motif and Windows + * look and feels use an etched border; The Java look and feel use a + * gray border.) + * + * @param border The Border object to add the title to + * + * @return The TitledBorder object + */ + public static TitledBorder createTitledBorder (Border border) + { + return new TitledBorder (border); + } -public static MatteBorder createMatteBorder(int top, - int left, - int bottom, - int right, - Color color) - { /* + /** + * Add a title to an existing border, specifying the text of the title, using + * the default positioning (sitting on the top line) and default + * justification (left) and using the default font and text color determined + * by the current look and feel. + * + * @param order The Border object to add the title to + * @param title A String containing the text of the title + * + * @return The TitledBorder object + */ + public static TitledBorder createTitledBorder (Border border, String title) + { + return new TitledBorder (border, title); + } - Create a matte-look border using a solid color. (The difference between this border and a line border is that you can specify the individual border dimensions.) + /** + * Add a title to an existing border, specifying the text of the title along + * with its positioning, using the default font and text color determined by + * the current look and feel. + * + * @param border The Border object to add the title to + * @param title A String containing the text of the title + * @param titleJustification An int specifying the left/right position of + * the title -- one of TitledBorder.LEFT, TitledBorder.CENTER, or + * TitledBorder.RIGHT, TitledBorder.DEFAULT_JUSTIFICATION (left). + * @param titlePosition An int specifying the vertical position of the text + * in relation to the border -- one of: TitledBorder.ABOVE_TOP, + * TitledBorder.TOP (sitting on the top line), TitledBorder.BELOW_TOP, + * TitledBorder.ABOVE_BOTTOM, TitledBorder.BOTTOM (sitting on the bottom + * line), TitledBorder.BELOW_BOTTOM, or TitledBorder.DEFAULT_POSITION (top). + * + * @return The TitledBorder object + */ + public static TitledBorder createTitledBorder (Border border, String title, + int titleJustification, + int titlePosition) + { + return new TitledBorder (border, title, titleJustification, titlePosition); + } - Parameters: - top - an int specifying the width of the top in pixelsleft - an int specifying the width of the left side in pixelsbottom - an int specifying the width of the right side in pixelsright - an int specifying the width of the bottom in pixelscolor - a Color to use for the borderReturns: - the MatteBorder object -createMatteBorder + /** + * Add a title to an existing border, specifying the text of the title along + * with its positioning and font, using the default text color determined by + * the current look and feel. + * + * @param border - the Border object to add the title to + * @param title - a String containing the text of the title + * @param titleJustification - an int specifying the left/right position of + * the title -- one of TitledBorder.LEFT, TitledBorder.CENTER, or + * TitledBorder.RIGHT, TitledBorder.DEFAULT_JUSTIFICATION (left). + * @param titlePosition - an int specifying the vertical position of the + * text in relation to the border -- one of: TitledBorder.ABOVE_TOP, + * TitledBorder.TOP (sitting on the top line), TitledBorder.BELOW_TOP, + * TitledBorder.ABOVE_BOTTOM, TitledBorder.BOTTOM (sitting on the bottom + * line), TitledBorder.BELOW_BOTTOM, or TitledBorder.DEFAULT_POSITION (top). + * @param titleFont - a Font object specifying the title font + * + * @return The TitledBorder object + */ + public static TitledBorder createTitledBorder (Border border, String title, + int titleJustification, + int titlePosition, + Font titleFont) + { + return new TitledBorder (border, title, titleJustification, titlePosition, + titleFont); + } - */ - return null; - } + /** + * Add a title to an existing border, specifying the text of the title along + * with its positioning, font, and color. + * + * @param border - the Border object to add the title to + * @param title - a String containing the text of the title + * @param titleJustification - an int specifying the left/right position of + * the title -- one of TitledBorder.LEFT, TitledBorder.CENTER, or + * TitledBorder.RIGHT, TitledBorder.DEFAULT_JUSTIFICATION (left). + * @param titlePosition - an int specifying the vertical position of the text + * in relation to the border -- one of: TitledBorder.ABOVE_TOP, + * TitledBorder.TOP (sitting on the top line), TitledBorder.BELOW_TOP, + * TitledBorder.ABOVE_BOTTOM, TitledBorder.BOTTOM (sitting on the bottom + * line), TitledBorder.BELOW_BOTTOM, or TitledBorder.DEFAULT_POSITION (top). + * @param titleFont - a Font object specifying the title font + * @param titleColor - a Color object specifying the title color + * + * @return The TitledBorder object + */ + public static TitledBorder createTitledBorder (Border border, + String title, + int titleJustification, + int titlePosition, + Font titleFont, + Color titleColor) + { + return new TitledBorder (border, title, titleJustification, titlePosition, + titleFont, titleColor); + } -public static MatteBorder createMatteBorder(int top, - int left, - int bottom, - int right, - Icon tileIcon) - { /* + /** + * Creates an empty border that takes up no space. (The width of the top, + * bottom, left, and right sides are all zero.) + * + * @return The Border object + */ + public static Border createEmptyBorder () + { + return new EmptyBorder (0, 0, 0, 0); + } - Create a matte-look border that consists of multiple tiles of a specified icon. Multiple copies of the icon are placed side-by-side to fill up the border area. + /** + * Creates an empty border that takes up no space but which does no drawing, + * specifying the width of the top, left, bottom, and right sides. + * + * @param top An int specifying the width of the top in pixels + * @param left An int specifying the width of the left side in pixels + * @param bottom An int specifying the width of the right side in pixels + * @param right An int specifying the width of the bottom in pixels + * + * @return The Border object + */ + public static Border createEmptyBorder (int top, int left, int bottom, + int right) + { + return new EmptyBorder (top, left, bottom, right); + } - Note: - If the icon doesn't load, the border area is painted gray. + /** + * Create a compound border with a null inside edge and a null outside edge. + * + * @return The CompoundBorder object + */ + public static CompoundBorder createCompoundBorder () + { + return new CompoundBorder (); + } - Parameters: - top - an int specifying the width of the top in pixelsleft - an int specifying the width of the left side in pixelsbottom - an int specifying the width of the right side in pixelsright - an int specifying the width of the bottom in pixelstileIcon - the Icon object used for the border tilesReturns: - the MatteBorder object + /** + * Create a compound border specifying the border objects to use for the + * outside and inside edges. + * + * @param outsideBorder A Border object for the outer edge of the + * compound border + * @param insideBorder A Border object for the inner edge of the + * compound border + * + * @return The CompoundBorder object + */ + public static CompoundBorder createCompoundBorder (Border outsideBorder, + Border insideBorder) + { + return new CompoundBorder (outsideBorder, insideBorder); + } - */ - return null; - } + /** + * Create a matte-look border using a solid color. (The difference between + * this border and a line border is that you can specify the individual + * border dimensions.) + * + * @param top An int specifying the width of the top in pixels + * @param left An int specifying the width of the left side in pixels + * @param bottom An int specifying the width of the right side in pixels + * @param right An int specifying the width of the bottom in pixels + * @param color A Color to use for the border + * + * @return The MatteBorder object + */ + public static MatteBorder createMatteBorder (int top, int left, int bottom, + int right, Color color) + { + return new MatteBorder (top, left, bottom, right, color); + } + /** + * Create a matte-look border that consists of multiple tiles of a specified + * icon. Multiple copies of the icon are placed side-by-side to fill up the + * border area. + * + * Note: + * If the icon doesn't load, the border area is painted gray. + * + * @param top An int specifying the width of the top in pixels + * @param left An int specifying the width of the left side in pixels + * @param bottom An int specifying the width of the right side in pixels + * @param right An int specifying the width of the bottom in pixels + * @param tileIcon The Icon object used for the border tiles + * + * @return The MatteBorder object + */ + public static MatteBorder createMatteBorder (int top, int left, int bottom, + int right, Icon tileIcon) + { + return new MatteBorder (top, left, bottom, right, tileIcon); + } } diff --git a/libjava/javax/swing/Box.java b/libjava/javax/swing/Box.java index a425db50b65..eee96b1cdc8 100644 --- a/libjava/javax/swing/Box.java +++ b/libjava/javax/swing/Box.java @@ -35,14 +35,17 @@ 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 javax.swing; +import javax.accessibility.Accessible; + /** * Needs some work I guess.... * * @author Ronald Veldema (rveldema@cs.vu.nl) */ -public class Box extends JComponent +public class Box extends JComponent implements Accessible { Box(int a) { diff --git a/libjava/javax/swing/BoxLayout.java b/libjava/javax/swing/BoxLayout.java index 00d9cb438a2..23009fe68b0 100644 --- a/libjava/javax/swing/BoxLayout.java +++ b/libjava/javax/swing/BoxLayout.java @@ -35,9 +35,15 @@ 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 javax.swing; -import java.awt.*; +import java.awt.Container; +import java.awt.Component; +import java.awt.Dimension; +import java.awt.GridLayout; +import java.awt.LayoutManager2; +import java.io.Serializable; /** * A layout for swing components. @@ -46,7 +52,7 @@ import java.awt.*; * * @author Ronald Veldema (rveldema@cs.vu.nl) */ -public class BoxLayout implements LayoutManager2 +public class BoxLayout implements LayoutManager2, Serializable { GridLayout gridbag; diff --git a/libjava/javax/swing/ButtonGroup.java b/libjava/javax/swing/ButtonGroup.java index 502d0840933..c872ab76a40 100644 --- a/libjava/javax/swing/ButtonGroup.java +++ b/libjava/javax/swing/ButtonGroup.java @@ -35,12 +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 javax.swing; -import java.io.*; -import java.util.*; -import javax.swing.event.*; +package javax.swing; +import java.io.Serializable; +import java.util.Enumeration; +import java.util.Vector; public class ButtonGroup implements Serializable { diff --git a/libjava/javax/swing/DefaultButtonModel.java b/libjava/javax/swing/DefaultButtonModel.java index 9d6f4089da7..52b78b33782 100644 --- a/libjava/javax/swing/DefaultButtonModel.java +++ b/libjava/javax/swing/DefaultButtonModel.java @@ -35,15 +35,22 @@ 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 javax.swing; -import java.util.*; -import java.awt.event.*; -import java.awt.*; -import javax.swing.event.*; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.awt.event.ItemEvent; +import java.awt.event.ItemListener; +import java.io.Serializable; +import java.util.EventListener; +import java.util.Vector; +import javax.swing.event.ChangeEvent; +import javax.swing.event.ChangeListener; +import javax.swing.event.EventListenerList; public class DefaultButtonModel - implements ButtonModel, java.io.Serializable + implements ButtonModel, Serializable { static final long serialVersionUID = -5342609566534980231L; diff --git a/libjava/javax/swing/DefaultListModel.java b/libjava/javax/swing/DefaultListModel.java index 3a841635903..43846a5cdbe 100644 --- a/libjava/javax/swing/DefaultListModel.java +++ b/libjava/javax/swing/DefaultListModel.java @@ -35,17 +35,21 @@ 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 javax.swing; -// Imports -import java.util.*; +import java.util.ArrayList; +import java.util.Enumeration; +import java.util.NoSuchElementException; +import java.util.Vector; /** * DefaultListModel * @author Andrew Selkirk * @version 1.0 */ -public class DefaultListModel extends AbstractListModel { +public class DefaultListModel extends AbstractListModel +{ //------------------------------------------------------------- // Variables -------------------------------------------------- diff --git a/libjava/javax/swing/DefaultListSelectionModel.java b/libjava/javax/swing/DefaultListSelectionModel.java index 64ae505fd12..2da790d247c 100644 --- a/libjava/javax/swing/DefaultListSelectionModel.java +++ b/libjava/javax/swing/DefaultListSelectionModel.java @@ -35,12 +35,16 @@ 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 javax.swing; -import javax.swing.event.*; -import java.util.*; +import java.io.Serializable; +import java.util.EventListener; +import java.util.Vector; +import javax.swing.event.EventListenerList; +import javax.swing.event.ListSelectionListener; -public class DefaultListSelectionModel implements ListSelectionModel +public class DefaultListSelectionModel implements Cloneable, ListSelectionModel, Serializable { int mode = SINGLE_SELECTION; diff --git a/libjava/javax/swing/FocusManager.java b/libjava/javax/swing/FocusManager.java index c770bd0246e..6cbfa10f9d6 100644 --- a/libjava/javax/swing/FocusManager.java +++ b/libjava/javax/swing/FocusManager.java @@ -35,18 +35,20 @@ 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 javax.swing; -// Imports -import java.awt.*; -import java.awt.event.*; +import java.awt.Component; +import java.awt.DefaultKeyboardFocusManager; +import java.awt.event.KeyEvent; /** * FocusManager * @author Andrew Selkirk * @version 1.0 */ -public abstract class FocusManager { +public abstract class FocusManager extends DefaultKeyboardFocusManager +{ //------------------------------------------------------------- // Classes ---------------------------------------------------- diff --git a/libjava/javax/swing/ImageIcon.java b/libjava/javax/swing/ImageIcon.java index ded11a13424..872558d08dd 100644 --- a/libjava/javax/swing/ImageIcon.java +++ b/libjava/javax/swing/ImageIcon.java @@ -35,12 +35,18 @@ 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 javax.swing; - -import java.awt.*; -import java.awt.image.*; +package javax.swing; +import java.awt.Component; +import java.awt.Graphics; +import java.awt.Image; +import java.awt.MediaTracker; +import java.awt.Toolkit; +import java.io.Serializable; +import java.net.URL; +import javax.accessibility.Accessible; +import javax.accessibility.AccessibleContext; public class ImageIcon implements Icon { diff --git a/libjava/javax/swing/InputMap.java b/libjava/javax/swing/InputMap.java index 861fe57ea84..d748fb53e02 100644 --- a/libjava/javax/swing/InputMap.java +++ b/libjava/javax/swing/InputMap.java @@ -35,11 +35,19 @@ 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 javax.swing; -// Imports -import java.util.*; -import java.io.*; +import java.io.IOException; +import java.io.ObjectInputStream; +import java.io.ObjectOutputStream; +import java.io.Serializable; +import java.util.Arrays; +import java.util.Iterator; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; /** * InputMap diff --git a/libjava/javax/swing/JApplet.java b/libjava/javax/swing/JApplet.java index 094123a2c7b..ed450ced7a5 100644 --- a/libjava/javax/swing/JApplet.java +++ b/libjava/javax/swing/JApplet.java @@ -35,18 +35,19 @@ 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 javax.swing; - -import java.applet.*; -import java.awt.*; -import java.awt.event.*; +package javax.swing; +import java.applet.Applet; +import java.awt.BorderLayout; +import java.awt.Component; +import java.awt.Container; +import java.awt.Dimension; +import java.awt.Graphics; +import java.awt.LayoutManager; +import java.awt.event.KeyEvent; +import java.awt.event.WindowEvent; import javax.accessibility.AccessibleContext; -import javax.accessibility.AccessibleRole; -import javax.accessibility.AccessibleState; -import javax.accessibility.AccessibleStateSet; - public class JApplet extends Applet { diff --git a/libjava/javax/swing/JButton.java b/libjava/javax/swing/JButton.java index 9bfe32edaa9..9c43e6d0bb9 100644 --- a/libjava/javax/swing/JButton.java +++ b/libjava/javax/swing/JButton.java @@ -49,6 +49,8 @@ import javax.accessibility.*; */ public class JButton extends AbstractButton implements Accessible { + private static final long serialVersionUID = -1907255238954382202L; + boolean def, is_def; diff --git a/libjava/javax/swing/JCheckBox.java b/libjava/javax/swing/JCheckBox.java index 4e6810ca22e..4d2cee7e02b 100644 --- a/libjava/javax/swing/JCheckBox.java +++ b/libjava/javax/swing/JCheckBox.java @@ -35,12 +35,10 @@ 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 javax.swing; -import java.awt.*; -import java.awt.event.*; -import javax.swing.plaf.*; -import javax.accessibility.*; +import javax.accessibility.AccessibleContext; /** * An instance of JCheckbox can be added to a panel, frame etc diff --git a/libjava/javax/swing/JCheckBoxMenuItem.java b/libjava/javax/swing/JCheckBoxMenuItem.java index ac3b6600cbf..0b767785fa4 100644 --- a/libjava/javax/swing/JCheckBoxMenuItem.java +++ b/libjava/javax/swing/JCheckBoxMenuItem.java @@ -46,7 +46,8 @@ import javax.accessibility.*; * @author Andrew Selkirk * @version 1.0 */ -public class JCheckBoxMenuItem extends JMenuItem implements SwingConstants, Accessible { +public class JCheckBoxMenuItem extends JMenuItem implements SwingConstants, Accessible +{ //------------------------------------------------------------- // Classes ---------------------------------------------------- diff --git a/libjava/javax/swing/JColorChooser.java b/libjava/javax/swing/JColorChooser.java index c9c22f18c57..8881dc3555d 100644 --- a/libjava/javax/swing/JColorChooser.java +++ b/libjava/javax/swing/JColorChooser.java @@ -35,15 +35,20 @@ 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 javax.swing; -// Imports -import java.awt.*; -import java.awt.event.*; -import java.io.*; -import javax.accessibility.*; -import javax.swing.colorchooser.*; -import javax.swing.plaf.*; +import java.awt.Color; +import java.awt.Component; +import java.awt.event.ActionListener; +import java.io.IOException; +import java.io.ObjectOutputStream; +import javax.accessibility.Accessible; +import javax.accessibility.AccessibleContext; +import javax.accessibility.AccessibleRole; +import javax.swing.colorchooser.AbstractColorChooserPanel; +import javax.swing.colorchooser.ColorSelectionModel; +import javax.swing.plaf.ColorChooserUI; /** * JColorChooser diff --git a/libjava/javax/swing/JComboBox.java b/libjava/javax/swing/JComboBox.java index 4837e972087..c854520d07d 100644 --- a/libjava/javax/swing/JComboBox.java +++ b/libjava/javax/swing/JComboBox.java @@ -35,9 +35,9 @@ 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 javax.swing; -// Imports import java.awt.*; import java.awt.event.*; import java.beans.*; @@ -52,8 +52,11 @@ import javax.swing.plaf.*; * @author Andrew Selkirk * @version 1.0 */ -public class JComboBox extends JComponent implements ItemSelectable, - ListDataListener, ActionListener, Accessible { +public class JComboBox extends JComponent + implements ItemSelectable, ListDataListener, ActionListener, Accessible +{ + private static final long serialVersionUID = 5654585963292734470L; + //------------------------------------------------------------- // Classes ---------------------------------------------------- @@ -766,6 +769,7 @@ public class JComboBox extends JComponent implements ItemSelectable, /** * isFocusTraversable * @returns boolean + * @deprecated */ public boolean isFocusTraversable() { return false; // TODO diff --git a/libjava/javax/swing/JComponent.java b/libjava/javax/swing/JComponent.java index 119e3859193..7cfa7435d7b 100644 --- a/libjava/javax/swing/JComponent.java +++ b/libjava/javax/swing/JComponent.java @@ -35,21 +35,44 @@ 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 javax.swing; - -import java.awt.*; -import java.awt.peer.*; -import java.awt.event.*; -import java.io.*; -import javax.swing.event.*; -import javax.swing.border.*; -import javax.swing.plaf.*; - -import java.util.*; -import java.beans.*; +package javax.swing; -import javax.accessibility.*; +import java.awt.AWTEvent; +import java.awt.Color; +import java.awt.Component; +import java.awt.Container; +import java.awt.Dimension; +import java.awt.FlowLayout; +import java.awt.Font; +import java.awt.Graphics; +import java.awt.Insets; +import java.awt.Point; +import java.awt.Rectangle; +import java.awt.event.ActionListener; +import java.awt.event.ContainerEvent; +import java.awt.event.ContainerListener; +import java.awt.event.FocusEvent; +import java.awt.event.FocusListener; +import java.awt.event.KeyEvent; +import java.awt.event.MouseEvent; +import java.awt.peer.LightweightPeer; +import java.beans.PropertyChangeListener; +import java.beans.PropertyVetoException; +import java.beans.VetoableChangeListener; +import java.io.Serializable; +import java.util.Vector; +import java.util.Hashtable; +import javax.accessibility.Accessible; +import javax.accessibility.AccessibleContext; +import javax.accessibility.AccessibleExtendedComponent; +import javax.accessibility.AccessibleKeyBinding; +import javax.accessibility.AccessibleRole; +import javax.accessibility.AccessibleStateSet; +import javax.swing.event.AncestorListener; +import javax.swing.event.EventListenerList; +import javax.swing.border.Border; +import javax.swing.plaf.ComponentUI; /** * Every component in swing inherits from this class (JLabel, JButton, etc). diff --git a/libjava/javax/swing/JDesktopPane.java b/libjava/javax/swing/JDesktopPane.java index af979f3084a..4ad265c9bd9 100644 --- a/libjava/javax/swing/JDesktopPane.java +++ b/libjava/javax/swing/JDesktopPane.java @@ -47,7 +47,8 @@ import javax.swing.plaf.*; * @author Andrew Selkirk * @version 1.0 */ -public class JDesktopPane extends JLayeredPane implements Accessible { +public class JDesktopPane extends JLayeredPane implements Accessible +{ //------------------------------------------------------------- // Classes ---------------------------------------------------- diff --git a/libjava/javax/swing/JDialog.java b/libjava/javax/swing/JDialog.java index 61b9d40a49b..11f27b239e0 100644 --- a/libjava/javax/swing/JDialog.java +++ b/libjava/javax/swing/JDialog.java @@ -35,16 +35,21 @@ 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 javax.swing; -import java.awt.*; -import java.awt.event.*; +package javax.swing; +import java.awt.BorderLayout; +import java.awt.Component; +import java.awt.Container; +import java.awt.Dialog; +import java.awt.Dimension; +import java.awt.Frame; +import java.awt.Graphics; +import java.awt.LayoutManager; +import java.awt.event.KeyEvent; +import java.awt.event.WindowEvent; import javax.accessibility.Accessible; import javax.accessibility.AccessibleContext; -import javax.accessibility.AccessibleRole; -import javax.accessibility.AccessibleState; -import javax.accessibility.AccessibleStateSet; /** * Unlike JComponent derivatives, JDialog inherits from diff --git a/libjava/javax/swing/JEditorPane.java b/libjava/javax/swing/JEditorPane.java index a2db3ee9007..bce9dc70640 100644 --- a/libjava/javax/swing/JEditorPane.java +++ b/libjava/javax/swing/JEditorPane.java @@ -35,15 +35,19 @@ 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 javax.swing; -import java.io.*; -import java.net.*; -import javax.swing.text.*; -import javax.swing.event.*; -import java.awt.event.*; -import java.awt.*; -import javax.accessibility.*; +import java.awt.Dimension; +import java.awt.event.KeyEvent; +import java.io.InputStream; +import java.net.URL; +import javax.accessibility.AccessibleContext; +import javax.swing.text.EditorKit; +import javax.swing.text.JTextComponent; +import javax.swing.text.PlainEditorKit; +import javax.swing.event.HyperlinkEvent; +import javax.swing.event.HyperlinkListener; public class JEditorPane extends JTextComponent { diff --git a/libjava/javax/swing/JFileChooser.java b/libjava/javax/swing/JFileChooser.java index cfa435c6d41..988e75b7743 100644 --- a/libjava/javax/swing/JFileChooser.java +++ b/libjava/javax/swing/JFileChooser.java @@ -35,17 +35,22 @@ 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 javax.swing; -// Imports -import java.awt.*; -import java.awt.event.*; -import java.io.*; -import java.util.*; -import javax.accessibility.*; -import javax.swing.filechooser.*; +import java.awt.Component; +import java.awt.event.ActionListener; +import java.io.File; +import java.io.IOException; +import java.io.ObjectOutputStream; +import java.util.Vector; +import javax.accessibility.Accessible; +import javax.accessibility.AccessibleContext; +import javax.accessibility.AccessibleRole; import javax.swing.filechooser.FileFilter; -import javax.swing.plaf.*; +import javax.swing.filechooser.FileSystemView; +import javax.swing.filechooser.FileView; +import javax.swing.plaf.FileChooserUI; /** * JFileChooser diff --git a/libjava/javax/swing/JFormattedTextField.java b/libjava/javax/swing/JFormattedTextField.java index c7838e80a36..f26af99e60e 100644 --- a/libjava/javax/swing/JFormattedTextField.java +++ b/libjava/javax/swing/JFormattedTextField.java @@ -41,6 +41,7 @@ package javax.swing; import java.awt.event.FocusEvent; import java.io.Serializable; import java.text.Format; +import java.text.ParseException; import javax.swing.text.Document; import javax.swing.text.DocumentFilter; import javax.swing.text.NavigationFilter; diff --git a/libjava/javax/swing/JFrame.java b/libjava/javax/swing/JFrame.java index 947bfab0e6c..9f4436ffb07 100644 --- a/libjava/javax/swing/JFrame.java +++ b/libjava/javax/swing/JFrame.java @@ -35,15 +35,20 @@ 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 javax.swing; -import java.awt.*; -import java.awt.event.*; +package javax.swing; +import java.awt.BorderLayout; +import java.awt.Component; +import java.awt.Container; +import java.awt.Dimension; +import java.awt.Frame; +import java.awt.Graphics; +import java.awt.GraphicsConfiguration; +import java.awt.LayoutManager; +import java.awt.event.KeyEvent; +import java.awt.event.WindowEvent; import javax.accessibility.AccessibleContext; -import javax.accessibility.AccessibleRole; -import javax.accessibility.AccessibleState; -import javax.accessibility.AccessibleStateSet; /** * Unlike JComponent derivatives, JFrame inherits from diff --git a/libjava/javax/swing/JLabel.java b/libjava/javax/swing/JLabel.java index a4d6fa16faf..c49615c4638 100644 --- a/libjava/javax/swing/JLabel.java +++ b/libjava/javax/swing/JLabel.java @@ -35,19 +35,16 @@ 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 javax.swing; - -import java.awt.*; -import javax.swing.plaf.*; +package javax.swing; +import java.awt.Component; +import java.awt.Image; +import javax.accessibility.Accessible; import javax.accessibility.AccessibleContext; -import javax.accessibility.AccessibleRole; -import javax.accessibility.AccessibleState; -import javax.accessibility.AccessibleStateSet; - +import javax.swing.plaf.LabelUI; -public class JLabel extends JComponent implements SwingConstants +public class JLabel extends JComponent implements Accessible, SwingConstants { String text; Icon icon; diff --git a/libjava/javax/swing/JLayeredPane.java b/libjava/javax/swing/JLayeredPane.java index ca49378dbb3..69217804ac1 100644 --- a/libjava/javax/swing/JLayeredPane.java +++ b/libjava/javax/swing/JLayeredPane.java @@ -35,11 +35,13 @@ 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 javax.swing; -import java.awt.*; +import java.awt.Component; +import javax.accessibility.Accessible; -public class JLayeredPane extends JComponent +public class JLayeredPane extends JComponent implements Accessible { JLayeredPane() { diff --git a/libjava/javax/swing/JList.java b/libjava/javax/swing/JList.java index b12e3c3d73f..22d35a5a2c0 100644 --- a/libjava/javax/swing/JList.java +++ b/libjava/javax/swing/JList.java @@ -1,5 +1,5 @@ /* JList.java -- - Copyright (C) 2002 Free Software Foundation, Inc. + Copyright (C) 2002, 2003 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -35,21 +35,21 @@ 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 javax.swing; - -import javax.swing.event.*; - -import java.awt.*; -import javax.swing.plaf.*; -import java.util.*; +package javax.swing; +import java.awt.Color; +import java.awt.Dimension; +import java.awt.Rectangle; +import java.util.Vector; +import javax.accessibility.Accessible; import javax.accessibility.AccessibleContext; -import javax.accessibility.AccessibleRole; -import javax.accessibility.AccessibleState; -import javax.accessibility.AccessibleStateSet; +import javax.swing.event.ListDataEvent; +import javax.swing.event.ListDataListener; +import javax.swing.event.ListSelectionListener; +import javax.swing.plaf.ListUI; -public class JList extends JComponent implements Scrollable +public class JList extends JComponent implements Accessible, Scrollable { Color select_back, select_fore; ListCellRenderer render; @@ -143,14 +143,13 @@ public class JList extends JComponent implements Scrollable public void setListData(final Vector listData) { - // XXX - FIXME Don't also name this AL, workaround for gcj 3.1. - class ALData extends AbstractListModel + class AL extends AbstractListModel { public int getSize() { return listData.size(); } public Object getElementAt(int i) { return listData.elementAt(i); } }; - setModel (new ALData()); + setModel (new AL()); } diff --git a/libjava/javax/swing/JMenuBar.java b/libjava/javax/swing/JMenuBar.java index dcceb9e3122..24440db598a 100644 --- a/libjava/javax/swing/JMenuBar.java +++ b/libjava/javax/swing/JMenuBar.java @@ -35,8 +35,14 @@ 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 javax.swing; +import java.awt.Component; +import java.awt.event.KeyEvent; +import java.awt.event.MouseEvent; +import javax.accessibility.Accessible; + public class JMenuBar extends JComponent { JMenuBar() diff --git a/libjava/javax/swing/JMenuItem.java b/libjava/javax/swing/JMenuItem.java index 7d3bfef9a7a..db09f22972f 100644 --- a/libjava/javax/swing/JMenuItem.java +++ b/libjava/javax/swing/JMenuItem.java @@ -35,16 +35,26 @@ 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 javax.swing; -// Imports -import java.awt.*; -import java.awt.event.*; -import java.beans.*; -import java.io.*; -import javax.accessibility.*; -import javax.swing.event.*; -import javax.swing.plaf.*; +import java.awt.Component; +import java.awt.event.KeyEvent; +import java.awt.event.MouseEvent; +import java.beans.PropertyChangeListener; +import java.io.IOException; +import java.io.ObjectInputStream; +import java.io.ObjectOutputStream; +import javax.accessibility.Accessible; +import javax.accessibility.AccessibleContext; +import javax.accessibility.AccessibleRole; +import javax.swing.event.ChangeEvent; +import javax.swing.event.ChangeListener; +import javax.swing.event.MenuDragMouseEvent; +import javax.swing.event.MenuDragMouseListener; +import javax.swing.event.MenuKeyEvent; +import javax.swing.event.MenuKeyListener; +import javax.swing.plaf.MenuItemUI; /** * JMenuItem diff --git a/libjava/javax/swing/JOptionPane.java b/libjava/javax/swing/JOptionPane.java index 71904021a9e..5dc10c7dc03 100644 --- a/libjava/javax/swing/JOptionPane.java +++ b/libjava/javax/swing/JOptionPane.java @@ -35,14 +35,16 @@ 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 javax.swing; -import java.awt.*; -import javax.swing.plaf.*; +import java.awt.BorderLayout; +import java.awt.Component; +import java.awt.Dialog; +import java.awt.Frame; +import javax.accessibility.Accessible; import javax.accessibility.AccessibleContext; -import javax.accessibility.AccessibleRole; -import javax.accessibility.AccessibleState; -import javax.accessibility.AccessibleStateSet; +import javax.swing.plaf.OptionPaneUI; public class JOptionPane extends JComponent { diff --git a/libjava/javax/swing/JPanel.java b/libjava/javax/swing/JPanel.java index b50271628b4..56cc1f09e26 100644 --- a/libjava/javax/swing/JPanel.java +++ b/libjava/javax/swing/JPanel.java @@ -35,22 +35,21 @@ 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 javax.swing; -import java.awt.*; -import javax.swing.plaf.*; +package javax.swing; +import java.awt.FlowLayout; +import java.awt.LayoutManager; +import javax.swing.plaf.PanelUI; +import javax.accessibility.Accessible; import javax.accessibility.AccessibleContext; -import javax.accessibility.AccessibleRole; -import javax.accessibility.AccessibleState; -import javax.accessibility.AccessibleStateSet; /** * An instance of JPanel can be added to a panel, frame etc * * @author Ronald Veldema (rveldema@cs.vu.nl) */ -public class JPanel extends JComponent +public class JPanel extends JComponent implements Accessible { public JPanel() { diff --git a/libjava/javax/swing/JPasswordField.java b/libjava/javax/swing/JPasswordField.java index 3e28a8fc106..40fb921f280 100644 --- a/libjava/javax/swing/JPasswordField.java +++ b/libjava/javax/swing/JPasswordField.java @@ -218,6 +218,7 @@ public class JPasswordField extends JTextField { /** * getText * @returns String + * @deprecated */ public String getText() { return null; // TODO @@ -229,6 +230,7 @@ public class JPasswordField extends JTextField { * @param length TODO * @exception BadLocationException TODO * @returns String + * @deprecated */ public String getText(int offset, int length) throws BadLocationException { return null; // TODO diff --git a/libjava/javax/swing/JPopupMenu.java b/libjava/javax/swing/JPopupMenu.java index a787332f176..d5c6023205e 100644 --- a/libjava/javax/swing/JPopupMenu.java +++ b/libjava/javax/swing/JPopupMenu.java @@ -51,7 +51,8 @@ import javax.swing.plaf.*; * @author Andrew Selkirk * @version 1.0 */ -public class JPopupMenu extends JComponent implements Accessible, MenuElement { +public class JPopupMenu extends JComponent implements Accessible, MenuElement +{ //------------------------------------------------------------- // Classes ---------------------------------------------------- diff --git a/libjava/javax/swing/JProgressBar.java b/libjava/javax/swing/JProgressBar.java index 6558bf83abc..2c4d834a6dd 100644 --- a/libjava/javax/swing/JProgressBar.java +++ b/libjava/javax/swing/JProgressBar.java @@ -49,7 +49,8 @@ import javax.swing.plaf.*; * @author Andrew Selkirk * @version 1.0 */ -public class JProgressBar extends JComponent implements SwingConstants, Accessible { +public class JProgressBar extends JComponent implements SwingConstants, Accessible +{ //------------------------------------------------------------- // Classes ---------------------------------------------------- diff --git a/libjava/javax/swing/JRadioButton.java b/libjava/javax/swing/JRadioButton.java index 7671b1d3f7b..14bfcebb1fd 100644 --- a/libjava/javax/swing/JRadioButton.java +++ b/libjava/javax/swing/JRadioButton.java @@ -35,12 +35,10 @@ 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 javax.swing; -import java.awt.*; -import java.awt.event.*; -import javax.swing.plaf.*; -import javax.accessibility.*; +import javax.accessibility.AccessibleContext; public class JRadioButton extends JToggleButton { diff --git a/libjava/javax/swing/JRadioButtonMenuItem.java b/libjava/javax/swing/JRadioButtonMenuItem.java index 208b678ee5c..d619bfdd051 100644 --- a/libjava/javax/swing/JRadioButtonMenuItem.java +++ b/libjava/javax/swing/JRadioButtonMenuItem.java @@ -46,7 +46,8 @@ import javax.accessibility.*; * @author Andrew Selkirk * @version 1.0 */ -public class JRadioButtonMenuItem extends JMenuItem implements Accessible { +public class JRadioButtonMenuItem extends JMenuItem implements Accessible +{ //------------------------------------------------------------- // Classes ---------------------------------------------------- diff --git a/libjava/javax/swing/JRootPane.java b/libjava/javax/swing/JRootPane.java index e7216d706a2..f0121b8ce92 100644 --- a/libjava/javax/swing/JRootPane.java +++ b/libjava/javax/swing/JRootPane.java @@ -35,15 +35,18 @@ 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 javax.swing; -import java.awt.*; -import java.awt.event.*; +package javax.swing; -import javax.accessibility.AccessibleContext; -import javax.accessibility.AccessibleRole; -import javax.accessibility.AccessibleState; -import javax.accessibility.AccessibleStateSet; +import java.awt.BorderLayout; +import java.awt.Component; +import java.awt.Container; +import java.awt.Dimension; +import java.awt.LayoutManager; +import java.awt.LayoutManager2; +import java.io.Serializable; +import javax.accessibility.Accessible; +import javax.accessibility.AccessibleComponent; /** * This class is where JComponents are added to. diff --git a/libjava/javax/swing/JScrollBar.java b/libjava/javax/swing/JScrollBar.java index 482ed8f62bf..1cf6667d483 100644 --- a/libjava/javax/swing/JScrollBar.java +++ b/libjava/javax/swing/JScrollBar.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 javax.swing; +import java.awt.Adjustable; +import java.awt.event.AdjustmentListener; +import javax.accessibility.Accessible; public class JScrollBar extends JComponent { diff --git a/libjava/javax/swing/JScrollPane.java b/libjava/javax/swing/JScrollPane.java index 70cbd2d6ef7..33cdba127dc 100644 --- a/libjava/javax/swing/JScrollPane.java +++ b/libjava/javax/swing/JScrollPane.java @@ -35,13 +35,14 @@ 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 javax.swing; -import java.awt.*; -import javax.swing.plaf.*; +package javax.swing; +import java.awt.Component; +import javax.accessibility.Accessible; +import javax.swing.plaf.ScrollPaneUI; -public class JScrollPane extends JComponent +public class JScrollPane extends JComponent implements Accessible, ScrollPaneConstants { protected JViewport columnHeader; protected JViewport rowHeader; diff --git a/libjava/javax/swing/JSeparator.java b/libjava/javax/swing/JSeparator.java index a49a77faa52..a0a010aa304 100644 --- a/libjava/javax/swing/JSeparator.java +++ b/libjava/javax/swing/JSeparator.java @@ -48,7 +48,8 @@ import javax.swing.plaf.*; * @version 1.0 */ public class JSeparator extends JComponent - implements SwingConstants, Accessible { + implements SwingConstants, Accessible +{ //------------------------------------------------------------- // Classes ---------------------------------------------------- diff --git a/libjava/javax/swing/JSlider.java b/libjava/javax/swing/JSlider.java index 58475b67f16..c9fc022fa6a 100644 --- a/libjava/javax/swing/JSlider.java +++ b/libjava/javax/swing/JSlider.java @@ -35,14 +35,22 @@ 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 javax.swing; -// Imports -import java.io.*; -import java.util.*; -import javax.accessibility.*; -import javax.swing.event.*; -import javax.swing.plaf.*; +import java.io.IOException; +import java.io.ObjectOutputStream; +import java.io.Serializable; +import java.util.Dictionary; +import java.util.Hashtable; +import javax.accessibility.Accessible; +import javax.accessibility.AccessibleContext; +import javax.accessibility.AccessibleRole; +import javax.accessibility.AccessibleStateSet; +import javax.accessibility.AccessibleValue; +import javax.swing.event.ChangeEvent; +import javax.swing.event.ChangeListener; +import javax.swing.plaf.SliderUI; /** * JSlider diff --git a/libjava/javax/swing/JTabbedPane.java b/libjava/javax/swing/JTabbedPane.java index 915ec93258f..9264a76e9c5 100644 --- a/libjava/javax/swing/JTabbedPane.java +++ b/libjava/javax/swing/JTabbedPane.java @@ -35,19 +35,18 @@ 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 javax.swing; - -import java.util.*; -import javax.swing.plaf.*; -import java.awt.*; +package javax.swing; +import java.awt.Component; +import java.util.Vector; +import javax.accessibility.Accessible; import javax.accessibility.AccessibleContext; -import javax.accessibility.AccessibleRole; -import javax.accessibility.AccessibleState; -import javax.accessibility.AccessibleStateSet; +import javax.swing.event.ChangeEvent; +import javax.swing.event.ChangeListener; +import javax.swing.plaf.TabbedPaneUI; -public class JTabbedPane extends JComponent +public class JTabbedPane extends JComponent implements Accessible, SwingConstants { class Tab { diff --git a/libjava/javax/swing/JTable.java b/libjava/javax/swing/JTable.java index a6ed0cc79b4..55c6043ff8f 100644 --- a/libjava/javax/swing/JTable.java +++ b/libjava/javax/swing/JTable.java @@ -35,10 +35,14 @@ 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 javax.swing; +import java.awt.Color; +import java.awt.Component; import java.awt.Dimension; import java.awt.Rectangle; +import java.util.Hashtable; import java.util.Vector; import javax.accessibility.Accessible; import javax.swing.event.ChangeEvent; @@ -49,9 +53,10 @@ import javax.swing.event.TableColumnModelEvent; import javax.swing.event.TableColumnModelListener; import javax.swing.event.TableModelEvent; import javax.swing.event.TableModelListener; +import javax.swing.table.JTableHeader; import javax.swing.table.TableModel; +import javax.swing.table.TableCellEditor; import javax.swing.table.TableColumnModel; -import javax.swing.table.DefaultTableModel; public class JTable extends JComponent implements TableModelListener, Scrollable, TableColumnModelListener, diff --git a/libjava/javax/swing/JTextField.java b/libjava/javax/swing/JTextField.java index 806aa27dfb3..edc3ea7735b 100644 --- a/libjava/javax/swing/JTextField.java +++ b/libjava/javax/swing/JTextField.java @@ -35,12 +35,14 @@ 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 javax.swing; -import java.awt.event.*; -import java.util.*; +package javax.swing; -import javax.accessibility.*; +import java.awt.event.ActionListener; +import java.util.Vector; +import javax.accessibility.AccessibleStateSet; +import javax.swing.text.Document; +import javax.swing.text.JTextComponent; public class JTextField extends JEditorPane { diff --git a/libjava/javax/swing/JToggleButton.java b/libjava/javax/swing/JToggleButton.java index d0e90cb59c8..63972c1cad5 100644 --- a/libjava/javax/swing/JToggleButton.java +++ b/libjava/javax/swing/JToggleButton.java @@ -35,14 +35,14 @@ 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 javax.swing; -import java.awt.*; -import java.awt.event.*; -import javax.swing.plaf.*; -import javax.accessibility.*; +import javax.accessibility.Accessible; +import javax.accessibility.AccessibleContext; +import javax.swing.plaf.ButtonUI; -public class JToggleButton extends AbstractButton +public class JToggleButton extends AbstractButton implements Accessible { public JToggleButton() { diff --git a/libjava/javax/swing/JToolBar.java b/libjava/javax/swing/JToolBar.java index f5b18d900ac..a92157efbf2 100644 --- a/libjava/javax/swing/JToolBar.java +++ b/libjava/javax/swing/JToolBar.java @@ -50,7 +50,8 @@ import javax.swing.plaf.*; * @version 1.0 */ public class JToolBar extends JComponent - implements SwingConstants, Accessible { + implements SwingConstants, Accessible +{ //------------------------------------------------------------- // Classes ---------------------------------------------------- diff --git a/libjava/javax/swing/JToolTip.java b/libjava/javax/swing/JToolTip.java index d245df99fe4..54e09cf0c60 100644 --- a/libjava/javax/swing/JToolTip.java +++ b/libjava/javax/swing/JToolTip.java @@ -35,12 +35,13 @@ 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 javax.swing; -import java.awt.*; +package javax.swing; +import javax.accessibility.Accessible; +import javax.accessibility.AccessibleContext; -public class JToolTip extends JComponent +public class JToolTip extends JComponent implements Accessible { String text; diff --git a/libjava/javax/swing/JTree.java b/libjava/javax/swing/JTree.java index f474c2f69ac..432612db808 100644 --- a/libjava/javax/swing/JTree.java +++ b/libjava/javax/swing/JTree.java @@ -35,11 +35,28 @@ 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 javax.swing; -import java.awt.*; -import javax.swing.plaf.*; -import javax.accessibility.*; +import java.awt.Dimension; +import java.awt.Rectangle; +import java.io.Serializable; +import java.util.Hashtable; +import java.util.Vector; +import javax.accessibility.Accessible; +import javax.accessibility.AccessibleContext; +import javax.swing.event.TreeModelEvent; +import javax.swing.event.TreeModelListener; +import javax.swing.event.TreeSelectionEvent; +import javax.swing.event.TreeSelectionListener; +import javax.swing.plaf.TreeUI; +import javax.swing.tree.DefaultTreeSelectionModel; +import javax.swing.tree.TreeCellEditor; +import javax.swing.tree.TreeCellRenderer; +import javax.swing.tree.TreeModel; +import javax.swing.tree.TreeNode; +import javax.swing.tree.TreePath; +import javax.swing.tree.TreeSelectionModel; public class JTree extends JComponent implements Scrollable, Accessible { diff --git a/libjava/javax/swing/JViewport.java b/libjava/javax/swing/JViewport.java index c4a8df6e15c..43ed91e6883 100644 --- a/libjava/javax/swing/JViewport.java +++ b/libjava/javax/swing/JViewport.java @@ -35,11 +35,17 @@ 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 javax.swing; -import javax.swing.plaf.*; -import java.awt.*; +package javax.swing; +import java.awt.Component; +import java.awt.Container; +import java.awt.Graphics; +import java.awt.Image; +import java.awt.Point; +import java.awt.Rectangle; +import javax.accessibility.Accessible; +import javax.swing.plaf.ViewportUI; public class JViewport extends JComponent { diff --git a/libjava/javax/swing/JWindow.java b/libjava/javax/swing/JWindow.java index c74e33870c0..50d0c316895 100644 --- a/libjava/javax/swing/JWindow.java +++ b/libjava/javax/swing/JWindow.java @@ -35,11 +35,22 @@ 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 javax.swing; -import java.awt.*; -import java.awt.event.*; -import javax.accessibility.*; +import java.awt.BorderLayout; +import java.awt.Component; +import java.awt.Container; +import java.awt.Dimension; +import java.awt.Frame; +import java.awt.Graphics; +import java.awt.GraphicsConfiguration; +import java.awt.LayoutManager; +import java.awt.Window; +import java.awt.event.KeyEvent; +import java.awt.event.WindowEvent; +import javax.accessibility.Accessible; +import javax.accessibility.AccessibleContext; /** * Unlike JComponent derivatives, JWindow inherits from diff --git a/libjava/javax/swing/KeyStroke.java b/libjava/javax/swing/KeyStroke.java index 7fe06995a9f..c3053aa289e 100644 --- a/libjava/javax/swing/KeyStroke.java +++ b/libjava/javax/swing/KeyStroke.java @@ -37,9 +37,9 @@ exception statement from your version. */ package javax.swing; -// Imports -import java.awt.event.*; -import java.io.*; +import java.awt.AWTKeyStroke; +import java.awt.event.KeyEvent; +import java.io.Serializable; /** * KeyStroke diff --git a/libjava/javax/swing/ListSelectionModel.java b/libjava/javax/swing/ListSelectionModel.java index e4b985b93e0..f4568479387 100644 --- a/libjava/javax/swing/ListSelectionModel.java +++ b/libjava/javax/swing/ListSelectionModel.java @@ -35,10 +35,10 @@ 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 javax.swing; +package javax.swing; -import javax.swing.event.*; +import javax.swing.event.ListSelectionListener; public interface ListSelectionModel { diff --git a/libjava/javax/swing/LookAndFeel.java b/libjava/javax/swing/LookAndFeel.java index cd9d201dce6..b841a178075 100644 --- a/libjava/javax/swing/LookAndFeel.java +++ b/libjava/javax/swing/LookAndFeel.java @@ -35,9 +35,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 javax.swing; -import javax.swing.text.*; +import java.awt.Component; +import javax.swing.text.JTextComponent; public abstract class LookAndFeel { diff --git a/libjava/javax/swing/RepaintManager.java b/libjava/javax/swing/RepaintManager.java index cce32b5a018..55d62ae5f80 100644 --- a/libjava/javax/swing/RepaintManager.java +++ b/libjava/javax/swing/RepaintManager.java @@ -35,11 +35,15 @@ 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 javax.swing; -// Imports -import java.awt.*; -import java.util.*; +import java.awt.Component; +import java.awt.Dimension; +import java.awt.Image; +import java.awt.Rectangle; +import java.util.Hashtable; +import java.util.Vector; /** * RepaintManager diff --git a/libjava/javax/swing/ScrollPaneLayout.java b/libjava/javax/swing/ScrollPaneLayout.java index bd65471d05f..d6cc479de0b 100644 --- a/libjava/javax/swing/ScrollPaneLayout.java +++ b/libjava/javax/swing/ScrollPaneLayout.java @@ -35,12 +35,15 @@ 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 javax.swing; -// Imports -import java.awt.*; -import java.io.*; -import javax.swing.plaf.*; +import java.awt.Component; +import java.awt.Container; +import java.awt.Dimension; +import java.awt.LayoutManager; +import java.awt.Rectangle; +import java.io.Serializable; /** * ScrollPaneLayout diff --git a/libjava/javax/swing/SizeRequirements.java b/libjava/javax/swing/SizeRequirements.java index da6d1129d0f..eb641fbd1c7 100644 --- a/libjava/javax/swing/SizeRequirements.java +++ b/libjava/javax/swing/SizeRequirements.java @@ -35,10 +35,10 @@ 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 javax.swing; -// Imports -import java.io.*; +import java.io.Serializable; /** * SizeRequirements diff --git a/libjava/javax/swing/SwingConstants.java b/libjava/javax/swing/SwingConstants.java index dbdd71043f1..fb7c23b4970 100644 --- a/libjava/javax/swing/SwingConstants.java +++ b/libjava/javax/swing/SwingConstants.java @@ -35,11 +35,10 @@ 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 javax.swing; - +package javax.swing; -public interface SwingConstants +public interface SwingConstants { public static final int CENTER = 0; public static final int TOP = 1; diff --git a/libjava/javax/swing/Timer.java b/libjava/javax/swing/Timer.java index 1d52405218f..80eb13a1a44 100644 --- a/libjava/javax/swing/Timer.java +++ b/libjava/javax/swing/Timer.java @@ -35,13 +35,17 @@ 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 javax.swing; -import java.awt.event.*; -import java.util.*; +package javax.swing; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.io.Serializable; +import java.util.EventListener; +import java.util.Vector; +import javax.swing.event.EventListenerList; -public class Timer +public class Timer implements Serializable { int ticks; static boolean verbose; diff --git a/libjava/javax/swing/UIDefaults.java b/libjava/javax/swing/UIDefaults.java index de36203c9dc..71f0955fcfc 100644 --- a/libjava/javax/swing/UIDefaults.java +++ b/libjava/javax/swing/UIDefaults.java @@ -77,7 +77,7 @@ public class UIDefaults extends Hashtable Object createValue(UIDefaults table); } // interface LazyValue - public static class ProxyLazyValue + public static class ProxyLazyValue implements LazyValue { public ProxyLazyValue(String s) { @@ -101,6 +101,8 @@ public class UIDefaults extends Hashtable } } // class ProxyLazyValue + private static final long serialVersionUID = 7341222528856548117L; + public UIDefaults() { } diff --git a/libjava/javax/swing/UIManager.java b/libjava/javax/swing/UIManager.java index 8feaccf30e3..8c4f9cc4af7 100644 --- a/libjava/javax/swing/UIManager.java +++ b/libjava/javax/swing/UIManager.java @@ -35,19 +35,18 @@ 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 javax.swing; - -import java.io.*; -import java.awt.*; - -import javax.swing.border.*; -import javax.swing.plaf.*; -import javax.swing.plaf.basic.*; -import javax.swing.plaf.metal.*; +package javax.swing; -import java.beans.*; - +import java.awt.Color; +import java.awt.Dimension; +import java.awt.Font; +import java.awt.Insets; +import java.beans.PropertyChangeListener; +import java.io.Serializable; +import javax.swing.border.Border; +import javax.swing.plaf.ComponentUI; +import javax.swing.plaf.metal.MetalLookAndFeel; public class UIManager implements Serializable { diff --git a/libjava/javax/swing/border/AbstractBorder.java b/libjava/javax/swing/border/AbstractBorder.java index fad3aa288ef..663fb1130e0 100644 --- a/libjava/javax/swing/border/AbstractBorder.java +++ b/libjava/javax/swing/border/AbstractBorder.java @@ -1,5 +1,5 @@ /* AbstractBorder.java -- - Copyright (C) 2002 Free Software Foundation, Inc. + Copyright (C) 2003 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -44,85 +44,149 @@ import java.awt.Insets; import java.awt.Rectangle; import java.io.Serializable; -public abstract class AbstractBorder implements Border, Serializable + +/** + * An invisible zero-width border, serving as a base class for + * implementing more interesting borders. + * + * @author Sascha Brawer (brawer@dandelis.ch) + * @author Ronald Veldema (rveldema@cs.vu.nl) + */ +public abstract class AbstractBorder + implements Border, Serializable { static final long serialVersionUID = -545885975315191844L; + + /** + * Constructs a new AbstractBorder. + */ public AbstractBorder () { } - public void paintBorder(Component c, - Graphics g, - int x, - int y, - int width, - int height) - { - System.out.println("HMMMMM, abstract-border.paintBorder"); - } + /** + * Performs nothing, because the default implementation provided by + * this class is an invisible, zero-width border. Subclasses will + * likely want to override this method, but they are not required + * for doing so. + * + * @param c the component whose border is to be painted. + * @param g the graphics for painting. + * @param x the horizontal position for painting the border. + * @param y the vertical position for painting the 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, + int x, int y, int width, int height) + { + /* A previous version of Classpath had emitted a warning when + * this method was called. The warning was removed because it is + * perfectly legal for a subclass to not override the paintBorder + * method. An example would be EmptyBorder. + */ + } - public Insets getBorderInsets(Component c, Insets insets) - { - if (insets == null) - insets = new Insets(0,0,0,0); - - insets.left = insets.top = insets.right = insets.bottom = 5; - return insets; - } + /** + * Determines the insets of this border. The implementation provided + * by AbstractButton returns Insets for a zero-width border, whose + * left, right, top and + * bottom fields are all zero. + * + * @param c the component whose border is to be measured. + * + * @return a newly created Insets object, indicating a zero-width + * border. + */ + public Insets getBorderInsets (Component c) + { + return new Insets (0, 0, 0, 0); + } - public Insets getBorderInsets(Component c) - { - return getBorderInsets(c, new Insets(0,0,0,0)); - } + /** + * Determines the insets of this border. The implementation provided + * by AbstractButton sets the left, right, + * top and bottom fields of the passed + * insets parameter to zero. + * + * @param c the component in the center of this border. + * + * @param insets an Insets object for holding the insets of this + * border. + * + * @return the insets object. + */ + public Insets getBorderInsets (Component c, Insets insets) + { + insets.left = insets.right = insets.top = insets.bottom = 0; + return insets; + } - public boolean isBorderOpaque() - { return false; } - public Rectangle getInteriorRectangle(Component c, - int x, - int y, - int width, - int height) - { - return getInteriorRectangle(c, - this, - x, - y, - width, - height); - } + /** + * Determines whether or not this border is opaque. An opaque border + * fills every pixel in its area when painting. Partially + * translucent borders must return false, or ugly + * artifacts can appear on screen. The default implementation + * provided by AbstractBorder always returns false. + * + * @return false. + */ + public boolean isBorderOpaque () + { + return false; + } - - public static Rectangle getInteriorRectangle(Component c, - Border b, - int x, - int y, - int width, - int height) + + /** + * Returns a rectangle that covers the specified area minus this + * border. Components that wish to determine an area into which + * they can safely draw without intersecting with a border might + * want to use this helper method. + * + * @param c the component in the center of this border. + * @param x the horizontal position of the border. + * @param y the vertical position of the border. + * @param width the width of the available area for the border. + * @param height the height of the available area for the border. + */ + public Rectangle getInteriorRectangle (Component c, + int x, int y, int width, int height) + { + return getInteriorRectangle (c, this, x, y, width, height); + } + + + /** + * Returns a rectangle that covers the specified area minus a + * border. Components that wish to determine an area into which + * they can safely draw without intersecting with a border might + * want to use this helper method. + * + * @param c the component in the center of this border. + * @param x the horizontal position of the border. + * @param y the vertical position of the border. + * @param width the width of the available area for the border. + * @param height the height of the available area for the border. + */ + public static Rectangle getInteriorRectangle (Component c, Border b, + int x, int y, int width, int height) + { + Insets borderInsets; + + if (b != null) { - if(b != null) - { - Insets insets = b.getBorderInsets(c); - - int w = insets.right - insets.left; - int h = insets.top - insets.bottom; - - return new Rectangle(x + insets.left, - y + insets.top, - width - w, - height - h); - } - else - { - return new Rectangle(x, - y, - width, - height); - } + borderInsets = b.getBorderInsets (c); + x += borderInsets.left; + y += borderInsets.top; + width -= borderInsets.left + borderInsets.right; + height -= borderInsets.top + borderInsets.bottom; } -} + return new Rectangle (x, y, width, height); + } +} diff --git a/libjava/javax/swing/border/CompoundBorder.java b/libjava/javax/swing/border/CompoundBorder.java index bf6a8caaefe..102a220e103 100644 --- a/libjava/javax/swing/border/CompoundBorder.java +++ b/libjava/javax/swing/border/CompoundBorder.java @@ -1,5 +1,5 @@ /* CompoundBorder.java -- - Copyright (C) 2002 Free Software Foundation, Inc. + Copyright (C) 2003 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -42,45 +42,212 @@ import java.awt.Component; import java.awt.Graphics; import java.awt.Insets; -public class CompoundBorder extends AbstractBorder +/** + * A Border that is composed of an interior and an exterior border, + * where the interior border is tightly nested into the exterior. + * + * @author Sascha Brawer (brawer@dandelis.ch) + */ +public class CompoundBorder + extends AbstractBorder { + static final long serialVersionUID = 9054540377030555103L; + + + /** + * The inside border, which is painted between the bordered + * Component and the outside border. It is valid for + * insideBorder to be null. + */ protected Border insideBorder; + + + /** + * The outside border, which is painted outside both the + * bordered Component and the inside border. It is valid for + * outsideBorder to be null. + */ protected Border outsideBorder; + + /** + * Constructs a CompoundBorder whose inside and outside borders + * are both null. While this does not really make + * any sense (there exists a class EmptyBorder as well, and not + * every Component needs to have a border at all), the API + * specification requires the existence of this constructor. + * + * @see EmptyBorder + */ public CompoundBorder () { this (null, null); } + + /** + * Constructs a CompoundBorder with the specified inside and + * outside borders. + * + * @param outsideBorder the outside border, which is painted to the + * outside of both insideBorder and the bordered + * compoonent. It is acceptable to pass null, in + * which no outside border is painted. + * + * @param insideBorder the inside border, which is painted to + * between outsideBorder and the bordered + * component. It is acceptable to pass null, in + * which no intside border is painted. + */ public CompoundBorder (Border outsideBorder, Border insideBorder) { this.outsideBorder = outsideBorder; this.insideBorder = insideBorder; } + + + /** + * Determines whether or not this border is opaque. An opaque + * border fills every pixel in its area when painting. Partially + * translucent borders must return false, or ugly + * artifacts can appear on screen. + * + * @return true if both the inside and outside borders + * are opaque, or false otherwise. + */ + public boolean isBorderOpaque () + { + /* While it would be safe to assume true for the opacity of + * a null border, this behavior would not be according to + * the API specification. Also, it is pathological to have + * null borders anyway. + */ + if ((insideBorder == null) || (outsideBorder == null)) + return false; + + return insideBorder.isBorderOpaque() + && outsideBorder.isBorderOpaque(); + } - public Insets getBorderInsets(Component c, - Insets s) + + /** + * Paints the compound border by first painting the outside border, + * then painting the inside border tightly nested into the outside. + * + * @param c the component whose border is to be painted. + * @param g the graphics for painting. + * @param x the horizontal position for painting the border. + * @param y the vertical position for painting the 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, + int x, int y, int width, int height) + { + /* If there is an outside border, paint it and reduce the + * bounding box by its insets. + */ + if (outsideBorder != null) { - if (s == null) - s = new Insets(0,0,0,0); - - s.left = s.right = s.top = s.bottom = 5; - - return s; + Insets outsideInsets; + + outsideBorder.paintBorder(c, g, x, y, width, height); + outsideInsets = outsideBorder.getBorderInsets(c); + + x += outsideInsets.left; + y += outsideInsets.top; + + /* Reduce width and height by the respective extent of the + * outside border. + */ + width -= outsideInsets.left + outsideInsets.right; + height -= outsideInsets.top + outsideInsets.bottom; } - - public boolean isBorderOpaque() + + if (insideBorder != null) + insideBorder.paintBorder(c, g, x, y, width, height); + } + + + /** + * Changes the specified insets to the insets of this border, + * which is the sum of the insets of the inside and the outside + * border. + * + * @param c the component in the center of this border. + * @param insets an Insets object for holding the added insets. + * + * @return the insets object. + */ + public Insets getBorderInsets(Component c, Insets insets) + { + Insets borderInsets; + + if (insets == null) + insets = new Insets (0,0,0,0); + else + insets.left = insets.right = insets.top = insets.bottom = 0; + + /* If there is an outside border, add it to insets. */ + if (outsideBorder != null) { - return false; + borderInsets = outsideBorder.getBorderInsets(c); + insets.left += borderInsets.left; + insets.right += borderInsets.right; + insets.top += borderInsets.top; + insets.bottom += borderInsets.bottom; } - - public void paintBorder(Component c, - Graphics g, - int x, - int y, - int width, - int height) + + /* If there is an inside border, add it to insets. */ + if (insideBorder != null) { + borderInsets = insideBorder.getBorderInsets(c); + insets.left += borderInsets.left; + insets.right += borderInsets.right; + insets.top += borderInsets.top; + insets.bottom += borderInsets.bottom; } + + return insets; + } + + + /** + * Determines the insets of this border, which is the sum of the + * insets of the inside and the outside border. + * + * @param c the component in the center of this border. + */ + public Insets getBorderInsets (Component c) + { + /* It is not clear why CompoundBorder does not simply inherit + * the implementation from AbstractBorder. However, we want + * to be compatible with the API specification, which overrides + * the getBorderInsets(Component) method. + */ + return getBorderInsets (c, null); + } + + + /** + * Returns the outside border, which is painted outside both the + * bordered Component and the inside border. It is valid for the + * result to be null. + */ + public Border getOutsideBorder () + { + return outsideBorder; + } + + + /** + * Returns the inside border, which is painted between the bordered + * Component and the outside border. It is valid for the result to + * be null. + */ + public Border getInsideBorder () + { + return insideBorder; + } } diff --git a/libjava/javax/swing/colorchooser/AbstractColorChooserPanel.java b/libjava/javax/swing/colorchooser/AbstractColorChooserPanel.java index 94503207af4..c39801dc10a 100644 --- a/libjava/javax/swing/colorchooser/AbstractColorChooserPanel.java +++ b/libjava/javax/swing/colorchooser/AbstractColorChooserPanel.java @@ -35,13 +35,14 @@ 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 javax.swing.colorchooser; -// Imports -import java.awt.*; -import java.io.*; -import javax.swing.*; -import javax.swing.event.*; +import java.awt.Color; +import java.awt.Graphics; +import javax.swing.Icon; +import javax.swing.JColorChooser; +import javax.swing.JPanel; /** * AbstractColorChooserPanel diff --git a/libjava/javax/swing/colorchooser/ColorChooserComponentFactory.java b/libjava/javax/swing/colorchooser/ColorChooserComponentFactory.java index 122612e5669..ffd8718eac0 100644 --- a/libjava/javax/swing/colorchooser/ColorChooserComponentFactory.java +++ b/libjava/javax/swing/colorchooser/ColorChooserComponentFactory.java @@ -35,10 +35,10 @@ 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 javax.swing.colorchooser; -// Imports -import javax.swing.*; +import javax.swing.JComponent; /** * ColorChooserComponentFactory diff --git a/libjava/javax/swing/colorchooser/ColorSelectionModel.java b/libjava/javax/swing/colorchooser/ColorSelectionModel.java index 8139a18c720..d04266b07a9 100644 --- a/libjava/javax/swing/colorchooser/ColorSelectionModel.java +++ b/libjava/javax/swing/colorchooser/ColorSelectionModel.java @@ -35,11 +35,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 javax.swing.colorchooser; -// Imports -import java.awt.*; -import javax.swing.event.*; +import java.awt.Color; +import javax.swing.event.ChangeListener; /** * ColorSelectionModel diff --git a/libjava/javax/swing/colorchooser/DefaultColorSelectionModel.java b/libjava/javax/swing/colorchooser/DefaultColorSelectionModel.java index 1df4e325e94..1aa51fd64c0 100644 --- a/libjava/javax/swing/colorchooser/DefaultColorSelectionModel.java +++ b/libjava/javax/swing/colorchooser/DefaultColorSelectionModel.java @@ -1,4 +1,4 @@ -/* BoundedRangeModel.java -- +/* DefaultColorSelectionModel.java -- Copyright (C) 2002 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -35,12 +35,14 @@ 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 javax.swing.colorchooser; -// Imports -import java.awt.*; -import java.io.*; -import javax.swing.event.*; +import java.awt.Color; +import java.io.Serializable; +import javax.swing.event.ChangeEvent; +import javax.swing.event.ChangeListener; +import javax.swing.event.EventListenerList; /** * DefaultColorSelectionModel diff --git a/libjava/javax/swing/event/AncestorEvent.java b/libjava/javax/swing/event/AncestorEvent.java index a1f5ae19fbd..0c86badc764 100644 --- a/libjava/javax/swing/event/AncestorEvent.java +++ b/libjava/javax/swing/event/AncestorEvent.java @@ -35,11 +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 javax.swing.event; -// Imports -import javax.swing.*; -import java.awt.*; +import java.awt.AWTEvent; +import java.awt.Container; +import javax.swing.JComponent; /** * Ancestor Event diff --git a/libjava/javax/swing/event/HyperlinkEvent.java b/libjava/javax/swing/event/HyperlinkEvent.java index ae356bb92a9..26ccaa81c50 100644 --- a/libjava/javax/swing/event/HyperlinkEvent.java +++ b/libjava/javax/swing/event/HyperlinkEvent.java @@ -35,18 +35,20 @@ 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 javax.swing.event; -// Imports -import java.net.*; -import java.util.*; +import java.net.URL; +import java.util.EventObject; +import javax.swing.text.Element; /** * HyperlinkEvent * @author Andrew Selkirk * @author Ronald Veldema */ -public class HyperlinkEvent extends EventObject { +public class HyperlinkEvent extends EventObject +{ //------------------------------------------------------------- // Classes ---------------------------------------------------- diff --git a/libjava/javax/swing/event/InternalFrameAdapter.java b/libjava/javax/swing/event/InternalFrameAdapter.java index d314cadc068..76f3d89da3d 100644 --- a/libjava/javax/swing/event/InternalFrameAdapter.java +++ b/libjava/javax/swing/event/InternalFrameAdapter.java @@ -35,14 +35,15 @@ 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 javax.swing.event; /** * InternalFrameAdapter * @author Andrew Selkirk */ -public class InternalFrameAdapter extends Object - implements InternalFrameListener { +public abstract class InternalFrameAdapter implements InternalFrameListener +{ //------------------------------------------------------------- // Initialization --------------------------------------------- diff --git a/libjava/javax/swing/event/InternalFrameEvent.java b/libjava/javax/swing/event/InternalFrameEvent.java index f974cb52ff3..345568b7b61 100644 --- a/libjava/javax/swing/event/InternalFrameEvent.java +++ b/libjava/javax/swing/event/InternalFrameEvent.java @@ -35,9 +35,9 @@ 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 javax.swing.event; -// Imports import java.awt.AWTEvent; import javax.swing.JInternalFrame; diff --git a/libjava/javax/swing/event/ListDataEvent.java b/libjava/javax/swing/event/ListDataEvent.java index 5849f7dc898..4c6e39f00a3 100644 --- a/libjava/javax/swing/event/ListDataEvent.java +++ b/libjava/javax/swing/event/ListDataEvent.java @@ -35,9 +35,9 @@ 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 javax.swing.event; -// Imports import java.util.EventObject; /** diff --git a/libjava/javax/swing/event/MouseInputAdapter.java b/libjava/javax/swing/event/MouseInputAdapter.java index 087f01c17d6..23caed0a8d9 100644 --- a/libjava/javax/swing/event/MouseInputAdapter.java +++ b/libjava/javax/swing/event/MouseInputAdapter.java @@ -35,9 +35,9 @@ 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 javax.swing.event; -// Imports import java.awt.event.MouseEvent; /** diff --git a/libjava/javax/swing/event/SwingPropertyChangeSupport.java b/libjava/javax/swing/event/SwingPropertyChangeSupport.java index 2bb0d64aca6..9092158df32 100644 --- a/libjava/javax/swing/event/SwingPropertyChangeSupport.java +++ b/libjava/javax/swing/event/SwingPropertyChangeSupport.java @@ -49,6 +49,8 @@ import java.util.*; public final class SwingPropertyChangeSupport extends PropertyChangeSupport { + private static final long serialVersionUID = 7162625831330845068L; + //------------------------------------------------------------- // Variables -------------------------------------------------- //------------------------------------------------------------- diff --git a/libjava/javax/swing/event/TableModelEvent.java b/libjava/javax/swing/event/TableModelEvent.java index 2316c28a75c..c5989558099 100644 --- a/libjava/javax/swing/event/TableModelEvent.java +++ b/libjava/javax/swing/event/TableModelEvent.java @@ -35,9 +35,9 @@ 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 javax.swing.event; -// Imports import java.util.EventObject; import javax.swing.table.TableModel; diff --git a/libjava/javax/swing/event/TreeWillExpandListener.java b/libjava/javax/swing/event/TreeWillExpandListener.java index c70c6c6d4a5..e11416dbf1f 100644 --- a/libjava/javax/swing/event/TreeWillExpandListener.java +++ b/libjava/javax/swing/event/TreeWillExpandListener.java @@ -35,10 +35,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 javax.swing.event; -// Imports import java.util.EventListener; +import javax.swing.tree.ExpandVetoException; /** * TreeWillExpandListener interface diff --git a/libjava/javax/swing/event/UndoableEditEvent.java b/libjava/javax/swing/event/UndoableEditEvent.java index 43ed56a4953..7fb7a9e3abb 100644 --- a/libjava/javax/swing/event/UndoableEditEvent.java +++ b/libjava/javax/swing/event/UndoableEditEvent.java @@ -48,6 +48,8 @@ import javax.swing.undo.*; */ public class UndoableEditEvent extends EventObject { + private static final long serialVersionUID = 4418044561759134484L; + //------------------------------------------------------------- // Variables -------------------------------------------------- //------------------------------------------------------------- diff --git a/libjava/javax/swing/filechooser/FileFilter.java b/libjava/javax/swing/filechooser/FileFilter.java index 9f624b3c814..7e0be6d1b06 100644 --- a/libjava/javax/swing/filechooser/FileFilter.java +++ b/libjava/javax/swing/filechooser/FileFilter.java @@ -35,10 +35,10 @@ 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 javax.swing.filechooser; -// Imports -import java.io.*; +import java.io.File; /** * FileFilter diff --git a/libjava/javax/swing/filechooser/FileSystemView.java b/libjava/javax/swing/filechooser/FileSystemView.java index 20abe09259c..759149756fc 100644 --- a/libjava/javax/swing/filechooser/FileSystemView.java +++ b/libjava/javax/swing/filechooser/FileSystemView.java @@ -35,10 +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 javax.swing.filechooser; -// Imports -import java.io.*; +import java.io.File; +import java.io.IOException; +import javax.swing.Icon; /** * FileSystemView diff --git a/libjava/javax/swing/filechooser/FileView.java b/libjava/javax/swing/filechooser/FileView.java index 77d28eb6bba..7ff8ab0b9bb 100644 --- a/libjava/javax/swing/filechooser/FileView.java +++ b/libjava/javax/swing/filechooser/FileView.java @@ -35,11 +35,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 javax.swing.filechooser; -// Imports -import java.io.*; -import javax.swing.*; +import java.io.File; +import javax.swing.Icon; /** * FileView diff --git a/libjava/javax/swing/plaf/BorderUIResource.java b/libjava/javax/swing/plaf/BorderUIResource.java index 46c65faf381..3dc092db93d 100644 --- a/libjava/javax/swing/plaf/BorderUIResource.java +++ b/libjava/javax/swing/plaf/BorderUIResource.java @@ -67,7 +67,6 @@ public class BorderUIResource */ public BorderUIResource(Border delegate) { - super (); this.delegate = delegate; } @@ -128,7 +127,7 @@ public class BorderUIResource Color highlight, Color shadow) { - super (bevelType); + super (bevelType, highlight, shadow); } public BevelBorderUIResource(int bevelType, Color highlightOuter, @@ -136,7 +135,8 @@ public class BorderUIResource Color shadowOuter, Color shadowInner) { - super (bevelType); + super (bevelType, highlightOuter, highlightInner, shadowOuter, + shadowInner); } } @@ -191,7 +191,7 @@ public class BorderUIResource public EtchedBorderUIResource(int etchType, Color highlight, Color shadow) { - super (etchType); + super (etchType, highlight, shadow); } } @@ -210,7 +210,7 @@ public class BorderUIResource public LineBorderUIResource(Color color, int thickness) { - super (color); + super (color, thickness); } } @@ -224,12 +224,13 @@ public class BorderUIResource public MatteBorderUIResource(int top, int left, int bottom, int right, Color color) { - super (top, left, bottom, right, color); + super (new Insets (top, left, bottom, right), color); } public MatteBorderUIResource(int top, int left, int bottom, int right, Icon tileIcon) { - super (top, left, bottom, right, tileIcon); + super (new Insets (top, left, bottom, right), tileIcon); + } public MatteBorderUIResource(Icon tileIcon) { @@ -254,24 +255,24 @@ public class BorderUIResource } TitledBorderUIResource(Border border, String title) { - super (border); + super (border, title); } TitledBorderUIResource(Border border, String title, int titleJustification, int titlePosition) { - super (border); + super (border, title, titleJustification, titlePosition); } TitledBorderUIResource(Border border, String title, int titleJustification, int titlePosition, Font titleFont) { - super (border); + super (border, title, titleJustification, titlePosition, titleFont); } TitledBorderUIResource(Border border, String title, int titleJustification, int titlePosition, Font titleFont, Color titleColor) { - super (border); + super (border, title, titleJustification, titlePosition, titleFont, titleColor); } } } diff --git a/libjava/javax/swing/plaf/basic/BasicDefaults.java b/libjava/javax/swing/plaf/basic/BasicDefaults.java index 1be8d5bdf84..046a7316c93 100644 --- a/libjava/javax/swing/plaf/basic/BasicDefaults.java +++ b/libjava/javax/swing/plaf/basic/BasicDefaults.java @@ -38,9 +38,12 @@ exception statement from your version. */ package javax.swing.plaf.basic; -import javax.swing.*; -import java.awt.*; -import javax.swing.border.*; +import java.awt.Color; +import java.awt.Component; +import java.awt.Graphics; +import java.awt.Insets; +import javax.swing.UIDefaults; +import javax.swing.border.MatteBorder; class BasicBorder extends MatteBorder { diff --git a/libjava/javax/swing/table/AbstractTableModel.java b/libjava/javax/swing/table/AbstractTableModel.java index 08eeb829a74..2f7ce40ce87 100644 --- a/libjava/javax/swing/table/AbstractTableModel.java +++ b/libjava/javax/swing/table/AbstractTableModel.java @@ -35,12 +35,14 @@ 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 javax.swing.table; -// Imports -import java.io.*; -import java.util.*; -import javax.swing.event.*; +import java.io.Serializable; +import java.util.EventListener; +import javax.swing.event.EventListenerList; +import javax.swing.event.TableModelEvent; +import javax.swing.event.TableModelListener; /** * AbstractTableModel diff --git a/libjava/javax/swing/table/DefaultTableCellRenderer.java b/libjava/javax/swing/table/DefaultTableCellRenderer.java index a7bcc5c36b7..fdecedd8acf 100644 --- a/libjava/javax/swing/table/DefaultTableCellRenderer.java +++ b/libjava/javax/swing/table/DefaultTableCellRenderer.java @@ -37,10 +37,13 @@ exception statement from your version. */ package javax.swing.table; + import java.awt.Component; import java.io.Serializable; import javax.swing.JLabel; import javax.swing.JTable; +import javax.swing.border.Border; + /** * STUBBED */ diff --git a/libjava/javax/swing/table/DefaultTableColumnModel.java b/libjava/javax/swing/table/DefaultTableColumnModel.java index 9ab2fff8116..2946829f99c 100644 --- a/libjava/javax/swing/table/DefaultTableColumnModel.java +++ b/libjava/javax/swing/table/DefaultTableColumnModel.java @@ -35,14 +35,22 @@ 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 javax.swing.table; -// Imports -import java.beans.*; -import java.io.*; -import java.util.*; -import javax.swing.*; -import javax.swing.event.*; +import java.beans.PropertyChangeEvent; +import java.beans.PropertyChangeListener; +import java.io.Serializable; +import java.util.Enumeration; +import java.util.EventListener; +import java.util.Vector; +import javax.swing.ListSelectionModel; +import javax.swing.event.ChangeEvent; +import javax.swing.event.EventListenerList; +import javax.swing.event.ListSelectionEvent; +import javax.swing.event.ListSelectionListener; +import javax.swing.event.TableColumnModelEvent; +import javax.swing.event.TableColumnModelListener; /** * DefaultTableColumnModel diff --git a/libjava/javax/swing/table/DefaultTableModel.java b/libjava/javax/swing/table/DefaultTableModel.java index 1587310856e..473229bea1d 100644 --- a/libjava/javax/swing/table/DefaultTableModel.java +++ b/libjava/javax/swing/table/DefaultTableModel.java @@ -35,12 +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 javax.swing.table; -// Imports -import java.io.*; -import java.util.*; -import javax.swing.event.*; +import java.io.Serializable; +import java.util.Vector; +import javax.swing.event.TableModelEvent; /** * DefaultTableModel diff --git a/libjava/javax/swing/table/TableColumn.java b/libjava/javax/swing/table/TableColumn.java index f5ace625675..d228d8aae92 100644 --- a/libjava/javax/swing/table/TableColumn.java +++ b/libjava/javax/swing/table/TableColumn.java @@ -35,12 +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 javax.swing.table; -// Imports -import java.beans.*; -import java.io.*; -import javax.swing.event.*; +import java.beans.PropertyChangeListener; +import java.io.Serializable; +import javax.swing.event.SwingPropertyChangeSupport; /** * TableColumn diff --git a/libjava/javax/swing/text/JTextComponent.java b/libjava/javax/swing/text/JTextComponent.java index 9a6d350f048..a747e99ac89 100644 --- a/libjava/javax/swing/text/JTextComponent.java +++ b/libjava/javax/swing/text/JTextComponent.java @@ -43,13 +43,20 @@ import java.awt.Dimension; import java.awt.Image; import java.awt.Rectangle; import java.awt.Point; -import javax.accessibility.*; +import javax.accessibility.Accessible; +import javax.accessibility.AccessibleContext; +import javax.accessibility.AccessibleRole; +import javax.accessibility.AccessibleStateSet; +import javax.accessibility.AccessibleText; import javax.swing.Icon; import javax.swing.JComponent; import javax.swing.KeyStroke; import javax.swing.Scrollable; import javax.swing.UIManager; -import javax.swing.event.*; +import javax.swing.event.CaretEvent; +import javax.swing.event.CaretListener; +import javax.swing.event.DocumentEvent; +import javax.swing.event.DocumentListener; import javax.swing.plaf.TextUI; public abstract class JTextComponent extends JComponent diff --git a/libjava/javax/swing/tree/AbstractLayoutCache.java b/libjava/javax/swing/tree/AbstractLayoutCache.java index 5be988ca604..4362684fda3 100644 --- a/libjava/javax/swing/tree/AbstractLayoutCache.java +++ b/libjava/javax/swing/tree/AbstractLayoutCache.java @@ -35,18 +35,19 @@ 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 javax.swing.tree; -// Imports -import java.awt.*; -import java.util.*; -import javax.swing.event.*; +import java.awt.Rectangle; +import java.util.Enumeration; +import javax.swing.event.TreeModelEvent; /** * AbstractLayoutCache * @author Andrew Selkirk */ -public abstract class AbstractLayoutCache implements RowMapper { +public abstract class AbstractLayoutCache implements RowMapper +{ //------------------------------------------------------------- // Classes ---------------------------------------------------- diff --git a/libjava/javax/swing/tree/DefaultMutableTreeNode.java b/libjava/javax/swing/tree/DefaultMutableTreeNode.java index 0c2b5459f99..01be46aeced 100644 --- a/libjava/javax/swing/tree/DefaultMutableTreeNode.java +++ b/libjava/javax/swing/tree/DefaultMutableTreeNode.java @@ -35,11 +35,18 @@ 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 javax.swing.tree; -// Imports -import java.io.*; -import java.util.*; +import java.io.IOException; +import java.io.ObjectInputStream; +import java.io.ObjectOutputStream; +import java.io.Serializable; +import java.util.ArrayList; +import java.util.Enumeration; +import java.util.Random; +import java.util.Stack; +import java.util.Vector; /** * DefaultMutableTreeNode diff --git a/libjava/javax/swing/tree/DefaultTreeCellEditor.java b/libjava/javax/swing/tree/DefaultTreeCellEditor.java index 732077b3adb..6d922a42437 100644 --- a/libjava/javax/swing/tree/DefaultTreeCellEditor.java +++ b/libjava/javax/swing/tree/DefaultTreeCellEditor.java @@ -35,16 +35,29 @@ 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 javax.swing.tree; -// Imports -import java.awt.*; -import java.awt.event.*; -import java.io.*; -import java.util.*; -import javax.swing.*; -import javax.swing.border.*; -import javax.swing.event.*; +import java.awt.Color; +import java.awt.Component; +import java.awt.Container; +import java.awt.Dimension; +import java.awt.Font; +import java.awt.Graphics; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.io.IOException; +import java.io.ObjectInputStream; +import java.io.ObjectOutputStream; +import java.util.EventObject; +import javax.swing.Icon; +import javax.swing.JTextField; +import javax.swing.JTree; +import javax.swing.border.Border; +import javax.swing.event.CellEditorListener; +import javax.swing.event.EventListenerList; +import javax.swing.event.TreeSelectionEvent; +import javax.swing.event.TreeSelectionListener; /** * DefaultTreeCellEditor diff --git a/libjava/javax/swing/tree/DefaultTreeCellRenderer.java b/libjava/javax/swing/tree/DefaultTreeCellRenderer.java index 6de55deae32..f0eb454db5c 100644 --- a/libjava/javax/swing/tree/DefaultTreeCellRenderer.java +++ b/libjava/javax/swing/tree/DefaultTreeCellRenderer.java @@ -35,11 +35,18 @@ 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 javax.swing.tree; -// Imports -import java.awt.*; -import javax.swing.*; +import java.awt.Color; +import java.awt.Component; +import java.awt.Dimension; +import java.awt.Font; +import java.awt.Graphics; +import java.awt.Rectangle; +import javax.swing.Icon; +import javax.swing.JLabel; +import javax.swing.JTree; /** * DefaultTreeCellRenderer diff --git a/libjava/javax/swing/tree/DefaultTreeModel.java b/libjava/javax/swing/tree/DefaultTreeModel.java index d905be96cb8..4f546acca3e 100644 --- a/libjava/javax/swing/tree/DefaultTreeModel.java +++ b/libjava/javax/swing/tree/DefaultTreeModel.java @@ -35,12 +35,16 @@ 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 javax.swing.tree; -// Imports -import java.io.*; -import java.util.*; -import javax.swing.event.*; +import java.io.IOException; +import java.io.ObjectInputStream; +import java.io.ObjectOutputStream; +import java.io.Serializable; +import java.util.EventListener; +import javax.swing.event.EventListenerList; +import javax.swing.event.TreeModelListener; /** * DefaultTreeModel diff --git a/libjava/javax/swing/tree/DefaultTreeSelectionModel.java b/libjava/javax/swing/tree/DefaultTreeSelectionModel.java index 9b5358241bd..79f642afc28 100644 --- a/libjava/javax/swing/tree/DefaultTreeSelectionModel.java +++ b/libjava/javax/swing/tree/DefaultTreeSelectionModel.java @@ -35,14 +35,21 @@ 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 javax.swing.tree; -// Imports -import java.beans.*; -import java.io.*; -import java.util.*; -import javax.swing.*; -import javax.swing.event.*; +import java.beans.PropertyChangeListener; +import java.io.IOException; +import java.io.ObjectInputStream; +import java.io.ObjectOutputStream; +import java.io.Serializable; +import java.util.EventListener; +import java.util.Vector; +import javax.swing.DefaultListSelectionModel; +import javax.swing.event.SwingPropertyChangeSupport; +import javax.swing.event.EventListenerList; +import javax.swing.event.TreeSelectionEvent; +import javax.swing.event.TreeSelectionListener; /** * DefaultTreeSelectionModel diff --git a/libjava/javax/swing/tree/FixedHeightLayoutCache.java b/libjava/javax/swing/tree/FixedHeightLayoutCache.java index 279eec0278b..dae34229c3a 100644 --- a/libjava/javax/swing/tree/FixedHeightLayoutCache.java +++ b/libjava/javax/swing/tree/FixedHeightLayoutCache.java @@ -35,12 +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 javax.swing.tree; -// Imports -import java.awt.*; -import java.util.*; -import javax.swing.event.*; +import java.awt.Rectangle; +import java.util.Enumeration; +import javax.swing.event.TreeModelEvent; /** * FixedHeightLayoutCache diff --git a/libjava/javax/swing/tree/TreeCellEditor.java b/libjava/javax/swing/tree/TreeCellEditor.java index c55b97d339a..503cd2d4deb 100644 --- a/libjava/javax/swing/tree/TreeCellEditor.java +++ b/libjava/javax/swing/tree/TreeCellEditor.java @@ -35,9 +35,9 @@ 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 javax.swing.tree; -// Imports import java.awt.Component; import javax.swing.JTree; diff --git a/libjava/javax/swing/tree/TreeModel.java b/libjava/javax/swing/tree/TreeModel.java index 6763544fb9e..5c3a12516d6 100644 --- a/libjava/javax/swing/tree/TreeModel.java +++ b/libjava/javax/swing/tree/TreeModel.java @@ -35,10 +35,10 @@ 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 javax.swing.tree; -// Imports -import javax.swing.event.*; +import javax.swing.event.TreeModelListener; /** * TreeModel interface diff --git a/libjava/javax/swing/tree/TreeNode.java b/libjava/javax/swing/tree/TreeNode.java index 46464d2d73e..4fd7ec630c6 100644 --- a/libjava/javax/swing/tree/TreeNode.java +++ b/libjava/javax/swing/tree/TreeNode.java @@ -35,10 +35,10 @@ 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 javax.swing.tree; -// Imports -import java.util.*; +import java.util.Enumeration; /** * TreeNode interface diff --git a/libjava/javax/swing/tree/TreePath.java b/libjava/javax/swing/tree/TreePath.java index 77627db77b1..ba0a00ba95e 100644 --- a/libjava/javax/swing/tree/TreePath.java +++ b/libjava/javax/swing/tree/TreePath.java @@ -35,10 +35,13 @@ 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 javax.swing.tree; -// Imports -import java.io.*; +import java.io.IOException; +import java.io.ObjectInputStream; +import java.io.ObjectOutputStream; +import java.io.Serializable; /** * TreePath diff --git a/libjava/javax/swing/tree/TreeSelectionModel.java b/libjava/javax/swing/tree/TreeSelectionModel.java index ef8e0b44772..3f28450d86f 100644 --- a/libjava/javax/swing/tree/TreeSelectionModel.java +++ b/libjava/javax/swing/tree/TreeSelectionModel.java @@ -35,9 +35,9 @@ 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 javax.swing.tree; -// Imports import java.beans.PropertyChangeListener; import javax.swing.event.TreeSelectionListener; diff --git a/libjava/javax/swing/tree/VariableHeightLayoutCache.java b/libjava/javax/swing/tree/VariableHeightLayoutCache.java index 8e9015399a6..445faa9c230 100644 --- a/libjava/javax/swing/tree/VariableHeightLayoutCache.java +++ b/libjava/javax/swing/tree/VariableHeightLayoutCache.java @@ -35,12 +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 javax.swing.tree; -// Imports -import java.awt.*; -import java.util.*; -import javax.swing.event.*; +import java.awt.Rectangle; +import java.util.Enumeration; +import javax.swing.event.TreeModelEvent; /** * VariableHeightLayoutCache diff --git a/libjava/javax/swing/undo/AbstractUndoableEdit.java b/libjava/javax/swing/undo/AbstractUndoableEdit.java index 68c28130e0f..d845e4341bb 100644 --- a/libjava/javax/swing/undo/AbstractUndoableEdit.java +++ b/libjava/javax/swing/undo/AbstractUndoableEdit.java @@ -35,9 +35,9 @@ 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 javax.swing.undo; -// Imports import java.io.Serializable; /** diff --git a/libjava/javax/swing/undo/CompoundEdit.java b/libjava/javax/swing/undo/CompoundEdit.java index 37a7c4ca4eb..be612dad77b 100644 --- a/libjava/javax/swing/undo/CompoundEdit.java +++ b/libjava/javax/swing/undo/CompoundEdit.java @@ -35,9 +35,9 @@ 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 javax.swing.undo; -// Imports import java.util.Vector; /** diff --git a/libjava/javax/swing/undo/StateEdit.java b/libjava/javax/swing/undo/StateEdit.java index f617bc3a455..6a32fbdb48d 100644 --- a/libjava/javax/swing/undo/StateEdit.java +++ b/libjava/javax/swing/undo/StateEdit.java @@ -35,10 +35,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 javax.swing.undo; -// Imports -import java.util.*; +import java.util.Hashtable; +import java.util.Iterator; /** * StateEdit diff --git a/libjava/javax/swing/undo/UndoManager.java b/libjava/javax/swing/undo/UndoManager.java index f13cd3b3faa..56e1c1b7247 100644 --- a/libjava/javax/swing/undo/UndoManager.java +++ b/libjava/javax/swing/undo/UndoManager.java @@ -35,10 +35,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 javax.swing.undo; -// Imports -import javax.swing.event.*; +import javax.swing.event.UndoableEditEvent; +import javax.swing.event.UndoableEditListener; /** * UndoManager diff --git a/libjava/javax/swing/undo/UndoableEditSupport.java b/libjava/javax/swing/undo/UndoableEditSupport.java index f09f3ffad4b..4e12c7c6b16 100644 --- a/libjava/javax/swing/undo/UndoableEditSupport.java +++ b/libjava/javax/swing/undo/UndoableEditSupport.java @@ -35,11 +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 javax.swing.undo; -// Imports -import java.util.*; -import javax.swing.event.*; +import java.util.Vector; +import javax.swing.event.UndoableEditEvent; +import javax.swing.event.UndoableEditListener; /** * UndoableEditSupport