diff options
| author | Philipp Thun | 2011-04-04 23:19:29 +0000 |
|---|---|---|
| committer | Matthias Sohn | 2011-04-04 23:19:29 +0000 |
| commit | 6da9779fb769ea50b59e88553ad3bbf604a7c499 (patch) | |
| tree | bc0e8ba22d44533b0a1f915c35226734601284c4 | |
| parent | f8db02fe34ebea2a6489e44ecf84086ea886ee15 (diff) | |
| download | egit-6da9779fb769ea50b59e88553ad3bbf604a7c499.tar.gz egit-6da9779fb769ea50b59e88553ad3bbf604a7c499.tar.xz egit-6da9779fb769ea50b59e88553ad3bbf604a7c499.zip | |
Never ignore project nodes
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.java | 4 | ||||
| -rw-r--r-- | org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/decorators/GitLightweightDecorator.java | 3 |
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 9442851534..edde5ae482 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 ab96ee54be..b02b8f04bb 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 |