diff options
| author | Jens Baumgart | 2011-11-23 22:06:22 +0000 |
|---|---|---|
| committer | Matthias Sohn | 2011-11-23 22:06:22 +0000 |
| commit | efce665800e3118ffc49fa11a5f004e749aa1441 (patch) | |
| tree | 31836313f7cb902418d59e159c862dcbbe8862fe /org.eclipse.egit.ui/src | |
| parent | e42997e778767d810f2bbe943fead1dca69f6032 (diff) | |
| download | egit-efce665800e3118ffc49fa11a5f004e749aa1441.tar.gz egit-efce665800e3118ffc49fa11a5f004e749aa1441.tar.xz egit-efce665800e3118ffc49fa11a5f004e749aa1441.zip | |
Decorate untracked folders
This change adds decoration of untracked folders to the new decorator
implementation.
Depends on JGit change http://egit.eclipse.org/r/4385
Bug: 359264
Change-Id: I2a246bd37936b9768106d68a77cd508b0cf019d3
Signed-off-by: Jens Baumgart <jens.baumgart@sap.com>
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Diffstat (limited to 'org.eclipse.egit.ui/src')
| -rw-r--r-- | org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/decorators/DecoratableResourceAdapter.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/decorators/DecoratableResourceAdapter.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/decorators/DecoratableResourceAdapter.java index ea78d21658..838be51cbf 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/decorators/DecoratableResourceAdapter.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/decorators/DecoratableResourceAdapter.java @@ -121,13 +121,13 @@ class DecoratableResourceAdapter extends DecoratableResource { String repoRelativePath = makeRepoRelative(resource) + "/"; //$NON-NLS-1$ Set<String> ignoredFiles = indexDiffData.getIgnoredNotInIndex(); + Set<String> untrackedFolders = indexDiffData.getUntrackedFolders(); ignored = containsPrefixPath(ignoredFiles, repoRelativePath); - // only file can be not tracked. if (ignored) tracked = false; else - tracked = true; // TODO: implement decoration for untracked folders + tracked = !containsPrefixPath(untrackedFolders, repoRelativePath); // containers are marked as staged whenever file was added, removed or // changed |