private boolean rangeModified = false;
+ public boolean isRangeModified() {
+ return rangeModified;
+ }
+
@Override
public void onChanged() {
try {
return n + "@" + Integer.toHexString(n.hashCode());
}
+ protected boolean filterChange(List<Pair<E,String>> list,E n) {
+ for (int i = list.size()-1; i >= 0; i--) {
+ if (list.get(i).first == n) {
+ list.remove(i);
+ return true;
+ }
+ }
+ return false;
+ }
+
@SuppressWarnings("unchecked")
protected void updateCycle() {
rem.clear();
synchronized (syncMutex) {
- // Check for overlapping additions and deletions, prevent deleting objects that are also added.
+ // Check for overlapping additions and deletions, prevent deleting objects that are also added and vice versa.
Deque<E> stack = new ArrayDeque<E>();
for (Pair<E, String> n : added) {
stack.add(n.first);
}
while (!stack.isEmpty()) {
E n = stack.pop();
- for (int i = removed.size()-1; i >= 0; i--) {
- if (removed.get(i).first == n) {
- removed.remove(i);
- break;
- }
+ boolean conflict = filterChange(removed, n);
+ if (conflict) {
+ System.out.println("Prevent removing " + n);
+ //filterChange(added, n)
+ if (filterChange(added, n))
+ System.out.println("Prevent adding " + n);
}
if (n instanceof ParentNode) {
ParentNode<INode> pn = (ParentNode<INode>)n;