diff options
author | Sarika Sinha | 2018-08-02 09:02:47 +0000 |
---|---|---|
committer | Sarika Sinha | 2018-08-14 12:23:54 +0000 |
commit | 697ccec4bd0017586f9221ba90c3017f09804a29 (patch) | |
tree | 5456f85b951680b69b6cad8ef094f540dd5eb00b | |
parent | 3a329a1ad4bdf8732bdb1a712898917f163cc50a (diff) | |
download | eclipse.platform.debug-697ccec4bd0017586f9221ba90c3017f09804a29.tar.gz eclipse.platform.debug-697ccec4bd0017586f9221ba90c3017f09804a29.tar.xz eclipse.platform.debug-697ccec4bd0017586f9221ba90c3017f09804a29.zip |
Bug 537525 - Follow up of Bug 312397 - Run Configuration Command Line toY20180815-2200I20180815-2000I20180815-1250I20180814-2000I20180814-0910I20180814-0900
Clipboard
Change-Id: If197112aa3f36344e0efc5d77be169ae743d9e27
2 files changed, 8 insertions, 1 deletions
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationsMessages.properties b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationsMessages.properties index de89a84d9..2fd2bd86e 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationsMessages.properties +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/LaunchConfigurationsMessages.properties @@ -117,7 +117,7 @@ LaunchConfigurationsDialog_Warning_2=Warning LaunchConfigurationsDialog_Information_3=Information LaunchConfigurationDialog_ShowCommandLine=Sho&w Command Line LaunchConfigurationDialog_ShowCommandLine_Title=Command Line -LaunchConfigurationDialog_ShowCommandLine_Copy=C&opy +LaunchConfigurationDialog_ShowCommandLine_Copy=C&opy && Close LaunchConfigurationDialog_ShowCommandLine_Default=Command Line could not be retrieved. LaunchConfigurationsDialog_0=New launch configuration LaunchConfigurationsDialog_1=Delete selected launch configuration(s) diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/ShowCommandLineDialog.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/ShowCommandLineDialog.java index e333b90b6..6a4f541c4 100644 --- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/ShowCommandLineDialog.java +++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/launchConfigurations/ShowCommandLineDialog.java @@ -23,6 +23,7 @@ import org.eclipse.debug.core.Launch; import org.eclipse.debug.core.model.ILaunchConfigurationDelegate; import org.eclipse.debug.core.model.ILaunchConfigurationDelegate2; import org.eclipse.debug.internal.core.DebugCoreMessages; +import org.eclipse.debug.internal.core.LaunchManager; import org.eclipse.debug.internal.ui.DebugUIPlugin; import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.dialogs.IDialogConstants; @@ -75,6 +76,10 @@ public class ShowCommandLineDialog extends Dialog { createButton(parent, IDialogConstants.CANCEL_ID, IDialogConstants.CANCEL_LABEL, false); } + private LaunchManager getLaunchManager() { + return (LaunchManager) DebugPlugin.getDefault().getLaunchManager(); + } + @Override protected Control createDialogArea(Composite parent) { Composite comp = (Composite) super.createDialogArea(parent); @@ -121,6 +126,8 @@ public class ShowCommandLineDialog extends Dialog { throw new CoreException(status); } } + launch.setAttribute(DebugPlugin.ATTR_CONSOLE_ENCODING, + getLaunchManager().getEncoding(flaunchConfiguration)); } command = delegate.showCommandLine(flaunchConfiguration, fMode, launch, null); |