Change confirm hard reset dialog Yes- and No-button label

Adds new String ("&Reset") and uses it as Yes-button label for the
confirm hard reset dialog.

Changes No-Button label to "Cancel"

Changes creation of MessageDialog in CommandConfirmation.

Bug: 514470
Change-Id: I7da9a33cc64b84200aed8529fbd51ed8121b18e3
Signed-off-by: David Weiser <david.weiser@vogella.com>

5 files changed, 19 insertions, 4 deletions

diff --git a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/team/actions/BranchAndResetActionTest.java b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/team/actions/BranchAndResetActionTest.java
index a9e88e172c..4505672333 100644
--- a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/team/actions/BranchAndResetActionTest.java
+++ b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/team/actions/BranchAndResetActionTest.java
@@ -280,7 +280,8 @@ public class BranchAndResetActionTest extends LocalRepositoryTestCase {
 				.click();
 
 		bot.shell(UIText.ResetTargetSelectionDialog_ResetQuestion).bot()
-				.button(IDialogConstants.YES_LABEL).click();
+				.button(UIText.CommandConfirmationHardResetDialog_resetButtonLabel)
+				.click();
 
 		Job.getJobManager().join(JobFamilies.RESET, null);
 		String reset = getTestFileContent();
diff --git a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/view/repositories/GitRepositoriesViewTagHandlingTest.java b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/view/repositories/GitRepositoriesViewTagHandlingTest.java
index fc9fec341e..73adfcbf8c 100644
--- a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/view/repositories/GitRepositoriesViewTagHandlingTest.java
+++ b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/view/repositories/GitRepositoriesViewTagHandlingTest.java
@@ -164,7 +164,8 @@ public class GitRepositoriesViewTagHandlingTest extends
 		TestUtil.joinJobs(JobFamilies.RESET);
 
 		bot.shell(UIText.ResetTargetSelectionDialog_ResetQuestion).bot()
-				.button(IDialogConstants.YES_LABEL).click();
+				.button(UIText.CommandConfirmationHardResetDialog_resetButtonLabel)
+				.click();
 
 		TestUtil.waitForJobs(50, 5000);
 		Job.getJobManager().join(JobFamilies.RESET, null);
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 012baecb6f..c6ec3d61e1 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
@@ -5535,6 +5535,9 @@ public class UIText extends NLS {
 	/** */
 	public static String StagingViewPreferencePage_maxLimitListMode;
 
+	/** */
+	public static String CommandConfirmationHardResetDialog_resetButtonLabel;
+
 	static {
 		initializeMessages(BUNDLE_NAME, UIText.class);
 	}
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/CommandConfirmation.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/CommandConfirmation.java
index c01ca363c4..47285f1f60 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/CommandConfirmation.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/dialogs/CommandConfirmation.java
@@ -18,7 +18,9 @@ import java.util.Collections;
 import org.eclipse.debug.core.ILaunchConfiguration;
 import org.eclipse.egit.ui.internal.UIText;
 import org.eclipse.egit.ui.internal.branch.LaunchFinder;
+import org.eclipse.jface.dialogs.IDialogConstants;
 import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.jface.window.Window;
 import org.eclipse.jgit.lib.Repository;
 import org.eclipse.swt.widgets.Shell;
 
@@ -47,7 +49,13 @@ public class CommandConfirmation {
 		} else {
 			question = MessageFormat.format(question, ""); //$NON-NLS-1$
 		}
-		return MessageDialog.openQuestion(shell,
-				UIText.ResetTargetSelectionDialog_ResetQuestion, question);
+
+		MessageDialog messageDialog = new MessageDialog(shell,
+				UIText.ResetTargetSelectionDialog_ResetQuestion, null, question,
+				MessageDialog.QUESTION, 0,
+				UIText.CommandConfirmationHardResetDialog_resetButtonLabel,
+				IDialogConstants.CANCEL_LABEL);
+
+		return messageDialog.open() == Window.OK;
 	}
 }
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 c5565d819d..7d989095e9 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
@@ -1949,3 +1949,5 @@ DiffStyleRangeFormatter_diffTruncated=[...] diff truncated after {0} lines.
 
 StagingViewPreferencePage_title=Staging View
 StagingViewPreferencePage_maxLimitListMode=Switch to compact mode if files number exceeds:
+
+CommandConfirmationHardResetDialog_resetButtonLabel=&Reset