From e2b84054ef70e395572c29f4b886a468e36f25f7 Mon Sep 17 00:00:00 2001 From: David Inglis Date: Tue, 16 Nov 2004 21:34:26 +0000 Subject: [PATCH] use default constant for terminal --- .../eclipse/cdt/launch/internal/LocalRunLaunchDelegate.java | 2 +- .../src/org/eclipse/cdt/launch/ui/CMainTab.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/LocalRunLaunchDelegate.java b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/LocalRunLaunchDelegate.java index 95bcb790b19..aa773f1d1c1 100644 --- a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/LocalRunLaunchDelegate.java +++ b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/LocalRunLaunchDelegate.java @@ -120,7 +120,7 @@ public class LocalRunLaunchDelegate extends AbstractCLaunchDelegate { command.add(exePath.toOSString()); command.addAll(Arrays.asList(arguments)); String[] commandArray = (String[]) command.toArray(new String[command.size()]); - boolean usePty = config.getAttribute(ICDTLaunchConfigurationConstants.ATTR_USE_TERMINAL, true); + boolean usePty = config.getAttribute(ICDTLaunchConfigurationConstants.ATTR_USE_TERMINAL, ICDTLaunchConfigurationConstants.USE_TERMINAL_DEFAULT); monitor.worked(5); Process process = exec(commandArray, getEnvironment(config), wd, usePty); monitor.worked(3); diff --git a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CMainTab.java b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CMainTab.java index d1af181e7b6..93f4b27d286 100644 --- a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CMainTab.java +++ b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/ui/CMainTab.java @@ -246,7 +246,7 @@ public class CMainTab extends CLaunchConfigurationTab { if (fTerminalButton != null) { boolean useTerminal = true; try { - useTerminal = config.getAttribute(ICDTLaunchConfigurationConstants.ATTR_USE_TERMINAL, true); + useTerminal = config.getAttribute(ICDTLaunchConfigurationConstants.ATTR_USE_TERMINAL, ICDTLaunchConfigurationConstants.USE_TERMINAL_DEFAULT); } catch (CoreException e) { LaunchUIPlugin.log(e); } @@ -597,7 +597,7 @@ public class CMainTab extends CLaunchConfigurationTab { initializeProgramName(cElement, config); } if (wantsTerminalOption()) { - config.setAttribute(ICDTLaunchConfigurationConstants.ATTR_USE_TERMINAL, true); + config.setAttribute(ICDTLaunchConfigurationConstants.ATTR_USE_TERMINAL, ICDTLaunchConfigurationConstants.USE_TERMINAL_DEFAULT); } }