From 7e3268348f221ba552c389f8f4d0f710ec459f51 Mon Sep 17 00:00:00 2001 From: Mathias Kinzler Date: Fri, 7 May 2010 14:18:22 +0200 Subject: [PATCH] LabelDecoration should show ellipsis if HEAD is on a commit Bug: 311364 Signed-off-by: Mathias Kinzler --- .../ui/internal/decorators/DecoratableResourceAdapter.java | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 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 0825a64b..d480a730 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 @@ -29,7 +29,6 @@ import org.eclipse.egit.core.project.RepositoryMapping; import org.eclipse.egit.ui.Activator; import org.eclipse.egit.ui.UIPreferences; import org.eclipse.jface.preference.IPreferenceStore; -import org.eclipse.team.core.Team; import org.eclipse.jgit.dircache.DirCache; import org.eclipse.jgit.dircache.DirCacheEntry; import org.eclipse.jgit.dircache.DirCacheIterator; @@ -47,6 +46,7 @@ import org.eclipse.jgit.treewalk.WorkingTreeIterator; import org.eclipse.jgit.treewalk.filter.AndTreeFilter; import org.eclipse.jgit.treewalk.filter.PathFilterGroup; import org.eclipse.jgit.treewalk.filter.TreeFilter; +import org.eclipse.team.core.Team; class DecoratableResourceAdapter implements IDecoratableResource { @@ -60,7 +60,7 @@ class DecoratableResourceAdapter implements IDecoratableResource { private final IPreferenceStore store; - private String branch = ""; //$NON-NLS-1$ + private final String branch; private final String repositoryName; @@ -119,13 +119,11 @@ class DecoratableResourceAdapter implements IDecoratableResource { } private String getShortBranch() throws IOException { - String branch = repository.getBranch(); Ref head = repository.getRef(Constants.HEAD); - if (head == null) - return branch; - if (!head.isSymbolic()) - return branch.substring(0, 6); - return branch; + if (head != null && !head.isSymbolic()) + return repository.getFullBranch().substring(0, 7) + "..."; //$NON-NLS-1$ + + return repository.getBranch(); } private void extractResourceProperties(TreeWalk treeWalk) { -- 2.11.4.GIT