View | Details | Raw Unified | Return to bug 124826 | Differences between
and this patch

Collapse All | Expand All

(-)src/org/eclipse/gmf/internal/bridge/genmodel/DiagramGenModelTransformer.java (+8 lines)
Lines 43-48 Link Here
43
import org.eclipse.gmf.codegen.gmfgen.GenChildContainer;
43
import org.eclipse.gmf.codegen.gmfgen.GenChildContainer;
44
import org.eclipse.gmf.codegen.gmfgen.GenChildLabelNode;
44
import org.eclipse.gmf.codegen.gmfgen.GenChildLabelNode;
45
import org.eclipse.gmf.codegen.gmfgen.GenChildNode;
45
import org.eclipse.gmf.codegen.gmfgen.GenChildNode;
46
import org.eclipse.gmf.codegen.gmfgen.GenChildSideAffixedNode;
46
import org.eclipse.gmf.codegen.gmfgen.GenCommonBase;
47
import org.eclipse.gmf.codegen.gmfgen.GenCommonBase;
47
import org.eclipse.gmf.codegen.gmfgen.GenCompartment;
48
import org.eclipse.gmf.codegen.gmfgen.GenCompartment;
48
import org.eclipse.gmf.codegen.gmfgen.GenConstraint;
49
import org.eclipse.gmf.codegen.gmfgen.GenConstraint;
Lines 91-96 Link Here
91
import org.eclipse.gmf.internal.bridge.VisualIdentifierDispenser;
92
import org.eclipse.gmf.internal.bridge.VisualIdentifierDispenser;
92
import org.eclipse.gmf.internal.bridge.naming.gen.GenModelNamingMediator;
93
import org.eclipse.gmf.internal.bridge.naming.gen.GenModelNamingMediator;
93
import org.eclipse.gmf.internal.bridge.tooldef.PaletteHandler;
94
import org.eclipse.gmf.internal.bridge.tooldef.PaletteHandler;
95
import org.eclipse.gmf.mappings.AffixedSide;
94
import org.eclipse.gmf.mappings.AuditContainer;
96
import org.eclipse.gmf.mappings.AuditContainer;
95
import org.eclipse.gmf.mappings.AuditRule;
97
import org.eclipse.gmf.mappings.AuditRule;
96
import org.eclipse.gmf.mappings.AuditedMetricTarget;
98
import org.eclipse.gmf.mappings.AuditedMetricTarget;
Lines 337-342 Link Here
337
			childLabelNode.setLabelElementIcon(soleLabel.getDiagramLabel().isElementIcon());
339
			childLabelNode.setLabelElementIcon(soleLabel.getDiagramLabel().isElementIcon());
338
			childNode = childLabelNode;
340
			childNode = childLabelNode;
339
			needCompartmentChildrenLabelProcessing = false;
341
			needCompartmentChildrenLabelProcessing = false;
342
		} else if (childNodeRef.getAffixedSide() != AffixedSide.NONE_LITERAL){
343
			GenChildSideAffixedNode sideAffixedNode = GMFGenFactory.eINSTANCE.createGenChildSideAffixedNode(); 
344
			sideAffixedNode.setViewmap(myViewmaps.create(childNodeMapping.getDiagramNode()));
345
			sideAffixedNode.setPreferredSide(childNodeRef.getAffixedSide().getValue());
346
			childNode = sideAffixedNode;
347
			needCompartmentChildrenLabelProcessing = true;
340
		} else {
348
		} else {
341
			childNode = GMFGenFactory.eINSTANCE.createGenChildNode();
349
			childNode = GMFGenFactory.eINSTANCE.createGenChildNode();
342
			childNode.setViewmap(myViewmaps.create(childNodeMapping.getDiagramNode()));
350
			childNode.setViewmap(myViewmaps.create(childNodeMapping.getDiagramNode()));
(-)src/org/eclipse/gmf/codegen/gmfgen/provider/GMFGenItemProviderAdapterFactory.java (+23 lines)
Lines 228-233 Link Here
228
	}
228
	}
229
229
230
	/**
230
	/**
231
	 * This keeps track of the one adapter used for all {@link org.eclipse.gmf.codegen.gmfgen.GenChildSideAffixedNode} instances.
232
	 * <!-- begin-user-doc -->
233
	 * <!-- end-user-doc -->
234
	 * @generated
235
	 */
236
	protected GenChildSideAffixedNodeItemProvider genChildSideAffixedNodeItemProvider;
237
238
	/**
239
	 * This creates an adapter for a {@link org.eclipse.gmf.codegen.gmfgen.GenChildSideAffixedNode}.
240
	 * <!-- begin-user-doc -->
241
	 * <!-- end-user-doc -->
242
	 * @generated
243
	 */
244
	public Adapter createGenChildSideAffixedNodeAdapter() {
245
		if (genChildSideAffixedNodeItemProvider == null) {
246
			genChildSideAffixedNodeItemProvider = new GenChildSideAffixedNodeItemProvider(this);
247
		}
248
249
		return genChildSideAffixedNodeItemProvider;
250
	}
251
252
	/**
231
	 * This keeps track of the one adapter used for all {@link org.eclipse.gmf.codegen.gmfgen.GenChildLabelNode} instances.
253
	 * This keeps track of the one adapter used for all {@link org.eclipse.gmf.codegen.gmfgen.GenChildLabelNode} instances.
232
	 * <!-- begin-user-doc -->
254
	 * <!-- begin-user-doc -->
233
	 * <!-- end-user-doc -->
255
	 * <!-- end-user-doc -->
Lines 1364-1369 Link Here
1364
		if (customBehaviourItemProvider != null) customBehaviourItemProvider.dispose();
1386
		if (customBehaviourItemProvider != null) customBehaviourItemProvider.dispose();
1365
		if (genTopLevelNodeItemProvider != null) genTopLevelNodeItemProvider.dispose();
1387
		if (genTopLevelNodeItemProvider != null) genTopLevelNodeItemProvider.dispose();
1366
		if (genChildNodeItemProvider != null) genChildNodeItemProvider.dispose();
1388
		if (genChildNodeItemProvider != null) genChildNodeItemProvider.dispose();
1389
		if (genChildSideAffixedNodeItemProvider != null) genChildSideAffixedNodeItemProvider.dispose();
1367
		if (genChildLabelNodeItemProvider != null) genChildLabelNodeItemProvider.dispose();
1390
		if (genChildLabelNodeItemProvider != null) genChildLabelNodeItemProvider.dispose();
1368
		if (genCompartmentItemProvider != null) genCompartmentItemProvider.dispose();
1391
		if (genCompartmentItemProvider != null) genCompartmentItemProvider.dispose();
1369
		if (genLinkItemProvider != null) genLinkItemProvider.dispose();
1392
		if (genLinkItemProvider != null) genLinkItemProvider.dispose();
(-)src/org/eclipse/gmf/codegen/gmfgen/provider/GenDiagramItemProvider.java (+5 lines)
Lines 1840-1845 Link Here
1840
		newChildDescriptors.add
1840
		newChildDescriptors.add
1841
			(createChildParameter
1841
			(createChildParameter
1842
				(GMFGenPackage.eINSTANCE.getGenDiagram_ChildNodes(),
1842
				(GMFGenPackage.eINSTANCE.getGenDiagram_ChildNodes(),
1843
				 GMFGenFactory.eINSTANCE.createGenChildSideAffixedNode()));
1844
1845
		newChildDescriptors.add
1846
			(createChildParameter
1847
				(GMFGenPackage.eINSTANCE.getGenDiagram_ChildNodes(),
1843
				 GMFGenFactory.eINSTANCE.createGenChildLabelNode()));
1848
				 GMFGenFactory.eINSTANCE.createGenChildLabelNode()));
1844
1849
1845
		newChildDescriptors.add
1850
		newChildDescriptors.add
(-)plugin.properties (+2 lines)
Lines 537-539 Link Here
537
_UI_GenCommonBase_customBehaviour_feature = Custom Behaviour
537
_UI_GenCommonBase_customBehaviour_feature = Custom Behaviour
538
_UI_CustomBehaviour_key_feature = Key
538
_UI_CustomBehaviour_key_feature = Key
539
_UI_CustomBehaviour_editPolicyQualifiedClassName_feature = Edit Policy Qualified Class Name
539
_UI_CustomBehaviour_editPolicyQualifiedClassName_feature = Edit Policy Qualified Class Name
540
_UI_GenChildSideAffixedNode_type = Gen Child Side Affixed Node
541
_UI_GenChildSideAffixedNode_preferredSide_feature = Preferred Side
(-)src/org/eclipse/gmf/codegen/gmfgen/provider/GenChildSideAffixedNodeItemProvider.java (+132 lines)
Added Link Here
1
/**
2
 * <copyright>
3
 * </copyright>
4
 *
5
 * $Id$
6
 */
7
package org.eclipse.gmf.codegen.gmfgen.provider;
8
9
10
import java.util.Collection;
11
import java.util.List;
12
13
import org.eclipse.emf.common.notify.AdapterFactory;
14
import org.eclipse.emf.common.notify.Notification;
15
16
import org.eclipse.emf.common.util.ResourceLocator;
17
18
import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
19
import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
20
import org.eclipse.emf.edit.provider.IItemLabelProvider;
21
import org.eclipse.emf.edit.provider.IItemPropertySource;
22
import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
23
import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
24
import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
25
import org.eclipse.emf.edit.provider.ViewerNotification;
26
27
import org.eclipse.gmf.codegen.gmfgen.GMFGenPackage;
28
import org.eclipse.gmf.codegen.gmfgen.GenChildSideAffixedNode;
29
30
import org.eclipse.gmf.codegen.gmfgen.presentation.EditorPlugin;
31
32
/**
33
 * This is the item provider adapter for a {@link org.eclipse.gmf.codegen.gmfgen.GenChildSideAffixedNode} object.
34
 * <!-- begin-user-doc -->
35
 * <!-- end-user-doc -->
36
 * @generated
37
 */
38
public class GenChildSideAffixedNodeItemProvider
39
	extends GenChildNodeItemProvider
40
	implements	
41
		IEditingDomainItemProvider,	
42
		IStructuredItemContentProvider,	
43
		ITreeItemContentProvider,	
44
		IItemLabelProvider,	
