Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoratikhomirov2008-04-17 07:58:46 -0400
committeratikhomirov2008-04-17 07:58:46 -0400
commit6d5a317c2f5fb57aeab3b184763b6559649b0bb5 (patch)
treed6d61f753ea51f9c73965c1e7838a8173d9b9bb0
parent3a5a8397886581b96e27957fcb9f40b3013a785f (diff)
downloadorg.eclipse.gmf-tooling-6d5a317c2f5fb57aeab3b184763b6559649b0bb5.tar.gz
org.eclipse.gmf-tooling-6d5a317c2f5fb57aeab3b184763b6559649b0bb5.tar.xz
org.eclipse.gmf-tooling-6d5a317c2f5fb57aeab3b184763b6559649b0bb5.zip
[227505] Replace FeatureValueSpec generalization of ValueExpression with aggregation, as it's better approach to model such a concept
-rw-r--r--tests/org.eclipse.gmf.tests/models/migration/patch_138440.gmfmap4
-rw-r--r--tests/org.eclipse.gmf.tests/src/org/eclipse/gmf/tests/setup/LinksSessionSetup.java7
2 files changed, 7 insertions, 4 deletions
diff --git a/tests/org.eclipse.gmf.tests/models/migration/patch_138440.gmfmap b/tests/org.eclipse.gmf.tests/models/migration/patch_138440.gmfmap
index 7cb63743f..0625e8387 100644
--- a/tests/org.eclipse.gmf.tests/models/migration/patch_138440.gmfmap
+++ b/tests/org.eclipse.gmf.tests/models/migration/patch_138440.gmfmap
@@ -12,8 +12,8 @@
href="../../../../plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EClass"/>
<domainInitializer
xsi:type="gmfmap:FeatureSeqInitializer">
- <initializers
- body="'a String'">
+ <initializers>
+ <value body="'a String'"/>
<feature
xsi:type="ecore:EAttribute"
href="../../../../plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//ENamedElement/name"/>
diff --git a/tests/org.eclipse.gmf.tests/src/org/eclipse/gmf/tests/setup/LinksSessionSetup.java b/tests/org.eclipse.gmf.tests/src/org/eclipse/gmf/tests/setup/LinksSessionSetup.java
index c39a515d3..52dd788df 100644
--- a/tests/org.eclipse.gmf.tests/src/org/eclipse/gmf/tests/setup/LinksSessionSetup.java
+++ b/tests/org.eclipse.gmf.tests/src/org/eclipse/gmf/tests/setup/LinksSessionSetup.java
@@ -53,6 +53,7 @@ import org.eclipse.gmf.mappings.MetricRule;
import org.eclipse.gmf.mappings.NodeMapping;
import org.eclipse.gmf.mappings.ReferenceNewElementSpec;
import org.eclipse.gmf.mappings.Severity;
+import org.eclipse.gmf.mappings.ValueExpression;
import org.eclipse.gmf.tests.EPath;
import org.eclipse.gmf.tests.Plugin;
import org.osgi.framework.BundleException;
@@ -322,8 +323,10 @@ public class LinksSessionSetup extends SessionSetup {
FeatureInitializer createInitializer() {
FeatureValueSpec featureValueSpec = GMFMapFactory.eINSTANCE.createFeatureValueSpec();
featureValueSpec.setFeature(feature);
- featureValueSpec.setBody(expressionBody);
- featureValueSpec.setLanguage(expressionLang);
+ ValueExpression value = GMFMapFactory.eINSTANCE.createValueExpression();
+ value.setBody(expressionBody);
+ value.setLanguage(expressionLang);
+ featureValueSpec.setValue(value);
return featureValueSpec;
}
};

Back to the top