Author: konstantin.mishin Date: 2010-05-04 11:54:02 -0400 (Tue, 04 May 2010) New Revision: 16886 Modified: branches/enterprise/3.3.X/ui/scrollableDataTable/src/main/java/org/richfaces/renderkit/html/SelectionRendererContributor.java Log: RF-8631 Modified: branches/enterprise/3.3.X/ui/scrollableDataTable/src/main/java/org/richfaces/renderkit/html/SelectionRendererContributor.java =================================================================== --- branches/enterprise/3.3.X/ui/scrollableDataTable/src/main/java/org/richfaces/renderkit/html/SelectionRendererContributor.java 2010-05-04 15:10:11 UTC (rev 16885) +++ branches/enterprise/3.3.X/ui/scrollableDataTable/src/main/java/org/richfaces/renderkit/html/SelectionRendererContributor.java 2010-05-04 15:54:02 UTC (rev 16886) @@ -118,11 +118,6 @@ } catch (IOException e) { throw new FacesException(e); } - int shiftRowIndex = clientSelection.getShiftRowIndex(); - if (shiftRowIndex != -1) { - int rows = grid.getRows(); - grid.setShiftRowIndex(grid.getFirst() + (rows + shiftRowIndex - clientRowIndex) % rows); - } int oldFirst = grid.getFirst(); int oldRows = grid.getRows(); int newFirst = -1; @@ -158,6 +153,11 @@ selectionBinding.setValue(context.getELContext(), simpleSelection); } + int shiftRowIndex = clientSelection.getShiftRowIndex(); + if (shiftRowIndex != -1) { + int rows = grid.getRows(); + grid.setShiftRowIndex(grid.getFirst() + (rows + shiftRowIndex - clientRowIndex) % rows); + } ScrollableDataTableRendererState.restoreState(context); } }