diff options
Diffstat (limited to 'bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/AbstractSynchronizeModelProvider.java')
| -rw-r--r-- | bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/AbstractSynchronizeModelProvider.java | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/AbstractSynchronizeModelProvider.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/AbstractSynchronizeModelProvider.java index 87671876d..18faf9c6b 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/AbstractSynchronizeModelProvider.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/AbstractSynchronizeModelProvider.java @@ -676,12 +676,13 @@ public abstract class AbstractSynchronizeModelProvider implements ISynchronizeMo * @param node the model element to remove */ protected void removeFromViewer(ISynchronizeModelElement node) { - propogateConflictState(node, true /* clear the conflict */); - clearModelObjects(node); + ISynchronizeModelElement rootToClear = getRootToClear(node); + propogateConflictState(rootToClear, true /* clear the conflict */); + clearModelObjects(rootToClear); if (Utils.canUpdateViewer(getViewer())) { - doRemove(node); + doRemove(rootToClear); } - updateHandler.nodeRemoved(node, this); + updateHandler.nodeRemoved(rootToClear, this); } /** |