Bug 451217 - added handling of structural changes in CompositeFreezeLayer for cases where no detail information is transported

3 files changed, 1139 insertions, 1040 deletions

diff --git a/org.eclipse.nebula.widgets.nattable.core.test/src/org/eclipse/nebula/widgets/nattable/freeze/CompositeFreezeLayerHideShowTest.java b/org.eclipse.nebula.widgets.nattable.core.test/src/org/eclipse/nebula/widgets/nattable/freeze/CompositeFreezeLayerHideShowTest.java
index e04aab12..640a3fd2 100644
--- a/org.eclipse.nebula.widgets.nattable.core.test/src/org/eclipse/nebula/widgets/nattable/freeze/CompositeFreezeLayerHideShowTest.java
+++ b/org.eclipse.nebula.widgets.nattable.core.test/src/org/eclipse/nebula/widgets/nattable/freeze/CompositeFreezeLayerHideShowTest.java
@@ -1,10 +1,10 @@
 /*******************************************************************************
- * Copyright (c) 2012, 2013 Original authors and others.
+ * Copyright (c) 2012, 2013, 2014 Original authors and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
- * 
+ *
  * Contributors:
  *     Original authors and others - initial API and implementation
  ******************************************************************************/
@@ -12,6 +12,10 @@ package org.eclipse.nebula.widgets.nattable.freeze;
 
 import static org.junit.Assert.assertEquals;
 
+import java.util.ArrayList;
+
+import org.eclipse.nebula.widgets.nattable.coordinate.Range;
+import org.eclipse.nebula.widgets.nattable.data.IDataProvider;
 import org.eclipse.nebula.widgets.nattable.freeze.command.FreezeColumnCommand;
 import org.eclipse.nebula.widgets.nattable.freeze.command.FreezeRowCommand;
 import org.eclipse.nebula.widgets.nattable.freeze.command.UnFreezeGridCommand;
@@ -23,9 +27,11 @@ import org.eclipse.nebula.widgets.nattable.hideshow.command.MultiRowHideCommand;
 import org.eclipse.nebula.widgets.nattable.hideshow.command.RowHideCommand;
 import org.eclipse.nebula.widgets.nattable.hideshow.command.ShowAllColumnsCommand;
 import org.eclipse.nebula.widgets.nattable.hideshow.command.ShowAllRowsCommand;
+import org.eclipse.nebula.widgets.nattable.layer.DataLayer;
+import org.eclipse.nebula.widgets.nattable.layer.event.RowDeleteEvent;
+import org.eclipse.nebula.widgets.nattable.layer.event.RowInsertEvent;
 import org.eclipse.nebula.widgets.nattable.reorder.ColumnReorderLayer;
 import org.eclipse.nebula.widgets.nattable.selection.SelectionLayer;
-import org.eclipse.nebula.widgets.nattable.test.fixture.layer.BaseDataLayerFixture;
 import org.eclipse.nebula.widgets.nattable.util.IClientAreaProvider;
 import org.eclipse.nebula.widgets.nattable.viewport.ViewportLayer;
 import org.eclipse.swt.graphics.Rectangle;
@@ -34,6 +40,34 @@ import org.junit.Test;
 
 public class CompositeFreezeLayerHideShowTest {
 
+    private int columnCount = 5;
+    private int rowCount = 5;
+
+    private IDataProvider testDataProvider = new IDataProvider() {
+
+        @Override
+        public int getColumnCount() {
+            return CompositeFreezeLayerHideShowTest.this.columnCount;
+        }
+
+        @Override
+        public int getRowCount() {
+            return CompositeFreezeLayerHideShowTest.this.rowCount;
+        }
+
+        @Override
+        public Object getDataValue(int columnIndex, int rowIndex) {
+            return "[col:" + columnIndex + ", row:" + rowIndex + "]";
+        }
+
+        @Override
+        public void setDataValue(int columnIndex, int rowIndex, Object newValue) {
+            // Do nothing
+        }
+
+    };
+
+    private DataLayer dataLayer;
     private ColumnReorderLayer reorderLayer;
     private RowHideShowLayer rowHideShowLayer;
     private ColumnHideShowLayer columnHideShowLayer;
@@ -44,16 +78,17 @@ public class CompositeFreezeLayerHideShowTest {
 
     @Before
     public void setup() {
-        reorderLayer = new ColumnReorderLayer(new BaseDataLayerFixture(5, 5));
-        rowHideShowLayer = new RowHideShowLayer(reorderLayer);
-        columnHideShowLayer = new ColumnHideShowLayer(rowHideShowLayer);
-        selectionLayer = new SelectionLayer(columnHideShowLayer);
-        viewportLayer = new ViewportLayer(selectionLayer);
-        freezeLayer = new FreezeLayer(selectionLayer);
-
-        compositeFreezeLayer = new CompositeFreezeLayer(freezeLayer,
-                viewportLayer, selectionLayer);
-        compositeFreezeLayer.setClientAreaProvider(new IClientAreaProvider() {
+        this.dataLayer = new DataLayer(this.testDataProvider);
+        this.reorderLayer = new ColumnReorderLayer(this.dataLayer);
+        this.rowHideShowLayer = new RowHideShowLayer(this.reorderLayer);
+        this.columnHideShowLayer = new ColumnHideShowLayer(this.rowHideShowLayer);
+        this.selectionLayer = new SelectionLayer(this.columnHideShowLayer);
+        this.viewportLayer = new ViewportLayer(this.selectionLayer);
+        this.freezeLayer = new FreezeLayer(this.selectionLayer);
+
+        this.compositeFreezeLayer = new CompositeFreezeLayer(
+                this.freezeLayer, this.viewportLayer, this.selectionLayer);
+        this.compositeFreezeLayer.setClientAreaProvider(new IClientAreaProvider() {
 
             @Override
             public Rectangle getClientArea() {
@@ -65,97 +100,97 @@ public class CompositeFreezeLayerHideShowTest {
 
     @Test
     public void testNotFrozen() {
-        assertEquals(0, freezeLayer.getColumnCount());
-        assertEquals(0, freezeLayer.getRowCount());
-        assertEquals(-1, freezeLayer.getBottomRightPosition().columnPosition);
-        assertEquals(-1, freezeLayer.getBottomRightPosition().rowPosition);
-
-        assertEquals(5, viewportLayer.getColumnCount());
-        assertEquals(5, viewportLayer.getRowCount());
-        assertEquals(0, viewportLayer.getMinimumOriginColumnPosition());
-        assertEquals(0, viewportLayer.getMinimumOriginRowPosition());
-        assertEquals(0, viewportLayer.getMinimumOrigin().getX());
-        assertEquals(0, viewportLayer.getMinimumOrigin().getY());
+        assertEquals(0, this.freezeLayer.getColumnCount());
+        assertEquals(0, this.freezeLayer.getRowCount());
+        assertEquals(-1, this.freezeLayer.getBottomRightPosition().columnPosition);
+        assertEquals(-1, this.freezeLayer.getBottomRightPosition().rowPosition);
+
+        assertEquals(5, this.viewportLayer.getColumnCount());
+        assertEquals(5, this.viewportLayer.getRowCount());
+        assertEquals(0, this.viewportLayer.getMinimumOriginColumnPosition());
+        assertEquals(0, this.viewportLayer.getMinimumOriginRowPosition());
+        assertEquals(0, this.viewportLayer.getMinimumOrigin().getX());
+        assertEquals(0, this.viewportLayer.getMinimumOrigin().getY());
     }
 
     // Freeze
 
     @Test
     public void testFreezeAllColumns() {
-        compositeFreezeLayer.doCommand(new FreezeColumnCommand(
-                compositeFreezeLayer, 4));
+        this.compositeFreezeLayer.doCommand(
+                new FreezeColumnCommand(this.compositeFreezeLayer, 4));
 
-        assertEquals(5, freezeLayer.getColumnCount());
-        assertEquals(0, freezeLayer.getRowCount());
-        assertEquals(4, freezeLayer.getBottomRightPosition().columnPosition);
-        assertEquals(-1, freezeLayer.getBottomRightPosition().rowPosition);
+        assertEquals(5, this.freezeLayer.getColumnCount());
+        assertEquals(0, this.freezeLayer.getRowCount());
+        assertEquals(4, this.freezeLayer.getBottomRightPosition().columnPosition);
+        assertEquals(-1, this.freezeLayer.getBottomRightPosition().rowPosition);
 
-        assertEquals(0, viewportLayer.getColumnCount());
-        assertEquals(5, viewportLayer.getRowCount());
-        assertEquals(-1, viewportLayer.getMinimumOriginColumnPosition());
-        assertEquals(0, viewportLayer.getMinimumOriginRowPosition());
-        assertEquals(500, viewportLayer.getMinimumOrigin().getX());
-        assertEquals(0, viewportLayer.getMinimumOrigin().getY());
+        assertEquals(0, this.viewportLayer.getColumnCount());
+        assertEquals(5, this.viewportLayer.getRowCount());
+        assertEquals(-1, this.viewportLayer.getMinimumOriginColumnPosition());
+        assertEquals(0, this.viewportLayer.getMinimumOriginRowPosition());
+        assertEquals(500, this.viewportLayer.getMinimumOrigin().getX());
+        assertEquals(0, this.viewportLayer.getMinimumOrigin().getY());
 
         reset();
     }
 
     @Test
     public void testFreezeAllRows() {
-        compositeFreezeLayer.doCommand(new FreezeRowCommand(
-                compositeFreezeLayer, 4));
+        this.compositeFreezeLayer.doCommand(
+                new FreezeRowCommand(this.compositeFreezeLayer, 4));
 
-        assertEquals(0, freezeLayer.getColumnCount());
-        assertEquals(5, freezeLayer.getRowCount());
-        assertEquals(-1, freezeLayer.getBottomRightPosition().columnPosition);
-        assertEquals(4, freezeLayer.getBottomRightPosition().rowPosition);
+        assertEquals(0, this.freezeLayer.getColumnCount());
+        assertEquals(5, this.freezeLayer.getRowCount());
+        assertEquals(-1, this.freezeLayer.getBottomRightPosition().columnPosition);
+        assertEquals(4, this.freezeLayer.getBottomRightPosition().rowPosition);
 
-        assertEquals(5, viewportLayer.getColumnCount());
-        assertEquals(0, viewportLayer.getRowCount());
-        assertEquals(0, viewportLayer.getMinimumOriginColumnPosition());
-        assertEquals(-1, viewportLayer.getMinimumOriginRowPosition());
-        assertEquals(0, viewportLayer.getMinimumOrigin().getX());
-        assertEquals(100, viewportLayer.getMinimumOrigin().getY());
+        assertEquals(5, this.viewportLayer.getColumnCount());
+        assertEquals(0, this.viewportLayer.getRowCount());
+        assertEquals(0, this.viewportLayer.getMinimumOriginColumnPosition());
+        assertEquals(-1, this.viewportLayer.getMinimumOriginRowPosition());
+        assertEquals(0, this.viewportLayer.getMinimumOrigin().getX());
+        assertEquals(100, this.viewportLayer.getMinimumOrigin().getY());
 
         reset();
     }
 
     @Test
     public void testFreezeColumns() {
-        compositeFreezeLayer.doCommand(new FreezeColumnCommand(
-                compositeFreezeLayer, 1));
+        this.compositeFreezeLayer.doCommand(
+                new FreezeColumnCommand(this.compositeFreezeLayer, 1));
 
-        assertEquals(2, freezeLayer.getColumnCount());
-        assertEquals(0, freezeLayer.getRowCount());
-        assertEquals(1, freezeLayer.getBottomRightPosition().columnPosition);
-        assertEquals(-1, freezeLayer.getBottomRightPosition().rowPosition);
+        assertEquals(2, this.freezeLayer.getColumnCount());
+        assertEquals(0, this.freezeLayer.getRowCount());
+        assertEquals(1, this.freezeLayer.getBottomRightPosition().columnPosition);
+        assertEquals(-1, this.freezeLayer.getBottomRightPosition().rowPosition);
 
-        assertEquals(3, viewportLayer.getColumnCount());
-        assertEquals(5, viewportLayer.getRowCount());
-        assertEquals(2, viewportLayer.getMinimumOriginColumnPosition());
-        assertEquals(0, viewportLayer.getMinimumOriginRowPosition());
-        assertEquals(200, viewportLayer.getMinimumOrigin().getX());
-        assertEquals(0, viewportLayer.getMinimumOrigin().getY());
+        assertEquals(3, this.viewportLayer.getColumnCount());
+        assertEquals(5, this.viewportLayer.getRowCount());
+        assertEquals(2, this.viewportLayer.getMinimumOriginColumnPosition());
+        assertEquals(0, this.viewportLayer.getMinimumOriginRowPosition());
+        assertEquals(200, this.viewportLayer.getMinimumOrigin().getX());
+        assertEquals(0, this.viewportLayer.getMinimumOrigin().getY());
 
         reset();
     }
 
     @Test
     public void testFreezeRows() {
-        compositeFreezeLayer.doCommand(new FreezeRowCommand(
-                compositeFreezeLayer, 1));
+        this.compositeFreezeLayer.doCommand(
+                new FreezeRowCommand(this.compositeFreezeLayer, 1));
 
-        assertEquals(0, freezeLayer.getColumnCount());
-        assertEquals(2, freezeLayer.getRowCount());
-        assertEquals(-1, freezeLayer.getBottomRightPosition().columnPosition);
-        assertEquals(1, freezeLayer.getBottomRightPosition().rowPosition);
+        assertEquals(0, this.freezeLayer.getColumnCount());
+        assertEquals(2, this.freezeLayer.getRowCount());
+        assertEquals(-1, this.freezeLayer.getBottomRightPosition().columnPosition);
+        assertEquals(1, this.freezeLayer.getBottomRightPosition().rowPosition);
 
-        assertEquals(5, viewportLayer.getColumnCount());
-        assertEquals(3, viewportLayer.getRowCount());
-        assertEquals(0, viewportLayer.getMinimumOriginColumnPosition());
-        assertEquals(2, viewportLayer.getMinimumOriginRowPosition());
-        assertEquals(0, viewportLayer.getMinimumOrigin().getX());
-        assertEquals(40, viewportLayer.getMinimumOrigin().getY());
+        assertEquals(5, this.viewportLayer.getColumnCount());
+        assertEquals(3, this.viewportLayer.getRowCount());
+        assertEquals(0, this.viewportLayer.getMinimumOriginColumnPosition());
+        assertEquals(2, this.viewportLayer.getMinimumOriginRowPosition());
+        assertEquals(0, this.viewportLayer.getMinimumOrigin().getX());
+        assertEquals(40, this.viewportLayer.getMinimumOrigin().getY());
 
         reset();
     }
@@ -165,51 +200,51 @@ public class CompositeFreezeLayerHideShowTest {
     @Test
     public void testFreezeHideShowColumnFrozenRegion() {
         // freeze
-        compositeFreezeLayer.doCommand(new FreezeColumnCommand(
-                compositeFreezeLayer, 1));
+        this.compositeFreezeLayer.doCommand(
+                new FreezeColumnCommand(this.compositeFreezeLayer, 1));
 
-        assertEquals(2, freezeLayer.getColumnCount());
-        assertEquals(0, freezeLayer.getRowCount());
-        assertEquals(1, freezeLayer.getBottomRightPosition().columnPosition);
-        assertEquals(-1, freezeLayer.getBottomRightPosition().rowPosition);
+        assertEquals(2, this.freezeLayer.getColumnCount());
+        assertEquals(0, this.freezeLayer.getRowCount());
+        assertEquals(1, this.freezeLayer.getBottomRightPosition().columnPosition);
+        assertEquals(-1, this.freezeLayer.getBottomRightPosition().rowPosition);
 
-        assertEquals(3, viewportLayer.getColumnCount());
-        assertEquals(5, viewportLayer.getRowCount());
-        assertEquals(2, viewportLayer.getMinimumOriginColumnPosition());
-        assertEquals(0, viewportLayer.getMinimumOriginRowPosition());
-        assertEquals(200, viewportLayer.getMinimumOrigin().getX());
-        assertEquals(0, viewportLayer.getMinimumOrigin().getY());
+        assertEquals(3, this.viewportLayer.getColumnCount());
+        assertEquals(5, this.viewportLayer.getRowCount());
+        assertEquals(2, this.viewportLayer.getMinimumOriginColumnPosition());
+        assertEquals(0, this.viewportLayer.getMinimumOriginRowPosition());
+        assertEquals(200, this.viewportLayer.getMinimumOrigin().getX());
+        assertEquals(0, this.viewportLayer.getMinimumOrigin().getY());
 
         // hide
-        compositeFreezeLayer.doCommand(new ColumnHideCommand(
-                compositeFreezeLayer, 0));
+        this.compositeFreezeLayer.doCommand(
+                new ColumnHideCommand(this.compositeFreezeLayer, 0));
 
-        assertEquals(1, freezeLayer.getColumnCount());
-        assertEquals(0, freezeLayer.getRowCount());
-        assertEquals(0, freezeLayer.getBottomRightPosition().columnPosition);
-        assertEquals(-1, freezeLayer.getBottomRightPosition().rowPosition);
+        assertEquals(1, this.freezeLayer.getColumnCount());
+        assertEquals(0, this.freezeLayer.getRowCount());
+        assertEquals(0, this.freezeLayer.getBottomRightPosition().columnPosition);
+        assertEquals(-1, this.freezeLayer.getBottomRightPosition().rowPosition);
 
-        assertEquals(3, viewportLayer.getColumnCount());
-        assertEquals(5, viewportLayer.getRowCount());
-        assertEquals(1, viewportLayer.getMinimumOriginColumnPosition());
-        assertEquals(0, viewportLayer.getMinimumOriginRowPosition());
-        assertEquals(100, viewportLayer.getMinimumOrigin().getX());
-        assertEquals(0, viewportLayer.getMinimumOrigin().getY());
+        assertEquals(3, this.viewportLayer.getColumnCount());
+        assertEquals(5, this.viewportLayer.getRowCount());
+        assertEquals(1, this.viewportLayer.getMinimumOriginColumnPosition());
+        assertEquals(0, this.viewportLayer.getMinimumOriginRowPosition());
+        assertEquals(100, this.viewportLayer.getMinimumOrigin().getX());
+        assertEquals(0, this.viewportLayer.getMinimumOrigin().getY());
 
         // show again
-        compositeFreezeLayer.doCommand(new ShowAllColumnsCommand());
+        this.compositeFreezeLayer.doCommand(new ShowAllColumnsCommand());
 
-        assertEquals(2, freezeLayer.getColumnCount());
-        assertEquals(0, freezeLayer.getRowCount());
-        assertEquals(1, freezeLayer.getBottomRightPosition().columnPosition);
-        assertEquals(-1, freezeLayer.getBottomRightPosition().rowPosition);
+        assertEquals(2, this.freezeLayer.getColumnCount());
+        assertEquals(0, this.freezeLayer.getRowCount());
+        assertEquals(1, this.freezeLayer.getBottomRightPosition().columnPosition);
+        assertEquals(-1, this.freezeLayer.getBottomRightPosition().rowPosition);
 
-        assertEquals(3, viewportLayer.getColumnCount());
-        assertEquals(5, viewportLayer.getRowCount());
-        assertEquals(2, viewportLayer.getMinimumOriginColumnPosition());
-        assertEquals(0, viewportLayer.getMinimumOriginRowPosition());
-        assertEquals(200, viewportLayer.getMinimumOrigin().getX());
-        assertEquals(0, viewportLayer.getMinimumOrigin().getY());
+        assertEquals(3, this.viewportLayer.getColumnCount());
+        assertEquals(5, this.viewportLayer.getRowCount());
+        assertEquals(2, this.viewportLayer.getMinimumOriginColumnPosition());
+        assertEquals(0, this.viewportLayer.getMinimumOriginRowPosition());
+        assertEquals(200, this.viewportLayer.getMinimumOrigin().getX());
+        assertEquals(0, this.viewportLayer.getMinimumOrigin().getY());
 
         reset();
     }
@@ -217,52 +252,52 @@ public class CompositeFreezeLayerHideShowTest {
     @Test
     public void testFreezeHideShowColumnFrozenRegionEdge() {
         // freeze
-        compositeFreezeLayer.doCommand(new FreezeColumnCommand(
-                compositeFreezeLayer, 1));
+        this.compositeFreezeLayer.doCommand(
+                new FreezeColumnCommand(this.compositeFreezeLayer, 1));
 
-        assertEquals(2, freezeLayer.getColumnCount());
-        assertEquals(0, freezeLayer.getRowCount());
-        assertEquals(1, freezeLayer.getBottomRightPosition().columnPosition);
-        assertEquals(-1, freezeLayer.getBottomRightPosition().rowPosition);
+        assertEquals(2, this.freezeLayer.getColumnCount());
+        assertEquals(0, this.freezeLayer.getRowCount());
+        assertEquals(1, this.freezeLayer.getBottomRightPosition().columnPosition);
+        assertEquals(-1, this.freezeLayer.getBottomRightPosition().rowPosition);
 
-        assertEquals(3, viewportLayer.getColumnCount());
-        assertEquals(5, viewportLayer.getRowCount());
-        assertEquals(2, viewportLayer.getMinimumOriginColumnPosition());
-        assertEquals(0, viewportLayer.getMinimumOriginRowPosition());
-        assertEquals(200, viewportLayer.getMinimumOrigin().getX());
-        assertEquals(0, viewportLayer.getMinimumOrigin().getY());
+        assertEquals(3, this.viewportLayer.getColumnCount());
+        assertEquals(5, this.viewportLayer.getRowCount());
+        assertEquals(2, this.viewportLayer.getMinimumOriginColumnPosition());
+        assertEquals(0, this.viewportLayer.getMinimumOriginRowPosition());
+        assertEquals(200, this.viewportLayer.getMinimumOrigin().getX());
+        assertEquals(0, this.viewportLayer.getMinimumOrigin().getY());
 
         // hide
-        compositeFreezeLayer.doCommand(new ColumnHideCommand(
-                compositeFreezeLayer, 1));
+        this.compositeFreezeLayer.doCommand(
+                new ColumnHideCommand(this.compositeFreezeLayer, 1));
 
-        assertEquals(1, freezeLayer.getColumnCount());
-        assertEquals(0, freezeLayer.getRowCount());
-        assertEquals(0, freezeLayer.getBottomRightPosition().columnPosition);
-        assertEquals(-1, freezeLayer.getBottomRightPosition().rowPosition);
+        assertEquals(1, this.freezeLayer.getColumnCount());
+        assertEquals(0, this.freezeLayer.getRowCount());
+        assertEquals(0, this.freezeLayer.getBottomRightPosition().columnPosition);
+        assertEquals(-1, this.freezeLayer.getBottomRightPosition().rowPosition);
 
-        assertEquals(3, viewportLayer.getColumnCount());
-        assertEquals(5, viewportLayer.getRowCount());
-        assertEquals(1, viewportLayer.getMinimumOriginColumnPosition());
-        assertEquals(0, viewportLayer.getMinimumOriginRowPosition());
-        assertEquals(100, viewportLayer.getMinimumOrigin().getX());
-        assertEquals(0, viewportLayer.getMinimumOrigin().getY());
+        assertEquals(3, this.viewportLayer.getColumnCount());
+        assertEquals(5, this.viewportLayer.getRowCount());
+        assertEquals(1, this.viewportLayer.getMinimumOriginColumnPosition());
+        assertEquals(0, this.viewportLayer.getMinimumOriginRowPosition());
+        assertEquals(100, this.viewportLayer.getMinimumOrigin().getX());
+        assertEquals(0, this.viewportLayer.getMinimumOrigin().getY());
 
         // show again - since edge is shown again the frozen region is not
         // extended
-        compositeFreezeLayer.doCommand(new ShowAllColumnsCommand());
+        this.compositeFreezeLayer.doCommand(new ShowAllColumnsCommand());
 
-        assertEquals(1, freezeLayer.getColumnCount());
-        assertEquals(0, freezeLayer.getRowCount());
-        assertEquals(0, freezeLayer.getBottomRightPosition().columnPosition);
-        assertEquals(-1, freezeLayer.getBottomRightPosition().rowPosition);
+        assertEquals(1, this.freezeLayer.getColumnCount());
+        assertEquals(0, this.freezeLayer.getRowCount());
+        assertEquals(0, this.freezeLayer.getBottomRightPosition().columnPosition);
+        assertEquals(-1, this.freezeLayer.getBottomRightPosition().rowPosition);
 
-        assertEquals(4, viewportLayer.getColumnCount());
-        assertEquals(5, viewportLayer.getRowCount());
-        assertEquals(1, viewportLayer.getMinimumOriginColumnPosition());
-        assertEquals(0, viewportLayer.getMinimumOriginRowPosition());
-        assertEquals(100, viewportLayer.getMinimumOrigin().getX());
-        assertEquals(0, viewportLayer.getMinimumOrigin().getY());
+        assertEquals(4, this.viewportLayer.getColumnCount());
+        assertEquals(5, this.viewportLayer.getRowCount());
+        assertEquals(1, this.viewportLayer.getMinimumOriginColumnPosition());
+        assertEquals(0, this.viewportLayer.getMinimumOriginRowPosition());
+        assertEquals(100, this.viewportLayer.getMinimumOrigin().getX());
+        assertEquals(0, this.viewportLayer.getMinimumOrigin().getY());
 
         reset();
     }
@@ -270,51 +305,51 @@ public class CompositeFreezeLayerHideShowTest {
     @Test
     public void testFreezeHideShowColumnAllFrozenRegion() {
         // freeze
-        compositeFreezeLayer.doCommand(new FreezeColumnCommand(
-                compositeFreezeLayer, 1));
+        this.compositeFreezeLayer.doCommand(
+                new FreezeColumnCommand(this.compositeFreezeLayer, 1));
 
-        assertEquals(2, freezeLayer.getColumnCount());
-        assertEquals(0, freezeLayer.getRowCount());
-        assertEquals(1, freezeLayer.getBottomRightPosition().columnPosition);
-        assertEquals(-1, freezeLayer.getBottomRightPosition().rowPosition);
+        assertEquals(2, this.freezeLayer.getColumnCount());
+        assertEquals(0, this.freezeLayer.getRowCount());
+        assertEquals(1, this.freezeLayer.getBottomRightPosition().columnPosition);
+        assertEquals(-1, this.freezeLayer.getBottomRightPosition().rowPosition);
 
-        assertEquals(3, viewportLayer.getColumnCount());
-        assertEquals(5, viewportLayer.getRowCount());
-        assertEquals(2, viewportLayer.getMinimumOriginColumnPosition());
-        assertEquals(0, viewportLayer.getMinimumOriginRowPosition());
-        assertEquals(200, viewportLayer.getMinimumOrigin().getX());
-        assertEquals(0, viewportLayer.getMinimumOrigin().getY());
+        assertEquals(3, this.viewportLayer.getColumnCount());
+        assertEquals(5, this.viewportLayer.getRowCount());
+        assertEquals(2, this.viewportLayer.getMinimumOriginColumnPosition());
+        assertEquals(0, this.viewportLayer.getMinimumOriginRowPosition());
+        assertEquals(200, this.viewportLayer.getMinimumOrigin().getX());
+        assertEquals(0, this.viewportLayer.getMinimumOrigin().getY());
 
         // hide
-        compositeFreezeLayer.doCommand(new MultiColumnHideCommand(
-                compositeFreezeLayer, new int[] { 0, 1 }));
+        this.compositeFreezeLayer.doCommand(
+                new MultiColumnHideCommand(this.compositeFreezeLayer, new int[] { 0, 1 }));
 
-        assertEquals(0, freezeLayer.getColumnCount());
-        assertEquals(0, freezeLayer.getRowCount());
-        assertEquals(-1, freezeLayer.getBottomRightPosition().columnPosition);
-        assertEquals(-1, freezeLayer.getBottomRightPosition().rowPosition);
+        assertEquals(0, this.freezeLayer.getColumnCount());
+        assertEquals(0, this.freezeLayer.getRowCount());
+        assertEquals(-1, this.freezeLayer.getBottomRightPosition().columnPosition);
+        assertEquals(-1, this.freezeLayer.getBottomRightPosition().rowPosition);
 
-        assertEquals(3, viewportLayer.getColumnCount());
-        assertEquals(5, viewportLayer.getRowCount());
-        assertEquals(0, viewportLayer.getMinimumOriginColumnPosition());
-        assertEquals(0, viewportLayer.getMinimumOriginRowPosition());
-        assertEquals(0, viewportLayer.getMinimumOrigin().getX());
-        assertEquals(0, viewportLayer.getMinimumOrigin().getY());
+        assertEquals(3, this.viewportLayer.getColumnCount());
+        assertEquals(5, this.viewportLayer.getRowCount());
+        assertEquals(0, this.viewportLayer.getMinimumOriginColumnPosition());
+        assertEquals(0, this.viewportLayer.getMinimumOriginRowPosition());
+        assertEquals(0, this.viewportLayer.getMinimumOrigin().getX());
+        assertEquals(0, this.viewportLayer.getMinimumOrigin().getY());
 
         // show again
-        compositeFreezeLayer.doCommand(new ShowAllColumnsCommand());
+        this.compositeFreezeLayer.doCommand(new ShowAllColumnsCommand());
 
-        assertEquals(0, freezeLayer.getColumnCount());
-        assertEquals(0, freezeLayer.getRowCount());
-        assertEquals(-1, freezeLayer.getBottomRightPosition().columnPosition);
-        assertEquals(-1, freezeLayer.getBottomRightPosition().rowPosition);
+        assertEquals(0, this.freezeLayer.getColumnCount());
+        assertEquals(0, this.freezeLayer.getRowCount());
+        assertEquals(-1, this.freezeLayer.getBottomRightPosition().columnPosition);
+        assertEquals(-1, this.freezeLayer.getBottomRightPosition().rowPosition);
 
-        assertEquals(5, viewportLayer.getColumnCount());
-        assertEquals(5, viewportLayer.getRowCount());
-        assertEquals(0, viewportLayer.getMinimumOriginColumnPosition());
-        assertEquals(0, viewportLayer.getMinimumOriginRowPosition());
-        assertEquals(0, viewportLayer.getMinimumOrigin().getX());
-        assertEquals(0, viewportLayer.getMinimumOrigin().getY());
+        assertEquals(5, this.viewportLayer.getColumnCount());
+        assertEquals(5, this.viewportLayer.getRowCount());
+        assertEquals(0, this.viewportLayer.getMinimumOriginColumnPosition());
+        assertEquals(0, this.viewportLayer.getMinimumOriginRowPosition());
+        assertEquals(0, this.viewportLayer.getMinimumOrigin().getX());
+        assertEquals(0, this.viewportLayer.getMinimumOrigin().getY());
 
         reset();
     }
@@ -322,51 +357,51 @@ public class CompositeFreezeLayerHideShowTest {
     @Test
     public void testFreezeHideShowColumnViewportRegion() {
         // freeze
-        compositeFreezeLayer.doCommand(new FreezeColumnCommand(
-                compositeFreezeLayer, 1));
+        this.compositeFreezeLayer.doCommand(
+                new FreezeColumnCommand(this.compositeFreezeLayer, 1));
 
-        assertEquals(2, freezeLayer.getColumnCount());
-        assertEquals(0, freezeLayer.getRowCount());
-        assertEquals(1, freezeLayer.getBottomRightPosition().columnPosition);
-        assertEquals(-1, freezeLayer.getBottomRightPosition().rowPosition);
+        assertEquals(2, this.freezeLayer.getColumnCount());
+        assertEquals(0, this.freezeLayer.getRowCount());
+        assertEquals(1, this.freezeLayer.getBottomRightPosition().columnPosition);
+        assertEquals(-1, this.freezeLayer.getBottomRightPosition().rowPosition);
 
-        assertEquals(3, viewportLayer.getColumnCount());
-        assertEquals(5, viewportLayer.getRowCount());
-        assertEquals(2, viewportLayer.getMinimumOriginColumnPosition());
-        assertEquals(0, viewportLayer.getMinimumOriginRowPosition());
-        assertEquals(200, viewportLayer.getMinimumOrigin().getX());
-        assertEquals(0, viewportLayer.getMinimumOrigin().getY());
+        assertEquals(3, this.viewportLayer.getColumnCount());
+        assertEquals(5, this.viewportLayer.getRowCount());
+        assertEquals(2, this.viewportLayer.getMinimumOriginColumnPosition());
+        assertEquals(0, this.viewportLayer.getMinimumOriginRowPosition());
+        assertEquals(200, this.viewportLayer.getMinimumOrigin().getX());
+        assertEquals(0, this.viewportLayer.getMinimumOrigin().getY());
 
         // hide
-        compositeFreezeLayer.doCommand(new ColumnHideCommand(
-                compositeFreezeLayer, 3));
+        this.compositeFreezeLayer.doCommand(
+                new ColumnHideCommand(this.compositeFreezeLayer, 3));
 
-        assertEquals(2, freezeLayer.getColumnCount());
-        assertEquals(0, freezeLayer.getRowCount());
-        assertEquals(1, freezeLayer.getBottomRightPosition().columnPosition);
-        assertEquals(-1, freezeLayer.getBottomRightPosition().rowPosition);
+        assertEquals(2, this.freezeLayer.getColumnCount());
+        assertEquals(0, this.freezeLayer.getRowCount());
+        assertEquals(1, this.freezeLayer.getBottomRightPosition().columnPosition);
+        assertEquals(-1, this.freezeLayer.getBottomRightPosition().rowPosition);
 
-        assertEquals(2, viewportLayer.getColumnCount());
-        assertEquals(5, viewportLayer.getRowCount());
-        assertEquals(2, viewportLayer.getMinimumOriginColumnPosition());
-        assertEquals(0, viewportLayer.getMinimumOriginRowPosition());
-        assertEquals(200, viewportLayer.getMinimumOrigin().getX());
-        assertEquals(0, viewportLayer.getMinimumOrigin().getY());
+        assertEquals(2, this.viewportLayer.getColumnCount());
+        assertEquals(5, this.viewportLayer.getRowCount());
+        assertEquals(2, this.viewportLayer.getMinimumOriginColumnPosition());
+        assertEquals(0, this.viewportLayer.getMinimumOriginRowPosition());
+        assertEquals(200, this.viewportLayer.getMinimumOrigin().getX());
+        assertEquals(0, this.viewportLayer.getMinimumOrigin().getY());
 
         // show again
-        compositeFreezeLayer.doCommand(new ShowAllColumnsCommand());
+        this.compositeFreezeLayer.doCommand(new ShowAllColumnsCommand());
 
-        assertEquals(2, freezeLayer.getColumnCount());
-        assertEquals(0, freezeLayer.getRowCount());
-        assertEquals(1, freezeLayer.getBottomRightPosition().columnPosition);
-        assertEquals(-1, freezeLayer.getBottomRightPosition().rowPosition);
+        assertEquals(2, this.freezeLayer.getColumnCount());
+        assertEquals(0, this.freezeLayer.getRowCount());
+        assertEquals(1, this.freezeLayer.getBottomRightPosition().columnPosition);
+        assertEquals(-1, this.freezeLayer.getBottomRightPosition().rowPosition);
 
-        assertEquals(3, viewportLayer.getColumnCount());
-        assertEquals(5, viewportLayer.getRowCount());
-        assertEquals(2, viewportLayer.getMinimumOriginColumnPosition());
-        assertEquals(0, viewportLayer.getMinimumOriginRowPosition());
-        assertEquals(200, viewportLayer.getMinimumOrigin().getX());
-        assertEquals(0, viewportLayer.getMinimumOrigin().getY());
+        assertEquals(3, this.viewportLayer.getColumnCount());
+        assertEquals(5, this.viewportLayer.getRowCount());
+        assertEquals(2, this.viewportLayer.getMinimumOriginColumnPosition());
+        assertEquals(0, this.viewportLayer.getMinimumOriginRowPosition());
+        assertEquals(200, this.viewportLayer.getMinimumOrigin().getX());
+        assertEquals(0, this.viewportLayer.getMinimumOrigin().getY());
 
         reset();
     }
@@ -374,51 +409,51 @@ public class CompositeFreezeLayerHideShowTest {
     @Test
     public void testFreezeHideShowColumnViewportRegionEdge() {
         // freeze
-        compositeFreezeLayer.doCommand(new FreezeColumnCommand(
-                compositeFreezeLayer, 1));
+        this.compositeFreezeLayer.doCommand(
+                new FreezeColumnCommand(this.compositeFreezeLayer, 1));
 
-        assertEquals(2, freezeLayer.getColumnCount());
-        assertEquals(0, freezeLayer.getRowCount());
-        assertEquals(1, freezeLayer.getBottomRightPosition().columnPosition);
-        assertEquals(-1, freezeLayer.getBottomRightPosition().rowPosition);
+        assertEquals(2, this.freezeLayer.getColumnCount());
+        assertEquals(0, this.freezeLayer.getRowCount());
+        assertEquals(1, this.freezeLayer.getBottomRightPosition().columnPosition);
+        assertEquals(-1, this.freezeLayer.getBottomRightPosition().rowPosition);
 
-        assertEquals(3, viewportLayer.getColumnCount());
-        assertEquals(5, viewportLayer.getRowCount());
-        assertEquals(2, viewportLayer.getMinimumOriginColumnPosition());
-        assertEquals(0, viewportLayer.getMinimumOriginRowPosition());
-        assertEquals(200, viewportLayer.getMinimumOrigin().getX());
-        assertEquals(0, viewportLayer.getMinimumOrigin().getY());
+        assertEquals(3, this.viewportLayer.getColumnCount());
+        assertEquals(5, this.viewportLayer.getRowCount());
+        assertEquals(2, this.viewportLayer.getMinimumOriginColumnPosition());
+        assertEquals(0, this.viewportLayer.getMinimumOriginRowPosition());
+        assertEquals(200, this.viewportLayer.getMinimumOrigin().getX());
+        assertEquals(0, this.viewportLayer.getMinimumOrigin().getY());
 
         // hide
-        compositeFreezeLayer.doCommand(new ColumnHideCommand(
-                compositeFreezeLayer, 2));
+        this.compositeFreezeLayer.doCommand(
+                new ColumnHideCommand(this.compositeFreezeLayer, 2));
 
-        assertEquals(2, freezeLayer.getColumnCount());
-        assertEquals(0, freezeLayer.getRowCount());
-        assertEquals(1, freezeLayer.getBottomRightPosition().columnPosition);
-        assertEquals(-1, freezeLayer.getBottomRightPosition().rowPosition);
+        assertEquals(2, this.freezeLayer.getColumnCount());
+        assertEquals(0, this.freezeLayer.getRowCount());
+        assertEquals(1, this.freezeLayer.getBottomRightPosition().columnPosition);
+        assertEquals(-1, this.freezeLayer.getBottomRightPosition().rowPosition);
 
-        assertEquals(2, viewportLayer.getColumnCount());
-        assertEquals(5, viewportLayer.getRowCount());
-        assertEquals(2, viewportLayer.getMinimumOriginColumnPosition());
-        assertEquals(0, viewportLayer.getMinimumOriginRowPosition());
-        assertEquals(200, viewportLayer.getMinimumOrigin().getX());
-        assertEquals(0, viewportLayer.getMinimumOrigin().getY());
+        assertEquals(2, this.viewportLayer.getColumnCount());
+        assertEquals(5, this.viewportLayer.getRowCount());
+        assertEquals(2, this.viewportLayer.getMinimumOriginColumnPosition());
+        assertEquals(0, this.viewportLayer.getMinimumOriginRowPosition());
+        assertEquals(200, this.viewportLayer.getMinimumOrigin().getX());
+        assertEquals(0, this.viewportLayer.getMinimumOrigin().getY());
 
         // show again
-        compositeFreezeLayer.doCommand(new ShowAllColumnsCommand());
+        this.compositeFreezeLayer.doCommand(new ShowAllColumnsCommand());
 
-        assertEquals(2, freezeLayer.getColumnCount());
-        assertEquals(0, freezeLayer.getRowCount());
-        assertEquals(1, freezeLayer.getBottomRightPosition().columnPosition);
-        assertEquals(-1, freezeLayer.getBottomRightPosition().rowPosition);
+        assertEquals(2, this.freezeLayer.getColumnCount());
+        assertEquals(0, this.freezeLayer.getRowCount());
+        assertEquals(1, this.freezeLayer.getBottomRightPosition().columnPosition);
+        assertEquals(-1, this.freezeLayer.getBottomRightPosition().rowPosition);
 
-        assertEquals(3, viewportLayer.getColumnCount());
-        assertEquals(5, viewportLayer.getRowCount());
-        assertEquals(2, viewportLayer.getMinimumOriginColumnPosition());
-        assertEquals(0, viewportLayer.getMinimumOriginRowPosition());
-        assertEquals(200, viewportLayer.getMinimumOrigin().getX());
-        assertEquals(0, viewportLayer.getMinimumOrigin().getY());
+        assertEquals(3, this.viewportLayer.getColumnCount());
+        assertEquals(5, this.viewportLayer.getRowCount());
+        assertEquals(2, this.viewportLayer.getMinimumOriginColumnPosition());
+        assertEquals(0, this.viewportLayer.getMinimumOriginRowPosition());
+        assertEquals(200, this.viewportLayer.getMinimumOrigin().getX());
+        assertEquals(0, this.viewportLayer.getMinimumOrigin().getY());
 
         reset();
     }
@@ -426,51 +461,51 @@ public class CompositeFreezeLayerHideShowTest {
     @Test
     public void testFreezeHideShowColumnAllViewportRegion() {
         // freeze
-        compositeFreezeLayer.doCommand(new FreezeColumnCommand(
-                compositeFreezeLayer, 1));
+        this.compositeFreezeLayer.doCommand(
+                new FreezeColumnCommand(this.compositeFreezeLayer, 1));
 
-        assertEquals(2, freezeLayer.getColumnCount());
-        assertEquals(0, freezeLayer.getRowCount());
-        assertEquals(1, freezeLayer.getBottomRightPosition().columnPosition);
-        assertEquals(-1, freezeLayer.getBottomRightPosition().rowPosition);
+        assertEquals(2, this.freezeLayer.getColumnCount());
+        assertEquals(0, this.freezeLayer.getRowCount());
+        assertEquals(1, this.freezeLayer.getBottomRightPosition().columnPosition);
+        assertEquals(-1, this.freezeLayer.getBottomRightPosition().rowPosition);
 
-        assertEquals(3, viewportLayer.getColumnCount());
-        assertEquals(5, viewportLayer.getRowCount());
-        assertEquals(2, viewportLayer.getMinimumOriginColumnPosition());
-        assertEquals(0, viewportLayer.getMinimumOriginRowPosition());
-        assertEquals(200, viewportLayer.getMinimumOrigin().getX());
-        assertEquals(0, viewportLayer.getMinimumOrigin().getY());
+        assertEquals(3, this.viewportLayer.getColumnCount());
+        assertEquals(5, this.viewportLayer.getRowCount());
+        assertEquals(2, this.viewportLayer.getMinimumOriginColumnPosition());
+        assertEquals(0, this.viewportLayer.getMinimumOriginRowPosition());
+        assertEquals(200, this.viewportLayer.getMinimumOrigin().getX());
+        assertEquals(0, this.viewportLayer.getMinimumOrigin().getY());
 
         // hide
-        compositeFreezeLayer.doCommand(new MultiColumnHideCommand(
-                compositeFreezeLayer, new int[] { 2, 3, 4 }));
+        this.compositeFreezeLayer.doCommand(
+                new MultiColumnHideCommand(this.compositeFreezeLayer, new int[] { 2, 3, 4 }));
 
-        assertEquals(2, freezeLayer.getColumnCount());
-        assertEquals(0, freezeLayer.getRowCount());
-        assertEquals(1, freezeLayer.getBottomRightPosition().columnPosition);
-        assertEquals(-1, freezeLayer.getBottomRightPosition().rowPosition);
+        assertEquals(2, this.freezeLayer.getColumnCount());
+        assertEquals(0, this.freezeLayer.getRowCount());
+        assertEquals(1, this.freezeLayer.getBottomRightPosition().columnPosition);
+        assertEquals(-1, this.freezeLayer.getBottomRightPosition().rowPosition);
 
-        assertEquals(0, viewportLayer.getColumnCount());
-        assertEquals(5, viewportLayer.getRowCount());
-        assertEquals(2, viewportLayer.getMinimumOriginColumnPosition());
-        assertEquals(0, viewportLayer.getMinimumOriginRowPosition());
-        assertEquals(200, viewportLayer.getMinimumOrigin().getX());
-        assertEquals(0, viewportLayer.getMinimumOrigin().getY());
+        assertEquals(0, this.viewportLayer.getColumnCount());
+        assertEquals(5, this.viewportLayer.getRowCount());
+        assertEquals(2, this.viewportLayer.getMinimumOriginColumnPosition());
+        assertEquals(0, this.viewportLayer.getMinimumOriginRowPosition());
+        assertEquals(200, this.viewportLayer.getMinimumOrigin().getX());
+        assertEquals(0, this.viewportLayer.getMinimumOrigin().getY());
 
         // show again
-        compositeFreezeLayer.doCommand(new ShowAllColumnsCommand());
+        this.compositeFreezeLayer.doCommand(new ShowAllColumnsCommand());
 
-        assertEquals(2, freezeLayer.getColumnCount());
-        assertEquals(0, freezeLayer.getRowCount());
-        assertEquals(1, freezeLayer.getBottomRightPosition().columnPosition);
-        assertEquals(-1, freezeLayer.getBottomRightPosition().rowPosition);
+        assertEquals(2, this.freezeLayer.getColumnCount());
+        assertEquals(0, this.freezeLayer.getRowCount());
+        assertEquals(1, this.freezeLayer.getBottomRightPosition().columnPosition);
+        assertEquals(-1, this.freezeLayer.getBottomRightPosition().rowPosition);
 
-        assertEquals(3, viewportLayer.getColumnCount());
-        assertEquals(5, viewportLayer.getRowCount());
-        assertEquals(2, viewportLayer.getMinimumOriginColumnPosition());
-        assertEquals(0, viewportLayer.getMinimumOriginRowPosition());
-        assertEquals(200, viewportLayer.getMinimumOrigin().getX());
-        assertEquals(0, viewportLayer.getMinimumOrigin().getY());
+        assertEquals(3, this.viewportLayer.getColumnCount());
+        assertEquals(5, this.viewportLayer.getRowCount());
+        assertEquals(2, this.viewportLayer.getMinimumOriginColumnPosition());
+        assertEquals(0, this.viewportLayer.getMinimumOriginRowPosition());
+        assertEquals(200, this.viewportLayer.getMinimumOrigin().getX());
+        assertEquals(0, this.viewportLayer.getMinimumOrigin().getY());
 
         reset();
     }
@@ -478,51 +513,51 @@ public class CompositeFreezeLayerHideShowTest {
     @Test
     public void testFreezeHideShowColumnBothRegions() {
         // freeze
-        compositeFreezeLayer.doCommand(new FreezeColumnCommand(
-                compositeFreezeLayer, 1));
+        this.compositeFreezeLayer.doCommand(
+                new FreezeColumnCommand(this.compositeFreezeLayer, 1));
 
-        assertEquals(2, freezeLayer.getColumnCount());
-        assertEquals(0, freezeLayer.getRowCount());
-        assertEquals(1, freezeLayer.getBottomRightPosition().columnPosition);
-        assertEquals(-1, freezeLayer.getBottomRightPosition().rowPosition);
+        assertEquals(2, this.freezeLayer.getColumnCount());
+        assertEquals(0, this.freezeLayer.getRowCount());
+        assertEquals(1, this.freezeLayer.getBottomRightPosition().columnPosition);
+        assertEquals(-1, this.freezeLayer.getBottomRightPosition().rowPosition);
 
-        assertEquals(3, viewportLayer.getColumnCount());
-        assertEquals(5, viewportLayer.getRowCount());
-        assertEquals(2, viewportLayer.getMinimumOriginColumnPosition());
-        assertEquals(0, viewportLayer.getMinimumOriginRowPosition());
-        assertEquals(200, viewportLayer.getMinimumOrigin().getX());
-        assertEquals(0, viewportLayer.getMinimumOrigin().getY());
+        assertEquals(3, this.viewportLayer.getColumnCount());
+        assertEquals(5, this.viewportLayer.getRowCount());
+        assertEquals(2, this.viewportLayer.getMinimumOriginColumnPosition());
+        assertEquals(0, this.viewportLayer.getMinimumOriginRowPosition());
+        assertEquals(200, this.viewportLayer.getMinimumOrigin().getX());
+        assertEquals(0, this.viewportLayer.getMinimumOrigin().getY());
 
         // hide
-        compositeFreezeLayer.doCommand(new MultiColumnHideCommand(
-                compositeFreezeLayer, new int[] { 0, 3 }));
+        this.compositeFreezeLayer.doCommand(
+                new MultiColumnHideCommand(this.compositeFreezeLayer, new int[] { 0, 3 }));
 
-        assertEquals(1, freezeLayer.getColumnCount());
-        assertEquals(0, freezeLayer.getRowCount());
-        assertEquals(0, freezeLayer.getBottomRightPosition().columnPosition);
-        assertEquals(-1, freezeLayer.getBottomRightPosition().rowPosition);
+        assertEquals(1, this.freezeLayer.getColumnCount());
+        assertEquals(0, this.freezeLayer.getRowCount());
+        assertEquals(0, this.freezeLayer.getBottomRightPosition().columnPosition);
+        assertEquals(-1, this.freezeLayer.getBottomRightPosition().rowPosition);
 
-        assertEquals(2, viewportLayer.getColumnCount());
-        assertEquals(5, viewportLayer.getRowCount());
-        assertEquals(1, viewportLayer.getMinimumOriginColumnPosition());
-        assertEquals(0, viewportLayer.getMinimumOriginRowPosition());
-        assertEquals(100, viewportLayer.getMinimumOrigin().getX());
-        assertEquals(0, viewportLayer.getMinimumOrigin().getY());
+        assertEquals(2, this.viewportLayer.getColumnCount());
+        assertEquals(5, this.viewportLayer.getRowCount());
+        assertEquals(1, this.viewportLayer.getMinimumOriginColumnPosition());
+        assertEquals(0, this.viewportLayer.getMinimumOriginRowPosition());
+        assertEquals(100, this.viewportLayer.getMinimumOrigin().getX());
+        assertEquals(0, this.viewportLayer.getMinimumOrigin().getY());
 
         // show again
-        compositeFreezeLayer.doCommand(new ShowAllColumnsCommand());
+        this.compositeFreezeLayer.doCommand(new ShowAllColumnsCommand());
 
-        assertEquals(2, freezeLayer.getColumnCount());
-        assertEquals(0, freezeLayer.getRowCount());
-        assertEquals(1, freezeLayer.getBottomRightPosition().columnPosition);
-        assertEquals(-1, freezeLayer.getBottomRightPosition().rowPosition);
+        assertEquals(2, this.freezeLayer.getColumnCount());
+        assertEquals(0, this.freezeLayer.getRowCount());
+        assertEquals(1, this.freezeLayer.getBottomRightPosition().columnPosition);
+        assertEquals(-1, this.freezeLayer.getBottomRightPosition().rowPosition);
 
-        assertEquals(3, viewportLayer.getColumnCount());
-        assertEquals(5, viewportLayer.getRowCount());
-        assertEquals(2, viewportLayer.getMinimumOriginColumnPosition());
-        assertEquals(0, viewportLayer.getMinimumOriginRowPosition());
-        assertEquals(200, viewportLayer.getMinimumOrigin().getX());
-        assertEquals(0, viewportLayer.getMinimumOrigin().getY());
+        assertEquals(3, this.viewportLayer.getColumnCount());
+        assertEquals(5, this.viewportLayer.getRowCount());
+        assertEquals(2, this.viewportLayer.getMinimumOriginColumnPosition());
+        assertEquals(0, this.viewportLayer.getMinimumOriginRowPosition());
+        assertEquals(200, this.viewportLayer.getMinimumOrigin().getX());
+        assertEquals(0, this.viewportLayer.getMinimumOrigin().getY());
 
         reset();
     }
@@ -530,51 +565,51 @@ public class CompositeFreezeLayerHideShowTest {
     @Test
     public void testFreezeHideShowColumnBothRegionsEdge() {
         // freeze
-        compositeFreezeLayer.doCommand(new FreezeColumnCommand(
-                compositeFreezeLayer, 1));
+        this.compositeFreezeLayer.doCommand(
+                new FreezeColumnCommand(this.compositeFreezeLayer, 1));
 
-        assertEquals(2, freezeLayer.getColumnCount());
-        assertEquals(0, freezeLayer.getRowCount());
-        assertEquals(1, freezeLayer.getBottomRightPosition().columnPosition);
-        assertEquals(-1, freezeLayer.getBottomRightPosition().rowPosition);
+        assertEquals(2, this.freezeLayer.getColumnCount());
+        assertEquals(0, this.freezeLayer.getRowCount());
+        assertEquals(1, this.freezeLayer.getBottomRightPosition().columnPosition);
+        assertEquals(-1, this.freezeLayer.getBottomRightPosition().rowPosition);
 
-        assertEquals(3, viewportLayer.getColumnCount());
-        assertEquals(5, viewportLayer.getRowCount());
-        assertEquals(2, viewportLayer.getMinimumOriginColumnPosition());
-        assertEquals(0, viewportLayer.getMinimumOriginRowPosition());
-        assertEquals(200, viewportLayer.getMinimumOrigin().getX());
-        assertEquals(0, viewportLayer.getMinimumOrigin().getY());
+        assertEquals(3, this.viewportLayer.getColumnCount());
+        assertEquals(5, this.viewportLayer.getRowCount());
+        assertEquals(2, this.viewportLayer.getMinimumOriginColumnPosition());
+        assertEquals(0, this.viewportLayer.getMinimumOriginRowPosition());
+        assertEquals(200, this.viewportLayer.getMinimumOrigin().getX());
+        assertEquals(0, this.viewportLayer.getMinimumOrigin().getY());
 
         // hide
-        compositeFreezeLayer.doCommand(new MultiColumnHideCommand(
-                compositeFreezeLayer, new int[] { 1, 2 }));
+        this.compositeFreezeLayer.doCommand(
+                new MultiColumnHideCommand(this.compositeFreezeLayer, new int[] { 1, 2 }));
 
-        assertEquals(1, freezeLayer.getColumnCount());
-        assertEquals(0, freezeLayer.getRowCount());
-        assertEquals(0, freezeLayer.getBottomRightPosition().columnPosition);
-        assertEquals(-1, freezeLayer.getBottomRightPosition().rowPosition);
+        assertEquals(1, this.freezeLayer.getColumnCount());
+        assertEquals(0, this.freezeLayer.getRowCount());
+        assertEquals(0, this.freezeLayer.getBottomRightPosition().columnPosition);
+        assertEquals(-1, this.freezeLayer.getBottomRightPosition().rowPosition);
 
-        assertEquals(2, viewportLayer.getColumnCount());
-        assertEquals(5, viewportLayer.getRowCount());
-        assertEquals(1, viewportLayer.getMinimumOriginColumnPosition());
-        assertEquals(0, viewportLayer.getMinimumOriginRowPosition());
-        assertEquals(100, viewportLayer.getMinimumOrigin().getX());
-        assertEquals(0, viewportLayer.getMinimumOrigin().getY());
+        assertEquals(2, this.viewportLayer.getColumnCount());
+        assertEquals(5, this.viewportLayer.getRowCount());
+        assertEquals(1, this.viewportLayer.getMinimumOriginColumnPosition());
+        assertEquals(0, this.viewportLayer.getMinimumOriginRowPosition());
+        assertEquals(100, this.viewportLayer.getMinimumOrigin().getX());
+        assertEquals(0, this.viewportLayer.getMinimumOrigin().getY());
 
         // show again
-        compositeFreezeLayer.doCommand(new ShowAllColumnsCommand());
+        this.compositeFreezeLayer.doCommand(new ShowAllColumnsCommand());
 
-        assertEquals(1, freezeLayer.getColumnCount());
-        assertEquals(0, freezeLayer.getRowCount());
-        assertEquals(0, freezeLayer.getBottomRightPosition().columnPosition);
-        assertEquals(-1, freezeLayer.getBottomRightPosition().rowPosition);
+        assertEquals(1, this.freezeLayer.getColumnCount());
+        assertEquals(0, this.freezeLayer.getRowCount());
+        assertEquals(0, this.freezeLayer.getBottomRightPosition().columnPosition);
+        assertEquals(-1, this.freezeLayer.getBottomRightPosition().rowPosition);
 
-        assertEquals(4, viewportLayer.getColumnCount());
-        assertEquals(5, viewportLayer.getRowCount());
-        assertEquals(1, viewportLayer.getMinimumOriginColumnPosition());
-        assertEquals(0, viewportLayer.getMinimumOriginRowPosition());
-        assertEquals(100, viewportLayer.getMinimumOrigin().getX());
-        assertEquals(0, viewportLayer.getMinimumOrigin().getY());
+        assertEquals(4, this.viewportLayer.getColumnCount());
+        assertEquals(5, this.viewportLayer.getRowCount());
+        assertEquals(1, this.viewportLayer.getMinimumOriginColumnPosition());
+        assertEquals(0, this.viewportLayer.getMinimumOriginRowPosition());
+        assertEquals(100, this.viewportLayer.getMinimumOrigin().getX());
+        assertEquals(0, this.viewportLayer.getMinimumOrigin().getY());
 
         reset();
     }
@@ -582,51 +617,51 @@ public class CompositeFreezeLayerHideShowTest {
     @Test
     public void testFreezeHideShowColumnFrozenRegionMiddle() {
         // freeze the first 4 columns
-        compositeFreezeLayer.doCommand(new FreezeColumnCommand(
-                compositeFreezeLayer, 3));
+        this.compositeFreezeLayer.doCommand(
+                new FreezeColumnCommand(this.compositeFreezeLayer, 3));
 
-        assertEquals(4, freezeLayer.getColumnCount());
-        assertEquals(0, freezeLayer.getRowCount());
-        assertEquals(3, freezeLayer.getBottomRightPosition().columnPosition);
-        assertEquals(-1, freezeLayer.getBottomRightPosition().rowPosition);
+        assertEquals(4, this.freezeLayer.getColumnCount());
+        assertEquals(0, this.freezeLayer.getRowCount());
+        assertEquals(3, this.freezeLayer.getBottomRightPosition().columnPosition);
+        assertEquals(-1, this.freezeLayer.getBottomRightPosition().rowPosition);
 
-        assertEquals(1, viewportLayer.getColumnCount());
-        assertEquals(5, viewportLayer.getRowCount());
-        assertEquals(4, viewportLayer.getMinimumOriginColumnPosition());
-        assertEquals(0, viewportLayer.getMinimumOriginRowPosition());
-        assertEquals(400, viewportLayer.getMinimumOrigin().getX());
-        assertEquals(0, viewportLayer.getMinimumOrigin().getY());
+        assertEquals(1, this.viewportLayer.getColumnCount());
+        assertEquals(5, this.viewportLayer.getRowCount());
+        assertEquals(4, this.viewportLayer.getMinimumOriginColumnPosition());
+        assertEquals(0, this.viewportLayer.getMinimumOriginRowPosition());
+        assertEquals(400, this.viewportLayer.getMinimumOrigin().getX());
+        assertEquals(0, this.viewportLayer.getMinimumOrigin().getY());
 
         // hide column 1 and 2
-        compositeFreezeLayer.doCommand(new MultiColumnHideCommand(
-                compositeFreezeLayer, new int[] { 1, 2 }));
+        this.compositeFreezeLayer.doCommand(
+                new MultiColumnHideCommand(this.compositeFreezeLayer, new int[] { 1, 2 }));
 
-        assertEquals(2, freezeLayer.getColumnCount());
-        assertEquals(0, freezeLayer.getRowCount());
-        assertEquals(1, freezeLayer.getBottomRightPosition().columnPosition);
-        assertEquals(-1, freezeLayer.getBottomRightPosition().rowPosition);
+        assertEquals(2, this.freezeLayer.getColumnCount());
+        assertEquals(0, this.freezeLayer.getRowCount());
+        assertEquals(1, this.freezeLayer.getBottomRightPosition().columnPosition);
+        assertEquals(-1, this.freezeLayer.getBottomRightPosition().rowPosition);
 
-        assertEquals(1, viewportLayer.getColumnCount());
-        assertEquals(5, viewportLayer.getRowCount());
-        assertEquals(2, viewportLayer.getMinimumOriginColumnPosition());
-        assertEquals(0, viewportLayer.getMinimumOriginRowPosition());
-        assertEquals(200, viewportLayer.getMinimumOrigin().getX());
-        assertEquals(0, viewportLayer.getMinimumOrigin().getY());
+        assertEquals(1, this.viewportLayer.getColumnCount());
+        assertEquals(5, this.viewportLayer.getRowCount());
+        assertEquals(2, this.viewportLayer.getMinimumOriginColumnPosition());
+        assertEquals(0, this.viewportLayer.getMinimumOriginRowPosition());
+        assertEquals(200, this.viewportLayer.getMinimumOrigin().getX());
+        assertEquals(0, this.viewportLayer.getMinimumOrigin().getY());
 
         // show again
-        compositeFreezeLayer.doCommand(new ShowAllColumnsCommand());
+        this.compositeFreezeLayer.doCommand(new ShowAllColumnsCommand());
 
-        assertEquals(4, freezeLayer.getColumnCount());
-        assertEquals(0, freezeLayer.getRowCount());
-        assertEquals(3, freezeLayer.getBottomRightPosition().columnPosition);
-        assertEquals(-1, freezeLayer.getBottomRightPosition().rowPosition);
+        assertEquals(4, this.freezeLayer.getColumnCount());
+        assertEquals(0, this.freezeLayer.getRowCount());
+        assertEquals(3, this.freezeLayer.getBottomRightPosition().columnPosition);
+        assertEquals(-1, this.freezeLayer.getBottomRightPosition().rowPosition);
 
-        assertEquals(1, viewportLayer.getColumnCount());
-        assertEquals(5, viewportLayer.getRowCount());
-        assertEquals(4, viewportLayer.getMinimumOriginColumnPosition());
-        assertEquals(0, viewportLayer.getMinimumOriginRowPosition());
-        assertEquals(400, viewportLayer.getMinimumOrigin().getX());
-        assertEquals(0, viewportLayer.getMinimumOrigin().getY());
+        assertEquals(1, this.viewportLayer.getColumnCount());
+        assertEquals(5, this.viewportLayer.getRowCount());
+        assertEquals(4, this.viewportLayer.getMinimumOriginColumnPosition());
+        assertEquals(0, this.viewportLayer.getMinimumOriginRowPosition());
+        assertEquals(400, this.viewportLayer.getMinimumOrigin().getX());
+        assertEquals(0, this.viewportLayer.getMinimumOrigin().getY());
 
         reset();
     }
@@ -634,51 +669,51 @@ public class CompositeFreezeLayerHideShowTest {
     @Test
     public void testFreezeHideShowColumnBothRegionsViewportAll() {
         // freeze
-        compositeFreezeLayer.doCommand(new FreezeColumnCommand(
-                compositeFreezeLayer, 1));
+        this.compositeFreezeLayer.doCommand(
+                new FreezeColumnCommand(this.compositeFreezeLayer, 1));
 
-        assertEquals(2, freezeLayer.getColumnCount());
-        assertEquals(0, freezeLayer.getRowCount());
-        assertEquals(1, freezeLayer.getBottomRightPosition().columnPosition);
-        assertEquals(-1, freezeLayer.getBottomRightPosition().rowPosition);
+        assertEquals(2, this.freezeLayer.getColumnCount());
+        assertEquals(0, this.freezeLayer.getRowCount());
+        assertEquals(1, this.freezeLayer.getBottomRightPosition().columnPosition);
+        assertEquals(-1, this.freezeLayer.getBottomRightPosition().rowPosition);
 
-        assertEquals(3, viewportLayer.getColumnCount());
-        assertEquals(5, viewportLayer.getRowCount());
-        assertEquals(2, viewportLayer.getMinimumOriginColumnPosition());
-        assertEquals(0, viewportLayer.getMinimumOriginRowPosition());
-        assertEquals(200, viewportLayer.getMinimumOrigin().getX());
-        assertEquals(0, viewportLayer.getMinimumOrigin().getY());
+        assertEquals(3, this.viewportLayer.getColumnCount());
+        assertEquals(5, this.viewportLayer.getRowCount());
+        assertEquals(2, this.viewportLayer.getMinimumOriginColumnPosition());
+        assertEquals(0, this.viewportLayer.getMinimumOriginRowPosition());
+        assertEquals(200, this.viewportLayer.getMinimumOrigin().getX());
+        assertEquals(0, this.viewportLayer.getMinimumOrigin().getY());
 
         // hide
-        compositeFreezeLayer.doCommand(new MultiColumnHideCommand(
-                compositeFreezeLayer, new int[] { 1, 2, 3, 4 }));
+        this.compositeFreezeLayer.doCommand(
+                new MultiColumnHideCommand(this.compositeFreezeLayer, new int[] { 1, 2, 3, 4 }));
 
-        assertEquals(1, freezeLayer.getColumnCount());
-        assertEquals(0, freezeLayer.getRowCount());
-        assertEquals(0, freezeLayer.getBottomRightPosition().columnPosition);
-        assertEquals(-1, freezeLayer.getBottomRightPosition().rowPosition);
+        assertEquals(1, this.freezeLayer.getColumnCount());
+        assertEquals(0, this.freezeLayer.getRowCount());
+        assertEquals(0, this.freezeLayer.getBottomRightPosition().columnPosition);
+        assertEquals(-1, this.freezeLayer.getBottomRightPosition().rowPosition);
 
-        assertEquals(0, viewportLayer.getColumnCount());
-        assertEquals(5, viewportLayer.getRowCount());
-        assertEquals(-1, viewportLayer.getMinimumOriginColumnPosition());
-        assertEquals(0, viewportLayer.getMinimumOriginRowPosition());
-        assertEquals(100, viewportLayer.getMinimumOrigin().getX());
-        assertEquals(0, viewportLayer.getMinimumOrigin().getY());
+        assertEquals(0, this.viewportLayer.getColumnCount());
+        assertEquals(5, this.viewportLayer.getRowCount());
+        assertEquals(-1, this.viewportLayer.getMinimumOriginColumnPosition());
+        assertEquals(0, this.viewportLayer.getMinimumOriginRowPosition());
+        assertEquals(100, this.viewportLayer.getMinimumOrigin().getX());
+        assertEquals(0, this.viewportLayer.getMinimumOrigin().getY());
 
         // show again
-        compositeFreezeLayer.doCommand(new ShowAllColumnsCommand());
+        this.compositeFreezeLayer.doCommand(new ShowAllColumnsCommand());
 
-        assertEquals(1, freezeLayer.getColumnCount());
-        assertEquals(0, freezeLayer.getRowCount());
-        assertEquals(0, freezeLayer.getBottomRightPosition().columnPosition);
-        assertEquals(-1, freezeLayer.getBottomRightPosition().rowPosition);
+        assertEquals(1, this.freezeLayer.getColumnCount());
+        assertEquals(0, this.freezeLayer.getRowCount());
+        assertEquals(0, this.freezeLayer.getBottomRightPosition().columnPosition);
+        assertEquals(-1, this.freezeLayer.getBottomRightPosition().rowPosition);
 
-        assertEquals(4, viewportLayer.getColumnCount());
-        assertEquals(5, viewportLayer.getRowCount());
-        assertEquals(-1, viewportLayer.getMinimumOriginColumnPosition());
-        assertEquals(0, viewportLayer.getMinimumOriginRowPosition());
-        assertEquals(100, viewportLayer.getMinimumOrigin().getX());
-        assertEquals(0, viewportLayer.getMinimumOrigin().getY());
+        assertEquals(4, this.viewportLayer.getColumnCount());
+        assertEquals(5, this.viewportLayer.getRowCount());
+        assertEquals(-1, this.viewportLayer.getMinimumOriginColumnPosition());
+        assertEquals(0, this.viewportLayer.getMinimumOriginRowPosition());
+        assertEquals(100, this.viewportLayer.getMinimumOrigin().getX());
+        assertEquals(0, this.viewportLayer.getMinimumOrigin().getY());
 
         reset();
     }
@@ -686,51 +721,51 @@ public class CompositeFreezeLayerHideShowTest {
     @Test
     public void testFreezeHideShowColumnBothRegionsFreezeAll() {
         // freeze
-        compositeFreezeLayer.doCommand(new FreezeColumnCommand(
-                compositeFreezeLayer, 1));
+        this.compositeFreezeLayer.doCommand(
+                new FreezeColumnCommand(this.compositeFreezeLayer, 1));
 
-        assertEquals(2, freezeLayer.getColumnCount());
-        assertEquals(0, freezeLayer.getRowCount());
-        assertEquals(1, freezeLayer.getBottomRightPosition().columnPosition);
-        assertEquals(-1, freezeLayer.getBottomRightPosition().rowPosition);
+        assertEquals(2, this.freezeLayer.getColumnCount());
+        assertEquals(0, this.freezeLayer.getRowCount());
+        assertEquals(1, this.freezeLayer.getBottomRightPosition().columnPosition);
+        assertEquals(-1, this.freezeLayer.getBottomRightPosition().rowPosition);
 
-        assertEquals(3, viewportLayer.getColumnCount());
-        assertEquals(5, viewportLayer.getRowCount());
-        assertEquals(2, viewportLayer.getMinimumOriginColumnPosition());
-        assertEquals(0, viewportLayer.getMinimumOriginRowPosition());
-        assertEquals(200, viewportLayer.getMinimumOrigin().getX());
-        assertEquals(0, viewportLayer.getMinimumOrigin().getY());
+        assertEquals(3, this.viewportLayer.getColumnCount());
+        assertEquals(5, this.viewportLayer.getRowCount());
+        assertEquals(2, this.viewportLayer.getMinimumOriginColumnPosition());
+        assertEquals(0, this.viewportLayer.getMinimumOriginRowPosition());
+        assertEquals(200, this.viewportLayer.getMinimumOrigin().getX());
+        assertEquals(0, this.viewportLayer.getMinimumOrigin().getY());
 
         // hide
-        compositeFreezeLayer.doCommand(new MultiColumnHideCommand(
-                compositeFreezeLayer, new int[] { 0, 1, 2 }));
+        this.compositeFreezeLayer.doCommand(
+                new MultiColumnHideCommand(this.compositeFreezeLayer, new int[] { 0, 1, 2 }));
 
-        assertEquals(0, freezeLayer.getColumnCount());
-        assertEquals(0, freezeLayer.getRowCount());
-        assertEquals(-1, freezeLayer.getBottomRightPosition().columnPosition);
-        assertEquals(-1, freezeLayer.getBottomRightPosition().rowPosition);
+        assertEquals(0, this.freezeLayer.getColumnCount());
+        assertEquals(0, this.freezeLayer.getRowCount());
+        assertEquals(-1, this.freezeLayer.getBottomRightPosition().columnPosition);
+        assertEquals(-1, this.freezeLayer.getBottomRightPosition().rowPosition);
 
-        assertEquals(2, viewportLayer.getColumnCount());
-        assertEquals(5, viewportLayer.getRowCount());
-        assertEquals(0, viewportLayer.getMinimumOriginColumnPosition());
-        assertEquals(0, viewportLayer.getMinimumOriginRowPosition());
-        assertEquals(0, viewportLayer.getMinimumOrigin().getX());
-        assertEquals(0, viewportLayer.getMinimumOrigin().getY());
+        assertEquals(2, this.viewportLayer.getColumnCount());
+        assertEquals(5, this.viewportLayer.getRowCount());
+        assertEquals(0, this.viewportLayer.getMinimumOriginColumnPosition());
+        assertEquals(0, this.viewportLayer.getMinimumOriginRowPosition());
+        assertEquals(0, this.viewportLayer.getMinimumOrigin().getX());
+        assertEquals(0, this.viewportLayer.getMinimumOrigin().getY());
 
         // show again
-        compositeFreezeLayer.doCommand(new ShowAllColumnsCommand());
+        this.compositeFreezeLayer.doCommand(new ShowAllColumnsCommand());
 
-        assertEquals(0, freezeLayer.getColumnCount());
-        assertEquals(0, freezeLayer.getRowCount());
-        assertEquals(-1, freezeLayer.getBottomRightPosition().columnPosition);
-        assertEquals(-1, freezeLayer.getBottomRightPosition().rowPosition);
+        assertEquals(0, this.freezeLayer.getColumnCount());
+        assertEquals(0, this.freezeLayer.getRowCount());
+        assertEquals(-1, this.freezeLayer.getBottomRightPosition().columnPosition);
+        assertEquals(-1, this.freezeLayer.getBottomRightPosition().rowPosition);
 
-        assertEquals(5, viewportLayer.getColumnCount());
-        assertEquals(5, viewportLayer.getRowCount());
-        assertEquals(0, viewportLayer.getMinimumOriginColumnPosition());
-        assertEquals(0, viewportLayer.getMinimumOriginRowPosition());
-        assertEquals(0, viewportLayer.getMinimumOrigin().getX());
-        assertEquals(0, viewportLayer.getMinimumOrigin().getY());
+        assertEquals(5, this.viewportLayer.getColumnCount());
+        assertEquals(5, this.viewportLayer.getRowCount());
+        assertEquals(0, this.viewportLayer.getMinimumOriginColumnPosition());
+        assertEquals(0, this.viewportLayer.getMinimumOriginRowPosition());
+        assertEquals(0, this.viewportLayer.getMinimumOrigin().getX());
+        assertEquals(0, this.viewportLayer.getMinimumOrigin().getY());
 
         reset();
     }
@@ -738,51 +773,51 @@ public class CompositeFreezeLayerHideShowTest {
     @Test
     public void testFreezeHideShowColumnBothRegionsAll() {
         // freeze
-        compositeFreezeLayer.doCommand(new FreezeColumnCommand(
-                compositeFreezeLayer, 1));
+        this.compositeFreezeLayer.doCommand(
+                new FreezeColumnCommand(this.compositeFreezeLayer, 1));
 
-        assertEquals(2, freezeLayer.getColumnCount());
-        assertEquals(0, freezeLayer.getRowCount());
-        assertEquals(1, freezeLayer.getBottomRightPosition().columnPosition);
-        assertEquals(-1, freezeLayer.getBottomRightPosition().rowPosition);
+        assertEquals(2, this.freezeLayer.getColumnCount());
+        assertEquals(0, this.freezeLayer.getRowCount());
+        assertEquals(1, this.freezeLayer.getBottomRightPosition().columnPosition);
+        assertEquals(-1, this.freezeLayer.getBottomRightPosition().rowPosition);
 
-        assertEquals(3, viewportLayer.getColumnCount());
-        assertEquals(5, viewportLayer.getRowCount());
-        assertEquals(2, viewportLayer.getMinimumOriginColumnPosition());
-        assertEquals(0, viewportLayer.getMinimumOriginRowPosition());
-        assertEquals(200, viewportLayer.getMinimumOrigin().getX());
-        assertEquals(0, viewportLayer.getMinimumOrigin().getY());
+        assertEquals(3, this.viewportLayer.getColumnCount());
+        assertEquals(5, this.viewportLayer.getRowCount());
+        assertEquals(2, this.viewportLayer.getMinimumOriginColumnPosition());
+        assertEquals(0, this.viewportLayer.getMinimumOriginRowPosition());
+        assertEquals(200, this.viewportLayer.getMinimumOrigin().getX());
+        assertEquals(0, this.viewportLayer.getMinimumOrigin().getY());
 
         // hide
-        compositeFreezeLayer.doCommand(new MultiColumnHideCommand(
-                compositeFreezeLayer, new int[] { 0, 1, 2, 3, 4 }));
+        this.compositeFreezeLayer.doCommand(
+                new MultiColumnHideCommand(this.compositeFreezeLayer, new int[] { 0, 1, 2, 3, 4 }));
 
-        assertEquals(0, freezeLayer.getColumnCount());
-        assertEquals(0, freezeLayer.getRowCount());
-        assertEquals(-1, freezeLayer.getBottomRightPosition().columnPosition);
-        assertEquals(-1, freezeLayer.getBottomRightPosition().rowPosition);
+        assertEquals(0, this.freezeLayer.getColumnCount());
+        assertEquals(0, this.freezeLayer.getRowCount());
+        assertEquals(-1, this.freezeLayer.getBottomRightPosition().columnPosition);
+        assertEquals(-1, this.freezeLayer.getBottomRightPosition().rowPosition);
 
-        assertEquals(0, viewportLayer.getColumnCount());
-        assertEquals(5, viewportLayer.getRowCount());
-        assertEquals(0, viewportLayer.getMinimumOriginColumnPosition());
-        assertEquals(0, viewportLayer.getMinimumOriginRowPosition());
-        assertEquals(0, viewportLayer.getMinimumOrigin().getX());
-        assertEquals(0, viewportLayer.getMinimumOrigin().getY());
+        assertEquals(0, this.viewportLayer.getColumnCount());
+        assertEquals(5, this.viewportLayer.getRowCount());
+        assertEquals(0, this.viewportLayer.getMinimumOriginColumnPosition());
+        assertEquals(0, this.viewportLayer.getMinimumOriginRowPosition());
+        assertEquals(0, this.viewportLayer.getMinimumOrigin().getX());
+        assertEquals(0, this.viewportLayer.getMinimumOrigin().getY());
 
         // show again
-        compositeFreezeLayer.doCommand(new ShowAllColumnsCommand());
+        this.compositeFreezeLayer.doCommand(new ShowAllColumnsCommand());
 
-        assertEquals(0, freezeLayer.getColumnCount());
-        assertEquals(0, freezeLayer.getRowCount());
-        assertEquals(-1, freezeLayer.getBottomRightPosition().columnPosition);
-        assertEquals(-1, freezeLayer.getBottomRightPosition().rowPosition);
+        assertEquals(0, this.freezeLayer.getColumnCount());
+        assertEquals(0, this.freezeLayer.getRowCount());
+        assertEquals(-1, this.freezeLayer.getBottomRightPosition().columnPosition);
+        assertEquals(-1, this.freezeLayer.getBottomRightPosition().rowPosition);
 
-        assertEquals(5, viewportLayer.getColumnCount());
-        assertEquals(5, viewportLayer.getRowCount());
-        assertEquals(0, viewportLayer.getMinimumOriginColumnPosition());
-        assertEquals(0, viewportLayer.getMinimumOriginRowPosition());
-        assertEquals(0, viewportLayer.getMinimumOrigin().getX());
-        assertEquals(0, viewportLayer.getMinimumOrigin().getY());
+        assertEquals(5, this.viewportLayer.getColumnCount());
+        assertEquals(5, this.viewportLayer.getRowCount());
+        assertEquals(0, this.viewportLayer.getMinimumOriginColumnPosition());
+        assertEquals(0, this.viewportLayer.getMinimumOriginRowPosition());
+        assertEquals(0, this.viewportLayer.getMinimumOrigin().getX());
+        assertEquals(0, this.viewportLayer.getMinimumOrigin().getY());
 
         reset();
     }
@@ -792,51 +827,51 @@ public class CompositeFreezeLayerHideShowTest {
     @Test
     public void testFreezeHideShowRowFrozenRegion() {
         // freeze
-        compositeFreezeLayer.doCommand(new FreezeRowCommand(
-                compositeFreezeLayer, 1));
+        this.compositeFreezeLayer.doCommand(
+                new FreezeRowCommand(this.compositeFreezeLayer, 1));
 
-        assertEquals(0, freezeLayer.getColumnCount());
-        assertEquals(2, freezeLayer.getRowCount());
-        assertEquals(-1, freezeLayer.getBottomRightPosition().columnPosition);
-        assertEquals(1, freezeLayer.getBottomRightPosition().rowPosition);
+        assertEquals(0, this.freezeLayer.getColumnCount());
+        assertEquals(2, this.freezeLayer.getRowCount());
+        assertEquals(-1, this.freezeLayer.getBottomRightPosition().columnPosition);
+        assertEquals(1, this.freezeLayer.getBottomRightPosition().rowPosition);
 
-        assertEquals(5, viewportLayer.getColumnCount());
-        assertEquals(3, viewportLayer.getRowCount());
-        assertEquals(0, viewportLayer.getMinimumOriginColumnPosition());
-        assertEquals(2, viewportLayer.getMinimumOriginRowPosition());
-        assertEquals(0, viewportLayer.getMinimumOrigin().getX());
-        assertEquals(40, viewportLayer.getMinimumOrigin().getY());
+        assertEquals(5, this.viewportLayer.getColumnCount());
+        assertEquals(3, this.viewportLayer.getRowCount());
+        assertEquals(0, this.viewportLayer.getMinimumOriginColumnPosition());
+        assertEquals(2, this.viewportLayer.getMinimumOriginRowPosition());
+        assertEquals(0, this.viewportLayer.getMinimumOrigin().getX());
+        assertEquals(40, this.viewportLayer.getMinimumOrigin().getY());
 
         // hide
-        compositeFreezeLayer.doCommand(new RowHideCommand(compositeFreezeLayer,
+        this.compositeFreezeLayer.doCommand(new RowHideCommand(this.compositeFreezeLayer,
                 0));
 
-        assertEquals(0, freezeLayer.getColumnCount());
-        assertEquals(1, freezeLayer.getRowCount());
-        assertEquals(-1, freezeLayer.getBottomRightPosition().columnPosition);
-        assertEquals(0, freezeLayer.getBottomRightPosition().rowPosition);
+        assertEquals(0, this.freezeLayer.getColumnCount());
+        assertEquals(1, this.freezeLayer.getRowCount());
+        assertEquals(-1, this.freezeLayer.getBottomRightPosition().columnPosition);
+        assertEquals(0, this.freezeLayer.getBottomRightPosition().rowPosition);
 
-        assertEquals(5, viewportLayer.getColumnCount());
-        assertEquals(3, viewportLayer.getRowCount());
-        assertEquals(0, viewportLayer.getMinimumOriginColumnPosition());
-        assertEquals(1, viewportLayer.getMinimumOriginRowPosition());
-        assertEquals(0, viewportLayer.getMinimumOrigin().getX());
-        assertEquals(20, viewportLayer.getMinimumOrigin().getY());
+        assertEquals(5, this.viewportLayer.getColumnCount());
+        assertEquals(3, this.viewportLayer.getRowCount());
+        assertEquals(0, this.viewportLayer.getMinimumOriginColumnPosition());
+        assertEquals(1, this.viewportLayer.getMinimumOriginRowPosition());
+        assertEquals(0, this.viewportLayer.getMinimumOrigin().getX());
+        assertEquals(20, this.viewportLayer.getMinimumOrigin().getY());
 
         // show again
-        compositeFreezeLayer.doCommand(new ShowAllRowsCommand());
+        this.compositeFreezeLayer.doCommand(new ShowAllRowsCommand());
 
-        assertEquals(0, freezeLayer.getColumnCount());
-        assertEquals(2, freezeLayer.getRowCount());
-        assertEquals(-1, freezeLayer.getBottomRightPosition().columnPosition);
-        assertEquals(1, freezeLayer.getBottomRightPosition().rowPosition);
+        assertEquals(0, this.freezeLayer.getColumnCount());
+        assertEquals(2, this.freezeLayer.getRowCount());
+        assertEquals(-1, this.freezeLayer.getBottomRightPosition().columnPosition);
+        assertEquals(1, this.freezeLayer.getBottomRightPosition().rowPosition);
 
-        assertEquals(5, viewportLayer.getColumnCount());
-        assertEquals(3, viewportLayer.getRowCount());
-        assertEquals(0, viewportLayer.getMinimumOriginColumnPosition());
-        assertEquals(2, viewportLayer.getMinimumOriginRowPosition());
-        assertEquals(0, viewportLayer.getMinimumOrigin().getX());
-        assertEquals(40, viewportLayer.getMinimumOrigin().getY());
+        assertEquals(5, this.viewportLayer.getColumnCount());
+        assertEquals(3, this.viewportLayer.getRowCount());
+        assertEquals(0, this.viewportLayer.getMinimumOriginColumnPosition());
+        assertEquals(2, this.viewportLayer.getMinimumOriginRowPosition());
+        assertEquals(0, this.viewportLayer.getMinimumOrigin().getX());
+        assertEquals(40, this.viewportLayer.getMinimumOrigin().getY());
 
         reset();
     }
@@ -844,52 +879,52 @@ public class CompositeFreezeLayerHideShowTest {
     @Test
     public void testFreezeHideShowRowFrozenRegionEdge() {
         // freeze
-        compositeFreezeLayer.doCommand(new FreezeRowCommand(
-                compositeFreezeLayer, 1));
+        this.compositeFreezeLayer.doCommand(
+                new FreezeRowCommand(this.compositeFreezeLayer, 1));
 
-        assertEquals(0, freezeLayer.getColumnCount());
-        assertEquals(2, freezeLayer.getRowCount());
-        assertEquals(-1, freezeLayer.getBottomRightPosition().columnPosition);
-        assertEquals(1, freezeLayer.getBottomRightPosition().rowPosition);
+        assertEquals(0, this.freezeLayer.getColumnCount());
+        assertEquals(2, this.freezeLayer.getRowCount());
+        assertEquals(-1, this.freezeLayer.getBottomRightPosition().columnPosition);
+        assertEquals(1, this.freezeLayer.getBottomRightPosition().rowPosition);
 
-        assertEquals(5, viewportLayer.getColumnCount());
-        assertEquals(3, viewportLayer.getRowCount());
-        assertEquals(0, viewportLayer.getMinimumOriginColumnPosition());
-        assertEquals(2, viewportLayer.getMinimumOriginRowPosition());
-        assertEquals(0, viewportLayer.getMinimumOrigin().getX());
-        assertEquals(40, viewportLayer.getMinimumOrigin().getY());
+        assertEquals(5, this.viewportLayer.getColumnCount());
+        assertEquals(3, this.viewportLayer.getRowCount());
+        assertEquals(0, this.viewportLayer.getMinimumOriginColumnPosition());
+        assertEquals(2, this.viewportLayer.getMinimumOriginRowPosition());
+        assertEquals(0, this.viewportLayer.getMinimumOrigin().getX());
+        assertEquals(40, this.viewportLayer.getMinimumOrigin().getY());
 
         // hide
-        compositeFreezeLayer.doCommand(new RowHideCommand(compositeFreezeLayer,
+        this.compositeFreezeLayer.doCommand(new RowHideCommand(this.compositeFreezeLayer,
                 1));
 
-        assertEquals(0, freezeLayer.getColumnCount());
-        assertEquals(1, freezeLayer.getRowCount());
-        assertEquals(-1, freezeLayer.getBottomRightPosition().columnPosition);
-        assertEquals(0, freezeLayer.getBottomRightPosition().rowPosition);
+        assertEquals(0, this.freezeLayer.getColumnCount());
+        assertEquals(1, this.freezeLayer.getRowCount());
+        assertEquals(-1, this.freezeLayer.getBottomRightPosition().columnPosition);
+        assertEquals(0, this.freezeLayer.getBottomRightPosition().rowPosition);
 
-        assertEquals(5, viewportLayer.getColumnCount());
-        assertEquals(3, viewportLayer.getRowCount());
-        assertEquals(0, viewportLayer.getMinimumOriginColumnPosition());
-        assertEquals(1, viewportLayer.getMinimumOriginRowPosition());
-        assertEquals(0, viewportLayer.getMinimumOrigin().getX());
-        assertEquals(20, viewportLayer.getMinimumOrigin().getY());
+        assertEquals(5, this.viewportLayer.getColumnCount());
+        assertEquals(3, this.viewportLayer.getRowCount());
+        assertEquals(0, this.viewportLayer.getMinimumOriginColumnPosition());
+        assertEquals(1, this.viewportLayer.getMinimumOriginRowPosition());
+        assertEquals(0, this.viewportLayer.getMinimumOrigin().getX());
+        assertEquals(20, this.viewportLayer.getMinimumOrigin().getY());
 
         // show again - since edge is shown again the frozen region is not
         // extended
-        compositeFreezeLayer.doCommand(new ShowAllRowsCommand());
+        this.compositeFreezeLayer.doCommand(new ShowAllRowsCommand());
 
-        assertEquals(0, freezeLayer.getColumnCount());
-        assertEquals(1, freezeLayer.getRowCount());
-        assertEquals(-1, freezeLayer.getBottomRightPosition().columnPosition);
-        assertEquals(0, freezeLayer.getBottomRightPosition().rowPosition);
+        assertEquals(0, this.freezeLayer.getColumnCount());
+        assertEquals(1, this.freezeLayer.getRowCount());
+        assertEquals(-1, this.freezeLayer.getBottomRightPosition().columnPosition);
+        assertEquals(0, this.freezeLayer.getBottomRightPosition().rowPosition);
 
-        assertEquals(5, viewportLayer.getColumnCount());
-        assertEquals(4, viewportLayer.getRowCount());
-        assertEquals(0, viewportLayer.getMinimumOriginColumnPosition());
-        assertEquals(1, viewportLayer.getMinimumOriginRowPosition());
-        assertEquals(0, viewportLayer.getMinimumOrigin().getX());
-        assertEquals(20, viewportLayer.getMinimumOrigin().getY());
+        assertEquals(5, this.viewportLayer.getColumnCount());
+        assertEquals(4, this.viewportLayer.getRowCount());
+        assertEquals(0, this.viewportLayer.getMinimumOriginColumnPosition());
+        assertEquals(1, this.viewportLayer.getMinimumOriginRowPosition());
+        assertEquals(0, this.viewportLayer.getMinimumOrigin().getX());
+        assertEquals(20, this.viewportLayer.getMinimumOrigin().getY());
 
         reset();
     }
@@ -897,51 +932,51 @@ public class CompositeFreezeLayerHideShowTest {
     @Test
     public void testFreezeHideShowRowAllFrozenRegion() {
         // freeze
-        compositeFreezeLayer.doCommand(new FreezeRowCommand(
-                compositeFreezeLayer, 1));
+        this.compositeFreezeLayer.doCommand(
+                new FreezeRowCommand(this.compositeFreezeLayer, 1));
 
-        assertEquals(0, freezeLayer.getColumnCount());
-        assertEquals(2, freezeLayer.getRowCount());
-        assertEquals(-1, freezeLayer.getBottomRightPosition().columnPosition);
-        assertEquals(1, freezeLayer.getBottomRightPosition().rowPosition);
+        assertEquals(0, this.freezeLayer.getColumnCount());
+        assertEquals(2, this.freezeLayer.getRowCount());
+        assertEquals(-1, this.freezeLayer.getBottomRightPosition().columnPosition);
+        assertEquals(1, this.freezeLayer.getBottomRightPosition().rowPosition);
 
-        assertEquals(5, viewportLayer.getColumnCount());
-        assertEquals(3, viewportLayer.getRowCount());
-        assertEquals(0, viewportLayer.getMinimumOriginColumnPosition());
-        assertEquals(2, viewportLayer.getMinimumOriginRowPosition());
-        assertEquals(0, viewportLayer.getMinimumOrigin().getX());
-        assertEquals(40, viewportLayer.getMinimumOrigin().getY());
+        assertEquals(5, this.viewportLayer.getColumnCount());
+        assertEquals(3, this.viewportLayer.getRowCount());
+        assertEquals(0, this.viewportLayer.getMinimumOriginColumnPosition());
+        assertEquals(2, this.viewportLayer.getMinimumOriginRowPosition());
+        assertEquals(0, this.viewportLayer.getMinimumOrigin().getX());
+        assertEquals(40, this.viewportLayer.getMinimumOrigin().getY());
 
         // hide
-        compositeFreezeLayer.doCommand(new MultiRowHideCommand(
-                compositeFreezeLayer, new int[] { 0, 1 }));
+        this.compositeFreezeLayer.doCommand(
+                new MultiRowHideCommand(this.compositeFreezeLayer, new int[] { 0, 1 }));
 
-        assertEquals(0, freezeLayer.getColumnCount());
-        assertEquals(0, freezeLayer.getRowCount());
-        assertEquals(-1, freezeLayer.getBottomRightPosition().columnPosition);
-        assertEquals(-1, freezeLayer.getBottomRightPosition().rowPosition);
+        assertEquals(0, this.freezeLayer.getColumnCount());
+        assertEquals(0, this.freezeLayer.getRowCount());
+        assertEquals(-1, this.freezeLayer.getBottomRightPosition().columnPosition);
+        assertEquals(-1, this.freezeLayer.getBottomRightPosition().rowPosition);
 
-        assertEquals(5, viewportLayer.getColumnCount());
-        assertEquals(3, viewportLayer.getRowCount());
-        assertEquals(0, viewportLayer.getMinimumOriginColumnPosition());
-        assertEquals(0, viewportLayer.getMinimumOriginRowPosition());
-        assertEquals(0, viewportLayer.getMinimumOrigin().getX());
-        assertEquals(0, viewportLayer.getMinimumOrigin().getY());
+        assertEquals(5, this.viewportLayer.getColumnCount());
+        assertEquals(3, this.viewportLayer.getRowCount());
+        assertEquals(0, this.viewportLayer.getMinimumOriginColumnPosition());
+        assertEquals(0, this.viewportLayer.getMinimumOriginRowPosition());
+        assertEquals(0, this.viewportLayer.getMinimumOrigin().getX());
+        assertEquals(0, this.viewportLayer.getMinimumOrigin().getY());
 
         // show again
-        compositeFreezeLayer.doCommand(new ShowAllRowsCommand());
+        this.compositeFreezeLayer.doCommand(new ShowAllRowsCommand());
 
-        assertEquals(0, freezeLayer.getColumnCount());
-        assertEquals(0, freezeLayer.getRowCount());
-        assertEquals(-1, freezeLayer.getBottomRightPosition().columnPosition);
-        assertEquals(-1, freezeLayer.getBottomRightPosition().rowPosition);
+        assertEquals(0, this.freezeLayer.getColumnCount());
+        assertEquals(0, this.freezeLayer.getRowCount());
+        assertEquals(-1, this.freezeLayer.getBottomRightPosition().columnPosition);
+        assertEquals(-1, this.freezeLayer.getBottomRightPosition().rowPosition);
 
-        assertEquals(5, viewportLayer.getColumnCount());
-        assertEquals(5, viewportLayer.getRowCount());
-        assertEquals(0, viewportLayer.getMinimumOriginColumnPosition());
-        assertEquals(0, viewportLayer.getMinimumOriginRowPosition());
-        assertEquals(0, viewportLayer.getMinimumOrigin().getX());
-        assertEquals(0, viewportLayer.getMinimumOrigin().getY());
+        assertEquals(5, this.viewportLayer.getColumnCount());
+        assertEquals(5, this.viewportLayer.getRowCount());
+        assertEquals(0, this.viewportLayer.getMinimumOriginColumnPosition());
+        assertEquals(0, this.viewportLayer.getMinimumOriginRowPosition());
+        assertEquals(0, this.viewportLayer.getMinimumOrigin().getX());
+        assertEquals(0, this.viewportLayer.getMinimumOrigin().getY());
 
         reset();
     }
@@ -949,51 +984,51 @@ public class CompositeFreezeLayerHideShowTest {
     @Test
     public void testFreezeHideShowRowViewportRegion() {
         // freeze
-        compositeFreezeLayer.doCommand(new FreezeRowCommand(
-                compositeFreezeLayer, 1));
+        this.compositeFreezeLayer.doCommand(
+                new FreezeRowCommand(this.compositeFreezeLayer, 1));
 
-        assertEquals(0, freezeLayer.getColumnCount());
-        assertEquals(2, freezeLayer.getRowCount());
-        assertEquals(-1, freezeLayer.getBottomRightPosition().columnPosition);
-        assertEquals(1, freezeLayer.getBottomRightPosition().rowPosition);
+        assertEquals(0, this.freezeLayer.getColumnCount());
+        assertEquals(2, this.freezeLayer.getRowCount());
+        assertEquals(-1, this.freezeLayer.getBottomRightPosition().columnPosition);
+        assertEquals(1, this.freezeLayer.getBottomRightPosition().rowPosition);
 
-        assertEquals(5, viewportLayer.getColumnCount());
-        assertEquals(3, viewportLayer.getRowCount());
-        assertEquals(0, viewportLayer.getMinimumOriginColumnPosition());
-        assertEquals(2, viewportLayer.getMinimumOriginRowPosition());
-        assertEquals(0, viewportLayer.getMinimumOrigin().getX());
-        assertEquals(40, viewportLayer.getMinimumOrigin().getY());
+        assertEquals(5, this.viewportLayer.getColumnCount());
+        assertEquals(3, this.viewportLayer.getRowCount());
+        assertEquals(0, this.viewportLayer.getMinimumOriginColumnPosition());
+        assertEquals(2, this.viewportLayer.getMinimumOriginRowPosition());
+        assertEquals(0, this.viewportLayer.getMinimumOrigin().getX());
+        assertEquals(40, this.viewportLayer.getMinimumOrigin().getY());
 
         // hide
-        compositeFreezeLayer.doCommand(new RowHideCommand(compositeFreezeLayer,
+        this.compositeFreezeLayer.doCommand(new RowHideCommand(this.compositeFreezeLayer,
                 3));
 
-        assertEquals(0, freezeLayer.getColumnCount());
-        assertEquals(2, freezeLayer.getRowCount());
-        assertEquals(-1, freezeLayer.getBottomRightPosition().columnPosition);
-        assertEquals(1, freezeLayer.getBottomRightPosition().rowPosition);
+        assertEquals(0, this.freezeLayer.getColumnCount());
+        assertEquals(2, this.freezeLayer.getRowCount());
+        assertEquals(-1, this.freezeLayer.getBottomRightPosition().columnPosition);
+        assertEquals(1, this.freezeLayer.getBottomRightPosition().rowPosition);
 
-        assertEquals(5, viewportLayer.getColumnCount());
-        assertEquals(2, viewportLayer.getRowCount());
-        assertEquals(0, viewportLayer.getMinimumOriginColumnPosition());
-        assertEquals(2, viewportLayer.getMinimumOriginRowPosition());
-        assertEquals(0, viewportLayer.getMinimumOrigin().getX());
-        assertEquals(40, viewportLayer.getMinimumOrigin().getY());
+        assertEquals(5, this.viewportLayer.getColumnCount());
+        assertEquals(2, this.viewportLayer.getRowCount());
+        assertEquals(0, this.viewportLayer.getMinimumOriginColumnPosition());
+        assertEquals(2, this.viewportLayer.getMinimumOriginRowPosition());
+        assertEquals(0, this.viewportLayer.getMinimumOrigin().getX());
+        assertEquals(40, this.viewportLayer.getMinimumOrigin().getY());
 
         // show again
-        compositeFreezeLayer.doCommand(new ShowAllRowsCommand());
+        this.compositeFreezeLayer.doCommand(new ShowAllRowsCommand());
 
-        assertEquals(0, freezeLayer.getColumnCount());
-        assertEquals(2, freezeLayer.getRowCount());
-        assertEquals(-1, freezeLayer.getBottomRightPosition().columnPosition);
-        assertEquals(1, freezeLayer.getBottomRightPosition().rowPosition);
+        assertEquals(0, this.freezeLayer.getColumnCount());
+        assertEquals(2, this.freezeLayer.getRowCount());
+        assertEquals(-1, this.freezeLayer.getBottomRightPosition().columnPosition);
+        assertEquals(1, this.freezeLayer.getBottomRightPosition().rowPosition);
 
-        assertEquals(5, viewportLayer.getColumnCount());
-        assertEquals(3, viewportLayer.getRowCount());
-        assertEquals(0, viewportLayer.getMinimumOriginColumnPosition());
-        assertEquals(2, viewportLayer.getMinimumOriginRowPosition());
-        assertEquals(0, viewportLayer.getMinimumOrigin().getX());
-        assertEquals(40, viewportLayer.getMinimumOrigin().getY());
+        assertEquals(5, this.viewportLayer.getColumnCount());
+        assertEquals(3, this.viewportLayer.getRowCount());
+        assertEquals(0, this.viewportLayer.getMinimumOriginColumnPosition());
+        assertEquals(2, this.viewportLayer.getMinimumOriginRowPosition());
+        assertEquals(0, this.viewportLayer.getMinimumOrigin().getX());
+        assertEquals(40, this.viewportLayer.getMinimumOrigin().getY());
 
         reset();
     }
@@ -1001,51 +1036,51 @@ public class CompositeFreezeLayerHideShowTest {
     @Test
     public void testFreezeHideShowRowViewportRegionEdge() {
         // freeze
-        compositeFreezeLayer.doCommand(new FreezeRowCommand(
-                compositeFreezeLayer, 1));
+        this.compositeFreezeLayer.doCommand(
+                new FreezeRowCommand(this.compositeFreezeLayer, 1));
 
-        assertEquals(0, freezeLayer.getColumnCount());
-        assertEquals(2, freezeLayer.getRowCount());
-        assertEquals(-1, freezeLayer.getBottomRightPosition().columnPosition);
-        assertEquals(1, freezeLayer.getBottomRightPosition().rowPosition);
+        assertEquals(0, this.freezeLayer.getColumnCount());
+        assertEquals(2, this.freezeLayer.getRowCount());
+        assertEquals(-1, this.freezeLayer.getBottomRightPosition().columnPosition);
+        assertEquals(1, this.freezeLayer.getBottomRightPosition().rowPosition);
 
-        assertEquals(5, viewportLayer.getColumnCount());
-        assertEquals(3, viewportLayer.getRowCount());
-        assertEquals(0, viewportLayer.getMinimumOriginColumnPosition());
-        assertEquals(2, viewportLayer.getMinimumOriginRowPosition());
-        assertEquals(0, viewportLayer.getMinimumOrigin().getX());
-        assertEquals(40, viewportLayer.getMinimumOrigin().getY());
+        assertEquals(5, this.viewportLayer.getColumnCount());
+        assertEquals(3, this.viewportLayer.getRowCount());
+        assertEquals(0, this.viewportLayer.getMinimumOriginColumnPosition());
+        assertEquals(2, this.viewportLayer.getMinimumOriginRowPosition());
+        assertEquals(0, this.viewportLayer.getMinimumOrigin().getX());
+        assertEquals(40, this.viewportLayer.getMinimumOrigin().getY());
 
         // hide
-        compositeFreezeLayer.doCommand(new RowHideCommand(compositeFreezeLayer,
-                2));
+        this.compositeFreezeLayer.doCommand(
+                new RowHideCommand(this.compositeFreezeLayer, 2));
 
-        assertEquals(0, freezeLayer.getColumnCount());
-        assertEquals(2, freezeLayer.getRowCount());
-        assertEquals(-1, freezeLayer.getBottomRightPosition().columnPosition);
-        assertEquals(1, freezeLayer.getBottomRightPosition().rowPosition);
+        assertEquals(0, this.freezeLayer.getColumnCount());
+        assertEquals(2, this.freezeLayer.getRowCount());
+        assertEquals(-1, this.freezeLayer.getBottomRightPosition().columnPosition);
+        assertEquals(1, this.freezeLayer.getBottomRightPosition().rowPosition);
 
-        assertEquals(5, viewportLayer.getColumnCount());
-        assertEquals(2, viewportLayer.getRowCount());
-        assertEquals(0, viewportLayer.getMinimumOriginColumnPosition());
-        assertEquals(2, viewportLayer.getMinimumOriginRowPosition());
-        assertEquals(0, viewportLayer.getMinimumOrigin().getX());
-        assertEquals(40, viewportLayer.getMinimumOrigin().getY());
+        assertEquals(5, this.viewportLayer.getColumnCount());
+        assertEquals(2, this.viewportLayer.getRowCount());
+        assertEquals(0, this.viewportLayer.getMinimumOriginColumnPosition());
+        assertEquals(2, this.viewportLayer.getMinimumOriginRowPosition());
+        assertEquals(0, this.viewportLayer.getMinimumOrigin().getX());
+        assertEquals(40, this.viewportLayer.getMinimumOrigin().getY());
 
         // show again
-        compositeFreezeLayer.doCommand(new ShowAllRowsCommand());
+        this.compositeFreezeLayer.doCommand(new ShowAllRowsCommand());
 
-        assertEquals(0, freezeLayer.getColumnCount());
-        assertEquals(2, freezeLayer.getRowCount());
-        assertEquals(-1, freezeLayer.getBottomRightPosition().columnPosition);
-        assertEquals(1, freezeLayer.getBottomRightPosition().rowPosition);
+        assertEquals(0, this.freezeLayer.getColumnCount());
+        assertEquals(2, this.freezeLayer.getRowCount());
+        assertEquals(-1, this.freezeLayer.getBottomRightPosition().columnPosition);
+        assertEquals(1, this.freezeLayer.getBottomRightPosition().rowPosition);
 
-        assertEquals(5, viewportLayer.getColumnCount());
-        assertEquals(3, viewportLayer.getRowCount());
-        assertEquals(0, viewportLayer.getMinimumOriginColumnPosition());
-        assertEquals(2, viewportLayer.getMinimumOriginRowPosition());
-        assertEquals(0, viewportLayer.getMinimumOrigin().getX());
-        assertEquals(40, viewportLayer.getMinimumOrigin().getY());
+        assertEquals(5, this.viewportLayer.getColumnCount());
+        assertEquals(3, this.viewportLayer.getRowCount());
+        assertEquals(0, this.viewportLayer.getMinimumOriginColumnPosition());
+        assertEquals(2, this.viewportLayer.getMinimumOriginRowPosition());
+        assertEquals(0, this.viewportLayer.getMinimumOrigin().getX());
+        assertEquals(40, this.viewportLayer.getMinimumOrigin().getY());
 
         reset();
     }
@@ -1053,51 +1088,51 @@ public class CompositeFreezeLayerHideShowTest {
     @Test
     public void testFreezeHideShowRowAllViewportRegion() {
         // freeze
-        compositeFreezeLayer.doCommand(new FreezeRowCommand(
-                compositeFreezeLayer, 1));
+        this.compositeFreezeLayer.doCommand(
+                new FreezeRowCommand(this.compositeFreezeLayer, 1));
 
-        assertEquals(0, freezeLayer.getColumnCount());
-        assertEquals(2, freezeLayer.getRowCount());
-        assertEquals(-1, freezeLayer.getBottomRightPosition().columnPosition);
-        assertEquals(1, freezeLayer.getBottomRightPosition().rowPosition);
+        assertEquals(0, this.freezeLayer.getColumnCount());
+        assertEquals(2, this.freezeLayer.getRowCount());
+        assertEquals(-1, this.freezeLayer.getBottomRightPosition().columnPosition);
+        assertEquals(1, this.freezeLayer.getBottomRightPosition().rowPosition);
 
-        assertEquals(5, viewportLayer.getColumnCount());
-        assertEquals(3, viewportLayer.getRowCount());
-        assertEquals(0, viewportLayer.getMinimumOriginColumnPosition());
-        assertEquals(2, viewportLayer.getMinimumOriginRowPosition());
-        assertEquals(0, viewportLayer.getMinimumOrigin().getX());
-        assertEquals(40, viewportLayer.getMinimumOrigin().getY());
+        assertEquals(5, this.viewportLayer.getColumnCount());
+        assertEquals(3, this.viewportLayer.getRowCount());
+        assertEquals(0, this.viewportLayer.getMinimumOriginColumnPosition());
+        assertEquals(2, this.viewportLayer.getMinimumOriginRowPosition());
+        assertEquals(0, this.viewportLayer.getMinimumOrigin().getX());
+        assertEquals(40, this.viewportLayer.getMinimumOrigin().getY());
 
         // hide
-        compositeFreezeLayer.doCommand(new MultiRowHideCommand(
-                compositeFreezeLayer, new int[] { 2, 3, 4 }));
+        this.compositeFreezeLayer.doCommand(
+                new MultiRowHideCommand(this.compositeFreezeLayer, new int[] { 2, 3, 4 }));
 
-        assertEquals(0, freezeLayer.getColumnCount());
-        assertEquals(2, freezeLayer.getRowCount());
-        assertEquals(-1, freezeLayer.getBottomRightPosition().columnPosition);
-        assertEquals(1, freezeLayer.getBottomRightPosition().rowPosition);
+        assertEquals(0, this.freezeLayer.getColumnCount());
+        assertEquals(2, this.freezeLayer.getRowCount());
+        assertEquals(-1, this.freezeLayer.getBottomRightPosition().columnPosition);
+        assertEquals(1, this.freezeLayer.getBottomRightPosition().rowPosition);
 
-        assertEquals(5, viewportLayer.getColumnCount());
-        assertEquals(0, viewportLayer.getRowCount());
-        assertEquals(0, viewportLayer.getMinimumOriginColumnPosition());
-        assertEquals(2, viewportLayer.getMinimumOriginRowPosition());
-        assertEquals(0, viewportLayer.getMinimumOrigin().getX());
-        assertEquals(40, viewportLayer.getMinimumOrigin().getY());
+        assertEquals(5, this.viewportLayer.getColumnCount());
+        assertEquals(0, this.viewportLayer.getRowCount());
+        assertEquals(0, this.viewportLayer.getMinimumOriginColumnPosition());
+        assertEquals(2, this.viewportLayer.getMinimumOriginRowPosition());
+        assertEquals(0, this.viewportLayer.getMinimumOrigin().getX());
+        assertEquals(40, this.viewportLayer.getMinimumOrigin().getY());
 
         // show again
-        compositeFreezeLayer.doCommand(new ShowAllRowsCommand());
+        this.compositeFreezeLayer.doCommand(new ShowAllRowsCommand());
 
-        assertEquals(0, freezeLayer.getColumnCount());
-        assertEquals(2, freezeLayer.getRowCount());
-        assertEquals(-1, freezeLayer.getBottomRightPosition().columnPosition);
-        assertEquals(1, freezeLayer.getBottomRightPosition().rowPosition);
+        assertEquals(0, this.freezeLayer.getColumnCount());
+        assertEquals(2, this.freezeLayer.getRowCount());
+        assertEquals(-1, this.freezeLayer.getBottomRightPosition().columnPosition);
+        assertEquals(1, this.freezeLayer.getBottomRightPosition().rowPosition);
 
-        assertEquals(5, viewportLayer.getColumnCount());
-        assertEquals(3, viewportLayer.getRowCount());
-        assertEquals(0, viewportLayer.getMinimumOriginColumnPosition());
-        assertEquals(2, viewportLayer.getMinimumOriginRowPosition());
-        assertEquals(0, viewportLayer.getMinimumOrigin().getX());
-        assertEquals(40, viewportLayer.getMinimumOrigin().getY());
+        assertEquals(5, this.viewportLayer.getColumnCount());
+        assertEquals(3, this.viewportLayer.getRowCount());
+        assertEquals(0, this.viewportLayer.getMinimumOriginColumnPosition());
+        assertEquals(2, this.viewportLayer.getMinimumOriginRowPosition());
+        assertEquals(0, this.viewportLayer.getMinimumOrigin().getX());
+        assertEquals(40, this.viewportLayer.getMinimumOrigin().getY());
 
         reset();
     }
@@ -1105,51 +1140,51 @@ public class CompositeFreezeLayerHideShowTest {
     @Test
     public void testFreezeHideShowRowBothRegions() {
         // freeze
-        compositeFreezeLayer.doCommand(new FreezeRowCommand(
-                compositeFreezeLayer, 1));
+        this.compositeFreezeLayer.doCommand(
+                new FreezeRowCommand(this.compositeFreezeLayer, 1));
 
-        assertEquals(0, freezeLayer.getColumnCount());
-        assertEquals(2, freezeLayer.getRowCount());
-        assertEquals(-1, freezeLayer.getBottomRightPosition().columnPosition);
-        assertEquals(1, freezeLayer.getBottomRightPosition().rowPosition);
+        assertEquals(0, this.freezeLayer.getColumnCount());
+        assertEquals(2, this.freezeLayer.getRowCount());
+        assertEquals(-1, this.freezeLayer.getBottomRightPosition().columnPosition);
+        assertEquals(1, this.freezeLayer.getBottomRightPosition().rowPosition);
 
-        assertEquals(5, viewportLayer.getColumnCount());
-        assertEquals(3, viewportLayer.getRowCount());
-        assertEquals(0, viewportLayer.getMinimumOriginColumnPosition());
-        assertEquals(2, viewportLayer.getMinimumOriginRowPosition());
-        assertEquals(0, viewportLayer.getMinimumOrigin().getX());
-        assertEquals(40, viewportLayer.getMinimumOrigin().getY());
+        assertEquals(5, this.viewportLayer.getColumnCount());
+        assertEquals(3, this.viewportLayer.getRowCount());
+        assertEquals(0, this.viewportLayer.getMinimumOriginColumnPosition());
+        assertEquals(2, this.viewportLayer.getMinimumOriginRowPosition());
+        assertEquals(0, this.viewportLayer.getMinimumOrigin().getX());
+        assertEquals(40, this.viewportLayer.getMinimumOrigin().getY());
 
         // hide
-        compositeFreezeLayer.doCommand(new MultiRowHideCommand(
-                compositeFreezeLayer, new int[] { 0, 3 }));
+        this.compositeFreezeLayer.doCommand(
+                new MultiRowHideCommand(this.compositeFreezeLayer, new int[] { 0, 3 }));
 
-        assertEquals(0, freezeLayer.getColumnCount());
-        assertEquals(1, freezeLayer.getRowCount());
-        assertEquals(-1, freezeLayer.getBottomRightPosition().columnPosition);
-        assertEquals(0, freezeLayer.getBottomRightPosition().rowPosition);
+        assertEquals(0, this.freezeLayer.getColumnCount());
+        assertEquals(1, this.freezeLayer.getRowCount());
+        assertEquals(-1, this.freezeLayer.getBottomRightPosition().columnPosition);
+        assertEquals(0, this.freezeLayer.getBottomRightPosition().rowPosition);
 
-        assertEquals(5, viewportLayer.getColumnCount());
-        assertEquals(2, viewportLayer.getRowCount());
-        assertEquals(0, viewportLayer.getMinimumOriginColumnPosition());
-        assertEquals(1, viewportLayer.getMinimumOriginRowPosition());
-        assertEquals(0, viewportLayer.getMinimumOrigin().getX());
-        assertEquals(20, viewportLayer.getMinimumOrigin().getY());
+        assertEquals(5, this.viewportLayer.getColumnCount());
+        assertEquals(2, this.viewportLayer.getRowCount());
+        assertEquals(0, this.viewportLayer.getMinimumOriginColumnPosition());
+        assertEquals(1, this.viewportLayer.getMinimumOriginRowPosition());
+        assertEquals(0, this.viewportLayer.getMinimumOrigin().getX());
+        assertEquals(20, this.viewportLayer.getMinimumOrigin().getY());
 
         // show again
-        compositeFreezeLayer.doCommand(new ShowAllRowsCommand());
+        this.compositeFreezeLayer.doCommand(new ShowAllRowsCommand());
 
-        assertEquals(0, freezeLayer.getColumnCount());
-        assertEquals(2, freezeLayer.getRowCount());
-        assertEquals(-1, freezeLayer.getBottomRightPosition().columnPosition);
-        assertEquals(1, freezeLayer.getBottomRightPosition().rowPosition);
+        assertEquals(0, this.freezeLayer.getColumnCount());
+        assertEquals(2, this.freezeLayer.getRowCount());
+        assertEquals(-1, this.freezeLayer.getBottomRightPosition().columnPosition);
+        assertEquals(1, this.freezeLayer.getBottomRightPosition().rowPosition);
 
-        assertEquals(5, viewportLayer.getColumnCount());
-        assertEquals(3, viewportLayer.getRowCount());
-        assertEquals(0, viewportLayer.getMinimumOriginColumnPosition());
-        assertEquals(2, viewportLayer.getMinimumOriginRowPosition());
-        assertEquals(0, viewportLayer.getMinimumOrigin().getX());
-        assertEquals(40, viewportLayer.getMinimumOrigin().getY());
+        assertEquals(5, this.viewportLayer.getColumnCount());
+        assertEquals(3, this.viewportLayer.getRowCount());
+        assertEquals(0, this.viewportLayer.getMinimumOriginColumnPosition());
+        assertEquals(2, this.viewportLayer.getMinimumOriginRowPosition());
+        assertEquals(0, this.viewportLayer.getMinimumOrigin().getX());
+        assertEquals(40, this.viewportLayer.getMinimumOrigin().getY());
 
         reset();
     }
@@ -1157,51 +1192,51 @@ public class CompositeFreezeLayerHideShowTest {
     @Test
     public void testFreezeHideShowRowBothRegionsEdge() {
         // freeze
-        compositeFreezeLayer.doCommand(new FreezeRowCommand(
-                compositeFreezeLayer, 1));
+        this.compositeFreezeLayer.doCommand(
+                new FreezeRowCommand(this.compositeFreezeLayer, 1));
 
-        assertEquals(0, freezeLayer.getColumnCount());
-        assertEquals(2, freezeLayer.getRowCount());
-        assertEquals(-1, freezeLayer.getBottomRightPosition().columnPosition);
-        assertEquals(1, freezeLayer.getBottomRightPosition().rowPosition);
+        assertEquals(0, this.freezeLayer.getColumnCount());
+        assertEquals(2, this.freezeLayer.getRowCount());
+        assertEquals(-1, this.freezeLayer.getBottomRightPosition().columnPosition);
+        assertEquals(1, this.freezeLayer.getBottomRightPosition().rowPosition);
 
-        assertEquals(5, viewportLayer.getColumnCount());
-        assertEquals(3, viewportLayer.getRowCount());
-        assertEquals(0, viewportLayer.getMinimumOriginColumnPosition());
-        assertEquals(2, viewportLayer.getMinimumOriginRowPosition());
-        assertEquals(0, viewportLayer.getMinimumOrigin().getX());
-        assertEquals(40, viewportLayer.getMinimumOrigin().getY());
+        assertEquals(5, this.viewportLayer.getColumnCount());
+        assertEquals(3, this.viewportLayer.getRowCount());
+        assertEquals(0, this.viewportLayer.getMinimumOriginColumnPosition());
+        assertEquals(2, this.viewportLayer.getMinimumOriginRowPosition());
+        assertEquals(0, this.viewportLayer.getMinimumOrigin().getX());
+        assertEquals(40, this.viewportLayer.getMinimumOrigin().getY());
 
         // hide
-        compositeFreezeLayer.doCommand(new MultiRowHideCommand(
-                compositeFreezeLayer, new int[] { 1, 2 }));
+        this.compositeFreezeLayer.doCommand(
+                new MultiRowHideCommand(this.compositeFreezeLayer, new int[] { 1, 2 }));
 
-        assertEquals(0, freezeLayer.getColumnCount());
-        assertEquals(1, freezeLayer.getRowCount());
-        assertEquals(-1, freezeLayer.getBottomRightPosition().columnPosition);
-        assertEquals(0, freezeLayer.getBottomRightPosition().rowPosition);
+        assertEquals(0, this.freezeLayer.getColumnCount());
+        assertEquals(1, this.freezeLayer.getRowCount());
+        assertEquals(-1, this.freezeLayer.getBottomRightPosition().columnPosition);
+        assertEquals(0, this.freezeLayer.getBottomRightPosition().rowPosition);
 
-        assertEquals(5, viewportLayer.getColumnCount());
-        assertEquals(2, viewportLayer.getRowCount());
-        assertEquals(0, viewportLayer.getMinimumOriginColumnPosition());
-        assertEquals(1, viewportLayer.getMinimumOriginRowPosition());
-        assertEquals(0, viewportLayer.getMinimumOrigin().getX());
-        assertEquals(20, viewportLayer.getMinimumOrigin().getY());
+        assertEquals(5, this.viewportLayer.getColumnCount());
+        assertEquals(2, this.viewportLayer.getRowCount());
+        assertEquals(0, this.viewportLayer.getMinimumOriginColumnPosition());
+        assertEquals(1, this.viewportLayer.getMinimumOriginRowPosition());
+        assertEquals(0, this.viewportLayer.getMinimumOrigin().getX());
+        assertEquals(20, this.viewportLayer.getMinimumOrigin().getY());
 
         // show again
-        compositeFreezeLayer.doCommand(new ShowAllRowsCommand());
+        this.compositeFreezeLayer.doCommand(new ShowAllRowsCommand());
 
-        assertEquals(0, freezeLayer.getColumnCount());
-        assertEquals(1, freezeLayer.getRowCount());
-        assertEquals(-1, freezeLayer.getBottomRightPosition().columnPosition);
-        assertEquals(0, freezeLayer.getBottomRightPosition().rowPosition);
+        assertEquals(0, this.freezeLayer.getColumnCount());
+        assertEquals(1, this.freezeLayer.getRowCount());
+        assertEquals(-1, this.freezeLayer.getBottomRightPosition().columnPosition);
+        assertEquals(0, this.freezeLayer.getBottomRightPosition().rowPosition);
 
-        assertEquals(5, viewportLayer.getColumnCount());
-        assertEquals(4, viewportLayer.getRowCount());
-        assertEquals(0, viewportLayer.getMinimumOriginColumnPosition());
-        assertEquals(1, viewportLayer.getMinimumOriginRowPosition());
-        assertEquals(0, viewportLayer.getMinimumOrigin().getX());
-        assertEquals(20, viewportLayer.getMinimumOrigin().getY());
+        assertEquals(5, this.viewportLayer.getColumnCount());
+        assertEquals(4, this.viewportLayer.getRowCount());
+        assertEquals(0, this.viewportLayer.getMinimumOriginColumnPosition());
+        assertEquals(1, this.viewportLayer.getMinimumOriginRowPosition());
+        assertEquals(0, this.viewportLayer.getMinimumOrigin().getX());
+        assertEquals(20, this.viewportLayer.getMinimumOrigin().getY());
 
         reset();
     }
@@ -1209,51 +1244,51 @@ public class CompositeFreezeLayerHideShowTest {
     @Test
     public void testFreezeHideShowRowFrozenRegionMiddle() {
         // freeze
-        compositeFreezeLayer.doCommand(new FreezeRowCommand(
-                compositeFreezeLayer, 3));
+        this.compositeFreezeLayer.doCommand(
+                new FreezeRowCommand(this.compositeFreezeLayer, 3));
 
-        assertEquals(0, freezeLayer.getColumnCount());
-        assertEquals(4, freezeLayer.getRowCount());
-        assertEquals(-1, freezeLayer.getBottomRightPosition().columnPosition);
-        assertEquals(3, freezeLayer.getBottomRightPosition().rowPosition);
+        assertEquals(0, this.freezeLayer.getColumnCount());
+        assertEquals(4, this.freezeLayer.getRowCount());
+        assertEquals(-1, this.freezeLayer.getBottomRightPosition().columnPosition);
+        assertEquals(3, this.freezeLayer.getBottomRightPosition().rowPosition);
 
-        assertEquals(5, viewportLayer.getColumnCount());
-        assertEquals(1, viewportLayer.getRowCount());
-        assertEquals(0, viewportLayer.getMinimumOriginColumnPosition());
-        assertEquals(4, viewportLayer.getMinimumOriginRowPosition());
-        assertEquals(0, viewportLayer.getMinimumOrigin().getX());
-        assertEquals(80, viewportLayer.getMinimumOrigin().getY());
+        assertEquals(5, this.viewportLayer.getColumnCount());
+        assertEquals(1, this.viewportLayer.getRowCount());
+        assertEquals(0, this.viewportLayer.getMinimumOriginColumnPosition());
+        assertEquals(4, this.viewportLayer.getMinimumOriginRowPosition());
+        assertEquals(0, this.viewportLayer.getMinimumOrigin().getX());
+        assertEquals(80, this.viewportLayer.getMinimumOrigin().getY());
 
         // hide
-        compositeFreezeLayer.doCommand(new MultiRowHideCommand(
-                compositeFreezeLayer, new int[] { 1, 2 }));
+        this.compositeFreezeLayer.doCommand(
+                new MultiRowHideCommand(this.compositeFreezeLayer, new int[] { 1, 2 }));
 
-        assertEquals(0, freezeLayer.getColumnCount());
-        assertEquals(2, freezeLayer.getRowCount());
-        assertEquals(-1, freezeLayer.getBottomRightPosition().columnPosition);
-        assertEquals(1, freezeLayer.getBottomRightPosition().rowPosition);
+        assertEquals(0, this.freezeLayer.getColumnCount());
+        assertEquals(2, this.freezeLayer.getRowCount());
+        assertEquals(-1, this.freezeLayer.getBottomRightPosition().columnPosition);
+        assertEquals(1, this.freezeLayer.getBottomRightPosition().rowPosition);
 
-        assertEquals(5, viewportLayer.getColumnCount());
-        assertEquals(1, viewportLayer.getRowCount());
-        assertEquals(0, viewportLayer.getMinimumOriginColumnPosition());
-        assertEquals(2, viewportLayer.getMinimumOriginRowPosition());
-        assertEquals(0, viewportLayer.getMinimumOrigin().getX());
-        assertEquals(40, viewportLayer.getMinimumOrigin().getY());
+        assertEquals(5, this.viewportLayer.getColumnCount());
+        assertEquals(1, this.viewportLayer.getRowCount());
+        assertEquals(0, this.viewportLayer.getMinimumOriginColumnPosition());
+        assertEquals(2, this.viewportLayer.getMinimumOriginRowPosition());
+        assertEquals(0, this.viewportLayer.getMinimumOrigin().getX());
+        assertEquals(40, this.viewportLayer.getMinimumOrigin().getY());
 
         // show again
-        compositeFreezeLayer.doCommand(new ShowAllRowsCommand());
+        this.compositeFreezeLayer.doCommand(new ShowAllRowsCommand());
 
-        assertEquals(0, freezeLayer.getColumnCount());
-        assertEquals(4, freezeLayer.getRowCount());
-        assertEquals(-1, freezeLayer.getBottomRightPosition().columnPosition);
-        assertEquals(3, freezeLayer.getBottomRightPosition().rowPosition);
+        assertEquals(0, this.freezeLayer.getColumnCount());
+        assertEquals(4, this.freezeLayer.getRowCount());
+        assertEquals(-1, this.freezeLayer.getBottomRightPosition().columnPosition);
+        assertEquals(3, this.freezeLayer.getBottomRightPosition().rowPosition);
 
-        assertEquals(5, viewportLayer.getColumnCount());
-        assertEquals(1, viewportLayer.getRowCount());
-        assertEquals(0, viewportLayer.getMinimumOriginColumnPosition());
-        assertEquals(4, viewportLayer.getMinimumOriginRowPosition());
-        assertEquals(0, viewportLayer.getMinimumOrigin().getX());
-        assertEquals(80, viewportLayer.getMinimumOrigin().getY());
+        assertEquals(5, this.viewportLayer.getColumnCount());
+        assertEquals(1, this.viewportLayer.getRowCount());
+        assertEquals(0, this.viewportLayer.getMinimumOriginColumnPosition());
+        assertEquals(4, this.viewportLayer.getMinimumOriginRowPosition());
+        assertEquals(0, this.viewportLayer.getMinimumOrigin().getX());
+        assertEquals(80, this.viewportLayer.getMinimumOrigin().getY());
 
         reset();
     }
@@ -1261,51 +1296,51 @@ public class CompositeFreezeLayerHideShowTest {
     @Test
     public void testFreezeHideShowRowBothRegionsViewportAll() {
         // freeze
-        compositeFreezeLayer.doCommand(new FreezeRowCommand(
-                compositeFreezeLayer, 1));
+        this.compositeFreezeLayer.doCommand(
+                new FreezeRowCommand(this.compositeFreezeLayer, 1));
 
-        assertEquals(0, freezeLayer.getColumnCount());
-        assertEquals(2, freezeLayer.getRowCount());
-        assertEquals(-1, freezeLayer.getBottomRightPosition().columnPosition);
-        assertEquals(1, freezeLayer.getBottomRightPosition().rowPosition);
+        assertEquals(0, this.freezeLayer.getColumnCount());
+        assertEquals(2, this.freezeLayer.getRowCount());
+        assertEquals(-1, this.freezeLayer.getBottomRightPosition().columnPosition);
+        assertEquals(1, this.freezeLayer.getBottomRightPosition().rowPosition);
 
-        assertEquals(5, viewportLayer.getColumnCount());
-        assertEquals(3, viewportLayer.getRowCount());
-        assertEquals(0, viewportLayer.getMinimumOriginColumnPosition());
-        assertEquals(2, viewportLayer.getMinimumOriginRowPosition());
-        assertEquals(0, viewportLayer.getMinimumOrigin().getX());
-        assertEquals(40, viewportLayer.getMinimumOrigin().getY());
+        assertEquals(5, this.viewportLayer.getColumnCount());
+        assertEquals(3, this.viewportLayer.getRowCount());
+        assertEquals(0, this.viewportLayer.getMinimumOriginColumnPosition());
+        assertEquals(2, this.viewportLayer.getMinimumOriginRowPosition());
+        assertEquals(0, this.viewportLayer.getMinimumOrigin().getX());
+        assertEquals(40, this.viewportLayer.getMinimumOrigin().getY());
 
         // hide
-        compositeFreezeLayer.doCommand(new MultiRowHideCommand(
-                compositeFreezeLayer, new int[] { 1, 2, 3, 4 }));
+        this.compositeFreezeLayer.doCommand(
+                new MultiRowHideCommand(this.compositeFreezeLayer, new int[] { 1, 2, 3, 4 }));
 
-        assertEquals(0, freezeLayer.getColumnCount());
-        assertEquals(1, freezeLayer.getRowCount());
-        assertEquals(-1, freezeLayer.getBottomRightPosition().columnPosition);
-        assertEquals(0, freezeLayer.getBottomRightPosition().rowPosition);
+        assertEquals(0, this.freezeLayer.getColumnCount());
+        assertEquals(1, this.freezeLayer.getRowCount());
+        assertEquals(-1, this.freezeLayer.getBottomRightPosition().columnPosition);
+        assertEquals(0, this.freezeLayer.getBottomRightPosition().rowPosition);
 
-        assertEquals(5, viewportLayer.getColumnCount());
-        assertEquals(0, viewportLayer.getRowCount());
-        assertEquals(0, viewportLayer.getMinimumOriginColumnPosition());
-        assertEquals(-1, viewportLayer.getMinimumOriginRowPosition());
-        assertEquals(0, viewportLayer.getMinimumOrigin().getX());
-        assertEquals(20, viewportLayer.getMinimumOrigin().getY());
+        assertEquals(5, this.viewportLayer.getColumnCount());
+        assertEquals(0, this.viewportLayer.getRowCount());
+        assertEquals(0, this.viewportLayer.getMinimumOriginColumnPosition());
+        assertEquals(-1, this.viewportLayer.getMinimumOriginRowPosition());
+        assertEquals(0, this.viewportLayer.getMinimumOrigin().getX());
+        assertEquals(20, this.viewportLayer.getMinimumOrigin().getY());
 
         // show again
-        compositeFreezeLayer.doCommand(new ShowAllRowsCommand());
+        this.compositeFreezeLayer.doCommand(new ShowAllRowsCommand());
 
-        assertEquals(0, freezeLayer.getColumnCount());
-        assertEquals(1, freezeLayer.getRowCount());
-        assertEquals(-1, freezeLayer.getBottomRightPosition().columnPosition);
-        assertEquals(0, freezeLayer.getBottomRightPosition().rowPosition);
+        assertEquals(0, this.freezeLayer.getColumnCount());
+        assertEquals(1, this.freezeLayer.getRowCount());
+        assertEquals(-1, this.freezeLayer.getBottomRightPosition().columnPosition);
+        assertEquals(0, this.freezeLayer.getBottomRightPosition().rowPosition);
 
-        assertEquals(5, viewportLayer.getColumnCount());
-        assertEquals(4, viewportLayer.getRowCount());
-        assertEquals(0, viewportLayer.getMinimumOriginColumnPosition());
-        assertEquals(-1, viewportLayer.getMinimumOriginRowPosition());
-        assertEquals(0, viewportLayer.getMinimumOrigin().getX());
-        assertEquals(20, viewportLayer.getMinimumOrigin().getY());
+        assertEquals(5, this.viewportLayer.getColumnCount());
+        assertEquals(4, this.viewportLayer.getRowCount());
+        assertEquals(0, this.viewportLayer.getMinimumOriginColumnPosition());
+        assertEquals(-1, this.viewportLayer.getMinimumOriginRowPosition());
+        assertEquals(0, this.viewportLayer.getMinimumOrigin().getX());
+        assertEquals(20, this.viewportLayer.getMinimumOrigin().getY());
 
         reset();
     }
@@ -1313,51 +1348,51 @@ public class CompositeFreezeLayerHideShowTest {
     @Test
     public void testFreezeHideShowRowBothRegionsFreezeAll() {
         // freeze
-        compositeFreezeLayer.doCommand(new FreezeRowCommand(
-                compositeFreezeLayer, 1));
+        this.compositeFreezeLayer.doCommand(
+                new FreezeRowCommand(this.compositeFreezeLayer, 1));
 
-        assertEquals(0, freezeLayer.getColumnCount());
-        assertEquals(2, freezeLayer.getRowCount());
-        assertEquals(-1, freezeLayer.getBottomRightPosition().columnPosition);
-        assertEquals(1, freezeLayer.getBottomRightPosition().rowPosition);
+        assertEquals(0, this.freezeLayer.getColumnCount());
+        assertEquals(2, this.freezeLayer.getRowCount());
+        assertEquals(-1, this.freezeLayer.getBottomRightPosition().columnPosition);
+        assertEquals(1, this.freezeLayer.getBottomRightPosition().rowPosition);
 
-        assertEquals(5, viewportLayer.getColumnCount());
-        assertEquals(3, viewportLayer.getRowCount());
-        assertEquals(0, viewportLayer.getMinimumOriginColumnPosition());
-        assertEquals(2, viewportLayer.getMinimumOriginRowPosition());
-        assertEquals(0, viewportLayer.getMinimumOrigin().getX());
-        assertEquals(40, viewportLayer.getMinimumOrigin().getY());
+        assertEquals(5, this.viewportLayer.getColumnCount());
+        assertEquals(3, this.viewportLayer.getRowCount());
+        assertEquals(0, this.viewportLayer.getMinimumOriginColumnPosition());
+        assertEquals(2, this.viewportLayer.getMinimumOriginRowPosition());
+        assertEquals(0, this.viewportLayer.getMinimumOrigin().getX());
+        assertEquals(40, this.viewportLayer.getMinimumOrigin().getY());
 
         // hide
-        compositeFreezeLayer.doCommand(new MultiRowHideCommand(
-                compositeFreezeLayer, new int[] { 0, 1, 2 }));
+        this.compositeFreezeLayer.doCommand(
+                new MultiRowHideCommand(this.compositeFreezeLayer, new int[] { 0, 1, 2 }));
 
-        assertEquals(0, freezeLayer.getColumnCount());
-        assertEquals(0, freezeLayer.getRowCount());
-        assertEquals(-1, freezeLayer.getBottomRightPosition().columnPosition);
-        assertEquals(-1, freezeLayer.getBottomRightPosition().rowPosition);
+        assertEquals(0, this.freezeLayer.getColumnCount());
+        assertEquals(0, this.freezeLayer.getRowCount());
+        assertEquals(-1, this.freezeLayer.getBottomRightPosition().columnPosition);
+        assertEquals(-1, this.freezeLayer.getBottomRightPosition().rowPosition);
 
-        assertEquals(5, viewportLayer.getColumnCount());
-        assertEquals(2, viewportLayer.getRowCount());
-        assertEquals(0, viewportLayer.getMinimumOriginColumnPosition());
-        assertEquals(0, viewportLayer.getMinimumOriginRowPosition());
-        assertEquals(0, viewportLayer.getMinimumOrigin().getX());
-        assertEquals(0, viewportLayer.getMinimumOrigin().getY());
+        assertEquals(5, this.viewportLayer.getColumnCount());
+        assertEquals(2, this.viewportLayer.getRowCount());
+        assertEquals(0, this.viewportLayer.getMinimumOriginColumnPosition());
+        assertEquals(0, this.viewportLayer.getMinimumOriginRowPosition());
+        assertEquals(0, this.viewportLayer.getMinimumOrigin().getX());
+        assertEquals(0, this.viewportLayer.getMinimumOrigin().getY());
 
         // show again
-        compositeFreezeLayer.doCommand(new ShowAllRowsCommand());
+        this.compositeFreezeLayer.doCommand(new ShowAllRowsCommand());
 
-        assertEquals(0, freezeLayer.getColumnCount());
-        assertEquals(0, freezeLayer.getRowCount());
-        assertEquals(-1, freezeLayer.getBottomRightPosition().columnPosition);
-        assertEquals(-1, freezeLayer.getBottomRightPosition().rowPosition);
+        assertEquals(0, this.freezeLayer.getColumnCount());
+        assertEquals(0, this.freezeLayer.getRowCount());
+        assertEquals(-1, this.freezeLayer.getBottomRightPosition().columnPosition);
+        assertEquals(-1, this.freezeLayer.getBottomRightPosition().rowPosition);
 
-        assertEquals(5, viewportLayer.getColumnCount());
-        assertEquals(5, viewportLayer.getRowCount());
-        assertEquals(0, viewportLayer.getMinimumOriginColumnPosition());
-        assertEquals(0, viewportLayer.getMinimumOriginRowPosition());
-        assertEquals(0, viewportLayer.getMinimumOrigin().getX());
-        assertEquals(0, viewportLayer.getMinimumOrigin().getY());
+        assertEquals(5, this.viewportLayer.getColumnCount());
+        assertEquals(5, this.viewportLayer.getRowCount());
+        assertEquals(0, this.viewportLayer.getMinimumOriginColumnPosition());
+        assertEquals(0, this.viewportLayer.getMinimumOriginRowPosition());
+        assertEquals(0, this.viewportLayer.getMinimumOrigin().getX());
+        assertEquals(0, this.viewportLayer.getMinimumOrigin().getY());
 
         reset();
     }
@@ -1365,68 +1400,109 @@ public class CompositeFreezeLayerHideShowTest {
     @Test
     public void testFreezeHideShowRowBothRegionsAll() {
         // freeze
-        compositeFreezeLayer.doCommand(new FreezeRowCommand(
-                compositeFreezeLayer, 1));
+        this.compositeFreezeLayer.doCommand(
+                new FreezeRowCommand(this.compositeFreezeLayer, 1));
 
-        assertEquals(0, freezeLayer.getColumnCount());
-        assertEquals(2, freezeLayer.getRowCount());
-        assertEquals(-1, freezeLayer.getBottomRightPosition().columnPosition);
-        assertEquals(1, freezeLayer.getBottomRightPosition().rowPosition);
+        assertEquals(0, this.freezeLayer.getColumnCount());
+        assertEquals(2, this.freezeLayer.getRowCount());
+        assertEquals(-1, this.freezeLayer.getBottomRightPosition().columnPosition);
+        assertEquals(1, this.freezeLayer.getBottomRightPosition().rowPosition);
 
-        assertEquals(5, viewportLayer.getColumnCount());
-        assertEquals(3, viewportLayer.getRowCount());
-        assertEquals(0, viewportLayer.getMinimumOriginColumnPosition());
-        assertEquals(2, viewportLayer.getMinimumOriginRowPosition());
-        assertEquals(0, viewportLayer.getMinimumOrigin().getX());
-        assertEquals(40, viewportLayer.getMinimumOrigin().getY());
+        assertEquals(5, this.viewportLayer.getColumnCount());
+        assertEquals(3, this.viewportLayer.getRowCount());
+        assertEquals(0, this.viewportLayer.getMinimumOriginColumnPosition());
+        assertEquals(2, this.viewportLayer.getMinimumOriginRowPosition());
+        assertEquals(0, this.viewportLayer.getMinimumOrigin().getX());
+        assertEquals(40, this.viewportLayer.getMinimumOrigin().getY());
 
         // hide
-        compositeFreezeLayer.doCommand(new MultiRowHideCommand(
-                compositeFreezeLayer, new int[] { 0, 1, 2, 3, 4 }));
+        this.compositeFreezeLayer.doCommand(
+                new MultiRowHideCommand(this.compositeFreezeLayer, new int[] { 0, 1, 2, 3, 4 }));
 
-        assertEquals(0, freezeLayer.getColumnCount());
-        assertEquals(0, freezeLayer.getRowCount());
-        assertEquals(-1, freezeLayer.getBottomRightPosition().columnPosition);
-        assertEquals(-1, freezeLayer.getBottomRightPosition().rowPosition);
+        assertEquals(0, this.freezeLayer.getColumnCount());
+        assertEquals(0, this.freezeLayer.getRowCount());
+        assertEquals(-1, this.freezeLayer.getBottomRightPosition().columnPosition);
+        assertEquals(-1, this.freezeLayer.getBottomRightPosition().rowPosition);
 
-        assertEquals(5, viewportLayer.getColumnCount());
-        assertEquals(0, viewportLayer.getRowCount());
-        assertEquals(0, viewportLayer.getMinimumOriginColumnPosition());
-        assertEquals(0, viewportLayer.getMinimumOriginRowPosition());
-        assertEquals(0, viewportLayer.getMinimumOrigin().getX());
-        assertEquals(0, viewportLayer.getMinimumOrigin().getY());
+        assertEquals(5, this.viewportLayer.getColumnCount());
+        assertEquals(0, this.viewportLayer.getRowCount());
+        assertEquals(0, this.viewportLayer.getMinimumOriginColumnPosition());
+        assertEquals(0, this.viewportLayer.getMinimumOriginRowPosition());
+        assertEquals(0, this.viewportLayer.getMinimumOrigin().getX());
+        assertEquals(0, this.viewportLayer.getMinimumOrigin().getY());
 
         // show again
-        compositeFreezeLayer.doCommand(new ShowAllRowsCommand());
+        this.compositeFreezeLayer.doCommand(new ShowAllRowsCommand());
+
+        assertEquals(0, this.freezeLayer.getColumnCount());
+        assertEquals(0, this.freezeLayer.getRowCount());
+        assertEquals(-1, this.freezeLayer.getBottomRightPosition().columnPosition);
+        assertEquals(-1, this.freezeLayer.getBottomRightPosition().rowPosition);
 
-        assertEquals(0, freezeLayer.getColumnCount());
-        assertEquals(0, freezeLayer.getRowCount());
-        assertEquals(-1, freezeLayer.getBottomRightPosition().columnPosition);
-        assertEquals(-1, freezeLayer.getBottomRightPosition().rowPosition);
+        assertEquals(5, this.viewportLayer.getColumnCount());
+        assertEquals(5, this.viewportLayer.getRowCount());
+        assertEquals(0, this.viewportLayer.getMinimumOriginColumnPosition());
+        assertEquals(0, this.viewportLayer.getMinimumOriginRowPosition());
+        assertEquals(0, this.viewportLayer.getMinimumOrigin().getX());
+        assertEquals(0, this.viewportLayer.getMinimumOrigin().getY());
 
-        assertEquals(5, viewportLayer.getColumnCount());
-        assertEquals(5, viewportLayer.getRowCount());
-        assertEquals(0, viewportLayer.getMinimumOriginColumnPosition());
-        assertEquals(0, viewportLayer.getMinimumOriginRowPosition());
-        assertEquals(0, viewportLayer.getMinimumOrigin().getX());
-        assertEquals(0, viewportLayer.getMinimumOrigin().getY());
+        reset();
+    }
 
+    @Test
+    public void testFreezeDeleteRows() {
+        this.compositeFreezeLayer.doCommand(
+                new FreezeRowCommand(this.compositeFreezeLayer, 3));
+
+        assertEquals(0, this.freezeLayer.getColumnCount());
+        assertEquals(4, this.freezeLayer.getRowCount());
+        assertEquals(-1, this.freezeLayer.getBottomRightPosition().columnPosition);
+        assertEquals(3, this.freezeLayer.getBottomRightPosition().rowPosition);
+
+        assertEquals(5, this.viewportLayer.getColumnCount());
+        assertEquals(1, this.viewportLayer.getRowCount());
+        assertEquals(0, this.viewportLayer.getMinimumOriginColumnPosition());
+        assertEquals(4, this.viewportLayer.getMinimumOriginRowPosition());
+        assertEquals(0, this.viewportLayer.getMinimumOrigin().getX());
+        assertEquals(80, this.viewportLayer.getMinimumOrigin().getY());
+
+        // fake a multi row delete with no details on which rows are deleted
+        // technically the same as collapsing or filtering a GlazedLists
+        this.rowCount = 2;
+        this.dataLayer.fireLayerEvent(new RowDeleteEvent(this.dataLayer, new ArrayList<Range>()));
+
+        assertEquals(0, this.freezeLayer.getColumnCount());
+        assertEquals(2, this.freezeLayer.getRowCount());
+        assertEquals(-1, this.freezeLayer.getBottomRightPosition().columnPosition);
+        assertEquals(3, this.freezeLayer.getBottomRightPosition().rowPosition);
+
+        assertEquals(5, this.viewportLayer.getColumnCount());
+        assertEquals(0, this.viewportLayer.getRowCount());
+        assertEquals(0, this.viewportLayer.getMinimumOriginColumnPosition());
+        assertEquals(-1, this.viewportLayer.getMinimumOriginRowPosition());
+        assertEquals(0, this.viewportLayer.getMinimumOrigin().getX());
+        assertEquals(40, this.viewportLayer.getMinimumOrigin().getY());
+
+        // since the RowHideShowLayer is involved in the current composition
+        // the number of rows is cached and we need to update this before reset
+        this.rowCount = 5;
+        this.dataLayer.fireLayerEvent(new RowInsertEvent(this.dataLayer, new Range(0, 2)));
         reset();
     }
 
     private void reset() {
-        compositeFreezeLayer.doCommand(new UnFreezeGridCommand());
-
-        assertEquals(0, freezeLayer.getColumnCount());
-        assertEquals(0, freezeLayer.getRowCount());
-        assertEquals(-1, freezeLayer.getBottomRightPosition().columnPosition);
-        assertEquals(-1, freezeLayer.getBottomRightPosition().rowPosition);
-
-        assertEquals(5, viewportLayer.getColumnCount());
-        assertEquals(5, viewportLayer.getRowCount());
-        assertEquals(0, viewportLayer.getMinimumOriginColumnPosition());
-        assertEquals(0, viewportLayer.getMinimumOriginRowPosition());
-        assertEquals(0, viewportLayer.getMinimumOrigin().getX());
-        assertEquals(0, viewportLayer.getMinimumOrigin().getY());
+        this.compositeFreezeLayer.doCommand(new UnFreezeGridCommand());
+
+        assertEquals(0, this.freezeLayer.getColumnCount());
+        assertEquals(0, this.freezeLayer.getRowCount());
+        assertEquals(-1, this.freezeLayer.getBottomRightPosition().columnPosition);
+        assertEquals(-1, this.freezeLayer.getBottomRightPosition().rowPosition);
+
+        assertEquals(5, this.viewportLayer.getColumnCount());
+        assertEquals(5, this.viewportLayer.getRowCount());
+        assertEquals(0, this.viewportLayer.getMinimumOriginColumnPosition());
+        assertEquals(0, this.viewportLayer.getMinimumOriginRowPosition());
+        assertEquals(0, this.viewportLayer.getMinimumOrigin().getX());
+        assertEquals(0, this.viewportLayer.getMinimumOrigin().getY());
     }
 }
diff --git a/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/freeze/CompositeFreezeLayer.java b/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/freeze/CompositeFreezeLayer.java
index 02f302e3..55720a3d 100644
--- a/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/freeze/CompositeFreezeLayer.java
+++ b/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/freeze/CompositeFreezeLayer.java
@@ -1,12 +1,13 @@
 /*******************************************************************************
- * Copyright (c) 2012, 2013 Original authors and others.
+ * Copyright (c) 2012, 2013, 2014 Original authors and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
- * 
+ *
  * Contributors:
  *     Original authors and others - initial API and implementation
+ *     Dirk Fauth <dirk.fauth@googlemail.com> - Bug 451217
  ******************************************************************************/
 package org.eclipse.nebula.widgets.nattable.freeze;
 
@@ -23,6 +24,9 @@ import org.eclipse.nebula.widgets.nattable.grid.layer.DimensionallyDependentInde
 import org.eclipse.nebula.widgets.nattable.layer.CompositeLayer;
 import org.eclipse.nebula.widgets.nattable.layer.ILayer;
 import org.eclipse.nebula.widgets.nattable.layer.IUniqueIndexLayer;
+import org.eclipse.nebula.widgets.nattable.layer.event.ColumnStructuralChangeEvent;
+import org.eclipse.nebula.widgets.nattable.layer.event.ILayerEvent;
+import org.eclipse.nebula.widgets.nattable.layer.event.RowStructuralChangeEvent;
 import org.eclipse.nebula.widgets.nattable.painter.layer.ILayerPainter;
 import org.eclipse.nebula.widgets.nattable.persistence.IPersistable;
 import org.eclipse.nebula.widgets.nattable.selection.SelectionLayer;
@@ -35,8 +39,7 @@ import org.eclipse.swt.graphics.Color;
 import org.eclipse.swt.graphics.GC;
 import org.eclipse.swt.graphics.Rectangle;
 
-public class CompositeFreezeLayer extends CompositeLayer implements
-        IUniqueIndexLayer {
+public class CompositeFreezeLayer extends CompositeLayer implements IUniqueIndexLayer {
 
     private final FreezeLayer freezeLayer;
     private final ViewportLayer viewportLayer;
@@ -57,10 +60,12 @@ public class CompositeFreezeLayer extends CompositeLayer implements
         this.selectionLayer = selectionLayer;
 
         setChildLayer("FROZEN_REGION", freezeLayer, 0, 0); //$NON-NLS-1$
-        setChildLayer(
-                "FROZEN_ROW_REGION", new DimensionallyDependentIndexLayer(viewportLayer.getScrollableLayer(), viewportLayer, freezeLayer), 1, 0); //$NON-NLS-1$
-        setChildLayer(
-                "FROZEN_COLUMN_REGION", new DimensionallyDependentIndexLayer(viewportLayer.getScrollableLayer(), freezeLayer, viewportLayer), 0, 1); //$NON-NLS-1$
+        setChildLayer("FROZEN_ROW_REGION", //$NON-NLS-1$
+                new DimensionallyDependentIndexLayer(
+                        viewportLayer.getScrollableLayer(), viewportLayer, freezeLayer), 1, 0);
+        setChildLayer("FROZEN_COLUMN_REGION", //$NON-NLS-1$
+                new DimensionallyDependentIndexLayer(
+                        viewportLayer.getScrollableLayer(), freezeLayer, viewportLayer), 0, 1);
         setChildLayer("NONFROZEN_REGION", viewportLayer, 1, 1); //$NON-NLS-1$
 
         registerCommandHandlers();
@@ -70,108 +75,130 @@ public class CompositeFreezeLayer extends CompositeLayer implements
         }
     }
 
+    @Override
+    public void handleLayerEvent(ILayerEvent event) {
+        // Bug 451217
+        // if structural change events are fired that carry no explicit diff
+        // information it is likely that the event handlers in the underlying
+        // layers are not executed. The following code is intended to "repair"
+        // possible inconsistent freeze-viewport states
+        if (event instanceof RowStructuralChangeEvent
+                && (((RowStructuralChangeEvent) event).getRowDiffs() == null
+                || ((RowStructuralChangeEvent) event).getRowDiffs().isEmpty())) {
+            if (this.viewportLayer.getMinimumOriginRowPosition() < this.freezeLayer.getRowCount()) {
+                this.viewportLayer.setMinimumOriginY(this.freezeLayer.getHeight());
+            }
+        }
+        if (event instanceof ColumnStructuralChangeEvent
+                && (((ColumnStructuralChangeEvent) event).getColumnDiffs() == null
+                || ((ColumnStructuralChangeEvent) event).getColumnDiffs().isEmpty())) {
+            if (this.viewportLayer.getMinimumOriginColumnPosition() < this.freezeLayer.getColumnCount()) {
+                this.viewportLayer.setMinimumOriginX(this.freezeLayer.getWidth());
+            }
+        }
+        super.handleLayerEvent(event);
+    }
+
     public boolean isFrozen() {
-        return freezeLayer.isFrozen();
+        return this.freezeLayer.isFrozen();
     }
 
     @Override
     public ILayerPainter getLayerPainter() {
-        return layerPainter;
+        return this.layerPainter;
     }
 
     @Override
     protected void registerCommandHandlers() {
-        registerCommandHandler(new FreezeCommandHandler(freezeLayer,
-                viewportLayer, selectionLayer));
-
-        final DimensionallyDependentIndexLayer frozenRowLayer = (DimensionallyDependentIndexLayer) getChildLayerByLayoutCoordinate(
-                1, 0);
-        frozenRowLayer
-                .registerCommandHandler(new ViewportSelectRowCommandHandler(
-                        frozenRowLayer));
-
-        final DimensionallyDependentIndexLayer frozenColumnLayer = (DimensionallyDependentIndexLayer) getChildLayerByLayoutCoordinate(
-                0, 1);
-        frozenColumnLayer
-                .registerCommandHandler(new ViewportSelectColumnCommandHandler(
-                        frozenColumnLayer));
+        registerCommandHandler(new FreezeCommandHandler(this.freezeLayer,
+                this.viewportLayer, this.selectionLayer));
+
+        final DimensionallyDependentIndexLayer frozenRowLayer =
+                (DimensionallyDependentIndexLayer) getChildLayerByLayoutCoordinate(1, 0);
+        frozenRowLayer.registerCommandHandler(
+                new ViewportSelectRowCommandHandler(frozenRowLayer));
+
+        final DimensionallyDependentIndexLayer frozenColumnLayer =
+                (DimensionallyDependentIndexLayer) getChildLayerByLayoutCoordinate(0, 1);
+        frozenColumnLayer.registerCommandHandler(
+                new ViewportSelectColumnCommandHandler(frozenColumnLayer));
     }
 
     @Override
     public boolean doCommand(ILayerCommand command) {
         // if this layer should handle a ClientAreaResizeCommand we have to
-        // ensure that
-        // it is only called on the ViewportLayer, as otherwise an undefined
-        // behaviour
-        // could occur because the ViewportLayer isn't informed about potential
-        // refreshes
+        // ensure that it is only called on the ViewportLayer, as otherwise
+        // an undefined behaviour could occur because the ViewportLayer
+        // isn't informed about potential refreshes
         if (command instanceof ClientAreaResizeCommand) {
             this.viewportLayer.doCommand(command);
         }
         return super.doCommand(command);
     }
 
+    @Override
     public int getColumnPositionByIndex(int columnIndex) {
-        int columnPosition = freezeLayer.getColumnPositionByIndex(columnIndex);
+        int columnPosition = this.freezeLayer.getColumnPositionByIndex(columnIndex);
         if (columnPosition >= 0) {
             return columnPosition;
         }
-        return freezeLayer.getColumnCount()
-                + viewportLayer.getColumnPositionByIndex(columnIndex);
+        return this.freezeLayer.getColumnCount()
+                + this.viewportLayer.getColumnPositionByIndex(columnIndex);
     }
 
+    @Override
     public int getRowPositionByIndex(int rowIndex) {
-        int rowPosition = freezeLayer.getRowPositionByIndex(rowIndex);
+        int rowPosition = this.freezeLayer.getRowPositionByIndex(rowIndex);
         if (rowPosition >= 0) {
             return rowPosition;
         }
-        return freezeLayer.getRowCount()
-                + viewportLayer.getRowPositionByIndex(rowIndex);
+        return this.freezeLayer.getRowCount()
+                + this.viewportLayer.getRowPositionByIndex(rowIndex);
     }
 
     // Persistence
 
     @Override
     public void saveState(String prefix, Properties properties) {
-        PositionCoordinate coord = freezeLayer.getTopLeftPosition();
-        properties.setProperty(prefix
-                + FreezeLayer.PERSISTENCE_TOP_LEFT_POSITION,
-                coord.columnPosition + IPersistable.VALUE_SEPARATOR
-                        + coord.rowPosition);
-
-        coord = freezeLayer.getBottomRightPosition();
-        properties.setProperty(prefix
-                + FreezeLayer.PERSISTENCE_BOTTOM_RIGHT_POSITION,
-                coord.columnPosition + IPersistable.VALUE_SEPARATOR
-                        + coord.rowPosition);
+        PositionCoordinate coord = this.freezeLayer.getTopLeftPosition();
+        properties.setProperty(
+                prefix + FreezeLayer.PERSISTENCE_TOP_LEFT_POSITION,
+                coord.columnPosition + IPersistable.VALUE_SEPARATOR + coord.rowPosition);
+
+        coord = this.freezeLayer.getBottomRightPosition();
+        properties.setProperty(
+                prefix + FreezeLayer.PERSISTENCE_BOTTOM_RIGHT_POSITION,
+                coord.columnPosition + IPersistable.VALUE_SEPARATOR + coord.rowPosition);
 
         super.saveState(prefix, properties);
     }
 
     @Override
     public void loadState(String prefix, Properties properties) {
-        String property = properties.getProperty(prefix
-                + FreezeLayer.PERSISTENCE_TOP_LEFT_POSITION);
+        String property = properties.getProperty(
+                prefix + FreezeLayer.PERSISTENCE_TOP_LEFT_POSITION);
         PositionCoordinate topLeftPosition = null;
         if (property != null) {
             StringTokenizer tok = new StringTokenizer(property,
                     IPersistable.VALUE_SEPARATOR);
             String columnPosition = tok.nextToken();
             String rowPosition = tok.nextToken();
-            topLeftPosition = new PositionCoordinate(this.freezeLayer,
+            topLeftPosition = new PositionCoordinate(
+                    this.freezeLayer,
                     Integer.valueOf(columnPosition),
                     Integer.valueOf(rowPosition));
         }
 
-        property = properties.getProperty(prefix
-                + FreezeLayer.PERSISTENCE_BOTTOM_RIGHT_POSITION);
+        property = properties.getProperty(
+                prefix + FreezeLayer.PERSISTENCE_BOTTOM_RIGHT_POSITION);
         PositionCoordinate bottomRightPosition = null;
         if (property != null) {
-            StringTokenizer tok = new StringTokenizer(property,
-                    IPersistable.VALUE_SEPARATOR);
+            StringTokenizer tok =
+                    new StringTokenizer(property, IPersistable.VALUE_SEPARATOR);
             String columnPosition = tok.nextToken();
             String rowPosition = tok.nextToken();
-            bottomRightPosition = new PositionCoordinate(this.freezeLayer,
+            bottomRightPosition = new PositionCoordinate(
+                    this.freezeLayer,
                     Integer.valueOf(columnPosition),
                     Integer.valueOf(rowPosition));
         }
@@ -199,13 +226,11 @@ public class CompositeFreezeLayer extends CompositeLayer implements
         @Override
         public void paintLayer(ILayer natLayer, GC gc, int xOffset,
                 int yOffset, Rectangle rectangle, IConfigRegistry configRegistry) {
-            super.paintLayer(natLayer, gc, xOffset, yOffset, rectangle,
-                    configRegistry);
+            super.paintLayer(natLayer, gc, xOffset, yOffset, rectangle, configRegistry);
 
-            Color separatorColor = configRegistry
-                    .getConfigAttribute(
-                            IFreezeConfigAttributes.SEPARATOR_COLOR,
-                            DisplayMode.NORMAL);
+            Color separatorColor = configRegistry.getConfigAttribute(
+                    IFreezeConfigAttributes.SEPARATOR_COLOR,
+                    DisplayMode.NORMAL);
             if (separatorColor == null) {
                 separatorColor = GUIHelper.COLOR_BLUE;
             }
@@ -213,15 +238,21 @@ public class CompositeFreezeLayer extends CompositeLayer implements
             gc.setClipping(rectangle);
             Color oldFg = gc.getForeground();
             gc.setForeground(separatorColor);
-            final int freezeWidth = freezeLayer.getWidth() - 1;
+            final int freezeWidth = CompositeFreezeLayer.this.freezeLayer.getWidth() - 1;
             if (freezeWidth > 0) {
-                gc.drawLine(xOffset + freezeWidth, yOffset, xOffset
-                        + freezeWidth, yOffset + getHeight() - 1);
+                gc.drawLine(
+                        xOffset + freezeWidth,
+                        yOffset,
+                        xOffset + freezeWidth,
+                        yOffset + getHeight() - 1);
             }
-            final int freezeHeight = freezeLayer.getHeight() - 1;
+            final int freezeHeight = CompositeFreezeLayer.this.freezeLayer.getHeight() - 1;
             if (freezeHeight > 0) {
-                gc.drawLine(xOffset, yOffset + freezeHeight, xOffset
-                        + getWidth() - 1, yOffset + freezeHeight);
+                gc.drawLine(
+                        xOffset,
+                        yOffset + freezeHeight,
+                        xOffset + getWidth() - 1,
+                        yOffset + freezeHeight);
             }
             gc.setForeground(oldFg);
         }
diff --git a/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/freeze/FreezeLayer.java b/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/freeze/FreezeLayer.java
index 7429e3c1..c8ed5c24 100644
--- a/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/freeze/FreezeLayer.java
+++ b/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/freeze/FreezeLayer.java
@@ -1,12 +1,13 @@
 /*******************************************************************************
- * Copyright (c) 2012 Original authors and others.
+ * Copyright (c) 2012, 2014 Original authors and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
- * 
+ *
  * Contributors:
  *     Original authors and others - initial API and implementation
+ *     Dirk Fauth <dirk.fauth@googlemail.com> - Bug 451217
  ******************************************************************************/
 package org.eclipse.nebula.widgets.nattable.freeze;
 
@@ -22,11 +23,9 @@ public class FreezeLayer extends AbstractIndexLayerTransform {
     public static final String PERSISTENCE_TOP_LEFT_POSITION = ".freezeTopLeftPosition"; //$NON-NLS-1$
     public static final String PERSISTENCE_BOTTOM_RIGHT_POSITION = ".freezeBottomRightPosition"; //$NON-NLS-1$
 
-    private PositionCoordinate topLeftPosition = new PositionCoordinate(this,
-            -1, -1);
+    private PositionCoordinate topLeftPosition = new PositionCoordinate(this, -1, -1);
 
-    private PositionCoordinate bottomRightPosition = new PositionCoordinate(
-            this, -1, -1);
+    private PositionCoordinate bottomRightPosition = new PositionCoordinate(this, -1, -1);
 
     public FreezeLayer(IUniqueIndexLayer underlyingLayer) {
         super(underlyingLayer);
@@ -41,32 +40,31 @@ public class FreezeLayer extends AbstractIndexLayerTransform {
     // Coordinates
 
     public PositionCoordinate getTopLeftPosition() {
-        return topLeftPosition;
+        return this.topLeftPosition;
     }
 
     public void setTopLeftPosition(int leftColumnPosition, int topRowPosition) {
-        this.topLeftPosition = new PositionCoordinate(this, leftColumnPosition,
-                topRowPosition);
+        this.topLeftPosition =
+                new PositionCoordinate(this, leftColumnPosition, topRowPosition);
     }
 
     public PositionCoordinate getBottomRightPosition() {
-        return bottomRightPosition;
+        return this.bottomRightPosition;
     }
 
-    public void setBottomRightPosition(int rightColumnPosition,
-            int bottomRowPosition) {
-        this.bottomRightPosition = new PositionCoordinate(this,
-                rightColumnPosition, bottomRowPosition);
+    public void setBottomRightPosition(int rightColumnPosition, int bottomRowPosition) {
+        this.bottomRightPosition =
+                new PositionCoordinate(this, rightColumnPosition, bottomRowPosition);
     }
 
     // Column features
 
     @Override
     public int getColumnCount() {
-        if (topLeftPosition.columnPosition >= 0
-                && bottomRightPosition.columnPosition >= 0) {
-            return bottomRightPosition.columnPosition
-                    - topLeftPosition.columnPosition + 1;
+        if (this.topLeftPosition.columnPosition >= 0
+                && this.bottomRightPosition.columnPosition >= 0) {
+            return this.bottomRightPosition.columnPosition
+                    - this.topLeftPosition.columnPosition + 1;
         } else {
             return 0;
         }
@@ -79,8 +77,8 @@ public class FreezeLayer extends AbstractIndexLayerTransform {
 
     @Override
     public int localToUnderlyingColumnPosition(int localColumnPosition) {
-        if (topLeftPosition.columnPosition >= 0) {
-            return topLeftPosition.columnPosition + localColumnPosition;
+        if (this.topLeftPosition.columnPosition >= 0) {
+            return this.topLeftPosition.columnPosition + localColumnPosition;
         }
         return -1;
     }
@@ -91,9 +89,9 @@ public class FreezeLayer extends AbstractIndexLayerTransform {
         if (sourceUnderlyingLayer != getUnderlyingLayer()) {
             return -1;
         }
-        if (underlyingColumnPosition >= topLeftPosition.columnPosition
-                && underlyingColumnPosition <= bottomRightPosition.columnPosition) {
-            return underlyingColumnPosition - topLeftPosition.columnPosition;
+        if (underlyingColumnPosition >= this.topLeftPosition.columnPosition
+                && underlyingColumnPosition <= this.bottomRightPosition.columnPosition) {
+            return underlyingColumnPosition - this.topLeftPosition.columnPosition;
         }
         return -1;
     }
@@ -115,10 +113,9 @@ public class FreezeLayer extends AbstractIndexLayerTransform {
     @Override
     public int getColumnPositionByX(int x) {
         IUniqueIndexLayer underlyingLayer = getUnderlyingLayer();
-        int xOffset = underlyingLayer
-                .getStartXOfColumnPosition(topLeftPosition.columnPosition);
-        return underlyingToLocalColumnPosition(underlyingLayer,
-                underlyingLayer.getColumnPositionByX(xOffset + x));
+        int xOffset = underlyingLayer.getStartXOfColumnPosition(this.topLeftPosition.columnPosition);
+        return underlyingToLocalColumnPosition(
+                underlyingLayer, underlyingLayer.getColumnPositionByX(xOffset + x));
     }
 
     @Override
@@ -127,27 +124,25 @@ public class FreezeLayer extends AbstractIndexLayerTransform {
             return -1;
         }
         IUniqueIndexLayer underlyingLayer = getUnderlyingLayer();
-        final int underlyingColumnPosition = LayerUtil.convertColumnPosition(
-                this, columnPosition, underlyingLayer);
+        final int underlyingColumnPosition =
+                LayerUtil.convertColumnPosition(this, columnPosition, underlyingLayer);
         if (underlyingColumnPosition < 0) {
             return -1;
         }
-        return underlyingLayer
-                .getStartXOfColumnPosition(underlyingColumnPosition)
-                - underlyingLayer
-                        .getStartXOfColumnPosition(topLeftPosition.columnPosition);
+        return underlyingLayer.getStartXOfColumnPosition(underlyingColumnPosition)
+                - underlyingLayer.getStartXOfColumnPosition(this.topLeftPosition.columnPosition);
     }
 
     // Row features
 
     @Override
     public int getRowCount() {
-        if (topLeftPosition.rowPosition >= 0
-                && bottomRightPosition.rowPosition >= 0) {
-            int frozenRowCount = bottomRightPosition.rowPosition
-                    - topLeftPosition.rowPosition + 1;
+        if (this.topLeftPosition.rowPosition >= 0
+                && this.bottomRightPosition.rowPosition >= 0) {
+            int frozenRowCount =
+                    this.bottomRightPosition.rowPosition - this.topLeftPosition.rowPosition + 1;
             int underlyingRowCount = getUnderlyingLayer().getRowCount();
-            return frozenRowCount <= underlyingRowCount ? frozenRowCount : 0;
+            return frozenRowCount <= underlyingRowCount ? frozenRowCount : underlyingRowCount;
         } else {
             return 0;
         }
@@ -160,8 +155,8 @@ public class FreezeLayer extends AbstractIndexLayerTransform {
 
     @Override
     public int localToUnderlyingRowPosition(int localRowPosition) {
-        if (topLeftPosition.rowPosition >= 0) {
-            return topLeftPosition.rowPosition + localRowPosition;
+        if (this.topLeftPosition.rowPosition >= 0) {
+            return this.topLeftPosition.rowPosition + localRowPosition;
         }
         return -1;
     }
@@ -172,9 +167,9 @@ public class FreezeLayer extends AbstractIndexLayerTransform {
         if (sourceUnderlyingLayer != getUnderlyingLayer()) {
             return -1;
         }
-        if (underlyingRowPosition >= topLeftPosition.rowPosition
-                && underlyingRowPosition <= bottomRightPosition.rowPosition) {
-            return underlyingRowPosition - topLeftPosition.rowPosition;
+        if (underlyingRowPosition >= this.topLeftPosition.rowPosition
+                && underlyingRowPosition <= this.bottomRightPosition.rowPosition) {
+            return underlyingRowPosition - this.topLeftPosition.rowPosition;
         }
         return -1;
     }
@@ -196,10 +191,9 @@ public class FreezeLayer extends AbstractIndexLayerTransform {
     @Override
     public int getRowPositionByY(int y) {
         IUniqueIndexLayer underlyingLayer = getUnderlyingLayer();
-        int yOffset = underlyingLayer
-                .getStartYOfRowPosition(topLeftPosition.rowPosition);
-        return underlyingToLocalRowPosition(underlyingLayer,
-                underlyingLayer.getRowPositionByY(yOffset + y));
+        int yOffset = underlyingLayer.getStartYOfRowPosition(this.topLeftPosition.rowPosition);
+        return underlyingToLocalRowPosition(
+                underlyingLayer, underlyingLayer.getRowPositionByY(yOffset + y));
     }
 
     @Override
@@ -208,14 +202,12 @@ public class FreezeLayer extends AbstractIndexLayerTransform {
             return -1;
         }
         IUniqueIndexLayer underlyingLayer = getUnderlyingLayer();
-        final int underlyingRowPosition = LayerUtil.convertRowPosition(this,
-                rowPosition, underlyingLayer);
+        final int underlyingRowPosition =
+                LayerUtil.convertRowPosition(this, rowPosition, underlyingLayer);
         if (underlyingRowPosition < 0) {
             return -1;
         }
         return underlyingLayer.getStartYOfRowPosition(underlyingRowPosition)
-                - underlyingLayer
-                        .getStartYOfRowPosition(topLeftPosition.rowPosition);
+                - underlyingLayer.getStartYOfRowPosition(this.topLeftPosition.rowPosition);
     }
-
 }