AbstractAction.java, [...]: New versions from classpath.
2003-06-11 Michael Koch <konqueror@gmx.de> * 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
This commit is contained in:
parent
658cf52f51
commit
d6c2458f4e
109 changed files with 1492 additions and 806 deletions
|
@ -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)
|
||||
|
||||
/**
|
||||
* 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.
|
||||
*/
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Determines the insets of this border. The implementation provided
|
||||
* by AbstractButton returns Insets for a zero-width border, whose
|
||||
* <code>left</code>, <code>right</code>, <code>top</code> and
|
||||
* <code>bottom</code> 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);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Determines the insets of this border. The implementation provided
|
||||
* by AbstractButton sets the <code>left</code>, <code>right</code>,
|
||||
* <code>top</code> and <code>bottom</code> fields of the passed
|
||||
* <code>insets</code> 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 <code>insets</code> object.
|
||||
*/
|
||||
public Insets getBorderInsets (Component c, Insets insets)
|
||||
{
|
||||
insets.left = insets.right = insets.top = insets.bottom = 0;
|
||||
return insets;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Determines whether or not this border is opaque. An opaque border
|
||||
* fills every pixel in its area when painting. Partially
|
||||
* translucent borders must return <code>false</code>, or ugly
|
||||
* artifacts can appear on screen. The default implementation
|
||||
* provided by AbstractBorder always returns <code>false</code>.
|
||||
*
|
||||
* @return <code>false</code>.
|
||||
*/
|
||||
public boolean isBorderOpaque ()
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 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)
|
||||
{
|
||||
System.out.println("HMMMMM, abstract-border.paintBorder");
|
||||
borderInsets = b.getBorderInsets (c);
|
||||
x += borderInsets.left;
|
||||
y += borderInsets.top;
|
||||
width -= borderInsets.left + borderInsets.right;
|
||||
height -= borderInsets.top + borderInsets.bottom;
|
||||
}
|
||||
|
||||
|
||||
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;
|
||||
}
|
||||
|
||||
public Insets getBorderInsets(Component c)
|
||||
{
|
||||
return getBorderInsets(c, new Insets(0,0,0,0));
|
||||
}
|
||||
|
||||
|
||||
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);
|
||||
}
|
||||
|
||||
|
||||
public static Rectangle getInteriorRectangle(Component c,
|
||||
Border b,
|
||||
int x,
|
||||
int y,
|
||||
int width,
|
||||
int height)
|
||||
{
|
||||
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);
|
||||
}
|
||||
}
|
||||
return new Rectangle (x, y, width, height);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue