Bug 526871 - "Older Workspace Version" dialog button should use verb
The open workspace dialog OK button now uses the verb "Continue".
Change-Id: I858c9a14a33b9ce5a97c1faf1d92544ea686b01d
Signed-off-by: Patrik Suzzi <psuzzi@gmail.com>
diff --git a/bundles/org.eclipse.ui.ide.application/src/org/eclipse/ui/internal/ide/application/IDEApplication.java b/bundles/org.eclipse.ui.ide.application/src/org/eclipse/ui/internal/ide/application/IDEApplication.java
index e71198c..e55d01a 100644
--- a/bundles/org.eclipse.ui.ide.application/src/org/eclipse/ui/internal/ide/application/IDEApplication.java
+++ b/bundles/org.eclipse.ui.ide.application/src/org/eclipse/ui/internal/ide/application/IDEApplication.java
@@ -41,6 +41,7 @@
import org.eclipse.jface.window.Window;
import org.eclipse.osgi.service.datalocation.Location;
import org.eclipse.osgi.util.NLS;
+import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.ui.IWorkbench;
@@ -479,9 +480,11 @@
boolean keepOnWarning = prefStore.getBoolean(IDEInternalPreferences.WARN_ABOUT_WORKSPACE_INCOMPATIBILITY);
if (keepOnWarning) {
MessageDialogWithToggle dialog = new MessageDialogWithToggle(shell, title, null, message, severity,
- new String[] {IDialogConstants.OK_LABEL, IDialogConstants.CANCEL_LABEL}, 0,
- IDEWorkbenchMessages.IDEApplication_version_doNotWarnAgain, false);
- if (dialog.open() != Window.OK) {
+ new String[] { IDEWorkbenchMessages.IDEApplication_version_continue,
+ IDialogConstants.CANCEL_LABEL },
+ 0, IDEWorkbenchMessages.IDEApplication_version_doNotWarnAgain, false);
+ int returnCode = dialog.open();
+ if (returnCode == Window.CANCEL || returnCode == SWT.DEFAULT) {
return false;
}
keepOnWarning = !dialog.getToggleState();
diff --git a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/IDEWorkbenchMessages.java b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/IDEWorkbenchMessages.java
index 6a2252e..abaf086 100644
--- a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/IDEWorkbenchMessages.java
+++ b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/IDEWorkbenchMessages.java
@@ -992,6 +992,7 @@
public static String IDEApplication_versionMessage_newerWorkspace;
public static String IDEApplication_versionMessage_olderWorkspace;
public static String IDEApplication_version_doNotWarnAgain;
+ public static String IDEApplication_version_continue;
public static String GlobalBuildAction_BuildRunningTitle;
public static String GlobalBuildAction_BuildRunningMessage;
public static String CleanDialog_buildCleanAuto;
diff --git a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/messages.properties b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/messages.properties
index 81da472..52b524d 100644
--- a/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/messages.properties
+++ b/bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/messages.properties
@@ -1019,6 +1019,7 @@
IDEApplication_versionMessage_newerWorkspace=Workspace ''{0}'' was written with a newer version of the product and can be incompatible with this version. \
If you continue, this can cause unexpected behavior or data loss.\n\nAre you sure you want to continue with this workspace?
IDEApplication_version_doNotWarnAgain=&Do not warn again about workspace versions
+IDEApplication_version_continue=C&ontinue
CleanDialog_buildCleanAuto=Clean discards all build results and states. The selected projects will be rebuilt from scratch.
CleanDialog_buildCleanManual=Clean discards all build results and states. The next time a build occurs the selected projects will be rebuilt from scratch.
