Bug 531724 - Use verbs instead of OK in all JDT UI "Generate" dialogs
Change-Id: Idbeeaaa7a22e13c35833c9cc4040cd375de9d5d9
Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/actions/ActionMessages.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/actions/ActionMessages.java
index 0b155ed..871d55d 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/actions/ActionMessages.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/actions/ActionMessages.java
@@ -28,12 +28,14 @@
public static String AddDelegateMethodsAction_template_link_message;
public static String AddDelegateMethodsAction_template_link_tooltip;
+ public static String AddDelegateMethodsAction_generate_button;
public static String AddGetterSetterAction_allow_setters_for_finals_description;
public static String AddGetterSetterAction_error_not_in_source_file;
public static String AddGetterSetterAction_template_link_description;
public static String AddGetterSetterAction_template_link_tooltip;
public static String AddUnimplementedConstructorsAction_template_link_message;
public static String AddUnimplementedConstructorsAction_template_link_tooltip;
+ public static String AddUnimplementedConstructorsAction_button_generate;
public static String GenerateConstructorUsingFieldsSelectionDialog_template_link_message;
public static String GenerateConstructorUsingFieldsSelectionDialog_template_link_tooltip;
@@ -225,6 +227,7 @@
public static String GenerateConstructorUsingFieldsSelectionDialog_up_button;
public static String GenerateConstructorUsingFieldsSelectionDialog_down_button;
public static String GenerateConstructorUsingFieldsSelectionDialog_sort_constructor_choices_label;
+ public static String GenerateConstructorUsingFieldsSelectionDialog_button_generate;
public static String GenerateConstructorUsingFieldsSelectionDialog_omit_super;
public static String GenerateConstructorUsingFieldsAction_error_anonymous_class;
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/actions/ActionMessages.properties b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/actions/ActionMessages.properties
index 20b005b..4a90838 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/actions/ActionMessages.properties
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/actions/ActionMessages.properties
@@ -180,9 +180,11 @@
AddUnimplementedConstructorsAction_template_link_tooltip=Show the code templates preferences.
AddUnimplementedConstructorsAction_template_link_message=The format of the constructors may be configured on the <a>Code Templates</a> preference page.
+AddUnimplementedConstructorsAction_button_generate=&Generate
GenerateConstructorUsingFieldsSelectionDialog_template_link_tooltip=Show the code templates preferences.
GenerateConstructorUsingFieldsSelectionDialog_template_link_message=The format of the constructors may be configured on the <a>Code Templates</a> preference page.
+GenerateConstructorUsingFieldsSelectionDialog_button_generate=&Generate
AddJavaDocStubAction_label=Generate Element Commen&t
AddJavaDocStubAction_description=Add a comment stub to the member element
@@ -378,6 +380,7 @@
AddDelegateMethodsAction_not_in_source_file=The Generate Delegate Methods operation is only applicable to fields and types in source files.
AddDelegateMethodsAction_template_link_message=The format of the delegate methods may be configured on the <a>Code Templates</a> preference page.
AddDelegateMethodsAction_template_link_tooltip=Show the code templates preferences.
+AddDelegateMethodsAction_generate_button=&Generate
ToggleLinkingAction_label=Lin&k with Editor
ToggleLinkingAction_tooltip=Link with Editor
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/actions/GenerateConstructorUsingFieldsSelectionDialog.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/actions/GenerateConstructorUsingFieldsSelectionDialog.java
index ff6a799..fdf05dd 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/actions/GenerateConstructorUsingFieldsSelectionDialog.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/actions/GenerateConstructorUsingFieldsSelectionDialog.java
@@ -157,6 +157,12 @@
}
@Override
+ protected void createButtonsForButtonBar(Composite parent) {
+ createButton(parent, IDialogConstants.OK_ID, ActionMessages.GenerateConstructorUsingFieldsSelectionDialog_button_generate, true);
+ createButton(parent, IDialogConstants.CANCEL_ID, IDialogConstants.CANCEL_LABEL, false);
+ }
+
+ @Override
protected void buttonPressed(int buttonId) {
super.buttonPressed(buttonId);
switch (buttonId) {
@@ -335,8 +341,8 @@
int numButtons= 2; // up, down
fButtonControls= new Button[numButtons];
fButtonsEnabled= new boolean[numButtons];
- fButtonControls[GenerateConstructorUsingFieldsSelectionDialog.UP_INDEX]= createButton(buttonComposite, UP_BUTTON, ActionMessages.GenerateConstructorUsingFieldsSelectionDialog_up_button, false);
- fButtonControls[GenerateConstructorUsingFieldsSelectionDialog.DOWN_INDEX]= createButton(buttonComposite, DOWN_BUTTON, ActionMessages.GenerateConstructorUsingFieldsSelectionDialog_down_button, false);
+ fButtonControls[GenerateConstructorUsingFieldsSelectionDialog.UP_INDEX]= createButton(buttonComposite, UP_BUTTON, ActionMessages.GenerateConstructorUsingFieldsSelectionDialog_up_button,false);
+ fButtonControls[GenerateConstructorUsingFieldsSelectionDialog.DOWN_INDEX]= createButton(buttonComposite, DOWN_BUTTON, ActionMessages.GenerateConstructorUsingFieldsSelectionDialog_down_button,false);
boolean defaultState= false;
fButtonControls[GenerateConstructorUsingFieldsSelectionDialog.UP_INDEX].setEnabled(defaultState);
fButtonControls[GenerateConstructorUsingFieldsSelectionDialog.DOWN_INDEX].setEnabled(defaultState);
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/actions/AddDelegateMethodsAction.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/actions/AddDelegateMethodsAction.java
index ea19ba5..0797f82 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/actions/AddDelegateMethodsAction.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/actions/AddDelegateMethodsAction.java
@@ -32,6 +32,7 @@
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.jface.dialogs.IDialogConstants;
import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.jface.operation.IRunnableContext;
import org.eclipse.jface.viewers.ILabelProvider;
@@ -251,9 +252,13 @@
PlatformUI.getWorkbench().getHelpSystem().setHelp(shell, IJavaHelpContextIds.ADD_DELEGATE_METHODS_SELECTION_DIALOG);
}
- /*
- * @see org.eclipse.jdt.internal.ui.dialogs.SourceActionDialog#createLinkControl(org.eclipse.swt.widgets.Composite)
- */
+ @Override
+ protected void createButtonsForButtonBar(Composite parent) {
+ createButton(parent, IDialogConstants.OK_ID,ActionMessages.AddDelegateMethodsAction_generate_button , true);
+ createButton(parent, IDialogConstants.CANCEL_ID, IDialogConstants.CANCEL_LABEL, false);
+
+ }
+
@Override
protected Control createLinkControl(Composite composite) {
Link link= new Link(composite, SWT.WRAP);
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/actions/AddUnimplementedConstructorsAction.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/actions/AddUnimplementedConstructorsAction.java
index 7588136..9eff053 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/actions/AddUnimplementedConstructorsAction.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/ui/actions/AddUnimplementedConstructorsAction.java
@@ -286,9 +286,12 @@
return entryComposite;
}
- /*
- * @see org.eclipse.jdt.internal.ui.dialogs.SourceActionDialog#createLinkControl(org.eclipse.swt.widgets.Composite)
- */
+ @Override
+ protected void createButtonsForButtonBar(Composite parent) {
+ createButton(parent, IDialogConstants.OK_ID, ActionMessages.AddUnimplementedConstructorsAction_button_generate, true);
+ createButton(parent, IDialogConstants.CANCEL_ID, IDialogConstants.CANCEL_LABEL, false);
+ }
+
@Override
protected Control createLinkControl(Composite composite) {
Link link= new Link(composite, SWT.WRAP);
