From c1be110cad133ab4a9a14ae7b2c016895dee10b6 Mon Sep 17 00:00:00 2001 From: David Inglis Date: Tue, 3 Sep 2002 14:47:45 +0000 Subject: [PATCH] changed runtimeoption arguments to String[] --- .../org/eclipse/cdt/debug/core/cdi/ICDIRuntimeOptions.java | 2 +- .../org/eclipse/cdt/debug/mi/core/cdi/RuntimeOptions.java | 6 +++--- .../launch/internal/LocalCLaunchConfigurationDelegate.java | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDIRuntimeOptions.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDIRuntimeOptions.java index 722075e48cd..7ee1313d2ea 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDIRuntimeOptions.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/cdi/ICDIRuntimeOptions.java @@ -20,7 +20,7 @@ public interface ICDIRuntimeOptions { * * @param args the string representing the arguments. */ - void setArguments(String args); + void setArguments(String[] args); /** * Program/Inferior environment settings. diff --git a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/RuntimeOptions.java b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/RuntimeOptions.java index b0b76cef8fa..4946f989b54 100644 --- a/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/RuntimeOptions.java +++ b/debug/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/RuntimeOptions.java @@ -36,13 +36,13 @@ public class RuntimeOptions implements ICDIRuntimeOptions { /** * @see org.eclipse.cdt.debug.core.cdi.ICDIRuntimeOptions#setArguments(String) */ - public void setArguments(String args) { - if (args == null || args.length() == 0) { + public void setArguments(String[] args) { + if (args == null || args.length == 0) { return; } MISession mi = session.getMISession(); CommandFactory factory = mi.getCommandFactory(); - MIExecArguments arguments = factory.createMIExecArguments(new String[]{args}); + MIExecArguments arguments = factory.createMIExecArguments(args); try { mi.postCommand(arguments); MIInfo info = arguments.getMIInfo(); diff --git a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/LocalCLaunchConfigurationDelegate.java b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/LocalCLaunchConfigurationDelegate.java index d73a29dbf44..ccb33405e4e 100644 --- a/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/LocalCLaunchConfigurationDelegate.java +++ b/launch/org.eclipse.cdt.launch/src/org/eclipse/cdt/launch/internal/LocalCLaunchConfigurationDelegate.java @@ -144,8 +144,8 @@ public class LocalCLaunchConfigurationDelegate extends AbstractCLaunchDelegate { e); throw new CoreException(status); } - ICDIRuntimeOptions opt = dsession.getRuntimeOptions(); - opt.setArguments(config.getAttribute(ICDTLaunchConfigurationConstants.ATTR_PROGRAM_ARGUMENTS, "")); + ICDIRuntimeOptions opt = dsession.getRuntimeOptions(); + opt.setArguments(getProgramArgumentsArray(config)); File wd = getWorkingDir(config); if (wd != null) { opt.setWorkingDirectory(wd.toString());