summaryrefslogtreecommitdiffstatsabout
diff options
context:
space:
mode:
authorMarkus Keller2012-07-02 08:42:07 (EDT)
committer Markus Keller2012-07-02 08:42:07 (EDT)
commit2fdf91ceb45a699cbcc20cf60be33ed24947b957 (patch)
tree2a0c8bba129f894e7c318988fec6992e86190d4d
parente80f318f8250c6864dff7ccc0afc5e4823db0dbc (diff)
downloadegit-2fdf91ceb45a699cbcc20cf60be33ed24947b957.zip
egit-2fdf91ceb45a699cbcc20cf60be33ed24947b957.tar.gz
egit-2fdf91ceb45a699cbcc20cf60be33ed24947b957.tar.bz2
Show the repository name in the title of the Pull Result dialogrefs/changes/91/6291/2
Bug: 359981 Change-Id: I61327cea70805ccab03f488749d98a242e6a6591 Signed-off-by: Markus Keller <markus_keller@ch.ibm.com>
-rw-r--r--org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/pull/PullResultDialog.java6
-rw-r--r--org.eclipse.egit.ui/src/org/eclipse/egit/ui/uitext.properties2
2 files changed, 6 insertions, 2 deletions
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/pull/PullResultDialog.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/pull/PullResultDialog.java
index 2e89bc6..14ef8a3 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/pull/PullResultDialog.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/pull/PullResultDialog.java
@@ -10,6 +10,7 @@
*******************************************************************************/
package org.eclipse.egit.ui.internal.pull;
+import org.eclipse.egit.ui.Activator;
import org.eclipse.egit.ui.UIText;
import org.eclipse.egit.ui.UIUtils;
import org.eclipse.egit.ui.internal.fetch.FetchResultDialog;
@@ -172,7 +173,10 @@ public class PullResultDialog extends Dialog {
@Override
protected void configureShell(Shell newShell) {
super.configureShell(newShell);
- newShell.setText(UIText.PullResultDialog_DialogTitle);
+ newShell.setText(NLS.bind(
+ UIText.PullResultDialog_DialogTitle,
+ Activator.getDefault().getRepositoryUtil()
+ .getRepositoryName(repo)));
}
@Override
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 7f6d7fb..b35ee83 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
@@ -603,7 +603,7 @@ PullOperationUI_PullingMultipleTaskName=Pulling from Multiple Repositories
PullOperationUI_PullingTaskName=Pulling Branch {0} - {1}
PullOperationUI_PullOperationCanceledMessage=The pull operation was canceled
PullResultDialog_NothingToFetchFromLocal=Nothing to fetch (the fetch source is the local Repository)
-PullResultDialog_DialogTitle=Pull Result
+PullResultDialog_DialogTitle=Pull Result for {0}
PullResultDialog_FetchResultGroupHeader=Fetch Result
PullResultDialog_MergeAlreadyUpToDateMessage=Nothing to update - everything up to date
PullResultDialog_MergeResultGroupHeader=Update Result