Bug 79908 [Change Sets] Change sets expand without my will

1 files changed, 9 insertions, 6 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 37589dc1c..11d199b9a 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
@@ -407,12 +407,15 @@ public abstract class AbstractSynchronizeModelProvider implements ISynchronizeMo
         for (int j = 0; j < resources.length; j++) {
             IResource resource = resources[j];
 			ISynchronizeModelElement[] elements = getModelObjects(resource);
-			for (int i = 0; i < elements.length; i++) {
-                ISynchronizeModelElement element = elements[i];
-                // Add all parents of the element to the expansion set
-                while (element != null) {
-                    expandedElements.add(element);
-                    element = (ISynchronizeModelElement)element.getParent();
+            // Only expand when there is one element per resource
+            if (elements.length == 1) {
+    			for (int i = 0; i < elements.length; i++) {
+                    ISynchronizeModelElement element = elements[i];
+                    // Add all parents of the element to the expansion set
+                    while (element != null) {
+                        expandedElements.add(element);
+                        element = (ISynchronizeModelElement)element.getParent();
+                    }
                 }
             }
 		}