diff options
author | Sarika Sinha | 2016-04-16 18:25:38 +0000 |
---|---|---|
committer | Sarika Sinha | 2016-04-16 18:25:38 +0000 |
commit | f526797aa48b1a05bae915958dda0bbc49aa0231 (patch) | |
tree | 1b990a6111b886ab5b95282c02f5590f64296771 | |
parent | f11a8af2a6470b63524d9d14b8110a09850e5dce (diff) | |
download | eclipse.platform.debug-f526797aa48b1a05bae915958dda0bbc49aa0231.tar.gz eclipse.platform.debug-f526797aa48b1a05bae915958dda0bbc49aa0231.tar.xz eclipse.platform.debug-f526797aa48b1a05bae915958dda0bbc49aa0231.zip |
Bug 487554 - Add "Terminate and Relaunch" to menu and toolbarI20160419-0800I20160417-1112
Change-Id: I662be435ba0f808746aa4120d2314cec009684c1
3 files changed, 8 insertions, 3 deletions
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/ActionMessages.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/ActionMessages.java index 3caa49be3..2b617ba5d 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/ActionMessages.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/ActionMessages.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2013 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 @@ -223,6 +223,7 @@ public class ActionMessages extends NLS { public static String SuspendAction_3; public static String TerminateAction_0; public static String TerminateAction_3; + public static String TerminateAndLaunchFailure; public static String TerminateAllAction_2; public static String TerminateAllAction_3; diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/ActionMessages.properties b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/ActionMessages.properties index 6fd5b8ea8..25055ad1f 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/ActionMessages.properties +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/actions/ActionMessages.properties @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2000, 2013 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 @@ -172,6 +172,7 @@ TerminateAllAction_2=Termi&nate/Disconnect All TerminateAllAction_3=Terminate/Disconnect All TerminateAction_0=&Terminate TerminateAction_3=Terminate +TerminateAndLaunchFailure=Failed to terminate {0} StepReturnAction_2=Step Return StepReturnAction_3=Step Ret&urn StepIntoAction_0=Step &Into diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/LaunchAction.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/LaunchAction.java index 4321268cf..8b8500256 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/LaunchAction.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/ui/actions/LaunchAction.java @@ -15,6 +15,8 @@ import java.util.ArrayList; import java.util.Set; import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.Status; import org.eclipse.debug.core.DebugException; import org.eclipse.debug.core.DebugPlugin; import org.eclipse.debug.core.ILaunch; @@ -33,6 +35,7 @@ import org.eclipse.jface.dialogs.IDialogConstants; import org.eclipse.jface.dialogs.MessageDialogWithToggle; import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.jface.viewers.StructuredSelection; +import org.eclipse.osgi.util.NLS; import org.eclipse.swt.SWT; import org.eclipse.swt.widgets.Event; import org.eclipse.ui.PlatformUI; @@ -93,7 +96,7 @@ public class LaunchAction extends Action { try { iLaunch.terminate(); } catch (DebugException e) { - e.printStackTrace(); + DebugUIPlugin.log(new Status(IStatus.ERROR, DebugUIPlugin.getUniqueIdentifier(), NLS.bind(ActionMessages.TerminateAndLaunchFailure, iLaunch.getLaunchConfiguration().getName()), e)); } } } |