some changes in RefreshableSelectionModels

This commit is contained in:
Lukas Furmanek committed 2015-12-07 09:46:25 +01:00
1 parent b32b8d49cb
commit afae0e480a
2 files changed
+9 -12

No files matched your search

@@ -96,8 +96,8 @@ public class RefreshableMultiSelectionModel<T> extends MultiSelectionModel<T>
public void refreshSelectionModel(Iterable<T> newObjects) {
dontcheckSelectionState = true;
final Set<T> selectedSet = getSelectedSet();
final boolean isNotEmpty = !selectedSet.isEmpty();
if (isNotEmpty) {
final boolean isEmpty = selectedSet.isEmpty();
if (!isEmpty) {
clear();
for (T it : newObjects) {
if (comp == null) {
@@ -107,10 +107,10 @@ public class RefreshableMultiSelectionModel<T> extends MultiSelectionModel<T>
for (T selected : selectedSet) {
isSelected = comp.representSameEntity(selected, it);
if (isSelected) {
setSelected(it, isSelected);
break;
}
}
setSelected(it, isSelected);
}
}
SelectionChangeEvent.fire(this);
@@ -90,16 +90,13 @@ public class RefreshableSingleSelectionModel<T> extends SingleSelectionModel<T>
@Override
public void refreshSelectionModel(int start, List<T> newObjects) {
dontcheckSelectionState = true;
List<T> oldElements = elements.subList(start, elements.size());
T selectedElement = null;
for (T it : oldElements) {
if (isSelected(it)) {
selectedElement = it;
setSelected(it, false);
break;
}
}
T selectedElement = getSelectedObject();
if (selectedElement != null) {
final int index = elements.indexOf(selectedElement);
if (index < 0 || index < start) {
return;
}
setSelected(selectedElement, false);
if (comp != null) {
for (T newElement : newObjects) {
if (comp.representSameEntity(selectedElement, newElement)) {