Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Valenta2007-01-30 15:24:58 +0000
committerMichael Valenta2007-01-30 15:24:58 +0000
commit62bcb36318ad98f6acf536e185109324cfab7c2b (patch)
treef55d922c28fea8c41a86a2580f1e3d4ae4d20ff9 /bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs
parent93a3640d638afab66f6a56d9f4bf13791337bf16 (diff)
downloadeclipse.platform.team-62bcb36318ad98f6acf536e185109324cfab7c2b.tar.gz
eclipse.platform.team-62bcb36318ad98f6acf536e185109324cfab7c2b.tar.xz
eclipse.platform.team-62bcb36318ad98f6acf536e185109324cfab7c2b.zip
Bug 138414 [Sync View] Flat presentation in Synchronize view is not available any more
Diffstat (limited to 'bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs')
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/ChangeSetContentProvider.java20
1 files changed, 14 insertions, 6 deletions
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/ChangeSetContentProvider.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/ChangeSetContentProvider.java
index 28291555d..b660c1cd6 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/ChangeSetContentProvider.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/mappings/ChangeSetContentProvider.java
@@ -344,12 +344,20 @@ public class ChangeSetContentProvider extends ResourceModelContentProvider imple
}
// Include resources that are not in a set
ResourceDiffTree tree = getTheRest();
- IPath[] otherRoots = tree.getChildren(ResourcesPlugin.getWorkspace().getRoot().getFullPath());
- for (int i = 0; i < otherRoots.length; i++) {
- IPath path = otherRoots[i];
- IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(path.lastSegment());
- if (project.isAccessible() && hasChildren(TreePath.EMPTY.createChildPath(project)))
- result.add(project);
+ if (isFlatLayout()) {
+ IResource[] resources = tree.getAffectedResources();
+ for (int i = 0; i < resources.length; i++) {
+ IResource resource = resources[i];
+ result.add(resource);
+ }
+ } else {
+ IPath[] otherRoots = tree.getChildren(ResourcesPlugin.getWorkspace().getRoot().getFullPath());
+ for (int i = 0; i < otherRoots.length; i++) {
+ IPath path = otherRoots[i];
+ IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(path.lastSegment());
+ if (project.isAccessible() && hasChildren(TreePath.EMPTY.createChildPath(project)))
+ result.add(project);
+ }
}
return result.toArray();
}

Back to the top