Bug 533601 - Add Bookmark dialog should use verbs

Change-Id: I52dedf5568747c3e055d7d2ac67c0131a0d8a9e7
Signed-off-by: Jonas Hungershausen <jonas.hungershausen@vogella.com>

2 files changed, 23 insertions, 1 deletions

diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/ConstructedTextEditorMessages.properties b/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/ConstructedTextEditorMessages.properties
index 6504cfad8da..ed62308b807 100644
--- a/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/ConstructedTextEditorMessages.properties
+++ b/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/ConstructedTextEditorMessages.properties
@@ -44,6 +44,7 @@ Editor.ManageBookmarks.add.label=Add Boo&kmark...
 Editor.ManageBookmarks.remove.label=Remove Boo&kmark
 Editor.ManageBookmarks.add.dialog.title=Add Bookmark
 Editor.ManageBookmarks.add.dialog.message=Enter Bookmark name:
+Editor.ManageBookmarks.add.dialog.addbutton=&Add
 Editor.ManageBookmarks.error.dialog.title=Managing Bookmarks
 Editor.ManageBookmarks.error.dialog.message=Problems managing bookmarks
 
diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/MarkerRulerAction.java b/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/MarkerRulerAction.java
index 033b413a032..fe70489f437 100644
--- a/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/MarkerRulerAction.java
+++ b/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/MarkerRulerAction.java
@@ -20,6 +20,8 @@ import java.util.ResourceBundle;
 
 import org.osgi.framework.Bundle;
 
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Shell;
 
 import org.eclipse.core.commands.ExecutionException;
@@ -400,13 +402,14 @@ public class MarkerRulerAction extends ResourceAction implements IUpdate {
 		String proposal= (o instanceof String) ? (String) o : ""; //$NON-NLS-1$
 		String title= getString(fBundle, fPrefix + "add.dialog.title", fPrefix + "add.dialog.title"); //$NON-NLS-2$ //$NON-NLS-1$
 		String message= getString(fBundle, fPrefix + "add.dialog.message", fPrefix + "add.dialog.message"); //$NON-NLS-2$ //$NON-NLS-1$
+		String addButtonText= getString(fBundle, fPrefix + "add.dialog.addbutton", fPrefix + "add.dialog.addbutton"); //$NON-NLS-1$ //$NON-NLS-2$
 		IInputValidator inputValidator= new IInputValidator() {
 			@Override
 			public String isValid(String newText) {
 				return (newText == null || newText.trim().length() == 0) ? " " : null; //$NON-NLS-1$
 			}
 		};
-		InputDialog dialog= new InputDialog(fTextEditor.getSite().getShell(), title, message, proposal, inputValidator);
+		AddBookmarkDialog dialog= new AddBookmarkDialog(fTextEditor.getSite().getShell(), title, message, proposal, inputValidator, addButtonText);
 
 		String label= null;
 		if (dialog.open() != Window.CANCEL)
@@ -423,6 +426,24 @@ public class MarkerRulerAction extends ResourceAction implements IUpdate {
 		return true;
 	}
 
+	class AddBookmarkDialog extends InputDialog {
+
+		private final String addButtonText;
+
+		public AddBookmarkDialog(Shell parentShell, String dialogTitle, String dialogMessage, String initialValue, IInputValidator validator, String addButtonText) {
+			super(parentShell, dialogTitle, dialogMessage, initialValue, validator);
+			this.addButtonText= addButtonText;
+		}
+
+		@Override
+		protected void createButtonsForButtonBar(Composite parent) {
+			super.createButtonsForButtonBar(parent);
+			Button okButton= getOkButton();
+			okButton.setText(addButtonText);
+		}
+
+	}
+
 	/**
 	 * Returns the attributes with which a newly created marker will be
 	 * initialized.