diff options
| author | Robin Stocker | 2012-10-20 20:54:31 +0000 |
|---|---|---|
| committer | Robin Stocker | 2012-10-28 16:24:03 +0000 |
| commit | 6f17309357a2941fffef373df0198d04f39c5d0c (patch) | |
| tree | 8a92e8e931774f660c8b0f400fad0ba6a51f500d /org.eclipse.egit.ui/src/org/eclipse | |
| parent | 6857d4ccf586d8c6d1abcd3814e5711ee92d76e0 (diff) | |
| download | egit-6f17309357a2941fffef373df0198d04f39c5d0c.tar.gz egit-6f17309357a2941fffef373df0198d04f39c5d0c.tar.xz egit-6f17309357a2941fffef373df0198d04f39c5d0c.zip | |
[sync] Add label for "Git Commits" when showing all models
Before, it would show toString of GitChangeSetModelProvider.
Bug: 384544
Change-Id: Ia49830473b48e502f6f1f8765916684dd1111951
Diffstat (limited to 'org.eclipse.egit.ui/src/org/eclipse')
3 files changed, 9 insertions, 0 deletions
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/UIText.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/UIText.java index b4d0bead8a..1fb10ec22e 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/UIText.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/UIText.java @@ -3742,6 +3742,9 @@ public class UIText extends NLS { public static String GitSynchronizeWizard_synchronize; /** */ + public static String GitChangeSetModelProviderLabel; + + /** */ public static String GitBranchSynchronizeWizardPage_title; /** */ diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/synchronize/mapping/GitChangeSetLabelProvider.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/synchronize/mapping/GitChangeSetLabelProvider.java index aa6d91af81..7d012d925e 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/synchronize/mapping/GitChangeSetLabelProvider.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/synchronize/mapping/GitChangeSetLabelProvider.java @@ -16,7 +16,9 @@ import java.util.Map.Entry; import org.eclipse.egit.core.synchronize.GitCommitsModelCache.Commit; import org.eclipse.egit.ui.UIPreferences; +import org.eclipse.egit.ui.UIText; import org.eclipse.egit.ui.internal.GitLabelProvider; +import org.eclipse.egit.ui.internal.synchronize.GitChangeSetModelProvider; import org.eclipse.egit.ui.internal.synchronize.model.GitModelCommit; import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.jface.viewers.DelegatingStyledCellLabelProvider.IStyledLabelProvider; @@ -68,6 +70,9 @@ public class GitChangeSetLabelProvider extends SynchronizationLabelProvider impl return string; } + if (element instanceof GitChangeSetModelProvider) + return new StyledString(UIText.GitChangeSetModelProviderLabel); + return getDelegateLabelProvider().getStyledText(element); } diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/uitext.properties b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/uitext.properties index bc5b8ec3a8..2fe6f28812 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/uitext.properties +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/uitext.properties @@ -1366,6 +1366,7 @@ CommitUI_pushFailedTitle=Push failed CommitUI_pushFailedMessage=Could not push {0} to {1}: {2} GitSynchronizeWizard_synchronize=Synchronize +GitChangeSetModelProviderLabel=Git Commits GitBranchSynchronizeWizardPage_title=Synchronize Git GitBranchSynchronizeWizardPage_description=Select destination for repositories to be synchronized. |