--- a/jdk/src/share/classes/javax/swing/text/TableView.java Thu Jul 24 14:51:13 2008 +0400
+++ b/jdk/src/share/classes/javax/swing/text/TableView.java Thu Jul 24 16:43:36 2008 +0400
@@ -76,7 +76,7 @@
*/
public TableView(Element elem) {
super(elem, View.Y_AXIS);
- rows = new Vector();
+ rows = new Vector<TableRow>();
gridValid = false;
}
@@ -139,7 +139,7 @@
TableRow getRow(int row) {
if (row < rows.size()) {
- return (TableRow) rows.elementAt(row);
+ return rows.elementAt(row);
}
return null;
}
@@ -227,7 +227,7 @@
for (int i = 0; i < n; i++) {
View v = getView(i);
if (v instanceof TableRow) {
- rows.addElement(v);
+ rows.addElement((TableRow) v);
TableRow rv = (TableRow) v;
rv.clearFilledColumns();
rv.setRow(i);
@@ -368,8 +368,7 @@
long min = 0;
long pref = 0;
long max = 0;
- for (int i = 0; i < columnRequirements.length; i++) {
- SizeRequirements req = columnRequirements[i];
+ for (SizeRequirements req : columnRequirements) {
min += req.minimum;
pref += req.preferred;
max += req.maximum;
@@ -578,7 +577,7 @@
int[] columnSpans;
int[] columnOffsets;
SizeRequirements[] columnRequirements;
- Vector rows;
+ Vector<TableRow> rows;
boolean gridValid;
static final private BitSet EMPTY = new BitSet();