diff options
| author | Artur Signell <artur@vaadin.com> | 2014-12-19 10:08:34 +0200 |
|---|---|---|
| committer | Artur Signell <artur@vaadin.com> | 2014-12-19 10:08:34 +0200 |
| commit | 8d8ba6f438f61d2e1d26fe9e23ddd58296e5f193 (patch) | |
| tree | 194b7972ce90c324c11ca7c4a661f727256a1bb3 /client | |
| parent | 456eec655d3a7c8040b00a82d7267e8cb892754d (diff) | |
| parent | c1c3564717388708e34f7ec6e9beeb09e4c2d6a4 (diff) | |
| download | vaadin-framework-7.4.0.beta1.tar.gz vaadin-framework-7.4.0.beta1.zip | |
Merge remote-tracking branch 'origin/grid' into 7.47.4.0.beta1
Diffstat (limited to 'client')
| -rw-r--r-- | client/src/com/vaadin/client/data/AbstractRemoteDataSource.java | 16 | ||||
| -rw-r--r-- | client/src/com/vaadin/client/widgets/Grid.java | 20 |
2 files changed, 22 insertions, 14 deletions
diff --git a/client/src/com/vaadin/client/data/AbstractRemoteDataSource.java b/client/src/com/vaadin/client/data/AbstractRemoteDataSource.java index 6799c0bd23..c6aa7c6291 100644 --- a/client/src/com/vaadin/client/data/AbstractRemoteDataSource.java +++ b/client/src/com/vaadin/client/data/AbstractRemoteDataSource.java @@ -467,19 +467,25 @@ public abstract class AbstractRemoteDataSource<T> implements DataSource<T> { size -= count; // shift indices to fill the cache correctly - for (int i = firstRowIndex + count; i < cached.getEnd(); i++) { + int firstMoved = Math.max(firstRowIndex + count, cached.getStart()); + for (int i = firstMoved; i < cached.getEnd(); i++) { moveRowFromIndexToIndex(i, i - count); } Range removedRange = Range.withLength(firstRowIndex, count); if (cached.isSubsetOf(removedRange)) { + // Whole cache is part of the removal. Empty cache cached = Range.withLength(0, 0); } else if (removedRange.intersects(cached)) { + // Removal and cache share some indices. fix accordingly. Range[] partitions = cached.partitionWith(removedRange); Range remainsBefore = partitions[0]; Range transposedRemainsAfter = partitions[2].offsetBy(-removedRange .length()); cached = remainsBefore.combineWith(transposedRemainsAfter); + } else if (removedRange.getEnd() <= cached.getStart()) { + // Removal was before the cache. offset the cache. + cached = cached.offsetBy(-removedRange.length()); } assertDataChangeHandlerIsInjected(); @@ -502,7 +508,7 @@ public abstract class AbstractRemoteDataSource<T> implements DataSource<T> { size += count; - if (firstRowIndex < cached.getStart()) { + if (firstRowIndex <= cached.getStart()) { Range oldCached = cached; cached = cached.offsetBy(count); @@ -539,7 +545,10 @@ public abstract class AbstractRemoteDataSource<T> implements DataSource<T> { T row = indexToRowMap.remove(oldIndex); if (indexToRowMap.containsKey(newIndex)) { // Old row is about to be overwritten. Remove it from keyCache. - keyToIndexMap.remove(getRowKey(indexToRowMap.get(newIndex))); + T row2 = indexToRowMap.remove(newIndex); + if (row2 != null) { + keyToIndexMap.remove(getRowKey(row2)); + } } indexToRowMap.put(newIndex, row); if (row != null) { @@ -580,6 +589,7 @@ public abstract class AbstractRemoteDataSource<T> implements DataSource<T> { private Range getMinCacheRange() { Range availableDataRange = getAvailableRangeForCache(); + Range minCacheRange = cacheStrategy.getMinCacheRange( requestedAvailability, cached, availableDataRange); diff --git a/client/src/com/vaadin/client/widgets/Grid.java b/client/src/com/vaadin/client/widgets/Grid.java index 50a41cd324..63070dcd92 100644 --- a/client/src/com/vaadin/client/widgets/Grid.java +++ b/client/src/com/vaadin/client/widgets/Grid.java @@ -1780,6 +1780,7 @@ public class Grid<T> extends ResizeComposite implements boolean insertionIsAboveFocusedCell = (added.getStart() <= rowWithFocus); if (bodyHasFocus && insertionIsAboveFocusedCell) { rowWithFocus += added.length(); + refreshRow(rowWithFocus); } } @@ -1792,32 +1793,29 @@ public class Grid<T> extends ResizeComposite implements * a range of removed rows */ public void rowsRemovedFromBody(Range removed) { - int focusedColumn = cellFocusRange.getStart(); if (containerWithFocus != escalator.getBody()) { return; } else if (!removed.contains(rowWithFocus)) { if (removed.getStart() > rowWithFocus) { return; } - setCellFocus(rowWithFocus - removed.length(), focusedColumn, - containerWithFocus); + rowWithFocus = rowWithFocus - removed.length(); } else { if (containerWithFocus.getRowCount() > removed.getEnd()) { - setCellFocus(removed.getStart(), focusedColumn, - containerWithFocus); + rowWithFocus = removed.getStart(); } else if (removed.getStart() > 0) { - setCellFocus(removed.getStart() - 1, focusedColumn, - containerWithFocus); + rowWithFocus = removed.getStart() - 1; } else { if (escalator.getHeader().getRowCount() > 0) { - setCellFocus(lastFocusedHeaderRow, focusedColumn, - escalator.getHeader()); + rowWithFocus = lastFocusedHeaderRow; + containerWithFocus = escalator.getHeader(); } else if (escalator.getFooter().getRowCount() > 0) { - setCellFocus(lastFocusedFooterRow, focusedColumn, - escalator.getFooter()); + rowWithFocus = lastFocusedFooterRow; + containerWithFocus = escalator.getFooter(); } } } + refreshRow(rowWithFocus); } } |