diff options
2 files changed, 4 insertions, 4 deletions
diff --git a/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/map/CompositeMap.java b/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/map/CompositeMap.java index 0170ed86..8f3bbb61 100644 --- a/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/map/CompositeMap.java +++ b/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/map/CompositeMap.java @@ -104,7 +104,7 @@ public class CompositeMap extends ObservableMap { } else { changes.add(changedKey); oldValues.put(changedKey, oldValue); - wrappedMap.put(changedKey, newValue); + wrappedMap.put(changedKey, secondMap.get(newValue)); } } for (Iterator it = diff.getRemovedKeys().iterator(); it.hasNext();) { @@ -229,7 +229,7 @@ public class CompositeMap extends ObservableMap { wrappedMap.remove(element); } } else { - changes.add(element); + Assert.isTrue(false, "unexpected case"); //$NON-NLS-1$ } } diff --git a/bundles/org.eclipse.core.databinding/src/org/eclipse/core/databinding/observable/map/CompositeMap.java b/bundles/org.eclipse.core.databinding/src/org/eclipse/core/databinding/observable/map/CompositeMap.java index 0170ed86..8f3bbb61 100644 --- a/bundles/org.eclipse.core.databinding/src/org/eclipse/core/databinding/observable/map/CompositeMap.java +++ b/bundles/org.eclipse.core.databinding/src/org/eclipse/core/databinding/observable/map/CompositeMap.java @@ -104,7 +104,7 @@ public class CompositeMap extends ObservableMap { } else { changes.add(changedKey); oldValues.put(changedKey, oldValue); - wrappedMap.put(changedKey, newValue); + wrappedMap.put(changedKey, secondMap.get(newValue)); } } for (Iterator it = diff.getRemovedKeys().iterator(); it.hasNext();) { @@ -229,7 +229,7 @@ public class CompositeMap extends ObservableMap { wrappedMap.remove(element); } } else { - changes.add(element); + Assert.isTrue(false, "unexpected case"); //$NON-NLS-1$ } } |