diff options
4 files changed, 17 insertions, 1 deletions
diff --git a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/gitflow/FeatureFinishSquashHandlerTest.java b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/gitflow/FeatureFinishSquashHandlerTest.java index eb5f18f1b9..c5925cc38e 100644 --- a/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/gitflow/FeatureFinishSquashHandlerTest.java +++ b/org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/gitflow/FeatureFinishSquashHandlerTest.java @@ -99,7 +99,9 @@ public class FeatureFinishSquashHandlerTest extends String text = bot.styledText().getText(); text = text.substring(text.indexOf('\n')); bot.styledText().setText(SQUASHED_COMMENT_SUMMARY + text); - bot.button("OK").click(); + bot.button( + org.eclipse.egit.ui.internal.UIText.RebaseInteractiveHandler_EditMessageDialogOkButton) + .click(); } @Override 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 2e9099554d..a40c35f8a9 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 @@ -805,6 +805,9 @@ public class UIText extends NLS { public static String RebaseInteractiveHandler_EditMessageDialogTitle; /** */ + public static String RebaseInteractiveHandler_EditMessageDialogOkButton; + + /** */ public static String RebaseInteractiveStepActionToolBarProvider_SkipText; /** */ diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/rebase/CommitMessageEditorDialog.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/rebase/CommitMessageEditorDialog.java index efac3f628f..1393dfbc8e 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/rebase/CommitMessageEditorDialog.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/rebase/CommitMessageEditorDialog.java @@ -16,6 +16,7 @@ package org.eclipse.egit.ui.internal.rebase; import org.eclipse.egit.ui.Activator; import org.eclipse.egit.ui.internal.UIText; import org.eclipse.egit.ui.internal.dialogs.SpellcheckableMessageArea; +import org.eclipse.jface.dialogs.IDialogConstants; import org.eclipse.jface.dialogs.IDialogSettings; import org.eclipse.jface.dialogs.TitleAreaDialog; import org.eclipse.jface.layout.GridDataFactory; @@ -131,4 +132,13 @@ public class CommitMessageEditorDialog extends TitleAreaDialog { super.configureShell(newShell); newShell.setText(title); } + + @Override + protected void createButtonsForButtonBar(Composite parent) { + createButton(parent, IDialogConstants.OK_ID, + UIText.RebaseInteractiveHandler_EditMessageDialogOkButton, + true); + createButton(parent, IDialogConstants.CANCEL_ID, + IDialogConstants.CANCEL_LABEL, false); + } } 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 b276f8e635..f2bd449b3f 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 @@ -343,6 +343,7 @@ RebaseCurrentRefCommand_RebasingCurrentJobName=Rebasing Branch {0} on {1} RebaseCurrentRefCommand_ErrorGettingCurrentBranchMessage=Error getting the branch to rebase RebaseInteractiveHandler_EditMessageDialogText=Edit the commit message. Lines starting with a \# are comments and will be ignored. RebaseInteractiveHandler_EditMessageDialogTitle=Edit Commit Message +RebaseInteractiveHandler_EditMessageDialogOkButton=&Reword RebaseInteractiveStepActionToolBarProvider_SkipText=Skip RebaseInteractiveStepActionToolBarProvider_SkipDesc=Remove the commit from the history RebaseInteractiveStepActionToolBarProvider_EditText=Edit |