Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean Michel-Lemieux2002-06-07 18:50:57 +0000
committerJean Michel-Lemieux2002-06-07 18:50:57 +0000
commit229e549330f52952b8476d06e49dc543caf2f62c (patch)
tree1bf552c96f0115d948e841280ebc12e26823ee04 /bundles
parent8c5a66b11fc2412cb73df5c03c229264558c2e38 (diff)
downloadeclipse.platform.team-229e549330f52952b8476d06e49dc543caf2f62c.tar.gz
eclipse.platform.team-229e549330f52952b8476d06e49dc543caf2f62c.tar.xz
eclipse.platform.team-229e549330f52952b8476d06e49dc543caf2f62c.zip
Bug 19362: CVS Tag name decoration filtering
Reviewed by James Moody
Diffstat (limited to 'bundles')
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSDecorationRunnable.java10
1 files changed, 9 insertions, 1 deletions
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSDecorationRunnable.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSDecorationRunnable.java
index 98a285b00..092e7b12c 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSDecorationRunnable.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSDecorationRunnable.java
@@ -232,20 +232,28 @@ public class CVSDecorationRunnable implements Runnable {
protected static CVSTag getTagToShow(IResource resource) throws CVSException {
ICVSResource cvsResource = CVSWorkspaceRoot.getCVSResourceFor(resource);
CVSTag tag = null;
+
+ // for unmanaged resources don't show a tag since they will be added in
+ // the context of their parents tag. For managed resources only show tags
+ // if different than parent.
+ boolean managed = false;
+
if(cvsResource.isFolder()) {
FolderSyncInfo folderInfo = ((ICVSFolder)cvsResource).getFolderSyncInfo();
if(folderInfo != null) {
tag = folderInfo.getTag();
+ managed = true;
}
} else {
ResourceSyncInfo info = ((ICVSFile)cvsResource).getSyncInfo();
if(info != null) {
tag = info.getTag();
+ managed = true;
}
}
ICVSFolder parent = cvsResource.getParent();
- if(parent != null && tag != null) {
+ if(parent != null && managed) {
FolderSyncInfo parentInfo = parent.getFolderSyncInfo();
if(parentInfo != null) {
CVSTag parentTag = parentInfo.getTag();

Back to the top