Some changes based on recommendations from code review #6722

svn changeset:19455/svn branch:6.7

diff --git a/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java b/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java
index a0feaddcadd914b35d39dab466f7cf983c9df9ac..9148b463fdd1a599913169eee4c3740805b282c6 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java
@@ -3734,7 +3734,7 @@ public class VScrollTable extends FlowPanel implements Table, ScrollHandler,
             }
         }
 
-        public void insertRows(UIDL rowData, int firstIndex, int rows) {
+        protected void insertRows(UIDL rowData, int firstIndex, int rows) {
             aligns = tHead.getColumnAlignments();
             final Iterator<?> it = rowData.getChildIterator();
 
@@ -3850,7 +3850,7 @@ public class VScrollTable extends FlowPanel implements Table, ScrollHandler,
         /**
          * @return false if couldn't remove row
          */
-        public boolean unlinkRow(boolean fromBeginning) {
+        protected boolean unlinkRow(boolean fromBeginning) {
             if (lastRendered - firstRendered < 0) {
                 return false;
             }
@@ -3871,7 +3871,7 @@ public class VScrollTable extends FlowPanel implements Table, ScrollHandler,
             }
         }
 
-        public void unlinkRows(int firstIndex, int count) {
+        protected void unlinkRows(int firstIndex, int count) {
             if (count < 1) {
                 return;
             }
@@ -3890,7 +3890,7 @@ public class VScrollTable extends FlowPanel implements Table, ScrollHandler,
             fixSpacers();
         }
 
-        public void unlinkAllRowsAfter(int index) {
+        protected void unlinkAllRowsAfter(int index) {
             if (firstRendered > index) {
                 index = firstRendered;
             }

diff --git a/src/com/vaadin/ui/Table.java b/src/com/vaadin/ui/Table.java
index 94e917d3720818aeaf0973fc1e3acecf71050987..27d17169f1f5d39566d764c71508c7abaae06682 100644 (file)
--- a/src/com/vaadin/ui/Table.java
+++ b/src/com/vaadin/ui/Table.java
@@ -2692,15 +2692,13 @@ public class Table extends AbstractSelect implements Action.Container,
 
     private boolean[] findCellsWithComponents() {
         final boolean[] isComponent = new boolean[visibleColumns.size()];
-        int isComponentIndex = 0;
-        for (final Iterator<Object> it = visibleColumns.iterator(); it
-                .hasNext() && isComponentIndex < isComponent.length;) {
-            final Object columnId = it.next();
+        int ix = 0;
+        for (Object columnId : visibleColumns) {
             if (columnGenerators.containsKey(columnId)) {
-                isComponent[isComponentIndex++] = true;
+                isComponent[ix++] = true;
             } else {
                 final Class<?> colType = getType(columnId);
-                isComponent[isComponentIndex++] = colType != null
+                isComponent[ix++] = colType != null
                         && Component.class.isAssignableFrom(colType);
             }
         }
@@ -2710,9 +2708,7 @@ public class Table extends AbstractSelect implements Action.Container,
     private void paintVisibleColumnOrder(PaintTarget target) {
         // Visible column order
         final ArrayList<String> visibleColOrder = new ArrayList<String>();
-        for (final Iterator<Object> it = visibleColumns.iterator(); it
-                .hasNext();) {
-            final Object columnId = it.next();
+        for (Object columnId : visibleColumns) {
             if (!isColumnCollapsed(columnId)) {
                 visibleColOrder.add(columnIdMap.key(columnId));
             }

diff --git a/src/com/vaadin/ui/TreeTable.java b/src/com/vaadin/ui/TreeTable.java
index 55b80a8e90257f489bd409bfbf4c1fbe0537d608..dfc2703eb7bcb6fd51fc9e1a1352f46393b7efb1 100644 (file)
--- a/src/com/vaadin/ui/TreeTable.java
+++ b/src/com/vaadin/ui/TreeTable.java
@@ -419,6 +419,11 @@ public class TreeTable extends Table implements Hierarchical {
         toggledItemId = null;
     }
 
+    /*
+     * Override methods for partial row updates and additions when expanding /
+     * collapsing nodes.
+     */
+
     @Override
     protected boolean isPartialRowUpdate() {
         return toggledItemId != null;