diff options
author | Michael Valenta | 2004-10-07 18:02:43 +0000 |
---|---|---|
committer | Michael Valenta | 2004-10-07 18:02:43 +0000 |
commit | 4d5075ef7127cc64ddb533734abd300784ca6ea8 (patch) | |
tree | 9584b81420517f97dfca39d67dcc0f828d627db1 | |
parent | 9a602c9783143e2dd206770939fe9a66fd62c14c (diff) | |
download | eclipse.platform.team-branch_20040924_GeneralizeChangeSets.tar.gz eclipse.platform.team-branch_20040924_GeneralizeChangeSets.tar.xz eclipse.platform.team-branch_20040924_GeneralizeChangeSets.zip |
*** empty log message ***branch_20040924_GeneralizeChangeSets
2 files changed, 6 insertions, 5 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); } /** diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ChangeSetModelProvider.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ChangeSetModelProvider.java index 0888c4d49..225a064e1 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ChangeSetModelProvider.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ChangeSetModelProvider.java @@ -414,8 +414,8 @@ public class ChangeSetModelProvider extends CompositeModelProvider { } if (provider == null) { provider = createProvider(set, tree); + provider.prepareInput(null); } - provider.prepareInput(null); } private ISynchronizeModelProvider createProvider(ChangeSet set, SyncInfoTree tree) { |