Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Wolf2019-08-21 15:06:30 +0000
committerThomas Wolf2019-08-21 16:08:20 +0000
commit70207c34222a4bcb0fc56c3810080dd5e5621430 (patch)
treef003bd9965b8d4e8d7c8395c30cdb345334e42ee /org.eclipse.egit.ui.test/src
parent9a0e6920c9e134d8a7848ca289645e79f9e4d6fa (diff)
downloadegit-70207c34222a4bcb0fc56c3810080dd5e5621430.tar.gz
egit-70207c34222a4bcb0fc56c3810080dd5e5621430.tar.xz
egit-70207c34222a4bcb0fc56c3810080dd5e5621430.zip
Shorten confirmation messages for "reset hard" and "discard changes"
Eliminate the "Are you sure?"-like extra questions. They're not necessary; the dialogs tell the user what's going to happen and present a "Reset"/"Discard Changes" button and a "Cancel" button. The explicit questions were a left-over from older code where the dialogs had just "Yes"/"No" or "OK"/"Cancel" buttons. Incidentally constructing the message texts becomes simpler because the warning text about running launches doesn't have to be inserted somewhere in the middle but can simply be tacked onto the end. Bug: 550292 Bug: 550293 Change-Id: I9365737ef08fe43f29142ca1ae6851464282a334 Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
Diffstat (limited to 'org.eclipse.egit.ui.test/src')
-rw-r--r--org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/test/team/actions/BranchAndResetActionTest.java2
-rw-r--r--org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/view/repositories/GitRepositoriesViewTagHandlingTest.java2
2 files changed, 2 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 33c4cc9b4c..11c05b3059 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
@@ -317,7 +317,7 @@ public class BranchAndResetActionTest extends LocalRepositoryTestCase {
resetDialog.bot().button(UIText.ResetTargetSelectionDialog_ResetButton)
.click();
- bot.shell(UIText.ResetTargetSelectionDialog_ResetQuestion).bot()
+ bot.shell(UIText.ResetTargetSelectionDialog_ResetConfirmTitle).bot()
.button(UIText.CommandConfirmationHardResetDialog_resetButtonLabel)
.click();
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 8c6696f546..b743a121b2 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
@@ -160,7 +160,7 @@ public class GitRepositoriesViewTagHandlingTest extends
resetDialog.bot().button(IDialogConstants.FINISH_LABEL).click();
TestUtil.joinJobs(JobFamilies.RESET);
- bot.shell(UIText.ResetTargetSelectionDialog_ResetQuestion).bot()
+ bot.shell(UIText.ResetTargetSelectionDialog_ResetConfirmTitle).bot()
.button(UIText.CommandConfirmationHardResetDialog_resetButtonLabel)
.click();

Back to the top