Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorskovalsky2014-03-24 15:42:58 -0400
committerskovalsky2014-03-24 15:42:58 -0400
commit7bb3830f89e2da349dfb90ca700d6e463d1d626a (patch)
tree14ebd749a7c3770418fc5d95e2f51cbdf705fd0d
parent8e1f301a11f0f4205386ae15044f222b6454f4e8 (diff)
downloadorg.eclipse.gmf-tooling-7bb3830f89e2da349dfb90ca700d6e463d1d626a.tar.gz
org.eclipse.gmf-tooling-7bb3830f89e2da349dfb90ca700d6e463d1d626a.tar.xz
org.eclipse.gmf-tooling-7bb3830f89e2da349dfb90ca700d6e463d1d626a.zip
[430611] - fix non model link label
-rw-r--r--plugins/org.eclipse.gmf.codegen.xtend/xtend/impl/diagram/editparts/LinkEditPart.xtend6
-rw-r--r--plugins/org.eclipse.gmf.codegen/templates/impl/diagram/editparts/LinkEditPart.xpt6
-rw-r--r--test-examples/labels/org.eclipse.gmf.tooling.examples.labels/model/labels.ecore2
-rw-r--r--test-examples/labels/org.eclipse.gmf.tooling.examples.labels/model/labels.genmodel1
-rw-r--r--test-examples/labels/org.eclipse.gmf.tooling.examples.labels/model/labels.gmfgen60
-rw-r--r--test-examples/labels/org.eclipse.gmf.tooling.examples.labels/model/labels.gmfgraph6
-rw-r--r--test-examples/labels/org.eclipse.gmf.tooling.examples.labels/model/labels.gmftool4
-rw-r--r--test-examples/labels/org.eclipse.gmf.tooling.examples.labels/src/org/eclipse/gmf/tooling/examples/labels/AllLabelsType.java18
-rw-r--r--test-examples/labels/org.eclipse.gmf.tooling.examples.labels/src/org/eclipse/gmf/tooling/examples/labels/LabelsPackage.java30
-rw-r--r--test-examples/labels/org.eclipse.gmf.tooling.examples.labels/src/org/eclipse/gmf/tooling/examples/labels/impl/AllLabelsTypeImpl.java39
-rw-r--r--test-examples/labels/org.eclipse.gmf.tooling.examples.labels/src/org/eclipse/gmf/tooling/examples/labels/impl/LabelsPackageImpl.java11
11 files changed, 178 insertions, 5 deletions
diff --git a/plugins/org.eclipse.gmf.codegen.xtend/xtend/impl/diagram/editparts/LinkEditPart.xtend b/plugins/org.eclipse.gmf.codegen.xtend/xtend/impl/diagram/editparts/LinkEditPart.xtend
index 2c900b93c..283c2ff17 100644
--- a/plugins/org.eclipse.gmf.codegen.xtend/xtend/impl/diagram/editparts/LinkEditPart.xtend
+++ b/plugins/org.eclipse.gmf.codegen.xtend/xtend/impl/diagram/editparts/LinkEditPart.xtend
@@ -84,8 +84,10 @@ import xpt.Common_qvto import org.eclipse.gmf.gmfgraph.DiagramLabel
'''
def dispatch addLabel(ModeledViewmap it, GenLinkLabel label) '''
- «var getterName = (figureModel as DiagramLabel).accessor.accessor»
- «it.commonAddLabel(getterName,label)»
+ «var labelAccessor = (figureModel as DiagramLabel).accessor»
+ «IF labelAccessor != null && labelAccessor.accessor != null»
+ «it.commonAddLabel(labelAccessor.accessor,label)»
+ «ENDIF»
'''
def commonAddLabel(Viewmap it, String getterName, GenLinkLabel label) '''
diff --git a/plugins/org.eclipse.gmf.codegen/templates/impl/diagram/editparts/LinkEditPart.xpt b/plugins/org.eclipse.gmf.codegen/templates/impl/diagram/editparts/LinkEditPart.xpt
index e96a1d78f..32726fd0e 100644
--- a/plugins/org.eclipse.gmf.codegen/templates/impl/diagram/editparts/LinkEditPart.xpt
+++ b/plugins/org.eclipse.gmf.codegen/templates/impl/diagram/editparts/LinkEditPart.xpt
@@ -54,8 +54,10 @@
«ENDDEFINE»
«DEFINE addLabel(label : gmfgen::GenLinkLabel) FOR gmfgen::ModeledViewmap-»
- «LET figureModel.oclAsType(gmfgraph::DiagramLabel).accessor.accessor AS getterName-»
- «EXPAND addLabelCommonCode(getterName, label)-»
+ «LET figureModel.oclAsType(gmfgraph::DiagramLabel).accessor AS labelAccessor-»
+ «IF not labelAccessor.oclIsUndefined() and not labelAccessor.accessor.oclIsUndefined()-»
+ «EXPAND addLabelCommonCode(labelAccessor.accessor, label)-»
+ «ENDIF-»
«ENDLET-»
«ENDDEFINE»
diff --git a/test-examples/labels/org.eclipse.gmf.tooling.examples.labels/model/labels.ecore b/test-examples/labels/org.eclipse.gmf.tooling.examples.labels/model/labels.ecore
index 73c94adff..a5911c29e 100644
--- a/test-examples/labels/org.eclipse.gmf.tooling.examples.labels/model/labels.ecore
+++ b/test-examples/labels/org.eclipse.gmf.tooling.examples.labels/model/labels.ecore
@@ -41,6 +41,8 @@
<eStructuralFeatures xsi:type="ecore:EAttribute" name="string" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
defaultValueLiteral="Hello!"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="side" eType="#//Side" defaultValueLiteral="LEFT"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="featureVerticalLabelLinks"
+ upperBound="-1" eType="#//VerticalLabel"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="ChildLabelNodeContainer" eSuperTypes="#//NamedElement">
<eStructuralFeatures xsi:type="ecore:EReference" name="getChildren" lowerBound="1"
diff --git a/test-examples/labels/org.eclipse.gmf.tooling.examples.labels/model/labels.genmodel b/test-examples/labels/org.eclipse.gmf.tooling.examples.labels/model/labels.genmodel
index 9541e16fc..d4fbeffd9 100644
--- a/test-examples/labels/org.eclipse.gmf.tooling.examples.labels/model/labels.genmodel
+++ b/test-examples/labels/org.eclipse.gmf.tooling.examples.labels/model/labels.genmodel
@@ -38,6 +38,7 @@
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute labels.ecore#//AllLabelsType/shortObject"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute labels.ecore#//AllLabelsType/string"/>
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute labels.ecore#//AllLabelsType/side"/>
+ <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference labels.ecore#//AllLabelsType/featureVerticalLabelLinks"/>
</genClasses>
<genClasses ecoreClass="labels.ecore#//ChildLabelNodeContainer">
<genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference labels.ecore#//ChildLabelNodeContainer/getChildren"/>
diff --git a/test-examples/labels/org.eclipse.gmf.tooling.examples.labels/model/labels.gmfgen b/test-examples/labels/org.eclipse.gmf.tooling.examples.labels/model/labels.gmfgen
index d34f32cab..fb2816ec9 100644
--- a/test-examples/labels/org.eclipse.gmf.tooling.examples.labels/model/labels.gmfgen
+++ b/test-examples/labels/org.eclipse.gmf.tooling.examples.labels/model/labels.gmfgen
@@ -729,6 +729,7 @@
visualID="5024"
editPartClassName="ChildLabelNodeContainerNameEditPart"
itemSemanticEditPolicyClassName="ChildLabelNodeContainerNameItemSemanticEditPolicy"
+ notationViewFactoryClassName="ChildLabelNodeContainerNameViewFactory"
elementIcon="true">
<diagramRunTimeClass
href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
@@ -783,6 +784,7 @@
visualID="5025"
editPartClassName="VerticalLabelNameEditPart"
itemSemanticEditPolicyClassName="VerticalLabelNameItemSemanticEditPolicy"
+ notationViewFactoryClassName="VerticalLabelNameViewFactory"
elementIcon="true">
<diagramRunTimeClass
href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
@@ -807,6 +809,7 @@
visualID="4001"
editPartClassName="LinkWithLabelEditPart"
itemSemanticEditPolicyClassName="LinkWithLabelItemSemanticEditPolicy"
+ notationViewFactoryClassName="LinkWithLabelViewFactory"
createCommandClassName="LinkWithLabelCreateCommand"
reorientCommandClassName="LinkWithLabelReorientCommand">
<diagramRunTimeClass
@@ -836,6 +839,7 @@
visualID="6001"
editPartClassName="LinkWithLabelNameEditPart"
itemSemanticEditPolicyClassName="LinkWithLabelNameItemSemanticEditPolicy"
+ notationViewFactoryClassName="LinkWithLabelNameViewFactory"
elementIcon="true">
<diagramRunTimeClass
href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Node"/>
@@ -855,6 +859,28 @@
</modelFacet>
</labels>
</links>
+ <links
+ visualID="4002"
+ editPartClassName="AllLabelsTypeFeatureVerticalLabelLinksEditPart"
+ itemSemanticEditPolicyClassName="AllLabelsTypeFeatureVerticalLabelLinksItemSemanticEditPolicy"
+ notationViewFactoryClassName="AllLabelsTypeFeatureVerticalLabelLinksViewFactory"
+ createCommandClassName="AllLabelsTypeFeatureVerticalLabelLinksCreateCommand"
+ reorientCommandClassName="AllLabelsTypeFeatureVerticalLabelLinksReorientCommand">
+ <diagramRunTimeClass
+ href="../../../plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#//notation/Edge"/>
+ <elementType
+ xsi:type="gmfgen:SpecializationType"/>
+ <viewmap
+ xsi:type="gmfgen:ModeledViewmap">
+ <figureModel
+ href="labels.gmfgraph#AllLabelsType_VerticalLabel_Connection"/>
+ </viewmap>
+ <modelFacet
+ xsi:type="gmfgen:FeatureLinkModelFacet">
+ <metaFeature
+ href="labels.genmodel#//labels/AllLabelsType/featureVerticalLabelLinks"/>
+ </modelFacet>
+ </links>
<compartments
visualID="7001"
editPartClassName="ChildLabelNodeContainerLabelContainerEditPart"
@@ -908,6 +934,11 @@
title="VerticalLabel_GenLabel_Connection"
description="Create new VerticalLabel_GenLabel_Connection"
genLinks="//@diagram/@links.0"/>
+ <entries
+ xsi:type="gmfgen:ToolEntry"
+ title="AllLabelTypes_VerticalLabel_Link"
+ description="Create new AllLabelTypes_VerticalLabel_Link"
+ genLinks="//@diagram/@links.1"/>
</groups>
</palette>
<preferencePages
@@ -987,6 +1018,35 @@
referenceType="out_target"
groupName="outgoing links"
groupIcon="icons/outgoingLinksNavigatorGroup.gif"/>
+ <childReferences
+ parent="//@diagram"
+ child="//@diagram/@links.1"
+ groupName="links"
+ groupIcon="icons/linksNavigatorGroup.gif"/>
+ <childReferences
+ parent="//@diagram/@links.1"
+ child="//@diagram/@topLevelNodes.3"
+ referenceType="out_target"
+ groupName="target"
+ groupIcon="icons/linkTargetNavigatorGroup.gif"/>
+ <childReferences
+ parent="//@diagram/@topLevelNodes.3"
+ child="//@diagram/@links.1"
+ referenceType="in_source"
+ groupName="incoming links"
+ groupIcon="icons/incomingLinksNavigatorGroup.gif"/>
+ <childReferences
+ parent="//@diagram/@links.1"
+ child="//@diagram/@topLevelNodes.1"
+ referenceType="in_source"
+ groupName="source"
+ groupIcon="icons/linkSourceNavigatorGroup.gif"/>
+ <childReferences
+ parent="//@diagram/@topLevelNodes.1"
+ child="//@diagram/@links.1"
+ referenceType="out_target"
+ groupName="outgoing links"
+ groupIcon="icons/outgoingLinksNavigatorGroup.gif"/>
</navigator>
<diagramUpdater/>
<propertySheet>
diff --git a/test-examples/labels/org.eclipse.gmf.tooling.examples.labels/model/labels.gmfgraph b/test-examples/labels/org.eclipse.gmf.tooling.examples.labels/model/labels.gmfgraph
index 89bc2c4d6..1564640a0 100644
--- a/test-examples/labels/org.eclipse.gmf.tooling.examples.labels/model/labels.gmfgraph
+++ b/test-examples/labels/org.eclipse.gmf.tooling.examples.labels/model/labels.gmfgraph
@@ -122,12 +122,18 @@
</actualFigure>
<accessors figure="//@figures.0/@descriptors.6/@actualFigure/@children.0"/>
</descriptors>
+ <descriptors name="AllLabelsType_LinkFigure">
+ <actualFigure xsi:type="gmfgraph:PolylineConnection">
+ <children xsi:type="gmfgraph:Label" name="FeatureLinkLabel" text="FeatureLinkLabel"/>
+ </actualFigure>
+ </descriptors>
</figures>
<nodes name="AllLabelsType" figure="AllLabelsTypeFigure"/>
<nodes name="ChildLabelNodeContainer" figure="ChildLabelNodeContainerFigure"/>
<nodes name="GenLabelNode" figure="GenLabelNodeFigure"/>
<nodes name="VerticalLabel" figure="VerticalLabelFigure"/>
<connections name="VericalLabel_GenLabel_Connection" figure="VericalLabel_GenLabel_ConnectionFigure"/>
+ <connections name="AllLabelsType_VerticalLabel_Connection" figure="AllLabelsType_LinkFigure"/>
<compartments name="LabelContainer" figure="ChildLabelNodeContainerFigure" collapsible="true" needsTitle="true" accessor="//@figures.0/@descriptors.1/@accessors.1"/>
<labels name="AllLabelsTypeName" figure="AllLabelsTypeFigure" accessor="//@figures.0/@descriptors.0/@accessors.0"/>
<labels name="AllLabelsTypeBigDecimal" figure="AllLabelsTypeFigure" accessor="//@figures.0/@descriptors.0/@accessors.1"/>
diff --git a/test-examples/labels/org.eclipse.gmf.tooling.examples.labels/model/labels.gmftool b/test-examples/labels/org.eclipse.gmf.tooling.examples.labels/model/labels.gmftool
index 10c897081..174c43708 100644
--- a/test-examples/labels/org.eclipse.gmf.tooling.examples.labels/model/labels.gmftool
+++ b/test-examples/labels/org.eclipse.gmf.tooling.examples.labels/model/labels.gmftool
@@ -63,6 +63,10 @@
<largeIcon
xsi:type="gmftool:DefaultImage"/>
</tools>
+ <tools
+ xsi:type="gmftool:CreationTool"
+ title="AllLabelTypes_VerticalLabel_Link"
+ description="Create new AllLabelTypes_VerticalLabel_Link"/>
</tools>
</palette>
</gmftool:ToolRegistry>
diff --git a/test-examples/labels/org.eclipse.gmf.tooling.examples.labels/src/org/eclipse/gmf/tooling/examples/labels/AllLabelsType.java b/test-examples/labels/org.eclipse.gmf.tooling.examples.labels/src/org/eclipse/gmf/tooling/examples/labels/AllLabelsType.java
index 380a23457..09093c4c7 100644
--- a/test-examples/labels/org.eclipse.gmf.tooling.examples.labels/src/org/eclipse/gmf/tooling/examples/labels/AllLabelsType.java
+++ b/test-examples/labels/org.eclipse.gmf.tooling.examples.labels/src/org/eclipse/gmf/tooling/examples/labels/AllLabelsType.java
@@ -6,6 +6,7 @@ import java.math.BigDecimal;
import java.math.BigInteger;
import java.util.Date;
+import org.eclipse.emf.common.util.EList;
/**
* <!-- begin-user-doc -->
@@ -36,6 +37,7 @@ import java.util.Date;
* <li>{@link org.eclipse.gmf.tooling.examples.labels.AllLabelsType#getShortObject <em>Short Object</em>}</li>
* <li>{@link org.eclipse.gmf.tooling.examples.labels.AllLabelsType#getString <em>String</em>}</li>
* <li>{@link org.eclipse.gmf.tooling.examples.labels.AllLabelsType#getSide <em>Side</em>}</li>
+ * <li>{@link org.eclipse.gmf.tooling.examples.labels.AllLabelsType#getFeatureVerticalLabelLinks <em>Feature Vertical Label Links</em>}</li>
* </ul>
* </p>
*
@@ -609,4 +611,20 @@ public interface AllLabelsType extends NamedElement {
*/
void setSide(Side value);
+ /**
+ * Returns the value of the '<em><b>Feature Vertical Label Links</b></em>' reference list.
+ * The list contents are of type {@link org.eclipse.gmf.tooling.examples.labels.VerticalLabel}.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Feature Vertical Label Links</em>' reference list isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @return the value of the '<em>Feature Vertical Label Links</em>' reference list.
+ * @see org.eclipse.gmf.tooling.examples.labels.LabelsPackage#getAllLabelsType_FeatureVerticalLabelLinks()
+ * @model
+ * @generated
+ */
+ EList<VerticalLabel> getFeatureVerticalLabelLinks();
+
} // AllLabelsType
diff --git a/test-examples/labels/org.eclipse.gmf.tooling.examples.labels/src/org/eclipse/gmf/tooling/examples/labels/LabelsPackage.java b/test-examples/labels/org.eclipse.gmf.tooling.examples.labels/src/org/eclipse/gmf/tooling/examples/labels/LabelsPackage.java
index a21b50c95..110e31647 100644
--- a/test-examples/labels/org.eclipse.gmf.tooling.examples.labels/src/org/eclipse/gmf/tooling/examples/labels/LabelsPackage.java
+++ b/test-examples/labels/org.eclipse.gmf.tooling.examples.labels/src/org/eclipse/gmf/tooling/examples/labels/LabelsPackage.java
@@ -293,13 +293,22 @@ public interface LabelsPackage extends EPackage {
int ALL_LABELS_TYPE__SIDE = NAMED_ELEMENT_FEATURE_COUNT + 20;
/**
+ * The feature id for the '<em><b>Feature Vertical Label Links</b></em>' reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int ALL_LABELS_TYPE__FEATURE_VERTICAL_LABEL_LINKS = NAMED_ELEMENT_FEATURE_COUNT + 21;
+
+ /**
* The number of structural features of the '<em>All Labels Type</em>' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- int ALL_LABELS_TYPE_FEATURE_COUNT = NAMED_ELEMENT_FEATURE_COUNT + 21;
+ int ALL_LABELS_TYPE_FEATURE_COUNT = NAMED_ELEMENT_FEATURE_COUNT + 22;
/**
* The meta object id for the '{@link org.eclipse.gmf.tooling.examples.labels.impl.ChildLabelNodeContainerImpl <em>Child Label Node Container</em>}' class.
@@ -770,6 +779,17 @@ public interface LabelsPackage extends EPackage {
EAttribute getAllLabelsType_Side();
/**
+ * Returns the meta object for the reference list '{@link org.eclipse.gmf.tooling.examples.labels.AllLabelsType#getFeatureVerticalLabelLinks <em>Feature Vertical Label Links</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return the meta object for the reference list '<em>Feature Vertical Label Links</em>'.
+ * @see org.eclipse.gmf.tooling.examples.labels.AllLabelsType#getFeatureVerticalLabelLinks()
+ * @see #getAllLabelsType()
+ * @generated
+ */
+ EReference getAllLabelsType_FeatureVerticalLabelLinks();
+
+ /**
* Returns the meta object for class '{@link org.eclipse.gmf.tooling.examples.labels.ChildLabelNodeContainer <em>Child Label Node Container</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -1102,6 +1122,14 @@ public interface LabelsPackage extends EPackage {
EAttribute ALL_LABELS_TYPE__SIDE = eINSTANCE.getAllLabelsType_Side();
/**
+ * The meta object literal for the '<em><b>Feature Vertical Label Links</b></em>' reference list feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ EReference ALL_LABELS_TYPE__FEATURE_VERTICAL_LABEL_LINKS = eINSTANCE.getAllLabelsType_FeatureVerticalLabelLinks();
+
+ /**
* The meta object literal for the '{@link org.eclipse.gmf.tooling.examples.labels.impl.ChildLabelNodeContainerImpl <em>Child Label Node Container</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
diff --git a/test-examples/labels/org.eclipse.gmf.tooling.examples.labels/src/org/eclipse/gmf/tooling/examples/labels/impl/AllLabelsTypeImpl.java b/test-examples/labels/org.eclipse.gmf.tooling.examples.labels/src/org/eclipse/gmf/tooling/examples/labels/impl/AllLabelsTypeImpl.java
index 484b791d9..31f907d2b 100644
--- a/test-examples/labels/org.eclipse.gmf.tooling.examples.labels/src/org/eclipse/gmf/tooling/examples/labels/impl/AllLabelsTypeImpl.java
+++ b/test-examples/labels/org.eclipse.gmf.tooling.examples.labels/src/org/eclipse/gmf/tooling/examples/labels/impl/AllLabelsTypeImpl.java
@@ -5,17 +5,21 @@ package org.eclipse.gmf.tooling.examples.labels.impl;
import java.math.BigDecimal;
import java.math.BigInteger;
+import java.util.Collection;
import java.util.Date;
import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.util.EList;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.emf.ecore.util.EObjectResolvingEList;
import org.eclipse.gmf.tooling.examples.labels.AllLabelsType;
import org.eclipse.gmf.tooling.examples.labels.LabelsPackage;
import org.eclipse.gmf.tooling.examples.labels.Side;
+import org.eclipse.gmf.tooling.examples.labels.VerticalLabel;
/**
* <!-- begin-user-doc -->
@@ -45,6 +49,7 @@ import org.eclipse.gmf.tooling.examples.labels.Side;
* <li>{@link org.eclipse.gmf.tooling.examples.labels.impl.AllLabelsTypeImpl#getShortObject <em>Short Object</em>}</li>
* <li>{@link org.eclipse.gmf.tooling.examples.labels.impl.AllLabelsTypeImpl#getString <em>String</em>}</li>
* <li>{@link org.eclipse.gmf.tooling.examples.labels.impl.AllLabelsTypeImpl#getSide <em>Side</em>}</li>
+ * <li>{@link org.eclipse.gmf.tooling.examples.labels.impl.AllLabelsTypeImpl#getFeatureVerticalLabelLinks <em>Feature Vertical Label Links</em>}</li>
* </ul>
* </p>
*
@@ -472,6 +477,16 @@ public class AllLabelsTypeImpl extends NamedElementImpl implements AllLabelsType
protected Side side = SIDE_EDEFAULT;
/**
+ * The cached value of the '{@link #getFeatureVerticalLabelLinks() <em>Feature Vertical Label Links</em>}' reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getFeatureVerticalLabelLinks()
+ * @generated
+ * @ordered
+ */
+ protected EList<VerticalLabel> featureVerticalLabelLinks;
+
+ /**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
@@ -936,6 +951,18 @@ public class AllLabelsTypeImpl extends NamedElementImpl implements AllLabelsType
* <!-- end-user-doc -->
* @generated
*/
+ public EList<VerticalLabel> getFeatureVerticalLabelLinks() {
+ if (featureVerticalLabelLinks == null) {
+ featureVerticalLabelLinks = new EObjectResolvingEList<VerticalLabel>(VerticalLabel.class, this, LabelsPackage.ALL_LABELS_TYPE__FEATURE_VERTICAL_LABEL_LINKS);
+ }
+ return featureVerticalLabelLinks;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
@Override
public Object eGet(int featureID, boolean resolve, boolean coreType) {
switch (featureID) {
@@ -981,6 +1008,8 @@ public class AllLabelsTypeImpl extends NamedElementImpl implements AllLabelsType
return getString();
case LabelsPackage.ALL_LABELS_TYPE__SIDE:
return getSide();
+ case LabelsPackage.ALL_LABELS_TYPE__FEATURE_VERTICAL_LABEL_LINKS:
+ return getFeatureVerticalLabelLinks();
}
return super.eGet(featureID, resolve, coreType);
}
@@ -990,6 +1019,7 @@ public class AllLabelsTypeImpl extends NamedElementImpl implements AllLabelsType
* <!-- end-user-doc -->
* @generated
*/
+ @SuppressWarnings("unchecked")
@Override
public void eSet(int featureID, Object newValue) {
switch (featureID) {
@@ -1056,6 +1086,10 @@ public class AllLabelsTypeImpl extends NamedElementImpl implements AllLabelsType
case LabelsPackage.ALL_LABELS_TYPE__SIDE:
setSide((Side)newValue);
return;
+ case LabelsPackage.ALL_LABELS_TYPE__FEATURE_VERTICAL_LABEL_LINKS:
+ getFeatureVerticalLabelLinks().clear();
+ getFeatureVerticalLabelLinks().addAll((Collection<? extends VerticalLabel>)newValue);
+ return;
}
super.eSet(featureID, newValue);
}
@@ -1131,6 +1165,9 @@ public class AllLabelsTypeImpl extends NamedElementImpl implements AllLabelsType
case LabelsPackage.ALL_LABELS_TYPE__SIDE:
setSide(SIDE_EDEFAULT);
return;
+ case LabelsPackage.ALL_LABELS_TYPE__FEATURE_VERTICAL_LABEL_LINKS:
+ getFeatureVerticalLabelLinks().clear();
+ return;
}
super.eUnset(featureID);
}
@@ -1185,6 +1222,8 @@ public class AllLabelsTypeImpl extends NamedElementImpl implements AllLabelsType
return STRING_EDEFAULT == null ? string != null : !STRING_EDEFAULT.equals(string);
case LabelsPackage.ALL_LABELS_TYPE__SIDE:
return side != SIDE_EDEFAULT;
+ case LabelsPackage.ALL_LABELS_TYPE__FEATURE_VERTICAL_LABEL_LINKS:
+ return featureVerticalLabelLinks != null && !featureVerticalLabelLinks.isEmpty();
}
return super.eIsSet(featureID);
}
diff --git a/test-examples/labels/org.eclipse.gmf.tooling.examples.labels/src/org/eclipse/gmf/tooling/examples/labels/impl/LabelsPackageImpl.java b/test-examples/labels/org.eclipse.gmf.tooling.examples.labels/src/org/eclipse/gmf/tooling/examples/labels/impl/LabelsPackageImpl.java
index 77916cb1c..e13ceb86b 100644
--- a/test-examples/labels/org.eclipse.gmf.tooling.examples.labels/src/org/eclipse/gmf/tooling/examples/labels/impl/LabelsPackageImpl.java
+++ b/test-examples/labels/org.eclipse.gmf.tooling.examples.labels/src/org/eclipse/gmf/tooling/examples/labels/impl/LabelsPackageImpl.java
@@ -374,6 +374,15 @@ public class LabelsPackageImpl extends EPackageImpl implements LabelsPackage {
* <!-- end-user-doc -->
* @generated
*/
+ public EReference getAllLabelsType_FeatureVerticalLabelLinks() {
+ return (EReference)allLabelsTypeEClass.getEStructuralFeatures().get(21);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
public EClass getChildLabelNodeContainer() {
return childLabelNodeContainerEClass;
}
@@ -521,6 +530,7 @@ public class LabelsPackageImpl extends EPackageImpl implements LabelsPackage {
createEAttribute(allLabelsTypeEClass, ALL_LABELS_TYPE__SHORT_OBJECT);
createEAttribute(allLabelsTypeEClass, ALL_LABELS_TYPE__STRING);
createEAttribute(allLabelsTypeEClass, ALL_LABELS_TYPE__SIDE);
+ createEReference(allLabelsTypeEClass, ALL_LABELS_TYPE__FEATURE_VERTICAL_LABEL_LINKS);
childLabelNodeContainerEClass = createEClass(CHILD_LABEL_NODE_CONTAINER);
createEReference(childLabelNodeContainerEClass, CHILD_LABEL_NODE_CONTAINER__GET_CHILDREN);
@@ -603,6 +613,7 @@ public class LabelsPackageImpl extends EPackageImpl implements LabelsPackage {
initEAttribute(getAllLabelsType_ShortObject(), ecorePackage.getEShortObject(), "shortObject", "42", 0, 1, AllLabelsType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEAttribute(getAllLabelsType_String(), ecorePackage.getEString(), "string", "Hello!", 0, 1, AllLabelsType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEAttribute(getAllLabelsType_Side(), this.getSide(), "side", "LEFT", 0, 1, AllLabelsType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEReference(getAllLabelsType_FeatureVerticalLabelLinks(), this.getVerticalLabel(), null, "featureVerticalLabelLinks", null, 0, -1, AllLabelsType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(childLabelNodeContainerEClass, ChildLabelNodeContainer.class, "ChildLabelNodeContainer", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
initEReference(getChildLabelNodeContainer_GetChildren(), this.getChildLabelNode(), null, "getChildren", null, 1, 4, ChildLabelNodeContainer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);

Back to the top