Bug 129554 - [preferences] Edit Template: Rename Yes/No buttons andI20200214-0620I20200213-1800I20200213-1520I20200213-1210I20200213-1100I20200213-0640I20200212-1810I20200212-1800

dialog text

Change-Id: I6e336627810b695d77349d21aeceb609e5b8ed70
Signed-off-by: Gautier de Saint Martin Lacaze <gautier.desaintmartinlacaze@gmail.com>

3 files changed, 15 insertions, 4 deletions

diff --git a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/templates/TemplatePreferencePage.java b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/templates/TemplatePreferencePage.java
index 5db91d5668c..b1077de8b81 100644
--- a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/templates/TemplatePreferencePage.java
+++ b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/templates/TemplatePreferencePage.java
@@ -1203,9 +1203,7 @@ public abstract class TemplatePreferencePage extends PreferencePage implements I
 		if (newTemplate != null) {
 
 			if (!newTemplate.getName().equals(oldTemplate.getName()) &&
-				MessageDialog.openQuestion(getShell(),
-				TemplatesMessages.TemplatePreferencePage_question_create_new_title,
-				TemplatesMessages.TemplatePreferencePage_question_create_new_message))
+					openCreateNewOrRenameDialog())
 			{
 				data= new TemplatePersistenceData(newTemplate, true);
 				fTemplateStore.add(data);
@@ -1436,6 +1434,15 @@ public abstract class TemplatePreferencePage extends PreferencePage implements I
 		MessageDialog.openError(getShell(), title, message);
 	}
 
+	private boolean openCreateNewOrRenameDialog() {
+		MessageDialog dialog = new MessageDialog(getShell(),
+				TemplatesMessages.TemplatePreferencePage_question_create_new_title, null,
+				TemplatesMessages.TemplatePreferencePage_question_create_new_message, MessageDialog.QUESTION, 0,
+				TemplatesMessages.TemplatePreferencePage_question_create_new_button_create,
+				TemplatesMessages.TemplatePreferencePage_question_create_new_button_rename);
+		return dialog.open() == 0;
+	}
+
 	protected SourceViewer getViewer() {
 		return fPatternViewer;
 	}
diff --git a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/templates/TemplatesMessages.java b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/templates/TemplatesMessages.java
index da6c60b138b..acc613f86e2 100644
--- a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/templates/TemplatesMessages.java
+++ b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/templates/TemplatesMessages.java
@@ -64,6 +64,8 @@ final class TemplatesMessages extends NLS {
 	public static String TemplatePreferencePage_error_write_message;
 	public static String TemplatePreferencePage_question_create_new_title;
 	public static String TemplatePreferencePage_question_create_new_message;
+	public static String TemplatePreferencePage_question_create_new_button_create;
+	public static String TemplatePreferencePage_question_create_new_button_rename;
 	public static String TemplatePreferencePage_preview;
 	public static String EditTemplateDialog_error_noname;
 	public static String EditTemplateDialog_error_adjacent_variables;
diff --git a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/templates/TemplatesMessages.properties b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/templates/TemplatesMessages.properties
index a3f3b711b3b..b8fe4225609 100644
--- a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/templates/TemplatesMessages.properties
+++ b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/templates/TemplatesMessages.properties
@@ -58,7 +58,9 @@ TemplatePreferencePage_error_read_message= Failed to read templates. See the err
 TemplatePreferencePage_error_write_message= Failed to write templates. See the error log for details.
 
 TemplatePreferencePage_question_create_new_title= Edit Template
-TemplatePreferencePage_question_create_new_message= The name of the template has been changed. Click 'Yes' to create an additional template with the new name or 'No' to rename the existing one.
+TemplatePreferencePage_question_create_new_message= The name of the template has been changed.
+TemplatePreferencePage_question_create_new_button_create= Create New
+TemplatePreferencePage_question_create_new_button_rename= Rename Existing
 
 TemplatePreferencePage_preview=Previe&w: