Bug 514354 - Use "Abort" instead of "OK" in "Workspace unavailable" di
The workspace unavailable (reload) dialog now shows the Cancel button.
see: https://bugs.eclipse.org/bugs/attachment.cgi?id=267706
Change-Id: Id4d821793a01cd7c82f41106fb25943acb4af0ca
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 e73976c..b7b1283 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
@@ -320,7 +320,7 @@
MessageDialog dialog = new MessageDialog(shell, IDEWorkbenchMessages.IDEApplication_workspaceInUseTitle,
null, NLS.bind(IDEWorkbenchMessages.IDEApplication_workspaceInUseMessage, workspaceUrl.getFile()),
MessageDialog.ERROR, 1, IDEWorkbenchMessages.IDEApplication_workspaceInUse_Retry,
- IDEWorkbenchMessages.IDEApplication_workspaceInUse_Ok);
+ IDEWorkbenchMessages.IDEApplication_workspaceInUse_Cancel);
// the return value influences the next loop's iteration
returnValue = dialog.open();
}
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 cd7a5b0..383aeb5 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
@@ -972,7 +972,7 @@
public static String IDEApplication_workspaceMandatoryMessage;
public static String IDEApplication_workspaceInUseTitle;
public static String IDEApplication_workspaceInUseMessage;
- public static String IDEApplication_workspaceInUse_Ok;
+ public static String IDEApplication_workspaceInUse_Cancel;
public static String IDEApplication_workspaceInUse_Retry;
public static String IDEApplication_workspaceEmptyTitle;
public static String IDEApplication_workspaceEmptyMessage;
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 ced1603..aa10859 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
@@ -996,7 +996,7 @@
IDEApplication_workspaceMandatoryMessage=IDEs need a valid workspace. Restart without the @none option.
IDEApplication_workspaceInUseTitle=Workspace Unavailable
IDEApplication_workspaceInUseMessage=The default workspace ''{0}'' is in use or cannot be created. Please choose a different one.
-IDEApplication_workspaceInUse_Ok=Ok
+IDEApplication_workspaceInUse_Cancel=Cancel
IDEApplication_workspaceInUse_Retry=Retry
IDEApplication_workspaceEmptyTitle=Workspace Required
IDEApplication_workspaceEmptyMessage=Workspace field must not be empty; enter a path to continue.
