Add a way to cancel if workspace is in use

Added #3rd Cancel button, close window button behaves as Cancel button,
hence cancels launch.

Fixes #2628

Co-authored-by: Aaron Pang  <[email protected]>
Co-authored-by: Yash Patel  <[email protected]>

Author: 3 people

bundles/org.eclipse.ui.ide.application/src/org/eclipse/ui/internal/ide/application/IDEApplication.java

@@ -122,6 +122,13 @@ public class IDEApplication implements IApplication, IExecutableExtension {
 	 */
 	private static final int RETRY_LOAD = 0;
 
+	/**
+	 * Return value when the user wants to cancel launch since workspace already
+	 * occupied
+	 */
+	private static final int CANCEL_LAUNCH = 2;
+	private static final int CANCEL_LAUNCH_DEFAULT = -1;
+
 	/**
 	 * A special return code that will be recognized by the PDE launcher and used to
 	 * show an error dialog if the workspace is locked.
@@ -374,8 +381,9 @@ protected Object checkInstanceLocation(Shell shell, Map applicationArguments) {
 
 			MessageDialog dialog = new MessageDialog(null, IDEWorkbenchMessages.IDEApplication_workspaceInUseTitle,
 					null, NLS.bind(IDEWorkbenchMessages.IDEApplication_workspaceInUseMessage, workspaceUrl.getFile()),
-					MessageDialog.ERROR, 1, IDEWorkbenchMessages.IDEApplication_workspaceInUse_Retry,
-					IDEWorkbenchMessages.IDEApplication_workspaceInUse_Choose) {
+					MessageDialog.ERROR, 2, IDEWorkbenchMessages.IDEApplication_workspaceInUse_Retry,
+					IDEWorkbenchMessages.IDEApplication_workspaceInUse_Choose,
+					IDEWorkbenchMessages.IDEApplication_workspaceInUse_Cancel) {
 				@Override
 				protected Control createCustomArea(Composite parent) {
 					if (lockInfo == null || lockInfo.isBlank()) {
@@ -393,6 +401,11 @@ protected Control createCustomArea(Composite parent) {
 			};
 			// the return value influences the next loop's iteration
 			returnValue = dialog.open();
+
+			if (returnValue == CANCEL_LAUNCH || returnValue == CANCEL_LAUNCH_DEFAULT) {
+				return EXIT_OK;
+			}
+
 			// Remember the locked workspace as recent workspace
 			launchData.writePersistedData();
 		}

bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/IDEWorkbenchMessages.java

@@ -1043,6 +1043,7 @@ public class IDEWorkbenchMessages extends NLS {
 	public static String IDEApplication_workspaceInUseMessage;
 	public static String IDEApplication_workspaceInUse_Choose;
 	public static String IDEApplication_workspaceInUse_Retry;
+	public static String IDEApplication_workspaceInUse_Cancel;
 	public static String IDEApplication_workspaceEmptyTitle;
 	public static String IDEApplication_workspaceEmptyMessage;
 	public static String IDEApplication_workspaceInvalidTitle;

bundles/org.eclipse.ui.ide/src/org/eclipse/ui/internal/ide/messages.properties

@@ -1067,6 +1067,7 @@ IDEApplication_workspaceInUseTitle=Workspace Unavailable
 IDEApplication_workspaceInUseMessage=Please choose another workspace as ''{0}'' is currently in use.
 IDEApplication_workspaceInUse_Choose=&Choose
 IDEApplication_workspaceInUse_Retry=&Retry
+IDEApplication_workspaceInUse_Cancel=&Cancel
 IDEApplication_workspaceEmptyTitle=Workspace Required
 IDEApplication_workspaceEmptyMessage=Workspace field must not be empty; enter a path to continue.
 IDEApplication_workspaceInvalidTitle=Invalid Workspace