diff options
| author | Matthew Davis | 2013-03-28 23:19:38 +0000 |
|---|---|---|
| committer | Matthew Davis | 2013-03-28 23:19:38 +0000 |
| commit | 8652ad1df03283592ee94c38dfe38706ba9a0165 (patch) | |
| tree | 239477a27e04990674434d351fac69a738fd2cf6 | |
| parent | ac9c4e29f4e2d0a89df163ea9b18e5646c16b800 (diff) | |
| download | org.eclipse.stem-8652ad1df03283592ee94c38dfe38706ba9a0165.tar.gz org.eclipse.stem-8652ad1df03283592ee94c38dfe38706ba9a0165.tar.xz org.eclipse.stem-8652ad1df03283592ee94c38dfe38706ba9a0165.zip | |
Adds label (IntegrationLabel) into the list of generated parameters for expression functions
git-svn-id: http://dev.eclipse.org/svnroot/technology/org.eclipse.stem/trunk@3678 92a21009-5b66-0410-b83a-dc787c41c6e9
3 files changed, 26 insertions, 1 deletions
diff --git a/modelgen/org.eclipse.stem.model.ctdl.functions/plugin.xml b/modelgen/org.eclipse.stem.model.ctdl.functions/plugin.xml index 4a86f8841..a8e7f469d 100644 --- a/modelgen/org.eclipse.stem.model.ctdl.functions/plugin.xml +++ b/modelgen/org.eclipse.stem.model.ctdl.functions/plugin.xml @@ -129,6 +129,22 @@ </function> <function + name="test8" + className="org.eclipse.stem.model.ctdl.functions.TestFunctions" + methodName="test8Method"> + <functionParams> + <functionParam name="x" type="double" /> + </functionParams> + <generatedParams> + <generatedParam name="time" mapsFrom="time" /> + <generatedParam name="node" mapsFrom="node" /> + <generatedParam name="x" mapsFrom="x" /> + <generatedParam mapsFrom="label" /> + <generatedParam mapsFrom="labelValue" /> + </generatedParams> + </function> + + <function name="one" className="org.eclipse.stem.model.ctdl.functions.TestFunctions" methodName="one"> diff --git a/modelgen/org.eclipse.stem.model.ctdl.functions/src/org/eclipse/stem/model/ctdl/functions/STEMDSLUtils.java b/modelgen/org.eclipse.stem.model.ctdl.functions/src/org/eclipse/stem/model/ctdl/functions/STEMDSLUtils.java index 6d89f2da4..c37b5470f 100644 --- a/modelgen/org.eclipse.stem.model.ctdl.functions/src/org/eclipse/stem/model/ctdl/functions/STEMDSLUtils.java +++ b/modelgen/org.eclipse.stem.model.ctdl.functions/src/org/eclipse/stem/model/ctdl/functions/STEMDSLUtils.java @@ -24,7 +24,9 @@ public class STEMDSLUtils GLOBAL_USER_VARS.put("t", double.class); GLOBAL_SYSTEM_VARS - .put("time", org.eclipse.stem.core.model.STEMTime.class); + .put("time", org.eclipse.stem.core.model.STEMTime.class); + GLOBAL_SYSTEM_VARS.put("label", + org.eclipse.stem.core.graph.Label.class); GLOBAL_SYSTEM_VARS.put("labelValue", org.eclipse.stem.core.graph.LabelValue.class); GLOBAL_SYSTEM_VARS.put("node", diff --git a/modelgen/org.eclipse.stem.model.ctdl.functions/src/org/eclipse/stem/model/ctdl/functions/TestFunctions.java b/modelgen/org.eclipse.stem.model.ctdl.functions/src/org/eclipse/stem/model/ctdl/functions/TestFunctions.java index 6d3be8019..af52bee2c 100644 --- a/modelgen/org.eclipse.stem.model.ctdl.functions/src/org/eclipse/stem/model/ctdl/functions/TestFunctions.java +++ b/modelgen/org.eclipse.stem.model.ctdl.functions/src/org/eclipse/stem/model/ctdl/functions/TestFunctions.java @@ -10,6 +10,8 @@ *******************************************************************************/ package org.eclipse.stem.model.ctdl.functions; +import org.eclipse.stem.core.graph.Label; +import org.eclipse.stem.core.graph.LabelValue; import org.eclipse.stem.core.graph.Node; import org.eclipse.stem.core.model.STEMTime; @@ -51,6 +53,11 @@ public class TestFunctions return ""; } + public static double test8Method(STEMTime time, Node n, double x, Label label, LabelValue labelValue) + { + return 0.0; + } + public static double one() { return 1; |