diff options
| author | Uwe Stieber | 2012-01-19 12:59:06 +0000 |
|---|---|---|
| committer | Uwe Stieber | 2012-01-19 12:59:55 +0000 |
| commit | 0865d86bb6138a1b54b9a13bc871c7d810cd06fb (patch) | |
| tree | a8858fed4ccbc4935f077d662968abb03178d5be /target_explorer/plugins/org.eclipse.tcf.te.tcf.core.scripting | |
| parent | eeba7def07f337ffb82eaf2752ead2ef6ee0fe97 (diff) | |
| download | org.eclipse.tcf-0865d86bb6138a1b54b9a13bc871c7d810cd06fb.tar.gz org.eclipse.tcf-0865d86bb6138a1b54b9a13bc871c7d810cd06fb.tar.xz org.eclipse.tcf-0865d86bb6138a1b54b9a13bc871c7d810cd06fb.zip | |
Target Explorer: 'null' argument not passed on correctly by the ScriptPad
Diffstat (limited to 'target_explorer/plugins/org.eclipse.tcf.te.tcf.core.scripting')
2 files changed, 6 insertions, 2 deletions
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.core.scripting/src/org/eclipse/tcf/te/tcf/core/scripting/parser/Parser.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.core.scripting/src/org/eclipse/tcf/te/tcf/core/scripting/parser/Parser.java index 087765d99..a174f39d3 100644 --- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.core.scripting/src/org/eclipse/tcf/te/tcf/core/scripting/parser/Parser.java +++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.core.scripting/src/org/eclipse/tcf/te/tcf/core/scripting/parser/Parser.java @@ -105,6 +105,11 @@ public class Parser { String tok = tokenizer.nextToken();
if (tok == null || "".equals(tok.trim())) continue; //$NON-NLS-1$
+ if (tok.equals("null")) { //$NON-NLS-1$
+ token.addArgument(null);
+ continue;
+ }
+
if (tok.startsWith("\"")) { //$NON-NLS-1$
// String type
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.core.scripting/src/org/eclipse/tcf/te/tcf/core/scripting/parser/Token.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.core.scripting/src/org/eclipse/tcf/te/tcf/core/scripting/parser/Token.java index 18c838c43..ddeea161e 100644 --- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.core.scripting/src/org/eclipse/tcf/te/tcf/core/scripting/parser/Token.java +++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.core.scripting/src/org/eclipse/tcf/te/tcf/core/scripting/parser/Token.java @@ -72,10 +72,9 @@ public final class Token { /**
* Adds an argument to the command arguments list.
*
- * @param arg The argument. Must not be <code>null</code>.
+ * @param arg The argument or <code>null</code>.
*/
public void addArgument(Object arg) {
- Assert.isNotNull(arg);
if (arguments == null) arguments = new ArrayList<Object>();
arguments.add(arg);
}
|