Author: tchemit Date: 2008-07-22 18:02:38 +0000 (Tue, 22 Jul 2008) New Revision: 758 Modified: trunk/lutinjaxx/jaxx-swing/src/main/java/jaxx/tags/swing/TableHandler.java Log: revert ! Modified: trunk/lutinjaxx/jaxx-swing/src/main/java/jaxx/tags/swing/TableHandler.java =================================================================== --- trunk/lutinjaxx/jaxx-swing/src/main/java/jaxx/tags/swing/TableHandler.java 2008-07-22 17:16:20 UTC (rev 757) +++ trunk/lutinjaxx/jaxx-swing/src/main/java/jaxx/tags/swing/TableHandler.java 2008-07-22 18:02:38 UTC (rev 758) @@ -100,8 +100,8 @@ rowConstraints = (GridBagConstraints) tableConstraints.clone(); for (int x = 0; x < rowSpans.size(); x++) { - Integer rowSpan = rowSpans.get(x); - if (rowSpan != null && rowSpan > 0) { + int rowSpan = rowSpans.get(x); + if (rowSpan > 0) { rowSpans.set(x, rowSpan - 1); } } @@ -110,7 +110,7 @@ public void newCell() { emptyCell = true; rowConstraints.gridx++; - while (rowConstraints.gridx < rowSpans.size() && rowSpans.get(rowConstraints.gridx) != null && rowSpans.get(rowConstraints.gridx) > 0) { + while (rowConstraints.gridx < rowSpans.size() && rowSpans.get(rowConstraints.gridx) > 0) { rowConstraints.gridx++; } cellConstraints = (GridBagConstraints) rowConstraints.clone();