diff --git a/jdk/src/share/classes/javax/swing/table/DefaultTableColumnModel.java b/jdk/src/share/classes/javax/swing/table/DefaultTableColumnModel.java index 96193cb35fd..7e02789f837 100644 --- a/jdk/src/share/classes/javax/swing/table/DefaultTableColumnModel.java +++ b/jdk/src/share/classes/javax/swing/table/DefaultTableColumnModel.java @@ -716,6 +716,8 @@ public class DefaultTableColumnModel implements TableColumnModel, /** * Creates a new default list selection model. + * + * @return a newly created default list selection model. */ protected ListSelectionModel createSelectionModel() { return new DefaultListSelectionModel(); diff --git a/jdk/src/share/classes/javax/swing/table/DefaultTableModel.java b/jdk/src/share/classes/javax/swing/table/DefaultTableModel.java index 74b88c1160d..251738ae40d 100644 --- a/jdk/src/share/classes/javax/swing/table/DefaultTableModel.java +++ b/jdk/src/share/classes/javax/swing/table/DefaultTableModel.java @@ -335,6 +335,8 @@ public class DefaultTableModel extends AbstractTableModel implements Serializabl * * @see #setColumnCount * @since 1.3 + * + * @param rowCount number of rows in the model */ public void setRowCount(int rowCount) { setNumRows(rowCount); @@ -577,6 +579,9 @@ public class DefaultTableModel extends AbstractTableModel implements Serializabl * element going to row 0, etc. This method will send a * tableChanged notification message to all the listeners. * + * @param columnName identifier of the newly created column + * @param columnData new data to be added to the column + * * @see #addColumn(Object, Vector) */ public void addColumn(Object columnName, Object[] columnData) { diff --git a/jdk/src/share/classes/javax/swing/table/JTableHeader.java b/jdk/src/share/classes/javax/swing/table/JTableHeader.java index 3995cccc288..5e923b1356d 100644 --- a/jdk/src/share/classes/javax/swing/table/JTableHeader.java +++ b/jdk/src/share/classes/javax/swing/table/JTableHeader.java @@ -336,6 +336,10 @@ public class JTableHeader extends JComponent implements TableColumnModelListener * Returns the index of the column that point lies in, or -1 if it * lies out of bounds. * + * @param point if this point lies within a column, the index of + * that column will be returned; otherwise it is out of bounds + * and -1 is returned + * * @return the index of the column that point lies in, or -1 if it * lies out of bounds */ @@ -352,6 +356,8 @@ public class JTableHeader extends JComponent implements TableColumnModelListener * When the column parameter is out of bounds this method uses the * same conventions as the JTable method getCellRect. * + * @param column index of the column + * * @return the rectangle containing the header tile at column * @see JTable#getCellRect */ @@ -883,6 +889,10 @@ public class JTableHeader extends JComponent implements TableColumnModelListener /** * Constructs an AccessiblJTableHeaaderEntry * @since 1.4 + * + * @param c the column index + * @param p the parent JTableHeader + * @param t the table JTable */ public AccessibleJTableHeaderEntry(int c, JTableHeader p, JTable t) { parent = p; diff --git a/jdk/src/share/classes/javax/swing/table/TableCellRenderer.java b/jdk/src/share/classes/javax/swing/table/TableCellRenderer.java index 892220bc47c..585d9221482 100644 --- a/jdk/src/share/classes/javax/swing/table/TableCellRenderer.java +++ b/jdk/src/share/classes/javax/swing/table/TableCellRenderer.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -86,6 +86,9 @@ public interface TableCellRenderer { * drawing the header, the value of * row is -1 * @param column the column index of the cell being drawn + * + * @return the component used for drawing the cell. + * * @see javax.swing.JComponent#isPaintingForPrint() */ Component getTableCellRendererComponent(JTable table, Object value, diff --git a/jdk/src/share/classes/javax/swing/table/TableColumn.java b/jdk/src/share/classes/javax/swing/table/TableColumn.java index 713bf5483dc..1f116c47832 100644 --- a/jdk/src/share/classes/javax/swing/table/TableColumn.java +++ b/jdk/src/share/classes/javax/swing/table/TableColumn.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -201,6 +201,11 @@ public class TableColumn extends Object implements Serializable { * Cover method, using a default width of 75, a null * renderer and a null editor. * @see #TableColumn(int, int, TableCellRenderer, TableCellEditor) + * + * @param modelIndex the index of the column in the model + * that supplies the data for this column in the table; + * the model index remains the same even when columns + * are reordered in the view */ public TableColumn(int modelIndex) { this(modelIndex, 75, null, null); @@ -210,6 +215,12 @@ public class TableColumn extends Object implements Serializable { * Cover method, using a null renderer and a * null editor. * @see #TableColumn(int, int, TableCellRenderer, TableCellEditor) + * + * @param modelIndex the index of the column in the model + * that supplies the data for this column in the table; + * the model index remains the same even when columns + * are reordered in the view + * @param width this column's preferred width and initial width */ public TableColumn(int modelIndex, int width) { this(modelIndex, width, null, null); diff --git a/jdk/src/share/classes/javax/swing/table/TableColumnModel.java b/jdk/src/share/classes/javax/swing/table/TableColumnModel.java index b6c308c0ea7..eaaa8447ef7 100644 --- a/jdk/src/share/classes/javax/swing/table/TableColumnModel.java +++ b/jdk/src/share/classes/javax/swing/table/TableColumnModel.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -162,6 +162,9 @@ public interface TableColumnModel * model. If the column index for a given X coordinate in 2D space is * required, JTable.columnAtPoint can be used instead. * + * @param xPosition width from the start of the first column in + * the model. + * * @return the index of the column; or -1 if no column is found * @see javax.swing.JTable#columnAtPoint */