Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Wolf2019-08-15 12:25:42 +0000
committerThomas Wolf2019-08-15 16:16:19 +0000
commit2d7e27301cc89fe30abc392598a96fac2e8d299a (patch)
tree2c03b41d07dd529790040d8106af2d72a7c590bb /org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/decorators/DecoratableResourceMapping.java
parent63093b15aeb7417a0a0aed15676da116bd682c35 (diff)
downloadegit-2d7e27301cc89fe30abc392598a96fac2e8d299a.tar.gz
egit-2d7e27301cc89fe30abc392598a96fac2e8d299a.tar.xz
egit-2d7e27301cc89fe30abc392598a96fac2e8d299a.zip
Don't decorate ResourceMappings mapping only unshared resources
If a ResourceMapping has no shared resources, its state will be untracked, which would make EGit show the "?" overlay. Bug: 550082 Change-Id: I2bf6c1b7261907d8d49188317fc4a7768bc0f046 Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
Diffstat (limited to 'org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/decorators/DecoratableResourceMapping.java')
-rw-r--r--org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/decorators/DecoratableResourceMapping.java8
1 files changed, 6 insertions, 2 deletions
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/decorators/DecoratableResourceMapping.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/decorators/DecoratableResourceMapping.java
index 4415537be7..70282f320d 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/decorators/DecoratableResourceMapping.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/decorators/DecoratableResourceMapping.java
@@ -26,7 +26,7 @@ import org.eclipse.jgit.lib.Repository;
/**
* Represents a decoratable resource mapping (i.e. a group of resources).
*/
-public class DecoratableResourceMapping extends DecoratableResource {
+public class DecoratableResourceMapping extends DecoratableResourceGroup {
private static final String MULTIPLE = "*"; //$NON-NLS-1$
@@ -45,7 +45,7 @@ public class DecoratableResourceMapping extends DecoratableResource {
*/
public DecoratableResourceMapping(ResourceMapping mapping)
throws IOException {
- super(null); // no resource ...
+ super(mapping);
Set<Repository> repositories = new HashSet<>();
Set<StagingState> stagingStates = new HashSet<>();
@@ -108,6 +108,10 @@ public class DecoratableResourceMapping extends DecoratableResource {
setStagingState(StagingState.MODIFIED);
}
+ if (repositories.isEmpty()) {
+ return;
+ }
+ someShared = true;
decorateRepositoryInformation(this, repositories);
}

Back to the top