summaryrefslogtreecommitdiffstatsabout
diff options
context:
space:
mode:
authorPhilipp Thun2011-04-04 19:19:29 (EDT)
committer Matthias Sohn2011-04-04 19:19:29 (EDT)
commit6da9779fb769ea50b59e88553ad3bbf604a7c499 (patch)
treebc0e8ba22d44533b0a1f915c35226734601284c4
parentf8db02fe34ebea2a6489e44ecf84086ea886ee15 (diff)
downloadegit-6da9779fb769ea50b59e88553ad3bbf604a7c499.zip
egit-6da9779fb769ea50b59e88553ad3bbf604a7c499.tar.gz
egit-6da9779fb769ea50b59e88553ad3bbf604a7c499.tar.bz2
Never ignore project nodesrefs/changes/01/3001/2
With this change project nodes are no longer ignored (Team.isIgnoredHint). This affects the decoration of resources as well as entries in a ContainerTreeIterator. Bug: 336744 Change-Id: I2e559b1c59a268956a92808b2cb68d9d90547eb0 Signed-off-by: Philipp Thun <philipp.thun@sap.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
-rw-r--r--org.eclipse.egit.core/src/org/eclipse/egit/core/ContainerTreeIterator.java4
-rw-r--r--org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/decorators/GitLightweightDecorator.java3
2 files changed, 4 insertions, 3 deletions
diff --git a/org.eclipse.egit.core/src/org/eclipse/egit/core/ContainerTreeIterator.java b/org.eclipse.egit.core/src/org/eclipse/egit/core/ContainerTreeIterator.java
index 9442851..edde5ae 100644
--- a/org.eclipse.egit.core/src/org/eclipse/egit/core/ContainerTreeIterator.java
+++ b/org.eclipse.egit.core/src/org/eclipse/egit/core/ContainerTreeIterator.java
@@ -166,12 +166,12 @@ public class ContainerTreeIterator extends WorkingTreeIterator {
}
private boolean isEntryIgnoredByTeamProvider(IResource resource) {
- if (resource.getType() == IResource.ROOT)
+ if (resource.getType() == IResource.ROOT
+ || resource.getType() == IResource.PROJECT)
return false;
if (Team.isIgnoredHint(resource))
return true;
return isEntryIgnoredByTeamProvider(resource.getParent());
-
}
/**
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/decorators/GitLightweightDecorator.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/decorators/GitLightweightDecorator.java
index ab96ee5..b02b8f0 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/decorators/GitLightweightDecorator.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/decorators/GitLightweightDecorator.java
@@ -273,7 +273,8 @@ public class GitLightweightDecorator extends LabelProvider implements
// Step 3: Perform more expensive tests
// Don't decorate ignored resources (e.g. bin folder content)
- if (Team.isIgnoredHint(resource))
+ if (resource.getType() != IResource.PROJECT
+ && Team.isIgnoredHint(resource))
return;
// Cannot decorate linked resources