Rename ResultDialog_* message keys to PushResultDialog_*

The practice is to name them the same as the class, which helps with
finding them e.g. in test code.

Change-Id: If74c9b2d9d37cd6a20d27c26678269303d02c264
Signed-off-by: Robin Stocker <robin@nibor.org>

6 files changed, 15 insertions, 15 deletions

diff --git a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/team/actions/PushActionTest.java b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/team/actions/PushActionTest.java
index e3308f7f3d..14b0f33b8a 100644
--- a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/team/actions/PushActionTest.java
+++ b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/team/actions/PushActionTest.java
@@ -93,7 +93,7 @@ public class PushActionTest extends LocalRepositoryTestCase {
 		if (withConfirmPage)
 			pushDialog.bot().button(IDialogConstants.NEXT_LABEL).click();
 		pushDialog.bot().button(IDialogConstants.FINISH_LABEL).click();
-		SWTBotShell confirm = bot.shell(NLS.bind(UIText.ResultDialog_title,
+		SWTBotShell confirm = bot.shell(NLS.bind(UIText.PushResultDialog_title,
 				destination));
 		String result = confirm.bot().tree().getAllItems()[0].getText();
 
@@ -113,7 +113,7 @@ public class PushActionTest extends LocalRepositoryTestCase {
 		if (withConfirmPage)
 			pushDialog.bot().button(IDialogConstants.NEXT_LABEL).click();
 		pushDialog.bot().button(IDialogConstants.FINISH_LABEL).click();
-		confirm = bot.shell(NLS.bind(UIText.ResultDialog_title, destination));
+		confirm = bot.shell(NLS.bind(UIText.PushResultDialog_title, destination));
 		result = confirm.bot().tree().getAllItems()[0].getText();
 
 		confirm.close();
diff --git a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/view/repositories/GitRepositoriesViewFetchAndPushTest.java b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/view/repositories/GitRepositoriesViewFetchAndPushTest.java
index 692f9ea351..f42c042bb5 100644
--- a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/view/repositories/GitRepositoriesViewFetchAndPushTest.java
+++ b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/view/repositories/GitRepositoriesViewFetchAndPushTest.java
@@ -118,7 +118,7 @@ public class GitRepositoriesViewFetchAndPushTest extends
 		String destinationString = clonedRepositoryFile.getParentFile()
 				.getName()
 				+ " - " + "origin";
-		String dialogTitle = NLS.bind(UIText.ResultDialog_title,
+		String dialogTitle = NLS.bind(UIText.PushResultDialog_title,
 				destinationString);
 
 		// first time: expect new branch
@@ -220,7 +220,7 @@ public class GitRepositoriesViewFetchAndPushTest extends
 		PushOperationUI op =new PushOperationUI(repository, "origin", 0, false);
 		op.start();
 
-		String pushdialogTitle = NLS.bind(UIText.ResultDialog_title,
+		String pushdialogTitle = NLS.bind(UIText.PushResultDialog_title,
 				op.getDestinationString());
 
 		bot.shell(pushdialogTitle).close();
diff --git a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/view/synchronize/SynchronizeViewPushTest.java b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/view/synchronize/SynchronizeViewPushTest.java
index a255cdaeb1..2212e570ca 100644
--- a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/view/synchronize/SynchronizeViewPushTest.java
+++ b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/view/synchronize/SynchronizeViewPushTest.java
@@ -72,7 +72,7 @@ public class SynchronizeViewPushTest extends AbstractSynchronizeViewTest {
 		jobJoiner.join();
 
 		String destinationString = repositoryFile.getParentFile().getName() + " - " + "origin";
-		SWTBotShell resultDialog = bot.shell(NLS.bind(UIText.ResultDialog_title, destinationString));
+		SWTBotShell resultDialog = bot.shell(NLS.bind(UIText.PushResultDialog_title, destinationString));
 		resultDialog.close();
 
 		Repository remoteRepository = lookupRepository(childRepositoryFile);
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/UIText.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/UIText.java
index d472c4d8a0..985518cec6 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/UIText.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/UIText.java
@@ -2388,6 +2388,12 @@ public class UIText extends NLS {
 	public static String PushResultDialog_ConfigureButton;
 
 	/** */
+	public static String PushResultDialog_label;
+
+	/** */
+	public static String PushResultDialog_title;
+
+	/** */
 	public static String PushResultTable_columnStatusRepo;
 
 	/** */
@@ -2481,12 +2487,6 @@ public class UIText extends NLS {
 	public static String PushToGerritWizard_Title;
 
 	/** */
-	public static String ResultDialog_title;
-
-	/** */
-	public static String ResultDialog_label;
-
-	/** */
 	public static String FetchAction_wrongURITitle;
 
 	/** */
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/push/PushResultDialog.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/push/PushResultDialog.java
index a948139ac4..5d43e333e9 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/push/PushResultDialog.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/push/PushResultDialog.java
@@ -101,7 +101,7 @@ class PushResultDialog extends TitleAreaDialog {
 	protected Control createDialogArea(final Composite parent) {
 		final Composite composite = (Composite) super.createDialogArea(parent);
 		String pushErrors = getPushErrors();
-		setTitle(NLS.bind(UIText.ResultDialog_label, destinationString));
+		setTitle(NLS.bind(UIText.PushResultDialog_label, destinationString));
 		if (pushErrors != null && pushErrors.length() > 0)
 			setErrorMessage(pushErrors);
 		final PushResultTable table = new PushResultTable(composite);
@@ -114,7 +114,7 @@ class PushResultDialog extends TitleAreaDialog {
 		tableControl.setLayoutData(tableLayout);
 
 		getShell().setText(
-				NLS.bind(UIText.ResultDialog_title, destinationString));
+				NLS.bind(UIText.PushResultDialog_title, destinationString));
 		applyDialogFont(composite);
 		return composite;
 	}
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/uitext.properties b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/uitext.properties
index 3a78a1d6f8..b9777d26de 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/uitext.properties
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/uitext.properties
@@ -790,6 +790,8 @@ CreateRepositoryPage_PageTitle=Create a New Git Repository
 CreateRepositoryPage_PleaseSelectDirectoryMessage=Please select a directory
 CreateRepositoryPage_PleaseUseAbsoluePathMessage=Please use an absolute path
 CreateRepositoryPage_RepositoryNameLabel=&Name:
+PushResultDialog_title=Push Results: {0}
+PushResultDialog_label=Pushed to {0}
 PushResultDialog_ConfigureButton=&Configure...
 PushResultTable_columnStatusRepo=Status: Repository #{0}
 PushResultTable_columnDst=Destination Ref
@@ -822,8 +824,6 @@ PushToGerritPage_MissingUriMessage=Select a URI
 PushToGerritPage_Title=Push the current HEAD from repository {0} to Gerrit
 PushToGerritPage_UriLabel=&URI:
 PushToGerritWizard_Title=Push the current HEAD to Gerrit
-ResultDialog_title=Push Results: {0}
-ResultDialog_label=Pushed to {0}
 
 FetchAction_wrongURITitle=Corrupted Configuration
 FetchAction_wrongURIMessage=Remote repositories URIs configuration is corrupted.