From 4d5075ef7127cc64ddb533734abd300784ca6ea8 Mon Sep 17 00:00:00 2001
From: Michael Valenta
Date: Thu, 7 Oct 2004 18:02:43 +0000
Subject: *** empty log message ***

---
 .../ui/synchronize/AbstractSynchronizeModelProvider.java         | 9 +++++----
 .../team/internal/ui/synchronize/ChangeSetModelProvider.java     | 2 +-
 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) {
-- 
cgit v1.2.3