Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean Michel-Lemieux2002-05-13 09:12:46 -0400
committerJean Michel-Lemieux2002-05-13 09:12:46 -0400
commit1586070969f8365db6e55cd7b9c4ebf20d4b3719 (patch)
treeb5937912f0b8ae268ccd1bd832ed53eb1845d209 /bundles/org.eclipse.team.cvs.ui
parent872539d9c11db6e6fd9b293054f0f048122cd159 (diff)
downloadeclipse.platform.team-1586070969f8365db6e55cd7b9c4ebf20d4b3719.tar.gz
eclipse.platform.team-1586070969f8365db6e55cd7b9c4ebf20d4b3719.tar.xz
eclipse.platform.team-1586070969f8365db6e55cd7b9c4ebf20d4b3719.zip
Bug 11322: CVSDecorator.resourceStateChanged() should check recursive dirty flag
Diffstat (limited to 'bundles/org.eclipse.team.cvs.ui')
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSDecorator.java14
1 files changed, 8 insertions, 6 deletions
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSDecorator.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSDecorator.java
index a13674aa2..d24ba0801 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSDecorator.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSDecorator.java
@@ -303,7 +303,7 @@ public class CVSDecorator extends LabelProvider implements ILabelDecorator, IRes
// post a changed event but forget any cached information about this resource
noProviderResources.add(resource);
}
- resources.addAll(computeParents(resource)); //todo: should only add parents if deep preference on: bug #11400
+ resources.addAll(computeParents(resource));
}
addResourcesToBeDecorated((IResource[]) resources.toArray(new IResource[resources.size()]));
@@ -340,9 +340,13 @@ public class CVSDecorator extends LabelProvider implements ILabelDecorator, IRes
private List computeParents(IResource resource) {
IResource current = resource;
List resources = new ArrayList();
- while (current.getType() != IResource.ROOT) {
- resources.add(current);
- current = current.getParent();
+ if(CVSUIPlugin.getPlugin().getPreferenceStore().getBoolean(ICVSUIConstants.PREF_CALCULATE_DIRTY)) {
+ while (current.getType() != IResource.ROOT) {
+ resources.add(current);
+ current = current.getParent();
+ }
+ } else {
+ resources.add(current);
}
return resources;
}
@@ -351,9 +355,7 @@ public class CVSDecorator extends LabelProvider implements ILabelDecorator, IRes
if (resources.length > 0) {
for (int i = 0; i < resources.length; i++) {
IResource resource = resources[i];
- //System.out.println("\t to update: " + resource.getFullPath());
if(!decoratorNeedsUpdating.contains(resource)) {
- //System.out.println("\t adding: " + resource.getFullPath());
decoratorNeedsUpdating.add(resource);
}
}

Back to the top