Modernization from Dave Hoover.
git-svn-id: https://samskivert.googlecode.com/svn/trunk@2669 6335cc39-0255-0410-8fd6-9bcaacd3b74c
This commit is contained in:
@@ -237,7 +237,7 @@ public class TableSorter extends AbstractTableModel {
|
|||||||
}
|
}
|
||||||
if (Comparable.class.isAssignableFrom(columnType)) {
|
if (Comparable.class.isAssignableFrom(columnType)) {
|
||||||
@SuppressWarnings("unchecked")
|
@SuppressWarnings("unchecked")
|
||||||
Comparator<Object> c = (Comparator<Object>)Comparators.COMPARABLE;
|
Comparator<Object> c = Comparators.COMPARABLE;
|
||||||
return c;
|
return c;
|
||||||
}
|
}
|
||||||
return Comparators.LEXICAL_CASE_INSENSITIVE;
|
return Comparators.LEXICAL_CASE_INSENSITIVE;
|
||||||
@@ -320,8 +320,7 @@ public class TableSorter extends AbstractTableModel {
|
|||||||
int row1 = modelIndex;
|
int row1 = modelIndex;
|
||||||
int row2 = orow.modelIndex;
|
int row2 = orow.modelIndex;
|
||||||
|
|
||||||
for (Iterator<Directive> it = sortingColumns.iterator(); it.hasNext();) {
|
for (Directive directive : sortingColumns) {
|
||||||
Directive directive = it.next();
|
|
||||||
int column = directive.column;
|
int column = directive.column;
|
||||||
Object o1 = tableModel.getValueAt(row1, column);
|
Object o1 = tableModel.getValueAt(row1, column);
|
||||||
Object o2 = tableModel.getValueAt(row2, column);
|
Object o2 = tableModel.getValueAt(row2, column);
|
||||||
|
|||||||
Reference in New Issue
Block a user