--- a/jdk/src/share/classes/javax/swing/JTable.java Tue May 25 20:39:52 2010 +0400
+++ b/jdk/src/share/classes/javax/swing/JTable.java Tue May 25 20:54:59 2010 +0400
@@ -2583,10 +2583,8 @@
* @see #convertColumnIndexToView
*/
public int convertColumnIndexToModel(int viewColumnIndex) {
- if (viewColumnIndex < 0) {
- return viewColumnIndex;
- }
- return getColumnModel().getColumn(viewColumnIndex).getModelIndex();
+ return SwingUtilities2.convertColumnIndexToModel(
+ getColumnModel(), viewColumnIndex);
}
/**
@@ -2603,16 +2601,8 @@
* @see #convertColumnIndexToModel
*/
public int convertColumnIndexToView(int modelColumnIndex) {
- if (modelColumnIndex < 0) {
- return modelColumnIndex;
- }
- TableColumnModel cm = getColumnModel();
- for (int column = 0; column < getColumnCount(); column++) {
- if (cm.getColumn(column).getModelIndex() == modelColumnIndex) {
- return column;
- }
- }
- return -1;
+ return SwingUtilities2.convertColumnIndexToView(
+ getColumnModel(), modelColumnIndex);
}
/**