45
		IItemPropertySource {
46
	/**
47
	 * This constructs an instance from a factory and a notifier.
48
	 * <!-- begin-user-doc -->
49
	 * <!-- end-user-doc -->
50
	 * @generated
51
	 */
52
	public GenChildSideAffixedNodeItemProvider(AdapterFactory adapterFactory) {
53
		super(adapterFactory);
54
	}
55
56
	/**
57
	 * This returns the property descriptors for the adapted class.
58
	 * <!-- begin-user-doc -->
59
	 * <!-- end-user-doc -->
60
	 * @generated
61
	 */
62
	public List getPropertyDescriptors(Object object) {
63
		if (itemPropertyDescriptors == null) {
64
			super.getPropertyDescriptors(object);
65
66
		}
67
		return itemPropertyDescriptors;
68
	}
69
70
	/**
71
	 * This returns GenChildSideAffixedNode.gif.
72
	 * <!-- begin-user-doc -->
73
	 * <!-- end-user-doc -->
74
	 * @generated
75
	 */
76
	public Object getImage(Object object) {
77
		return overlayImage(object, getResourceLocator().getImage("full/obj16/GenChildSideAffixedNode"));
78
	}
79
80
	/**
81
	 * This returns the label text for the adapted class.
82
	 * <!-- begin-user-doc -->
83
	 * <!-- end-user-doc -->
84
	 * @generated
85
	 */
86
	public String getText(Object object) {
87
		String label = ((GenChildSideAffixedNode)object).getEditPartClassName();
88
		return label == null || label.length() == 0 ?
89
			getString("_UI_GenChildSideAffixedNode_type") :
90
			getString("_UI_GenChildSideAffixedNode_type") + " " + label;
91
	}
92
93
	/**
94
	 * This handles model notifications by calling {@link #updateChildren} to update any cached
95
	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
96
	 * <!-- begin-user-doc -->
97
	 * <!-- end-user-doc -->
98
	 * @generated
99
	 */
100
	public void notifyChanged(Notification notification) {
101
		updateChildren(notification);
102
103
		switch (notification.getFeatureID(GenChildSideAffixedNode.class)) {
104
			case GMFGenPackage.GEN_CHILD_SIDE_AFFIXED_NODE__PREFERRED_SIDE:
105
				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
106
				return;
107
		}
108
		super.notifyChanged(notification);
109
	}
110
111
	/**
112
	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
113
	 * describing all of the children that can be created under this object.
114
	 * <!-- begin-user-doc -->
115
	 * <!-- end-user-doc -->
116
	 * @generated
117
	 */
118
	protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {
119
		super.collectNewChildDescriptors(newChildDescriptors, object);
120
	}
121
122
	/**
123
	 * Return the resource locator for this item provider's resources.
124
	 * <!-- begin-user-doc -->
125
	 * <!-- end-user-doc -->
126
	 * @generated
127
	 */
128
	public ResourceLocator getResourceLocator() {
129
		return EditorPlugin.INSTANCE;
130
	}
131
132
}
(-)icons/full/ctool16/CreateGenDiagram_childNodes_GenChildSideAffixedNode.gif (+1 lines)
Added Link Here
1
GIF89aÄÿÿÿßß¿??_ÀÀÀœœœ@€À@@@ÿÿ_Ÿ_?ÿß?€€€ÀÀÀœœœÀÀ@@@@º—&º—&µ’#®Š¥‚žy™tþýïþýïýóÏýóÏüç£û݃!ù,\  ŽdY>&™ÍÔе’?ƒŽ’tI3ó4ŒÖk’)'?ciCQ(›§ÈŽ*œÊÉF:,&ßKD8R€›è`ð¢É‡¡`F؄|Ûm*Ëégol|‚e?‚k%!;
(-)icons/full/obj16/GenChildSideAffixedNode.gif (+1 lines)
Added Link Here
1
GIF89a³€€€€ÀÀÀ€€€ÿÿÀÀÀÿÿÿÿÿÿÀÀÀœœœ@€À@@@!ù	,.0ÉI«½8ëôö$áqE·5Úd`J ¡õ<.ñ–&Õ6wŒ©)-§‰Fđ;
(-)src/org/eclipse/gmf/codegen/gmfgen/impl/GMFGenPackageImpl.java (+33 lines)
Lines 41-46 Link Here
41
import org.eclipse.gmf.codegen.gmfgen.GenChildContainer;
41
import org.eclipse.gmf.codegen.gmfgen.GenChildContainer;
42
import org.eclipse.gmf.codegen.gmfgen.GenChildLabelNode;
42
import org.eclipse.gmf.codegen.gmfgen.GenChildLabelNode;
43
import org.eclipse.gmf.codegen.gmfgen.GenChildNode;
43
import org.eclipse.gmf.codegen.gmfgen.GenChildNode;
44
import org.eclipse.gmf.codegen.gmfgen.GenChildSideAffixedNode;
44
import org.eclipse.gmf.codegen.gmfgen.GenCommonBase;
45
import org.eclipse.gmf.codegen.gmfgen.GenCommonBase;
45
import org.eclipse.gmf.codegen.gmfgen.GenCompartment;
46
import org.eclipse.gmf.codegen.gmfgen.GenCompartment;
46
import org.eclipse.gmf.codegen.gmfgen.GenConstraint;
47
import org.eclipse.gmf.codegen.gmfgen.GenConstraint;
Lines 274-279 Link Here
274
	 * <!-- end-user-doc -->
275
	 * <!-- end-user-doc -->
275
	 * @generated
276
	 * @generated
276
	 */
277
	 */
278
	private EClass genChildSideAffixedNodeEClass = null;
279
280
	/**
281
	 * <!-- begin-user-doc -->
282
	 * <!-- end-user-doc -->
283
	 * @generated
284
	 */
277
	private EClass genChildLabelNodeEClass = null;
285
	private EClass genChildLabelNodeEClass = null;
278
286
279
	/**
287
	/**
Lines 2147-2152 Link Here
2147
	 * <!-- end-user-doc -->
2155
	 * <!-- end-user-doc -->
2148
	 * @generated
2156
	 * @generated
2149
	 */
2157
	 */
2158
	public EClass getGenChildSideAffixedNode() {
2159
		return genChildSideAffixedNodeEClass;
2160
	}
2161
2162
	/**
2163
	 * <!-- begin-user-doc -->
2164
	 * <!-- end-user-doc -->
2165
	 * @generated
2166
	 */
2167
	public EAttribute getGenChildSideAffixedNode_PreferredSide() {
2168
		return (EAttribute)genChildSideAffixedNodeEClass.getEStructuralFeatures().get(0);
2169
	}
2170
2171
	/**
2172
	 * <!-- begin-user-doc -->
2173
	 * <!-- end-user-doc -->
2174
	 * @generated
2175
	 */
2150
	public EClass getGenChildLabelNode() {
2176
	public EClass getGenChildLabelNode() {
2151
		return genChildLabelNodeEClass;
2177
		return genChildLabelNodeEClass;
2152
	}
2178
	}
Lines 4077-4082 Link Here
4077
		createEReference(genChildNodeEClass, GEN_CHILD_NODE__DIAGRAM);
4103
		createEReference(genChildNodeEClass, GEN_CHILD_NODE__DIAGRAM);
4078
		createEReference(genChildNodeEClass, GEN_CHILD_NODE__CONTAINERS);
4104
		createEReference(genChildNodeEClass, GEN_CHILD_NODE__CONTAINERS);
4079
4105
4106
		genChildSideAffixedNodeEClass = createEClass(GEN_CHILD_SIDE_AFFIXED_NODE);
4107
		createEAttribute(genChildSideAffixedNodeEClass, GEN_CHILD_SIDE_AFFIXED_NODE__PREFERRED_SIDE);
4108
4080
		genChildLabelNodeEClass = createEClass(GEN_CHILD_LABEL_NODE);
4109
		genChildLabelNodeEClass = createEClass(GEN_CHILD_LABEL_NODE);
4081
		createEAttribute(genChildLabelNodeEClass, GEN_CHILD_LABEL_NODE__LABEL_READ_ONLY);
4110
		createEAttribute(genChildLabelNodeEClass, GEN_CHILD_LABEL_NODE__LABEL_READ_ONLY);
4082
		createEAttribute(genChildLabelNodeEClass, GEN_CHILD_LABEL_NODE__LABEL_ELEMENT_ICON);
4111
		createEAttribute(genChildLabelNodeEClass, GEN_CHILD_LABEL_NODE__LABEL_ELEMENT_ICON);
Lines 4385-4390 Link Here
4385
		genNodeEClass.getESuperTypes().add(this.getGenChildContainer());
4414
		genNodeEClass.getESuperTypes().add(this.getGenChildContainer());
4386
		genTopLevelNodeEClass.getESuperTypes().add(this.getGenNode());
4415
		genTopLevelNodeEClass.getESuperTypes().add(this.getGenNode());
4387
		genChildNodeEClass.getESuperTypes().add(this.getGenNode());
4416
		genChildNodeEClass.getESuperTypes().add(this.getGenNode());
4417
		genChildSideAffixedNodeEClass.getESuperTypes().add(this.getGenChildNode());
4388
		genChildLabelNodeEClass.getESuperTypes().add(this.getGenChildNode());
4418
		genChildLabelNodeEClass.getESuperTypes().add(this.getGenChildNode());
4389
		genCompartmentEClass.getESuperTypes().add(this.getGenChildContainer());
4419
		genCompartmentEClass.getESuperTypes().add(this.getGenChildContainer());
4390
		genLinkEClass.getESuperTypes().add(this.getGenCommonBase());
4420
		genLinkEClass.getESuperTypes().add(this.getGenCommonBase());
Lines 4746-4751 Link Here
4746
		initEReference(getGenChildNode_Diagram(), this.getGenDiagram(), this.getGenDiagram_ChildNodes(), "diagram", null, 1, 1, GenChildNode.class, !IS_TRANSIENT, !IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
4776
		initEReference(getGenChildNode_Diagram(), this.getGenDiagram(), this.getGenDiagram_ChildNodes(), "diagram", null, 1, 1, GenChildNode.class, !IS_TRANSIENT, !IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
4747
		initEReference(getGenChildNode_Containers(), this.getGenChildContainer(), this.getGenChildContainer_ChildNodes(), "containers", null, 0, -1, GenChildNode.class, !IS_TRANSIENT, !IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
4777
		initEReference(getGenChildNode_Containers(), this.getGenChildContainer(), this.getGenChildContainer_ChildNodes(), "containers", null, 0, -1, GenChildNode.class, !IS_TRANSIENT, !IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
4748
4778
4779
		initEClass(genChildSideAffixedNodeEClass, GenChildSideAffixedNode.class, "GenChildSideAffixedNode", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
4780
		initEAttribute(getGenChildSideAffixedNode_PreferredSide(), ecorePackage.getEInt(), "preferredSide", "0", 0, 1, GenChildSideAffixedNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
4781
4749
		initEClass(genChildLabelNodeEClass, GenChildLabelNode.class, "GenChildLabelNode", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
4782
		initEClass(genChildLabelNodeEClass, GenChildLabelNode.class, "GenChildLabelNode", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
4750
		initEAttribute(getGenChildLabelNode_LabelReadOnly(), ecorePackage.getEBoolean(), "labelReadOnly", null, 0, 1, GenChildLabelNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
4783
		initEAttribute(getGenChildLabelNode_LabelReadOnly(), ecorePackage.getEBoolean(), "labelReadOnly", null, 0, 1, GenChildLabelNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
4751
		initEAttribute(getGenChildLabelNode_LabelElementIcon(), ecorePackage.getEBoolean(), "labelElementIcon", null, 0, 1, GenChildLabelNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
4784
		initEAttribute(getGenChildLabelNode_LabelElementIcon(), ecorePackage.getEBoolean(), "labelElementIcon", null, 0, 1, GenChildLabelNode.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
(-)src/org/eclipse/gmf/codegen/gmfgen/impl/GMFGenFactoryImpl.java (+11 lines)
Lines 118-123 Link Here
118
			case GMFGenPackage.CUSTOM_BEHAVIOUR: return createCustomBehaviour();
118
			case GMFGenPackage.CUSTOM_BEHAVIOUR: return createCustomBehaviour();
119
			case GMFGenPackage.GEN_TOP_LEVEL_NODE: return createGenTopLevelNode();
119
			case GMFGenPackage.GEN_TOP_LEVEL_NODE: return createGenTopLevelNode();
120
			case GMFGenPackage.GEN_CHILD_NODE: return createGenChildNode();
120
			case GMFGenPackage.GEN_CHILD_NODE: return createGenChildNode();
121
			case GMFGenPackage.GEN_CHILD_SIDE_AFFIXED_NODE: return createGenChildSideAffixedNode();
121
			case GMFGenPackage.GEN_CHILD_LABEL_NODE: return createGenChildLabelNode();
122
			case GMFGenPackage.GEN_CHILD_LABEL_NODE: return createGenChildLabelNode();
122
			case GMFGenPackage.GEN_COMPARTMENT: return createGenCompartment();
123
			case GMFGenPackage.GEN_COMPARTMENT: return createGenCompartment();
123
			case GMFGenPackage.GEN_LINK: return createGenLink();
124
			case GMFGenPackage.GEN_LINK: return createGenLink();
Lines 289-294 Link Here
289
	 * <!-- end-user-doc -->
290
	 * <!-- end-user-doc -->
290
	 * @generated
291
	 * @generated
291
	 */
292
	 */
293
	public GenChildSideAffixedNode createGenChildSideAffixedNode() {
294
		GenChildSideAffixedNodeImpl genChildSideAffixedNode = new GenChildSideAffixedNodeImpl();
295
		return genChildSideAffixedNode;
296
	}
297
298
	/**
299
	 * <!-- begin-user-doc -->
300
	 * <!-- end-user-doc -->
301
	 * @generated
302
	 */
292
	public GenChildLabelNode createGenChildLabelNode() {
303
	public GenChildLabelNode createGenChildLabelNode() {
293
		GenChildLabelNodeImpl genChildLabelNode = new GenChildLabelNodeImpl();
304
		GenChildLabelNodeImpl genChildLabelNode = new GenChildLabelNodeImpl();
294
		return genChildLabelNode;
305
		return genChildLabelNode;
(-)src-templates/org/eclipse/gmf/codegen/templates/parts/NodeEditPartGenerator.java (-330 / +443 lines)
Lines 48-219 Link Here
48
  protected final String TEXT_29 = ".VISUAL_ID));" + NL + "\t\t\t\t\t\t\treturn compartmentEditPart == null ? null : compartmentEditPart.getCommand(request);" + NL + "\t\t\t\t\t\t}";
48
  protected final String TEXT_29 = ".VISUAL_ID));" + NL + "\t\t\t\t\t\t\treturn compartmentEditPart == null ? null : compartmentEditPart.getCommand(request);" + NL + "\t\t\t\t\t\t}";
49
  protected final String TEXT_30 = NL + "\t\t\t\t\t}" + NL + "\t\t\t\t\treturn super.getCommand(request);" + NL + "\t\t\t\t}" + NL + "\t\t\t\treturn null;" + NL + "\t\t\t}" + NL + "\t\t}";
49
  protected final String TEXT_30 = NL + "\t\t\t\t\t}" + NL + "\t\t\t\t\treturn super.getCommand(request);" + NL + "\t\t\t\t}" + NL + "\t\t\t\treturn null;" + NL + "\t\t\t}" + NL + "\t\t}";
50
  protected final String TEXT_31 = NL + "\t\t);";
50
  protected final String TEXT_31 = NL + "\t\t);";
51
  protected final String TEXT_32 = NL + "\t\tsuper.createDefaultEditPolicies();" + NL + "\t\tinstallEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new ";
51
  protected final String TEXT_32 = NL + "\t\tsuper.createDefaultEditPolicies();";
52
  protected final String TEXT_33 = "());" + NL + "\t\tinstallEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new ";
52
  protected final String TEXT_33 = NL + "\t\tinstallEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, getPrimaryDragEditPolicy());";
53
  protected final String TEXT_34 = "());";
53
  protected final String TEXT_34 = "\t\t" + NL + "\t\tinstallEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new ";
54
  protected final String TEXT_35 = NL + "\t\tinstallEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new ";
54
  protected final String TEXT_35 = "());" + NL + "\t\tinstallEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new ";
55
  protected final String TEXT_36 = "());";
55
  protected final String TEXT_36 = "());";
56
  protected final String TEXT_37 = NL + "\t\tinstallEditPolicy(EditPolicyRoles.CANONICAL_ROLE, new ";
56
  protected final String TEXT_37 = NL + "\t\tinstallEditPolicy(EditPolicyRoles.DRAG_DROP_ROLE, new ";
57
  protected final String TEXT_38 = "());";
57
  protected final String TEXT_38 = "());";
58
  protected final String TEXT_39 = NL + "\t\tinstallEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());";
58
  protected final String TEXT_39 = NL + "\t\tinstallEditPolicy(EditPolicyRoles.CANONICAL_ROLE, new ";
59
  protected final String TEXT_40 = NL;
59
  protected final String TEXT_40 = "());";
60
  protected final String TEXT_41 = NL + "\t\tinstallEditPolicy(\"";
60
  protected final String TEXT_41 = NL + "\t\tinstallEditPolicy(EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());";
61
  protected final String TEXT_42 = "\", new ";
61
  protected final String TEXT_42 = NL;
62
  protected final String TEXT_43 = "()); //$NON-NLS-1$";
62
  protected final String TEXT_43 = NL + "\t\tinstallEditPolicy(\"";
63
  protected final String TEXT_44 = NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected ";
63
  protected final String TEXT_44 = "\", new ";
64
  protected final String TEXT_45 = " createLayoutEditPolicy() {";
64
  protected final String TEXT_45 = "()); //$NON-NLS-1$";
65
  protected final String TEXT_46 = NL + "\t\t";
65
  protected final String TEXT_46 = NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected ";
66
  protected final String TEXT_47 = " lep = new ";
66
  protected final String TEXT_47 = " createLayoutEditPolicy() {";
67
  protected final String TEXT_48 = "() {";
67
  protected final String TEXT_48 = NL + "\t\t";
68
  protected final String TEXT_49 = NL + NL + "\t\t\tprotected void decorateChild(EditPart child) {" + NL + "\t\t\t\tif (isExternalLabel(child)) {" + NL + "\t\t\t\t\treturn;" + NL + "\t\t\t\t}" + NL + "\t\t\t\tsuper.decorateChild(child);" + NL + "\t\t\t}";
68
  protected final String TEXT_49 = " lep = new ";
69
  protected final String TEXT_50 = NL + NL + "\t\t\tprotected EditPolicy createChildEditPolicy(";
69
  protected final String TEXT_50 = "() {";
70
  protected final String TEXT_51 = " child) {" + NL + "\t\t\t\tEditPolicy result = super.createChildEditPolicy(child);" + NL + "\t\t\t\tif (result == null) {" + NL + "\t\t\t\t\treturn new ";
70
  protected final String TEXT_51 = NL + NL + "\t\t\tprotected void decorateChild(EditPart child) {" + NL + "\t\t\t\tif (isExternalLabel(child)) {" + NL + "\t\t\t\t\treturn;" + NL + "\t\t\t\t}" + NL + "\t\t\t\tsuper.decorateChild(child);" + NL + "\t\t\t}";
71
  protected final String TEXT_52 = "();" + NL + "\t\t\t\t}" + NL + "\t\t\t\treturn result;" + NL + "\t\t\t}" + NL + "\t\t};";
71
  protected final String TEXT_52 = NL + NL + "\t\t\tprotected EditPolicy createChildEditPolicy(";
72
  protected final String TEXT_53 = NL + "\t\t";
72
  protected final String TEXT_53 = " child) {" + NL + "\t\t\t\tEditPolicy result = super.createChildEditPolicy(child);" + NL + "\t\t\t\tif (result == null) {" + NL + "\t\t\t\t\treturn new ";
73
  protected final String TEXT_54 = " xlep = new ";
73
  protected final String TEXT_54 = "();" + NL + "\t\t\t\t}" + NL + "\t\t\t\treturn result;" + NL + "\t\t\t}" + NL + "\t\t};";
74
  protected final String TEXT_55 = "() {" + NL + "" + NL + "\t\t\tprotected boolean isExternalLabel(EditPart editPart) {" + NL + "\t\t\t\treturn ";
74
  protected final String TEXT_55 = NL + "\t\t";
75
  protected final String TEXT_56 = ".this.isExternalLabel(editPart);" + NL + "\t\t\t}" + NL + "\t\t};" + NL + "\t\txlep.setRealLayoutEditPolicy(lep);" + NL + "\t\treturn xlep;";
75
  protected final String TEXT_56 = " xlep = new ";
76
  protected final String TEXT_57 = NL + "\t\treturn lep;";
76
  protected final String TEXT_57 = "() {" + NL + "" + NL + "\t\t\tprotected boolean isExternalLabel(EditPart editPart) {" + NL + "\t\t\t\treturn ";
77
  protected final String TEXT_58 = NL + "\t\t";
77
  protected final String TEXT_58 = ".this.isExternalLabel(editPart);" + NL + "\t\t\t}" + NL + "\t\t};" + NL + "\t\txlep.setRealLayoutEditPolicy(lep);" + NL + "\t\treturn xlep;";
78
  protected final String TEXT_59 = " lep = new ";
78
  protected final String TEXT_59 = NL + "\t\treturn lep;";
79
  protected final String TEXT_60 = "() {";
79
  protected final String TEXT_60 = NL + "\t\t";
80
  protected final String TEXT_61 = NL + NL + "\t\t\tprotected void decorateChild(EditPart child) {" + NL + "\t\t\t\tif (isExternalLabel(child)) {" + NL + "\t\t\t\t\treturn;" + NL + "\t\t\t\t}" + NL + "\t\t\t\tsuper.decorateChild(child);" + NL + "\t\t\t}";
80
  protected final String TEXT_61 = " lep = new ";
81
  protected final String TEXT_62 = NL + NL + "\t\t\tprotected EditPolicy createChildEditPolicy(";
81
  protected final String TEXT_62 = "() {";
82
  protected final String TEXT_63 = " child) {" + NL + "\t\t\t\tif (child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE) == null) {" + NL + "\t\t\t\t\tif (child instanceof ";
82
  protected final String TEXT_63 = NL + NL + "\t\t\tprotected void decorateChild(EditPart child) {" + NL + "\t\t\t\tif (isExternalLabel(child)) {" + NL + "\t\t\t\t\treturn;" + NL + "\t\t\t\t}" + NL + "\t\t\t\tsuper.decorateChild(child);" + NL + "\t\t\t}";
83
  protected final String TEXT_64 = ") {" + NL + "\t\t\t\t\t\treturn new ";
83
  protected final String TEXT_64 = NL + NL + "\t\t\tprotected EditPolicy createChildEditPolicy(";
84
  protected final String TEXT_65 = "();" + NL + "\t\t\t\t\t}" + NL + "\t\t\t\t}" + NL + "\t\t\t\treturn super.createChildEditPolicy(child);" + NL + "\t\t\t}" + NL + "\t\t};";
84
  protected final String TEXT_65 = " child) {" + NL + "\t\t\t\tif (child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE) == null) {" + NL + "\t\t\t\t\tif (child instanceof ";
85
  protected final String TEXT_66 = NL + "\t\t";
85
  protected final String TEXT_66 = ") {" + NL + "\t\t\t\t\t\treturn new ";
86
  protected final String TEXT_67 = " xlep = new ";
86
  protected final String TEXT_67 = "();" + NL + "\t\t\t\t\t}" + NL + "\t\t\t\t}" + NL + "\t\t\t\treturn super.createChildEditPolicy(child);" + NL + "\t\t\t}" + NL + "\t\t};";
87
  protected final String TEXT_68 = "() {" + NL + "" + NL + "\t\t\tprotected boolean isExternalLabel(EditPart editPart) {" + NL + "\t\t\t\treturn ";
87
  protected final String TEXT_68 = NL + "\t\t";
88
  protected final String TEXT_69 = ".this.isExternalLabel(editPart);" + NL + "\t\t\t}" + NL + "\t\t};" + NL + "\t\txlep.setRealLayoutEditPolicy(lep);" + NL + "\t\treturn xlep;";
88
  protected final String TEXT_69 = " xlep = new ";
89
  protected final String TEXT_70 = NL + "\t\treturn lep;";
89
  protected final String TEXT_70 = "() {" + NL + "" + NL + "\t\t\tprotected boolean isExternalLabel(EditPart editPart) {" + NL + "\t\t\t\treturn ";
90
  protected final String TEXT_71 = NL + "\t\t";
90
  protected final String TEXT_71 = ".this.isExternalLabel(editPart);" + NL + "\t\t\t}" + NL + "\t\t};" + NL + "\t\txlep.setRealLayoutEditPolicy(lep);" + NL + "\t\treturn xlep;";
91
  protected final String TEXT_72 = " lep = new ";
91
  protected final String TEXT_72 = NL + "\t\treturn lep;";
92
  protected final String TEXT_73 = "() {";
92
  protected final String TEXT_73 = NL + "\t\t";
93
  protected final String TEXT_74 = NL + NL + "\t\t\tprotected void decorateChild(EditPart child) {" + NL + "\t\t\t\tif (isExternalLabel(child)) {" + NL + "\t\t\t\t\treturn;" + NL + "\t\t\t\t}" + NL + "\t\t\t\tsuper.decorateChild(child);" + NL + "\t\t\t}";
93
  protected final String TEXT_74 = " lep = new ";
94
  protected final String TEXT_75 = NL + NL + "\t\t\tprotected ";
94
  protected final String TEXT_75 = "() {";
95
  protected final String TEXT_76 = " createAddCommand(";
95
  protected final String TEXT_76 = NL + NL + "\t\t\tprotected void decorateChild(EditPart child) {" + NL + "\t\t\t\tif (isExternalLabel(child)) {" + NL + "\t\t\t\t\treturn;" + NL + "\t\t\t\t}" + NL + "\t\t\t\tsuper.decorateChild(child);" + NL + "\t\t\t}";
96
  protected final String TEXT_77 = " child, ";
96
  protected final String TEXT_77 = NL;
97
  protected final String TEXT_78 = " after) {" + NL + "\t\t\t\treturn null;" + NL + "\t\t\t}" + NL + "" + NL + "\t\t\tprotected ";
97
  protected final String TEXT_78 = NL + "\t\t\tprotected EditPolicy createChildEditPolicy(";
98
  protected final String TEXT_79 = " createMoveChildCommand(";
98
  protected final String TEXT_79 = " child) {" + NL + "\t\t\t\tif (child instanceof ";
99
  protected final String TEXT_80 = " child, ";
99
  protected final String TEXT_80 = ") {" + NL + "\t\t\t\t\treturn new ";
100
  protected final String TEXT_81 = " after) {" + NL + "\t\t\t\treturn null;" + NL + "\t\t\t}" + NL + "" + NL + "\t\t\tprotected ";
100
  protected final String TEXT_81 = "();" + NL + "\t\t\t\t}" + NL + "\t\t\t\treturn super.createChildEditPolicy(child);" + NL + "\t\t\t}";
101
  protected final String TEXT_82 = " getCreateCommand(";
101
  protected final String TEXT_82 = NL + NL + "\t\t\tprotected ";
102
  protected final String TEXT_83 = " request) {" + NL + "\t\t\t\treturn null;" + NL + "\t\t\t}" + NL + "\t\t};";
102
  protected final String TEXT_83 = " createAddCommand(";
103
  protected final String TEXT_84 = NL + "\t\t";
103
  protected final String TEXT_84 = " child, ";
104
  protected final String TEXT_85 = " xlep = new ";
104
  protected final String TEXT_85 = " after) {" + NL + "\t\t\t\treturn null;" + NL + "\t\t\t}" + NL + "" + NL + "\t\t\tprotected ";
105
  protected final String TEXT_86 = "() {" + NL + "" + NL + "\t\t\tprotected boolean isExternalLabel(EditPart editPart) {" + NL + "\t\t\t\treturn ";
105
  protected final String TEXT_86 = " createMoveChildCommand(";
106
  protected final String TEXT_87 = ".this.isExternalLabel(editPart);" + NL + "\t\t\t}" + NL + "\t\t};" + NL + "\t\txlep.setRealLayoutEditPolicy(lep);" + NL + "\t\treturn xlep;";
106
  protected final String TEXT_87 = " child, ";
107
  protected final String TEXT_88 = NL + "\t\treturn lep;";
107
  protected final String TEXT_88 = " after) {" + NL + "\t\t\t\treturn null;" + NL + "\t\t\t}" + NL + "" + NL + "\t\t\tprotected ";
108
  protected final String TEXT_89 = NL + "\t\t";
108
  protected final String TEXT_89 = " getCreateCommand(";
109
  protected final String TEXT_90 = " lep = new ";
109
  protected final String TEXT_90 = " request) {" + NL + "\t\t\t\treturn null;" + NL + "\t\t\t}" + NL + "\t\t};";
110
  protected final String TEXT_91 = "() {";
110
  protected final String TEXT_91 = NL + "\t\t";
111
  protected final String TEXT_92 = NL + NL + "\t\t\tprotected void decorateChild(EditPart child) {" + NL + "\t\t\t\tif (isExternalLabel(child)) {" + NL + "\t\t\t\t\treturn;" + NL + "\t\t\t\t}" + NL + "\t\t\t\tsuper.decorateChild(child);" + NL + "\t\t\t}";
111
  protected final String TEXT_92 = " xlep = new ";
112
  protected final String TEXT_93 = NL + NL + "\t\t\tprotected EditPolicy createChildEditPolicy(";
112
  protected final String TEXT_93 = "() {" + NL + "" + NL + "\t\t\tprotected boolean isExternalLabel(EditPart editPart) {" + NL + "\t\t\t\treturn ";
113
  protected final String TEXT_94 = " child) {" + NL + "\t\t\t\tEditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);" + NL + "\t\t\t\tif( result == null ){" + NL + "\t\t\t\t\tresult = new ";
113
  protected final String TEXT_94 = ".this.isExternalLabel(editPart);" + NL + "\t\t\t}" + NL + "\t\t};" + NL + "\t\txlep.setRealLayoutEditPolicy(lep);" + NL + "\t\treturn xlep;";
114
  protected final String TEXT_95 = "();" + NL + "\t\t\t\t}" + NL + "\t\t\t\treturn result;" + NL + "\t\t\t}" + NL + "" + NL + "\t\t\tprotected ";
114
  protected final String TEXT_95 = NL + "\t\treturn lep;";
115
  protected final String TEXT_96 = " getMoveChildrenCommand(";
115
  protected final String TEXT_96 = NL + "\t\t";
116
  protected final String TEXT_97 = " request) {" + NL + "\t\t\t\treturn null;" + NL + "\t\t\t}" + NL + "" + NL + "\t\t\tprotected ";
116
  protected final String TEXT_97 = " lep = new ";
117
  protected final String TEXT_98 = " getCreateCommand(";
117
  protected final String TEXT_98 = "() {";
118
  protected final String TEXT_99 = " request) {" + NL + "\t\t\t\treturn null;" + NL + "\t\t\t}" + NL + "\t\t};";
118
  protected final String TEXT_99 = NL + NL + "\t\t\tprotected void decorateChild(EditPart child) {" + NL + "\t\t\t\tif (isExternalLabel(child)) {" + NL + "\t\t\t\t\treturn;" + NL + "\t\t\t\t}" + NL + "\t\t\t\tsuper.decorateChild(child);" + NL + "\t\t\t}";
119
  protected final String TEXT_100 = NL + "\t\t";
119
  protected final String TEXT_100 = NL + NL + "\t\t\tprotected EditPolicy createChildEditPolicy(";
120
  protected final String TEXT_101 = " xlep = new ";
120
  protected final String TEXT_101 = " child) {" + NL + "\t\t\t\tEditPolicy result = child.getEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE);" + NL + "\t\t\t\tif( result == null ){" + NL + "\t\t\t\t\tresult = new ";
121
  protected final String TEXT_102 = "() {" + NL + "" + NL + "\t\t\tprotected boolean isExternalLabel(EditPart editPart) {" + NL + "\t\t\t\treturn ";
121
  protected final String TEXT_102 = "();" + NL + "\t\t\t\t}" + NL + "\t\t\t\treturn result;" + NL + "\t\t\t}" + NL + "" + NL + "\t\t\tprotected ";
122
  protected final String TEXT_103 = ".this.isExternalLabel(editPart);" + NL + "\t\t\t}" + NL + "\t\t};" + NL + "\t\txlep.setRealLayoutEditPolicy(lep);" + NL + "\t\treturn xlep;";
122
  protected final String TEXT_103 = " getMoveChildrenCommand(";
123
  protected final String TEXT_104 = NL + "\t\treturn lep;";
123
  protected final String TEXT_104 = " request) {" + NL + "\t\t\t\treturn null;" + NL + "\t\t\t}" + NL + "" + NL + "\t\t\tprotected ";
124
  protected final String TEXT_105 = NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected IFigure createNodeShape() {";
124
  protected final String TEXT_105 = " getCreateCommand(";
125
  protected final String TEXT_106 = NL + "\t\treturn primaryShape = new ";
125
  protected final String TEXT_106 = " request) {" + NL + "\t\t\t\treturn null;" + NL + "\t\t\t}" + NL + "\t\t};";
126
  protected final String TEXT_107 = "()";
126
  protected final String TEXT_107 = NL + "\t\t";
127
  protected final String TEXT_108 = " {" + NL + "\t\t\tprotected boolean useLocalCoordinates() {" + NL + "\t\t\t\treturn true;" + NL + "\t\t\t}" + NL + "\t\t}";
127
  protected final String TEXT_108 = " xlep = new ";
128
  protected final String TEXT_109 = ";";
128
  protected final String TEXT_109 = "() {" + NL + "" + NL + "\t\t\tprotected boolean isExternalLabel(EditPart editPart) {" + NL + "\t\t\t\treturn ";
129
  protected final String TEXT_110 = NL + "\t\treturn ";
129
  protected final String TEXT_110 = ".this.isExternalLabel(editPart);" + NL + "\t\t\t}" + NL + "\t\t};" + NL + "\t\txlep.setRealLayoutEditPolicy(lep);" + NL + "\t\treturn xlep;";
130
  protected final String TEXT_111 = ";";
130
  protected final String TEXT_111 = NL + "\t\treturn lep;";
131
  protected final String TEXT_112 = NL + "\t\t";
131
  protected final String TEXT_112 = NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected IFigure createNodeShape() {";
132
  protected final String TEXT_113 = " figure = new ";
132
  protected final String TEXT_113 = NL + "\t\treturn primaryShape = new ";
133
  protected final String TEXT_114 = "();";
133
  protected final String TEXT_114 = "()";
134
  protected final String TEXT_115 = NL + " \t\tfigure.setUseLocalCoordinates(true);";
134
  protected final String TEXT_115 = " {" + NL + "\t\t\tprotected boolean useLocalCoordinates() {" + NL + "\t\t\t\treturn true;" + NL + "\t\t\t}" + NL + "\t\t}";
135
  protected final String TEXT_116 = NL + " \t\treturn primaryShape = figure;";
135
  protected final String TEXT_116 = ";";
136
  protected final String TEXT_117 = NL + "\t}";
136
  protected final String TEXT_117 = NL + "\t\treturn ";
137
  protected final String TEXT_118 = NL + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic ";
137
  protected final String TEXT_118 = ";";
138
  protected final String TEXT_119 = " getPrimaryShape() {" + NL + "\t\treturn (";
138
  protected final String TEXT_119 = NL + "\t\t";
139
  protected final String TEXT_120 = ") primaryShape;" + NL + "\t}";
139
  protected final String TEXT_120 = " figure = new ";
140
  protected final String TEXT_121 = NL;
140
  protected final String TEXT_121 = "();";
141
  protected final String TEXT_122 = NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected boolean addFixedChild(EditPart childEditPart) {";
141
  protected final String TEXT_122 = NL + " \t\tfigure.setUseLocalCoordinates(true);";
142
  protected final String TEXT_123 = NL + "\t\tif (childEditPart instanceof ";
142
  protected final String TEXT_123 = NL + " \t\treturn primaryShape = figure;";
143
  protected final String TEXT_124 = ") {" + NL + "\t\t\t((";
143
  protected final String TEXT_124 = NL + "\t}";
144
  protected final String TEXT_125 = ") childEditPart).";
144
  protected final String TEXT_125 = NL + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic ";
145
  protected final String TEXT_126 = "(getPrimaryShape().";
145
  protected final String TEXT_126 = " getPrimaryShape() {" + NL + "\t\treturn (";
146
  protected final String TEXT_127 = "());" + NL + "\t\t\treturn true;" + NL + "\t\t}";
146
  protected final String TEXT_127 = ") primaryShape;" + NL + "\t}";
147
  protected final String TEXT_128 = NL + "\t\tif (childEditPart instanceof ";
147
  protected final String TEXT_128 = NL;
148
  protected final String TEXT_129 = ") {" + NL + "\t\t\t";
148
  protected final String TEXT_129 = NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected boolean addFixedChild(EditPart childEditPart) {";
149
  protected final String TEXT_130 = " pane = getPrimaryShape().";
149
  protected final String TEXT_130 = NL + "\t\tif (childEditPart instanceof ";
150
  protected final String TEXT_131 = "();" + NL + "\t\t\tsetupContentPane(pane); // FIXME each comparment should handle his content pane in his own way " + NL + "\t\t\tpane.add(((";
150
  protected final String TEXT_131 = ") {" + NL + "\t\t\t((";
151
  protected final String TEXT_132 = ")childEditPart).getFigure());" + NL + "\t\t\treturn true;" + NL + "\t\t}\t";
151
  protected final String TEXT_132 = ") childEditPart).";
152
  protected final String TEXT_133 = NL + "\t\treturn false;" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected boolean removeFixedChild(EditPart childEditPart) {";
152
  protected final String TEXT_133 = "(getPrimaryShape().";
153
  protected final String TEXT_134 = "\t\t" + NL + "\t\tif (childEditPart instanceof ";
153
  protected final String TEXT_134 = "());" + NL + "\t\t\treturn true;" + NL + "\t\t}";
154
  protected final String TEXT_135 = ") {" + NL + "\t\t\t";
154
  protected final String TEXT_135 = NL + "\t\tif (childEditPart instanceof ";
155
  protected final String TEXT_136 = " pane = getPrimaryShape().";
155
  protected final String TEXT_136 = ") {" + NL + "\t\t\t";
156
  protected final String TEXT_137 = "();" + NL + "\t\t\tpane.remove(((";
156
  protected final String TEXT_137 = " pane = getPrimaryShape().";
157
  protected final String TEXT_138 = ")childEditPart).getFigure());" + NL + "\t\t\treturn true;" + NL + "\t\t}\t";
157
  protected final String TEXT_138 = "();" + NL + "\t\t\tsetupContentPane(pane); // FIXME each comparment should handle his content pane in his own way " + NL + "\t\t\tpane.add(((";
158
  protected final String TEXT_139 = NL + "\t\treturn false;" + NL + "\t}";
158
  protected final String TEXT_139 = ")childEditPart).getFigure());" + NL + "\t\t\treturn true;" + NL + "\t\t}\t";
159
  protected final String TEXT_140 = NL + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected ";
159
  protected final String TEXT_140 = NL + "\t\tif (childEditPart instanceof ";
160
  protected final String TEXT_141 = " createNodePlate() {";
160
  protected final String TEXT_141 = ") {" + NL + "\t\t\taddBorderItem(getBorderedFigure().getBorderItemContainer(), (";
161
  protected final String TEXT_142 = NL + "\t\treturn new ";
161
  protected final String TEXT_142 = ") childEditPart);" + NL + "\t\t\treturn true;" + NL + "\t\t}";
162
  protected final String TEXT_143 = "(getMapMode().DPtoLP(";
162
  protected final String TEXT_143 = NL + "\t\treturn false;" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected boolean removeFixedChild(EditPart childEditPart) {";
163
  protected final String TEXT_144 = "), getMapMode().DPtoLP(";
163
  protected final String TEXT_144 = "\t\t" + NL + "\t\tif (childEditPart instanceof ";
164
  protected final String TEXT_145 = "));" + NL + "\t}";
164
  protected final String TEXT_145 = ") {" + NL + "\t\t\t";
165
  protected final String TEXT_146 = NL + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic EditPolicy getPrimaryDragEditPolicy() {" + NL + "\t\t";
165
  protected final String TEXT_146 = " pane = getPrimaryShape().";
166
  protected final String TEXT_147 = " ep = (";
166
  protected final String TEXT_147 = "();" + NL + "\t\t\tpane.remove(((";
167
  protected final String TEXT_148 = ") super.getPrimaryDragEditPolicy();" + NL + "\t\t";
167
  protected final String TEXT_148 = ")childEditPart).getFigure());" + NL + "\t\t\treturn true;" + NL + "\t\t}\t";
168
  protected final String TEXT_149 = NL + "\t\tep.setResizeDirections(";
168
  protected final String TEXT_149 = NL + "\t\tif (childEditPart instanceof ";
169
  protected final String TEXT_150 = ".NONE);" + NL + "\t\t";
169
  protected final String TEXT_150 = ") {" + NL + "\t\t\tgetBorderedFigure().getBorderItemContainer().remove(((";
170
  protected final String TEXT_151 = NL + "\t\tep.setResizeDirections(";
170
  protected final String TEXT_151 = ")childEditPart).getFigure());" + NL + "\t\t\treturn true;" + NL + "\t\t}";
171
  protected final String TEXT_152 = ".";
171
  protected final String TEXT_152 = NL + "\t\treturn false;" + NL + "\t}";
172
  protected final String TEXT_153 = " | ";
172
  protected final String TEXT_153 = NL + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected ";
173
  protected final String TEXT_154 = ");" + NL + "\t\t";
173
  protected final String TEXT_154 = " createNodePlate() {";
174
  protected final String TEXT_155 = NL + "\t\treturn ep;" + NL + "\t}";
174
  protected final String TEXT_155 = NL + "\t\t";
175
  protected final String TEXT_156 = NL + "\t/**" + NL + "\t * Creates figure for this edit part." + NL + "\t * " + NL + "\t * Body of this method does not depend on settings in generation model" + NL + "\t * so you may safely remove <i>generated</i> tag and modify it." + NL + "\t * " + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected ";
175
  protected final String TEXT_156 = " result = new ";
176
  protected final String TEXT_157 = " createNodeFigure() {" + NL + "\t\t";
176
  protected final String TEXT_157 = "(getMapMode().DPtoLP(";
177
  protected final String TEXT_158 = " figure = createNodePlate();" + NL + "\t\tfigure.setLayoutManager(new StackLayout());" + NL + "\t\tIFigure shape = createNodeShape();" + NL + "\t\tfigure.add(shape);" + NL + "\t\tcontentPane = setupContentPane(shape);" + NL + "\t\treturn figure;" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * Default implementation treats passed figure as content pane." + NL + "\t * Respects layout one may have set for generated figure." + NL + "\t * @param nodeShape instance of generated figure class" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected IFigure setupContentPane(IFigure nodeShape) {" + NL + "\t\tif (nodeShape.getLayoutManager() == null) {";
177
  protected final String TEXT_158 = "), getMapMode().DPtoLP(";
178
  protected final String TEXT_159 = NL + "\t\tnodeShape.setLayoutManager(new ";
178
  protected final String TEXT_159 = "));";
179
  protected final String TEXT_160 = "() {" + NL + "" + NL + "\t\t\tpublic Object getConstraint(IFigure figure) {" + NL + "\t\t\t\tObject result = constraints.get(figure);" + NL + "\t\t\t\tif (result == null) {" + NL + "\t\t\t\t\tresult = new ";
179
  protected final String TEXT_160 = NL + "\t\t//FIXME: workaround for #154536" + NL + "\t\tresult.getBounds().setSize(result.getPreferredSize());";
180
  protected final String TEXT_161 = "(0, 0, -1, -1);" + NL + "\t\t\t\t}" + NL + "\t\t\t\treturn result;" + NL + "\t\t\t}" + NL + "\t\t});";
180
  protected final String TEXT_161 = "\t\t" + NL + "\t\treturn result;" + NL + "\t}";
181
  protected final String TEXT_162 = NL + "\t\t\t";
181
  protected final String TEXT_162 = NL + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic EditPolicy getPrimaryDragEditPolicy() {" + NL + "\t\t";
182
  protected final String TEXT_163 = " layout = new ";
182
  protected final String TEXT_163 = " ep = (";
183
  protected final String TEXT_164 = "();" + NL + "\t\t\tlayout.setSpacing(getMapMode().DPtoLP(5));" + NL + "\t\t\tnodeShape.setLayoutManager(layout);";
183
  protected final String TEXT_164 = ") super.getPrimaryDragEditPolicy();" + NL + "\t\t";
184
  protected final String TEXT_165 = NL + "\t\t}" + NL + "\t\treturn nodeShape; // use nodeShape itself as contentPane" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic IFigure getContentPane() {" + NL + "\t\tif (contentPane != null) {" + NL + "\t\t\treturn contentPane;" + NL + "\t\t}" + NL + "\t\treturn super.getContentPane();" + NL + "\t}";
184
  protected final String TEXT_165 = NL + "\t\tep.setResizeDirections(";
185
  protected final String TEXT_166 = NL + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic ";
185
  protected final String TEXT_166 = ".NONE);" + NL + "\t\t";
186
  protected final String TEXT_167 = " getPrimaryChildEditPart() {" + NL + "\t\treturn getChildBySemanticHint(";
186
  protected final String TEXT_167 = NL + "\t\tep.setResizeDirections(";
187
  protected final String TEXT_168 = ".getType(";
187
  protected final String TEXT_168 = ".";
188
  protected final String TEXT_169 = ".VISUAL_ID));" + NL + "\t}";
188
  protected final String TEXT_169 = " | ";
189
  protected final String TEXT_170 = NL + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected boolean isExternalLabel(";
189
  protected final String TEXT_170 = ");" + NL + "\t\t";
190
  protected final String TEXT_171 = " childEditPart) {";
190
  protected final String TEXT_171 = NL + "\t\treturn ep;" + NL + "\t}";
191
  protected final String TEXT_172 = NL + "\t\tif (childEditPart instanceof ";
191
  protected final String TEXT_172 = NL;
192
  protected final String TEXT_173 = ") {" + NL + "\t\t\treturn true;" + NL + "\t\t}";
192
  protected final String TEXT_173 = "\t " + NL + "\t/**" + NL + "\t * Creates figure for this edit part." + NL + "\t * " + NL + "\t * Body of this method does not depend on settings in generation model" + NL + "\t * so you may safely remove <i>generated</i> tag and modify it." + NL + "\t * " + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected ";
193
  protected final String TEXT_174 = NL + "\t\treturn false;" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected IFigure getExternalLabelsContainer() {" + NL + "\t\t";
193
  protected final String TEXT_174 = " createMainFigure() {";
194
  protected final String TEXT_175 = " root = (";
194
  protected final String TEXT_175 = NL + "\t/**" + NL + "\t * Creates figure for this edit part." + NL + "\t * " + NL + "\t * Body of this method does not depend on settings in generation model" + NL + "\t * so you may safely remove <i>generated</i> tag and modify it." + NL + "\t * " + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected ";
195
  protected final String TEXT_176 = ") getRoot();" + NL + "\t\treturn root.getLayer(";
195
  protected final String TEXT_176 = " createNodeFigure() {";
196
  protected final String TEXT_177 = ".EXTERNAL_NODE_LABELS_LAYER);" + NL + "\t}" + NL;
196
  protected final String TEXT_177 = NL + "\t\t";
197
  protected final String TEXT_178 = NL + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected void addChildVisual(";
197
  protected final String TEXT_178 = " figure = createNodePlate();" + NL + "\t\tfigure.setLayoutManager(new StackLayout());" + NL + "\t\tIFigure shape = createNodeShape();" + NL + "\t\tfigure.add(shape);" + NL + "\t\tcontentPane = setupContentPane(shape);" + NL + "\t\treturn figure;" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * Default implementation treats passed figure as content pane." + NL + "\t * Respects layout one may have set for generated figure." + NL + "\t * @param nodeShape instance of generated figure class" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected IFigure setupContentPane(IFigure nodeShape) {" + NL + "\t\tif (nodeShape.getLayoutManager() == null) {";
198
  protected final String TEXT_179 = " childEditPart, int index) {";
198
  protected final String TEXT_179 = NL + "\t\tnodeShape.setLayoutManager(new ";
199
  protected final String TEXT_180 = NL + "\t\tif (isExternalLabel(childEditPart)) {" + NL + "\t\t\tIFigure labelFigure = ((";
199
  protected final String TEXT_180 = "() {" + NL + "" + NL + "\t\t\tpublic Object getConstraint(IFigure figure) {" + NL + "\t\t\t\tObject result = constraints.get(figure);" + NL + "\t\t\t\tif (result == null) {" + NL + "\t\t\t\t\tresult = new ";
200
  protected final String TEXT_181 = ") childEditPart).getFigure();" + NL + "\t\t\tgetExternalLabelsContainer().add(labelFigure);" + NL + "\t\t\treturn;" + NL + "\t\t} ";
200
  protected final String TEXT_181 = "(0, 0, -1, -1);" + NL + "\t\t\t\t}" + NL + "\t\t\t\treturn result;" + NL + "\t\t\t}" + NL + "\t\t});";
201
  protected final String TEXT_182 = "\t\t" + NL + "\t\tif (addFixedChild(childEditPart)) {" + NL + "\t\t\treturn;" + NL + "\t\t}";
201
  protected final String TEXT_182 = NL + "\t\t\t";
202
  protected final String TEXT_183 = NL + "\t\tsuper.addChildVisual(childEditPart, -1);" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected void removeChildVisual(";
202
  protected final String TEXT_183 = " layout = new ";
203
  protected final String TEXT_184 = " childEditPart) {";
203
  protected final String TEXT_184 = "();" + NL + "\t\t\tlayout.setSpacing(getMapMode().DPtoLP(5));" + NL + "\t\t\tnodeShape.setLayoutManager(layout);";
204
  protected final String TEXT_185 = NL + "\t\tif (isExternalLabel(childEditPart)) {" + NL + "\t\t\tIFigure labelFigure = ((";
204
  protected final String TEXT_185 = NL + "\t\t}" + NL + "\t\treturn nodeShape; // use nodeShape itself as contentPane" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic IFigure getContentPane() {" + NL + "\t\tif (contentPane != null) {" + NL + "\t\t\treturn contentPane;" + NL + "\t\t}" + NL + "\t\treturn super.getContentPane();" + NL + "\t}";
205
  protected final String TEXT_186 = ") childEditPart).getFigure();" + NL + "\t\t\tgetExternalLabelsContainer().remove(labelFigure);" + NL + "\t\t\treturn;" + NL + "\t\t} ";
205
  protected final String TEXT_186 = NL + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic ";
206
  protected final String TEXT_187 = NL + "\t\tif (removeFixedChild(childEditPart)){" + NL + "\t\t\treturn;" + NL + "\t\t}";
206
  protected final String TEXT_187 = " getPrimaryChildEditPart() {" + NL + "\t\treturn getChildBySemanticHint(";
207
  protected final String TEXT_188 = NL + "\t\tsuper.removeChildVisual(childEditPart);" + NL + "\t}";
207
  protected final String TEXT_188 = ".getType(";
208
  protected final String TEXT_189 = "\t\t" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic void removeNotify() {" + NL + "\t\tfor (";
208
  protected final String TEXT_189 = ".VISUAL_ID));" + NL + "\t}";
209
  protected final String TEXT_190 = " it = getChildren().iterator(); it.hasNext();) {" + NL + "\t\t\t";
209
  protected final String TEXT_190 = NL + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected boolean isExternalLabel(";
210
  protected final String TEXT_191 = " childEditPart = (";
210
  protected final String TEXT_191 = " childEditPart) {";
211
  protected final String TEXT_192 = ") it.next();" + NL + "\t\t\tif (isExternalLabel(childEditPart)) {" + NL + "\t\t\t\tIFigure labelFigure = ((";
211
  protected final String TEXT_192 = NL + "\t\tif (childEditPart instanceof ";
212
  protected final String TEXT_193 = ") childEditPart).getFigure();" + NL + "\t\t\t\tgetExternalLabelsContainer().remove(labelFigure);" + NL + "\t\t\t}" + NL + "\t\t}" + NL + "\t\tsuper.removeNotify();" + NL + "\t}";
212
  protected final String TEXT_193 = ") {" + NL + "\t\t\treturn true;" + NL + "\t\t}";
213
  protected final String TEXT_194 = "\t" + NL;
213
  protected final String TEXT_194 = NL + "\t\treturn false;" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected IFigure getExternalLabelsContainer() {" + NL + "\t\t";
214
  protected final String TEXT_195 = NL;
214
  protected final String TEXT_195 = " root = (";
215
  protected final String TEXT_196 = NL + "}";
215
  protected final String TEXT_196 = ") getRoot();" + NL + "\t\treturn root.getLayer(";
216
  protected final String TEXT_197 = NL;
216
  protected final String TEXT_197 = ".EXTERNAL_NODE_LABELS_LAYER);" + NL + "\t}" + NL;
217
  protected final String TEXT_198 = NL + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected void addChildVisual(";
218
  protected final String TEXT_199 = " childEditPart, int index) {";
219
  protected final String TEXT_200 = NL + "\t\tif (isExternalLabel(childEditPart)) {" + NL + "\t\t\tIFigure labelFigure = ((";
220
  protected final String TEXT_201 = ") childEditPart).getFigure();" + NL + "\t\t\tgetExternalLabelsContainer().add(labelFigure);" + NL + "\t\t\treturn;" + NL + "\t\t} ";
221
  protected final String TEXT_202 = "\t\t" + NL + "\t\tif (addFixedChild(childEditPart)) {" + NL + "\t\t\treturn;" + NL + "\t\t}";
222
  protected final String TEXT_203 = NL + "\t\tsuper.addChildVisual(childEditPart, -1);" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected void removeChildVisual(";
223
  protected final String TEXT_204 = " childEditPart) {";
224
  protected final String TEXT_205 = NL + "\t\tif (isExternalLabel(childEditPart)) {" + NL + "\t\t\tIFigure labelFigure = ((";
225
  protected final String TEXT_206 = ") childEditPart).getFigure();" + NL + "\t\t\tgetExternalLabelsContainer().remove(labelFigure);" + NL + "\t\t\treturn;" + NL + "\t\t} ";
226
  protected final String TEXT_207 = NL + "\t\tif (removeFixedChild(childEditPart)){" + NL + "\t\t\treturn;" + NL + "\t\t}";
227
  protected final String TEXT_208 = NL + "\t\tsuper.removeChildVisual(childEditPart);" + NL + "\t}";
228
  protected final String TEXT_209 = "\t\t" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic void removeNotify() {" + NL + "\t\tfor (";
229
  protected final String TEXT_210 = " it = getChildren().iterator(); it.hasNext();) {" + NL + "\t\t\t";
230
  protected final String TEXT_211 = " childEditPart = (";
231
  protected final String TEXT_212 = ") it.next();" + NL + "\t\t\tif (isExternalLabel(childEditPart)) {" + NL + "\t\t\t\tIFigure labelFigure = ((";
232
  protected final String TEXT_213 = ") childEditPart).getFigure();" + NL + "\t\t\t\tgetExternalLabelsContainer().remove(labelFigure);" + NL + "\t\t\t}" + NL + "\t\t}" + NL + "\t\tsuper.removeNotify();" + NL + "\t}";
233
  protected final String TEXT_214 = "\t" + NL;
234
  protected final String TEXT_215 = NL;
235
  protected final String TEXT_216 = NL + "}";
236
  protected final String TEXT_217 = NL;
217
237
218
	protected final String getFeatureValueGetter(String containerName, GenFeature feature, boolean isContainerEObject, ImportAssistant importManager) {
238
	protected final String getFeatureValueGetter(String containerName, GenFeature feature, boolean isContainerEObject, ImportAssistant importManager) {
219
		StringBuffer result = new StringBuffer();
239
		StringBuffer result = new StringBuffer();
Lines 325-332 Link Here
325
	private final List myExternalLabels = new LinkedList();
345
	private final List myExternalLabels = new LinkedList();
326
	private final List myPinnedCompartments = new LinkedList();
346
	private final List myPinnedCompartments = new LinkedList();
327
	private final List myFloatingCompartments = new LinkedList();
347
	private final List myFloatingCompartments = new LinkedList();
348
	private final List mySideAffixedChildren = new LinkedList();
328
	private GenNodeLabel myPrimaryLabel;
349
	private GenNodeLabel myPrimaryLabel;
329
	private boolean myHasChildrenInListCompartments = false;
350
	private boolean myHasChildrenInListCompartments = false;
351
	private final boolean myIsSideAffixed;
352
	private final boolean myHasSideAffixedChildren;
330
	
353
	
331
	public NodeEditPartHelper(GenNode genNode){
354
	public NodeEditPartHelper(GenNode genNode){
332
		myPrimaryLabel = null;
355
		myPrimaryLabel = null;
Lines 353-358 Link Here
353
			
376
			
354
			myHasChildrenInListCompartments |= next.isListLayout() && !next.getChildNodes().isEmpty();
377
			myHasChildrenInListCompartments |= next.isListLayout() && !next.getChildNodes().isEmpty();
355
		}
378
		}
379
		
380
		for (Iterator childNodes = genNode.getChildNodes().iterator(); childNodes.hasNext();){
381
			GenChildNode next = (GenChildNode)childNodes.next();
382
			if (next instanceof GenChildSideAffixedNode){
383
				mySideAffixedChildren.add(next);
384
			}
385
		}
386
		
387
		myIsSideAffixed = genNode instanceof GenChildSideAffixedNode;
388
		myHasSideAffixedChildren = !mySideAffixedChildren.isEmpty();
389
	}
390
	
391
	public boolean isSideAffixed(){
392
		return myIsSideAffixed;
393
	}
394
	
395
	public boolean hasSideAffixedChildren(){
396
		return myHasSideAffixedChildren;
397
	}
398
	
399
	public String getEditPartSuperClassFQN(){
400
		if (isSideAffixed()){
401
			return hasSideAffixedChildren() ? 
402
				"org.eclipse.gmf.runtime.diagram.ui.editparts.BorderedBorderItemEditPart" :
403
				"org.eclipse.gmf.runtime.diagram.ui.editparts.AbstractBorderItemEditPart";
404
		} else {
405
			return hasSideAffixedChildren() ? 
406
				"org.eclipse.gmf.runtime.diagram.ui.editparts.AbstractBorderedShapeEditPart" : 
407
				"org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeNodeEditPart";
408
		}
356
	}
409
	}
357
	
410
	
358
	public boolean hasChildrenInListCompartments(){
411
	public boolean hasChildrenInListCompartments(){
Lines 390-395 Link Here
390
	public Iterator getPinnedCompartments(){
443
	public Iterator getPinnedCompartments(){
391
		return myPinnedCompartments.iterator();
444
		return myPinnedCompartments.iterator();
392
	}	
445
	}	
446
	
447
	public Iterator getSideAffixedChildren(){
448
		return mySideAffixedChildren.iterator();
449
	}
393
}
450
}
394
final NodeEditPartHelper myHelper = new NodeEditPartHelper(genNode);
451
final NodeEditPartHelper myHelper = new NodeEditPartHelper(genNode);
395
452
Lines 420-426 Link Here
420
    stringBuffer.append(TEXT_5);
477
    stringBuffer.append(TEXT_5);
421
    stringBuffer.append(genNode.getEditPartClassName());
478
    stringBuffer.append(genNode.getEditPartClassName());
422
    stringBuffer.append(TEXT_6);
479
    stringBuffer.append(TEXT_6);
423
    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeNodeEditPart"));
480
    stringBuffer.append(importManager.getImportedName(myHelper.getEditPartSuperClassFQN()));
424
    stringBuffer.append(TEXT_7);
481
    stringBuffer.append(TEXT_7);
425
    {	GenCommonBase genCommonBase = genNode;
482
    {	GenCommonBase genCommonBase = genNode;
426
    stringBuffer.append(TEXT_8);
483
    stringBuffer.append(TEXT_8);
Lines 483-659 Link Here
483
    stringBuffer.append(TEXT_31);
540
    stringBuffer.append(TEXT_31);
484
    }
541
    }
485
    stringBuffer.append(TEXT_32);
542
    stringBuffer.append(TEXT_32);
486
    stringBuffer.append(importManager.getImportedName(genNode.getItemSemanticEditPolicyQualifiedClassName()));
543
    if (myHelper.isSideAffixed()){
487
    stringBuffer.append(TEXT_33);
544
    stringBuffer.append(TEXT_33);
488
    stringBuffer.append(importManager.getImportedName(genNode.getGraphicalNodeEditPolicyQualifiedClassName()));
545
    }
489
    stringBuffer.append(TEXT_34);
546
    stringBuffer.append(TEXT_34);
490
    if (!genNode.getChildNodes().isEmpty()) {
547
    stringBuffer.append(importManager.getImportedName(genNode.getItemSemanticEditPolicyQualifiedClassName()));
491
    stringBuffer.append(TEXT_35);
548
    stringBuffer.append(TEXT_35);
492
    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy"));
549
    stringBuffer.append(importManager.getImportedName(genNode.getGraphicalNodeEditPolicyQualifiedClassName()));
493
    stringBuffer.append(TEXT_36);
550
    stringBuffer.append(TEXT_36);
551
    if (!genNode.getChildNodes().isEmpty()) {
552
    stringBuffer.append(TEXT_37);
553
    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy"));
554
    stringBuffer.append(TEXT_38);
494
    }
555
    }
495
556
496
if (genDiagram.isSynchronized()) {
557
if (genDiagram.isSynchronized()) {
497
    stringBuffer.append(TEXT_37);
558
    stringBuffer.append(TEXT_39);
498
    stringBuffer.append(importManager.getImportedName(genNode.getCanonicalEditPolicyQualifiedClassName()));
559
    stringBuffer.append(importManager.getImportedName(genNode.getCanonicalEditPolicyQualifiedClassName()));
499
    stringBuffer.append(TEXT_38);
560
    stringBuffer.append(TEXT_40);
500
    }
561
    }
501
    stringBuffer.append(TEXT_39);
562
    stringBuffer.append(TEXT_41);
502
    {	GenCommonBase genCommonBase = genNode;
563
    {	GenCommonBase genCommonBase = genNode;
503
    stringBuffer.append(TEXT_40);
564
    stringBuffer.append(TEXT_42);
504
    
565
    
505
for (java.util.Iterator it = genCommonBase.getCustomBehaviour().iterator(); it.hasNext();) {
566
for (java.util.Iterator it = genCommonBase.getCustomBehaviour().iterator(); it.hasNext();) {
506
	CustomBehaviour behaviour = (CustomBehaviour) it.next();
567
	CustomBehaviour behaviour = (CustomBehaviour) it.next();
507
568
508
    stringBuffer.append(TEXT_41);
569
    stringBuffer.append(TEXT_43);
509
    stringBuffer.append(behaviour.getKey());
570
    stringBuffer.append(behaviour.getKey());
510
    stringBuffer.append(TEXT_42);
571
    stringBuffer.append(TEXT_44);
511
    stringBuffer.append(importManager.getImportedName(behaviour.getEditPolicyQualifiedClassName()));
572
    stringBuffer.append(importManager.getImportedName(behaviour.getEditPolicyQualifiedClassName()));
512
    stringBuffer.append(TEXT_43);
573
    stringBuffer.append(TEXT_45);
513
    }
574
    }
514
    }
575
    }
515
    stringBuffer.append(TEXT_44);
576
    stringBuffer.append(TEXT_46);
516
    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.editpolicies.LayoutEditPolicy"));
577
    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.editpolicies.LayoutEditPolicy"));
517
    stringBuffer.append(TEXT_45);
578
    stringBuffer.append(TEXT_47);
518
    
579
    
519
final String fqnEditPart = importManager.getImportedName("org.eclipse.gef.EditPart");
580
final String fqnEditPart = importManager.getImportedName("org.eclipse.gef.EditPart");
520
switch(genNode.getLayoutType().getValue()){
581
switch(genNode.getLayoutType().getValue()){
521
	case ViewmapLayoutType.XY_LAYOUT:
582
	case ViewmapLayoutType.XY_LAYOUT:
522
583
523
    stringBuffer.append(TEXT_46);
584
    stringBuffer.append(TEXT_48);
524
    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.diagram.ui.editpolicies.XYLayoutEditPolicy"));
585
    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.diagram.ui.editpolicies.XYLayoutEditPolicy"));
525
    stringBuffer.append(TEXT_47);
586
    stringBuffer.append(TEXT_49);
526
    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.diagram.ui.editpolicies.XYLayoutEditPolicy"));
587
    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.diagram.ui.editpolicies.XYLayoutEditPolicy"));
527
    stringBuffer.append(TEXT_48);
588
    stringBuffer.append(TEXT_50);
528
    		if (myHelper.hasExternalLabels()) {
589
    		if (myHelper.hasExternalLabels()) {
529
    stringBuffer.append(TEXT_49);
590
    stringBuffer.append(TEXT_51);
530
    		}
591
    		}
531
    stringBuffer.append(TEXT_50);
592
    stringBuffer.append(TEXT_52);
532
    stringBuffer.append(fqnEditPart);
593
    stringBuffer.append(fqnEditPart);
533
    stringBuffer.append(TEXT_51);
594
    stringBuffer.append(TEXT_53);
534
    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableShapeEditPolicy"));
595
    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableShapeEditPolicy"));
535
    stringBuffer.append(TEXT_52);
596
    stringBuffer.append(TEXT_54);
536
    		if (myHelper.hasExternalLabels()) {
597
    		if (myHelper.hasExternalLabels()) {
537
    stringBuffer.append(TEXT_53);
598
    stringBuffer.append(TEXT_55);
538
    stringBuffer.append(importManager.getImportedName(genDiagram.getExternalNodeLabelHostLayoutEditPolicyQualifiedClassName()));
599
    stringBuffer.append(importManager.getImportedName(genDiagram.getExternalNodeLabelHostLayoutEditPolicyQualifiedClassName()));
539
    stringBuffer.append(TEXT_54);
600
    stringBuffer.append(TEXT_56);
540
    stringBuffer.append(importManager.getImportedName(genDiagram.getExternalNodeLabelHostLayoutEditPolicyQualifiedClassName()));
601
    stringBuffer.append(importManager.getImportedName(genDiagram.getExternalNodeLabelHostLayoutEditPolicyQualifiedClassName()));
541
    stringBuffer.append(TEXT_55);
602
    stringBuffer.append(TEXT_57);
542
    stringBuffer.append(genNode.getEditPartClassName());
603
    stringBuffer.append(genNode.getEditPartClassName());
543
    stringBuffer.append(TEXT_56);
604
    stringBuffer.append(TEXT_58);
544
    		} else {
605
    		} else {
545
    stringBuffer.append(TEXT_57);
606
    stringBuffer.append(TEXT_59);
546
    
607
    
547
		}
608
		}
548
		break;
609
		break;
549
	case ViewmapLayoutType.TOOLBAR_LAYOUT:
610
	case ViewmapLayoutType.TOOLBAR_LAYOUT:
550
611
551
    stringBuffer.append(TEXT_58);
612
    stringBuffer.append(TEXT_60);
552
    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.diagram.ui.editpolicies.ConstrainedToolbarLayoutEditPolicy"));
613
    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.diagram.ui.editpolicies.ConstrainedToolbarLayoutEditPolicy"));
553
    stringBuffer.append(TEXT_59);
614
    stringBuffer.append(TEXT_61);
554
    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.diagram.ui.editpolicies.ConstrainedToolbarLayoutEditPolicy"));
615
    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.diagram.ui.editpolicies.ConstrainedToolbarLayoutEditPolicy"));
555
    stringBuffer.append(TEXT_60);
616
    stringBuffer.append(TEXT_62);
556
    		if (myHelper.hasExternalLabels()) {
617
    		if (myHelper.hasExternalLabels()) {
557
    stringBuffer.append(TEXT_61);
618
    stringBuffer.append(TEXT_63);
558
    		}
619
    		}
559
    stringBuffer.append(TEXT_62);
620
    stringBuffer.append(TEXT_64);
560
    stringBuffer.append(fqnEditPart);
621
    stringBuffer.append(fqnEditPart);
561
    stringBuffer.append(TEXT_63);
622
    stringBuffer.append(TEXT_65);
562
    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart"));
623
    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart"));
563
    stringBuffer.append(TEXT_64);
624
    stringBuffer.append(TEXT_66);
564
    stringBuffer.append(importManager.getImportedName(genDiagram.getTextSelectionEditPolicyQualifiedClassName()));
625
    stringBuffer.append(importManager.getImportedName(genDiagram.getTextSelectionEditPolicyQualifiedClassName()));
565
    stringBuffer.append(TEXT_65);
626
    stringBuffer.append(TEXT_67);
566
    		if (myHelper.hasExternalLabels()) {
627
    		if (myHelper.hasExternalLabels()) {
567
    stringBuffer.append(TEXT_66);
628
    stringBuffer.append(TEXT_68);
568
    stringBuffer.append(importManager.getImportedName(genDiagram.getExternalNodeLabelHostLayoutEditPolicyQualifiedClassName()));
629
    stringBuffer.append(importManager.getImportedName(genDiagram.getExternalNodeLabelHostLayoutEditPolicyQualifiedClassName()));
569
    stringBuffer.append(TEXT_67);
630
    stringBuffer.append(TEXT_69);
570
    stringBuffer.append(importManager.getImportedName(genDiagram.getExternalNodeLabelHostLayoutEditPolicyQualifiedClassName()));
631
    stringBuffer.append(importManager.getImportedName(genDiagram.getExternalNodeLabelHostLayoutEditPolicyQualifiedClassName()));
571
    stringBuffer.append(TEXT_68);
632
    stringBuffer.append(TEXT_70);
572
    stringBuffer.append(genNode.getEditPartClassName());
633
    stringBuffer.append(genNode.getEditPartClassName());
573
    stringBuffer.append(TEXT_69);
634
    stringBuffer.append(TEXT_71);
574
    		} else {
635
    		} else {
575
    stringBuffer.append(TEXT_70);
636
    stringBuffer.append(TEXT_72);
576
    
637
    
577
		}
638
		}
578
		break;
639
		break;
579
	case ViewmapLayoutType.FLOW_LAYOUT:
640
	case ViewmapLayoutType.FLOW_LAYOUT:
580
641
581
    stringBuffer.append(TEXT_71);
642
    stringBuffer.append(TEXT_73);
582
    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.editpolicies.FlowLayoutEditPolicy"));
643
    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.editpolicies.FlowLayoutEditPolicy"));
583
    stringBuffer.append(TEXT_72);
644
    stringBuffer.append(TEXT_74);
584
    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.editpolicies.FlowLayoutEditPolicy"));
645
    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.editpolicies.FlowLayoutEditPolicy"));
585
    stringBuffer.append(TEXT_73);
646
    stringBuffer.append(TEXT_75);
586
    		if (myHelper.hasExternalLabels()) {
647
    		if (myHelper.hasExternalLabels()) {
587
    stringBuffer.append(TEXT_74);
648
    stringBuffer.append(TEXT_76);
588
    		}
649
    		}
589
    stringBuffer.append(TEXT_75);
650
    stringBuffer.append(TEXT_77);
651
    if (myHelper.hasSideAffixedChildren()) {
652
    stringBuffer.append(TEXT_78);
653
    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.EditPart"));
654
    stringBuffer.append(TEXT_79);
655
    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart"));
656
    stringBuffer.append(TEXT_80);
657
    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.diagram.ui.editpolicies.BorderItemSelectionEditPolicy"));
658
    stringBuffer.append(TEXT_81);
659
    }
660
    stringBuffer.append(TEXT_82);
590
    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.commands.Command"));
661
    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.commands.Command"));
591
    stringBuffer.append(TEXT_76);
662
    stringBuffer.append(TEXT_83);
592
    stringBuffer.append(fqnEditPart);
663
    stringBuffer.append(fqnEditPart);
593
    stringBuffer.append(TEXT_77);
664
    stringBuffer.append(TEXT_84);
594
    stringBuffer.append(fqnEditPart);
665
    stringBuffer.append(fqnEditPart);
595
    stringBuffer.append(TEXT_78);
666
    stringBuffer.append(TEXT_85);
596
    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.commands.Command"));
667
    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.commands.Command"));
597
    stringBuffer.append(TEXT_79);
668
    stringBuffer.append(TEXT_86);
598
    stringBuffer.append(fqnEditPart);
669
    stringBuffer.append(fqnEditPart);
599
    stringBuffer.append(TEXT_80);
670
    stringBuffer.append(TEXT_87);
600
    stringBuffer.append(fqnEditPart);
671
    stringBuffer.append(fqnEditPart);
601
    stringBuffer.append(TEXT_81);
672
    stringBuffer.append(TEXT_88);
602
    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.commands.Command"));
673
    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.commands.Command"));
603
    stringBuffer.append(TEXT_82);
674
    stringBuffer.append(TEXT_89);
604
    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.requests.CreateRequest"));
675
    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.requests.CreateRequest"));
605
    stringBuffer.append(TEXT_83);
676
    stringBuffer.append(TEXT_90);
606
    		if (myHelper.hasExternalLabels()) {
677
    		if (myHelper.hasExternalLabels()) {
607
    stringBuffer.append(TEXT_84);
678
    stringBuffer.append(TEXT_91);
608
    stringBuffer.append(importManager.getImportedName(genDiagram.getExternalNodeLabelHostLayoutEditPolicyQualifiedClassName()));
679
    stringBuffer.append(importManager.getImportedName(genDiagram.getExternalNodeLabelHostLayoutEditPolicyQualifiedClassName()));
609
    stringBuffer.append(TEXT_85);
680
    stringBuffer.append(TEXT_92);
610
    stringBuffer.append(importManager.getImportedName(genDiagram.getExternalNodeLabelHostLayoutEditPolicyQualifiedClassName()));
681
    stringBuffer.append(importManager.getImportedName(genDiagram.getExternalNodeLabelHostLayoutEditPolicyQualifiedClassName()));
611
    stringBuffer.append(TEXT_86);
682
    stringBuffer.append(TEXT_93);
612
    stringBuffer.append(genNode.getEditPartClassName());
683
    stringBuffer.append(genNode.getEditPartClassName());
613
    stringBuffer.append(TEXT_87);
684
    stringBuffer.append(TEXT_94);
614
    		} else {
685
    		} else {
615
    stringBuffer.append(TEXT_88);
686
    stringBuffer.append(TEXT_95);
616
    
687
    
617
		}
688
		}
618
		break;
689
		break;
619
	default:
690
	default:
620
691
621
    stringBuffer.append(TEXT_89);
692
    stringBuffer.append(TEXT_96);
622
    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.editpolicies.LayoutEditPolicy"));
693
    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.editpolicies.LayoutEditPolicy"));
623
    stringBuffer.append(TEXT_90);
694
    stringBuffer.append(TEXT_97);
624
    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.editpolicies.LayoutEditPolicy"));
695
    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.editpolicies.LayoutEditPolicy"));
625
    stringBuffer.append(TEXT_91);
696
    stringBuffer.append(TEXT_98);
626
    		if (myHelper.hasExternalLabels()) {
697
    		if (myHelper.hasExternalLabels()) {
627
    stringBuffer.append(TEXT_92);
698
    stringBuffer.append(TEXT_99);
628
    		}
699
    		}
629
    stringBuffer.append(TEXT_93);
700
    stringBuffer.append(TEXT_100);
630
    stringBuffer.append(fqnEditPart);
701
    stringBuffer.append(fqnEditPart);
631
    stringBuffer.append(TEXT_94);
702
    stringBuffer.append(TEXT_101);
632
    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.editpolicies.NonResizableEditPolicy"));
703
    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.editpolicies.NonResizableEditPolicy"));
633
    stringBuffer.append(TEXT_95);
704
    stringBuffer.append(TEXT_102);
634
    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.commands.Command"));
705
    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.commands.Command"));
635
    stringBuffer.append(TEXT_96);
706
    stringBuffer.append(TEXT_103);
636
    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.Request"));
707
    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.Request"));
637
    stringBuffer.append(TEXT_97);
708
    stringBuffer.append(TEXT_104);
638
    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.commands.Command"));
709
    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.commands.Command"));
639
    stringBuffer.append(TEXT_98);
710
    stringBuffer.append(TEXT_105);
640
    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.requests.CreateRequest"));
711
    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.requests.CreateRequest"));
641
    stringBuffer.append(TEXT_99);
712
    stringBuffer.append(TEXT_106);
642
    		if (myHelper.hasExternalLabels()) {
713
    		if (myHelper.hasExternalLabels()) {
643
    stringBuffer.append(TEXT_100);
714
    stringBuffer.append(TEXT_107);
644
    stringBuffer.append(importManager.getImportedName(genDiagram.getExternalNodeLabelHostLayoutEditPolicyQualifiedClassName()));
715
    stringBuffer.append(importManager.getImportedName(genDiagram.getExternalNodeLabelHostLayoutEditPolicyQualifiedClassName()));
645
    stringBuffer.append(TEXT_101);
716
    stringBuffer.append(TEXT_108);
646
    stringBuffer.append(importManager.getImportedName(genDiagram.getExternalNodeLabelHostLayoutEditPolicyQualifiedClassName()));
717
    stringBuffer.append(importManager.getImportedName(genDiagram.getExternalNodeLabelHostLayoutEditPolicyQualifiedClassName()));
647
    stringBuffer.append(TEXT_102);
718
    stringBuffer.append(TEXT_109);
648
    stringBuffer.append(genNode.getEditPartClassName());
719
    stringBuffer.append(genNode.getEditPartClassName());
649
    stringBuffer.append(TEXT_103);
720
    stringBuffer.append(TEXT_110);
650
    		} else {
721
    		} else {
651
    stringBuffer.append(TEXT_104);
722
    stringBuffer.append(TEXT_111);
652
    
723
    
653
		}
724
		}
654
} //switch
725
} //switch
655
726
656
    stringBuffer.append(TEXT_105);
727
    stringBuffer.append(TEXT_112);
657
    
728
    
658
String figureQualifiedClassName = null;
729
String figureQualifiedClassName = null;
659
Viewmap viewmap = genNode.getViewmap();
730
Viewmap viewmap = genNode.getViewmap();
Lines 664-708 Link Here
664
	}
735
	}
665
	figureQualifiedClassName = importManager.getImportedName(figureQualifiedClassName);
736
	figureQualifiedClassName = importManager.getImportedName(figureQualifiedClassName);
666
737
667
    stringBuffer.append(TEXT_106);
738
    stringBuffer.append(TEXT_113);
668
    stringBuffer.append(figureQualifiedClassName);
739
    stringBuffer.append(figureQualifiedClassName);
669
    stringBuffer.append(TEXT_107);
740
    stringBuffer.append(TEXT_114);
670
    if (isXYLayout) {
741
    if (isXYLayout) {
671
    stringBuffer.append(TEXT_108);
742
    stringBuffer.append(TEXT_115);
672
    } // if isXYLayout
743
    } // if isXYLayout
673
    stringBuffer.append(TEXT_109);
744
    stringBuffer.append(TEXT_116);
674
    } // instanceof FigureViewmap
745
    } // instanceof FigureViewmap
675
 else if (viewmap instanceof SnippetViewmap) {
746
 else if (viewmap instanceof SnippetViewmap) {
676
    stringBuffer.append(TEXT_110);
747
    stringBuffer.append(TEXT_117);
677
    stringBuffer.append(((SnippetViewmap) viewmap).getBody());
748
    stringBuffer.append(((SnippetViewmap) viewmap).getBody());
678
    stringBuffer.append(TEXT_111);
749
    stringBuffer.append(TEXT_118);
679
    } // instanceof SnippetViewmap; FIXME : obtain figure class name to generate getter
750
    } // instanceof SnippetViewmap; FIXME : obtain figure class name to generate getter
680
 else if (viewmap instanceof InnerClassViewmap) {
751
 else if (viewmap instanceof InnerClassViewmap) {
681
 	figureQualifiedClassName = ((InnerClassViewmap) viewmap).getClassName();
752
 	figureQualifiedClassName = ((InnerClassViewmap) viewmap).getClassName();
682
753
683
    stringBuffer.append(TEXT_112);
754
    stringBuffer.append(TEXT_119);
684
    stringBuffer.append(figureQualifiedClassName);
755
    stringBuffer.append(figureQualifiedClassName);
685
    stringBuffer.append(TEXT_113);
756
    stringBuffer.append(TEXT_120);
686
    stringBuffer.append(figureQualifiedClassName);
757
    stringBuffer.append(figureQualifiedClassName);
687
    stringBuffer.append(TEXT_114);
758
    stringBuffer.append(TEXT_121);
688
    if (!genNode.getChildNodes().isEmpty() && isXYLayout) { /*otherwise, leave to figure's default value*/
759
    if (!genNode.getChildNodes().isEmpty() && isXYLayout) { /*otherwise, leave to figure's default value*/
689
    stringBuffer.append(TEXT_115);
760
    stringBuffer.append(TEXT_122);
690
    }
761
    }
691
    stringBuffer.append(TEXT_116);
762
    stringBuffer.append(TEXT_123);
692
    }
763
    }
693
    stringBuffer.append(TEXT_117);
764
    stringBuffer.append(TEXT_124);
694
    if (figureQualifiedClassName != null) {
765
    if (figureQualifiedClassName != null) {
695
    stringBuffer.append(TEXT_118);
766
    stringBuffer.append(TEXT_125);
696
    stringBuffer.append(figureQualifiedClassName);
767
    stringBuffer.append(figureQualifiedClassName);
697
    stringBuffer.append(TEXT_119);
768
    stringBuffer.append(TEXT_126);
698
    stringBuffer.append(figureQualifiedClassName);
769
    stringBuffer.append(figureQualifiedClassName);
699
    stringBuffer.append(TEXT_120);
770
    stringBuffer.append(TEXT_127);
700
    }
771
    }
701
    stringBuffer.append(TEXT_121);
772
    stringBuffer.append(TEXT_128);
702
    
773
    
703
if (myHelper.hasFixedChildren()) {
774
if (myHelper.hasFixedChildren()) {
704
775
705
    stringBuffer.append(TEXT_122);
776
    stringBuffer.append(TEXT_129);
706
    
777
    
707
for (Iterator it = myHelper.getInnerFixedLabels(); it.hasNext(); ) {
778
for (Iterator it = myHelper.getInnerFixedLabels(); it.hasNext(); ) {
708
	GenNodeLabel genLabel = (GenNodeLabel) it.next();
779
	GenNodeLabel genLabel = (GenNodeLabel) it.next();
Lines 710-724 Link Here
710
	final ParentAssignedViewmap childViewmap = (ParentAssignedViewmap) genLabel.getViewmap();
781
	final ParentAssignedViewmap childViewmap = (ParentAssignedViewmap) genLabel.getViewmap();
711
	final String childSetterName = childViewmap.getSetterName() == null ? "setLabel" : childViewmap.getSetterName();
782
	final String childSetterName = childViewmap.getSetterName() == null ? "setLabel" : childViewmap.getSetterName();
712
783
713
    stringBuffer.append(TEXT_123);
784
    stringBuffer.append(TEXT_130);
714
    stringBuffer.append(labelEditPart);
785
    stringBuffer.append(labelEditPart);
715
    stringBuffer.append(TEXT_124);
786
    stringBuffer.append(TEXT_131);
716
    stringBuffer.append(labelEditPart);
787
    stringBuffer.append(labelEditPart);
717
    stringBuffer.append(TEXT_125);
788
    stringBuffer.append(TEXT_132);
718
    stringBuffer.append(childSetterName);
789
    stringBuffer.append(childSetterName);
719
    stringBuffer.append(TEXT_126);
790
    stringBuffer.append(TEXT_133);
720
    stringBuffer.append(childViewmap.getGetterName());
791
    stringBuffer.append(childViewmap.getGetterName());
721
    stringBuffer.append(TEXT_127);
792
    stringBuffer.append(TEXT_134);
722
    
793
    
723
}
794
}
724
795
Lines 727-745 Link Here
727
	final ParentAssignedViewmap childViewmap = (ParentAssignedViewmap) next.getViewmap();
798
	final ParentAssignedViewmap childViewmap = (ParentAssignedViewmap) next.getViewmap();
728
	String compartmentEditPartFQN = importManager.getImportedName(next.getEditPartQualifiedClassName());
799
	String compartmentEditPartFQN = importManager.getImportedName(next.getEditPartQualifiedClassName());
729
800
730
    stringBuffer.append(TEXT_128);
801
    stringBuffer.append(TEXT_135);
731
    stringBuffer.append(compartmentEditPartFQN);
802
    stringBuffer.append(compartmentEditPartFQN);
732
    stringBuffer.append(TEXT_129);
803
    stringBuffer.append(TEXT_136);
733
    stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.IFigure"));
804
    stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.IFigure"));
734
    stringBuffer.append(TEXT_130);
805
    stringBuffer.append(TEXT_137);
735
    stringBuffer.append(childViewmap.getGetterName());
806
    stringBuffer.append(childViewmap.getGetterName());
736
    stringBuffer.append(TEXT_131);
807
    stringBuffer.append(TEXT_138);
737
    stringBuffer.append(compartmentEditPartFQN);
808
    stringBuffer.append(compartmentEditPartFQN);
738
    stringBuffer.append(TEXT_132);
809
    stringBuffer.append(TEXT_139);
739
    	
810
    	
740
} // for pinned compartments
811
} // for pinned compartments
741
812
742
    stringBuffer.append(TEXT_133);
813
for (Iterator it = myHelper.getSideAffixedChildren(); it.hasNext(); ) {
814
	GenChildNode next = (GenChildNode) it.next();
815
	String sideAffixedEidtPartFQN = importManager.getImportedName(next.getEditPartQualifiedClassName());
816
817
    stringBuffer.append(TEXT_140);
818
    stringBuffer.append(sideAffixedEidtPartFQN);
819
    stringBuffer.append(TEXT_141);
820
    stringBuffer.append(sideAffixedEidtPartFQN);
821
    stringBuffer.append(TEXT_142);
822
    	
823
} // for side affixed
824
825
    stringBuffer.append(TEXT_143);
743
    
826
    
744
//XXX: ignore labels assuming that they never may be removed
827
//XXX: ignore labels assuming that they never may be removed
745
for (Iterator it = myHelper.getPinnedCompartments(); it.hasNext(); ) {
828
for (Iterator it = myHelper.getPinnedCompartments(); it.hasNext(); ) {
Lines 747-771 Link Here
747
	final ParentAssignedViewmap childViewmap = (ParentAssignedViewmap) next.getViewmap();
830
	final ParentAssignedViewmap childViewmap = (ParentAssignedViewmap) next.getViewmap();
748
	String compartmentEditPartFQN = importManager.getImportedName(next.getEditPartQualifiedClassName());
831
	String compartmentEditPartFQN = importManager.getImportedName(next.getEditPartQualifiedClassName());
749
832
750
    stringBuffer.append(TEXT_134);
833
    stringBuffer.append(TEXT_144);
751
    stringBuffer.append(compartmentEditPartFQN);
834
    stringBuffer.append(compartmentEditPartFQN);
752
    stringBuffer.append(TEXT_135);
835
    stringBuffer.append(TEXT_145);
753
    stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.IFigure"));
836
    stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.IFigure"));
754
    stringBuffer.append(TEXT_136);
837
    stringBuffer.append(TEXT_146);
755
    stringBuffer.append(childViewmap.getGetterName());
838
    stringBuffer.append(childViewmap.getGetterName());
756
    stringBuffer.append(TEXT_137);
839
    stringBuffer.append(TEXT_147);
757
    stringBuffer.append(compartmentEditPartFQN);
840
    stringBuffer.append(compartmentEditPartFQN);
758
    stringBuffer.append(TEXT_138);
841
    stringBuffer.append(TEXT_148);
759
    
842
    
760
} // for pinned compartments
843
} // for pinned compartments
761
844
762
    stringBuffer.append(TEXT_139);
845
for (Iterator it = myHelper.getSideAffixedChildren(); it.hasNext(); ) {
846
	GenChildNode next = (GenChildNode) it.next();
847
	String sideAffixedEidtPartFQN = importManager.getImportedName(next.getEditPartQualifiedClassName());
848
849
    stringBuffer.append(TEXT_149);
850
    stringBuffer.append(sideAffixedEidtPartFQN);
851
    stringBuffer.append(TEXT_150);
852
    stringBuffer.append(sideAffixedEidtPartFQN);
853
    stringBuffer.append(TEXT_151);
854
    	
855
} // for side affixed
856
857
    stringBuffer.append(TEXT_152);
763
    
858
    
764
} // if myHelper.hasFixedChildren()
859
} // if myHelper.hasFixedChildren()
765
860
766
    stringBuffer.append(TEXT_140);
861
    stringBuffer.append(TEXT_153);
767
    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure"));
862
    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure"));
768
    stringBuffer.append(TEXT_141);
863
    stringBuffer.append(TEXT_154);
769
    
864
    
770
int width = 40;
865
int width = 40;
771
int height = 40;
866
int height = 40;
Lines 775-922 Link Here
775
	height = defSizeAttrs.getHeight();
870
	height = defSizeAttrs.getHeight();
776
}
871
}
777
872
778
    stringBuffer.append(TEXT_142);
873
    stringBuffer.append(TEXT_155);
779
    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure"));
874
    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure"));
780
    stringBuffer.append(TEXT_143);
875
    stringBuffer.append(TEXT_156);
876
    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure"));
877
    stringBuffer.append(TEXT_157);
781
    stringBuffer.append(width);
878
    stringBuffer.append(width);
782
    stringBuffer.append(TEXT_144);
879
    stringBuffer.append(TEXT_158);
783
    stringBuffer.append(height);
880
    stringBuffer.append(height);
784
    stringBuffer.append(TEXT_145);
881
    stringBuffer.append(TEXT_159);
882
    
883
if (myHelper.isSideAffixed()){		
884
885
    stringBuffer.append(TEXT_160);
886
    
887
}
888
889
    stringBuffer.append(TEXT_161);
785
    if (genNode.getViewmap().find(ResizeConstraints.class) != null) {
890
    if (genNode.getViewmap().find(ResizeConstraints.class) != null) {
786
	final ResizeConstraints rc = (ResizeConstraints) genNode.getViewmap().find(ResizeConstraints.class);
891
	final ResizeConstraints rc = (ResizeConstraints) genNode.getViewmap().find(ResizeConstraints.class);
787
	final String draw2dPC = importManager.getImportedName("org.eclipse.draw2d.PositionConstants");
892
	final String draw2dPC = importManager.getImportedName("org.eclipse.draw2d.PositionConstants");
788
    stringBuffer.append(TEXT_146);
893
    stringBuffer.append(TEXT_162);
789
    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.editpolicies.ResizableEditPolicy"));
894
    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.editpolicies.ResizableEditPolicy"));
790
    stringBuffer.append(TEXT_147);
895
    stringBuffer.append(TEXT_163);
791
    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.editpolicies.ResizableEditPolicy"));
896
    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.editpolicies.ResizableEditPolicy"));
792
    stringBuffer.append(TEXT_148);
897
    stringBuffer.append(TEXT_164);
793
    if (rc.getResizeHandleNames().isEmpty()) {
898
    if (rc.getResizeHandleNames().isEmpty()) {
794
    stringBuffer.append(TEXT_149);
899
    stringBuffer.append(TEXT_165);
795
    stringBuffer.append(draw2dPC);
900
    stringBuffer.append(draw2dPC);
796
    stringBuffer.append(TEXT_150);
901
    stringBuffer.append(TEXT_166);
797
     } else {
902
     } else {
798
    stringBuffer.append(TEXT_151);
903
    stringBuffer.append(TEXT_167);
799
    for (Iterator rcNamesIter = rc.getResizeHandleNames().iterator(); rcNamesIter.hasNext();) {
904
    for (Iterator rcNamesIter = rc.getResizeHandleNames().iterator(); rcNamesIter.hasNext();) {
800
			String nextConstantName = (String) rcNamesIter.next();
905
			String nextConstantName = (String) rcNamesIter.next();
801
    stringBuffer.append(draw2dPC);
906
    stringBuffer.append(draw2dPC);
802
    stringBuffer.append(TEXT_152);
907
    stringBuffer.append(TEXT_168);
803
    stringBuffer.append(nextConstantName);
908
    stringBuffer.append(nextConstantName);
804
    if (rcNamesIter.hasNext()) {
909
    if (rcNamesIter.hasNext()) {
805
    stringBuffer.append(TEXT_153);
910
    stringBuffer.append(TEXT_169);
806
    }}
911
    }}
807
    stringBuffer.append(TEXT_154);
912
    stringBuffer.append(TEXT_170);
808
    }
913
    }
809
    stringBuffer.append(TEXT_155);
914
    stringBuffer.append(TEXT_171);
810
    }
915
    }
811
    stringBuffer.append(TEXT_156);
916
    stringBuffer.append(TEXT_172);
917
    if (myHelper.hasSideAffixedChildren()) {
918
    stringBuffer.append(TEXT_173);
812
    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure"));
919
    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure"));
813
    stringBuffer.append(TEXT_157);
920
    stringBuffer.append(TEXT_174);
921
    } else {
922
    stringBuffer.append(TEXT_175);
814
    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure"));
923
    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure"));
815
    stringBuffer.append(TEXT_158);
924
    stringBuffer.append(TEXT_176);
925
    }
926
    stringBuffer.append(TEXT_177);
927
    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure"));
928
    stringBuffer.append(TEXT_178);
816
    
929
    
817
if (isXYLayout) {
930
if (isXYLayout) {
818
931
819
    stringBuffer.append(TEXT_159);
932
    stringBuffer.append(TEXT_179);
820
    stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.FreeformLayout"));
933
    stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.FreeformLayout"));
821
    stringBuffer.append(TEXT_160);
934
    stringBuffer.append(TEXT_180);
822
    stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.geometry.Rectangle"));
935
    stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.geometry.Rectangle"));
823
    stringBuffer.append(TEXT_161);
936
    stringBuffer.append(TEXT_181);
824
    } else {
937
    } else {
825
	String layoutClassName = importManager.getImportedName("org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout");
938
	String layoutClassName = importManager.getImportedName("org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout");
826
939
827
    stringBuffer.append(TEXT_162);
940
    stringBuffer.append(TEXT_182);
828
    stringBuffer.append(layoutClassName);
941
    stringBuffer.append(layoutClassName);
829
    stringBuffer.append(TEXT_163);
942
    stringBuffer.append(TEXT_183);
830
    stringBuffer.append(layoutClassName);
943
    stringBuffer.append(layoutClassName);
831
    stringBuffer.append(TEXT_164);
944
    stringBuffer.append(TEXT_184);
832
    }
945
    }
833
    stringBuffer.append(TEXT_165);
946
    stringBuffer.append(TEXT_185);
834
    
947
    
835
if (myHelper.getPrimaryLabel() != null) {
948
if (myHelper.getPrimaryLabel() != null) {
836
	GenNodeLabel primaryLabel = myHelper.getPrimaryLabel();
949
	GenNodeLabel primaryLabel = myHelper.getPrimaryLabel();
837
950
838
    stringBuffer.append(TEXT_166);
951
    stringBuffer.append(TEXT_186);
839
    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.EditPart"));
952
    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.EditPart"));
840
    stringBuffer.append(TEXT_167);
953
    stringBuffer.append(TEXT_187);
841
    stringBuffer.append(importManager.getImportedName(genDiagram.getVisualIDRegistryQualifiedClassName()));
954
    stringBuffer.append(importManager.getImportedName(genDiagram.getVisualIDRegistryQualifiedClassName()));
842
    stringBuffer.append(TEXT_168);
955
    stringBuffer.append(TEXT_188);
843
    stringBuffer.append(importManager.getImportedName(primaryLabel.getEditPartQualifiedClassName()));
956
    stringBuffer.append(importManager.getImportedName(primaryLabel.getEditPartQualifiedClassName()));
844
    stringBuffer.append(TEXT_169);
957
    stringBuffer.append(TEXT_189);
845
    
958
    
846
}
959
}
847
if (myHelper.hasExternalLabels()) {
960
if (myHelper.hasExternalLabels()) {
848
961
849
    stringBuffer.append(TEXT_170);
962
    stringBuffer.append(TEXT_190);
850
    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.EditPart"));
963
    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.EditPart"));
851
    stringBuffer.append(TEXT_171);
964
    stringBuffer.append(TEXT_191);
852
    
965
    
853
	for (Iterator externalLabels = myHelper.getExternalLabels(); externalLabels.hasNext();) {
966
	for (Iterator externalLabels = myHelper.getExternalLabels(); externalLabels.hasNext();) {
854
		GenNodeLabel next = (GenNodeLabel) externalLabels.next();
967
		GenNodeLabel next = (GenNodeLabel) externalLabels.next();
855
968
856
    stringBuffer.append(TEXT_172);
969
    stringBuffer.append(TEXT_192);
857
    stringBuffer.append(importManager.getImportedName(next.getEditPartQualifiedClassName()));
970
    stringBuffer.append(importManager.getImportedName(next.getEditPartQualifiedClassName()));
858
    stringBuffer.append(TEXT_173);
971
    stringBuffer.append(TEXT_193);
859
    	}
972
    	}
860
    stringBuffer.append(TEXT_174);
973
    stringBuffer.append(TEXT_194);
861
    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.editparts.LayerManager"));
974
    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.editparts.LayerManager"));
862
    stringBuffer.append(TEXT_175);
975
    stringBuffer.append(TEXT_195);
863
    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.editparts.LayerManager"));
976
    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.editparts.LayerManager"));
864
    stringBuffer.append(TEXT_176);
977
    stringBuffer.append(TEXT_196);
865
    stringBuffer.append(importManager.getImportedName(genDiagram.getEditPartFactoryQualifiedClassName()));
978
    stringBuffer.append(importManager.getImportedName(genDiagram.getEditPartFactoryQualifiedClassName()));
866
    stringBuffer.append(TEXT_177);
979
    stringBuffer.append(TEXT_197);
867
    
980
    
868
}
981
}
869
if (myHelper.hasFixedChildren() || myHelper.hasExternalLabels()) {
982
if (myHelper.hasFixedChildren() || myHelper.hasExternalLabels()) {
870
983
871
    stringBuffer.append(TEXT_178);
984
    stringBuffer.append(TEXT_198);
872
    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.EditPart"));
985
    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.EditPart"));
873
    stringBuffer.append(TEXT_179);
986
    stringBuffer.append(TEXT_199);
874
    	if (myHelper.hasExternalLabels()) {
987
    	if (myHelper.hasExternalLabels()) {
875
    stringBuffer.append(TEXT_180);
988
    stringBuffer.append(TEXT_200);
876
    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.GraphicalEditPart"));
989
    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.GraphicalEditPart"));
877
    stringBuffer.append(TEXT_181);
990
    stringBuffer.append(TEXT_201);
878
    
991
    
879
	}
992
	}
880
	if (myHelper.hasFixedChildren()) {
993
	if (myHelper.hasFixedChildren()) {
881
994
882
    stringBuffer.append(TEXT_182);
995
    stringBuffer.append(TEXT_202);
883
    	}
996
    	}
884
    stringBuffer.append(TEXT_183);
997
    stringBuffer.append(TEXT_203);
885
    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.EditPart"));
998
    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.EditPart"));
886
    stringBuffer.append(TEXT_184);
999
    stringBuffer.append(TEXT_204);
887
    	if (myHelper.hasExternalLabels()) {
1000
    	if (myHelper.hasExternalLabels()) {
888
    stringBuffer.append(TEXT_185);
1001
    stringBuffer.append(TEXT_205);
889
    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.GraphicalEditPart"));
1002
    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.GraphicalEditPart"));
890
    stringBuffer.append(TEXT_186);
1003
    stringBuffer.append(TEXT_206);
891
    
1004
    
892
	}
1005
	}
893
	if (myHelper.hasFixedChildren()){
1006
	if (myHelper.hasFixedChildren()){
894
1007
895
    stringBuffer.append(TEXT_187);
1008
    stringBuffer.append(TEXT_207);
896
    	}
1009
    	}
897
    stringBuffer.append(TEXT_188);
1010
    stringBuffer.append(TEXT_208);
898
    	if (myHelper.hasExternalLabels()) {
1011
    	if (myHelper.hasExternalLabels()) {
899
    stringBuffer.append(TEXT_189);
1012
    stringBuffer.append(TEXT_209);
900
    stringBuffer.append(importManager.getImportedName("java.util.Iterator"));
1013
    stringBuffer.append(importManager.getImportedName("java.util.Iterator"));
901
    stringBuffer.append(TEXT_190);
1014
    stringBuffer.append(TEXT_210);
902
    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.EditPart"));
1015
    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.EditPart"));
903
    stringBuffer.append(TEXT_191);
1016
    stringBuffer.append(TEXT_211);
904
    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.EditPart"));
1017
    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.EditPart"));
905
    stringBuffer.append(TEXT_192);
1018
    stringBuffer.append(TEXT_212);
906
    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.GraphicalEditPart"));
1019
    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.GraphicalEditPart"));
907
    stringBuffer.append(TEXT_193);
1020
    stringBuffer.append(TEXT_213);
908
    
1021
    
909
	}
1022
	}
910
} // if hasFixedChildren || hasExternalLabels
1023
} // if hasFixedChildren || hasExternalLabels
911
1024
912
    stringBuffer.append(TEXT_194);
1025
    stringBuffer.append(TEXT_214);
913
    if (genNode.getViewmap() instanceof InnerClassViewmap) {
1026
    if (genNode.getViewmap() instanceof InnerClassViewmap) {
914
    stringBuffer.append(TEXT_195);
1027
    stringBuffer.append(TEXT_215);
915
    stringBuffer.append(((InnerClassViewmap) genNode.getViewmap()).getClassBody());
1028
    stringBuffer.append(((InnerClassViewmap) genNode.getViewmap()).getClassBody());
916
    }
1029
    }
917
    stringBuffer.append(TEXT_196);
1030
    stringBuffer.append(TEXT_216);
918
    importManager.emitSortedImports();
1031
    importManager.emitSortedImports();
919
    stringBuffer.append(TEXT_197);
1032
    stringBuffer.append(TEXT_217);
920
    return stringBuffer.toString();
1033
    return stringBuffer.toString();
921
  }
1034
  }
922
}
1035
}
(-)models/gmfgen.genmodel (+3 lines)
Lines 278-283 Link Here
278
      <genFeatures property="Readonly" notify="false" createChild="false" propertyCategory="Diagram Containment"
278
      <genFeatures property="Readonly" notify="false" createChild="false" propertyCategory="Diagram Containment"
279
          ecoreFeature="ecore:EReference gmfgen.ecore#//GenChildNode/containers"/>
279
          ecoreFeature="ecore:EReference gmfgen.ecore#//GenChildNode/containers"/>
280
    </genClasses>
280
    </genClasses>
281
    <genClasses ecoreClass="gmfgen.ecore#//GenChildSideAffixedNode">
282
      <genFeatures property="None" createChild="false" ecoreFeature="ecore:EAttribute gmfgen.ecore#//GenChildSideAffixedNode/preferredSide"/>
283
    </genClasses>
281
    <genClasses ecoreClass="gmfgen.ecore#//GenChildLabelNode">
284
    <genClasses ecoreClass="gmfgen.ecore#//GenChildLabelNode">
282
      <genFeatures createChild="false" propertyCategory="Diagram Label" ecoreFeature="ecore:EAttribute gmfgen.ecore#//GenChildLabelNode/labelReadOnly"/>
285
      <genFeatures createChild="false" propertyCategory="Diagram Label" ecoreFeature="ecore:EAttribute gmfgen.ecore#//GenChildLabelNode/labelReadOnly"/>
283
      <genFeatures createChild="false" propertyCategory="Diagram Label" ecoreFeature="ecore:EAttribute gmfgen.ecore#//GenChildLabelNode/labelElementIcon"/>
286
      <genFeatures createChild="false" propertyCategory="Diagram Label" ecoreFeature="ecore:EAttribute gmfgen.ecore#//GenChildLabelNode/labelElementIcon"/>
(-)models/gmfgen.ecore (+4 lines)
Lines 474-479 Link Here
474
      </eAnnotations>
474
      </eAnnotations>
475
    </eStructuralFeatures>
475
    </eStructuralFeatures>
476
  </eClassifiers>
476
  </eClassifiers>
477
  <eClassifiers xsi:type="ecore:EClass" name="GenChildSideAffixedNode" eSuperTypes="#//GenChildNode">
478
    <eStructuralFeatures xsi:type="ecore:EAttribute" name="preferredSide" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"
479
        defaultValueLiteral="0"/>
480
  </eClassifiers>
477
  <eClassifiers xsi:type="ecore:EClass" name="GenChildLabelNode" eSuperTypes="#//GenChildNode">
481
  <eClassifiers xsi:type="ecore:EClass" name="GenChildLabelNode" eSuperTypes="#//GenChildNode">
478
    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
482
    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
479
      <details key="documentation" value="Child node represented by label; typically hosted by list compartment"/>
483
      <details key="documentation" value="Child node represented by label; typically hosted by list compartment"/>
(-)src/org/eclipse/gmf/codegen/gmfgen/util/GMFGenSwitch.java (+26 lines)
Lines 302-307 Link Here
302
				if (result == null) result = defaultCase(theEObject);
302
				if (result == null) result = defaultCase(theEObject);
303
				return result;
303
				return result;
304
			}
304
			}
305
			case GMFGenPackage.GEN_CHILD_SIDE_AFFIXED_NODE: {
306
				GenChildSideAffixedNode genChildSideAffixedNode = (GenChildSideAffixedNode)theEObject;
307
				Object result = caseGenChildSideAffixedNode(genChildSideAffixedNode);
308
				if (result == null) result = caseGenChildNode(genChildSideAffixedNode);
309
				if (result == null) result = caseGenNode(genChildSideAffixedNode);
310
				if (result == null) result = caseGenChildContainer(genChildSideAffixedNode);
311
				if (result == null) result = caseGenContainerBase(genChildSideAffixedNode);
312
				if (result == null) result = caseGenCommonBase(genChildSideAffixedNode);
313
				if (result == null) result = defaultCase(theEObject);
314
				return result;
315
			}
305
			case GMFGenPackage.GEN_CHILD_LABEL_NODE: {
316
			case GMFGenPackage.GEN_CHILD_LABEL_NODE: {
306
				GenChildLabelNode genChildLabelNode = (GenChildLabelNode)theEObject;
317
				GenChildLabelNode genChildLabelNode = (GenChildLabelNode)theEObject;
307
				Object result = caseGenChildLabelNode(genChildLabelNode);
318
				Object result = caseGenChildLabelNode(genChildLabelNode);
Lines 1092-1097 Link Here
1092
	}
1103
	}
1093
1104
1094
	/**
1105
	/**
1106
	 * Returns the result of interpretting the object as an instance of '<em>Gen Child Side Affixed Node</em>'.
1107
	 * <!-- begin-user-doc -->
1108
	 * This implementation returns null;
1109
	 * returning a non-null result will terminate the switch.
1110
	 * <!-- end-user-doc -->
1111
	 * @param object the target of the switch.
1112
	 * @return the result of interpretting the object as an instance of '<em>Gen Child Side Affixed Node</em>'.
1113
	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
1114
	 * @generated
1115
	 */
1116
	public Object caseGenChildSideAffixedNode(GenChildSideAffixedNode object) {
1117
		return null;
1118
	}
1119
1120
	/**
1095
	 * Returns the result of interpretting the object as an instance of '<em>Gen Child Label Node</em>'.
1121
	 * Returns the result of interpretting the object as an instance of '<em>Gen Child Label Node</em>'.
1096
	 * <!-- begin-user-doc -->
1122
	 * <!-- begin-user-doc -->
1097
	 * This implementation returns null;
1123
	 * This implementation returns null;
(-)src/org/eclipse/gmf/codegen/gmfgen/util/GMFGenAdapterFactory.java (+17 lines)
Lines 202-207 Link Here
202
			public Object caseGenChildNode(GenChildNode object) {
202
			public Object caseGenChildNode(GenChildNode object) {
203
				return createGenChildNodeAdapter();
203
				return createGenChildNodeAdapter();
204
			}
204
			}
205
			public Object caseGenChildSideAffixedNode(GenChildSideAffixedNode object) {
206
				return createGenChildSideAffixedNodeAdapter();
207
			}
205
			public Object caseGenChildLabelNode(GenChildLabelNode object) {
208
			public Object caseGenChildLabelNode(GenChildLabelNode object) {
206
				return createGenChildLabelNodeAdapter();
209
				return createGenChildLabelNodeAdapter();
207
			}
210
			}
Lines 718-723 Link Here
718
	}
721
	}
719
722
720
	/**
723
	/**
724
	 * Creates a new adapter for an object of class '{@link org.eclipse.gmf.codegen.gmfgen.GenChildSideAffixedNode <em>Gen Child Side Affixed Node</em>}'.
725
	 * <!-- begin-user-doc -->
726
	 * This default implementation returns null so that we can easily ignore cases;
727
	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
728
	 * <!-- end-user-doc -->
729
	 * @return the new adapter.
730
	 * @see org.eclipse.gmf.codegen.gmfgen.GenChildSideAffixedNode
731
	 * @generated
732
	 */
733
	public Adapter createGenChildSideAffixedNodeAdapter() {
734
		return null;
735
	}
736
737
	/**
721
	 * Creates a new adapter for an object of class '{@link org.eclipse.gmf.codegen.gmfgen.GenChildLabelNode <em>Gen Child Label Node</em>}'.
738
	 * Creates a new adapter for an object of class '{@link org.eclipse.gmf.codegen.gmfgen.GenChildLabelNode <em>Gen Child Label Node</em>}'.
722
	 * <!-- begin-user-doc -->
739
	 * <!-- begin-user-doc -->
723
	 * This default implementation returns null so that we can easily ignore cases;
740
	 * This default implementation returns null so that we can easily ignore cases;
(-)src/org/eclipse/gmf/codegen/gmfgen/GMFGenPackage.java (-68 / +270 lines)
Lines 2137-2143 Link Here
2137
	 * @see org.eclipse.gmf.codegen.gmfgen.impl.GMFGenPackageImpl#getElementType()
2137
	 * @see org.eclipse.gmf.codegen.gmfgen.impl.GMFGenPackageImpl#getElementType()
2138
	 * @generated
2138
	 * @generated
2139
	 */
2139
	 */
2140
	int ELEMENT_TYPE = 26;
2140
	int ELEMENT_TYPE = 27;
2141
2141
2142
	/**
2142
	/**
2143
	 * The meta object id for the '{@link org.eclipse.gmf.codegen.gmfgen.impl.MetamodelTypeImpl <em>Metamodel Type</em>}' class.
2143
	 * The meta object id for the '{@link org.eclipse.gmf.codegen.gmfgen.impl.MetamodelTypeImpl <em>Metamodel Type</em>}' class.
Lines 2147-2153 Link Here
2147
	 * @see org.eclipse.gmf.codegen.gmfgen.impl.GMFGenPackageImpl#getMetamodelType()
2147
	 * @see org.eclipse.gmf.codegen.gmfgen.impl.GMFGenPackageImpl#getMetamodelType()
2148
	 * @generated
2148
	 * @generated
2149
	 */
2149
	 */
2150
	int METAMODEL_TYPE = 27;
2150
	int METAMODEL_TYPE = 28;
2151
2151
2152
	/**
2152
	/**
2153
	 * The meta object id for the '{@link org.eclipse.gmf.codegen.gmfgen.impl.SpecializationTypeImpl <em>Specialization Type</em>}' class.
2153
	 * The meta object id for the '{@link org.eclipse.gmf.codegen.gmfgen.impl.SpecializationTypeImpl <em>Specialization Type</em>}' class.
Lines 2157-2163 Link Here
2157
	 * @see org.eclipse.gmf.codegen.gmfgen.impl.GMFGenPackageImpl#getSpecializationType()
2157
	 * @see org.eclipse.gmf.codegen.gmfgen.impl.GMFGenPackageImpl#getSpecializationType()
2158
	 * @generated
2158
	 * @generated
2159
	 */
2159
	 */
2160
	int SPECIALIZATION_TYPE = 28;
2160
	int SPECIALIZATION_TYPE = 29;
2161
2161
2162
	/**
2162
	/**
2163
	 * The meta object id for the '{@link org.eclipse.gmf.codegen.gmfgen.impl.GenNodeImpl <em>Gen Node</em>}' class.
2163
	 * The meta object id for the '{@link org.eclipse.gmf.codegen.gmfgen.impl.GenNodeImpl <em>Gen Node</em>}' class.
Lines 2177-2183 Link Here
2177
	 * @see org.eclipse.gmf.codegen.gmfgen.impl.GMFGenPackageImpl#getGenCompartment()
2177
	 * @see org.eclipse.gmf.codegen.gmfgen.impl.GMFGenPackageImpl#getGenCompartment()
2178
	 * @generated
2178
	 * @generated
2179
	 */
2179
	 */
2180
	int GEN_COMPARTMENT = 20;
2180
	int GEN_COMPARTMENT = 21;
2181
2181
2182
	/**
2182
	/**
2183
	 * The meta object id for the '{@link org.eclipse.gmf.codegen.gmfgen.impl.GenChildContainerImpl <em>Gen Child Container</em>}' class.
2183
	 * The meta object id for the '{@link org.eclipse.gmf.codegen.gmfgen.impl.GenChildContainerImpl <em>Gen Child Container</em>}' class.
Lines 2777-2782 Link Here
2777
	int GEN_CHILD_NODE_FEATURE_COUNT = GEN_NODE_FEATURE_COUNT + 2;
2777
	int GEN_CHILD_NODE_FEATURE_COUNT = GEN_NODE_FEATURE_COUNT + 2;
2778
2778
2779
	/**
2779
	/**
2780
	 * The meta object id for the '{@link org.eclipse.gmf.codegen.gmfgen.impl.GenChildSideAffixedNodeImpl <em>Gen Child Side Affixed Node</em>}' class.
2781
	 * <!-- begin-user-doc -->
2782
	 * <!-- end-user-doc -->
2783
	 * @see org.eclipse.gmf.codegen.gmfgen.impl.GenChildSideAffixedNodeImpl
2784
	 * @see org.eclipse.gmf.codegen.gmfgen.impl.GMFGenPackageImpl#getGenChildSideAffixedNode()
2785
	 * @generated
2786
	 */
2787
	int GEN_CHILD_SIDE_AFFIXED_NODE = 19;
2788
2789
	/**
2790
	 * The feature id for the '<em><b>Diagram Run Time Class</b></em>' reference.
2791
	 * <!-- begin-user-doc -->
2792
	 * <!-- end-user-doc -->
2793
	 * @generated
2794
	 * @ordered
2795
	 */
2796
	int GEN_CHILD_SIDE_AFFIXED_NODE__DIAGRAM_RUN_TIME_CLASS = GEN_CHILD_NODE__DIAGRAM_RUN_TIME_CLASS;
2797
2798
	/**
2799
	 * The feature id for the '<em><b>Visual ID</b></em>' attribute.
2800
	 * <!-- begin-user-doc -->
2801
	 * <!-- end-user-doc -->
2802
	 * @generated
2803
	 * @ordered
2804
	 */
2805
	int GEN_CHILD_SIDE_AFFIXED_NODE__VISUAL_ID = GEN_CHILD_NODE__VISUAL_ID;
2806
2807
	/**
2808
	 * The feature id for the '<em><b>Element Type</b></em>' containment reference.
2809
	 * <!-- begin-user-doc -->
2810
	 * <!-- end-user-doc -->
2811
	 * @generated
2812
	 * @ordered
2813
	 */
2814
	int GEN_CHILD_SIDE_AFFIXED_NODE__ELEMENT_TYPE = GEN_CHILD_NODE__ELEMENT_TYPE;
2815
2816
	/**
2817
	 * The feature id for the '<em><b>Edit Part Class Name</b></em>' attribute.
2818
	 * <!-- begin-user-doc -->
2819
	 * <!-- end-user-doc -->
2820
	 * @generated
2821
	 * @ordered
2822
	 */
2823
	int GEN_CHILD_SIDE_AFFIXED_NODE__EDIT_PART_CLASS_NAME = GEN_CHILD_NODE__EDIT_PART_CLASS_NAME;
2824
2825
	/**
2826
	 * The feature id for the '<em><b>Item Semantic Edit Policy Class Name</b></em>' attribute.
2827
	 * <!-- begin-user-doc -->
2828
	 * <!-- end-user-doc -->
2829
	 * @generated
2830
	 * @ordered
2831
	 */
2832
	int GEN_CHILD_SIDE_AFFIXED_NODE__ITEM_SEMANTIC_EDIT_POLICY_CLASS_NAME = GEN_CHILD_NODE__ITEM_SEMANTIC_EDIT_POLICY_CLASS_NAME;
2833
2834
	/**
2835
	 * The feature id for the '<em><b>Notation View Factory Class Name</b></em>' attribute.
2836
	 * <!-- begin-user-doc -->
2837
	 * <!-- end-user-doc -->
2838
	 * @generated
2839
	 * @ordered
2840
	 */
2841
	int GEN_CHILD_SIDE_AFFIXED_NODE__NOTATION_VIEW_FACTORY_CLASS_NAME = GEN_CHILD_NODE__NOTATION_VIEW_FACTORY_CLASS_NAME;
2842
2843
	/**
2844
	 * The feature id for the '<em><b>Viewmap</b></em>' containment reference.
2845
	 * <!-- begin-user-doc -->
2846
	 * <!-- end-user-doc -->
2847
	 * @generated
2848
	 * @ordered
2849
	 */
2850
	int GEN_CHILD_SIDE_AFFIXED_NODE__VIEWMAP = GEN_CHILD_NODE__VIEWMAP;
2851
2852
	/**
2853
	 * The feature id for the '<em><b>Custom Behaviour</b></em>' containment reference list.
2854
	 * <!-- begin-user-doc -->
2855
	 * <!-- end-user-doc -->
2856
	 * @generated
2857
	 * @ordered
2858
	 */
2859
	int GEN_CHILD_SIDE_AFFIXED_NODE__CUSTOM_BEHAVIOUR = GEN_CHILD_NODE__CUSTOM_BEHAVIOUR;
2860
2861
	/**
2862
	 * The feature id for the '<em><b>Contained Nodes</b></em>' reference list.
2863
	 * <!-- begin-user-doc -->
2864
	 * <!-- end-user-doc -->
2865
	 * @generated
2866
	 * @ordered
2867
	 */
2868
	int GEN_CHILD_SIDE_AFFIXED_NODE__CONTAINED_NODES = GEN_CHILD_NODE__CONTAINED_NODES;
2869
2870
	/**
2871
	 * The feature id for the '<em><b>Child Nodes</b></em>' reference list.
2872
	 * <!-- begin-user-doc -->
2873
	 * <!-- end-user-doc -->
2874
	 * @generated
2875
	 * @ordered
2876
	 */
2877
	int GEN_CHILD_SIDE_AFFIXED_NODE__CHILD_NODES = GEN_CHILD_NODE__CHILD_NODES;
2878
2879
	/**
2880
	 * The feature id for the '<em><b>Canonical Edit Policy Class Name</b></em>' attribute.
2881
	 * <!-- begin-user-doc -->
2882
	 * <!-- end-user-doc -->
2883
	 * @generated
2884
	 * @ordered
2885
	 */
2886
	int GEN_CHILD_SIDE_AFFIXED_NODE__CANONICAL_EDIT_POLICY_CLASS_NAME = GEN_CHILD_NODE__CANONICAL_EDIT_POLICY_CLASS_NAME;
2887
2888
	/**
2889
	 * The feature id for the '<em><b>Model Facet</b></em>' containment reference.
2890
	 * <!-- begin-user-doc -->
2891
	 * <!-- end-user-doc -->
2892
	 * @generated
2893
	 * @ordered
2894
	 */
2895
	int GEN_CHILD_SIDE_AFFIXED_NODE__MODEL_FACET = GEN_CHILD_NODE__MODEL_FACET;
2896
2897
	/**
2898
	 * The feature id for the '<em><b>Labels</b></em>' containment reference list.
2899
	 * <!-- begin-user-doc -->
2900
	 * <!-- end-user-doc -->
2901
	 * @generated
2902
	 * @ordered
2903
	 */
2904
	int GEN_CHILD_SIDE_AFFIXED_NODE__LABELS = GEN_CHILD_NODE__LABELS;
2905
2906
	/**
2907
	 * The feature id for the '<em><b>Compartments</b></em>' reference list.
2908
	 * <!-- begin-user-doc -->
2909
	 * <!-- end-user-doc -->
2910
	 * @generated
2911
	 * @ordered
2912
	 */
2913
	int GEN_CHILD_SIDE_AFFIXED_NODE__COMPARTMENTS = GEN_CHILD_NODE__COMPARTMENTS;
2914
2915
	/**
2916
	 * The feature id for the '<em><b>Graphical Node Edit Policy Class Name</b></em>' attribute.
2917
	 * <!-- begin-user-doc -->
2918
	 * <!-- end-user-doc -->
2919
	 * @generated
2920
	 * @ordered
2921
	 */
2922
	int GEN_CHILD_SIDE_AFFIXED_NODE__GRAPHICAL_NODE_EDIT_POLICY_CLASS_NAME = GEN_CHILD_NODE__GRAPHICAL_NODE_EDIT_POLICY_CLASS_NAME;
2923
2924
	/**
2925
	 * The feature id for the '<em><b>Diagram</b></em>' container reference.
2926
	 * <!-- begin-user-doc -->
2927
	 * <!-- end-user-doc -->
2928
	 * @generated
2929
	 * @ordered
2930
	 */
2931
	int GEN_CHILD_SIDE_AFFIXED_NODE__DIAGRAM = GEN_CHILD_NODE__DIAGRAM;
2932
2933
	/**
2934
	 * The feature id for the '<em><b>Containers</b></em>' reference list.
2935
	 * <!-- begin-user-doc -->
2936
	 * <!-- end-user-doc -->
2937
	 * @generated
2938
	 * @ordered
2939
	 */
2940
	int GEN_CHILD_SIDE_AFFIXED_NODE__CONTAINERS = GEN_CHILD_NODE__CONTAINERS;
2941
2942
	/**
2943
	 * The feature id for the '<em><b>Preferred Side</b></em>' attribute.
2944
	 * <!-- begin-user-doc -->
2945
	 * <!-- end-user-doc -->
2946
	 * @generated
2947
	 * @ordered
2948
	 */
2949
	int GEN_CHILD_SIDE_AFFIXED_NODE__PREFERRED_SIDE = GEN_CHILD_NODE_FEATURE_COUNT + 0;
2950
2951
	/**
2952
	 * The number of structural features of the '<em>Gen Child Side Affixed Node</em>' class.
2953
	 * <!-- begin-user-doc -->
2954
	 * <!-- end-user-doc -->
2955
	 * @generated
2956
	 * @ordered
2957
	 */
2958
	int GEN_CHILD_SIDE_AFFIXED_NODE_FEATURE_COUNT = GEN_CHILD_NODE_FEATURE_COUNT + 1;
2959
2960
	/**
2780
	 * The meta object id for the '{@link org.eclipse.gmf.codegen.gmfgen.impl.GenChildLabelNodeImpl <em>Gen Child Label Node</em>}' class.
2961
	 * The meta object id for the '{@link org.eclipse.gmf.codegen.gmfgen.impl.GenChildLabelNodeImpl <em>Gen Child Label Node</em>}' class.
2781
	 * <!-- begin-user-doc -->
2962
	 * <!-- begin-user-doc -->
2782
	 * <!-- end-user-doc -->
2963
	 * <!-- end-user-doc -->
Lines 2784-2790 Link Here
2784
	 * @see org.eclipse.gmf.codegen.gmfgen.impl.GMFGenPackageImpl#getGenChildLabelNode()
2965
	 * @see org.eclipse.gmf.codegen.gmfgen.impl.GMFGenPackageImpl#getGenChildLabelNode()
2785
	 * @generated
2966
	 * @generated
2786
	 */
2967
	 */
2787
	int GEN_CHILD_LABEL_NODE = 19;
2968
	int GEN_CHILD_LABEL_NODE = 20;
2788
2969
2789
	/**
2970
	/**
2790
	 * The feature id for the '<em><b>Diagram Run Time Class</b></em>' reference.
2971
	 * The feature id for the '<em><b>Diagram Run Time Class</b></em>' reference.
Lines 3154-3160 Link Here
3154
	 * @see org.eclipse.gmf.codegen.gmfgen.impl.GMFGenPackageImpl#getGenLink()
3335
	 * @see org.eclipse.gmf.codegen.gmfgen.impl.GMFGenPackageImpl#getGenLink()
3155
	 * @generated
3336
	 * @generated
3156
	 */
3337
	 */
3157
	int GEN_LINK = 21;
3338
	int GEN_LINK = 22;
3158
3339
3159
	/**
3340
	/**
3160
	 * The feature id for the '<em><b>Diagram Run Time Class</b></em>' reference.
3341
	 * The feature id for the '<em><b>Diagram Run Time Class</b></em>' reference.
Lines 3308-3314 Link Here
3308
	 * @see org.eclipse.gmf.codegen.gmfgen.impl.GMFGenPackageImpl#getGenLabel()
3489
	 * @see org.eclipse.gmf.codegen.gmfgen.impl.GMFGenPackageImpl#getGenLabel()
3309
	 * @generated
3490
	 * @generated
3310
	 */
3491
	 */
3311
	int GEN_LABEL = 22;
3492
	int GEN_LABEL = 23;
3312
3493
3313
	/**
3494
	/**
3314
	 * The feature id for the '<em><b>Diagram Run Time Class</b></em>' reference.
3495
	 * The feature id for the '<em><b>Diagram Run Time Class</b></em>' reference.
Lines 3426-3432 Link Here
3426
	 * @see org.eclipse.gmf.codegen.gmfgen.impl.GMFGenPackageImpl#getGenNodeLabel()
3607
	 * @see org.eclipse.gmf.codegen.gmfgen.impl.GMFGenPackageImpl#getGenNodeLabel()
3427
	 * @generated
3608
	 * @generated
3428
	 */
3609
	 */
3429
	int GEN_NODE_LABEL = 23;
3610
	int GEN_NODE_LABEL = 24;
3430
3611
3431
	/**
3612
	/**
3432
	 * The feature id for the '<em><b>Diagram Run Time Class</b></em>' reference.
3613
	 * The feature id for the '<em><b>Diagram Run Time Class</b></em>' reference.
Lines 3553-3559 Link Here
3553
	 * @see org.eclipse.gmf.codegen.gmfgen.impl.GMFGenPackageImpl#getGenExternalNodeLabel()
3734
	 * @see org.eclipse.gmf.codegen.gmfgen.impl.GMFGenPackageImpl#getGenExternalNodeLabel()
3554
	 * @generated
3735
	 * @generated
3555
	 */
3736
	 */
3556
	int GEN_EXTERNAL_NODE_LABEL = 24;
3737
	int GEN_EXTERNAL_NODE_LABEL = 25;
3557
3738
3558
	/**
3739
	/**
3559
	 * The feature id for the '<em><b>Diagram Run Time Class</b></em>' reference.
3740
	 * The feature id for the '<em><b>Diagram Run Time Class</b></em>' reference.
Lines 3680-3686 Link Here
3680
	 * @see org.eclipse.gmf.codegen.gmfgen.impl.GMFGenPackageImpl#getGenLinkLabel()
3861
	 * @see org.eclipse.gmf.codegen.gmfgen.impl.GMFGenPackageImpl#getGenLinkLabel()
3681
	 * @generated
3862
	 * @generated
3682
	 */
3863
	 */
3683
	int GEN_LINK_LABEL = 25;
3864
	int GEN_LINK_LABEL = 26;
3684
3865
3685
	/**
3866
	/**
3686
	 * The feature id for the '<em><b>Diagram Run Time Class</b></em>' reference.
3867
	 * The feature id for the '<em><b>Diagram Run Time Class</b></em>' reference.
Lines 3852-3858 Link Here
3852
	 * @see org.eclipse.gmf.codegen.gmfgen.impl.GMFGenPackageImpl#getModelFacet()
4033
	 * @see org.eclipse.gmf.codegen.gmfgen.impl.GMFGenPackageImpl#getModelFacet()
3853
	 * @generated
4034
	 * @generated
3854
	 */
4035
	 */
3855
	int MODEL_FACET = 30;
4036
	int MODEL_FACET = 31;
3856
4037
3857
	/**
4038
	/**
3858
	 * The meta object id for the '{@link org.eclipse.gmf.codegen.gmfgen.LinkModelFacet <em>Link Model Facet</em>}' class.
4039
	 * The meta object id for the '{@link org.eclipse.gmf.codegen.gmfgen.LinkModelFacet <em>Link Model Facet</em>}' class.
Lines 3862-3868 Link Here
3862
	 * @see org.eclipse.gmf.codegen.gmfgen.impl.GMFGenPackageImpl#getLinkModelFacet()
4043
	 * @see org.eclipse.gmf.codegen.gmfgen.impl.GMFGenPackageImpl#getLinkModelFacet()
3863
	 * @generated
4044
	 * @generated
3864
	 */
4045
	 */
3865
	int LINK_MODEL_FACET = 31;
4046
	int LINK_MODEL_FACET = 32;
3866
4047
3867
	/**
4048
	/**
3868
	 * The meta object id for the '{@link org.eclipse.gmf.codegen.gmfgen.LabelModelFacet <em>Label Model Facet</em>}' class.
4049
	 * The meta object id for the '{@link org.eclipse.gmf.codegen.gmfgen.LabelModelFacet <em>Label Model Facet</em>}' class.
Lines 3872-3878 Link Here
3872
	 * @see org.eclipse.gmf.codegen.gmfgen.impl.GMFGenPackageImpl#getLabelModelFacet()
4053
	 * @see org.eclipse.gmf.codegen.gmfgen.impl.GMFGenPackageImpl#getLabelModelFacet()
3873
	 * @generated
4054
	 * @generated
3874
	 */
4055
	 */
3875
	int LABEL_MODEL_FACET = 32;
4056
	int LABEL_MODEL_FACET = 33;
3876
4057
3877
	/**
4058
	/**
3878
	 * The number of structural features of the '<em>Element Type</em>' class.
4059
	 * The number of structural features of the '<em>Element Type</em>' class.
Lines 4008-4014 Link Here
4008
	 * @see org.eclipse.gmf.codegen.gmfgen.impl.GMFGenPackageImpl#getNotationType()
4189
	 * @see org.eclipse.gmf.codegen.gmfgen.impl.GMFGenPackageImpl#getNotationType()
4009
	 * @generated
4190
	 * @generated
4010
	 */
4191
	 */
4011
	int NOTATION_TYPE = 29;
4192
	int NOTATION_TYPE = 30;
4012
4193
4013
	/**
4194
	/**
4014
	 * The feature id for the '<em><b>Diagram Element</b></em>' container reference.
4195
	 * The feature id for the '<em><b>Diagram Element</b></em>' container reference.
Lines 4090-4096 Link Here
4090
	 * @see org.eclipse.gmf.codegen.gmfgen.impl.GMFGenPackageImpl#getTypeModelFacet()
4271
	 * @see org.eclipse.gmf.codegen.gmfgen.impl.GMFGenPackageImpl#getTypeModelFacet()
4091
	 * @generated
4272
	 * @generated
4092
	 */
4273
	 */
4093
	int TYPE_MODEL_FACET = 33;
4274
	int TYPE_MODEL_FACET = 34;
4094
4275
4095
	/**
4276
	/**
4096
	 * The feature id for the '<em><b>Meta Class</b></em>' reference.
4277
	 * The feature id for the '<em><b>Meta Class</b></em>' reference.
Lines 4154-4160 Link Here
4154
	 * @see org.eclipse.gmf.codegen.gmfgen.impl.GMFGenPackageImpl#getFeatureModelFacet()
4335
	 * @see org.eclipse.gmf.codegen.gmfgen.impl.GMFGenPackageImpl#getFeatureModelFacet()
4155
	 * @generated
4336
	 * @generated
4156
	 */
4337
	 */
4157
	int FEATURE_MODEL_FACET = 34;
4338
	int FEATURE_MODEL_FACET = 35;
4158
4339
4159
	/**
4340
	/**
4160
	 * The feature id for the '<em><b>Meta Feature</b></em>' reference.
4341
	 * The feature id for the '<em><b>Meta Feature</b></em>' reference.
Lines 4182-4188 Link Here
4182
	 * @see org.eclipse.gmf.codegen.gmfgen.impl.GMFGenPackageImpl#getFeatureLabelModelFacet()
4363
	 * @see org.eclipse.gmf.codegen.gmfgen.impl.GMFGenPackageImpl#getFeatureLabelModelFacet()
4183
	 * @generated
4364
	 * @generated
4184
	 */
4365
	 */
4185
	int FEATURE_LABEL_MODEL_FACET = 38;
4366
	int FEATURE_LABEL_MODEL_FACET = 39;
4186
4367
4187
	/**
4368
	/**
4188
	 * The meta object id for the '{@link org.eclipse.gmf.codegen.gmfgen.impl.CompositeFeatureModelFacetImpl <em>Composite Feature Model Facet</em>}' class.
4369
	 * The meta object id for the '{@link org.eclipse.gmf.codegen.gmfgen.impl.CompositeFeatureModelFacetImpl <em>Composite Feature Model Facet</em>}' class.
Lines 4192-4198 Link Here
4192
	 * @see org.eclipse.gmf.codegen.gmfgen.impl.GMFGenPackageImpl#getCompositeFeatureModelFacet()
4373
	 * @see org.eclipse.gmf.codegen.gmfgen.impl.GMFGenPackageImpl#getCompositeFeatureModelFacet()
4193
	 * @generated
4374
	 * @generated
4194
	 */
4375
	 */
4195
	int COMPOSITE_FEATURE_MODEL_FACET = 35;
4376
	int COMPOSITE_FEATURE_MODEL_FACET = 36;
4196
4377
4197
	/**
4378
	/**
4198
	 * The feature id for the '<em><b>Meta Features</b></em>' reference list.
4379
	 * The feature id for the '<em><b>Meta Features</b></em>' reference list.
Lines 4220-4226 Link Here
4220
	 * @see org.eclipse.gmf.codegen.gmfgen.impl.GMFGenPackageImpl#getCompositeFeatureLabelModelFacet()
4401
	 * @see org.eclipse.gmf.codegen.gmfgen.impl.GMFGenPackageImpl#getCompositeFeatureLabelModelFacet()
4221
	 * @generated
4402
	 * @generated
4222
	 */
4403
	 */
4223
	int COMPOSITE_FEATURE_LABEL_MODEL_FACET = 39;
4404
	int COMPOSITE_FEATURE_LABEL_MODEL_FACET = 40;
4224
4405
4225
	/**
4406
	/**
4226
	 * The meta object id for the '{@link org.eclipse.gmf.codegen.gmfgen.impl.TypeLinkModelFacetImpl <em>Type Link Model Facet</em>}' class.
4407
	 * The meta object id for the '{@link org.eclipse.gmf.codegen.gmfgen.impl.TypeLinkModelFacetImpl <em>Type Link Model Facet</em>}' class.
Lines 4230-4236 Link Here
4230
	 * @see org.eclipse.gmf.codegen.gmfgen.impl.GMFGenPackageImpl#getTypeLinkModelFacet()
4411
	 * @see org.eclipse.gmf.codegen.gmfgen.impl.GMFGenPackageImpl#getTypeLinkModelFacet()
4231
	 * @generated
4412
	 * @generated
4232
	 */
4413
	 */
4233
	int TYPE_LINK_MODEL_FACET = 36;
4414
	int TYPE_LINK_MODEL_FACET = 37;
4234
4415
4235
	/**
4416
	/**
4236
	 * The feature id for the '<em><b>Meta Class</b></em>' reference.
4417
	 * The feature id for the '<em><b>Meta Class</b></em>' reference.
Lines 4312-4318 Link Here
4312
	 * @see org.eclipse.gmf.codegen.gmfgen.impl.GMFGenPackageImpl#getFeatureLinkModelFacet()
4493
	 * @see org.eclipse.gmf.codegen.gmfgen.impl.GMFGenPackageImpl#getFeatureLinkModelFacet()
4313
	 * @generated
4494
	 * @generated
4314
	 */
4495
	 */
4315
	int FEATURE_LINK_MODEL_FACET = 37;
4496
	int FEATURE_LINK_MODEL_FACET = 38;
4316
4497
4317
	/**
4498
	/**
4318
	 * The feature id for the '<em><b>Meta Feature</b></em>' reference.
4499
	 * The feature id for the '<em><b>Meta Feature</b></em>' reference.
Lines 4412-4418 Link Here
4412
	 * @see org.eclipse.gmf.codegen.gmfgen.impl.GMFGenPackageImpl#getDesignLabelModelFacet()
4593
	 * @see org.eclipse.gmf.codegen.gmfgen.impl.GMFGenPackageImpl#getDesignLabelModelFacet()
4413
	 * @generated
4594
	 * @generated
4414
	 */
4595
	 */
4415
	int DESIGN_LABEL_MODEL_FACET = 40;
4596
	int DESIGN_LABEL_MODEL_FACET = 41;
4416
4597
4417
	/**
4598
	/**
4418
	 * The number of structural features of the '<em>Design Label Model Facet</em>' class.
4599
	 * The number of structural features of the '<em>Design Label Model Facet</em>' class.
Lines 4431-4437 Link Here
4431
	 * @see org.eclipse.gmf.codegen.gmfgen.impl.GMFGenPackageImpl#getViewmap()
4612
	 * @see org.eclipse.gmf.codegen.gmfgen.impl.GMFGenPackageImpl#getViewmap()
4432
	 * @generated
4613
	 * @generated
4433
	 */
4614
	 */
4434
	int VIEWMAP = 47;
4615
	int VIEWMAP = 48;
4435
4616
4436
	/**
4617
	/**
4437
	 * The meta object id for the '{@link org.eclipse.gmf.codegen.gmfgen.Attributes <em>Attributes</em>}' class.
4618
	 * The meta object id for the '{@link org.eclipse.gmf.codegen.gmfgen.Attributes <em>Attributes</em>}' class.
Lines 4441-4447 Link Here
4441
	 * @see org.eclipse.gmf.codegen.gmfgen.impl.GMFGenPackageImpl#getAttributes()
4622
	 * @see org.eclipse.gmf.codegen.gmfgen.impl.GMFGenPackageImpl#getAttributes()
4442
	 * @generated
4623
	 * @generated
4443
	 */
4624
	 */
4444
	int ATTRIBUTES = 41;
4625
	int ATTRIBUTES = 42;
4445
4626
4446
	/**
4627
	/**
4447
	 * The number of structural features of the '<em>Attributes</em>' class.
4628
	 * The number of structural features of the '<em>Attributes</em>' class.
Lines 4460-4466 Link Here
4460
	 * @see org.eclipse.gmf.codegen.gmfgen.impl.GMFGenPackageImpl#getColorAttributes()
4641
	 * @see org.eclipse.gmf.codegen.gmfgen.impl.GMFGenPackageImpl#getColorAttributes()
4461
	 * @generated
4642
	 * @generated
4462
	 */
4643
	 */
4463
	int COLOR_ATTRIBUTES = 42;
4644
	int COLOR_ATTRIBUTES = 43;
4464
4645
4465
	/**
4646
	/**
4466
	 * The feature id for the '<em><b>Foreground Color</b></em>' attribute.
4647
	 * The feature id for the '<em><b>Foreground Color</b></em>' attribute.
Lines 4497-4503 Link Here
4497
	 * @see org.eclipse.gmf.codegen.gmfgen.impl.GMFGenPackageImpl#getStyleAttributes()
4678
	 * @see org.eclipse.gmf.codegen.gmfgen.impl.GMFGenPackageImpl#getStyleAttributes()
4498
	 * @generated
4679
	 * @generated
4499
	 */
4680
	 */
4500
	int STYLE_ATTRIBUTES = 43;
4681
	int STYLE_ATTRIBUTES = 44;
4501
4682
4502
	/**
4683
	/**
4503
	 * The feature id for the '<em><b>Fixed Font</b></em>' attribute.
4684
	 * The feature id for the '<em><b>Fixed Font</b></em>' attribute.
Lines 4543-4549 Link Here
4543
	 * @see org.eclipse.gmf.codegen.gmfgen.impl.GMFGenPackageImpl#getResizeConstraints()
4724
	 * @see org.eclipse.gmf.codegen.gmfgen.impl.GMFGenPackageImpl#getResizeConstraints()
4544
	 * @generated
4725
	 * @generated
4545
	 */
4726
	 */
4546
	int RESIZE_CONSTRAINTS = 44;
4727
	int RESIZE_CONSTRAINTS = 45;
4547
4728
4548
	/**
4729
	/**
4549
	 * The feature id for the '<em><b>Resize Handles</b></em>' attribute.
4730
	 * The feature id for the '<em><b>Resize Handles</b></em>' attribute.
Lines 4580-4586 Link Here
4580
	 * @see org.eclipse.gmf.codegen.gmfgen.impl.GMFGenPackageImpl#getDefaultSizeAttributes()
4761
	 * @see org.eclipse.gmf.codegen.gmfgen.impl.GMFGenPackageImpl#getDefaultSizeAttributes()
4581
	 * @generated
4762
	 * @generated
4582
	 */
4763
	 */
4583
	int DEFAULT_SIZE_ATTRIBUTES = 45;
4764
	int DEFAULT_SIZE_ATTRIBUTES = 46;
4584
4765
4585
	/**
4766
	/**
4586
	 * The feature id for the '<em><b>Width</b></em>' attribute.
4767
	 * The feature id for the '<em><b>Width</b></em>' attribute.
Lines 4617-4623 Link Here
4617
	 * @see org.eclipse.gmf.codegen.gmfgen.impl.GMFGenPackageImpl#getLabelOffsetAttributes()
4798
	 * @see org.eclipse.gmf.codegen.gmfgen.impl.GMFGenPackageImpl#getLabelOffsetAttributes()
4618
	 * @generated
4799
	 * @generated
4619
	 */
4800
	 */
4620
	int LABEL_OFFSET_ATTRIBUTES = 46;
4801
	int LABEL_OFFSET_ATTRIBUTES = 47;
4621
4802
4622
	/**
4803
	/**
4623
	 * The feature id for the '<em><b>X</b></em>' attribute.
4804
	 * The feature id for the '<em><b>X</b></em>' attribute.
Lines 4690-4696 Link Here
4690
	 * @see org.eclipse.gmf.codegen.gmfgen.impl.GMFGenPackageImpl#getFigureViewmap()
4871
	 * @see org.eclipse.gmf.codegen.gmfgen.impl.GMFGenPackageImpl#getFigureViewmap()
4691
	 * @generated
4872
	 * @generated
4692
	 */
4873
	 */
4693
	int FIGURE_VIEWMAP = 48;
4874
	int FIGURE_VIEWMAP = 49;
4694
4875
4695
	/**
4876
	/**
4696
	 * The feature id for the '<em><b>Attributes</b></em>' containment reference list.
4877
	 * The feature id for the '<em><b>Attributes</b></em>' containment reference list.
Lines 4745-4751 Link Here
4745
	 * @see org.eclipse.gmf.codegen.gmfgen.impl.GMFGenPackageImpl#getSnippetViewmap()
4926
	 * @see org.eclipse.gmf.codegen.gmfgen.impl.GMFGenPackageImpl#getSnippetViewmap()
4746
	 * @generated
4927
	 * @generated
4747
	 */
4928
	 */
4748
	int SNIPPET_VIEWMAP = 49;
4929
	int SNIPPET_VIEWMAP = 50;
4749
4930
4750
	/**
4931
	/**
4751
	 * The feature id for the '<em><b>Attributes</b></em>' containment reference list.
4932
	 * The feature id for the '<em><b>Attributes</b></em>' containment reference list.
Lines 4800-4806 Link Here
4800
	 * @see org.eclipse.gmf.codegen.gmfgen.impl.GMFGenPackageImpl#getInnerClassViewmap()
4981
	 * @see org.eclipse.gmf.codegen.gmfgen.impl.GMFGenPackageImpl#getInnerClassViewmap()
4801
	 * @generated
4982
	 * @generated
4802
	 */
4983
	 */
4803
	int INNER_CLASS_VIEWMAP = 50;
4984
	int INNER_CLASS_VIEWMAP = 51;
4804
4985
4805
	/**
4986
	/**
4806
	 * The feature id for the '<em><b>Attributes</b></em>' containment reference list.
4987
	 * The feature id for the '<em><b>Attributes</b></em>' containment reference list.
Lines 4864-4870 Link Here
4864
	 * @see org.eclipse.gmf.codegen.gmfgen.impl.GMFGenPackageImpl#getParentAssignedViewmap()
5045
	 * @see org.eclipse.gmf.codegen.gmfgen.impl.GMFGenPackageImpl#getParentAssignedViewmap()
4865
	 * @generated
5046
	 * @generated
4866
	 */
5047
	 */
4867
	int PARENT_ASSIGNED_VIEWMAP = 51;
5048
	int PARENT_ASSIGNED_VIEWMAP = 52;
4868
5049
4869
	/**
5050
	/**
4870
	 * The feature id for the '<em><b>Attributes</b></em>' containment reference list.
5051
	 * The feature id for the '<em><b>Attributes</b></em>' containment reference list.
Lines 4937-4943 Link Here
4937
	 * @see org.eclipse.gmf.codegen.gmfgen.impl.GMFGenPackageImpl#getPalette()
5118
	 * @see org.eclipse.gmf.codegen.gmfgen.impl.GMFGenPackageImpl#getPalette()
4938
	 * @generated
5119
	 * @generated
4939
	 */
5120
	 */
4940
	int PALETTE = 54;
5121
	int PALETTE = 55;
4941
5122
4942
	/**
5123
	/**
4943
	 * The meta object id for the '{@link org.eclipse.gmf.codegen.gmfgen.impl.EntryBaseImpl <em>Entry Base</em>}' class.
5124
	 * The meta object id for the '{@link org.eclipse.gmf.codegen.gmfgen.impl.EntryBaseImpl <em>Entry Base</em>}' class.
Lines 4947-4953 Link Here
4947
	 * @see org.eclipse.gmf.codegen.gmfgen.impl.GMFGenPackageImpl#getEntryBase()
5128
	 * @see org.eclipse.gmf.codegen.gmfgen.impl.GMFGenPackageImpl#getEntryBase()
4948
	 * @generated
5129
	 * @generated
4949
	 */
5130
	 */
4950
	int ENTRY_BASE = 55;
5131
	int ENTRY_BASE = 56;
4951
5132
4952
	/**
5133
	/**
4953
	 * The meta object id for the '{@link org.eclipse.gmf.codegen.gmfgen.impl.ToolEntryImpl <em>Tool Entry</em>}' class.
5134
	 * The meta object id for the '{@link org.eclipse.gmf.codegen.gmfgen.impl.ToolEntryImpl <em>Tool Entry</em>}' class.
Lines 4957-4963 Link Here
4957
	 * @see org.eclipse.gmf.codegen.gmfgen.impl.GMFGenPackageImpl#getToolEntry()
5138
	 * @see org.eclipse.gmf.codegen.gmfgen.impl.GMFGenPackageImpl#getToolEntry()
4958
	 * @generated
5139
	 * @generated
4959
	 */
5140
	 */
4960
	int TOOL_ENTRY = 56;
5141
	int TOOL_ENTRY = 57;
4961
5142
4962
	/**
5143
	/**
4963
	 * The meta object id for the '{@link org.eclipse.gmf.codegen.gmfgen.impl.ToolGroupImpl <em>Tool Group</em>}' class.
5144
	 * The meta object id for the '{@link org.eclipse.gmf.codegen.gmfgen.impl.ToolGroupImpl <em>Tool Group</em>}' class.
Lines 4967-4973 Link Here
4967
	 * @see org.eclipse.gmf.codegen.gmfgen.impl.GMFGenPackageImpl#getToolGroup()
5148
	 * @see org.eclipse.gmf.codegen.gmfgen.impl.GMFGenPackageImpl#getToolGroup()
4968
	 * @generated
5149
	 * @generated
4969
	 */
5150
	 */
4970
	int TOOL_GROUP = 59;
5151
	int TOOL_GROUP = 60;
4971
5152
4972
	/**
5153
	/**
4973
	 * The meta object id for the '{@link org.eclipse.gmf.codegen.gmfgen.impl.ValueExpressionImpl <em>Value Expression</em>}' class.
5154
	 * The meta object id for the '{@link org.eclipse.gmf.codegen.gmfgen.impl.ValueExpressionImpl <em>Value Expression</em>}' class.
Lines 4977-4983 Link Here
4977
	 * @see org.eclipse.gmf.codegen.gmfgen.impl.GMFGenPackageImpl#getValueExpression()
5158
	 * @see org.eclipse.gmf.codegen.gmfgen.impl.GMFGenPackageImpl#getValueExpression()
4978
	 * @generated
5159
	 * @generated
4979
	 */
5160
	 */
4980
	int VALUE_EXPRESSION = 52;
5161
	int VALUE_EXPRESSION = 53;
4981
5162
4982
	/**
5163
	/**
4983
	 * The feature id for the '<em><b>Body</b></em>' attribute.
5164
	 * The feature id for the '<em><b>Body</b></em>' attribute.
Lines 5023-5029 Link Here
5023
	 * @see org.eclipse.gmf.codegen.gmfgen.impl.GMFGenPackageImpl#getGenConstraint()
5204
	 * @see org.eclipse.gmf.codegen.gmfgen.impl.GMFGenPackageImpl#getGenConstraint()
5024
	 * @generated
5205
	 * @generated
5025
	 */
5206
	 */
5026
	int GEN_CONSTRAINT = 53;
5207
	int GEN_CONSTRAINT = 54;
5027
5208
5028
	/**
5209
	/**
5029
	 * The feature id for the '<em><b>Body</b></em>' attribute.
5210
	 * The feature id for the '<em><b>Body</b></em>' attribute.
Lines 5285-5291 Link Here
5285
	 * @see org.eclipse.gmf.codegen.gmfgen.impl.GMFGenPackageImpl#getToolGroupItem()
5466
	 * @see org.eclipse.gmf.codegen.gmfgen.impl.GMFGenPackageImpl#getToolGroupItem()
5286
	 * @generated
5467
	 * @generated
5287
	 */
5468
	 */
5288
	int TOOL_GROUP_ITEM = 57;
5469
	int TOOL_GROUP_ITEM = 58;
5289
5470
5290
	/**
5471
	/**
5291
	 * The number of structural features of the '<em>Tool Group Item</em>' class.
5472
	 * The number of structural features of the '<em>Tool Group Item</em>' class.
Lines 5304-5310 Link Here
5304
	 * @see org.eclipse.gmf.codegen.gmfgen.impl.GMFGenPackageImpl#getSeparator()
5485
	 * @see org.eclipse.gmf.codegen.gmfgen.impl.GMFGenPackageImpl#getSeparator()
5305
	 * @generated
5486
	 * @generated
5306
	 */
5487
	 */
5307
	int SEPARATOR = 58;
5488
	int SEPARATOR = 59;
5308
5489
5309
	/**
5490
	/**
5310
	 * The number of structural features of the '<em>Separator</em>' class.
5491
	 * The number of structural features of the '<em>Separator</em>' class.
Lines 5413-5419 Link Here
5413
	 * @see org.eclipse.gmf.codegen.gmfgen.impl.GMFGenPackageImpl#getGenElementInitializer()
5594
	 * @see org.eclipse.gmf.codegen.gmfgen.impl.GMFGenPackageImpl#getGenElementInitializer()
5414
	 * @generated
5595
	 * @generated
5415
	 */
5596
	 */
5416
	int GEN_ELEMENT_INITIALIZER = 60;
5597
	int GEN_ELEMENT_INITIALIZER = 61;
5417
5598
5418
	/**
5599
	/**
5419
	 * The feature id for the '<em><b>Type Model Facet</b></em>' container reference.
5600
	 * The feature id for the '<em><b>Type Model Facet</b></em>' container reference.
Lines 5441-5447 Link Here
5441
	 * @see org.eclipse.gmf.codegen.gmfgen.impl.GMFGenPackageImpl#getGenFeatureSeqInitializer()
5622
	 * @see org.eclipse.gmf.codegen.gmfgen.impl.GMFGenPackageImpl#getGenFeatureSeqInitializer()
5442
	 * @generated
5623
	 * @generated
5443
	 */
5624
	 */
5444
	int GEN_FEATURE_SEQ_INITIALIZER = 61;
5625
	int GEN_FEATURE_SEQ_INITIALIZER = 62;
5445
5626
5446
	/**
5627
	/**
5447
	 * The feature id for the '<em><b>Type Model Facet</b></em>' container reference.
5628
	 * The feature id for the '<em><b>Type Model Facet</b></em>' container reference.
Lines 5478-5484 Link Here
5478
	 * @see org.eclipse.gmf.codegen.gmfgen.impl.GMFGenPackageImpl#getGenFeatureValueSpec()
5659
	 * @see org.eclipse.gmf.codegen.gmfgen.impl.GMFGenPackageImpl#getGenFeatureValueSpec()
5479
	 * @generated
5660
	 * @generated
5480
	 */
5661
	 */
5481
	int GEN_FEATURE_VALUE_SPEC = 62;
5662
	int GEN_FEATURE_VALUE_SPEC = 63;
5482
5663
5483
	/**
5664
	/**
5484
	 * The feature id for the '<em><b>Body</b></em>' attribute.
5665
	 * The feature id for the '<em><b>Body</b></em>' attribute.
Lines 5542-5548 Link Here
5542
	 * @see org.eclipse.gmf.codegen.gmfgen.impl.GMFGenPackageImpl#getGenLinkConstraints()
5723
	 * @see org.eclipse.gmf.codegen.gmfgen.impl.GMFGenPackageImpl#getGenLinkConstraints()
5543
	 * @generated
5724
	 * @generated
5544
	 */
5725
	 */
5545
	int GEN_LINK_CONSTRAINTS = 63;
5726
	int GEN_LINK_CONSTRAINTS = 64;
5546
5727
5547
	/**
5728
	/**
5548
	 * The feature id for the '<em><b>Link</b></em>' container reference.
5729
	 * The feature id for the '<em><b>Link</b></em>' container reference.
Lines 5588-5594 Link Here
5588
	 * @see org.eclipse.gmf.codegen.gmfgen.impl.GMFGenPackageImpl#getGenRuleContainerBase()
5769
	 * @see org.eclipse.gmf.codegen.gmfgen.impl.GMFGenPackageImpl#getGenRuleContainerBase()
5589
	 * @generated
5770
	 * @generated
5590
	 */
5771
	 */
5591
	int GEN_RULE_CONTAINER_BASE = 64;
5772
	int GEN_RULE_CONTAINER_BASE = 65;
5592
5773
5593
	/**
5774
	/**
5594
	 * The feature id for the '<em><b>Editor</b></em>' reference.
5775
	 * The feature id for the '<em><b>Editor</b></em>' reference.
Lines 5616-5622 Link Here
5616
	 * @see org.eclipse.gmf.codegen.gmfgen.impl.GMFGenPackageImpl#getGenAuditContainer()
5797
	 * @see org.eclipse.gmf.codegen.gmfgen.impl.GMFGenPackageImpl#getGenAuditContainer()
5617
	 * @generated
5798
	 * @generated
5618
	 */
5799
	 */
5619
	int GEN_AUDIT_CONTAINER = 65;
5800
	int GEN_AUDIT_CONTAINER = 66;
5620
5801
5621
	/**
5802
	/**
5622
	 * The feature id for the '<em><b>Editor</b></em>' reference.
5803
	 * The feature id for the '<em><b>Editor</b></em>' reference.
Lines 5698-5704 Link Here
5698
	 * @see org.eclipse.gmf.codegen.gmfgen.impl.GMFGenPackageImpl#getGenRuleBase()
5879
	 * @see org.eclipse.gmf.codegen.gmfgen.impl.GMFGenPackageImpl#getGenRuleBase()
5699
	 * @generated
5880
	 * @generated
5700
	 */
5881
	 */
5701
	int GEN_RULE_BASE = 66;
5882
	int GEN_RULE_BASE = 67;
5702
5883
5703
	/**
5884
	/**
5704
	 * The feature id for the '<em><b>Name</b></em>' attribute.
5885
	 * The feature id for the '<em><b>Name</b></em>' attribute.
Lines 5735-5741 Link Here
5735
	 * @see org.eclipse.gmf.codegen.gmfgen.impl.GMFGenPackageImpl#getGenAuditRule()
5916
	 * @see org.eclipse.gmf.codegen.gmfgen.impl.GMFGenPackageImpl#getGenAuditRule()
5736
	 * @generated
5917
	 * @generated
5737
	 */
5918
	 */
5738
	int GEN_AUDIT_RULE = 67;
5919
	int GEN_AUDIT_RULE = 68;
5739
5920
5740
	/**
5921
	/**
5741
	 * The feature id for the '<em><b>Name</b></em>' attribute.
5922
	 * The feature id for the '<em><b>Name</b></em>' attribute.
Lines 5835-5841 Link Here
5835
	 * @see org.eclipse.gmf.codegen.gmfgen.impl.GMFGenPackageImpl#getGenRuleTarget()
6016
	 * @see org.eclipse.gmf.codegen.gmfgen.impl.GMFGenPackageImpl#getGenRuleTarget()
5836
	 * @generated
6017
	 * @generated
5837
	 */
6018
	 */
5838
	int GEN_RULE_TARGET = 68;
6019
	int GEN_RULE_TARGET = 69;
5839
6020
5840
	/**
6021
	/**
5841
	 * The number of structural features of the '<em>Gen Rule Target</em>' class.
6022
	 * The number of structural features of the '<em>Gen Rule Target</em>' class.
Lines 5854-5860 Link Here
5854
	 * @see org.eclipse.gmf.codegen.gmfgen.impl.GMFGenPackageImpl#getGenAuditable()
6035
	 * @see org.eclipse.gmf.codegen.gmfgen.impl.GMFGenPackageImpl#getGenAuditable()
5855
	 * @generated
6036
	 * @generated
5856
	 */
6037
	 */
5857
	int GEN_AUDITABLE = 76;
6038
	int GEN_AUDITABLE = 77;
5858
6039
5859
	/**
6040
	/**
5860
	 * The number of structural features of the '<em>Gen Auditable</em>' class.
6041
	 * The number of structural features of the '<em>Gen Auditable</em>' class.
Lines 5873-5879 Link Here
5873
	 * @see org.eclipse.gmf.codegen.gmfgen.impl.GMFGenPackageImpl#getGenDomainElementTarget()
6054
	 * @see org.eclipse.gmf.codegen.gmfgen.impl.GMFGenPackageImpl#getGenDomainElementTarget()
5874
	 * @generated
6055
	 * @generated
5875
	 */
6056
	 */
5876
	int GEN_DOMAIN_ELEMENT_TARGET = 69;
6057
	int GEN_DOMAIN_ELEMENT_TARGET = 70;
5877
6058
5878
	/**
6059
	/**
5879
	 * The feature id for the '<em><b>Element</b></em>' reference.
6060
	 * The feature id for the '<em><b>Element</b></em>' reference.
Lines 5901-5907 Link Here
5901
	 * @see org.eclipse.gmf.codegen.gmfgen.impl.GMFGenPackageImpl#getGenDiagramElementTarget()
6082
	 * @see org.eclipse.gmf.codegen.gmfgen.impl.GMFGenPackageImpl#getGenDiagramElementTarget()
5902
	 * @generated
6083
	 * @generated
5903
	 */
6084
	 */
5904
	int GEN_DIAGRAM_ELEMENT_TARGET = 70;
6085
	int GEN_DIAGRAM_ELEMENT_TARGET = 71;
5905
6086
5906
	/**
6087
	/**
5907
	 * The feature id for the '<em><b>Element</b></em>' reference list.
6088
	 * The feature id for the '<em><b>Element</b></em>' reference list.
Lines 5929-5935 Link Here
5929
	 * @see org.eclipse.gmf.codegen.gmfgen.impl.GMFGenPackageImpl#getGenDomainAttributeTarget()
6110
	 * @see org.eclipse.gmf.codegen.gmfgen.impl.GMFGenPackageImpl#getGenDomainAttributeTarget()
5930
	 * @generated
6111
	 * @generated
5931
	 */
6112
	 */
5932
	int GEN_DOMAIN_ATTRIBUTE_TARGET = 71;
6113
	int GEN_DOMAIN_ATTRIBUTE_TARGET = 72;
5933
6114
5934
	/**
6115
	/**
5935
	 * The feature id for the '<em><b>Attribute</b></em>' reference.
6116
	 * The feature id for the '<em><b>Attribute</b></em>' reference.
Lines 5966-5972 Link Here
5966
	 * @see org.eclipse.gmf.codegen.gmfgen.impl.GMFGenPackageImpl#getGenNotationElementTarget()
6147
	 * @see org.eclipse.gmf.codegen.gmfgen.impl.GMFGenPackageImpl#getGenNotationElementTarget()
5967
	 * @generated
6148
	 * @generated
5968
	 */
6149
	 */
5969
	int GEN_NOTATION_ELEMENT_TARGET = 72;
6150
	int GEN_NOTATION_ELEMENT_TARGET = 73;
5970
6151
5971
	/**
6152
	/**
5972
	 * The feature id for the '<em><b>Element</b></em>' reference.
6153
	 * The feature id for the '<em><b>Element</b></em>' reference.
Lines 5994-6000 Link Here
5994
	 * @see org.eclipse.gmf.codegen.gmfgen.impl.GMFGenPackageImpl#getGenMetricContainer()
6175
	 * @see org.eclipse.gmf.codegen.gmfgen.impl.GMFGenPackageImpl#getGenMetricContainer()
5995
	 * @generated
6176
	 * @generated
5996
	 */
6177
	 */
5997
	int GEN_METRIC_CONTAINER = 73;
6178
	int GEN_METRIC_CONTAINER = 74;
5998
6179
5999
	/**
6180
	/**
6000
	 * The feature id for the '<em><b>Editor</b></em>' reference.
6181
	 * The feature id for the '<em><b>Editor</b></em>' reference.
Lines 6031-6037 Link Here
6031
	 * @see org.eclipse.gmf.codegen.gmfgen.impl.GMFGenPackageImpl#getGenMetricRule()
6212
	 * @see org.eclipse.gmf.codegen.gmfgen.impl.GMFGenPackageImpl#getGenMetricRule()
6032
	 * @generated
6213
	 * @generated
6033
	 */
6214
	 */
6034
	int GEN_METRIC_RULE = 74;
6215
	int GEN_METRIC_RULE = 75;
6035
6216
6036
	/**
6217
	/**
6037
	 * The feature id for the '<em><b>Name</b></em>' attribute.
6218
	 * The feature id for the '<em><b>Name</b></em>' attribute.
Lines 6122-6128 Link Here
6122
	 * @see org.eclipse.gmf.codegen.gmfgen.impl.GMFGenPackageImpl#getGenAuditedMetricTarget()
6303
	 * @see org.eclipse.gmf.codegen.gmfgen.impl.GMFGenPackageImpl#getGenAuditedMetricTarget()
6123
	 * @generated
6304
	 * @generated
6124
	 */
6305
	 */
6125
	int GEN_AUDITED_METRIC_TARGET = 75;
6306
	int GEN_AUDITED_METRIC_TARGET = 76;
6126
6307
6127
	/**
6308
	/**
6128
	 * The feature id for the '<em><b>Metric</b></em>' reference.
6309
	 * The feature id for the '<em><b>Metric</b></em>' reference.
Lines 6159-6165 Link Here
6159
	 * @see org.eclipse.gmf.codegen.gmfgen.impl.GMFGenPackageImpl#getGenMeasurable()
6340
	 * @see org.eclipse.gmf.codegen.gmfgen.impl.GMFGenPackageImpl#getGenMeasurable()
6160
	 * @generated
6341
	 * @generated
6161
	 */
6342
	 */
6162
	int GEN_MEASURABLE = 77;
6343
	int GEN_MEASURABLE = 78;
6163
6344
6164
	/**
6345
	/**
6165
	 * The number of structural features of the '<em>Gen Measurable</em>' class.
6346
	 * The number of structural features of the '<em>Gen Measurable</em>' class.
Lines 6178-6184 Link Here
6178
	 * @see org.eclipse.gmf.codegen.gmfgen.impl.GMFGenPackageImpl#getGenExpressionProviderContainer()
6359
	 * @see org.eclipse.gmf.codegen.gmfgen.impl.GMFGenPackageImpl#getGenExpressionProviderContainer()
6179
	 * @generated
6360
	 * @generated
6180
	 */
6361
	 */
6181
	int GEN_EXPRESSION_PROVIDER_CONTAINER = 78;
6362
	int GEN_EXPRESSION_PROVIDER_CONTAINER = 79;
6182
6363
6183
	/**
6364
	/**
6184
	 * The feature id for the '<em><b>Expressions Package Name</b></em>' attribute.
6365
	 * The feature id for the '<em><b>Expressions Package Name</b></em>' attribute.
Lines 6233-6239 Link Here
6233
	 * @see org.eclipse.gmf.codegen.gmfgen.impl.GMFGenPackageImpl#getGenExpressionProviderBase()
6414
	 * @see org.eclipse.gmf.codegen.gmfgen.impl.GMFGenPackageImpl#getGenExpressionProviderBase()
6234
	 * @generated
6415
	 * @generated
6235
	 */
6416
	 */
6236
	int GEN_EXPRESSION_PROVIDER_BASE = 79;
6417
	int GEN_EXPRESSION_PROVIDER_BASE = 80;
6237
6418
6238
	/**
6419
	/**
6239
	 * The feature id for the '<em><b>Expressions</b></em>' reference list.
6420
	 * The feature id for the '<em><b>Expressions</b></em>' reference list.
Lines 6270-6276 Link Here
6270
	 * @see org.eclipse.gmf.codegen.gmfgen.impl.GMFGenPackageImpl#getGenJavaExpressionProvider()
6451
	 * @see org.eclipse.gmf.codegen.gmfgen.impl.GMFGenPackageImpl#getGenJavaExpressionProvider()
6271
	 * @generated
6452
	 * @generated
6272
	 */
6453
	 */
6273
	int GEN_JAVA_EXPRESSION_PROVIDER = 80;
6454
	int GEN_JAVA_EXPRESSION_PROVIDER = 81;
6274
6455
6275
	/**
6456
	/**
6276
	 * The feature id for the '<em><b>Expressions</b></em>' reference list.
6457
	 * The feature id for the '<em><b>Expressions</b></em>' reference list.
Lines 6307-6313 Link Here
6307
	 * @see org.eclipse.gmf.codegen.gmfgen.impl.GMFGenPackageImpl#getGenExpressionInterpreter()
6488
	 * @see org.eclipse.gmf.codegen.gmfgen.impl.GMFGenPackageImpl#getGenExpressionInterpreter()
6308
	 * @generated
6489
	 * @generated
6309
	 */
6490
	 */
6310
	int GEN_EXPRESSION_INTERPRETER = 81;
6491
	int GEN_EXPRESSION_INTERPRETER = 82;
6311
6492
6312
	/**
6493
	/**
6313
	 * The feature id for the '<em><b>Expressions</b></em>' reference list.
6494
	 * The feature id for the '<em><b>Expressions</b></em>' reference list.
Lines 6371-6377 Link Here
6371
	 * @see org.eclipse.gmf.codegen.gmfgen.impl.GMFGenPackageImpl#getProviderPriority()
6552
	 * @see org.eclipse.gmf.codegen.gmfgen.impl.GMFGenPackageImpl#getProviderPriority()
6372
	 * @generated
6553
	 * @generated
6373
	 */
6554
	 */
6374
	int PROVIDER_PRIORITY = 82;
6555
	int PROVIDER_PRIORITY = 83;
6375
6556
6376
	/**
6557
	/**
6377
	 * The meta object id for the '{@link org.eclipse.gmf.codegen.gmfgen.LinkLabelAlignment <em>Link Label Alignment</em>}' enum.
6558
	 * The meta object id for the '{@link org.eclipse.gmf.codegen.gmfgen.LinkLabelAlignment <em>Link Label Alignment</em>}' enum.
Lines 6381-6387 Link Here
6381
	 * @see org.eclipse.gmf.codegen.gmfgen.impl.GMFGenPackageImpl#getLinkLabelAlignment()
6562
	 * @see org.eclipse.gmf.codegen.gmfgen.impl.GMFGenPackageImpl#getLinkLabelAlignment()
6382
	 * @generated
6563
	 * @generated
6383
	 */
6564
	 */
6384
	int LINK_LABEL_ALIGNMENT = 83;
6565
	int LINK_LABEL_ALIGNMENT = 84;
6385
6566
6386
	/**
6567
	/**
6387
	 * The meta object id for the '{@link org.eclipse.gmf.codegen.gmfgen.ViewmapLayoutType <em>Viewmap Layout Type</em>}' enum.
6568
	 * The meta object id for the '{@link org.eclipse.gmf.codegen.gmfgen.ViewmapLayoutType <em>Viewmap Layout Type</em>}' enum.
Lines 6391-6397 Link Here
6391
	 * @see org.eclipse.gmf.codegen.gmfgen.impl.GMFGenPackageImpl#getViewmapLayoutType()
6572
	 * @see org.eclipse.gmf.codegen.gmfgen.impl.GMFGenPackageImpl#getViewmapLayoutType()
6392
	 * @generated
6573
	 * @generated
6393
	 */
6574
	 */
6394
	int VIEWMAP_LAYOUT_TYPE = 84;
6575
	int VIEWMAP_LAYOUT_TYPE = 85;
6395
6576
6396
	/**
6577
	/**
6397
	 * The meta object id for the '{@link org.eclipse.gmf.codegen.gmfgen.GenSeverity <em>Gen Severity</em>}' enum.
6578
	 * The meta object id for the '{@link org.eclipse.gmf.codegen.gmfgen.GenSeverity <em>Gen Severity</em>}' enum.
Lines 6401-6407 Link Here
6401
	 * @see org.eclipse.gmf.codegen.gmfgen.impl.GMFGenPackageImpl#getGenSeverity()
6582
	 * @see org.eclipse.gmf.codegen.gmfgen.impl.GMFGenPackageImpl#getGenSeverity()
6402
	 * @generated
6583
	 * @generated
6403
	 */
6584
	 */
6404
	int GEN_SEVERITY = 85;
6585
	int GEN_SEVERITY = 86;
6405
6586
6406
	/**
6587
	/**
6407
	 * The meta object id for the '{@link org.eclipse.gmf.codegen.gmfgen.GenLanguage <em>Gen Language</em>}' enum.
6588
	 * The meta object id for the '{@link org.eclipse.gmf.codegen.gmfgen.GenLanguage <em>Gen Language</em>}' enum.
Lines 6411-6417 Link Here
6411
	 * @see org.eclipse.gmf.codegen.gmfgen.impl.GMFGenPackageImpl#getGenLanguage()
6592
	 * @see org.eclipse.gmf.codegen.gmfgen.impl.GMFGenPackageImpl#getGenLanguage()
6412
	 * @generated
6593
	 * @generated
6413
	 */
6594
	 */
6414
	int GEN_LANGUAGE = 86;
6595
	int GEN_LANGUAGE = 87;
6415
6596
6416
6597
6417
	/**
6598
	/**
Lines 8032-8037 Link Here
8032
	EReference getGenChildNode_Containers();
8213
	EReference getGenChildNode_Containers();
8033
8214
8034
	/**
8215
	/**
8216
	 * Returns the meta object for class '{@link org.eclipse.gmf.codegen.gmfgen.GenChildSideAffixedNode <em>Gen Child Side Affixed Node</em>}'.
8217
	 * <!-- begin-user-doc -->
8218
	 * <!-- end-user-doc -->
8219
	 * @return the meta object for class '<em>Gen Child Side Affixed Node</em>'.
8220
	 * @see org.eclipse.gmf.codegen.gmfgen.GenChildSideAffixedNode
8221
	 * @generated
8222
	 */
8223
	EClass getGenChildSideAffixedNode();
8224
8225
	/**
8226
	 * Returns the meta object for the attribute '{@link org.eclipse.gmf.codegen.gmfgen.GenChildSideAffixedNode#getPreferredSide <em>Preferred Side</em>}'.
8227
	 * <!-- begin-user-doc -->
8228
	 * <!-- end-user-doc -->
8229
	 * @return the meta object for the attribute '<em>Preferred Side</em>'.
8230
	 * @see org.eclipse.gmf.codegen.gmfgen.GenChildSideAffixedNode#getPreferredSide()
8231
	 * @see #getGenChildSideAffixedNode()
8232
	 * @generated
8233
	 */
8234
	EAttribute getGenChildSideAffixedNode_PreferredSide();
8235
8236
	/**
8035
	 * Returns the meta object for class '{@link org.eclipse.gmf.codegen.gmfgen.GenChildLabelNode <em>Gen Child Label Node</em>}'.
8237
	 * Returns the meta object for class '{@link org.eclipse.gmf.codegen.gmfgen.GenChildLabelNode <em>Gen Child Label Node</em>}'.
8036
	 * <!-- begin-user-doc -->
8238
	 * <!-- begin-user-doc -->
8037
	 * <!-- end-user-doc -->
8239
	 * <!-- end-user-doc -->
(-)src/org/eclipse/gmf/codegen/gmfgen/GMFGenFactory.java (+9 lines)
Lines 89-94 Link Here
89
	GenChildNode createGenChildNode();
89
	GenChildNode createGenChildNode();
90
90
91
	/**
91
	/**
92
	 * Returns a new object of class '<em>Gen Child Side Affixed Node</em>'.
93
	 * <!-- begin-user-doc -->
94
	 * <!-- end-user-doc -->
95
	 * @return a new object of class '<em>Gen Child Side Affixed Node</em>'.
96
	 * @generated
97
	 */
98
	GenChildSideAffixedNode createGenChildSideAffixedNode();
99
100
	/**
92
	 * Returns a new object of class '<em>Gen Child Label Node</em>'.
101
	 * Returns a new object of class '<em>Gen Child Label Node</em>'.
93
	 * <!-- begin-user-doc -->
102
	 * <!-- begin-user-doc -->
94
	 * <!-- end-user-doc -->
103
	 * <!-- end-user-doc -->
(-)templates/parts/NodeEditPart.javajet (-2 / +95 lines)
Lines 12-19 Link Here
12
	private final List myExternalLabels = new LinkedList();
12
	private final List myExternalLabels = new LinkedList();
13
	private final List myPinnedCompartments = new LinkedList();
13
	private final List myPinnedCompartments = new LinkedList();
14
	private final List myFloatingCompartments = new LinkedList();
14
	private final List myFloatingCompartments = new LinkedList();
15
	private final List mySideAffixedChildren = new LinkedList();
15
	private GenNodeLabel myPrimaryLabel;
16
	private GenNodeLabel myPrimaryLabel;
16
	private boolean myHasChildrenInListCompartments = false;
17
	private boolean myHasChildrenInListCompartments = false;
18
	private final boolean myIsSideAffixed;
19
	private final boolean myHasSideAffixedChildren;
17
	
20
	
18
	public NodeEditPartHelper(GenNode genNode){
21
	public NodeEditPartHelper(GenNode genNode){
19
		myPrimaryLabel = null;
22
		myPrimaryLabel = null;
Lines 40-45 Link Here
40
			
43
			
41
			myHasChildrenInListCompartments |= next.isListLayout() && !next.getChildNodes().isEmpty();
44
			myHasChildrenInListCompartments |= next.isListLayout() && !next.getChildNodes().isEmpty();
42
		}
45
		}
46
		
47
		for (Iterator childNodes = genNode.getChildNodes().iterator(); childNodes.hasNext();){
48
			GenChildNode next = (GenChildNode)childNodes.next();
49
			if (next instanceof GenChildSideAffixedNode){
50
				mySideAffixedChildren.add(next);
51
			}
52
		}
53
		
54
		myIsSideAffixed = genNode instanceof GenChildSideAffixedNode;
55
		myHasSideAffixedChildren = !mySideAffixedChildren.isEmpty();
56
	}
57
	
58
	public boolean isSideAffixed(){
59
		return myIsSideAffixed;
60
	}
61
	
62
	public boolean hasSideAffixedChildren(){
63
		return myHasSideAffixedChildren;
64
	}
65
	
66
	public String getEditPartSuperClassFQN(){
67
		if (isSideAffixed()){
68
			return hasSideAffixedChildren() ? 
69
				"org.eclipse.gmf.runtime.diagram.ui.editparts.BorderedBorderItemEditPart" :
70
				"org.eclipse.gmf.runtime.diagram.ui.editparts.AbstractBorderItemEditPart";
71
		} else {
72
			return hasSideAffixedChildren() ? 
73
				"org.eclipse.gmf.runtime.diagram.ui.editparts.AbstractBorderedShapeEditPart" : 
74
				"org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeNodeEditPart";
75
		}
43
	}
76
	}
44
	
77
	
45
	public boolean hasChildrenInListCompartments(){
78
	public boolean hasChildrenInListCompartments(){
Lines 77-82 Link Here
77
	public Iterator getPinnedCompartments(){
110
	public Iterator getPinnedCompartments(){
78
		return myPinnedCompartments.iterator();
111
		return myPinnedCompartments.iterator();
79
	}	
112
	}	
113
	
114
	public Iterator getSideAffixedChildren(){
115
		return mySideAffixedChildren.iterator();
116
	}
80
}
117
}
81
final NodeEditPartHelper myHelper = new NodeEditPartHelper(genNode);
118
final NodeEditPartHelper myHelper = new NodeEditPartHelper(genNode);
82
%>
119
%>
Lines 100-106 Link Here
100
/**
137
/**
101
 * @generated
138
 * @generated
102
 */
139
 */
103
public class <%=genNode.getEditPartClassName()%> extends <%=importManager.getImportedName("org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeNodeEditPart")%> {
140
public class <%=genNode.getEditPartClassName()%> extends <%=importManager.getImportedName(myHelper.getEditPartSuperClassFQN())%> {
104
<%{	GenCommonBase genCommonBase = genNode;%>
141
<%{	GenCommonBase genCommonBase = genNode;%>
105
<%@ include file="visualID.jetinc"%>
142
<%@ include file="visualID.jetinc"%>
106
<%}%>
143
<%}%>
Lines 167-172 Link Here
167
		);
204
		);
168
<%}%>
205
<%}%>
169
		super.createDefaultEditPolicies();
206
		super.createDefaultEditPolicies();
207
<%if (myHelper.isSideAffixed()){%>
208
		installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, getPrimaryDragEditPolicy());
209
<%}%>		
170
		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new <%=importManager.getImportedName(genNode.getItemSemanticEditPolicyQualifiedClassName())%>());
210
		installEditPolicy(EditPolicyRoles.SEMANTIC_ROLE, new <%=importManager.getImportedName(genNode.getItemSemanticEditPolicyQualifiedClassName())%>());
171
		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new <%=importManager.getImportedName(genNode.getGraphicalNodeEditPolicyQualifiedClassName())%>());
211
		installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new <%=importManager.getImportedName(genNode.getGraphicalNodeEditPolicyQualifiedClassName())%>());
172
<%if (!genNode.getChildNodes().isEmpty()) {%>
212
<%if (!genNode.getChildNodes().isEmpty()) {%>
Lines 273-278 Link Here
273
			}
313
			}
274
<%		}%>
314
<%		}%>
275
315
316
<%if (myHelper.hasSideAffixedChildren()) {%>
317
			protected EditPolicy createChildEditPolicy(<%=importManager.getImportedName("org.eclipse.gef.EditPart")%> child) {
318
				if (child instanceof <%=importManager.getImportedName("org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart")%>) {
319
					return new <%=importManager.getImportedName("org.eclipse.gmf.runtime.diagram.ui.editpolicies.BorderItemSelectionEditPolicy")%>();
320
				}
321
				return super.createChildEditPolicy(child);
322
			}
323
<%}%>
324
276
			protected <%=importManager.getImportedName("org.eclipse.gef.commands.Command")%> createAddCommand(<%=fqnEditPart%> child, <%=fqnEditPart%> after) {
325
			protected <%=importManager.getImportedName("org.eclipse.gef.commands.Command")%> createAddCommand(<%=fqnEditPart%> child, <%=fqnEditPart%> after) {
277
				return null;
326
				return null;
278
			}
327
			}
Lines 422-427 Link Here
422
		}	
471
		}	
423
<%	
472
<%	
424
} // for pinned compartments
473
} // for pinned compartments
474
475
for (Iterator it = myHelper.getSideAffixedChildren(); it.hasNext(); ) {
476
	GenChildNode next = (GenChildNode) it.next();
477
	String sideAffixedEidtPartFQN = importManager.getImportedName(next.getEditPartQualifiedClassName());
478
%>
479
		if (childEditPart instanceof <%=sideAffixedEidtPartFQN%>) {
480
			addBorderItem(getBorderedFigure().getBorderItemContainer(), (<%=sideAffixedEidtPartFQN%>) childEditPart);
481
			return true;
482
		}
483
<%	
484
} // for side affixed
425
%>
485
%>
426
		return false;
486
		return false;
427
	}
487
	}
Lines 444-449 Link Here
444
		}	
504
		}	
445
<%
505
<%
446
} // for pinned compartments
506
} // for pinned compartments
507
508
for (Iterator it = myHelper.getSideAffixedChildren(); it.hasNext(); ) {
509
	GenChildNode next = (GenChildNode) it.next();
510
	String sideAffixedEidtPartFQN = importManager.getImportedName(next.getEditPartQualifiedClassName());
511
%>
512
		if (childEditPart instanceof <%=sideAffixedEidtPartFQN%>) {
513
			getBorderedFigure().getBorderItemContainer().remove(((<%=sideAffixedEidtPartFQN%>)childEditPart).getFigure());
514
			return true;
515
		}
516
<%	
517
} // for side affixed
447
%>
518
%>
448
		return false;
519
		return false;
449
	}
520
	}
Lines 464-470 Link Here
464
	height = defSizeAttrs.getHeight();
535
	height = defSizeAttrs.getHeight();
465
}
536
}
466
%>
537
%>
467
		return new <%=importManager.getImportedName("org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure")%>(getMapMode().DPtoLP(<%=width%>), getMapMode().DPtoLP(<%=height%>));
538
		<%=importManager.getImportedName("org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure")%> result = new <%=importManager.getImportedName("org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure")%>(getMapMode().DPtoLP(<%=width%>), getMapMode().DPtoLP(<%=height%>));
539
<%
540
if (myHelper.isSideAffixed()){		
541
%>
542
		//FIXME: workaround for #154536
543
		result.getBounds().setSize(result.getPreferredSize());
544
<%
545
}
546
%>		
547
		return result;
468
	}
548
	}
469
<%if (genNode.getViewmap().find(ResizeConstraints.class) != null) {
549
<%if (genNode.getViewmap().find(ResizeConstraints.class) != null) {
470
	final ResizeConstraints rc = (ResizeConstraints) genNode.getViewmap().find(ResizeConstraints.class);
550
	final ResizeConstraints rc = (ResizeConstraints) genNode.getViewmap().find(ResizeConstraints.class);
Lines 484-489 Link Here
484
		return ep;
564
		return ep;
485
	}
565
	}
486
<%}%>
566
<%}%>
567
568
<%if (myHelper.hasSideAffixedChildren()) {%>	 
569
	/**
570
	 * Creates figure for this edit part.
571
	 * 
572
	 * Body of this method does not depend on settings in generation model
573
	 * so you may safely remove <i>generated</i> tag and modify it.
574
	 * 
575
	 * @generated
576
	 */
577
	protected <%=importManager.getImportedName("org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure")%> createMainFigure() {
578
<%} else {%>
487
	/**
579
	/**
488
	 * Creates figure for this edit part.
580
	 * Creates figure for this edit part.
489
	 * 
581
	 * 
Lines 493-498 Link Here
493
	 * @generated
585
	 * @generated
494
	 */
586
	 */
495
	protected <%=importManager.getImportedName("org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure")%> createNodeFigure() {
587
	protected <%=importManager.getImportedName("org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure")%> createNodeFigure() {
588
<%}%>
496
		<%=importManager.getImportedName("org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure")%> figure = createNodePlate();
589
		<%=importManager.getImportedName("org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure")%> figure = createNodePlate();
497
		figure.setLayoutManager(new StackLayout());
590
		figure.setLayoutManager(new StackLayout());
498
		IFigure shape = createNodeShape();
591
		IFigure shape = createNodeShape();
(-)src/org/eclipse/gmf/codegen/gmfgen/GenChildSideAffixedNode.java (+54 lines)
Added Link Here
1
/**
2
 * <copyright>
3
 * </copyright>
4
 *
5
 * $Id$
6
 */
7
package org.eclipse.gmf.codegen.gmfgen;
8
9
10
/**
11
 * <!-- begin-user-doc -->
12
 * A representation of the model object '<em><b>Gen Child Side Affixed Node</b></em>'.
13
 * <!-- end-user-doc -->
14
 *
15
 * <p>
16
 * The following features are supported:
17
 * <ul>
18
 *   <li>{@link org.eclipse.gmf.codegen.gmfgen.GenChildSideAffixedNode#getPreferredSide <em>Preferred Side</em>}</li>
19
 * </ul>
20
 * </p>
21
 *
22
 * @see org.eclipse.gmf.codegen.gmfgen.GMFGenPackage#getGenChildSideAffixedNode()
23
 * @model
24
 * @generated
25
 */
26
public interface GenChildSideAffixedNode extends GenChildNode {
27
	/**
28
	 * Returns the value of the '<em><b>Preferred Side</b></em>' attribute.
29
	 * The default value is <code>"0"</code>.
30
	 * <!-- begin-user-doc -->
31
	 * <p>
32
	 * If the meaning of the '<em>Preferred Side</em>' attribute isn't clear,
33
	 * there really should be more of a description here...
34
	 * </p>
35
	 * <!-- end-user-doc -->
36
	 * @return the value of the '<em>Preferred Side</em>' attribute.
37
	 * @see #setPreferredSide(int)
38
	 * @see org.eclipse.gmf.codegen.gmfgen.GMFGenPackage#getGenChildSideAffixedNode_PreferredSide()
39
	 * @model default="0"
40
	 * @generated
41
	 */
42
	int getPreferredSide();
43
44
	/**
45
	 * Sets the value of the '{@link org.eclipse.gmf.codegen.gmfgen.GenChildSideAffixedNode#getPreferredSide <em>Preferred Side</em>}' attribute.
46
	 * <!-- begin-user-doc -->
47
	 * <!-- end-user-doc -->
48
	 * @param value the new value of the '<em>Preferred Side</em>' attribute.
49
	 * @see #getPreferredSide()
50
	 * @generated
51
	 */
52
	void setPreferredSide(int value);
53
54
} // GenChildSideAffixedNode
(-)src/org/eclipse/gmf/codegen/gmfgen/impl/GenChildSideAffixedNodeImpl.java (+160 lines)
Added Link Here
1
/**
2
 * <copyright>
3
 * </copyright>
4
 *
5
 * $Id$
6
 */
7
package org.eclipse.gmf.codegen.gmfgen.impl;
8
9
import org.eclipse.emf.common.notify.Notification;
10
11
import org.eclipse.emf.ecore.EClass;
12
13
import org.eclipse.emf.ecore.impl.ENotificationImpl;
14
15
import org.eclipse.gmf.codegen.gmfgen.GMFGenPackage;
16
import org.eclipse.gmf.codegen.gmfgen.GenChildSideAffixedNode;
17
18
/**
19
 * <!-- begin-user-doc -->
20
 * An implementation of the model object '<em><b>Gen Child Side Affixed Node</b></em>'.
21
 * <!-- end-user-doc -->
22
 * <p>
23
 * The following features are implemented:
24
 * <ul>
25
 *   <li>{@link org.eclipse.gmf.codegen.gmfgen.impl.GenChildSideAffixedNodeImpl#getPreferredSide <em>Preferred Side</em>}</li>
26
 * </ul>
27
 * </p>
28
 *
29
 * @generated
30
 */
31
public class GenChildSideAffixedNodeImpl extends GenChildNodeImpl implements GenChildSideAffixedNode {
32
	/**
33
	 * The default value of the '{@link #getPreferredSide() <em>Preferred Side</em>}' attribute.
34
	 * <!-- begin-user-doc -->
35
	 * <!-- end-user-doc -->
36
	 * @see #getPreferredSide()
37
	 * @generated
38
	 * @ordered
39
	 */
40
	protected static final int PREFERRED_SIDE_EDEFAULT = 0;
41
42
	/**
43
	 * The cached value of the '{@link #getPreferredSide() <em>Preferred Side</em>}' attribute.
44
	 * <!-- begin-user-doc -->
45
	 * <!-- end-user-doc -->
46
	 * @see #getPreferredSide()
47
	 * @generated
48
	 * @ordered
49
	 */
50
	protected int preferredSide = PREFERRED_SIDE_EDEFAULT;
51
52
	/**
53
	 * <!-- begin-user-doc -->
54
	 * <!-- end-user-doc -->
55
	 * @generated
56
	 */
57
	protected GenChildSideAffixedNodeImpl() {
58
		super();
59
	}
60
61
	/**
62
	 * <!-- begin-user-doc -->
63
	 * <!-- end-user-doc -->
64
	 * @generated
65
	 */
66
	protected EClass eStaticClass() {
67
		return GMFGenPackage.eINSTANCE.getGenChildSideAffixedNode();
68
	}
69
70
	/**
71
	 * <!-- begin-user-doc -->
72
	 * <!-- end-user-doc -->
73
	 * @generated
74
	 */
75
	public int getPreferredSide() {
76
		return preferredSide;
77
	}
78
79
	/**
80
	 * <!-- begin-user-doc -->
81
	 * <!-- end-user-doc -->
82
	 * @generated
83
	 */
84
	public void setPreferredSide(int newPreferredSide) {
85
		int oldPreferredSide = preferredSide;
86
		preferredSide = newPreferredSide;
87
		if (eNotificationRequired())
88
			eNotify(new ENotificationImpl(this, Notification.SET, GMFGenPackage.GEN_CHILD_SIDE_AFFIXED_NODE__PREFERRED_SIDE, oldPreferredSide, preferredSide));
89
	}
90
91
	/**
92
	 * <!-- begin-user-doc -->
93
	 * <!-- end-user-doc -->
94
	 * @generated
95
	 */
96
	public Object eGet(int featureID, boolean resolve, boolean coreType) {
97
		switch (featureID) {
98
			case GMFGenPackage.GEN_CHILD_SIDE_AFFIXED_NODE__PREFERRED_SIDE:
99
				return new Integer(getPreferredSide());
100
		}
101
		return super.eGet(featureID, resolve, coreType);
102
	}
103
104
	/**
105
	 * <!-- begin-user-doc -->
106
	 * <!-- end-user-doc -->
107
	 * @generated
108
	 */
109
	public void eSet(int featureID, Object newValue) {
110
		switch (featureID) {
111
			case GMFGenPackage.GEN_CHILD_SIDE_AFFIXED_NODE__PREFERRED_SIDE:
112
				setPreferredSide(((Integer)newValue).intValue());
113
				return;
114
		}
115
		super.eSet(featureID, newValue);
116
	}
117
118
	/**
119
	 * <!-- begin-user-doc -->
120
	 * <!-- end-user-doc -->
121
	 * @generated
122
	 */
123
	public void eUnset(int featureID) {
124
		switch (featureID) {
125
			case GMFGenPackage.GEN_CHILD_SIDE_AFFIXED_NODE__PREFERRED_SIDE:
126
				setPreferredSide(PREFERRED_SIDE_EDEFAULT);
127
				return;
128
		}
129
		super.eUnset(featureID);
130
	}
131
132
	/**
133
	 * <!-- begin-user-doc -->
134
	 * <!-- end-user-doc -->
135
	 * @generated
136
	 */
137
	public boolean eIsSet(int featureID) {
138
		switch (featureID) {
139
			case GMFGenPackage.GEN_CHILD_SIDE_AFFIXED_NODE__PREFERRED_SIDE:
140
				return preferredSide != PREFERRED_SIDE_EDEFAULT;
141
		}
142
		return super.eIsSet(featureID);
143
	}
144
145
	/**
146
	 * <!-- begin-user-doc -->
147
	 * <!-- end-user-doc -->
148
	 * @generated
149
	 */
150
	public String toString() {
151
		if (eIsProxy()) return super.toString();
152
153
		StringBuffer result = new StringBuffer(super.toString());
154
		result.append(" (preferredSide: ");
155
		result.append(preferredSide);
156
		result.append(')');
157
		return result.toString();
158
	}
159
160
} //GenChildSideAffixedNodeImpl
(-)plugin.properties (-1 / +10 lines)
Lines 195-204 Link Here
195
_UI_Severity_ERROR_literal = ERROR
195
_UI_Severity_ERROR_literal = ERROR
196
_UI_VisualrepresentationPropertyCategory = Visual representation
196
_UI_VisualrepresentationPropertyCategory = Visual representation
197
_UI_DomainmetainformationPropertyCategory = Domain meta information
197
_UI_DomainmetainformationPropertyCategory = Domain meta information
198
198
199
# ====================================================================
199
# ====================================================================
200
_UI_ValueExpression_langName_feature = Lang Name
200
_UI_ValueExpression_langName_feature = Lang Name
201
_UI_Language_ocl_literal = ocl
201
_UI_Language_ocl_literal = ocl
202
_UI_Language_java_literal = java
202
_UI_Language_java_literal = java
203
_UI_Language_regexp_literal = regexp
203
_UI_Language_regexp_literal = regexp
204
_UI_Language_nregexp_literal = nregexp
204
_UI_Language_nregexp_literal = nregexp
205
_UI_ChildReference_affixedSide_feature = Affixed Side
206
_UI_AffixedSide_NONE_literal = NONE
207
_UI_AffixedSide_NORTH_literal = NORTH
208
_UI_AffixedSide_SOUTH_literal = SOUTH
209
_UI_AffixedSide_WEST_literal = WEST
210
_UI_AffixedSide_EAST_literal = EAST
211
_UI_AffixedSide_ANY_literal = ANY
212
_UI_Wizard_category = Example EMF Model Creation Wizards
213
(-)src/org/eclipse/gmf/mappings/provider/ChildReferenceItemProvider.java (+26 lines)
Lines 64-69 Link Here
64
64
65
			addCompartmentPropertyDescriptor(object);
65
			addCompartmentPropertyDescriptor(object);
66
			addReferencedChildPropertyDescriptor(object);
66
			addReferencedChildPropertyDescriptor(object);
67
			addAffixedSidePropertyDescriptor(object);
67
		}
68
		}
68
		return itemPropertyDescriptors;
69
		return itemPropertyDescriptors;
69
	}
70
	}
Lines 117-122 Link Here
117
	}
118
	}
118
119
119
	/**
120
	/**
121
	 * This adds a property descriptor for the Affixed Side feature.
122
	 * <!-- begin-user-doc -->
123
	 * <!-- end-user-doc -->
124
	 * @generated
125
	 */
126
	protected void addAffixedSidePropertyDescriptor(Object object) {
127
		itemPropertyDescriptors.add
128
			(createItemPropertyDescriptor
129
				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
130
				 getResourceLocator(),
131
				 getString("_UI_ChildReference_affixedSide_feature"),
132
				 getString("_UI_PropertyDescriptor_description", "_UI_ChildReference_affixedSide_feature", "_UI_ChildReference_type"),
133
				 GMFMapPackage.eINSTANCE.getChildReference_AffixedSide(),
134
				 true,
135
				 false,
136
				 false,
137
				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
138
				 null,
139
				 null));
140
	}
141
142
	/**
120
	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
143
	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
121
	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
144
	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
122
	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
145
	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
Lines 189-194 Link Here
189
		updateChildren(notification);
212
		updateChildren(notification);
190
213
191
		switch (notification.getFeatureID(ChildReference.class)) {
214
		switch (notification.getFeatureID(ChildReference.class)) {
215
			case GMFMapPackage.CHILD_REFERENCE__AFFIXED_SIDE:
216
				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
217
				return;
192
			case GMFMapPackage.CHILD_REFERENCE__OWNED_CHILD:
218
			case GMFMapPackage.CHILD_REFERENCE__OWNED_CHILD:
193
				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
219
				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
194
				return;
220
				return;
(-)models/gmfmap.genmodel (+9 lines)
Lines 8-13 Link Here
8
  <foreignModel>gmfmap.ecore</foreignModel>
8
  <foreignModel>gmfmap.ecore</foreignModel>
9
  <genPackages prefix="GMFMap" basePackage="org.eclipse.gmf" disposableProviderFactory="true"
9
  <genPackages prefix="GMFMap" basePackage="org.eclipse.gmf" disposableProviderFactory="true"
10
      literalsInterface="false" ecorePackage="gmfmap.ecore#/">
10
      literalsInterface="false" ecorePackage="gmfmap.ecore#/">
11
    <genEnums ecoreEnum="gmfmap.ecore#//AffixedSide">
12
      <genEnumLiterals ecoreEnumLiteral="gmfmap.ecore#//AffixedSide/NONE"/>
13
      <genEnumLiterals ecoreEnumLiteral="gmfmap.ecore#//AffixedSide/NORTH"/>
14
      <genEnumLiterals ecoreEnumLiteral="gmfmap.ecore#//AffixedSide/SOUTH"/>
15
      <genEnumLiterals ecoreEnumLiteral="gmfmap.ecore#//AffixedSide/WEST"/>
16
      <genEnumLiterals ecoreEnumLiteral="gmfmap.ecore#//AffixedSide/EAST"/>
17
      <genEnumLiterals ecoreEnumLiteral="gmfmap.ecore#//AffixedSide/ANY"/>
18
    </genEnums>
11
    <genEnums ecoreEnum="gmfmap.ecore#//Severity">
19
    <genEnums ecoreEnum="gmfmap.ecore#//Severity">
12
      <genEnumLiterals ecoreEnumLiteral="gmfmap.ecore#//Severity/INFO"/>
20
      <genEnumLiterals ecoreEnumLiteral="gmfmap.ecore#//Severity/INFO"/>
13
      <genEnumLiterals ecoreEnumLiteral="gmfmap.ecore#//Severity/WARNING"/>
21
      <genEnumLiterals ecoreEnumLiteral="gmfmap.ecore#//Severity/WARNING"/>
Lines 50-55 Link Here
50
      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference gmfmap.ecore#//ChildReference/compartment"/>
58
      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference gmfmap.ecore#//ChildReference/compartment"/>
51
      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference gmfmap.ecore#//ChildReference/ownedChild"/>
59
      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference gmfmap.ecore#//ChildReference/ownedChild"/>
52
      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference gmfmap.ecore#//ChildReference/referencedChild"/>
60
      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference gmfmap.ecore#//ChildReference/referencedChild"/>
61
      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute gmfmap.ecore#//ChildReference/affixedSide"/>
53
    </genClasses>
62
    </genClasses>
54
    <genClasses ecoreClass="gmfmap.ecore#//TopNodeReference">
63
    <genClasses ecoreClass="gmfmap.ecore#//TopNodeReference">
55
      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference gmfmap.ecore#//TopNodeReference/ownedChild"/>
64
      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference gmfmap.ecore#//TopNodeReference/ownedChild"/>
(-)models/gmfmap.ecore (+18 lines)
Lines 107-112 Link Here
107
      <details key="ocl" value="not child.getDomainContext().oclIsUndefined() implies not containmentFeature.oclIsUndefined()"/>
107
      <details key="ocl" value="not child.getDomainContext().oclIsUndefined() implies not containmentFeature.oclIsUndefined()"/>
108
      <details key="description" value="ChildReference to NodeMapping with domainElement should define 'containmentFeature'"/>
108
      <details key="description" value="ChildReference to NodeMapping with domainElement should define 'containmentFeature'"/>
109
    </eAnnotations>
109
    </eAnnotations>
110
    <eAnnotations source="http://www.eclipse.org/gmf/2005/constraints">
111
      <details key="ocl" value="affixedSide != AffixedSide::NONE implies compartment.oclIsUndefined()"/>
112
      <details key="description" value="Side-affixed children can not be placed in compartments"/>
113
    </eAnnotations>
114
    <eAnnotations source="http://www.eclipse.org/gmf/2005/constraints">
115
      <details key="ocl" value="let child:NodeMapping=(if ownedChild.oclIsUndefined() then referencedChild else ownedChild) in ((child.labelMappings->size() = 1 and child.children->size() = 0) implies affixedSide = AffixedSide::NONE)"/>
116
      <details key="description" value="Side-affixed children can not be pure labels"/>
117
    </eAnnotations>
110
    <eStructuralFeatures xsi:type="ecore:EReference" name="parentNode" lowerBound="1"
118
    <eStructuralFeatures xsi:type="ecore:EReference" name="parentNode" lowerBound="1"
111
        eType="#//NodeMapping" eOpposite="#//NodeMapping/children"/>
119
        eType="#//NodeMapping" eOpposite="#//NodeMapping/children"/>
112
    <eStructuralFeatures xsi:type="ecore:EReference" name="compartment" eType="#//CompartmentMapping"
120
    <eStructuralFeatures xsi:type="ecore:EReference" name="compartment" eType="#//CompartmentMapping"
Lines 114-119 Link Here
114
    <eStructuralFeatures xsi:type="ecore:EReference" name="ownedChild" eType="#//NodeMapping"
122
    <eStructuralFeatures xsi:type="ecore:EReference" name="ownedChild" eType="#//NodeMapping"
115
        containment="true"/>
123
        containment="true"/>
116
    <eStructuralFeatures xsi:type="ecore:EReference" name="referencedChild" eType="#//NodeMapping"/>
124
    <eStructuralFeatures xsi:type="ecore:EReference" name="referencedChild" eType="#//NodeMapping"/>
125
    <eStructuralFeatures xsi:type="ecore:EAttribute" name="affixedSide" eType="#//AffixedSide"
126
        defaultValueLiteral="NONE"/>
117
  </eClassifiers>
127
  </eClassifiers>
118
  <eClassifiers xsi:type="ecore:EClass" name="TopNodeReference" eSuperTypes="#//NodeReference">
128
  <eClassifiers xsi:type="ecore:EClass" name="TopNodeReference" eSuperTypes="#//NodeReference">
119
    <eStructuralFeatures xsi:type="ecore:EReference" name="ownedChild" lowerBound="1"
129
    <eStructuralFeatures xsi:type="ecore:EReference" name="ownedChild" lowerBound="1"
Lines 130-135 Link Here
130
    <eStructuralFeatures xsi:type="ecore:EReference" name="compartments" upperBound="-1"
140
    <eStructuralFeatures xsi:type="ecore:EReference" name="compartments" upperBound="-1"
131
        eType="#//CompartmentMapping" containment="true" eOpposite="#//CompartmentMapping/parentNode"/>
141
        eType="#//CompartmentMapping" containment="true" eOpposite="#//CompartmentMapping/parentNode"/>
132
  </eClassifiers>
142
  </eClassifiers>
143
  <eClassifiers xsi:type="ecore:EEnum" name="AffixedSide">
144
    <eLiterals name="NONE"/>
145
    <eLiterals name="NORTH" value="1"/>
146
    <eLiterals name="SOUTH" value="4"/>
147
    <eLiterals name="WEST" value="8"/>
148
    <eLiterals name="EAST" value="16"/>
149
    <eLiterals name="ANY" value="31"/>
150
  </eClassifiers>
133
  <eClassifiers xsi:type="ecore:EClass" name="CompartmentMapping">
151
  <eClassifiers xsi:type="ecore:EClass" name="CompartmentMapping">
134
    <eStructuralFeatures xsi:type="ecore:EReference" name="compartment" lowerBound="1"
152
    <eStructuralFeatures xsi:type="ecore:EReference" name="compartment" lowerBound="1"
135
        eType="ecore:EClass ../../org.eclipse.gmf.graphdef/models/gmfgraph.ecore#//Compartment"/>
153
        eType="ecore:EClass ../../org.eclipse.gmf.graphdef/models/gmfgraph.ecore#//Compartment"/>
(-)src/org/eclipse/gmf/mappings/impl/GMFMapFactoryImpl.java (+24 lines)
Lines 110-115 Link Here
110
	 */
110
	 */
111
	public Object createFromString(EDataType eDataType, String initialValue) {
111
	public Object createFromString(EDataType eDataType, String initialValue) {
112
		switch (eDataType.getClassifierID()) {
112
		switch (eDataType.getClassifierID()) {
113
			case GMFMapPackage.AFFIXED_SIDE:
114
				return createAffixedSideFromString(eDataType, initialValue);
113
			case GMFMapPackage.SEVERITY:
115
			case GMFMapPackage.SEVERITY:
114
				return createSeverityFromString(eDataType, initialValue);
116
				return createSeverityFromString(eDataType, initialValue);
115
			case GMFMapPackage.LANGUAGE:
117
			case GMFMapPackage.LANGUAGE:
Lines 126-131 Link Here
126
	 */
128
	 */
127
	public String convertToString(EDataType eDataType, Object instanceValue) {
129
	public String convertToString(EDataType eDataType, Object instanceValue) {
128
		switch (eDataType.getClassifierID()) {
130
		switch (eDataType.getClassifierID()) {
131
			case GMFMapPackage.AFFIXED_SIDE:
132
				return convertAffixedSideToString(eDataType, instanceValue);
129
			case GMFMapPackage.SEVERITY:
133
			case GMFMapPackage.SEVERITY:
130
				return convertSeverityToString(eDataType, instanceValue);
134
				return convertSeverityToString(eDataType, instanceValue);
131
			case GMFMapPackage.LANGUAGE:
135
			case GMFMapPackage.LANGUAGE:
Lines 360-365 Link Here
360
	 * <!-- end-user-doc -->
364
	 * <!-- end-user-doc -->
361
	 * @generated
365
	 * @generated
362
	 */
366
	 */
367
	public AffixedSide createAffixedSideFromString(EDataType eDataType, String initialValue) {
368
		AffixedSide result = AffixedSide.get(initialValue);
369
		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
370
		return result;
371
	}
372
373
	/**
374
	 * <!-- begin-user-doc -->
375
	 * <!-- end-user-doc -->
376
	 * @generated
377
	 */
378
	public String convertAffixedSideToString(EDataType eDataType, Object instanceValue) {
379
		return instanceValue == null ? null : instanceValue.toString();
380
	}
381
382
	/**
383
	 * <!-- begin-user-doc -->
384
	 * <!-- end-user-doc -->
385
	 * @generated
386
	 */
363
	public Severity createSeverityFromString(EDataType eDataType, String initialValue) {
387
	public Severity createSeverityFromString(EDataType eDataType, String initialValue) {
364
		Severity result = Severity.get(initialValue);
388
		Severity result = Severity.get(initialValue);
365
		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
389
		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
(-)src/org/eclipse/gmf/mappings/impl/GMFMapPackageImpl.java (-2 / +46 lines)
Lines 14-19 Link Here
14
import org.eclipse.emf.ecore.EValidator;
14
import org.eclipse.emf.ecore.EValidator;
15
import org.eclipse.emf.ecore.impl.EPackageImpl;
15
import org.eclipse.emf.ecore.impl.EPackageImpl;
16
import org.eclipse.gmf.gmfgraph.GMFGraphPackage;
16
import org.eclipse.gmf.gmfgraph.GMFGraphPackage;
17
import org.eclipse.gmf.mappings.AffixedSide;
17
import org.eclipse.gmf.mappings.AppearanceSteward;
18
import org.eclipse.gmf.mappings.AppearanceSteward;
18
import org.eclipse.gmf.mappings.AuditContainer;
19
import org.eclipse.gmf.mappings.AuditContainer;
19
import org.eclipse.gmf.mappings.AuditRule;
20
import org.eclipse.gmf.mappings.AuditRule;
Lines 289-294 Link Here
289
	 * <!-- end-user-doc -->
290
	 * <!-- end-user-doc -->
290
	 * @generated
291
	 * @generated
291
	 */
292
	 */
293
	private EEnum affixedSideEEnum = null;
294
295
	/**
296
	 * <!-- begin-user-doc -->
297
	 * <!-- end-user-doc -->
298
	 * @generated
299
	 */
292
	private EEnum severityEEnum = null;
300
	private EEnum severityEEnum = null;
293
301
294
	/**
302
	/**
Lines 516-521 Link Here
516
	 * <!-- end-user-doc -->
524
	 * <!-- end-user-doc -->
517
	 * @generated
525
	 * @generated
518
	 */
526
	 */
527
	public EAttribute getChildReference_AffixedSide() {
528
		return (EAttribute)childReferenceEClass.getEStructuralFeatures().get(4);
529
	}
530
531
	/**
532
	 * <!-- begin-user-doc -->
533
	 * <!-- end-user-doc -->
534
	 * @generated
535
	 */
519
	public EClass getTopNodeReference() {
536
	public EClass getTopNodeReference() {
520
		return topNodeReferenceEClass;
537
		return topNodeReferenceEClass;
521
	}
538
	}
Lines 1398-1403 Link Here
1398
	 * <!-- end-user-doc -->
1415
	 * <!-- end-user-doc -->
1399
	 * @generated
1416
	 * @generated
1400
	 */
1417
	 */
1418
	public EEnum getAffixedSide() {
1419
		return affixedSideEEnum;
1420
	}
1421
1422
	/**
1423
	 * <!-- begin-user-doc -->
1424
	 * <!-- end-user-doc -->
1425
	 * @generated
1426
	 */
1401
	public EEnum getSeverity() {
1427
	public EEnum getSeverity() {
1402
		return severityEEnum;
1428
		return severityEEnum;
1403
	}
1429
	}
Lines 1465-1470 Link Here
1465
		createEReference(childReferenceEClass, CHILD_REFERENCE__COMPARTMENT);
1491
		createEReference(childReferenceEClass, CHILD_REFERENCE__COMPARTMENT);
1466
		createEReference(childReferenceEClass, CHILD_REFERENCE__OWNED_CHILD);
1492
		createEReference(childReferenceEClass, CHILD_REFERENCE__OWNED_CHILD);
1467
		createEReference(childReferenceEClass, CHILD_REFERENCE__REFERENCED_CHILD);
1493
		createEReference(childReferenceEClass, CHILD_REFERENCE__REFERENCED_CHILD);
1494
		createEAttribute(childReferenceEClass, CHILD_REFERENCE__AFFIXED_SIDE);
1468
1495
1469
		topNodeReferenceEClass = createEClass(TOP_NODE_REFERENCE);
1496
		topNodeReferenceEClass = createEClass(TOP_NODE_REFERENCE);
1470
		createEReference(topNodeReferenceEClass, TOP_NODE_REFERENCE__OWNED_CHILD);
1497
		createEReference(topNodeReferenceEClass, TOP_NODE_REFERENCE__OWNED_CHILD);
Lines 1585-1590 Link Here
1585
		measurableEClass = createEClass(MEASURABLE);
1612
		measurableEClass = createEClass(MEASURABLE);
1586
1613
1587
		// Create enums
1614
		// Create enums
1615
		affixedSideEEnum = createEEnum(AFFIXED_SIDE);
1588
		severityEEnum = createEEnum(SEVERITY);
1616
		severityEEnum = createEEnum(SEVERITY);
1589
		languageEEnum = createEEnum(LANGUAGE);
1617
		languageEEnum = createEEnum(LANGUAGE);
1590
	}
1618
	}
Lines 1672-1677 Link Here
1672
		initEReference(getChildReference_Compartment(), this.getCompartmentMapping(), this.getCompartmentMapping_Children(), "compartment", null, 0, 1, ChildReference.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
1700
		initEReference(getChildReference_Compartment(), this.getCompartmentMapping(), this.getCompartmentMapping_Children(), "compartment", null, 0, 1, ChildReference.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
1673
		initEReference(getChildReference_OwnedChild(), this.getNodeMapping(), null, "ownedChild", null, 0, 1, ChildReference.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
1701
		initEReference(getChildReference_OwnedChild(), this.getNodeMapping(), null, "ownedChild", null, 0, 1, ChildReference.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
1674
		initEReference(getChildReference_ReferencedChild(), this.getNodeMapping(), null, "referencedChild", null, 0, 1, ChildReference.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
1702
		initEReference(getChildReference_ReferencedChild(), this.getNodeMapping(), null, "referencedChild", null, 0, 1, ChildReference.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
1703
		initEAttribute(getChildReference_AffixedSide(), this.getAffixedSide(), "affixedSide", "NONE", 0, 1, ChildReference.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
1675
1704
1676
		initEClass(topNodeReferenceEClass, TopNodeReference.class, "TopNodeReference", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
1705
		initEClass(topNodeReferenceEClass, TopNodeReference.class, "TopNodeReference", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
1677
		initEReference(getTopNodeReference_OwnedChild(), this.getNodeMapping(), null, "ownedChild", null, 1, 1, TopNodeReference.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
1706
		initEReference(getTopNodeReference_OwnedChild(), this.getNodeMapping(), null, "ownedChild", null, 1, 1, TopNodeReference.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
Lines 1792-1797 Link Here
1792
		initEClass(measurableEClass, Measurable.class, "Measurable", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
1821
		initEClass(measurableEClass, Measurable.class, "Measurable", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
1793
1822
1794
		// Initialize enums and add enum literals
1823
		// Initialize enums and add enum literals
1824
		initEEnum(affixedSideEEnum, AffixedSide.class, "AffixedSide");
1825
		addEEnumLiteral(affixedSideEEnum, AffixedSide.NONE_LITERAL);
1826
		addEEnumLiteral(affixedSideEEnum, AffixedSide.NORTH_LITERAL);
1827
		addEEnumLiteral(affixedSideEEnum, AffixedSide.SOUTH_LITERAL);
1828
		addEEnumLiteral(affixedSideEEnum, AffixedSide.WEST_LITERAL);
1829
		addEEnumLiteral(affixedSideEEnum, AffixedSide.EAST_LITERAL);
1830
		addEEnumLiteral(affixedSideEEnum, AffixedSide.ANY_LITERAL);
1831
1795
		initEEnum(severityEEnum, Severity.class, "Severity");
1832
		initEEnum(severityEEnum, Severity.class, "Severity");
1796
		addEEnumLiteral(severityEEnum, Severity.INFO_LITERAL);
1833
		addEEnumLiteral(severityEEnum, Severity.INFO_LITERAL);
1797
		addEEnumLiteral(severityEEnum, Severity.WARNING_LITERAL);
1834
		addEEnumLiteral(severityEEnum, Severity.WARNING_LITERAL);
Lines 1829-1835 Link Here
1829
		   new String[] {
1866
		   new String[] {
1830
			 "constraints", "http://www.eclipse.org/gmf/2005/constraints",
1867
			 "constraints", "http://www.eclipse.org/gmf/2005/constraints",
1831
			 "constraintsMeta", "http://www.eclipse.org/gmf/2005/constraints/meta"
1868
			 "constraintsMeta", "http://www.eclipse.org/gmf/2005/constraints/meta"
1832
		   });																																																																																																					
1869
		   });																																																																																																						
1833
	}
1870
	}
1834
1871
1835
	/**
1872
	/**
Lines 1853-1859 Link Here
1853
		   new String[] {
1890
		   new String[] {
1854
			 "def", "context",
1891
			 "def", "context",
1855
			 "ocl", "self.getDomainContext()"
1892
			 "ocl", "self.getDomainContext()"
1856
		   });																							
1893
		   });																								
1857
		addAnnotation
1894
		addAnnotation
1858
		  (constraintEClass, 
1895
		  (constraintEClass, 
1859
		   source, 
1896
		   source, 
Lines 2061-2066 Link Here
2061
		   new String[] {
2098
		   new String[] {
2062
			 "ocl", "not child.getDomainContext().oclIsUndefined() implies not containmentFeature.oclIsUndefined()",
2099
			 "ocl", "not child.getDomainContext().oclIsUndefined() implies not containmentFeature.oclIsUndefined()",
2063
			 "description", "ChildReference to NodeMapping with domainElement should define \'containmentFeature\'"
2100
			 "description", "ChildReference to NodeMapping with domainElement should define \'containmentFeature\'"
2101
		   });		
2102
		addAnnotation
2103
		  (childReferenceEClass, 
2104
		   source, 
2105
		   new String[] {
2106
			 "ocl", "affixedSide != AffixedSide::NONE implies compartment.oclIsUndefined()",
2107
			 "description", "Side-affixed children can not be placed in compartments"
2064
		   });				
2108
		   });				
2065
		addAnnotation
2109
		addAnnotation
2066
		  (linkMappingEClass, 
2110
		  (linkMappingEClass, 
(-)src/org/eclipse/gmf/mappings/impl/ChildReferenceImpl.java (+68 lines)
Lines 16-21 Link Here
16
16
17
import org.eclipse.emf.ecore.util.EcoreUtil;
17
import org.eclipse.emf.ecore.util.EcoreUtil;
18
18
19
import org.eclipse.gmf.mappings.AffixedSide;
19
import org.eclipse.gmf.mappings.ChildReference;
20
import org.eclipse.gmf.mappings.ChildReference;
20
import org.eclipse.gmf.mappings.CompartmentMapping;
21
import org.eclipse.gmf.mappings.CompartmentMapping;
21
import org.eclipse.gmf.mappings.GMFMapPackage;
22
import org.eclipse.gmf.mappings.GMFMapPackage;
Lines 32-37 Link Here
32
 *   <li>{@link org.eclipse.gmf.mappings.impl.ChildReferenceImpl#getCompartment <em>Compartment</em>}</li>
33
 *   <li>{@link org.eclipse.gmf.mappings.impl.ChildReferenceImpl#getCompartment <em>Compartment</em>}</li>
33
 *   <li>{@link org.eclipse.gmf.mappings.impl.ChildReferenceImpl#getOwnedChild <em>Owned Child</em>}</li>
34
 *   <li>{@link org.eclipse.gmf.mappings.impl.ChildReferenceImpl#getOwnedChild <em>Owned Child</em>}</li>
34
 *   <li>{@link org.eclipse.gmf.mappings.impl.ChildReferenceImpl#getReferencedChild <em>Referenced Child</em>}</li>
35
 *   <li>{@link org.eclipse.gmf.mappings.impl.ChildReferenceImpl#getReferencedChild <em>Referenced Child</em>}</li>
36
 *   <li>{@link org.eclipse.gmf.mappings.impl.ChildReferenceImpl#getAffixedSide <em>Affixed Side</em>}</li>
35
 * </ul>
37
 * </ul>
36
 * </p>
38
 * </p>
37
 *
39
 *
Lines 69-74 Link Here
69
	protected NodeMapping referencedChild = null;
71
	protected NodeMapping referencedChild = null;
70
72
71
	/**
73
	/**
74
	 * The default value of the '{@link #getAffixedSide() <em>Affixed Side</em>}' attribute.
75
	 * <!-- begin-user-doc -->
76
	 * <!-- end-user-doc -->
77
	 * @see #getAffixedSide()
78
	 * @generated
79
	 * @ordered
80
	 */
81
	protected static final AffixedSide AFFIXED_SIDE_EDEFAULT = AffixedSide.NONE_LITERAL;
82
83
	/**
84
	 * The cached value of the '{@link #getAffixedSide() <em>Affixed Side</em>}' attribute.
85
	 * <!-- begin-user-doc -->
86
	 * <!-- end-user-doc -->
87
	 * @see #getAffixedSide()
88
	 * @generated
89
	 * @ordered
90
	 */
91
	protected AffixedSide affixedSide = AFFIXED_SIDE_EDEFAULT;
92
93
	/**
72
	 * <!-- begin-user-doc -->
94
	 * <!-- begin-user-doc -->
73
	 * <!-- end-user-doc -->
95
	 * <!-- end-user-doc -->
74
	 * @generated
96
	 * @generated
Lines 273-278 Link Here
273
	 * <!-- end-user-doc -->
295
	 * <!-- end-user-doc -->
274
	 * @generated
296
	 * @generated
275
	 */
297
	 */
298
	public AffixedSide getAffixedSide() {
299
		return affixedSide;
300
	}
301
302
	/**
303
	 * <!-- begin-user-doc -->
304
	 * <!-- end-user-doc -->
305
	 * @generated
306
	 */
307
	public void setAffixedSide(AffixedSide newAffixedSide) {
308
		AffixedSide oldAffixedSide = affixedSide;
309
		affixedSide = newAffixedSide == null ? AFFIXED_SIDE_EDEFAULT : newAffixedSide;
310
		if (eNotificationRequired())
311
			eNotify(new ENotificationImpl(this, Notification.SET, GMFMapPackage.CHILD_REFERENCE__AFFIXED_SIDE, oldAffixedSide, affixedSide));
312
	}
313
314
	/**
315
	 * <!-- begin-user-doc -->
316
	 * <!-- end-user-doc -->
317
	 * @generated
318
	 */
276
	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
319
	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
277
		switch (featureID) {
320
		switch (featureID) {
278
			case GMFMapPackage.CHILD_REFERENCE__PARENT_NODE:
321
			case GMFMapPackage.CHILD_REFERENCE__PARENT_NODE:
Lines 334-339 Link Here
334
			case GMFMapPackage.CHILD_REFERENCE__REFERENCED_CHILD:
377
			case GMFMapPackage.CHILD_REFERENCE__REFERENCED_CHILD:
335
				if (resolve) return getReferencedChild();
378
				if (resolve) return getReferencedChild();
336
				return basicGetReferencedChild();
379
				return basicGetReferencedChild();
380
			case GMFMapPackage.CHILD_REFERENCE__AFFIXED_SIDE:
381
				return getAffixedSide();
337
		}
382
		}
338
		return super.eGet(featureID, resolve, coreType);
383
		return super.eGet(featureID, resolve, coreType);
339
	}
384
	}
Lines 357-362 Link Here
357
			case GMFMapPackage.CHILD_REFERENCE__REFERENCED_CHILD:
402
			case GMFMapPackage.CHILD_REFERENCE__REFERENCED_CHILD:
358
				setReferencedChild((NodeMapping)newValue);
403
				setReferencedChild((NodeMapping)newValue);
359
				return;
404
				return;
405
			case GMFMapPackage.CHILD_REFERENCE__AFFIXED_SIDE:
406
				setAffixedSide((AffixedSide)newValue);
407
				return;
360
		}
408
		}
361
		super.eSet(featureID, newValue);
409
		super.eSet(featureID, newValue);
362
	}
410
	}
Lines 380-385 Link Here
380
			case GMFMapPackage.CHILD_REFERENCE__REFERENCED_CHILD:
428
			case GMFMapPackage.CHILD_REFERENCE__REFERENCED_CHILD:
381
				setReferencedChild((NodeMapping)null);
429
				setReferencedChild((NodeMapping)null);
382
				return;
430
				return;
431
			case GMFMapPackage.CHILD_REFERENCE__AFFIXED_SIDE:
432
				setAffixedSide(AFFIXED_SIDE_EDEFAULT);
433
				return;
383
		}
434
		}
384
		super.eUnset(featureID);
435
		super.eUnset(featureID);
385
	}
436
	}
Lines 399-408 Link Here
399
				return ownedChild != null;
450
				return ownedChild != null;
400
			case GMFMapPackage.CHILD_REFERENCE__REFERENCED_CHILD:
451
			case GMFMapPackage.CHILD_REFERENCE__REFERENCED_CHILD:
401
				return referencedChild != null;
452
				return referencedChild != null;
453
			case GMFMapPackage.CHILD_REFERENCE__AFFIXED_SIDE:
454
				return affixedSide != AFFIXED_SIDE_EDEFAULT;
402
		}
455
		}
403
		return super.eIsSet(featureID);
456
		return super.eIsSet(featureID);
404
	}
457
	}
405
458
459
	/**
460
	 * <!-- begin-user-doc -->
461
	 * <!-- end-user-doc -->
462
	 * @generated
463
	 */
464
	public String toString() {
465
		if (eIsProxy()) return super.toString();
466
467
		StringBuffer result = new StringBuffer(super.toString());
468
		result.append(" (affixedSide: ");
469
		result.append(affixedSide);
470
		result.append(')');
471
		return result.toString();
472
	}
473
406
	public NodeMapping getChild() {
474
	public NodeMapping getChild() {
407
		if (getOwnedChild() != null) {
475
		if (getOwnedChild() != null) {
408
			return getOwnedChild();
476
			return getOwnedChild();
(-)src/org/eclipse/gmf/mappings/GMFMapPackage.java (-3 / +43 lines)
Lines 379-391 Link Here
379
	int CHILD_REFERENCE__REFERENCED_CHILD = NODE_REFERENCE_FEATURE_COUNT + 3;
379
	int CHILD_REFERENCE__REFERENCED_CHILD = NODE_REFERENCE_FEATURE_COUNT + 3;
380
380
381
	/**
381
	/**
382
	 * The feature id for the '<em><b>Affixed Side</b></em>' attribute.
383
	 * <!-- begin-user-doc -->
384
	 * <!-- end-user-doc -->
385
	 * @generated
386
	 * @ordered
387
	 */
388
	int CHILD_REFERENCE__AFFIXED_SIDE = NODE_REFERENCE_FEATURE_COUNT + 4;
389
390
	/**
382
	 * The number of structural features of the '<em>Child Reference</em>' class.
391
	 * The number of structural features of the '<em>Child Reference</em>' class.
383
	 * <!-- begin-user-doc -->
392
	 * <!-- begin-user-doc -->
384
	 * <!-- end-user-doc -->
393
	 * <!-- end-user-doc -->
385
	 * @generated
394
	 * @generated
386
	 * @ordered
395
	 * @ordered
387
	 */
396
	 */
388
	int CHILD_REFERENCE_FEATURE_COUNT = NODE_REFERENCE_FEATURE_COUNT + 4;
397
	int CHILD_REFERENCE_FEATURE_COUNT = NODE_REFERENCE_FEATURE_COUNT + 5;
389
398
390
	/**
399
	/**
391
	 * The meta object id for the '{@link org.eclipse.gmf.mappings.impl.TopNodeReferenceImpl <em>Top Node Reference</em>}' class.
400
	 * The meta object id for the '{@link org.eclipse.gmf.mappings.impl.TopNodeReferenceImpl <em>Top Node Reference</em>}' class.
Lines 1700-1705 Link Here
1700
	int MEASURABLE_FEATURE_COUNT = 0;
1709
	int MEASURABLE_FEATURE_COUNT = 0;
1701
1710
1702
	/**
1711
	/**
1712
	 * The meta object id for the '{@link org.eclipse.gmf.mappings.AffixedSide <em>Affixed Side</em>}' enum.
1713
	 * <!-- begin-user-doc -->
1714
	 * <!-- end-user-doc -->
1715
	 * @see org.eclipse.gmf.mappings.AffixedSide
1716
	 * @see org.eclipse.gmf.mappings.impl.GMFMapPackageImpl#getAffixedSide()
1717
	 * @generated
1718
	 */
1719
	int AFFIXED_SIDE = 32;
1720
1721
	/**
1703
	 * The meta object id for the '{@link org.eclipse.gmf.mappings.Severity <em>Severity</em>}' enum.
1722
	 * The meta object id for the '{@link org.eclipse.gmf.mappings.Severity <em>Severity</em>}' enum.
1704
	 * <!-- begin-user-doc -->
1723
	 * <!-- begin-user-doc -->
1705
	 * <!-- end-user-doc -->
1724
	 * <!-- end-user-doc -->
Lines 1707-1713 Link Here
1707
	 * @see org.eclipse.gmf.mappings.impl.GMFMapPackageImpl#getSeverity()
1726
	 * @see org.eclipse.gmf.mappings.impl.GMFMapPackageImpl#getSeverity()
1708
	 * @generated
1727
	 * @generated
1709
	 */
1728
	 */
1710
	int SEVERITY = 32;
1729
	int SEVERITY = 33;
1711
1730
1712
1731
1713
	/**
1732
	/**
Lines 1718-1724 Link Here
1718
	 * @see org.eclipse.gmf.mappings.impl.GMFMapPackageImpl#getLanguage()
1737
	 * @see org.eclipse.gmf.mappings.impl.GMFMapPackageImpl#getLanguage()
1719
	 * @generated
1738
	 * @generated
1720
	 */
1739
	 */
1721
	int LANGUAGE = 33;
1740
	int LANGUAGE = 34;
1722
1741
1723
1742
1724
	/**
1743
	/**
Lines 1883-1888 Link Here
1883
	EReference getChildReference_ReferencedChild();
1902
	EReference getChildReference_ReferencedChild();
1884
1903
1885
	/**
1904
	/**
1905
	 * Returns the meta object for the attribute '{@link org.eclipse.gmf.mappings.ChildReference#getAffixedSide <em>Affixed Side</em>}'.
1906
	 * <!-- begin-user-doc -->
1907
	 * <!-- end-user-doc -->
1908
	 * @return the meta object for the attribute '<em>Affixed Side</em>'.
1909
	 * @see org.eclipse.gmf.mappings.ChildReference#getAffixedSide()
1910
	 * @see #getChildReference()
1911
	 * @generated
1912
	 */
1913
	EAttribute getChildReference_AffixedSide();
1914
1915
	/**
1886
	 * Returns the meta object for class '{@link org.eclipse.gmf.mappings.TopNodeReference <em>Top Node Reference</em>}'.
1916
	 * Returns the meta object for class '{@link org.eclipse.gmf.mappings.TopNodeReference <em>Top Node Reference</em>}'.
1887
	 * <!-- begin-user-doc -->
1917
	 * <!-- begin-user-doc -->
1888
	 * <!-- end-user-doc -->
1918
	 * <!-- end-user-doc -->
Lines 2933-2938 Link Here
2933
	EClass getMeasurable();
2963
	EClass getMeasurable();
2934
2964
2935
	/**
2965
	/**
2966
	 * Returns the meta object for enum '{@link org.eclipse.gmf.mappings.AffixedSide <em>Affixed Side</em>}'.
2967
	 * <!-- begin-user-doc -->
2968
	 * <!-- end-user-doc -->
2969
	 * @return the meta object for enum '<em>Affixed Side</em>'.
2970
	 * @see org.eclipse.gmf.mappings.AffixedSide
2971
	 * @generated
2972
	 */
2973
	EEnum getAffixedSide();
2974
2975
	/**
2936
	 * Returns the meta object for enum '{@link org.eclipse.gmf.mappings.Severity <em>Severity</em>}'.
2976
	 * Returns the meta object for enum '{@link org.eclipse.gmf.mappings.Severity <em>Severity</em>}'.
2937
	 * <!-- begin-user-doc -->
2977
	 * <!-- begin-user-doc -->
2938
	 * <!-- end-user-doc -->
2978
	 * <!-- end-user-doc -->
(-)src/org/eclipse/gmf/mappings/ChildReference.java (+32 lines)
Lines 19-24 Link Here
19
 *   <li>{@link org.eclipse.gmf.mappings.ChildReference#getCompartment <em>Compartment</em>}</li>
19
 *   <li>{@link org.eclipse.gmf.mappings.ChildReference#getCompartment <em>Compartment</em>}</li>
20
 *   <li>{@link org.eclipse.gmf.mappings.ChildReference#getOwnedChild <em>Owned Child</em>}</li>
20
 *   <li>{@link org.eclipse.gmf.mappings.ChildReference#getOwnedChild <em>Owned Child</em>}</li>
21
 *   <li>{@link org.eclipse.gmf.mappings.ChildReference#getReferencedChild <em>Referenced Child</em>}</li>
21
 *   <li>{@link org.eclipse.gmf.mappings.ChildReference#getReferencedChild <em>Referenced Child</em>}</li>
22
 *   <li>{@link org.eclipse.gmf.mappings.ChildReference#getAffixedSide <em>Affixed Side</em>}</li>
22
 * </ul>
23
 * </ul>
23
 * </p>
24
 * </p>
24
 *
25
 *
Lines 27-32 Link Here
27
 *        annotation="http://www.eclipse.org/gmf/2005/constraints ocl='not childrenFeature.oclIsUndefined() implies childrenFeature.eContainingClass.isSuperTypeOf(parentNode.domainMetaElement)' description='\'Children Feature\' must be owned by \'Domain Meta Element\' or its super type of this reference parent Node Mapping'"
28
 *        annotation="http://www.eclipse.org/gmf/2005/constraints ocl='not childrenFeature.oclIsUndefined() implies childrenFeature.eContainingClass.isSuperTypeOf(parentNode.domainMetaElement)' description='\'Children Feature\' must be owned by \'Domain Meta Element\' or its super type of this reference parent Node Mapping'"
28
 *        annotation="http://www.eclipse.org/gmf/2005/constraints ocl='not containmentFeature.oclIsUndefined() implies containmentFeature.eContainingClass.isSuperTypeOf(parentNode.domainMetaElement)' description='\'Containment Feature\' must be owned by \'Domain Meta Element\' or its super type of this reference parent Node Mapping'"
29
 *        annotation="http://www.eclipse.org/gmf/2005/constraints ocl='not containmentFeature.oclIsUndefined() implies containmentFeature.eContainingClass.isSuperTypeOf(parentNode.domainMetaElement)' description='\'Containment Feature\' must be owned by \'Domain Meta Element\' or its super type of this reference parent Node Mapping'"
29
 *        annotation="http://www.eclipse.org/gmf/2005/constraints ocl='not child.getDomainContext().oclIsUndefined() implies not containmentFeature.oclIsUndefined()' description='ChildReference to NodeMapping with domainElement should define \'containmentFeature\''"
30
 *        annotation="http://www.eclipse.org/gmf/2005/constraints ocl='not child.getDomainContext().oclIsUndefined() implies not containmentFeature.oclIsUndefined()' description='ChildReference to NodeMapping with domainElement should define \'containmentFeature\''"
31
 *        annotation="http://www.eclipse.org/gmf/2005/constraints ocl='affixedSide != AffixedSide::NONE implies compartment.oclIsUndefined()' description='Side-affixed children can not be placed in compartments'"
30
 * @generated
32
 * @generated
31
 */
33
 */
32
public interface ChildReference extends NodeReference {
34
public interface ChildReference extends NodeReference {
Lines 138-141 Link Here
138
	 */
140
	 */
139
	void setReferencedChild(NodeMapping value);
141
	void setReferencedChild(NodeMapping value);
140
142
143
	/**
144
	 * Returns the value of the '<em><b>Affixed Side</b></em>' attribute.
145
	 * The default value is <code>"NONE"</code>.
146
	 * The literals are from the enumeration {@link org.eclipse.gmf.mappings.AffixedSide}.
147
	 * <!-- begin-user-doc -->
148
	 * <p>
149
	 * If the meaning of the '<em>Affixed Side</em>' attribute isn't clear,
150
	 * there really should be more of a description here...
151
	 * </p>
152
	 * <!-- end-user-doc -->
153
	 * @return the value of the '<em>Affixed Side</em>' attribute.
154
	 * @see org.eclipse.gmf.mappings.AffixedSide
155
	 * @see #setAffixedSide(AffixedSide)
156
	 * @see org.eclipse.gmf.mappings.GMFMapPackage#getChildReference_AffixedSide()
157
	 * @model default="NONE"
158
	 * @generated
159
	 */
160
	AffixedSide getAffixedSide();
161
162
	/**
163
	 * Sets the value of the '{@link org.eclipse.gmf.mappings.ChildReference#getAffixedSide <em>Affixed Side</em>}' attribute.
164
	 * <!-- begin-user-doc -->
165
	 * <!-- end-user-doc -->
166
	 * @param value the new value of the '<em>Affixed Side</em>' attribute.
167
	 * @see org.eclipse.gmf.mappings.AffixedSide
168
	 * @see #getAffixedSide()
169
	 * @generated
170
	 */
171
	void setAffixedSide(AffixedSide value);
172
141
} // ChildReference
173
} // ChildReference
(-)src/org/eclipse/gmf/mappings/AffixedSide.java (+259 lines)
Added Link Here
1
/**
2
 * <copyright>
3
 * </copyright>
4
 *
5
 * $Id$
6
 */
7
package org.eclipse.gmf.mappings;
8
9
import java.util.Arrays;
10
import java.util.Collections;
11
import java.util.List;
12
13
import org.eclipse.emf.common.util.AbstractEnumerator;
14
15
/**
16
 * <!-- begin-user-doc -->
17
 * A representation of the literals of the enumeration '<em><b>Affixed Side</b></em>',
18
 * and utility methods for working with them.
19
 * <!-- end-user-doc -->
20
 * @see org.eclipse.gmf.mappings.GMFMapPackage#getAffixedSide()
21
 * @model
22
 * @generated
23
 */
24
public final class AffixedSide extends AbstractEnumerator {
25
	/**
26
	 * The '<em><b>NONE</b></em>' literal value.
27
	 * <!-- begin-user-doc -->
28
	 * <p>
29
	 * If the meaning of '<em><b>NONE</b></em>' literal object isn't clear,
30
	 * there really should be more of a description here...
31
	 * </p>
32
	 * <!-- end-user-doc -->
33
	 * @see #NONE_LITERAL
34
	 * @model
35
	 * @generated
36
	 * @ordered
37
	 */
38
	public static final int NONE = 0;
39
40
	/**
41
	 * The '<em><b>NORTH</b></em>' literal value.
42
	 * <!-- begin-user-doc -->
43
	 * <p>
44
	 * If the meaning of '<em><b>NORTH</b></em>' literal object isn't clear,
45
	 * there really should be more of a description here...
46
	 * </p>
47
	 * <!-- end-user-doc -->
48
	 * @see #NORTH_LITERAL
49
	 * @model
50
	 * @generated
51
	 * @ordered
52
	 */
53
	public static final int NORTH = 1;
54
55
	/**
56
	 * The '<em><b>SOUTH</b></em>' literal value.
57
	 * <!-- begin-user-doc -->
58
	 * <p>
59
	 * If the meaning of '<em><b>SOUTH</b></em>' literal object isn't clear,
60
	 * there really should be more of a description here...
61
	 * </p>
62
	 * <!-- end-user-doc -->
63
	 * @see #SOUTH_LITERAL
64
	 * @model
65
	 * @generated
66
	 * @ordered
67
	 */
68
	public static final int SOUTH = 4;
69
70
	/**
71
	 * The '<em><b>WEST</b></em>' literal value.
72
	 * <!-- begin-user-doc -->
73
	 * <p>
74
	 * If the meaning of '<em><b>WEST</b></em>' literal object isn't clear,
75
	 * there really should be more of a description here...
76
	 * </p>
77
	 * <!-- end-user-doc -->
78
	 * @see #WEST_LITERAL
79
	 * @model
80
	 * @generated
81
	 * @ordered
82
	 */
83
	public static final int WEST = 8;
84
85
	/**
86
	 * The '<em><b>EAST</b></em>' literal value.
87
	 * <!-- begin-user-doc -->
88
	 * <p>
89
	 * If the meaning of '<em><b>EAST</b></em>' literal object isn't clear,
90
	 * there really should be more of a description here...
91
	 * </p>
92
	 * <!-- end-user-doc -->
93
	 * @see #EAST_LITERAL
94
	 * @model
95
	 * @generated
96
	 * @ordered
97
	 */
98
	public static final int EAST = 16;
99
100
	/**
101
	 * The '<em><b>ANY</b></em>' literal value.
102
	 * <!-- begin-user-doc -->
103
	 * <p>
104
	 * If the meaning of '<em><b>ANY</b></em>' literal object isn't clear,
105
	 * there really should be more of a description here...
106
	 * </p>
107
	 * <!-- end-user-doc -->
108
	 * @see #ANY_LITERAL
109
	 * @model
110
	 * @generated
111
	 * @ordered
112
	 */
113
	public static final int ANY = 31;
114
115
	/**
116
	 * The '<em><b>NONE</b></em>' literal object.
117
	 * <!-- begin-user-doc -->
118
	 * <!-- end-user-doc -->
119
	 * @see #NONE
120
	 * @generated
121
	 * @ordered
122
	 */
123
	public static final AffixedSide NONE_LITERAL = new AffixedSide(NONE, "NONE", "NONE");
124
125
	/**
126
	 * The '<em><b>NORTH</b></em>' literal object.
127
	 * <!-- begin-user-doc -->
128
	 * <!-- end-user-doc -->
129
	 * @see #NORTH
130
	 * @generated
131
	 * @ordered
132
	 */
133
	public static final AffixedSide NORTH_LITERAL = new AffixedSide(NORTH, "NORTH", "NORTH");
134
135
	/**
136
	 * The '<em><b>SOUTH</b></em>' literal object.
137
	 * <!-- begin-user-doc -->
138
	 * <!-- end-user-doc -->
139
	 * @see #SOUTH
140
	 * @generated
141
	 * @ordered
142
	 */
143
	public static final AffixedSide SOUTH_LITERAL = new AffixedSide(SOUTH, "SOUTH", "SOUTH");
144
145
	/**
146
	 * The '<em><b>WEST</b></em>' literal object.
147
	 * <!-- begin-user-doc -->
148
	 * <!-- end-user-doc -->
149
	 * @see #WEST
150
	 * @generated
151
	 * @ordered
152
	 */
153
	public static final AffixedSide WEST_LITERAL = new AffixedSide(WEST, "WEST", "WEST");
154
155
	/**
156
	 * The '<em><b>EAST</b></em>' literal object.
157
	 * <!-- begin-user-doc -->
158
	 * <!-- end-user-doc -->
159
	 * @see #EAST
160
	 * @generated
161
	 * @ordered
162
	 */
163
	public static final AffixedSide EAST_LITERAL = new AffixedSide(EAST, "EAST", "EAST");
164
165
	/**
166
	 * The '<em><b>ANY</b></em>' literal object.
167
	 * <!-- begin-user-doc -->
168
	 * <!-- end-user-doc -->
169
	 * @see #ANY
170
	 * @generated
171
	 * @ordered
172
	 */
173
	public static final AffixedSide ANY_LITERAL = new AffixedSide(ANY, "ANY", "ANY");
174
175
	/**
176
	 * An array of all the '<em><b>Affixed Side</b></em>' enumerators.
177
	 * <!-- begin-user-doc -->
178
	 * <!-- end-user-doc -->
179
	 * @generated
180
	 */
181
	private static final AffixedSide[] VALUES_ARRAY =
182
		new AffixedSide[] {
183
			NONE_LITERAL,
184
			NORTH_LITERAL,
185
			SOUTH_LITERAL,
186
			WEST_LITERAL,
187
			EAST_LITERAL,
188
			ANY_LITERAL,
189
		};
190
191
	/**
192
	 * A public read-only list of all the '<em><b>Affixed Side</b></em>' enumerators.
193
	 * <!-- begin-user-doc -->
194
	 * <!-- end-user-doc -->
195
	 * @generated
196
	 */
197
	public static final List VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
198
199
	/**
200
	 * Returns the '<em><b>Affixed Side</b></em>' literal with the specified literal value.
201
	 * <!-- begin-user-doc -->
202
	 * <!-- end-user-doc -->
203
	 * @generated
204
	 */
205
	public static AffixedSide get(String literal) {
206
		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
207
			AffixedSide result = VALUES_ARRAY[i];
208
			if (result.toString().equals(literal)) {
209
				return result;
210
			}
211
		}
212
		return null;
213
	}
214
215
	/**
216
	 * Returns the '<em><b>Affixed Side</b></em>' literal with the specified name.
217
	 * <!-- begin-user-doc -->
218
	 * <!-- end-user-doc -->
219
	 * @generated
220
	 */
221
	public static AffixedSide getByName(String name) {
222
		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
223
			AffixedSide result = VALUES_ARRAY[i];
224
			if (result.getName().equals(name)) {
225
				return result;
226
			}
227
		}
228
		return null;
229
	}
230
231
	/**
232
	 * Returns the '<em><b>Affixed Side</b></em>' literal with the specified integer value.
233
	 * <!-- begin-user-doc -->
234
	 * <!-- end-user-doc -->
235
	 * @generated
236
	 */
237
	public static AffixedSide get(int value) {
238
		switch (value) {
239
			case NONE: return NONE_LITERAL;
240
			case NORTH: return NORTH_LITERAL;
241
			case SOUTH: return SOUTH_LITERAL;
242
			case WEST: return WEST_LITERAL;
243
			case EAST: return EAST_LITERAL;
244
			case ANY: return ANY_LITERAL;
245
		}
246
		return null;	
247
	}
248
249
	/**
250
	 * Only this class can construct instances.
251
	 * <!-- begin-user-doc -->
252
	 * <!-- end-user-doc -->
253
	 * @generated
254
	 */
255
	private AffixedSide(int value, String name, String literal) {
256
		super(value, name, literal);
257
	}
258
259
} //AffixedSide

Return to bug 124826