Revert "Bug 511198 - Save Resource should use "Save" / "Don't save"
instead of Yes / No"
This reverts commit ec9b497ece4293b634cc7648d70a26a4dcd08965.
diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/SaveableHelper.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/SaveableHelper.java
index 52b2ce1..085c209 100644
--- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/SaveableHelper.java
+++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/SaveableHelper.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2004, 2017 IBM Corporation and others.
+ * Copyright (c) 2004, 2015 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -9,7 +9,6 @@
* IBM Corporation - initial API and implementation
* Andrey Loskutov <loskutov@gmx.de> - Bug 372799
* Lars Vogel <Lars.Vogel@vogella.com> - Bug 472654
- * Patrik Suzzi <psuzzi@gmail.com> - Bug 511198
*******************************************************************************/
package org.eclipse.ui.internal;
@@ -121,8 +120,8 @@
WorkbenchMessages.Save_Resource, null, message,
MessageDialog.QUESTION,
0,
- WorkbenchMessages.Save,
- WorkbenchMessages.Dont_Save,
+ IDialogConstants.YES_LABEL,
+ IDialogConstants.NO_LABEL,
IDialogConstants.CANCEL_LABEL) {
@Override
protected int getShellStyle() {
diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/SaveablesList.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/SaveablesList.java
index 9ce2f97..8d20eff 100644
--- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/SaveablesList.java
+++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/SaveablesList.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2006, 2017 IBM Corporation and others.
+ * Copyright (c) 2006, 2016 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -8,7 +8,7 @@
* Contributors:
* IBM Corporation - initial API and implementation
* Andrey Loskutov <loskutov@gmx.de> - Bug 372799
- * Patrik Suzzi <psuzzi@gmail.com> - Bug 490700, 511198
+ * Patrik Suzzi <psuzzi@gmail.com> - Bug 490700
*******************************************************************************/
package org.eclipse.ui.internal;
@@ -19,7 +19,6 @@
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
-import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
@@ -489,26 +488,28 @@
} else if (modelsToSave.size() == 1) {
Saveable model = modelsToSave.get(0);
// Show a dialog.
+ String[] buttons;
+ if(canCancel) {
+ buttons = new String[] { IDialogConstants.YES_LABEL,
+ IDialogConstants.NO_LABEL,
+ IDialogConstants.CANCEL_LABEL };
+ } else {
+ buttons = new String[] { IDialogConstants.YES_LABEL,
+ IDialogConstants.NO_LABEL};
+ }
// don't save if we don't prompt
int choice = ISaveablePart2.NO;
MessageDialog dialog;
if (stillOpenElsewhere) {
- Map<String, Integer> buttonLabelToIdMap = new LinkedHashMap<>();
- buttonLabelToIdMap.put(WorkbenchMessages.Save, IDialogConstants.OK_ID);
- buttonLabelToIdMap.put(WorkbenchMessages.Dont_Save, IDialogConstants.NO_ID);
- if (canCancel) {
- buttonLabelToIdMap.put(IDialogConstants.CANCEL_LABEL, IDialogConstants.CANCEL_ID);
- }
String message = NLS
.bind(
WorkbenchMessages.EditorManager_saveChangesOptionallyQuestion,
model.getName());
MessageDialogWithToggle dialogWithToggle = new MessageDialogWithToggle(shellProvider.getShell(),
WorkbenchMessages.Save_Resource, null, message,
- MessageDialog.QUESTION, buttonLabelToIdMap, 0,
- WorkbenchMessages.EditorManager_closeWithoutPromptingOption, false) {
+ MessageDialog.QUESTION, buttons, 0, WorkbenchMessages.EditorManager_closeWithoutPromptingOption, false) {
@Override
protected int getShellStyle() {
return (canCancel ? SWT.CLOSE : SWT.NONE)
@@ -519,14 +520,6 @@
};
dialog = dialogWithToggle;
} else {
- String[] buttons;
- if (canCancel) {
- buttons = new String[] { WorkbenchMessages.Save, WorkbenchMessages.Dont_Save,
- IDialogConstants.CANCEL_LABEL };
- } else {
- buttons = new String[] { WorkbenchMessages.Save, WorkbenchMessages.Dont_Save };
- }
-
String message = NLS
.bind(
WorkbenchMessages.EditorManager_saveChangesQuestion,
@@ -793,7 +786,7 @@
@Override
protected void createButtonsForButtonBar(Composite parent) {
createButton(parent, IDialogConstants.OK_ID,
- WorkbenchMessages.Save, true);
+ IDialogConstants.OK_LABEL, true);
if (canCancel) {
createButton(parent, IDialogConstants.CANCEL_ID,
IDialogConstants.CANCEL_LABEL, false);
diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbenchMessages.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbenchMessages.java
index b039865..aa0dea1 100644
--- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbenchMessages.java
+++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/WorkbenchMessages.java
@@ -14,7 +14,7 @@
* Implemented workbench auto-save to correctly restore state in case of crash.
* Andrey Loskutov <loskutov@gmx.de> - Bug 388476, 445538, 463262
* Alain Bernard <alain.bernard1224@gmail.com> - Bug 281490
- * Patrik Suzzi <psuzzi@gmail.com> - Bug 491785, 368977, 501811, 511198
+ * Patrik Suzzi <psuzzi@gmail.com> - Bug 491785, 368977, 501811
*******************************************************************************/
package org.eclipse.ui.internal;
@@ -632,7 +632,6 @@
public static String Save_Resource;
public static String Saving_Modifications;
public static String Save_All;
- public static String Dont_Save;
// ==============================================================================
diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/messages.properties b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/messages.properties
index 0081df8..6024950 100644
--- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/messages.properties
+++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/messages.properties
@@ -18,7 +18,7 @@
# Andrey Loskutov <loskutov@gmx.de> - Bug 445538
# Alain Bernard <alain.bernard1224@gmail.com> - Bug 281490
# Lars Vogel <Lars.Vogel@vogella.com> - Bug 407432
-# Patrik Suzzi <psuzzi@gmail.com> - Bug 491572, 491785, 501811, 511198
+# Patrik Suzzi <psuzzi@gmail.com> - Bug 491572, 491785, 501811
###############################################################################
# package: org.eclipse.ui
@@ -584,7 +584,7 @@
Save_Resource = Save Resource
Saving_Modifications = Saving modifications
Save_All = Save All
-Dont_Save = Don't Save
+
# ==============================================================================
# Perspective Framework
diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dialogs/UIMessageDialogs.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dialogs/UIMessageDialogs.java
index fc7f043..c2e2434 100644
--- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dialogs/UIMessageDialogs.java
+++ b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dialogs/UIMessageDialogs.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2017 IBM Corporation and others.
+ * Copyright (c) 2000, 2016 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -7,7 +7,7 @@
*
* Contributors:
* IBM Corporation - initial API and implementation
- * Patrik Suzzi <psuzzi@gmail.com> - Bug 490700, 489250, 511198
+ * Patrik Suzzi <psuzzi@gmail.com> - Bug 490700, Bug 489250
*******************************************************************************/
package org.eclipse.ui.tests.dialogs;
@@ -250,7 +250,7 @@
public void testSaveChanges() {
Dialog dialog = new MessageDialog(getShell(), WorkbenchMessages.Save_Resource, null, NLS.bind(WorkbenchMessages.EditorManager_saveChangesQuestion, (new Object[] { DUMMY_RESOURCE })), MessageDialog.QUESTION,
- 0, WorkbenchMessages.Save, WorkbenchMessages.Dont_Save, IDialogConstants.CANCEL_LABEL);
+ 0,IDialogConstants.YES_LABEL, IDialogConstants.NO_LABEL, IDialogConstants.CANCEL_LABEL);
DialogCheck.assertDialog(dialog, this);
}
diff --git a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dialogs/UIMessageDialogsAuto.java b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dialogs/UIMessageDialogsAuto.java
index 275eb5d..36a8906 100644
--- a/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dialogs/UIMessageDialogsAuto.java
+++ b/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/dialogs/UIMessageDialogsAuto.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2017 IBM Corporation and others.
+ * Copyright (c) 2000, 2016 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -7,7 +7,7 @@
*
* Contributors:
* IBM Corporation - initial API and implementation
- * Patrik Suzzi <psuzzi@gmail.com> - Bug 490700, 489250, 511198
+ * Patrik Suzzi <psuzzi@gmail.com> - Bug 490700, Bug 489250
*******************************************************************************/
package org.eclipse.ui.tests.dialogs;
@@ -238,8 +238,8 @@
public void testSaveAsOverwrite() {
Dialog dialog = new MessageDialog(getShell(), "WorkbenchMessages.Question", null, DUMMY_RELATIVE_PATH,
- MessageDialog.QUESTION, 0,
- IDialogConstants.YES_LABEL,
+ MessageDialog.QUESTION, 0,
+ IDialogConstants.YES_LABEL,
IDialogConstants.NO_LABEL,
IDialogConstants.CANCEL_LABEL);
DialogCheck.assertDialogTexts(dialog, this);
@@ -248,7 +248,8 @@
public void testSaveChanges() {
Dialog dialog = new MessageDialog(getShell(), WorkbenchMessages.Save_Resource, null, NLS.bind(WorkbenchMessages.EditorManager_saveChangesQuestion, (new Object[] { DUMMY_RESOURCE })), MessageDialog.QUESTION,
0,
- WorkbenchMessages.Save, WorkbenchMessages.Dont_Save,
+ IDialogConstants.YES_LABEL,
+ IDialogConstants.NO_LABEL,
IDialogConstants.CANCEL_LABEL);
DialogCheck.assertDialogTexts(dialog, this);
}
