Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Weiser2017-05-15 11:29:09 -0400
committerThomas Wolf2017-05-22 07:31:40 -0400
commit12c9eae766ad1ef99a0337d559b0b0db2619ca96 (patch)
tree14bb09330020fe53f6ddb3b137732440614c638b /org.eclipse.egit.ui.test/src/org/eclipse/egit
parent275ec2823632670ac00451f16b4ed9cec7a1fe59 (diff)
downloadegit-12c9eae766ad1ef99a0337d559b0b0db2619ca96.tar.gz
egit-12c9eae766ad1ef99a0337d559b0b0db2619ca96.tar.xz
egit-12c9eae766ad1ef99a0337d559b0b0db2619ca96.zip
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>
Diffstat (limited to 'org.eclipse.egit.ui.test/src/org/eclipse/egit')
-rw-r--r--org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/team/actions/BranchAndResetActionTest.java3
-rw-r--r--org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/view/repositories/GitRepositoriesViewTagHandlingTest.java3
2 files changed, 4 insertions, 2 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 a9e88e172..450567233 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 fc9fec341..73adfcbf8 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);

Back to the top