Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormgolubev2012-02-20 17:37:50 +0000
committermgolubev2012-04-29 17:36:30 +0000
commit6ae738ededecb90eedd0bd10c05c76d54382bb36 (patch)
treed42053ba0469f4443e6b60dd9b340e0a1dcd7ae7
parent51206e54ddf02b2ee71d49e21bd573d1ea30222b (diff)
downloadorg.eclipse.gmf-tooling-6ae738ededecb90eedd0bd10c05c76d54382bb36.tar.gz
org.eclipse.gmf-tooling-6ae738ededecb90eedd0bd10c05c76d54382bb36.tar.xz
org.eclipse.gmf-tooling-6ae738ededecb90eedd0bd10c05c76d54382bb36.zip
weird dependency to org.hamcrest removed
-rw-r--r--plugins/org.eclipse.gmf.map.edit/plugin.properties3
-rw-r--r--plugins/org.eclipse.gmf.map.edit/src/org/eclipse/gmf/mappings/provider/MappingEntryItemProvider.java7
-rw-r--r--plugins/org.eclipse.gmf.map.edit/src/org/eclipse/gmf/mappings/provider/NodeMappingItemProvider.java7
-rw-r--r--plugins/org.eclipse.gmf.map/models/gmfmap.ecore8
-rw-r--r--plugins/org.eclipse.gmf.map/models/gmfmap.emf6
-rw-r--r--plugins/org.eclipse.gmf.map/models/gmfmap.genmodel4
-rw-r--r--plugins/org.eclipse.gmf.map/src/org/eclipse/gmf/mappings/GMFMapPackage.java74
-rw-r--r--plugins/org.eclipse.gmf.map/src/org/eclipse/gmf/mappings/MappingEntry.java19
-rw-r--r--plugins/org.eclipse.gmf.map/src/org/eclipse/gmf/mappings/NodeMapping.java19
-rw-r--r--plugins/org.eclipse.gmf.map/src/org/eclipse/gmf/mappings/VisualEffectMapping.java16
-rw-r--r--plugins/org.eclipse.gmf.map/src/org/eclipse/gmf/mappings/impl/GMFMapPackageImpl.java28
-rw-r--r--plugins/org.eclipse.gmf.map/src/org/eclipse/gmf/mappings/impl/MappingEntryImpl.java39
-rw-r--r--plugins/org.eclipse.gmf.map/src/org/eclipse/gmf/mappings/impl/NodeMappingImpl.java39
-rw-r--r--plugins/org.eclipse.gmf.map/src/org/eclipse/gmf/mappings/impl/VisualEffectMappingImpl.java29
-rw-r--r--tests/org.eclipse.gmf.tests/META-INF/MANIFEST.MF3
15 files changed, 160 insertions, 141 deletions
diff --git a/plugins/org.eclipse.gmf.map.edit/plugin.properties b/plugins/org.eclipse.gmf.map.edit/plugin.properties
index eb4c8bacc..39040daf2 100644
--- a/plugins/org.eclipse.gmf.map.edit/plugin.properties
+++ b/plugins/org.eclipse.gmf.map.edit/plugin.properties
@@ -264,4 +264,5 @@ _UI_VisualEffectMapping_type = Visual Effect Mapping
_UI_VisualEffectMapping_diagramPin_feature = Diagram Pin
_UI_VisualEffectMapping_oclExpression_feature = Ocl Expression
_UI_VisualEffectMapping_parentNode_feature = Parent Node
-_UI_NodeMapping_visualEffects_feature = Visual Effects
+_UI_MappingEntry_visualEffects_feature = Visual Effects
+_UI_VisualEffectMapping_parentMapEntry_feature = Parent Map Entry
diff --git a/plugins/org.eclipse.gmf.map.edit/src/org/eclipse/gmf/mappings/provider/MappingEntryItemProvider.java b/plugins/org.eclipse.gmf.map.edit/src/org/eclipse/gmf/mappings/provider/MappingEntryItemProvider.java
index a767fe8ae..5eac3a9dd 100644
--- a/plugins/org.eclipse.gmf.map.edit/src/org/eclipse/gmf/mappings/provider/MappingEntryItemProvider.java
+++ b/plugins/org.eclipse.gmf.map.edit/src/org/eclipse/gmf/mappings/provider/MappingEntryItemProvider.java
@@ -144,6 +144,7 @@ public class MappingEntryItemProvider
childrenFeatures.add(GMFMapPackage.eINSTANCE.getMappingEntry_DomainSpecialization());
childrenFeatures.add(GMFMapPackage.eINSTANCE.getMappingEntry_DomainInitializer());
childrenFeatures.add(GMFMapPackage.eINSTANCE.getMappingEntry_LabelMappings());
+ childrenFeatures.add(GMFMapPackage.eINSTANCE.getMappingEntry_VisualEffects());
}
return childrenFeatures;
}
@@ -187,6 +188,7 @@ public class MappingEntryItemProvider
case GMFMapPackage.MAPPING_ENTRY__DOMAIN_SPECIALIZATION:
case GMFMapPackage.MAPPING_ENTRY__DOMAIN_INITIALIZER:
case GMFMapPackage.MAPPING_ENTRY__LABEL_MAPPINGS:
+ case GMFMapPackage.MAPPING_ENTRY__VISUAL_EFFECTS:
fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
return;
}
@@ -238,6 +240,11 @@ public class MappingEntryItemProvider
(createChildParameter
(GMFMapPackage.eINSTANCE.getMappingEntry_LabelMappings(),
GMFMapFactory.eINSTANCE.createExpressionLabelMapping()));
+
+ newChildDescriptors.add
+ (createChildParameter
+ (GMFMapPackage.eINSTANCE.getMappingEntry_VisualEffects(),
+ GMFMapFactory.eINSTANCE.createVisualEffectMapping()));
}
/**
diff --git a/plugins/org.eclipse.gmf.map.edit/src/org/eclipse/gmf/mappings/provider/NodeMappingItemProvider.java b/plugins/org.eclipse.gmf.map.edit/src/org/eclipse/gmf/mappings/provider/NodeMappingItemProvider.java
index 04482f68b..836d47d70 100644
--- a/plugins/org.eclipse.gmf.map.edit/src/org/eclipse/gmf/mappings/provider/NodeMappingItemProvider.java
+++ b/plugins/org.eclipse.gmf.map.edit/src/org/eclipse/gmf/mappings/provider/NodeMappingItemProvider.java
@@ -178,7 +178,6 @@ public class NodeMappingItemProvider
super.getChildrenFeatures(object);
childrenFeatures.add(GMFMapPackage.eINSTANCE.getNodeMapping_Children());
childrenFeatures.add(GMFMapPackage.eINSTANCE.getNodeMapping_Compartments());
- childrenFeatures.add(GMFMapPackage.eINSTANCE.getNodeMapping_VisualEffects());
}
return childrenFeatures;
}
@@ -243,7 +242,6 @@ public class NodeMappingItemProvider
switch (notification.getFeatureID(NodeMapping.class)) {
case GMFMapPackage.NODE_MAPPING__CHILDREN:
case GMFMapPackage.NODE_MAPPING__COMPARTMENTS:
- case GMFMapPackage.NODE_MAPPING__VISUAL_EFFECTS:
fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
return;
}
@@ -280,11 +278,6 @@ public class NodeMappingItemProvider
(createChildParameter
(GMFMapPackage.eINSTANCE.getNodeMapping_Compartments(),
GMFMapFactory.eINSTANCE.createCompartmentMapping()));
-
- newChildDescriptors.add
- (createChildParameter
- (GMFMapPackage.eINSTANCE.getNodeMapping_VisualEffects(),
- GMFMapFactory.eINSTANCE.createVisualEffectMapping()));
}
}
diff --git a/plugins/org.eclipse.gmf.map/models/gmfmap.ecore b/plugins/org.eclipse.gmf.map/models/gmfmap.ecore
index d005e6f3b..a399c1e80 100644
--- a/plugins/org.eclipse.gmf.map/models/gmfmap.ecore
+++ b/plugins/org.eclipse.gmf.map/models/gmfmap.ecore
@@ -68,6 +68,8 @@
<details key="documentation" value="Diagrams that may be associated with this diagram element. It's up to client application to define what this association means (e.g. open diagram)"/>
</eAnnotations>
</eStructuralFeatures>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="visualEffects" upperBound="-1"
+ eType="#//VisualEffectMapping" containment="true" eOpposite="#//VisualEffectMapping/parentMapEntry"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="NeedsContainment" abstract="true" interface="true">
<eStructuralFeatures xsi:type="ecore:EReference" name="containmentFeature" eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EReference">
@@ -139,8 +141,6 @@
eType="#//ChildReference" containment="true" eOpposite="#//ChildReference/parentNode"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="compartments" upperBound="-1"
eType="#//CompartmentMapping" containment="true" eOpposite="#//CompartmentMapping/parentNode"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="visualEffects" upperBound="-1"
- eType="#//VisualEffectMapping" containment="true" eOpposite="#//VisualEffectMapping/parentNode"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="CompartmentMapping">
<eStructuralFeatures xsi:type="ecore:EReference" name="compartment" lowerBound="1"
@@ -748,7 +748,7 @@
<eStructuralFeatures xsi:type="ecore:EReference" name="diagramPin" lowerBound="1"
eType="ecore:EClass ../../org.eclipse.gmf.graphdef/models/gmfgraph.ecore#//Pin"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="oclExpression" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="parentNode" lowerBound="1"
- eType="#//NodeMapping" changeable="false" eOpposite="#//NodeMapping/visualEffects"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="parentMapEntry" lowerBound="1"
+ eType="#//MappingEntry" changeable="false" eOpposite="#//MappingEntry/visualEffects"/>
</eClassifiers>
</ecore:EPackage>
diff --git a/plugins/org.eclipse.gmf.map/models/gmfmap.emf b/plugins/org.eclipse.gmf.map/models/gmfmap.emf
index 09d932f5b..5af63d579 100644
--- a/plugins/org.eclipse.gmf.map/models/gmfmap.emf
+++ b/plugins/org.eclipse.gmf.map/models/gmfmap.emf
@@ -58,6 +58,8 @@ abstract class MappingEntry {
ref CanvasMapping[*] relatedDiagrams;
// ref ecore.EClass drtClass; -> extract to interface NotationInstanceAspect, and use it in CanvasMapping
+
+ val VisualEffectMapping[*]#parentMapEntry visualEffects;
}
abstract interface NeedsContainment {
@@ -107,8 +109,6 @@ class NodeMapping extends MappingEntry, MenuOwner, ToolOwner, AppearanceSteward
val CompartmentMapping[*]#parentNode compartments;
//FIXME no containment feature - persist in resource then. Was: @constraints(ocl="not containmentFeature.oclIsUndefined() ", description="The child node mapping containmentFeature must be set")
-
- val VisualEffectMapping[*]#parentNode visualEffects;
}
class CompartmentMapping {
@@ -460,5 +460,5 @@ class VisualEffectMapping {
ref gmfgraph.Pin[1] diagramPin;
attr String oclExpression;
- readonly ref NodeMapping[1]#visualEffects parentNode;
+ readonly ref MappingEntry[1]#visualEffects parentMapEntry;
}
diff --git a/plugins/org.eclipse.gmf.map/models/gmfmap.genmodel b/plugins/org.eclipse.gmf.map/models/gmfmap.genmodel
index 42870b856..21e641034 100644
--- a/plugins/org.eclipse.gmf.map/models/gmfmap.genmodel
+++ b/plugins/org.eclipse.gmf.map/models/gmfmap.genmodel
@@ -45,6 +45,7 @@
ecoreFeature="ecore:EReference gmfmap.ecore#//MappingEntry/domainInitializer"/>
<genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference gmfmap.ecore#//MappingEntry/labelMappings"/>
<genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference gmfmap.ecore#//MappingEntry/relatedDiagrams"/>
+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference gmfmap.ecore#//MappingEntry/visualEffects"/>
<genOperations ecoreOperation="gmfmap.ecore#//MappingEntry/getDomainContext"/>
</genClasses>
<genClasses ecoreClass="gmfmap.ecore#//NeedsContainment">
@@ -68,7 +69,6 @@
ecoreFeature="ecore:EReference gmfmap.ecore#//NodeMapping/diagramNode"/>
<genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference gmfmap.ecore#//NodeMapping/children"/>
<genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference gmfmap.ecore#//NodeMapping/compartments"/>
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference gmfmap.ecore#//NodeMapping/visualEffects"/>
</genClasses>
<genClasses ecoreClass="gmfmap.ecore#//CompartmentMapping">
<genFeatures notify="false" createChild="false" propertyCategory="Visual representation"
@@ -228,7 +228,7 @@
<genClasses ecoreClass="gmfmap.ecore#//VisualEffectMapping">
<genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference gmfmap.ecore#//VisualEffectMapping/diagramPin"/>
<genFeatures createChild="false" propertyMultiLine="true" ecoreFeature="ecore:EAttribute gmfmap.ecore#//VisualEffectMapping/oclExpression"/>
- <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference gmfmap.ecore#//VisualEffectMapping/parentNode"/>
+ <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference gmfmap.ecore#//VisualEffectMapping/parentMapEntry"/>
</genClasses>
</genPackages>
</genmodel:GenModel>
diff --git a/plugins/org.eclipse.gmf.map/src/org/eclipse/gmf/mappings/GMFMapPackage.java b/plugins/org.eclipse.gmf.map/src/org/eclipse/gmf/mappings/GMFMapPackage.java
index 32fc031cc..319f10c2e 100644
--- a/plugins/org.eclipse.gmf.map/src/org/eclipse/gmf/mappings/GMFMapPackage.java
+++ b/plugins/org.eclipse.gmf.map/src/org/eclipse/gmf/mappings/GMFMapPackage.java
@@ -232,13 +232,22 @@ public interface GMFMapPackage extends EPackage {
int MAPPING_ENTRY__RELATED_DIAGRAMS = 4;
/**
+ * The feature id for the '<em><b>Visual Effects</b></em>' containment reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int MAPPING_ENTRY__VISUAL_EFFECTS = 5;
+
+ /**
* The number of structural features of the '<em>Mapping Entry</em>' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- int MAPPING_ENTRY_FEATURE_COUNT = 5;
+ int MAPPING_ENTRY_FEATURE_COUNT = 6;
/**
* The meta object id for the '{@link org.eclipse.gmf.mappings.NeedsContainment <em>Needs Containment</em>}' class.
@@ -497,6 +506,15 @@ public interface GMFMapPackage extends EPackage {
int NODE_MAPPING__RELATED_DIAGRAMS = MAPPING_ENTRY__RELATED_DIAGRAMS;
/**
+ * The feature id for the '<em><b>Visual Effects</b></em>' containment reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int NODE_MAPPING__VISUAL_EFFECTS = MAPPING_ENTRY__VISUAL_EFFECTS;
+
+ /**
* The feature id for the '<em><b>Context Menu</b></em>' reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -551,22 +569,13 @@ public interface GMFMapPackage extends EPackage {
int NODE_MAPPING__COMPARTMENTS = MAPPING_ENTRY_FEATURE_COUNT + 5;
/**
- * The feature id for the '<em><b>Visual Effects</b></em>' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int NODE_MAPPING__VISUAL_EFFECTS = MAPPING_ENTRY_FEATURE_COUNT + 6;
-
- /**
* The number of structural features of the '<em>Node Mapping</em>' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- int NODE_MAPPING_FEATURE_COUNT = MAPPING_ENTRY_FEATURE_COUNT + 7;
+ int NODE_MAPPING_FEATURE_COUNT = MAPPING_ENTRY_FEATURE_COUNT + 6;
/**
* The feature id for the '<em><b>Compartment</b></em>' reference.
@@ -650,6 +659,15 @@ public interface GMFMapPackage extends EPackage {
int LINK_MAPPING__RELATED_DIAGRAMS = MAPPING_ENTRY__RELATED_DIAGRAMS;
/**
+ * The feature id for the '<em><b>Visual Effects</b></em>' containment reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int LINK_MAPPING__VISUAL_EFFECTS = MAPPING_ENTRY__VISUAL_EFFECTS;
+
+ /**
* The feature id for the '<em><b>Containment Feature</b></em>' reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -2121,13 +2139,13 @@ public interface GMFMapPackage extends EPackage {
int VISUAL_EFFECT_MAPPING__OCL_EXPRESSION = 1;
/**
- * The feature id for the '<em><b>Parent Node</b></em>' container reference.
+ * The feature id for the '<em><b>Parent Map Entry</b></em>' container reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- int VISUAL_EFFECT_MAPPING__PARENT_NODE = 2;
+ int VISUAL_EFFECT_MAPPING__PARENT_MAP_ENTRY = 2;
/**
* The number of structural features of the '<em>Visual Effect Mapping</em>' class.
@@ -2236,6 +2254,17 @@ public interface GMFMapPackage extends EPackage {
EReference getMappingEntry_RelatedDiagrams();
/**
+ * Returns the meta object for the containment reference list '{@link org.eclipse.gmf.mappings.MappingEntry#getVisualEffects <em>Visual Effects</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return the meta object for the containment reference list '<em>Visual Effects</em>'.
+ * @see org.eclipse.gmf.mappings.MappingEntry#getVisualEffects()
+ * @see #getMappingEntry()
+ * @generated
+ */
+ EReference getMappingEntry_VisualEffects();
+
+ /**
* Returns the meta object for class '{@link org.eclipse.gmf.mappings.NeedsContainment <em>Needs Containment</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -2407,17 +2436,6 @@ public interface GMFMapPackage extends EPackage {
EReference getNodeMapping_Compartments();
/**
- * Returns the meta object for the containment reference list '{@link org.eclipse.gmf.mappings.NodeMapping#getVisualEffects <em>Visual Effects</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the containment reference list '<em>Visual Effects</em>'.
- * @see org.eclipse.gmf.mappings.NodeMapping#getVisualEffects()
- * @see #getNodeMapping()
- * @generated
- */
- EReference getNodeMapping_VisualEffects();
-
- /**
* Returns the meta object for class '{@link org.eclipse.gmf.mappings.CompartmentMapping <em>Compartment Mapping</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -3650,15 +3668,15 @@ public interface GMFMapPackage extends EPackage {
EAttribute getVisualEffectMapping_OclExpression();
/**
- * Returns the meta object for the container reference '{@link org.eclipse.gmf.mappings.VisualEffectMapping#getParentNode <em>Parent Node</em>}'.
+ * Returns the meta object for the container reference '{@link org.eclipse.gmf.mappings.VisualEffectMapping#getParentMapEntry <em>Parent Map Entry</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @return the meta object for the container reference '<em>Parent Node</em>'.
- * @see org.eclipse.gmf.mappings.VisualEffectMapping#getParentNode()
+ * @return the meta object for the container reference '<em>Parent Map Entry</em>'.
+ * @see org.eclipse.gmf.mappings.VisualEffectMapping#getParentMapEntry()
* @see #getVisualEffectMapping()
* @generated
*/
- EReference getVisualEffectMapping_ParentNode();
+ EReference getVisualEffectMapping_ParentMapEntry();
/**
* Returns the meta object for enum '{@link org.eclipse.gmf.mappings.LabelTextAccessMethod <em>Label Text Access Method</em>}'.
diff --git a/plugins/org.eclipse.gmf.map/src/org/eclipse/gmf/mappings/MappingEntry.java b/plugins/org.eclipse.gmf.map/src/org/eclipse/gmf/mappings/MappingEntry.java
index b38d2c254..3bcb639e8 100644
--- a/plugins/org.eclipse.gmf.map/src/org/eclipse/gmf/mappings/MappingEntry.java
+++ b/plugins/org.eclipse.gmf.map/src/org/eclipse/gmf/mappings/MappingEntry.java
@@ -23,6 +23,7 @@ import org.eclipse.emf.ecore.EObject;
* <li>{@link org.eclipse.gmf.mappings.MappingEntry#getDomainInitializer <em>Domain Initializer</em>}</li>
* <li>{@link org.eclipse.gmf.mappings.MappingEntry#getLabelMappings <em>Label Mappings</em>}</li>
* <li>{@link org.eclipse.gmf.mappings.MappingEntry#getRelatedDiagrams <em>Related Diagrams</em>}</li>
+ * <li>{@link org.eclipse.gmf.mappings.MappingEntry#getVisualEffects <em>Visual Effects</em>}</li>
* </ul>
* </p>
*
@@ -144,6 +145,24 @@ public interface MappingEntry extends EObject {
EList<CanvasMapping> getRelatedDiagrams();
/**
+ * Returns the value of the '<em><b>Visual Effects</b></em>' containment reference list.
+ * The list contents are of type {@link org.eclipse.gmf.mappings.VisualEffectMapping}.
+ * It is bidirectional and its opposite is '{@link org.eclipse.gmf.mappings.VisualEffectMapping#getParentMapEntry <em>Parent Map Entry</em>}'.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Visual Effects</em>' containment reference list isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @return the value of the '<em>Visual Effects</em>' containment reference list.
+ * @see org.eclipse.gmf.mappings.GMFMapPackage#getMappingEntry_VisualEffects()
+ * @see org.eclipse.gmf.mappings.VisualEffectMapping#getParentMapEntry
+ * @model opposite="parentMapEntry" containment="true"
+ * @generated
+ */
+ EList<VisualEffectMapping> getVisualEffects();
+
+ /**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* <!-- begin-model-doc -->
diff --git a/plugins/org.eclipse.gmf.map/src/org/eclipse/gmf/mappings/NodeMapping.java b/plugins/org.eclipse.gmf.map/src/org/eclipse/gmf/mappings/NodeMapping.java
index 344962a3c..0f72bef8a 100644
--- a/plugins/org.eclipse.gmf.map/src/org/eclipse/gmf/mappings/NodeMapping.java
+++ b/plugins/org.eclipse.gmf.map/src/org/eclipse/gmf/mappings/NodeMapping.java
@@ -26,7 +26,6 @@ import org.eclipse.gmf.gmfgraph.Node;
* <li>{@link org.eclipse.gmf.mappings.NodeMapping#getDiagramNode <em>Diagram Node</em>}</li>
* <li>{@link org.eclipse.gmf.mappings.NodeMapping#getChildren <em>Children</em>}</li>
* <li>{@link org.eclipse.gmf.mappings.NodeMapping#getCompartments <em>Compartments</em>}</li>
- * <li>{@link org.eclipse.gmf.mappings.NodeMapping#getVisualEffects <em>Visual Effects</em>}</li>
* </ul>
* </p>
*
@@ -97,22 +96,4 @@ public interface NodeMapping extends MappingEntry, MenuOwner, ToolOwner, Appeara
*/
EList<CompartmentMapping> getCompartments();
- /**
- * Returns the value of the '<em><b>Visual Effects</b></em>' containment reference list.
- * The list contents are of type {@link org.eclipse.gmf.mappings.VisualEffectMapping}.
- * It is bidirectional and its opposite is '{@link org.eclipse.gmf.mappings.VisualEffectMapping#getParentNode <em>Parent Node</em>}'.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Visual Effects</em>' containment reference list isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Visual Effects</em>' containment reference list.
- * @see org.eclipse.gmf.mappings.GMFMapPackage#getNodeMapping_VisualEffects()
- * @see org.eclipse.gmf.mappings.VisualEffectMapping#getParentNode
- * @model opposite="parentNode" containment="true"
- * @generated
- */
- EList<VisualEffectMapping> getVisualEffects();
-
} // NodeMapping
diff --git a/plugins/org.eclipse.gmf.map/src/org/eclipse/gmf/mappings/VisualEffectMapping.java b/plugins/org.eclipse.gmf.map/src/org/eclipse/gmf/mappings/VisualEffectMapping.java
index e91621ddb..db4686979 100644
--- a/plugins/org.eclipse.gmf.map/src/org/eclipse/gmf/mappings/VisualEffectMapping.java
+++ b/plugins/org.eclipse.gmf.map/src/org/eclipse/gmf/mappings/VisualEffectMapping.java
@@ -20,7 +20,7 @@ import org.eclipse.gmf.gmfgraph.Pin;
* <ul>
* <li>{@link org.eclipse.gmf.mappings.VisualEffectMapping#getDiagramPin <em>Diagram Pin</em>}</li>
* <li>{@link org.eclipse.gmf.mappings.VisualEffectMapping#getOclExpression <em>Ocl Expression</em>}</li>
- * <li>{@link org.eclipse.gmf.mappings.VisualEffectMapping#getParentNode <em>Parent Node</em>}</li>
+ * <li>{@link org.eclipse.gmf.mappings.VisualEffectMapping#getParentMapEntry <em>Parent Map Entry</em>}</li>
* </ul>
* </p>
*
@@ -82,20 +82,20 @@ public interface VisualEffectMapping extends EObject {
void setOclExpression(String value);
/**
- * Returns the value of the '<em><b>Parent Node</b></em>' container reference.
- * It is bidirectional and its opposite is '{@link org.eclipse.gmf.mappings.NodeMapping#getVisualEffects <em>Visual Effects</em>}'.
+ * Returns the value of the '<em><b>Parent Map Entry</b></em>' container reference.
+ * It is bidirectional and its opposite is '{@link org.eclipse.gmf.mappings.MappingEntry#getVisualEffects <em>Visual Effects</em>}'.
* <!-- begin-user-doc -->
* <p>
- * If the meaning of the '<em>Parent Node</em>' container reference isn't clear,
+ * If the meaning of the '<em>Parent Map Entry</em>' container reference isn't clear,
* there really should be more of a description here...
* </p>
* <!-- end-user-doc -->
- * @return the value of the '<em>Parent Node</em>' container reference.
- * @see org.eclipse.gmf.mappings.GMFMapPackage#getVisualEffectMapping_ParentNode()
- * @see org.eclipse.gmf.mappings.NodeMapping#getVisualEffects
+ * @return the value of the '<em>Parent Map Entry</em>' container reference.
+ * @see org.eclipse.gmf.mappings.GMFMapPackage#getVisualEffectMapping_ParentMapEntry()
+ * @see org.eclipse.gmf.mappings.MappingEntry#getVisualEffects
* @model opposite="visualEffects" required="true" transient="false" changeable="false"
* @generated
*/
- NodeMapping getParentNode();
+ MappingEntry getParentMapEntry();
} // VisualEffectMapping
diff --git a/plugins/org.eclipse.gmf.map/src/org/eclipse/gmf/mappings/impl/GMFMapPackageImpl.java b/plugins/org.eclipse.gmf.map/src/org/eclipse/gmf/mappings/impl/GMFMapPackageImpl.java
index 9316fa67a..2daf1ad9a 100644
--- a/plugins/org.eclipse.gmf.map/src/org/eclipse/gmf/mappings/impl/GMFMapPackageImpl.java
+++ b/plugins/org.eclipse.gmf.map/src/org/eclipse/gmf/mappings/impl/GMFMapPackageImpl.java
@@ -494,6 +494,15 @@ public class GMFMapPackageImpl extends EPackageImpl implements GMFMapPackage {
* <!-- end-user-doc -->
* @generated
*/
+ public EReference getMappingEntry_VisualEffects() {
+ return (EReference)mappingEntryEClass.getEStructuralFeatures().get(5);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
public EClass getNeedsContainment() {
return needsContainmentEClass;
}
@@ -638,15 +647,6 @@ public class GMFMapPackageImpl extends EPackageImpl implements GMFMapPackage {
* <!-- end-user-doc -->
* @generated
*/
- public EReference getNodeMapping_VisualEffects() {
- return (EReference)nodeMappingEClass.getEStructuralFeatures().get(3);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
public EClass getCompartmentMapping() {
return compartmentMappingEClass;
}
@@ -1682,7 +1682,7 @@ public class GMFMapPackageImpl extends EPackageImpl implements GMFMapPackage {
* <!-- end-user-doc -->
* @generated
*/
- public EReference getVisualEffectMapping_ParentNode() {
+ public EReference getVisualEffectMapping_ParentMapEntry() {
return (EReference)visualEffectMappingEClass.getEStructuralFeatures().get(2);
}
@@ -1755,6 +1755,7 @@ public class GMFMapPackageImpl extends EPackageImpl implements GMFMapPackage {
createEReference(mappingEntryEClass, MAPPING_ENTRY__DOMAIN_INITIALIZER);
createEReference(mappingEntryEClass, MAPPING_ENTRY__LABEL_MAPPINGS);
createEReference(mappingEntryEClass, MAPPING_ENTRY__RELATED_DIAGRAMS);
+ createEReference(mappingEntryEClass, MAPPING_ENTRY__VISUAL_EFFECTS);
needsContainmentEClass = createEClass(NEEDS_CONTAINMENT);
createEReference(needsContainmentEClass, NEEDS_CONTAINMENT__CONTAINMENT_FEATURE);
@@ -1776,7 +1777,6 @@ public class GMFMapPackageImpl extends EPackageImpl implements GMFMapPackage {
createEReference(nodeMappingEClass, NODE_MAPPING__DIAGRAM_NODE);
createEReference(nodeMappingEClass, NODE_MAPPING__CHILDREN);
createEReference(nodeMappingEClass, NODE_MAPPING__COMPARTMENTS);
- createEReference(nodeMappingEClass, NODE_MAPPING__VISUAL_EFFECTS);
compartmentMappingEClass = createEClass(COMPARTMENT_MAPPING);
createEReference(compartmentMappingEClass, COMPARTMENT_MAPPING__COMPARTMENT);
@@ -1917,7 +1917,7 @@ public class GMFMapPackageImpl extends EPackageImpl implements GMFMapPackage {
visualEffectMappingEClass = createEClass(VISUAL_EFFECT_MAPPING);
createEReference(visualEffectMappingEClass, VISUAL_EFFECT_MAPPING__DIAGRAM_PIN);
createEAttribute(visualEffectMappingEClass, VISUAL_EFFECT_MAPPING__OCL_EXPRESSION);
- createEReference(visualEffectMappingEClass, VISUAL_EFFECT_MAPPING__PARENT_NODE);
+ createEReference(visualEffectMappingEClass, VISUAL_EFFECT_MAPPING__PARENT_MAP_ENTRY);
// Create enums
labelTextAccessMethodEEnum = createEEnum(LABEL_TEXT_ACCESS_METHOD);
@@ -2003,6 +2003,7 @@ public class GMFMapPackageImpl extends EPackageImpl implements GMFMapPackage {
initEReference(getMappingEntry_DomainInitializer(), this.getElementInitializer(), null, "domainInitializer", null, 0, 1, MappingEntry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEReference(getMappingEntry_LabelMappings(), this.getLabelMapping(), this.getLabelMapping_MapEntry(), "labelMappings", null, 0, -1, MappingEntry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEReference(getMappingEntry_RelatedDiagrams(), this.getCanvasMapping(), null, "relatedDiagrams", null, 0, -1, MappingEntry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getMappingEntry_VisualEffects(), this.getVisualEffectMapping(), this.getVisualEffectMapping_ParentMapEntry(), "visualEffects", null, 0, -1, MappingEntry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
addEOperation(mappingEntryEClass, ecorePackage.getEClass(), "getDomainContext", 0, 1, IS_UNIQUE, IS_ORDERED);
@@ -2026,7 +2027,6 @@ public class GMFMapPackageImpl extends EPackageImpl implements GMFMapPackage {
initEReference(getNodeMapping_DiagramNode(), theGMFGraphPackage.getNode(), null, "diagramNode", null, 1, 1, NodeMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEReference(getNodeMapping_Children(), this.getChildReference(), this.getChildReference_ParentNode(), "children", null, 0, -1, NodeMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEReference(getNodeMapping_Compartments(), this.getCompartmentMapping(), this.getCompartmentMapping_ParentNode(), "compartments", null, 0, -1, NodeMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getNodeMapping_VisualEffects(), this.getVisualEffectMapping(), this.getVisualEffectMapping_ParentNode(), "visualEffects", null, 0, -1, NodeMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(compartmentMappingEClass, CompartmentMapping.class, "CompartmentMapping", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
initEReference(getCompartmentMapping_Compartment(), theGMFGraphPackage.getCompartment(), null, "compartment", null, 1, 1, CompartmentMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
@@ -2167,7 +2167,7 @@ public class GMFMapPackageImpl extends EPackageImpl implements GMFMapPackage {
initEClass(visualEffectMappingEClass, VisualEffectMapping.class, "VisualEffectMapping", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
initEReference(getVisualEffectMapping_DiagramPin(), theGMFGraphPackage.getPin(), null, "diagramPin", null, 1, 1, VisualEffectMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEAttribute(getVisualEffectMapping_OclExpression(), ecorePackage.getEString(), "oclExpression", null, 0, 1, VisualEffectMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEReference(getVisualEffectMapping_ParentNode(), this.getNodeMapping(), this.getNodeMapping_VisualEffects(), "parentNode", null, 1, 1, VisualEffectMapping.class, !IS_TRANSIENT, !IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getVisualEffectMapping_ParentMapEntry(), this.getMappingEntry(), this.getMappingEntry_VisualEffects(), "parentMapEntry", null, 1, 1, VisualEffectMapping.class, !IS_TRANSIENT, !IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
// Initialize enums and add enum literals
initEEnum(labelTextAccessMethodEEnum, LabelTextAccessMethod.class, "LabelTextAccessMethod");
diff --git a/plugins/org.eclipse.gmf.map/src/org/eclipse/gmf/mappings/impl/MappingEntryImpl.java b/plugins/org.eclipse.gmf.map/src/org/eclipse/gmf/mappings/impl/MappingEntryImpl.java
index e50b4228d..cdfcc0c6b 100644
--- a/plugins/org.eclipse.gmf.map/src/org/eclipse/gmf/mappings/impl/MappingEntryImpl.java
+++ b/plugins/org.eclipse.gmf.map/src/org/eclipse/gmf/mappings/impl/MappingEntryImpl.java
@@ -24,6 +24,7 @@ import org.eclipse.gmf.mappings.ElementInitializer;
import org.eclipse.gmf.mappings.GMFMapPackage;
import org.eclipse.gmf.mappings.LabelMapping;
import org.eclipse.gmf.mappings.MappingEntry;
+import org.eclipse.gmf.mappings.VisualEffectMapping;
/**
* <!-- begin-user-doc -->
@@ -37,6 +38,7 @@ import org.eclipse.gmf.mappings.MappingEntry;
* <li>{@link org.eclipse.gmf.mappings.impl.MappingEntryImpl#getDomainInitializer <em>Domain Initializer</em>}</li>
* <li>{@link org.eclipse.gmf.mappings.impl.MappingEntryImpl#getLabelMappings <em>Label Mappings</em>}</li>
* <li>{@link org.eclipse.gmf.mappings.impl.MappingEntryImpl#getRelatedDiagrams <em>Related Diagrams</em>}</li>
+ * <li>{@link org.eclipse.gmf.mappings.impl.MappingEntryImpl#getVisualEffects <em>Visual Effects</em>}</li>
* </ul>
* </p>
*
@@ -94,6 +96,16 @@ public abstract class MappingEntryImpl extends EObjectImpl implements MappingEnt
protected EList<CanvasMapping> relatedDiagrams;
/**
+ * The cached value of the '{@link #getVisualEffects() <em>Visual Effects</em>}' containment reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getVisualEffects()
+ * @generated
+ * @ordered
+ */
+ protected EList<VisualEffectMapping> visualEffects;
+
+ /**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
@@ -263,6 +275,18 @@ public abstract class MappingEntryImpl extends EObjectImpl implements MappingEnt
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ * @generated
+ */
+ public EList<VisualEffectMapping> getVisualEffects() {
+ if (visualEffects == null) {
+ visualEffects = new EObjectContainmentWithInverseEList<VisualEffectMapping>(VisualEffectMapping.class, this, GMFMapPackage.MAPPING_ENTRY__VISUAL_EFFECTS, GMFMapPackage.VISUAL_EFFECT_MAPPING__PARENT_MAP_ENTRY);
+ }
+ return visualEffects;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated NOT
*/
public abstract EClass getDomainContext();
@@ -278,6 +302,8 @@ public abstract class MappingEntryImpl extends EObjectImpl implements MappingEnt
switch (featureID) {
case GMFMapPackage.MAPPING_ENTRY__LABEL_MAPPINGS:
return ((InternalEList<InternalEObject>)(InternalEList<?>)getLabelMappings()).basicAdd(otherEnd, msgs);
+ case GMFMapPackage.MAPPING_ENTRY__VISUAL_EFFECTS:
+ return ((InternalEList<InternalEObject>)(InternalEList<?>)getVisualEffects()).basicAdd(otherEnd, msgs);
}
return super.eInverseAdd(otherEnd, featureID, msgs);
}
@@ -296,6 +322,8 @@ public abstract class MappingEntryImpl extends EObjectImpl implements MappingEnt
return basicSetDomainInitializer(null, msgs);
case GMFMapPackage.MAPPING_ENTRY__LABEL_MAPPINGS:
return ((InternalEList<?>)getLabelMappings()).basicRemove(otherEnd, msgs);
+ case GMFMapPackage.MAPPING_ENTRY__VISUAL_EFFECTS:
+ return ((InternalEList<?>)getVisualEffects()).basicRemove(otherEnd, msgs);
}
return super.eInverseRemove(otherEnd, featureID, msgs);
}
@@ -319,6 +347,8 @@ public abstract class MappingEntryImpl extends EObjectImpl implements MappingEnt
return getLabelMappings();
case GMFMapPackage.MAPPING_ENTRY__RELATED_DIAGRAMS:
return getRelatedDiagrams();
+ case GMFMapPackage.MAPPING_ENTRY__VISUAL_EFFECTS:
+ return getVisualEffects();
}
return super.eGet(featureID, resolve, coreType);
}
@@ -349,6 +379,10 @@ public abstract class MappingEntryImpl extends EObjectImpl implements MappingEnt
getRelatedDiagrams().clear();
getRelatedDiagrams().addAll((Collection<? extends CanvasMapping>)newValue);
return;
+ case GMFMapPackage.MAPPING_ENTRY__VISUAL_EFFECTS:
+ getVisualEffects().clear();
+ getVisualEffects().addAll((Collection<? extends VisualEffectMapping>)newValue);
+ return;
}
super.eSet(featureID, newValue);
}
@@ -376,6 +410,9 @@ public abstract class MappingEntryImpl extends EObjectImpl implements MappingEnt
case GMFMapPackage.MAPPING_ENTRY__RELATED_DIAGRAMS:
getRelatedDiagrams().clear();
return;
+ case GMFMapPackage.MAPPING_ENTRY__VISUAL_EFFECTS:
+ getVisualEffects().clear();
+ return;
}
super.eUnset(featureID);
}
@@ -398,6 +435,8 @@ public abstract class MappingEntryImpl extends EObjectImpl implements MappingEnt
return labelMappings != null && !labelMappings.isEmpty();
case GMFMapPackage.MAPPING_ENTRY__RELATED_DIAGRAMS:
return relatedDiagrams != null && !relatedDiagrams.isEmpty();
+ case GMFMapPackage.MAPPING_ENTRY__VISUAL_EFFECTS:
+ return visualEffects != null && !visualEffects.isEmpty();
}
return super.eIsSet(featureID);
}
diff --git a/plugins/org.eclipse.gmf.map/src/org/eclipse/gmf/mappings/impl/NodeMappingImpl.java b/plugins/org.eclipse.gmf.map/src/org/eclipse/gmf/mappings/impl/NodeMappingImpl.java
index 965b5f184..4b0026bb0 100644
--- a/plugins/org.eclipse.gmf.map/src/org/eclipse/gmf/mappings/impl/NodeMappingImpl.java
+++ b/plugins/org.eclipse.gmf.map/src/org/eclipse/gmf/mappings/impl/NodeMappingImpl.java
@@ -24,7 +24,6 @@ import org.eclipse.gmf.mappings.GMFMapPackage;
import org.eclipse.gmf.mappings.MenuOwner;
import org.eclipse.gmf.mappings.NodeMapping;
import org.eclipse.gmf.mappings.ToolOwner;
-import org.eclipse.gmf.mappings.VisualEffectMapping;
import org.eclipse.gmf.tooldef.AbstractTool;
import org.eclipse.gmf.tooldef.ContextMenu;
import org.eclipse.gmf.tooldef.StyleSelector;
@@ -42,7 +41,6 @@ import org.eclipse.gmf.tooldef.StyleSelector;
* <li>{@link org.eclipse.gmf.mappings.impl.NodeMappingImpl#getDiagramNode <em>Diagram Node</em>}</li>
* <li>{@link org.eclipse.gmf.mappings.impl.NodeMappingImpl#getChildren <em>Children</em>}</li>
* <li>{@link org.eclipse.gmf.mappings.impl.NodeMappingImpl#getCompartments <em>Compartments</em>}</li>
- * <li>{@link org.eclipse.gmf.mappings.impl.NodeMappingImpl#getVisualEffects <em>Visual Effects</em>}</li>
* </ul>
* </p>
*
@@ -110,16 +108,6 @@ public class NodeMappingImpl extends MappingEntryImpl implements NodeMapping {
protected EList<CompartmentMapping> compartments;
/**
- * The cached value of the '{@link #getVisualEffects() <em>Visual Effects</em>}' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getVisualEffects()
- * @generated
- * @ordered
- */
- protected EList<VisualEffectMapping> visualEffects;
-
- /**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
@@ -319,18 +307,6 @@ public class NodeMappingImpl extends MappingEntryImpl implements NodeMapping {
* <!-- end-user-doc -->
* @generated
*/
- public EList<VisualEffectMapping> getVisualEffects() {
- if (visualEffects == null) {
- visualEffects = new EObjectContainmentWithInverseEList<VisualEffectMapping>(VisualEffectMapping.class, this, GMFMapPackage.NODE_MAPPING__VISUAL_EFFECTS, GMFMapPackage.VISUAL_EFFECT_MAPPING__PARENT_NODE);
- }
- return visualEffects;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
@SuppressWarnings("unchecked")
@Override
public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
@@ -339,8 +315,6 @@ public class NodeMappingImpl extends MappingEntryImpl implements NodeMapping {
return ((InternalEList<InternalEObject>)(InternalEList<?>)getChildren()).basicAdd(otherEnd, msgs);
case GMFMapPackage.NODE_MAPPING__COMPARTMENTS:
return ((InternalEList<InternalEObject>)(InternalEList<?>)getCompartments()).basicAdd(otherEnd, msgs);
- case GMFMapPackage.NODE_MAPPING__VISUAL_EFFECTS:
- return ((InternalEList<InternalEObject>)(InternalEList<?>)getVisualEffects()).basicAdd(otherEnd, msgs);
}
return super.eInverseAdd(otherEnd, featureID, msgs);
}
@@ -357,8 +331,6 @@ public class NodeMappingImpl extends MappingEntryImpl implements NodeMapping {
return ((InternalEList<?>)getChildren()).basicRemove(otherEnd, msgs);
case GMFMapPackage.NODE_MAPPING__COMPARTMENTS:
return ((InternalEList<?>)getCompartments()).basicRemove(otherEnd, msgs);
- case GMFMapPackage.NODE_MAPPING__VISUAL_EFFECTS:
- return ((InternalEList<?>)getVisualEffects()).basicRemove(otherEnd, msgs);
}
return super.eInverseRemove(otherEnd, featureID, msgs);
}
@@ -387,8 +359,6 @@ public class NodeMappingImpl extends MappingEntryImpl implements NodeMapping {
return getChildren();
case GMFMapPackage.NODE_MAPPING__COMPARTMENTS:
return getCompartments();
- case GMFMapPackage.NODE_MAPPING__VISUAL_EFFECTS:
- return getVisualEffects();
}
return super.eGet(featureID, resolve, coreType);
}
@@ -422,10 +392,6 @@ public class NodeMappingImpl extends MappingEntryImpl implements NodeMapping {
getCompartments().clear();
getCompartments().addAll((Collection<? extends CompartmentMapping>)newValue);
return;
- case GMFMapPackage.NODE_MAPPING__VISUAL_EFFECTS:
- getVisualEffects().clear();
- getVisualEffects().addAll((Collection<? extends VisualEffectMapping>)newValue);
- return;
}
super.eSet(featureID, newValue);
}
@@ -456,9 +422,6 @@ public class NodeMappingImpl extends MappingEntryImpl implements NodeMapping {
case GMFMapPackage.NODE_MAPPING__COMPARTMENTS:
getCompartments().clear();
return;
- case GMFMapPackage.NODE_MAPPING__VISUAL_EFFECTS:
- getVisualEffects().clear();
- return;
}
super.eUnset(featureID);
}
@@ -483,8 +446,6 @@ public class NodeMappingImpl extends MappingEntryImpl implements NodeMapping {
return children != null && !children.isEmpty();
case GMFMapPackage.NODE_MAPPING__COMPARTMENTS:
return compartments != null && !compartments.isEmpty();
- case GMFMapPackage.NODE_MAPPING__VISUAL_EFFECTS:
- return visualEffects != null && !visualEffects.isEmpty();
}
return super.eIsSet(featureID);
}
diff --git a/plugins/org.eclipse.gmf.map/src/org/eclipse/gmf/mappings/impl/VisualEffectMappingImpl.java b/plugins/org.eclipse.gmf.map/src/org/eclipse/gmf/mappings/impl/VisualEffectMappingImpl.java
index 2feeb8387..f1d669eaa 100644
--- a/plugins/org.eclipse.gmf.map/src/org/eclipse/gmf/mappings/impl/VisualEffectMappingImpl.java
+++ b/plugins/org.eclipse.gmf.map/src/org/eclipse/gmf/mappings/impl/VisualEffectMappingImpl.java
@@ -18,6 +18,7 @@ import org.eclipse.emf.ecore.impl.EObjectImpl;
import org.eclipse.gmf.gmfgraph.Pin;
import org.eclipse.gmf.mappings.GMFMapPackage;
+import org.eclipse.gmf.mappings.MappingEntry;
import org.eclipse.gmf.mappings.NodeMapping;
import org.eclipse.gmf.mappings.VisualEffectMapping;
@@ -30,7 +31,7 @@ import org.eclipse.gmf.mappings.VisualEffectMapping;
* <ul>
* <li>{@link org.eclipse.gmf.mappings.impl.VisualEffectMappingImpl#getDiagramPin <em>Diagram Pin</em>}</li>
* <li>{@link org.eclipse.gmf.mappings.impl.VisualEffectMappingImpl#getOclExpression <em>Ocl Expression</em>}</li>
- * <li>{@link org.eclipse.gmf.mappings.impl.VisualEffectMappingImpl#getParentNode <em>Parent Node</em>}</li>
+ * <li>{@link org.eclipse.gmf.mappings.impl.VisualEffectMappingImpl#getParentMapEntry <em>Parent Map Entry</em>}</li>
* </ul>
* </p>
*
@@ -150,9 +151,9 @@ public class VisualEffectMappingImpl extends EObjectImpl implements VisualEffect
* <!-- end-user-doc -->
* @generated
*/
- public NodeMapping getParentNode() {
- if (eContainerFeatureID() != GMFMapPackage.VISUAL_EFFECT_MAPPING__PARENT_NODE) return null;
- return (NodeMapping)eContainer();
+ public MappingEntry getParentMapEntry() {
+ if (eContainerFeatureID() != GMFMapPackage.VISUAL_EFFECT_MAPPING__PARENT_MAP_ENTRY) return null;
+ return (MappingEntry)eContainer();
}
/**
@@ -163,10 +164,10 @@ public class VisualEffectMappingImpl extends EObjectImpl implements VisualEffect
@Override
public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
switch (featureID) {
- case GMFMapPackage.VISUAL_EFFECT_MAPPING__PARENT_NODE:
+ case GMFMapPackage.VISUAL_EFFECT_MAPPING__PARENT_MAP_ENTRY:
if (eInternalContainer() != null)
msgs = eBasicRemoveFromContainer(msgs);
- return eBasicSetContainer(otherEnd, GMFMapPackage.VISUAL_EFFECT_MAPPING__PARENT_NODE, msgs);
+ return eBasicSetContainer(otherEnd, GMFMapPackage.VISUAL_EFFECT_MAPPING__PARENT_MAP_ENTRY, msgs);
}
return super.eInverseAdd(otherEnd, featureID, msgs);
}
@@ -179,8 +180,8 @@ public class VisualEffectMappingImpl extends EObjectImpl implements VisualEffect
@Override
public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
switch (featureID) {
- case GMFMapPackage.VISUAL_EFFECT_MAPPING__PARENT_NODE:
- return eBasicSetContainer(null, GMFMapPackage.VISUAL_EFFECT_MAPPING__PARENT_NODE, msgs);
+ case GMFMapPackage.VISUAL_EFFECT_MAPPING__PARENT_MAP_ENTRY:
+ return eBasicSetContainer(null, GMFMapPackage.VISUAL_EFFECT_MAPPING__PARENT_MAP_ENTRY, msgs);
}
return super.eInverseRemove(otherEnd, featureID, msgs);
}
@@ -193,8 +194,8 @@ public class VisualEffectMappingImpl extends EObjectImpl implements VisualEffect
@Override
public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs) {
switch (eContainerFeatureID()) {
- case GMFMapPackage.VISUAL_EFFECT_MAPPING__PARENT_NODE:
- return eInternalContainer().eInverseRemove(this, GMFMapPackage.NODE_MAPPING__VISUAL_EFFECTS, NodeMapping.class, msgs);
+ case GMFMapPackage.VISUAL_EFFECT_MAPPING__PARENT_MAP_ENTRY:
+ return eInternalContainer().eInverseRemove(this, GMFMapPackage.MAPPING_ENTRY__VISUAL_EFFECTS, MappingEntry.class, msgs);
}
return super.eBasicRemoveFromContainerFeature(msgs);
}
@@ -212,8 +213,8 @@ public class VisualEffectMappingImpl extends EObjectImpl implements VisualEffect
return basicGetDiagramPin();
case GMFMapPackage.VISUAL_EFFECT_MAPPING__OCL_EXPRESSION:
return getOclExpression();
- case GMFMapPackage.VISUAL_EFFECT_MAPPING__PARENT_NODE:
- return getParentNode();
+ case GMFMapPackage.VISUAL_EFFECT_MAPPING__PARENT_MAP_ENTRY:
+ return getParentMapEntry();
}
return super.eGet(featureID, resolve, coreType);
}
@@ -266,8 +267,8 @@ public class VisualEffectMappingImpl extends EObjectImpl implements VisualEffect
return diagramPin != null;
case GMFMapPackage.VISUAL_EFFECT_MAPPING__OCL_EXPRESSION:
return OCL_EXPRESSION_EDEFAULT == null ? oclExpression != null : !OCL_EXPRESSION_EDEFAULT.equals(oclExpression);
- case GMFMapPackage.VISUAL_EFFECT_MAPPING__PARENT_NODE:
- return getParentNode() != null;
+ case GMFMapPackage.VISUAL_EFFECT_MAPPING__PARENT_MAP_ENTRY:
+ return getParentMapEntry() != null;
}
return super.eIsSet(featureID);
}
diff --git a/tests/org.eclipse.gmf.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.gmf.tests/META-INF/MANIFEST.MF
index ed7c80c50..15d97c1b0 100644
--- a/tests/org.eclipse.gmf.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.gmf.tests/META-INF/MANIFEST.MF
@@ -29,8 +29,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.3.0,4.0.0)",
org.eclipse.swtbot.eclipse.finder;bundle-version="2.0.5",
org.eclipse.swtbot.swt.finder;bundle-version="2.0.5",
org.eclipse.jdt.ui;bundle-version="3.7.1",
- org.eclipse.gmf.graphdef.codegen.ui;bundle-version="1.0.100",
- org.hamcrest;bundle-version="1.1.0"
+ org.eclipse.gmf.graphdef.codegen.ui;bundle-version="1.0.100"
Bundle-Activator: org.eclipse.gmf.tests.Plugin
Bundle-ActivationPolicy: lazy
Export-Package: org.eclipse.gmf.tests;x-friends:="org.eclipse.gmf.tests.lite",

Back to the top