diff options
Diffstat (limited to 'libjava/javax/swing/table')
| -rw-r--r-- | libjava/javax/swing/table/AbstractTableModel.java | 4 | ||||
| -rw-r--r-- | libjava/javax/swing/table/DefaultTableCellRenderer.java | 4 | ||||
| -rw-r--r-- | libjava/javax/swing/table/DefaultTableColumnModel.java | 36 | ||||
| -rw-r--r-- | libjava/javax/swing/table/DefaultTableModel.java | 3 | ||||
| -rw-r--r-- | libjava/javax/swing/table/JTableHeader.java | 78 | ||||
| -rw-r--r-- | libjava/javax/swing/table/TableCellEditor.java | 7 | ||||
| -rw-r--r-- | libjava/javax/swing/table/TableCellRenderer.java | 5 | ||||
| -rw-r--r-- | libjava/javax/swing/table/TableColumn.java | 184 | ||||
| -rw-r--r-- | libjava/javax/swing/table/TableColumnModel.java | 5 |
9 files changed, 203 insertions, 123 deletions
diff --git a/libjava/javax/swing/table/AbstractTableModel.java b/libjava/javax/swing/table/AbstractTableModel.java index dd8eb69382c..076487f5322 100644 --- a/libjava/javax/swing/table/AbstractTableModel.java +++ b/libjava/javax/swing/table/AbstractTableModel.java @@ -1,5 +1,5 @@ /* AbstractTableModel.java -- - Copyright (C) 2002 Free Software Foundation, Inc. + Copyright (C) 2002, 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -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.table; import java.io.Serializable; import java.util.EventListener; + import javax.swing.event.EventListenerList; import javax.swing.event.TableModelEvent; import javax.swing.event.TableModelListener; diff --git a/libjava/javax/swing/table/DefaultTableCellRenderer.java b/libjava/javax/swing/table/DefaultTableCellRenderer.java index ef829886147..ac5edb99586 100644 --- a/libjava/javax/swing/table/DefaultTableCellRenderer.java +++ b/libjava/javax/swing/table/DefaultTableCellRenderer.java @@ -1,4 +1,4 @@ -/* DefaultTableCellRenderer.java +/* DefaultTableCellRenderer.java -- Copyright (C) 2002, 2004 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.table; import java.awt.Color; import java.awt.Component; import java.awt.Rectangle; import java.io.Serializable; + import javax.swing.JLabel; import javax.swing.JTable; import javax.swing.border.Border; diff --git a/libjava/javax/swing/table/DefaultTableColumnModel.java b/libjava/javax/swing/table/DefaultTableColumnModel.java index d7a3c351938..b66b6951a99 100644 --- a/libjava/javax/swing/table/DefaultTableColumnModel.java +++ b/libjava/javax/swing/table/DefaultTableColumnModel.java @@ -35,6 +35,7 @@ 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; import java.beans.PropertyChangeEvent; @@ -43,8 +44,9 @@ import java.io.Serializable; import java.util.Enumeration; import java.util.EventListener; import java.util.Vector; -import javax.swing.ListSelectionModel; + import javax.swing.DefaultListSelectionModel; +import javax.swing.ListSelectionModel; import javax.swing.event.ChangeEvent; import javax.swing.event.EventListenerList; import javax.swing.event.ListSelectionEvent; @@ -52,7 +54,6 @@ import javax.swing.event.ListSelectionListener; import javax.swing.event.TableColumnModelEvent; import javax.swing.event.TableColumnModelListener; - /** * DefaultTableColumnModel * @author Andrew Selkirk @@ -288,26 +289,35 @@ public class DefaultTableColumnModel /** * addColumnModelListener - * @param value0 TODO + * @param listener the listener to add */ public void addColumnModelListener(TableColumnModelListener listener) { listenerList.add(TableColumnModelListener.class, listener); } - /** - * removeColumnModelListener - * @param value0 TODO - */ - public void removeColumnModelListener(TableColumnModelListener value0) + /** + * removeColumnModelListener + * @param listener the listener to remove + */ + public void removeColumnModelListener(TableColumnModelListener listener) { - // TODO + listenerList.remove(TableColumnModelListener.class, listener); } - /** - * fireColumnAdded - * @param value0 TODO - */ + /** + * @since 1.4 + */ + public TableColumnModelListener[] getColumnModelListeners() + { + return (TableColumnModelListener[]) + listenerList.getListeners(TableColumnModelListener.class); + } + + /** + * fireColumnAdded + * @param value0 TODO + */ protected void fireColumnAdded(TableColumnModelEvent value0) { // TODO diff --git a/libjava/javax/swing/table/DefaultTableModel.java b/libjava/javax/swing/table/DefaultTableModel.java index 8e111303c34..dd8e3b84612 100644 --- a/libjava/javax/swing/table/DefaultTableModel.java +++ b/libjava/javax/swing/table/DefaultTableModel.java @@ -1,5 +1,5 @@ /* DefaultTableModel.java -- - Copyright (C) 2002 Free Software Foundation, Inc. + Copyright (C) 2002, 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -40,6 +40,7 @@ package javax.swing.table; import java.io.Serializable; import java.util.Vector; + import javax.swing.event.TableModelEvent; /** diff --git a/libjava/javax/swing/table/JTableHeader.java b/libjava/javax/swing/table/JTableHeader.java index 9e55647f42f..95ff92006cf 100644 --- a/libjava/javax/swing/table/JTableHeader.java +++ b/libjava/javax/swing/table/JTableHeader.java @@ -1,4 +1,4 @@ -/* JTableHeader.java +/* JTableHeader.java -- Copyright (C) 2003, 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -38,8 +38,6 @@ exception statement from your version. */ package javax.swing.table; -import java.awt.event.FocusEvent; -import java.awt.event.FocusListener; import java.awt.Color; import java.awt.Cursor; import java.awt.Dimension; @@ -47,7 +45,7 @@ import java.awt.Font; import java.awt.FontMetrics; import java.awt.Point; import java.awt.Rectangle; -import java.beans.PropertyChangeEvent; +import java.awt.event.FocusListener; import java.beans.PropertyChangeListener; import java.util.Locale; @@ -55,9 +53,9 @@ import javax.accessibility.Accessible; import javax.accessibility.AccessibleAction; import javax.accessibility.AccessibleComponent; import javax.accessibility.AccessibleContext; +import javax.accessibility.AccessibleRole; import javax.accessibility.AccessibleSelection; import javax.accessibility.AccessibleStateSet; -import javax.accessibility.AccessibleRole; import javax.accessibility.AccessibleText; import javax.accessibility.AccessibleValue; import javax.swing.JComponent; @@ -76,178 +74,222 @@ public class JTableHeader extends JComponent { throw new Error("not implemented"); } + public void addPropertyChangeListener(PropertyChangeListener l) { throw new Error("not implemented"); } + public boolean contains(Point p) { throw new Error("not implemented"); } + public AccessibleAction getAccessibleAction() { throw new Error("not implemented"); } + public Accessible getAccessibleAt(Point p) { throw new Error("not implemented"); } + public Accessible getAccessibleChild(int i) { throw new Error("not implemented"); } + public int getAccessibleChildrenCount() { throw new Error("not implemented"); } + public AccessibleComponent getAccessibleComponent() { throw new Error("not implemented"); } + public AccessibleContext getAccessibleContext() { throw new Error("not implemented"); } + public String getAccessibleDescription() { throw new Error("not implemented"); } + public int getAccessibleIndexInParent() { throw new Error("not implemented"); } + public String getAccessibleName() { throw new Error("not implemented"); } + public AccessibleRole getAccessibleRole() { throw new Error("not implemented"); } + public AccessibleSelection getAccessibleSelection() { throw new Error("not implemented"); } + public AccessibleStateSet getAccessibleStateSet() { throw new Error("not implemented"); } + public AccessibleText getAccessibleText() { throw new Error("not implemented"); } + public AccessibleValue getAccessibleValue() { throw new Error("not implemented"); } + public Color getBackground() { throw new Error("not implemented"); } + public Rectangle getBounds() { throw new Error("not implemented"); } + public Cursor getCursor() { throw new Error("not implemented"); } + public Font getFont() { throw new Error("not implemented"); } + public FontMetrics getFontMetrics(Font f) { throw new Error("not implemented"); } + public Color getForeground() { throw new Error("not implemented"); } + public Locale getLocale() { throw new Error("not implemented"); } + public Point getLocation() { throw new Error("not implemented"); } + public Point getLocationOnScreen() { throw new Error("not implemented"); } + public Dimension getSize() { throw new Error("not implemented"); } + public boolean isEnabled() { throw new Error("not implemented"); } + public boolean isFocusTraversable() { throw new Error("not implemented"); } + public boolean isShowing() { throw new Error("not implemented"); } + public boolean isVisible() { throw new Error("not implemented"); } + public void removeFocusListener(FocusListener l) { throw new Error("not implemented"); } + public void removePropertyChangeListener(PropertyChangeListener l) { throw new Error("not implemented"); } + public void requestFocus() { throw new Error("not implemented"); } + public void setAccessibleDescription(String s) { throw new Error("not implemented"); } + public void setAccessibleName(String s) { throw new Error("not implemented"); } + public void setBackground(Color c) { throw new Error("not implemented"); } + public void setBounds(Rectangle r) { throw new Error("not implemented"); } + public void setCursor(Cursor c) { throw new Error("not implemented"); } + public void setEnabled(boolean b) { throw new Error("not implemented"); } + public void setFont(Font f) { throw new Error("not implemented"); } + public void setForeground(Color c) { throw new Error("not implemented"); } + public void setLocation(Point p) { throw new Error("not implemented"); } + public void setSize(Dimension d) { throw new Error("not implemented"); } + public void setVisible(boolean b) { throw new Error("not implemented"); @@ -265,17 +307,17 @@ public class JTableHeader extends JComponent /** * The columnModel property. */ - TableColumnModel columnModel; + protected TableColumnModel columnModel; /** * The draggedColumn property. */ - TableColumn draggedColumn; + protected TableColumn draggedColumn; /** * The draggedDistance property. */ - int draggedDistance; + protected int draggedDistance; /** * The opaque property. @@ -285,27 +327,27 @@ public class JTableHeader extends JComponent /** * The reorderingAllowed property. */ - boolean reorderingAllowed; + protected boolean reorderingAllowed; /** * The resizingAllowed property. */ - boolean resizingAllowed; + protected boolean resizingAllowed = true; /** * The resizingColumn property. */ - TableColumn resizingColumn; + protected TableColumn resizingColumn; /** * The table property. */ - JTable table; + protected JTable table; /** * The updateTableInRealTime property. */ - boolean updateTableInRealTime; + protected boolean updateTableInRealTime; TableCellRenderer cellRenderer; @@ -317,7 +359,7 @@ public class JTableHeader extends JComponent public JTableHeader(TableColumnModel cm) { accessibleContext = new AccessibleJTableHeader(); - columnModel = cm == null ? createDefaultTableColumnModel() : cm; + columnModel = cm == null ? createDefaultColumnModel() : cm; draggedColumn = null; draggedDistance = 0; opaque = true; @@ -330,12 +372,11 @@ public class JTableHeader extends JComponent updateUI(); } - protected TableColumnModel createDefaultTableColumnModel() + protected TableColumnModel createDefaultColumnModel() { return new DefaultTableColumnModel(); } - /** * Get the value of the {@link #accessibleContext} property. * @@ -536,6 +577,11 @@ public class JTableHeader extends JComponent return cellRenderer; } + public void setDefaultRenderer(TableCellRenderer cellRenderer) + { + this.cellRenderer = cellRenderer; + } + public Rectangle getHeaderRect(int column) { Rectangle r = getTable().getCellRect(-1, column, true); diff --git a/libjava/javax/swing/table/TableCellEditor.java b/libjava/javax/swing/table/TableCellEditor.java index bb7904e3d40..d83812c1ac1 100644 --- a/libjava/javax/swing/table/TableCellEditor.java +++ b/libjava/javax/swing/table/TableCellEditor.java @@ -1,5 +1,5 @@ /* TableCellEditor.java -- - Copyright (C) 2002 Free Software Foundation, Inc. + Copyright (C) 2002, 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -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.table; -// Imports import java.awt.Component; -import javax.swing.JTable; + import javax.swing.CellEditor; +import javax.swing.JTable; /** * TableCellEditor public interface diff --git a/libjava/javax/swing/table/TableCellRenderer.java b/libjava/javax/swing/table/TableCellRenderer.java index 6ad91c7e9b8..580226b3f02 100644 --- a/libjava/javax/swing/table/TableCellRenderer.java +++ b/libjava/javax/swing/table/TableCellRenderer.java @@ -1,5 +1,5 @@ /* TableCellRenderer.java -- - Copyright (C) 2002 Free Software Foundation, Inc. + Copyright (C) 2002, 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -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.table; -// Imports import java.awt.Component; + import javax.swing.JTable; /** diff --git a/libjava/javax/swing/table/TableColumn.java b/libjava/javax/swing/table/TableColumn.java index 02ef7f8009e..0aaad8b3f95 100644 --- a/libjava/javax/swing/table/TableColumn.java +++ b/libjava/javax/swing/table/TableColumn.java @@ -1,5 +1,5 @@ /* TableColumn.java -- - Copyright (C) 2002 Free Software Foundation, Inc. + Copyright (C) 2002, 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -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.table; import java.beans.PropertyChangeListener; import java.io.Serializable; -import javax.swing.event.SwingPropertyChangeSupport; +import javax.swing.event.SwingPropertyChangeSupport; /** * TableColumn @@ -52,89 +53,91 @@ public class TableColumn { static final long serialVersionUID = -6113660025878112608L; - /** - * COLUMN_WIDTH_PROPERTY - */ - public static final String COLUMN_WIDTH_PROPERTY = "columWidth"; + /** + * COLUMN_WIDTH_PROPERTY + */ + public static final String COLUMN_WIDTH_PROPERTY = "columWidth"; - /** - * HEADER_VALUE_PROPERTY - */ - public static final String HEADER_VALUE_PROPERTY = "headerValue"; + /** + * HEADER_VALUE_PROPERTY + */ + public static final String HEADER_VALUE_PROPERTY = "headerValue"; - /** - * HEADER_RENDERER_PROPERTY - */ - public static final String HEADER_RENDERER_PROPERTY = "headerRenderer"; + /** + * HEADER_RENDERER_PROPERTY + */ + public static final String HEADER_RENDERER_PROPERTY = "headerRenderer"; - /** - * CELL_RENDERER_PROPERTY - */ - public static final String CELL_RENDERER_PROPERTY = "cellRenderer"; + /** + * CELL_RENDERER_PROPERTY + */ + public static final String CELL_RENDERER_PROPERTY = "cellRenderer"; - /** - * modelIndex - */ - protected int modelIndex; + /** + * modelIndex + */ + protected int modelIndex; - /** - * identifier - */ - protected Object identifier; + /** + * identifier + */ + protected Object identifier; - /** - * width - */ - protected int width; + /** + * width + */ + protected int width; - /** - * minWidth - */ - protected int minWidth = 15; + /** + * minWidth + */ + protected int minWidth = 15; - /** - * preferredWidth - */ - private int preferredWidth; + /** + * preferredWidth + */ + private int preferredWidth; - /** - * maxWidth - */ - protected int maxWidth = Integer.MAX_VALUE; + /** + * maxWidth + */ + protected int maxWidth = Integer.MAX_VALUE; - /** - * headerRenderer - */ - protected TableCellRenderer headerRenderer; + /** + * headerRenderer + */ + protected TableCellRenderer headerRenderer; - /** - * headerValue - */ - protected Object headerValue; + /** + * headerValue + */ + protected Object headerValue; - /** - * cellRenderer - */ - protected TableCellRenderer cellRenderer; + /** + * cellRenderer + */ + protected TableCellRenderer cellRenderer; - /** - * cellEditor - */ - protected TableCellEditor cellEditor; + /** + * cellEditor + */ + protected TableCellEditor cellEditor; - /** - * isResizable - */ - protected boolean isResizable = true; + /** + * isResizable + */ + protected boolean isResizable = true; - /** - * resizedPostingDisableCount - */ - protected transient int resizedPostingDisableCount; + /** + * resizedPostingDisableCount + * + * @deprecated 1.3 + */ + protected transient int resizedPostingDisableCount; - /** - * changeSupport - */ + /** + * changeSupport + */ private SwingPropertyChangeSupport changeSupport = new SwingPropertyChangeSupport(this); @@ -215,14 +218,15 @@ public class TableColumn */ private void firePropertyChange(String property, boolean oldValue, boolean newValue) - { - firePropertyChange(property, new Boolean(oldValue), new Boolean(newValue)); - } + { + firePropertyChange(property, Boolean.valueOf(oldValue), + Boolean.valueOf(newValue)); + } - /** - * setModelIndex - * @param modelIndex TODO - */ + /** + * setModelIndex + * @param modelIndex TODO + */ public void setModelIndex(int modelIndex) { this.modelIndex = modelIndex; @@ -470,17 +474,21 @@ public class TableColumn // TODO } - /** - * disableResizedPosting - */ + /** + * disableResizedPosting + * + * @deprecated 1.3 + */ public void disableResizedPosting() { // Does nothing } - /** - * enableResizedPosting - */ + /** + * enableResizedPosting + * + * @deprecated 1.3 + */ public void enableResizedPosting() { // Does nothing @@ -504,8 +512,16 @@ public class TableColumn changeSupport.removePropertyChangeListener(listener); } - /** - * createDefaultHeaderRenderer + /** + * @since 1.4 + */ + public PropertyChangeListener[] getPropertyChangeListeners() + { + return changeSupport.getPropertyChangeListeners(); + } + + /** + * createDefaultHeaderRenderer * @return TableCellRenderer */ protected TableCellRenderer createDefaultHeaderRenderer() diff --git a/libjava/javax/swing/table/TableColumnModel.java b/libjava/javax/swing/table/TableColumnModel.java index ef0897d165b..b825ca0606c 100644 --- a/libjava/javax/swing/table/TableColumnModel.java +++ b/libjava/javax/swing/table/TableColumnModel.java @@ -1,5 +1,5 @@ /* TableColumnModel.java -- - Copyright (C) 2002 Free Software Foundation, Inc. + Copyright (C) 2002, 2004 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -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.table; import java.util.Enumeration; + import javax.swing.ListSelectionModel; import javax.swing.event.TableColumnModelListener; - /** * TableColumnModel public interface * @author Andrew Selkirk |
