Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormgolubev2014-01-17 09:22:42 -0500
committermgolubev2014-01-17 09:22:42 -0500
commit34ce65bf55a2bd14a17c1ac90fa45ac94666bc09 (patch)
tree5e49c2ee57657f03b1615a4b7a14bba0a9f535a4
parent6948c7b27b14181e0f0cd97b3740432eb5d93746 (diff)
downloadorg.eclipse.gmf-tooling-403577-v2014-no-more-TopLevel-vs-ChildNodes.tar.gz
org.eclipse.gmf-tooling-403577-v2014-no-more-TopLevel-vs-ChildNodes.tar.xz
org.eclipse.gmf-tooling-403577-v2014-no-more-TopLevel-vs-ChildNodes.zip
[403577] - catchup, model files had not been committed for moving403577-v2014-no-more-TopLevel-vs-ChildNodes
findFacetForContainerOrDiagram Change-Id: I6411ffb0ffc6ea3097f737de844cc3d2bac20497
-rw-r--r--plugins/org.eclipse.gmf.codegen/models/gmfgen.ecore6
-rw-r--r--plugins/org.eclipse.gmf.codegen/models/gmfgen.emf4
-rw-r--r--plugins/org.eclipse.gmf.codegen/models/gmfgen.genmodel6
3 files changed, 8 insertions, 8 deletions
diff --git a/plugins/org.eclipse.gmf.codegen/models/gmfgen.ecore b/plugins/org.eclipse.gmf.codegen/models/gmfgen.ecore
index b5897b65a..6593c15d4 100644
--- a/plugins/org.eclipse.gmf.codegen/models/gmfgen.ecore
+++ b/plugins/org.eclipse.gmf.codegen/models/gmfgen.ecore
@@ -845,6 +845,9 @@
</eAnnotations>
</eOperations>
<eOperations name="getCreateCommandQualifiedClassName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eOperations name="findFacetForContainerOrDiagram" eType="#//TypeModelFacet">
+ <eParameters name="container" eType="#//GenContainerBase"/>
+ </eOperations>
<eStructuralFeatures xsi:type="ecore:EReference" name="modelFacet" eType="#//TypeModelFacet"
containment="true"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="labels" upperBound="-1"
@@ -905,9 +908,6 @@
<details key="documentation" value="All model facets, for toplevel- and child- modes"/>
</eAnnotations>
</eOperations>
- <eOperations name="findFacetForContainerOrDiagram" eType="#//TypeModelFacet">
- <eParameters name="container" eType="#//GenContainerBase"/>
- </eOperations>
<eOperations name="mayServeAsTopLevel" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="diagram" lowerBound="1"
eType="#//GenDiagram" changeable="false" resolveProxies="false" eOpposite="#//GenDiagram/multiFacetedNodes"/>
diff --git a/plugins/org.eclipse.gmf.codegen/models/gmfgen.emf b/plugins/org.eclipse.gmf.codegen/models/gmfgen.emf
index 1bf19a13e..49e45d350 100644
--- a/plugins/org.eclipse.gmf.codegen/models/gmfgen.emf
+++ b/plugins/org.eclipse.gmf.codegen/models/gmfgen.emf
@@ -605,6 +605,8 @@ abstract class GenNode extends GenChildContainer, GenLinkEnd {
op String getCreateCommandQualifiedClassName();
attr String createCommandClassName;
readonly transient derived volatile ref GenLink[*] reorientedIncomingLinks;
+
+ op TypeModelFacet findFacetForContainerOrDiagram(GenContainerBase container);
}
@@ -647,8 +649,6 @@ class GenMultiFacetedNode extends GenChildNodeBase {
@genmodel(documentation="All model facets, for toplevel- and child- modes")
op TypeModelFacet[*] allModelFacets();
- op TypeModelFacet findFacetForContainerOrDiagram(GenContainerBase container);
-
op boolean mayServeAsTopLevel();
}
diff --git a/plugins/org.eclipse.gmf.codegen/models/gmfgen.genmodel b/plugins/org.eclipse.gmf.codegen/models/gmfgen.genmodel
index 6ae225166..9cf5c65a2 100644
--- a/plugins/org.eclipse.gmf.codegen/models/gmfgen.genmodel
+++ b/plugins/org.eclipse.gmf.codegen/models/gmfgen.genmodel
@@ -506,6 +506,9 @@
<genOperations ecoreOperation="gmfgen.ecore#//GenNode/getDomainMetaClass"/>
<genOperations ecoreOperation="gmfgen.ecore#//GenNode/getGraphicalNodeEditPolicyQualifiedClassName"/>
<genOperations ecoreOperation="gmfgen.ecore#//GenNode/getCreateCommandQualifiedClassName"/>
+ <genOperations ecoreOperation="gmfgen.ecore#//GenNode/findFacetForContainerOrDiagram">
+ <genParameters ecoreParameter="gmfgen.ecore#//GenNode/findFacetForContainerOrDiagram/container"/>
+ </genOperations>
</genClasses>
<genClasses ecoreClass="gmfgen.ecore#//GenTopLevelNode">
<genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference gmfgen.ecore#//GenTopLevelNode/diagram"/>
@@ -523,9 +526,6 @@
<genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference gmfgen.ecore#//GenMultiFacetedNode/diagram"/>
<genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference gmfgen.ecore#//GenMultiFacetedNode/additionalModelFacets"/>
<genOperations ecoreOperation="gmfgen.ecore#//GenMultiFacetedNode/allModelFacets"/>
- <genOperations ecoreOperation="gmfgen.ecore#//GenMultiFacetedNode/findFacetForContainerOrDiagram">
- <genParameters ecoreParameter="gmfgen.ecore#//GenMultiFacetedNode/findFacetForContainerOrDiagram/container"/>
- </genOperations>
<genOperations ecoreOperation="gmfgen.ecore#//GenMultiFacetedNode/mayServeAsTopLevel"/>
</genClasses>
<genClasses ecoreClass="gmfgen.ecore#//TypeNodeModelFacet">

Back to the top