### Eclipse Workspace Patch 1.0
#P org.eclipse.gmf.codegen.lite
Index: templates/editor/Editor.javajet
===================================================================
RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.codegen.lite/templates/editor/Editor.javajet,v
retrieving revision 1.8
diff -u -r1.8 Editor.javajet
--- templates/editor/Editor.javajet	1 Sep 2006 16:14:09 -0000	1.8
+++ templates/editor/Editor.javajet	11 Sep 2006 10:18:30 -0000
@@ -131,6 +131,9 @@
 		addAction(zoomOut);
 		getSite().getKeyBindingService().registerAction(zoomIn);
 		getSite().getKeyBindingService().registerAction(zoomOut);
+		<%=importManager.getImportedName("org.eclipse.gef.KeyHandler")%> keyHandler = getGraphicalViewer().getKeyHandler();
+		keyHandler.put(<%=importManager.getImportedName("org.eclipse.gef.KeyStroke")%>.getPressed(<%=importManager.getImportedName("org.eclipse.swt.SWT")%>.DEL, 127, 0), getActionRegistry().getAction(<%=importManager.getImportedName("org.eclipse.ui.actions.ActionFactory")%>.DELETE.getId()));
+		keyHandler.put(<%=importManager.getImportedName("org.eclipse.gef.KeyStroke")%>.getPressed(<%=importManager.getImportedName("org.eclipse.swt.SWT")%>.F2, 0), getActionRegistry().getAction(<%=importManager.getImportedName("org.eclipse.gef.ui.actions.GEFActionConstants")%>.DIRECT_EDIT));
 	}
 
 <%
@@ -397,8 +400,6 @@
 		getSite().registerContextMenu(<%=importManager.getImportedName(genDiagram.getEditorGen().getPlugin().getActivatorQualifiedClassName())%>.ID + ".editor.contextmenu", provider, getSite().getSelectionProvider()); //$NON-NLS-1$
 
 		<%=importManager.getImportedName("org.eclipse.gef.KeyHandler")%> keyHandler = new <%=importManager.getImportedName("org.eclipse.gef.ui.parts.GraphicalViewerKeyHandler")%>(viewer);
-		keyHandler.put(<%=importManager.getImportedName("org.eclipse.gef.KeyStroke")%>.getPressed(<%=importManager.getImportedName("org.eclipse.swt.SWT")%>.DEL, 127, 0), getActionRegistry().getAction(<%=importManager.getImportedName("org.eclipse.ui.actions.ActionFactory")%>.DELETE.getId()));
-		keyHandler.put(<%=importManager.getImportedName("org.eclipse.gef.KeyStroke")%>.getPressed(<%=importManager.getImportedName("org.eclipse.swt.SWT")%>.F2, 0), getActionRegistry().getAction(<%=importManager.getImportedName("org.eclipse.gef.ui.actions.GEFActionConstants")%>.DIRECT_EDIT));
 		viewer.setKeyHandler(keyHandler);
 
 		viewer.setProperty(<%=importManager.getImportedName("org.eclipse.gef.MouseWheelHandler")%>.KeyGenerator.getKey(<%=importManager.getImportedName("org.eclipse.swt.SWT")%>.CTRL), <%=importManager.getImportedName("org.eclipse.gef.MouseWheelZoomHandler")%>.SINGLETON);
Index: templates/parts/directEditPolicy.javajetinc
===================================================================
RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.codegen.lite/templates/parts/directEditPolicy.javajetinc,v
retrieving revision 1.4
diff -u -r1.4 directEditPolicy.javajetinc
--- templates/parts/directEditPolicy.javajetinc	1 Sep 2006 16:14:09 -0000	1.4
+++ templates/parts/directEditPolicy.javajetinc	11 Sep 2006 10:18:31 -0000
@@ -4,106 +4,5 @@
 						String value = (String) request.getCellEditor().getValue();
 						getLabel().setText(value);
 					}
-					protected <%=importManager.getImportedName("org.eclipse.gef.commands.Command")%> getDirectEditCommand(<%=importManager.getImportedName("org.eclipse.gef.requests.DirectEditRequest")%> request) {
-						String value = (String) request.getCellEditor().getValue();
-						if (value == null) {
-							//Invalid value is transformed into a null by the validator.
-							//XXX: implement validator
-							return <%=importManager.getImportedName("org.eclipse.gef.commands.UnexecutableCommand")%>.INSTANCE;
-						}
-						final Object[] parseResult;
-						try {
-							parseResult = new <%=importManager.getImportedName("java.text.MessageFormat")%>(EDIT_PATTERN).parse(value);
-						} catch (IllegalArgumentException e) {
-							return <%=importManager.getImportedName("org.eclipse.gef.commands.UnexecutableCommand")%>.INSTANCE;
-						} catch (<%=importManager.getImportedName("java.text.ParseException")%> e) {
-							return <%=importManager.getImportedName("org.eclipse.gef.commands.UnexecutableCommand")%>.INSTANCE;
-						}
-						<%=importManager.getImportedName("org.eclipse.emf.transaction.TransactionalEditingDomain")%> editingDomain = <%=importManager.getImportedName("org.eclipse.emf.transaction.util.TransactionUtil")%>.getEditingDomain(<%=primaryView%>.getDiagram().getElement());
-<%
-if (labelModelFacet instanceof FeatureLabelModelFacet) {
-	GenFeature featureToSet = ((FeatureLabelModelFacet)labelModelFacet).getMetaFeature();
-	EStructuralFeature ecoreFeature = featureToSet.getEcoreFeature();
-%>
-						if (parseResult.length != 1) {
-							return <%=importManager.getImportedName("org.eclipse.gef.commands.UnexecutableCommand")%>.INSTANCE;
-						}
-						<%=importManager.getImportedName("org.eclipse.emf.common.command.Command")%> domainModelCommand = createDomainModelCommand(editingDomain, parseResult[0]);
-						return new <%=importManager.getImportedName("org.eclipse.gmf.runtime.lite.commands.WrappingCommand")%>(editingDomain, domainModelCommand);
-					}
-					<%=importManager.getImportedName("org.eclipse.emf.common.command.Command")%> createDomainModelCommand(<%=importManager.getImportedName("org.eclipse.emf.transaction.TransactionalEditingDomain")%> editingDomain, Object value) {
-						<%=importManager.getImportedName(underlyingMetaClass.getQualifiedInterfaceName())%> element = <%=resolvedSemanticElement%>;
-						<%=importManager.getImportedName("org.eclipse.emf.ecore.EAttribute")%> feature = (<%=importManager.getImportedName("org.eclipse.emf.ecore.EAttribute")%>) <%=importManager.getImportedName(featureToSet.getGenPackage().getQualifiedPackageInterfaceName())%>.eINSTANCE.get<%=featureToSet.getFeatureAccessorName()%>();
-						Object valueToSet;
-						try {
-							valueToSet = <%=importManager.getImportedName("org.eclipse.gmf.runtime.lite.services.ParserUtil")%>.parseValue(feature, value);
-						} catch (IllegalArgumentException e) {
-							return <%=importManager.getImportedName("org.eclipse.emf.common.command.UnexecutableCommand")%>.INSTANCE;
-						}
-<%
-	if (ecoreFeature.isMany()) {
-%>
-						<%=importManager.getImportedName("org.eclipse.emf.common.command.CompoundCommand")%> result = new <%=importManager.getImportedName("org.eclipse.emf.common.command.CompoundCommand")%>();
-						<%=importManager.getImportedName("org.eclipse.emf.common.util.EList")%> values = new <%=importManager.getImportedName("org.eclipse.emf.common.util.BasicEList")%>();
-						values.addAll(element.get<%=featureToSet.getAccessorName()%>());
-						result.append(<%=importManager.getImportedName("org.eclipse.emf.edit.command.RemoveCommand")%>.create(editingDomain, element, feature, values));
-						result.append(<%=importManager.getImportedName("org.eclipse.emf.edit.command.AddCommand")%>.create(editingDomain, element, feature, valueToSet));
-						return result;
-<%
-	} else {
-%>
-						return <%=importManager.getImportedName("org.eclipse.emf.edit.command.SetCommand")%>.create(editingDomain, element, feature, valueToSet);
-<%
-	}
-%>
-					}
-<%
-} else if (labelModelFacet instanceof CompositeFeatureLabelModelFacet) {
-	CompositeFeatureLabelModelFacet compositeFeatureLabelModelFacet = (CompositeFeatureLabelModelFacet) labelModelFacet;
-	List metaFeatures = compositeFeatureLabelModelFacet.getMetaFeatures();
-%>
-						if (parseResult.length != <%=metaFeatures.size()%>) {
-							return <%=importManager.getImportedName("org.eclipse.gef.commands.UnexecutableCommand")%>.INSTANCE;
-						}
-						<%=importManager.getImportedName("org.eclipse.emf.common.command.Command")%> domainModelCommand = createDomainModelCommand(editingDomain, parseResult);
-						return new <%=importManager.getImportedName("org.eclipse.gmf.runtime.lite.commands.WrappingCommand")%>(editingDomain, domainModelCommand);
-					}
-					<%=importManager.getImportedName("org.eclipse.emf.common.command.Command")%> createDomainModelCommand(<%=importManager.getImportedName("org.eclipse.emf.transaction.TransactionalEditingDomain")%> editingDomain, Object[] values) {
-						<%=importManager.getImportedName(underlyingMetaClass.getQualifiedInterfaceName())%> element = <%=resolvedSemanticElement%>;
-						<%=importManager.getImportedName("org.eclipse.emf.common.command.CompoundCommand")%> result = new <%=importManager.getImportedName("org.eclipse.emf.common.command.CompoundCommand")%>();
-						Object valueToSet;
-<%
-	boolean haveDeclaredValues = false;
-	for(int i = 0; i < metaFeatures.size(); i++) {
-		GenFeature nextFeatureToSet = (GenFeature) metaFeatures.get(i);
-		EStructuralFeature nextEcoreFeature = nextFeatureToSet.getEcoreFeature();
-%>
-						<%if (i == 0) {%><%=importManager.getImportedName("org.eclipse.emf.ecore.EAttribute")%> <%}%>feature = (<%=importManager.getImportedName("org.eclipse.emf.ecore.EAttribute")%>) <%=importManager.getImportedName(nextFeatureToSet.getGenPackage().getQualifiedPackageInterfaceName())%>.eINSTANCE.get<%=nextFeatureToSet.getFeatureAccessorName()%>();
-						try {
-							valueToSet = <%=importManager.getImportedName("org.eclipse.gmf.runtime.lite.services.ParserUtil")%>.parseValue(feature, values[<%=i%>]);
-						} catch (IllegalArgumentException e) {
-							return <%=importManager.getImportedName("org.eclipse.emf.common.command.UnexecutableCommand")%>.INSTANCE;
-						}
-<%
-		if (nextEcoreFeature.isMany()) {
-%>
-						<%if (!haveDeclaredValues) { haveDeclaredValues = true;%><%=importManager.getImportedName("org.eclipse.emf.common.util.EList")%> <%}%>values = new <%=importManager.getImportedName("org.eclipse.emf.common.util.BasicEList")%>();
-						values.addAll(element.get<%=nextFeatureToSet.getAccessorName()%>());
-						result.append(<%=importManager.getImportedName("org.eclipse.emf.edit.command.RemoveCommand")%>.create(editingDomain, element, feature, values));
-						result.append(<%=importManager.getImportedName("org.eclipse.emf.edit.command.AddCommand")%>.create(editingDomain, element, feature, valueToSet));
-<%
-		} else {
-%>
-						result.append(<%=importManager.getImportedName("org.eclipse.emf.edit.command.SetCommand")%>.create(editingDomain, element, feature, valueToSet));
-<%
-		}
-%>
-<%
-	}
-%>
-						return result;
-					}
-<%
-}
-%>
+<%@ include file="directEditCommand.jetinc" %>
 				});
Index: templates/parts/labelText.javajetinc
===================================================================
RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.codegen.lite/templates/parts/labelText.javajetinc,v
retrieving revision 1.2
diff -u -r1.2 labelText.javajetinc
--- templates/parts/labelText.javajetinc	4 Aug 2006 17:05:48 -0000	1.2
+++ templates/parts/labelText.javajetinc	11 Sep 2006 10:18:31 -0000
@@ -49,7 +49,7 @@
 	/**
 	 * @generated
 	 */
-	private static final String EDIT_PATTERN = "<%=editPattern%>";
+	public static final String EDIT_PATTERN = "<%=editPattern%>";
 
 	/**
 	 * @generated
Index: templates/parts/NodeEditPart.javajet
===================================================================
RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.codegen.lite/templates/parts/NodeEditPart.javajet,v
retrieving revision 1.20
diff -u -r1.20 NodeEditPart.javajet
--- templates/parts/NodeEditPart.javajet	6 Sep 2006 20:09:23 -0000	1.20
+++ templates/parts/NodeEditPart.javajet	11 Sep 2006 10:18:30 -0000
@@ -9,6 +9,8 @@
 boolean isXYLayout = ViewmapLayoutTypeHelper.getSharedInstance().isStoringChildPositions(genNode);
 final ImportAssistant importManager = (ImportAssistant) ((Object[]) argument)[1];
 importManager.registerInnerClass("LinkNotationModelRefresher");	//from linkNotationModelRefresher.jetinc
+importManager.registerInnerClass("NotationModelRefresher");	//from notationModelRefresher.jetinc
+importManager.registerInnerClass("TreeEditPartAdapter");
 %>
 
 <%@ include file="../common/featureGetAccessor.jetinc"%>
@@ -32,7 +34,7 @@
 
 		for (Iterator labels = genNode.getLabels().iterator(); labels.hasNext();) {
 			GenNodeLabel next = (GenNodeLabel) labels.next();
-			if (myPrimaryLabel == null){
+			if (myPrimaryLabel == null && !next.isReadOnly()){
 				myPrimaryLabel = next;
 			}
 			if (next instanceof GenExternalNodeLabel) {
@@ -537,6 +539,20 @@
 			}
 		});
 <%
+if (myHelper.getPrimaryLabel() != null) {
+%>
+		//This edit part understands the direct edit request and delegates it to the appropriate label, so no command is needed here.
+		installEditPolicy(<%=importManager.getImportedName("org.eclipse.gef.EditPolicy")%>.DIRECT_EDIT_ROLE, new <%=importManager.getImportedName("org.eclipse.gef.editpolicies.DirectEditPolicy")%>() {
+			protected void showCurrentEditValue(<%=importManager.getImportedName("org.eclipse.gef.requests.DirectEditRequest")%> request) {
+			}
+			protected <%=importManager.getImportedName("org.eclipse.gef.commands.Command")%> getDirectEditCommand(<%=importManager.getImportedName("org.eclipse.gef.requests.DirectEditRequest")%> request) {
+				return null;
+			}
+		});
+<%
+}
+%>
+<%
 if (!genNode.getChildNodes().isEmpty()) {
 %>
 		installNotationModelRefresher();
@@ -768,19 +784,11 @@
 	 */
 	private <%=importManager.getImportedName("org.eclipse.gef.EditPart")%> getPrimaryLabelEditPart() {
 <%
-		GenNodeLabel firstEditableLabel = null;
-		for (Iterator it = myHelper.getAllInnerLabels(); it.hasNext(); ) {
-			GenNodeLabel genLabel = (GenNodeLabel) it.next();
-			if (!genLabel.isReadOnly()) {
-				firstEditableLabel = genLabel;
-				break;
-			}
-		}
-		if (firstEditableLabel != null) {
+		if (myHelper.getPrimaryLabel() != null) {
 %>
 		for(<%=importManager.getImportedName("java.util.Iterator")%> it = getDiagramNode().getChildren().iterator(); it.hasNext(); ) {
 			<%=importManager.getImportedName("org.eclipse.gmf.runtime.notation.View")%> nextChild = (<%=importManager.getImportedName("org.eclipse.gmf.runtime.notation.View")%>)it.next();
-			if (<%=importManager.getImportedName(genDiagram.getVisualIDRegistryQualifiedClassName())%>.getVisualID(nextChild) == <%=importManager.getImportedName(firstEditableLabel.getEditPartQualifiedClassName())%>.VISUAL_ID) {
+			if (<%=importManager.getImportedName(genDiagram.getVisualIDRegistryQualifiedClassName())%>.getVisualID(nextChild) == <%=importManager.getImportedName(myHelper.getPrimaryLabel().getEditPartQualifiedClassName())%>.VISUAL_ID) {
 				return (<%=importManager.getImportedName("org.eclipse.gef.EditPart")%>) getViewer().getEditPartRegistry().get(nextChild);
 			}
 		}
@@ -1074,6 +1082,9 @@
 	 * @generated
 	 */
 	public Object getAdapter(Class key) {
+		if (<%=importManager.getImportedName("org.eclipse.gef.TreeEditPart")%>.class == key) {
+			return getTreeEditPartAdapter();
+		}
 <%/*@ include file="adapters/propertySource.javajetinc"*/%>
 		return super.getAdapter(key);
 	}
@@ -1081,6 +1092,21 @@
 	/**
 	 * @generated
 	 */
+	private TreeEditPartAdapter myTreeEditPartAdapter;
+
+	/**
+	 * @generated
+	 */
+	private TreeEditPartAdapter getTreeEditPartAdapter() {
+		if (myTreeEditPartAdapter == null) {
+			myTreeEditPartAdapter = new TreeEditPartAdapter();
+		}
+		return myTreeEditPartAdapter;
+	}
+
+	/**
+	 * @generated
+	 */
 	public void activate() {
 		super.activate();
 		getDiagramNode().getElement().eAdapters().add(domainModelRefresher);
@@ -2112,5 +2138,181 @@
 <%
 }
 %>
+
+	/**
+	 * @generated
+	 */
+	private class TreeEditPartAdapter extends <%=importManager.getImportedName("org.eclipse.gmf.runtime.lite.edit.parts.tree.BaseTreeEditPart")%> {
+		/**
+		 * @generated
+		 */
+		public TreeEditPartAdapter() {
+			super(getDiagramNode(), <%=importManager.getImportedName(genDiagram.getEditorGen().getPlugin().getActivatorQualifiedClassName())%>.getInstance().getItemProvidersAdapterFactory());
+		}
+
+		/**
+		 * @generated
+		 */
+		protected void createEditPolicies() {
+<%@ include file="componentEditPolicy.javajetinc"%>
+<%
+if (myHelper.getPrimaryLabel() != null) {
+		String editPatternCode = importManager.getImportedName(myHelper.getPrimaryLabel().getEditPartQualifiedClassName()) + ".EDIT_PATTERN";
+		String resolvedSemanticElement = "(" + importManager.getImportedName(genNode.getDomainMetaClass().getQualifiedInterfaceName()) + ") getDiagramNode().getElement()";
+		LabelModelFacet labelModelFacet = myHelper.getPrimaryLabel().getModelFacet();
+		GenClass underlyingMetaClass = genNode.getDomainMetaClass();
+%>
+<%@ include file="treeDirectEditPolicy.jetinc"%>
+<%
+}
+%>
+		}
+
+<%
+if (myHelper.getPrimaryLabel() != null) {
+%>
+<%@include file="treeDirectEdit.jetinc" %>
+
+		/**
+		 * @generated
+		 */
+		protected String getEditText() {
+			<%=importManager.getImportedName(myHelper.getPrimaryLabel().getEditPartQualifiedClassName())%> primaryLabelEditPart = getPrimaryLabelEditPart();
+			if (primaryLabelEditPart != null) {
+				return primaryLabelEditPart.getLabelEditText();
+			}
+			return "";
+		}
+
+<%
+}
+%>
+		/**
+		 * @generated
+		 */
+		public void activate() {
+			super.activate();
+			getDiagramNode().getElement().eAdapters().add(domainModelRefresher);
+		}
+
+		/**
+		 * @generated
+		 */
+		public void deactivate() {
+			getDiagramNode().getElement().eAdapters().remove(domainModelRefresher);
+			super.deactivate();
+		}
+
+<%@ include file="refreshers.javajetinc/domainModelRefresher.javajetinc"%>
+
+<%
+if (myHelper.getPrimaryLabel() != null) {
+%>
+		/**
+		 * @generated
+		 */
+		protected String getText() {
+			<%=importManager.getImportedName(myHelper.getPrimaryLabel().getEditPartQualifiedClassName())%> primaryLabelEditPart = getPrimaryLabelEditPart();
+			if (primaryLabelEditPart != null) {
+				return primaryLabelEditPart.getLabelText();
+			}
+			return super.getText();
+		}
+
+		/**
+		 * @generated
+		 */
+		private <%=importManager.getImportedName(myHelper.getPrimaryLabel().getEditPartQualifiedClassName())%> getPrimaryLabelEditPart() {
+			for(<%=importManager.getImportedName("java.util.Iterator")%> it = getDiagramNode().getChildren().iterator(); it.hasNext(); ) {
+				<%=importManager.getImportedName("org.eclipse.gmf.runtime.notation.View")%> nextChild = (<%=importManager.getImportedName("org.eclipse.gmf.runtime.notation.View")%>)it.next();
+				if (<%=importManager.getImportedName(genDiagram.getVisualIDRegistryQualifiedClassName())%>.getVisualID(nextChild) == <%=importManager.getImportedName(myHelper.getPrimaryLabel().getEditPartQualifiedClassName())%>.VISUAL_ID) {
+					return (<%=importManager.getImportedName(myHelper.getPrimaryLabel().getEditPartQualifiedClassName())%>) <%=genNode.getEditPartClassName()%>.this.getViewer().getEditPartRegistry().get(nextChild);
+				}
+			}
+			return null;
+		}
+<%
+}
+%>
+
+		/**
+		 * @generated
+		 */
+		protected void createRefreshers() {
+			super.createRefreshers();
+			Refresher labelRefresher = new Refresher() {
+				public void refresh() {
+					refreshVisuals();
+				}
+			};
+<%
+if (myHelper.getPrimaryLabel() != null) {
+	LabelModelFacet labelModelFacet = myHelper.getPrimaryLabel().getModelFacet();
+	if (labelModelFacet instanceof FeatureLabelModelFacet) {
+		GenFeature feature = ((FeatureLabelModelFacet)labelModelFacet).getMetaFeature();
+%>
+			registerRefresher(<%=importManager.getImportedName(feature.getGenPackage().getQualifiedPackageInterfaceName())%>.eINSTANCE.get<%=feature.getFeatureAccessorName()%>(), labelRefresher);
+<%
+	} else if (labelModelFacet instanceof CompositeFeatureLabelModelFacet) {
+		CompositeFeatureLabelModelFacet compositeFeatureLabelModelFacet = (CompositeFeatureLabelModelFacet) labelModelFacet;
+		for(Iterator it = compositeFeatureLabelModelFacet.getMetaFeatures().iterator(); it.hasNext(); ) {
+			GenFeature next = (GenFeature) it.next();
+%>
+			registerRefresher(<%=importManager.getImportedName(next.getGenPackage().getQualifiedPackageInterfaceName())%>.eINSTANCE.get<%=next.getFeatureAccessorName()%>(), labelRefresher);
+<%
+		}
+	}
+} else {
+	GenClass metaClass = genNode.getDomainMetaClass();
+	if (metaClass != null) {
+		List labelNotifyFeatures = metaClass.getLabelNotifyFeatures();
+		for(Iterator it = labelNotifyFeatures.iterator(); it.hasNext(); ) {
+			GenFeature next = (GenFeature) it.next();
+%>
+			registerRefresher(<%=importManager.getImportedName(next.getGenPackage().getQualifiedPackageInterfaceName())%>.eINSTANCE.get<%=next.getFeatureAccessorName()%>(), labelRefresher);
+<%
+		}
+	}
+%>
+<%
+}
+%>
+		}
+
+		/**
+		 * Since compartments and labels are not selectable edit parts, they are filtered from the overview as well.
+		 * @generated
+		 */
+		protected <%=importManager.getImportedName("java.util.List")%> getModelChildren() {
+			<%=importManager.getImportedName("java.util.List")%> result = new <%=importManager.getImportedName("java.util.ArrayList")%>();
+			for(<%=importManager.getImportedName("java.util.Iterator")%> it = getDiagramNode().getVisibleChildren().iterator(); it.hasNext(); ) {
+				<%=importManager.getImportedName("org.eclipse.gmf.runtime.notation.View")%> next = (<%=importManager.getImportedName("org.eclipse.gmf.runtime.notation.View")%>) it.next();
+				switch (<%=importManager.getImportedName(genDiagram.getVisualIDRegistryQualifiedClassName())%>.getVisualID(next)) {
+<%
+	for(Iterator it = genNode.getChildNodes().iterator(); it.hasNext(); ) {
+		GenChildNode next = (GenChildNode)it.next();
+%>
+				case <%=importManager.getImportedName(next.getEditPartQualifiedClassName())%>.VISUAL_ID:
+					result.add(next);
+					break;
+<%
+}
+%>
+<%
+		for (Iterator compartments = genNode.getCompartments().iterator(); compartments.hasNext();){
+			GenCompartment next = (GenCompartment) compartments.next();
+%>
+				case <%=importManager.getImportedName(next.getEditPartQualifiedClassName())%>.VISUAL_ID:
+					result.addAll(next.getChildren());
+					break;
+<%
+}
+%>
+				}
+			}
+			result.addAll(getDiagramNode().getSourceEdges());
+			return result;
+		}
+	}
 }
 <%importManager.emitSortedImports();%>
Index: templates/parts/ChildNodeEditPart.javajet
===================================================================
RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.codegen.lite/templates/parts/ChildNodeEditPart.javajet,v
retrieving revision 1.9
diff -u -r1.9 ChildNodeEditPart.javajet
--- templates/parts/ChildNodeEditPart.javajet	1 Sep 2006 16:14:09 -0000	1.9
+++ templates/parts/ChildNodeEditPart.javajet	11 Sep 2006 10:18:30 -0000
@@ -16,6 +16,7 @@
 <%@ include file="../common/featureGetAccessor.jetinc"%>
 
 <%importManager.emitPackageStatement(stringBuffer);
+importManager.registerInnerClass("TreeEditPartAdapter");
 
 importManager.addImport("org.eclipse.gef.EditPolicy");
 importManager.addImport("org.eclipse.gef.Request");
@@ -57,13 +58,13 @@
 	 * @generated
 	 */
 	protected void createEditPolicies() {
-		//XXX: install correct edit policies!
 <%
 	String resolvedSemanticElement = "(" + importManager.getImportedName(genHost.getDomainMetaClass().getQualifiedInterfaceName()) + ") getDiagramNode().getElement()";
 	final String primaryView = "getDiagramNode()";
 %>
 <%
 if (!isReadOnly) {
+		String editPatternCode = "EDIT_PATTERN";	//declared in labelText.javajetinc, used in directEditCommand.jetinc.
 %>
 <%@ include file="directEditPolicy.javajetinc"%>
 <%
@@ -160,6 +161,9 @@
 	 * @generated
 	 */
 	public Object getAdapter(Class key) {
+		if (<%=importManager.getImportedName("org.eclipse.gef.TreeEditPart")%>.class == key) {
+			return getTreeEditPartAdapter();
+		}
 <%/*@ include file="adapters/propertySource.javajetinc"*/%>
 		return super.getAdapter(key);
 	}
@@ -167,6 +171,21 @@
 	/**
 	 * @generated
 	 */
+	private TreeEditPartAdapter myTreeEditPartAdapter;
+
+	/**
+	 * @generated
+	 */
+	private TreeEditPartAdapter getTreeEditPartAdapter() {
+		if (myTreeEditPartAdapter == null) {
+			myTreeEditPartAdapter = new TreeEditPartAdapter();
+		}
+		return myTreeEditPartAdapter;
+	}
+
+	/**
+	 * @generated
+	 */
 	public void activate() {
 		super.activate();
 		getDiagramNode().getElement().eAdapters().add(domainModelRefresher);
@@ -220,5 +239,102 @@
 final Viewmap viewmap = genChildNode.getViewmap();
 %>
 <%@ include file="labelFigure.jetinc"%>
+
+	/**
+	 * @generated
+	 */
+	private class TreeEditPartAdapter extends <%=importManager.getImportedName("org.eclipse.gmf.runtime.lite.edit.parts.tree.BaseTreeEditPart")%> {
+		/**
+		 * @generated
+		 */
+		public TreeEditPartAdapter() {
+			super(getDiagramNode(), <%=importManager.getImportedName(genDiagram.getEditorGen().getPlugin().getActivatorQualifiedClassName())%>.getInstance().getItemProvidersAdapterFactory());
+		}
+
+		/**
+		 * @generated
+		 */
+		protected void createEditPolicies() {
+<%@ include file="componentEditPolicy.javajetinc"%>
+<%
+if (!isReadOnly) {
+		String editPatternCode = "EDIT_PATTERN";	//declared in labelText.javajetinc, used in directEditCommand.jetinc.
+%>
+<%@ include file="treeDirectEditPolicy.jetinc"%>
+<%
+}
+%>
+		}
+
+<%@include file="treeDirectEdit.jetinc" %>
+
+		/**
+		 * @generated
+		 */
+		protected String getEditText() {
+			return getLabelEditText();
+		}
+
+		/**
+		 * @generated
+		 */
+		public void activate() {
+			super.activate();
+			getDiagramNode().getElement().eAdapters().add(domainModelRefresher);
+		}
+
+		/**
+		 * @generated
+		 */
+		public void deactivate() {
+			getDiagramNode().getElement().eAdapters().remove(domainModelRefresher);
+			super.deactivate();
+		}
+
+<%@ include file="refreshers.javajetinc/domainModelRefresher.javajetinc"%>
+
+		/**
+		 * @generated
+		 */
+		protected void createRefreshers() {
+			super.createRefreshers();
+			Refresher labelRefresher = new Refresher() {
+				public void refresh() {
+					refreshVisuals();
+				}
+			};
+<%
+if (labelModelFacet instanceof FeatureLabelModelFacet) {
+	GenFeature feature = ((FeatureLabelModelFacet)labelModelFacet).getMetaFeature();
+%>
+			registerRefresher(<%=importManager.getImportedName(feature.getGenPackage().getQualifiedPackageInterfaceName())%>.eINSTANCE.get<%=feature.getFeatureAccessorName()%>(), labelRefresher);
+<%
+} else if (labelModelFacet instanceof CompositeFeatureLabelModelFacet) {
+	CompositeFeatureLabelModelFacet compositeFeatureLabelModelFacet = (CompositeFeatureLabelModelFacet) labelModelFacet;
+	for(Iterator it = compositeFeatureLabelModelFacet.getMetaFeatures().iterator(); it.hasNext(); ) {
+		GenFeature next = (GenFeature) it.next();
+%>
+			registerRefresher(<%=importManager.getImportedName(next.getGenPackage().getQualifiedPackageInterfaceName())%>.eINSTANCE.get<%=next.getFeatureAccessorName()%>(), labelRefresher);
+<%
+	}
+}
+%>
+		}
+
+		/**
+		 * @generated
+		 */
+		protected String getText() {
+			return getLabelText();
+		}
+
+		/**
+		 * Since compartments and labels are not selectable edit parts, they are filtered from the overview as well.
+		 * @generated
+		 */
+		protected <%=importManager.getImportedName("java.util.List")%> getModelChildren() {
+			return <%=importManager.getImportedName("java.util.Collections")%>.EMPTY_LIST;
+		}
+	}
 }
 <%importManager.emitSortedImports();%>
Index: templates/parts/NodeLabelEditPart.javajet
===================================================================
RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.codegen.lite/templates/parts/NodeLabelEditPart.javajet,v
retrieving revision 1.9
diff -u -r1.9 NodeLabelEditPart.javajet
--- templates/parts/NodeLabelEditPart.javajet	1 Sep 2006 16:14:09 -0000	1.9
+++ templates/parts/NodeLabelEditPart.javajet	11 Sep 2006 10:18:31 -0000
@@ -48,6 +48,7 @@
 	final String primaryView = "getUpdatableParent().getDiagramNode()";
 	final String resolvedSemanticElement = "resolveSemanticElement()";
 	if (!isReadOnly) {
+		String editPatternCode = "EDIT_PATTERN";	//declared in labelText.javajetinc, used in directEditCommand.jetinc.
 %>
 <%@ include file="directEditPolicy.javajetinc"%>
 <%
Index: templates/parts/LinkLabelEditPart.javajet
===================================================================
RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.codegen.lite/templates/parts/LinkLabelEditPart.javajet,v
retrieving revision 1.10
diff -u -r1.10 LinkLabelEditPart.javajet
--- templates/parts/LinkLabelEditPart.javajet	1 Sep 2006 16:14:09 -0000	1.10
+++ templates/parts/LinkLabelEditPart.javajet	11 Sep 2006 10:18:30 -0000
@@ -75,6 +75,7 @@
 		});
 <%
 if (labelModelFacet instanceof FeatureLabelModelFacet || labelModelFacet instanceof CompositeFeatureLabelModelFacet && !isReadOnly) {
+		String editPatternCode = "EDIT_PATTERN";	//declared in labelText.javajetinc, used in directEditCommand.jetinc.
 %>
 <%@ include file="directEditPolicy.javajetinc"%>
 <%
Index: templates/parts/DiagramEditPart.javajet
===================================================================
RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.codegen.lite/templates/parts/DiagramEditPart.javajet,v
retrieving revision 1.10
diff -u -r1.10 DiagramEditPart.javajet
--- templates/parts/DiagramEditPart.javajet	6 Sep 2006 20:09:23 -0000	1.10
+++ templates/parts/DiagramEditPart.javajet	11 Sep 2006 10:18:30 -0000
@@ -5,6 +5,7 @@
 final ImportAssistant importManager = (ImportAssistant) ((Object[]) argument)[1];
 importManager.registerInnerClass("NotationModelRefresher");	//from notationModelRefresher.jetinc
 importManager.registerInnerClass("LinkNotationModelRefresher");	//from linkNotationModelRefresher.jetinc
+importManager.registerInnerClass("TreeEditPartAdapter");
 List childNodes = genDiagram.getTopLevelNodes();
 %>
 
@@ -205,6 +206,9 @@
 		if (<%=importManager.getImportedName("org.eclipse.gef.SnapToHelper")%>.class == key) {
 			return new <%=importManager.getImportedName("org.eclipse.gef.SnapToGrid")%>(this);
 		}
+		if (<%=importManager.getImportedName("org.eclipse.gef.TreeEditPart")%>.class == key) {
+			return getTreeEditPartAdapter();
+		}
 <%/*@ include file="adapters/propertySource.javajetinc"*/%>
 		return super.getAdapter(key);
 	}
@@ -212,6 +216,21 @@
 	/**
 	 * @generated
 	 */
+	private TreeEditPartAdapter myTreeEditPartAdapter;
+
+	/**
+	 * @generated
+	 */
+	private TreeEditPartAdapter getTreeEditPartAdapter() {
+		if (myTreeEditPartAdapter == null) {
+			myTreeEditPartAdapter = new TreeEditPartAdapter();
+		}
+		return myTreeEditPartAdapter;
+	}
+
+	/**
+	 * @generated
+	 */
 	protected List getModelChildren() {
 		return getDiagram().getVisibleChildren();
 	}
@@ -308,5 +327,63 @@
 		}
 		return updateManager;
 	}
+
+	/**
+	 * @generated
+	 */
+	private class TreeEditPartAdapter extends <%=importManager.getImportedName("org.eclipse.gmf.runtime.lite.edit.parts.tree.BaseTreeEditPart")%> {
+		/**
+		 * @generated
+		 */
+		public TreeEditPartAdapter() {
+			super(getDiagram(), <%=importManager.getImportedName(genDiagram.getEditorGen().getPlugin().getActivatorQualifiedClassName())%>.getInstance().getItemProvidersAdapterFactory());
+		}
+
+		/**
+		 * @generated
+		 */
+		protected void createEditPolicies() {
+			installEditPolicy(EditPolicy.COMPONENT_ROLE, new RootComponentEditPolicy());
+		}
+
+		/**
+		 * @generated
+		 */
+		public void activate() {
+			super.activate();
+			if (!getDiagram().eAdapters().contains(getTreeUpdateManager())) {
+				getDiagram().eAdapters().add(getTreeUpdateManager());
+			}
+			if (!getDiagram().getElement().eAdapters().contains(domainModelRefresher)) {
+				getDiagram().getElement().eAdapters().add(domainModelRefresher);
+			}
+		}
+
+		/**
+		 * @generated
+		 */
+		public void deactivate() {
+			getDiagram().getElement().eAdapters().remove(domainModelRefresher);
+			getDiagram().eAdapters().remove(getTreeUpdateManager());
+			super.deactivate();
+		}
+
+<%@ include file="refreshers.javajetinc/domainModelRefresher.javajetinc"%>
+
+		/**
+		 * @generated
+		 */
+		private <%=importManager.getImportedName("org.eclipse.gmf.runtime.lite.edit.parts.update.UpdateManager")%> treeUpdateManager;
+
+		/**
+		 * @generated
+		 */
+		private <%=importManager.getImportedName("org.eclipse.gmf.runtime.lite.edit.parts.update.UpdateManager")%> getTreeUpdateManager() {
+			if (treeUpdateManager == null) {
+				treeUpdateManager = new <%=importManager.getImportedName("org.eclipse.gmf.runtime.lite.edit.parts.update.UpdateManager")%>(getViewer());
+			}
+			return treeUpdateManager;
+		}
+	}
 }
 <%importManager.emitSortedImports();%>
Index: templates/parts/LinkEditPart.javajet
===================================================================
RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.codegen.lite/templates/parts/LinkEditPart.javajet,v
retrieving revision 1.8
diff -u -r1.8 LinkEditPart.javajet
--- templates/parts/LinkEditPart.javajet	1 Sep 2006 16:14:09 -0000	1.8
+++ templates/parts/LinkEditPart.javajet	11 Sep 2006 10:18:30 -0000
@@ -4,6 +4,7 @@
 GenLink genLink = (GenLink) ((Object[]) argument)[0];
 GenDiagram genDiagram = genLink.getDiagram();
 final ImportAssistant importManager = (ImportAssistant) ((Object[]) argument)[1];
+importManager.registerInnerClass("TreeEditPartAdapter");
 %>
 <%@ include file="../copyright4java.jetinc"%>
 <%
@@ -37,26 +38,41 @@
 	}
 
 <%@ include file="registerModel.jetinc"%>
+<%
+GenLinkLabel primaryLabel = null;
+for(Iterator it = genLink.getLabels().iterator(); it.hasNext(); ) {
+	GenLinkLabel next = (GenLinkLabel)it.next();
+	if (!next.isReadOnly()) {
+		primaryLabel = next;
+		break;
+	}
+}
+%>
 
 	/**
 	 * @generated
 	 */
 	protected void createEditPolicies() {
-		//XXX: install correct edit policies!
 <%@ include file="linkComponentEditPolicy.javajetinc"%>
 		installEditPolicy(<%=importManager.getImportedName("org.eclipse.gef.EditPolicy")%>.CONNECTION_ENDPOINTS_ROLE, new <%=importManager.getImportedName("org.eclipse.gef.editpolicies.ConnectionEndpointEditPolicy")%>());
 		installEditPolicy(<%=importManager.getImportedName("org.eclipse.gef.EditPolicy")%>.CONNECTION_BENDPOINTS_ROLE, new <%=importManager.getImportedName("org.eclipse.gmf.runtime.lite.edit.policies.BendpointEditPolicy")%>());
+<%
+if (primaryLabel != null) {
+%>
+		//This edit part understands the direct edit request and delegates it to the appropriate label, so no command is needed here.
+		installEditPolicy(<%=importManager.getImportedName("org.eclipse.gef.EditPolicy")%>.DIRECT_EDIT_ROLE, new <%=importManager.getImportedName("org.eclipse.gef.editpolicies.DirectEditPolicy")%>() {
+			protected void showCurrentEditValue(<%=importManager.getImportedName("org.eclipse.gef.requests.DirectEditRequest")%> request) {
+			}
+			protected <%=importManager.getImportedName("org.eclipse.gef.commands.Command")%> getDirectEditCommand(<%=importManager.getImportedName("org.eclipse.gef.requests.DirectEditRequest")%> request) {
+				return null;
+			}
+		});
+<%
+}
+%>
 	}
 
 <%
-GenLinkLabel primaryLabel = null;
-for(Iterator it = genLink.getLabels().iterator(); it.hasNext(); ) {
-	GenLinkLabel next = (GenLinkLabel)it.next();
-	if (!next.isReadOnly()) {
-		primaryLabel = next;
-		break;
-	}
-}
 if (primaryLabel != null) {
 %>
 
@@ -132,6 +148,31 @@
 
 <%@ include file="refresher.javajetinc"%>
 
+	/**
+	 * @generated
+	 */
+	public Object getAdapter(Class key) {
+		if (<%=importManager.getImportedName("org.eclipse.gef.TreeEditPart")%>.class == key) {
+			return getTreeEditPartAdapter();
+		}
+		return super.getAdapter(key);
+	}
+
+	/**
+	 * @generated
+	 */
+	private TreeEditPartAdapter myTreeEditPartAdapter;
+
+	/**
+	 * @generated
+	 */
+	private TreeEditPartAdapter getTreeEditPartAdapter() {
+		if (myTreeEditPartAdapter == null) {
+			myTreeEditPartAdapter = new TreeEditPartAdapter();
+		}
+		return myTreeEditPartAdapter;
+	}
+
 <%
 if (genLink.getModelFacet() instanceof TypeLinkModelFacet) {
 	//Otherwise, there's no element associated with the element
@@ -263,5 +304,166 @@
 <%
 }
 %>
+
+	/**
+	 * @generated
+	 */
+	private class TreeEditPartAdapter extends <%=importManager.getImportedName("org.eclipse.gmf.runtime.lite.edit.parts.tree.BaseTreeEditPart")%> {
+		/**
+		 * @generated
+		 */
+		public TreeEditPartAdapter() {
+			super(getDiagramEdge(), <%=importManager.getImportedName(genDiagram.getEditorGen().getPlugin().getActivatorQualifiedClassName())%>.getInstance().getItemProvidersAdapterFactory());
+		}
+
+		/**
+		 * @generated
+		 */
+		protected void createEditPolicies() {
+<%@ include file="linkComponentEditPolicy.javajetinc"%>
+<%
+if (primaryLabel != null && genLink.getModelFacet() instanceof TypeLinkModelFacet) {
+		String editPatternCode = importManager.getImportedName(primaryLabel.getEditPartQualifiedClassName()) + ".EDIT_PATTERN";
+		TypeLinkModelFacet typeLinkModelFacet = (TypeLinkModelFacet) genLink.getModelFacet();
+		String primaryView = "getDiagramEdge()";
+		String resolvedSemanticElement = "(" + importManager.getImportedName(typeLinkModelFacet.getMetaClass().getQualifiedInterfaceName()) + ") getDiagramEdge().getElement()";
+		LabelModelFacet labelModelFacet = primaryLabel.getModelFacet();
+		GenClass underlyingMetaClass = typeLinkModelFacet.getMetaClass();
+%>
+<%@ include file="treeDirectEditPolicy.jetinc"%>
+<%
+}
+%>
+		}
+
+<%
+if (primaryLabel != null && genLink.getModelFacet() instanceof TypeLinkModelFacet) {
+%>
+<%@include file="treeDirectEdit.jetinc" %>
+
+		/**
+		 * @generated
+		 */
+		protected String getEditText() {
+			<%=importManager.getImportedName(primaryLabel.getEditPartQualifiedClassName())%> primaryLabelEditPart = getPrimaryLabelEditPart();
+	
+			if (primaryLabelEditPart != null) {
+				return primaryLabelEditPart.getLabelEditText();
+			}
+			return "";
+		}
+
+<%
+}
+%>
+
+<%
+if (genLink.getModelFacet() instanceof TypeLinkModelFacet) {
+	//Otherwise, there's no element associated with the element
+%>
+		/**
+		 * @generated
+		 */
+		public void activate() {
+			super.activate();
+			getDiagramEdge().getElement().eAdapters().add(domainModelRefresher);
+		}
+
+		/**
+		 * @generated
+		 */
+		public void deactivate() {
+			getDiagramEdge().getElement().eAdapters().remove(domainModelRefresher);
+			super.deactivate();
+		}
+
+<%@ include file="refreshers.javajetinc/domainModelRefresher.javajetinc"%>
+
+<%
+}
+%>
+		/**
+		 * @generated
+		 */
+		protected void createRefreshers() {
+			super.createRefreshers();
+<%
+if (genLink.getModelFacet() instanceof TypeLinkModelFacet || primaryLabel != null) {
+	//Otherwise, an empty string will be returned, and it will not change no matter what.
+%>
+			Refresher labelRefresher = new Refresher() {
+				public void refresh() {
+					refreshVisuals();
+				}
+			};
+<%
+	if (primaryLabel != null) {
+		LabelModelFacet labelModelFacet = primaryLabel.getModelFacet();
+		if (labelModelFacet instanceof FeatureLabelModelFacet) {
+			GenFeature feature = ((FeatureLabelModelFacet)labelModelFacet).getMetaFeature();
+%>
+			registerRefresher(<%=importManager.getImportedName(feature.getGenPackage().getQualifiedPackageInterfaceName())%>.eINSTANCE.get<%=feature.getFeatureAccessorName()%>(), labelRefresher);
+<%
+		} else if (labelModelFacet instanceof CompositeFeatureLabelModelFacet) {
+			CompositeFeatureLabelModelFacet compositeFeatureLabelModelFacet = (CompositeFeatureLabelModelFacet) labelModelFacet;
+			for(Iterator it = compositeFeatureLabelModelFacet.getMetaFeatures().iterator(); it.hasNext(); ) {
+				GenFeature next = (GenFeature) it.next();
+%>
+			registerRefresher(<%=importManager.getImportedName(next.getGenPackage().getQualifiedPackageInterfaceName())%>.eINSTANCE.get<%=next.getFeatureAccessorName()%>(), labelRefresher);
+<%
+			}
+		}
+	} else {
+		GenClass metaClass = ((TypeLinkModelFacet) genLink.getModelFacet()).getMetaClass();
+		List labelNotifyFeatures = metaClass.getLabelNotifyFeatures();
+		for(Iterator it = labelNotifyFeatures.iterator(); it.hasNext(); ) {
+			GenFeature next = (GenFeature) it.next();
+%>
+			registerRefresher(<%=importManager.getImportedName(next.getGenPackage().getQualifiedPackageInterfaceName())%>.eINSTANCE.get<%=next.getFeatureAccessorName()%>(), labelRefresher);
+<%
+		}
+	}
+}
+%>
+		}
+
+<%
+if (primaryLabel != null) {
+%>
+		/**
+		 * @generated
+		 */
+		protected String getText() {
+			<%=importManager.getImportedName(primaryLabel.getEditPartQualifiedClassName())%> primaryLabelEditPart = getPrimaryLabelEditPart();
+			if (primaryLabelEditPart != null) {
+				return primaryLabelEditPart.getLabelText();
+			}
+			return super.getText();
+		}
+
+		/**
+		 * @generated
+		 */
+		private <%=importManager.getImportedName(primaryLabel.getEditPartQualifiedClassName())%> getPrimaryLabelEditPart() {
+			for(<%=importManager.getImportedName("java.util.Iterator")%> it = getDiagramEdge().getChildren().iterator(); it.hasNext(); ) {
+				<%=importManager.getImportedName("org.eclipse.gmf.runtime.notation.View")%> nextChild = (<%=importManager.getImportedName("org.eclipse.gmf.runtime.notation.View")%>)it.next();
+				if (<%=importManager.getImportedName(genDiagram.getVisualIDRegistryQualifiedClassName())%>.getVisualID(nextChild) == <%=importManager.getImportedName(primaryLabel.getEditPartQualifiedClassName())%>.VISUAL_ID) {
+					return (<%=importManager.getImportedName(primaryLabel.getEditPartQualifiedClassName())%>) <%=genLink.getEditPartClassName()%>.this.getViewer().getEditPartRegistry().get(nextChild);
+				}
+			}
+			return null;
+		}
+<%
+}
+%>
+
+		/**
+		 * Since labels are not selectable edit parts, they are filtered from the overview as well.
+		 * @generated
+		 */
+		protected <%=importManager.getImportedName("java.util.List")%> getModelChildren() {
+			return <%=importManager.getImportedName("java.util.Collections")%>.EMPTY_LIST;
+		}
+	}
 }
 <%importManager.emitSortedImports();%>
Index: src-templates/org/eclipse/gmf/codegen/templates/lite/parts/LinkEditPartGenerator.java
===================================================================
RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.codegen.lite/src-templates/org/eclipse/gmf/codegen/templates/lite/parts/LinkEditPartGenerator.java,v
retrieving revision 1.11
diff -u -r1.11 LinkEditPartGenerator.java
--- src-templates/org/eclipse/gmf/codegen/templates/lite/parts/LinkEditPartGenerator.java	1 Sep 2006 16:14:08 -0000	1.11
+++ src-templates/org/eclipse/gmf/codegen/templates/lite/parts/LinkEditPartGenerator.java	11 Sep 2006 10:18:30 -0000
@@ -39,167 +39,379 @@
   protected final String TEXT_19 = " view = (";
   protected final String TEXT_20 = ") getModel();" + NL + "\t\tif (view != null && view.isSetElement() && view.getElement() != null) {" + NL + "\t\t\tgetViewer().getEditPartRegistry().put(view.getElement(), this);\t" + NL + "\t\t}" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected void unregisterModel() {" + NL + "\t\tsuper.unregisterModel();" + NL + "\t\t";
   protected final String TEXT_21 = " view = (";
-  protected final String TEXT_22 = ") getModel();" + NL + "\t\tif (view != null && view.isSetElement() && view.getElement() != null && getViewer().getEditPartRegistry().get(view.getElement()) == this) {" + NL + "\t\t\tgetViewer().getEditPartRegistry().remove(view.getElement());" + NL + "\t\t}" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected void createEditPolicies() {" + NL + "\t\t//XXX: install correct edit policies!";
-  protected final String TEXT_23 = NL;
-  protected final String TEXT_24 = "\t\tinstallEditPolicy(";
-  protected final String TEXT_25 = ".COMPONENT_ROLE, new ";
-  protected final String TEXT_26 = "() {" + NL + "\t\t\tprotected ";
-  protected final String TEXT_27 = " createDeleteCommand(";
-  protected final String TEXT_28 = " deleteRequest) {" + NL + "\t\t\t\tfinal Edge edgeToRemove = getDiagramEdge();" + NL + "\t\t\t\tfinal View source = edgeToRemove.getSource();" + NL + "\t\t\t\tfinal View target = edgeToRemove.getTarget();" + NL + "\t\t\t\t";
-  protected final String TEXT_29 = " editingDomain = ";
-  protected final String TEXT_30 = ".getEditingDomain(getDiagramEdge().getDiagram().getElement());" + NL + "\t\t\t\t";
-  protected final String TEXT_31 = " cc = new ";
-  protected final String TEXT_32 = "();" + NL + "\t\t\t\tcc.append(createDomainModelRemoveCommand(editingDomain));" + NL + "\t\t\t\tcc.append(new ";
-  protected final String TEXT_33 = "() {" + NL + "\t\t\t\t\tpublic boolean canExecute() {" + NL + "\t\t\t\t\t\treturn source != null && edgeToRemove != null;" + NL + "\t\t\t\t\t}" + NL + "\t\t\t\t\tpublic boolean canUndo() {" + NL + "\t\t\t\t\t\treturn source != null && edgeToRemove != null;" + NL + "\t\t\t\t\t}" + NL + "\t\t\t\t\tpublic void undo() {" + NL + "\t\t\t\t\t\tsource.getDiagram().insertEdge(edgeToRemove);" + NL + "\t\t\t\t\t\tedgeToRemove.setSource(source);" + NL + "\t\t\t\t\t\tedgeToRemove.setTarget(target);" + NL + "\t\t\t\t\t}" + NL + "\t\t\t\t\tpublic void redo() {" + NL + "\t\t\t\t\t\texecute();" + NL + "\t\t\t\t\t}" + NL + "\t\t\t\t\tpublic void execute() {" + NL + "\t\t\t\t\t\tsource.getDiagram().removeEdge(edgeToRemove);" + NL + "\t\t\t\t\t\tedgeToRemove.setSource(null);" + NL + "\t\t\t\t\t\tedgeToRemove.setTarget(null);" + NL + "\t\t\t\t\t}" + NL + "\t\t\t\t});" + NL + "\t\t\t\treturn new ";
-  protected final String TEXT_34 = "(editingDomain, cc);" + NL + "\t\t\t}";
-  protected final String TEXT_35 = NL;
-  protected final String TEXT_36 = NL + "\t\t\tprivate ";
-  protected final String TEXT_37 = " createDomainModelRemoveCommand(";
-  protected final String TEXT_38 = " editingDomain) {";
-  protected final String TEXT_39 = NL + "\t\t\t\t";
-  protected final String TEXT_40 = " result = new ";
-  protected final String TEXT_41 = "();";
-  protected final String TEXT_42 = NL + "\t\t\t\tresult.append(";
-  protected final String TEXT_43 = ".create(" + NL + "\t\t\t\t\teditingDomain," + NL + "\t\t\t\t\t";
-  protected final String TEXT_44 = ".getElement().eContainer(), ";
-  protected final String TEXT_45 = ".getElement().eContainmentFeature(), ";
-  protected final String TEXT_46 = ".getElement()));";
-  protected final String TEXT_47 = NL + "\t\t\t\tresult.append(";
-  protected final String TEXT_48 = ".create(" + NL + "\t\t\t\t\teditingDomain," + NL + "\t\t\t\t\t";
-  protected final String TEXT_49 = ".getElement().eContainer(), ";
-  protected final String TEXT_50 = ".getElement().eContainmentFeature(), ";
-  protected final String TEXT_51 = ".UNSET_VALUE));";
-  protected final String TEXT_52 = NL + "\t\t\t\treturn ";
-  protected final String TEXT_53 = ".INSTANCE;";
-  protected final String TEXT_54 = NL + "\t\t\t\tresult.append(";
-  protected final String TEXT_55 = ".create(" + NL + "\t\t\t\t\teditingDomain," + NL + "\t\t\t\t\t";
-  protected final String TEXT_56 = ".getElement().eContainer(), ";
-  protected final String TEXT_57 = ".eINSTANCE.get";
-  protected final String TEXT_58 = "()," + NL + "\t\t\t\t\t";
-  protected final String TEXT_59 = ".getElement()));";
-  protected final String TEXT_60 = NL + "\t\t\t\tresult.append(";
-  protected final String TEXT_61 = ".create(" + NL + "\t\t\t\t\teditingDomain," + NL + "\t\t\t\t\t";
-  protected final String TEXT_62 = ".getElement().eContainer(), ";
-  protected final String TEXT_63 = ".eINSTANCE.get";
-  protected final String TEXT_64 = "()," + NL + "\t\t\t\t\t";
-  protected final String TEXT_65 = ".UNSET_VALUE));";
-  protected final String TEXT_66 = NL + "\t\t\t\tresult.append(";
-  protected final String TEXT_67 = ".create(" + NL + "\t\t\t\t\teditingDomain," + NL + "\t\t\t\t\t";
-  protected final String TEXT_68 = ".getElement(), ";
-  protected final String TEXT_69 = ".eINSTANCE.get";
-  protected final String TEXT_70 = "(), ";
-  protected final String TEXT_71 = ".getSource().getElement()));";
-  protected final String TEXT_72 = NL + "\t\t\t\tresult.append(";
-  protected final String TEXT_73 = ".create(" + NL + "\t\t\t\t\teditingDomain," + NL + "\t\t\t\t\t";
-  protected final String TEXT_74 = ".getElement(), ";
-  protected final String TEXT_75 = ".eINSTANCE.get";
-  protected final String TEXT_76 = "(), ";
-  protected final String TEXT_77 = ".UNSET_VALUE));";
-  protected final String TEXT_78 = NL + "\t\t\t\tresult.append(";
-  protected final String TEXT_79 = ".create(" + NL + "\t\t\t\t\teditingDomain," + NL + "\t\t\t\t\t";
-  protected final String TEXT_80 = ".getElement(), ";
-  protected final String TEXT_81 = ".eINSTANCE.get";
-  protected final String TEXT_82 = "(), ";
-  protected final String TEXT_83 = ".getTarget().getElement()));";
-  protected final String TEXT_84 = NL + "\t\t\t\tresult.append(";
-  protected final String TEXT_85 = ".create(" + NL + "\t\t\t\t\teditingDomain," + NL + "\t\t\t\t\t";
-  protected final String TEXT_86 = ".getElement(), ";
-  protected final String TEXT_87 = ".eINSTANCE.get";
-  protected final String TEXT_88 = "(), ";
-  protected final String TEXT_89 = ".UNSET_VALUE));";
-  protected final String TEXT_90 = NL + "\t\t\t\treturn result;";
-  protected final String TEXT_91 = NL + "\t\t\t\treturn ";
-  protected final String TEXT_92 = ".create(" + NL + "\t\t\t\t\teditingDomain," + NL + "\t\t\t\t\t";
-  protected final String TEXT_93 = ".getSource().getElement(), ";
-  protected final String TEXT_94 = ".eINSTANCE.get";
-  protected final String TEXT_95 = "(), ";
-  protected final String TEXT_96 = ".getTarget().getElement());";
-  protected final String TEXT_97 = NL + "\t\t\t\treturn ";
-  protected final String TEXT_98 = ".create(" + NL + "\t\t\t\t\teditingDomain," + NL + "\t\t\t\t\t";
-  protected final String TEXT_99 = ".getSource().getElement(), ";
-  protected final String TEXT_100 = ".eINSTANCE.get";
-  protected final String TEXT_101 = "(), ";
-  protected final String TEXT_102 = ".UNSET_VALUE);";
-  protected final String TEXT_103 = NL + "\t\t\t}";
-  protected final String TEXT_104 = NL + "\t\t});" + NL + "\t\tinstallEditPolicy(";
-  protected final String TEXT_105 = ".CONNECTION_ENDPOINTS_ROLE, new ";
-  protected final String TEXT_106 = "());" + NL + "\t\tinstallEditPolicy(";
-  protected final String TEXT_107 = ".CONNECTION_BENDPOINTS_ROLE, new ";
-  protected final String TEXT_108 = "());" + NL + "\t}" + NL;
-  protected final String TEXT_109 = NL + NL + "\t/**" + NL + "\t * Returns the label which should be direct-edited by default." + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate ";
-  protected final String TEXT_110 = " getPrimaryLabelEditPart() {" + NL + "\t\tfor(";
-  protected final String TEXT_111 = " it = getDiagramEdge().getChildren().iterator(); it.hasNext(); ) {" + NL + "\t\t\t";
-  protected final String TEXT_112 = " nextChild = (";
-  protected final String TEXT_113 = ")it.next();" + NL + "\t\t\tif (";
-  protected final String TEXT_114 = ".getVisualID(nextChild) == ";
-  protected final String TEXT_115 = ".VISUAL_ID) {" + NL + "\t\t\t\treturn (EditPart) getViewer().getEditPartRegistry().get(nextChild);" + NL + "\t\t\t}" + NL + "\t\t}" + NL + "\t\treturn null;" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic void performRequest(";
-  protected final String TEXT_116 = " req) {" + NL + "\t\tif (";
-  protected final String TEXT_117 = ".REQ_DIRECT_EDIT == req.getType()) {" + NL + "\t\t\t";
-  protected final String TEXT_118 = " labelToEdit;" + NL + "\t\t\tif (req instanceof ";
-  protected final String TEXT_119 = ") {" + NL + "\t\t\t\tlabelToEdit = getLabelEditPart((";
-  protected final String TEXT_120 = ")req);" + NL + "\t\t\t} else {" + NL + "\t\t\t\tlabelToEdit = getPrimaryLabelEditPart();" + NL + "\t\t\t}" + NL + "\t\t\tif (labelToEdit != null) {" + NL + "\t\t\t\tlabelToEdit.performRequest(req);" + NL + "\t\t\t}" + NL + "\t\t}" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate ";
-  protected final String TEXT_121 = " getLabelEditPart(";
-  protected final String TEXT_122 = " req) {" + NL + "\t\t";
-  protected final String TEXT_123 = " result = getViewer().findObjectAt(req.getLocation());" + NL + "\t\tif (result != null) {" + NL + "\t\t\t";
-  protected final String TEXT_124 = " view = (";
-  protected final String TEXT_125 = ") result.getModel();" + NL + "\t\t\tif (getDiagramEdge().getChildren().contains(view)) {" + NL + "\t\t\t\tint visualId = ";
-  protected final String TEXT_126 = ".getVisualID(view);" + NL + "\t\t\t\tswitch (visualId) {";
-  protected final String TEXT_127 = NL + "\t\t\t\tcase ";
-  protected final String TEXT_128 = ".VISUAL_ID:" + NL + "\t\t\t\t\treturn result;";
-  protected final String TEXT_129 = NL + "\t\t\t\t}" + NL + "\t\t\t}" + NL + "\t\t}" + NL + "\t\treturn getPrimaryLabelEditPart();" + NL + "\t}" + NL;
-  protected final String TEXT_130 = NL + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected List getModelChildren() {" + NL + "\t\treturn ((Edge)getModel()).getChildren();" + NL + "\t}" + NL;
-  protected final String TEXT_131 = NL;
-  protected final String TEXT_132 = "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate ";
-  protected final String TEXT_133 = " structuralFeatures2Refresher;" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic Refresher getRefresher(";
-  protected final String TEXT_134 = " feature, ";
-  protected final String TEXT_135 = " msg) {" + NL + "\t\tif (structuralFeatures2Refresher == null) {" + NL + "\t\t\tcreateRefreshers();" + NL + "\t\t}" + NL + "\t\treturn (Refresher) structuralFeatures2Refresher.get(feature);" + NL + "\t}" + NL + NL;
-  protected final String TEXT_136 = NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic void activate() {" + NL + "\t\tsuper.activate();" + NL + "\t\tgetDiagramEdge().getElement().eAdapters().add(domainModelRefresher);" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic void deactivate() {" + NL + "\t\tgetDiagramEdge().getElement().eAdapters().remove(domainModelRefresher);" + NL + "\t\tsuper.deactivate();" + NL + "\t}" + NL;
-  protected final String TEXT_137 = NL;
-  protected final String TEXT_138 = "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate ";
-  protected final String TEXT_139 = " domainModelRefresher = new ";
-  protected final String TEXT_140 = "(this);" + NL;
-  protected final String TEXT_141 = NL;
-  protected final String TEXT_142 = "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic void addRefresher(";
-  protected final String TEXT_143 = " feature, Refresher refresher) {" + NL + "\t\tCompositeRefresher compositeRefresher = getCompositeRefresher(feature);" + NL + "\t\tcompositeRefresher.addRefresher(refresher);" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic void removeRefresher(";
-  protected final String TEXT_144 = " feature, Refresher refresher) {" + NL + "\t\tCompositeRefresher compositeRefresher = getCompositeRefresher(feature);" + NL + "\t\tcompositeRefresher.removeRefresher(refresher);" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate CompositeRefresher getCompositeRefresher(";
-  protected final String TEXT_145 = " feature) {" + NL + "\t\tif (structuralFeatures2Refresher == null) {" + NL + "\t\t\tcreateRefreshers();" + NL + "\t\t}" + NL + "\t\tRefresher refresher = (Refresher) structuralFeatures2Refresher.get(feature);" + NL + "\t\tif (refresher instanceof CompositeRefresher) {" + NL + "\t\t\treturn (CompositeRefresher) refresher;" + NL + "\t\t}" + NL + "\t\tCompositeRefresher result = new CompositeRefresher();" + NL + "\t\tif (refresher != null) {" + NL + "\t\t\tresult.addRefresher(refresher);" + NL + "\t\t}" + NL + "\t\tstructuralFeatures2Refresher.put(feature, result);" + NL + "\t\treturn result;" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate void createRefreshers() {" + NL + "\t\tstructuralFeatures2Refresher = new HashMap();";
+  protected final String TEXT_22 = ") getModel();" + NL + "\t\tif (view != null && view.isSetElement() && view.getElement() != null && getViewer().getEditPartRegistry().get(view.getElement()) == this) {" + NL + "\t\t\tgetViewer().getEditPartRegistry().remove(view.getElement());" + NL + "\t\t}" + NL + "\t}";
+  protected final String TEXT_23 = NL + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected void createEditPolicies() {";
+  protected final String TEXT_24 = NL;
+  protected final String TEXT_25 = "\t\tinstallEditPolicy(";
+  protected final String TEXT_26 = ".COMPONENT_ROLE, new ";
+  protected final String TEXT_27 = "() {" + NL + "\t\t\tprotected ";
+  protected final String TEXT_28 = " createDeleteCommand(";
+  protected final String TEXT_29 = " deleteRequest) {" + NL + "\t\t\t\tfinal Edge edgeToRemove = getDiagramEdge();" + NL + "\t\t\t\tfinal View source = edgeToRemove.getSource();" + NL + "\t\t\t\tfinal View target = edgeToRemove.getTarget();" + NL + "\t\t\t\t";
+  protected final String TEXT_30 = " editingDomain = ";
+  protected final String TEXT_31 = ".getEditingDomain(getDiagramEdge().getDiagram().getElement());" + NL + "\t\t\t\t";
+  protected final String TEXT_32 = " cc = new ";
+  protected final String TEXT_33 = "();" + NL + "\t\t\t\tcc.append(createDomainModelRemoveCommand(editingDomain));" + NL + "\t\t\t\tcc.append(new ";
+  protected final String TEXT_34 = "() {" + NL + "\t\t\t\t\tpublic boolean canExecute() {" + NL + "\t\t\t\t\t\treturn source != null && edgeToRemove != null;" + NL + "\t\t\t\t\t}" + NL + "\t\t\t\t\tpublic boolean canUndo() {" + NL + "\t\t\t\t\t\treturn source != null && edgeToRemove != null;" + NL + "\t\t\t\t\t}" + NL + "\t\t\t\t\tpublic void undo() {" + NL + "\t\t\t\t\t\tsource.getDiagram().insertEdge(edgeToRemove);" + NL + "\t\t\t\t\t\tedgeToRemove.setSource(source);" + NL + "\t\t\t\t\t\tedgeToRemove.setTarget(target);" + NL + "\t\t\t\t\t}" + NL + "\t\t\t\t\tpublic void redo() {" + NL + "\t\t\t\t\t\texecute();" + NL + "\t\t\t\t\t}" + NL + "\t\t\t\t\tpublic void execute() {" + NL + "\t\t\t\t\t\tsource.getDiagram().removeEdge(edgeToRemove);" + NL + "\t\t\t\t\t\tedgeToRemove.setSource(null);" + NL + "\t\t\t\t\t\tedgeToRemove.setTarget(null);" + NL + "\t\t\t\t\t}" + NL + "\t\t\t\t});" + NL + "\t\t\t\treturn new ";
+  protected final String TEXT_35 = "(editingDomain, cc);" + NL + "\t\t\t}";
+  protected final String TEXT_36 = NL;
+  protected final String TEXT_37 = NL + "\t\t\tprivate ";
+  protected final String TEXT_38 = " createDomainModelRemoveCommand(";
+  protected final String TEXT_39 = " editingDomain) {";
+  protected final String TEXT_40 = NL + "\t\t\t\t";
+  protected final String TEXT_41 = " result = new ";
+  protected final String TEXT_42 = "();";
+  protected final String TEXT_43 = NL + "\t\t\t\tresult.append(";
+  protected final String TEXT_44 = ".create(" + NL + "\t\t\t\t\teditingDomain," + NL + "\t\t\t\t\t";
+  protected final String TEXT_45 = ".getElement().eContainer(), ";
+  protected final String TEXT_46 = ".getElement().eContainmentFeature(), ";
+  protected final String TEXT_47 = ".getElement()));";
+  protected final String TEXT_48 = NL + "\t\t\t\tresult.append(";
+  protected final String TEXT_49 = ".create(" + NL + "\t\t\t\t\teditingDomain," + NL + "\t\t\t\t\t";
+  protected final String TEXT_50 = ".getElement().eContainer(), ";
+  protected final String TEXT_51 = ".getElement().eContainmentFeature(), ";
+  protected final String TEXT_52 = ".UNSET_VALUE));";
+  protected final String TEXT_53 = NL + "\t\t\t\treturn ";
+  protected final String TEXT_54 = ".INSTANCE;";
+  protected final String TEXT_55 = NL + "\t\t\t\tresult.append(";
+  protected final String TEXT_56 = ".create(" + NL + "\t\t\t\t\teditingDomain," + NL + "\t\t\t\t\t";
+  protected final String TEXT_57 = ".getElement().eContainer(), ";
+  protected final String TEXT_58 = ".eINSTANCE.get";
+  protected final String TEXT_59 = "()," + NL + "\t\t\t\t\t";
+  protected final String TEXT_60 = ".getElement()));";
+  protected final String TEXT_61 = NL + "\t\t\t\tresult.append(";
+  protected final String TEXT_62 = ".create(" + NL + "\t\t\t\t\teditingDomain," + NL + "\t\t\t\t\t";
+  protected final String TEXT_63 = ".getElement().eContainer(), ";
+  protected final String TEXT_64 = ".eINSTANCE.get";
+  protected final String TEXT_65 = "()," + NL + "\t\t\t\t\t";
+  protected final String TEXT_66 = ".UNSET_VALUE));";
+  protected final String TEXT_67 = NL + "\t\t\t\tresult.append(";
+  protected final String TEXT_68 = ".create(" + NL + "\t\t\t\t\teditingDomain," + NL + "\t\t\t\t\t";
+  protected final String TEXT_69 = ".getElement(), ";
+  protected final String TEXT_70 = ".eINSTANCE.get";
+  protected final String TEXT_71 = "(), ";
+  protected final String TEXT_72 = ".getSource().getElement()));";
+  protected final String TEXT_73 = NL + "\t\t\t\tresult.append(";
+  protected final String TEXT_74 = ".create(" + NL + "\t\t\t\t\teditingDomain," + NL + "\t\t\t\t\t";
+  protected final String TEXT_75 = ".getElement(), ";
+  protected final String TEXT_76 = ".eINSTANCE.get";
+  protected final String TEXT_77 = "(), ";
+  protected final String TEXT_78 = ".UNSET_VALUE));";
+  protected final String TEXT_79 = NL + "\t\t\t\tresult.append(";
+  protected final String TEXT_80 = ".create(" + NL + "\t\t\t\t\teditingDomain," + NL + "\t\t\t\t\t";
+  protected final String TEXT_81 = ".getElement(), ";
+  protected final String TEXT_82 = ".eINSTANCE.get";
+  protected final String TEXT_83 = "(), ";
+  protected final String TEXT_84 = ".getTarget().getElement()));";
+  protected final String TEXT_85 = NL + "\t\t\t\tresult.append(";
+  protected final String TEXT_86 = ".create(" + NL + "\t\t\t\t\teditingDomain," + NL + "\t\t\t\t\t";
+  protected final String TEXT_87 = ".getElement(), ";
+  protected final String TEXT_88 = ".eINSTANCE.get";
+  protected final String TEXT_89 = "(), ";
+  protected final String TEXT_90 = ".UNSET_VALUE));";
+  protected final String TEXT_91 = NL + "\t\t\t\treturn result;";
+  protected final String TEXT_92 = NL + "\t\t\t\treturn ";
+  protected final String TEXT_93 = ".create(" + NL + "\t\t\t\t\teditingDomain," + NL + "\t\t\t\t\t";
+  protected final String TEXT_94 = ".getSource().getElement(), ";
+  protected final String TEXT_95 = ".eINSTANCE.get";
+  protected final String TEXT_96 = "(), ";
+  protected final String TEXT_97 = ".getTarget().getElement());";
+  protected final String TEXT_98 = NL + "\t\t\t\treturn ";
+  protected final String TEXT_99 = ".create(" + NL + "\t\t\t\t\teditingDomain," + NL + "\t\t\t\t\t";
+  protected final String TEXT_100 = ".getSource().getElement(), ";
+  protected final String TEXT_101 = ".eINSTANCE.get";
+  protected final String TEXT_102 = "(), ";
+  protected final String TEXT_103 = ".UNSET_VALUE);";
+  protected final String TEXT_104 = NL + "\t\t\t}";
+  protected final String TEXT_105 = NL + "\t\t});" + NL + "\t\tinstallEditPolicy(";
+  protected final String TEXT_106 = ".CONNECTION_ENDPOINTS_ROLE, new ";
+  protected final String TEXT_107 = "());" + NL + "\t\tinstallEditPolicy(";
+  protected final String TEXT_108 = ".CONNECTION_BENDPOINTS_ROLE, new ";
+  protected final String TEXT_109 = "());";
+  protected final String TEXT_110 = NL + "\t\t//This edit part understands the direct edit request and delegates it to the appropriate label, so no command is needed here." + NL + "\t\tinstallEditPolicy(";
+  protected final String TEXT_111 = ".DIRECT_EDIT_ROLE, new ";
+  protected final String TEXT_112 = "() {" + NL + "\t\t\tprotected void showCurrentEditValue(";
+  protected final String TEXT_113 = " request) {" + NL + "\t\t\t}" + NL + "\t\t\tprotected ";
+  protected final String TEXT_114 = " getDirectEditCommand(";
+  protected final String TEXT_115 = " request) {" + NL + "\t\t\t\treturn null;" + NL + "\t\t\t}" + NL + "\t\t});";
+  protected final String TEXT_116 = NL + "\t}" + NL;
+  protected final String TEXT_117 = NL + NL + "\t/**" + NL + "\t * Returns the label which should be direct-edited by default." + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate ";
+  protected final String TEXT_118 = " getPrimaryLabelEditPart() {" + NL + "\t\tfor(";
+  protected final String TEXT_119 = " it = getDiagramEdge().getChildren().iterator(); it.hasNext(); ) {" + NL + "\t\t\t";
+  protected final String TEXT_120 = " nextChild = (";
+  protected final String TEXT_121 = ")it.next();" + NL + "\t\t\tif (";
+  protected final String TEXT_122 = ".getVisualID(nextChild) == ";
+  protected final String TEXT_123 = ".VISUAL_ID) {" + NL + "\t\t\t\treturn (EditPart) getViewer().getEditPartRegistry().get(nextChild);" + NL + "\t\t\t}" + NL + "\t\t}" + NL + "\t\treturn null;" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic void performRequest(";
+  protected final String TEXT_124 = " req) {" + NL + "\t\tif (";
+  protected final String TEXT_125 = ".REQ_DIRECT_EDIT == req.getType()) {" + NL + "\t\t\t";
+  protected final String TEXT_126 = " labelToEdit;" + NL + "\t\t\tif (req instanceof ";
+  protected final String TEXT_127 = ") {" + NL + "\t\t\t\tlabelToEdit = getLabelEditPart((";
+  protected final String TEXT_128 = ")req);" + NL + "\t\t\t} else {" + NL + "\t\t\t\tlabelToEdit = getPrimaryLabelEditPart();" + NL + "\t\t\t}" + NL + "\t\t\tif (labelToEdit != null) {" + NL + "\t\t\t\tlabelToEdit.performRequest(req);" + NL + "\t\t\t}" + NL + "\t\t}" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate ";
+  protected final String TEXT_129 = " getLabelEditPart(";
+  protected final String TEXT_130 = " req) {" + NL + "\t\t";
+  protected final String TEXT_131 = " result = getViewer().findObjectAt(req.getLocation());" + NL + "\t\tif (result != null) {" + NL + "\t\t\t";
+  protected final String TEXT_132 = " view = (";
+  protected final String TEXT_133 = ") result.getModel();" + NL + "\t\t\tif (getDiagramEdge().getChildren().contains(view)) {" + NL + "\t\t\t\tint visualId = ";
+  protected final String TEXT_134 = ".getVisualID(view);" + NL + "\t\t\t\tswitch (visualId) {";
+  protected final String TEXT_135 = NL + "\t\t\t\tcase ";
+  protected final String TEXT_136 = ".VISUAL_ID:" + NL + "\t\t\t\t\treturn result;";
+  protected final String TEXT_137 = NL + "\t\t\t\t}" + NL + "\t\t\t}" + NL + "\t\t}" + NL + "\t\treturn getPrimaryLabelEditPart();" + NL + "\t}" + NL;
+  protected final String TEXT_138 = NL + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected List getModelChildren() {" + NL + "\t\treturn ((Edge)getModel()).getChildren();" + NL + "\t}" + NL;
+  protected final String TEXT_139 = NL;
+  protected final String TEXT_140 = "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate ";
+  protected final String TEXT_141 = " structuralFeatures2Refresher;" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic Refresher getRefresher(";
+  protected final String TEXT_142 = " feature, ";
+  protected final String TEXT_143 = " msg) {" + NL + "\t\tif (structuralFeatures2Refresher == null) {" + NL + "\t\t\tcreateRefreshers();" + NL + "\t\t}" + NL + "\t\treturn (Refresher) structuralFeatures2Refresher.get(feature);" + NL + "\t}" + NL + "" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic Object getAdapter(Class key) {" + NL + "\t\tif (";
+  protected final String TEXT_144 = ".class == key) {" + NL + "\t\t\treturn getTreeEditPartAdapter();" + NL + "\t\t}" + NL + "\t\treturn super.getAdapter(key);" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate TreeEditPartAdapter myTreeEditPartAdapter;" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate TreeEditPartAdapter getTreeEditPartAdapter() {" + NL + "\t\tif (myTreeEditPartAdapter == null) {" + NL + "\t\t\tmyTreeEditPartAdapter = new TreeEditPartAdapter();" + NL + "\t\t}" + NL + "\t\treturn myTreeEditPartAdapter;" + NL + "\t}" + NL;
+  protected final String TEXT_145 = NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic void activate() {" + NL + "\t\tsuper.activate();" + NL + "\t\tgetDiagramEdge().getElement().eAdapters().add(domainModelRefresher);" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic void deactivate() {" + NL + "\t\tgetDiagramEdge().getElement().eAdapters().remove(domainModelRefresher);" + NL + "\t\tsuper.deactivate();" + NL + "\t}" + NL;
   protected final String TEXT_146 = NL;
-  protected final String TEXT_147 = "\t\tRefresher childrenRefresher = new Refresher() {" + NL + "\t\t\tpublic void refresh() {" + NL + "\t\t\t\trefreshChildren();" + NL + "\t\t\t}" + NL + "\t\t};" + NL + "\t\tstructuralFeatures2Refresher.put(";
-  protected final String TEXT_148 = ".eINSTANCE.getView_PersistedChildren(), childrenRefresher);" + NL + "\t\tstructuralFeatures2Refresher.put(";
-  protected final String TEXT_149 = ".eINSTANCE.getView_TransientChildren(), childrenRefresher);";
+  protected final String TEXT_147 = "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate ";
+  protected final String TEXT_148 = " domainModelRefresher = new ";
+  protected final String TEXT_149 = "(this);" + NL;
   protected final String TEXT_150 = NL;
-  protected final String TEXT_151 = "\t\tRefresher visibilityRefresher = new Refresher() {" + NL + "\t\t\tpublic void refresh() {" + NL + "\t\t\t\trefreshVisibility();" + NL + "\t\t\t}" + NL + "\t\t};" + NL + "\t\tstructuralFeatures2Refresher.put(";
-  protected final String TEXT_152 = ".eINSTANCE.getView_Visible(), visibilityRefresher);";
-  protected final String TEXT_153 = NL;
-  protected final String TEXT_154 = "\t\tRefresher bendpointsRefresher = new Refresher() {" + NL + "\t\t\tpublic void refresh() {" + NL + "\t\t\t\trefreshBendpoints();" + NL + "\t\t\t}" + NL + "\t\t};" + NL + "\t\tstructuralFeatures2Refresher.put(";
-  protected final String TEXT_155 = ".eINSTANCE.getEdge_Bendpoints(), bendpointsRefresher);" + NL + "\t\tstructuralFeatures2Refresher.put(";
-  protected final String TEXT_156 = ".eINSTANCE.getRelativeBendpoints_Points(), bendpointsRefresher);" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected void refreshVisuals() {" + NL + "\t\tsuper.refreshVisuals();" + NL + "//XXX:\t\trefreshBackgroundColor();" + NL + "//XXX:\t\trefreshForegroundColor();" + NL + "//XXX:\t\trefreshFont();" + NL + "\t\trefreshVisibility();" + NL + "\t\trefreshBendpoints();" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected void refreshBendpoints() {" + NL + "\t\t";
-  protected final String TEXT_157 = " bendpoints = (";
-  protected final String TEXT_158 = ") getDiagramEdge().getBendpoints();" + NL + "\t\tif (bendpoints == null) {" + NL + "\t\t\tgetConnectionFigure().setRoutingConstraint(";
-  protected final String TEXT_159 = ".EMPTY_LIST);" + NL + "\t\t\treturn;" + NL + "\t\t}" + NL + "\t\t";
-  protected final String TEXT_160 = " modelConstraint = bendpoints.getPoints();" + NL + "\t\t";
-  protected final String TEXT_161 = " figureConstraint = new ";
-  protected final String TEXT_162 = "();" + NL + "\t\tfor (int i = 0; i < modelConstraint.size(); i++) {" + NL + "\t\t\t";
-  protected final String TEXT_163 = " wbp = (";
-  protected final String TEXT_164 = ") modelConstraint.get(i);" + NL + "\t\t\t";
-  protected final String TEXT_165 = " rbp = new ";
-  protected final String TEXT_166 = "(getConnectionFigure());" + NL + "\t\t\trbp.setRelativeDimensions(new ";
-  protected final String TEXT_167 = "(wbp.getSourceX(), wbp.getSourceY()), new ";
-  protected final String TEXT_168 = "(wbp.getTargetX(), wbp.getTargetY()));" + NL + "\t\t\trbp.setWeight((i + 1) / ((float) modelConstraint.size() + 1));" + NL + "\t\t\tfigureConstraint.add(rbp);" + NL + "\t\t}" + NL + "\t\tgetConnectionFigure().setRoutingConstraint(figureConstraint);" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected void refreshVisibility() {" + NL + "\t\tboolean isVisible = ((View)getModel()).isVisible();" + NL + "\t\tboolean wasVisible = getFigure().isVisible();" + NL + "\t\tif (isVisible == wasVisible) {" + NL + "\t\t\treturn;" + NL + "\t\t}" + NL + "\t\tif (!isVisible && (getSelected() != SELECTED_NONE)) {" + NL + "\t\t\tgetViewer().deselect(this);" + NL + "\t\t}" + NL + "" + NL + "\t\tgetFigure().setVisible(isVisible);" + NL + "\t\tgetFigure().revalidate();" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic void addNotify() {" + NL + "\t\tsuper.addNotify();" + NL + "\t\tgetConnectionFigure().setConnectionRouter(new ";
-  protected final String TEXT_169 = "());" + NL + "\t}" + NL + "" + 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 ";
-  protected final String TEXT_170 = " createFigure() {";
-  protected final String TEXT_171 = NL + "\t\treturn new ";
-  protected final String TEXT_172 = "();";
-  protected final String TEXT_173 = NL + "\t\treturn ";
-  protected final String TEXT_174 = ";";
-  protected final String TEXT_175 = NL + " \t\treturn new ";
-  protected final String TEXT_176 = "();";
-  protected final String TEXT_177 = NL + "\t}" + NL;
-  protected final String TEXT_178 = NL;
-  protected final String TEXT_179 = NL;
-  protected final String TEXT_180 = NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate static class MapModeWorkaround {" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tpublic int DPtoLP(int dp) {" + NL + "\t\t\treturn dp;" + NL + "\t\t}" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tpublic static MapModeWorkaround INSTANCE = new MapModeWorkaround();" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate MapModeWorkaround getMapMode() {" + NL + "\t\treturn MapModeWorkaround.INSTANCE;" + NL + "\t}";
-  protected final String TEXT_181 = NL + "}";
-  protected final String TEXT_182 = NL;
+  protected final String TEXT_151 = "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic void addRefresher(";
+  protected final String TEXT_152 = " feature, Refresher refresher) {" + NL + "\t\tCompositeRefresher compositeRefresher = getCompositeRefresher(feature);" + NL + "\t\tcompositeRefresher.addRefresher(refresher);" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic void removeRefresher(";
+  protected final String TEXT_153 = " feature, Refresher refresher) {" + NL + "\t\tCompositeRefresher compositeRefresher = getCompositeRefresher(feature);" + NL + "\t\tcompositeRefresher.removeRefresher(refresher);" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate CompositeRefresher getCompositeRefresher(";
+  protected final String TEXT_154 = " feature) {" + NL + "\t\tif (structuralFeatures2Refresher == null) {" + NL + "\t\t\tcreateRefreshers();" + NL + "\t\t}" + NL + "\t\tRefresher refresher = (Refresher) structuralFeatures2Refresher.get(feature);" + NL + "\t\tif (refresher instanceof CompositeRefresher) {" + NL + "\t\t\treturn (CompositeRefresher) refresher;" + NL + "\t\t}" + NL + "\t\tCompositeRefresher result = new CompositeRefresher();" + NL + "\t\tif (refresher != null) {" + NL + "\t\t\tresult.addRefresher(refresher);" + NL + "\t\t}" + NL + "\t\tstructuralFeatures2Refresher.put(feature, result);" + NL + "\t\treturn result;" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate void createRefreshers() {" + NL + "\t\tstructuralFeatures2Refresher = new HashMap();";
+  protected final String TEXT_155 = NL;
+  protected final String TEXT_156 = "\t\tRefresher childrenRefresher = new Refresher() {" + NL + "\t\t\tpublic void refresh() {" + NL + "\t\t\t\trefreshChildren();" + NL + "\t\t\t}" + NL + "\t\t};" + NL + "\t\tstructuralFeatures2Refresher.put(";
+  protected final String TEXT_157 = ".eINSTANCE.getView_PersistedChildren(), childrenRefresher);" + NL + "\t\tstructuralFeatures2Refresher.put(";
+  protected final String TEXT_158 = ".eINSTANCE.getView_TransientChildren(), childrenRefresher);";
+  protected final String TEXT_159 = NL;
+  protected final String TEXT_160 = "\t\tRefresher visibilityRefresher = new Refresher() {" + NL + "\t\t\tpublic void refresh() {" + NL + "\t\t\t\trefreshVisibility();" + NL + "\t\t\t}" + NL + "\t\t};" + NL + "\t\tstructuralFeatures2Refresher.put(";
+  protected final String TEXT_161 = ".eINSTANCE.getView_Visible(), visibilityRefresher);";
+  protected final String TEXT_162 = NL;
+  protected final String TEXT_163 = "\t\tRefresher bendpointsRefresher = new Refresher() {" + NL + "\t\t\tpublic void refresh() {" + NL + "\t\t\t\trefreshBendpoints();" + NL + "\t\t\t}" + NL + "\t\t};" + NL + "\t\tstructuralFeatures2Refresher.put(";
+  protected final String TEXT_164 = ".eINSTANCE.getEdge_Bendpoints(), bendpointsRefresher);" + NL + "\t\tstructuralFeatures2Refresher.put(";
+  protected final String TEXT_165 = ".eINSTANCE.getRelativeBendpoints_Points(), bendpointsRefresher);" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected void refreshVisuals() {" + NL + "\t\tsuper.refreshVisuals();" + NL + "//XXX:\t\trefreshBackgroundColor();" + NL + "//XXX:\t\trefreshForegroundColor();" + NL + "//XXX:\t\trefreshFont();" + NL + "\t\trefreshVisibility();" + NL + "\t\trefreshBendpoints();" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected void refreshBendpoints() {" + NL + "\t\t";
+  protected final String TEXT_166 = " bendpoints = (";
+  protected final String TEXT_167 = ") getDiagramEdge().getBendpoints();" + NL + "\t\tif (bendpoints == null) {" + NL + "\t\t\tgetConnectionFigure().setRoutingConstraint(";
+  protected final String TEXT_168 = ".EMPTY_LIST);" + NL + "\t\t\treturn;" + NL + "\t\t}" + NL + "\t\t";
+  protected final String TEXT_169 = " modelConstraint = bendpoints.getPoints();" + NL + "\t\t";
+  protected final String TEXT_170 = " figureConstraint = new ";
+  protected final String TEXT_171 = "();" + NL + "\t\tfor (int i = 0; i < modelConstraint.size(); i++) {" + NL + "\t\t\t";
+  protected final String TEXT_172 = " wbp = (";
+  protected final String TEXT_173 = ") modelConstraint.get(i);" + NL + "\t\t\t";
+  protected final String TEXT_174 = " rbp = new ";
+  protected final String TEXT_175 = "(getConnectionFigure());" + NL + "\t\t\trbp.setRelativeDimensions(new ";
+  protected final String TEXT_176 = "(wbp.getSourceX(), wbp.getSourceY()), new ";
+  protected final String TEXT_177 = "(wbp.getTargetX(), wbp.getTargetY()));" + NL + "\t\t\trbp.setWeight((i + 1) / ((float) modelConstraint.size() + 1));" + NL + "\t\t\tfigureConstraint.add(rbp);" + NL + "\t\t}" + NL + "\t\tgetConnectionFigure().setRoutingConstraint(figureConstraint);" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected void refreshVisibility() {" + NL + "\t\tboolean isVisible = ((View)getModel()).isVisible();" + NL + "\t\tboolean wasVisible = getFigure().isVisible();" + NL + "\t\tif (isVisible == wasVisible) {" + NL + "\t\t\treturn;" + NL + "\t\t}" + NL + "\t\tif (!isVisible && (getSelected() != SELECTED_NONE)) {" + NL + "\t\t\tgetViewer().deselect(this);" + NL + "\t\t}" + NL + "" + NL + "\t\tgetFigure().setVisible(isVisible);" + NL + "\t\tgetFigure().revalidate();" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic void addNotify() {" + NL + "\t\tsuper.addNotify();" + NL + "\t\tgetConnectionFigure().setConnectionRouter(new ";
+  protected final String TEXT_178 = "());" + NL + "\t}" + NL + "" + 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 ";
+  protected final String TEXT_179 = " createFigure() {";
+  protected final String TEXT_180 = NL + "\t\treturn new ";
+  protected final String TEXT_181 = "();";
+  protected final String TEXT_182 = NL + "\t\treturn ";
+  protected final String TEXT_183 = ";";
+  protected final String TEXT_184 = NL + " \t\treturn new ";
+  protected final String TEXT_185 = "();";
+  protected final String TEXT_186 = NL + "\t}" + NL;
+  protected final String TEXT_187 = NL;
+  protected final String TEXT_188 = NL;
+  protected final String TEXT_189 = NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate static class MapModeWorkaround {" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tpublic int DPtoLP(int dp) {" + NL + "\t\t\treturn dp;" + NL + "\t\t}" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tpublic static MapModeWorkaround INSTANCE = new MapModeWorkaround();" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate MapModeWorkaround getMapMode() {" + NL + "\t\treturn MapModeWorkaround.INSTANCE;" + NL + "\t}";
+  protected final String TEXT_190 = NL + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate class TreeEditPartAdapter extends ";
+  protected final String TEXT_191 = " {" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tpublic TreeEditPartAdapter() {" + NL + "\t\t\tsuper(getDiagramEdge(), ";
+  protected final String TEXT_192 = ".getInstance().getItemProvidersAdapterFactory());" + NL + "\t\t}" + NL + "" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tprotected void createEditPolicies() {";
+  protected final String TEXT_193 = NL;
+  protected final String TEXT_194 = "\t\tinstallEditPolicy(";
+  protected final String TEXT_195 = ".COMPONENT_ROLE, new ";
+  protected final String TEXT_196 = "() {" + NL + "\t\t\tprotected ";
+  protected final String TEXT_197 = " createDeleteCommand(";
+  protected final String TEXT_198 = " deleteRequest) {" + NL + "\t\t\t\tfinal Edge edgeToRemove = getDiagramEdge();" + NL + "\t\t\t\tfinal View source = edgeToRemove.getSource();" + NL + "\t\t\t\tfinal View target = edgeToRemove.getTarget();" + NL + "\t\t\t\t";
+  protected final String TEXT_199 = " editingDomain = ";
+  protected final String TEXT_200 = ".getEditingDomain(getDiagramEdge().getDiagram().getElement());" + NL + "\t\t\t\t";
+  protected final String TEXT_201 = " cc = new ";
+  protected final String TEXT_202 = "();" + NL + "\t\t\t\tcc.append(createDomainModelRemoveCommand(editingDomain));" + NL + "\t\t\t\tcc.append(new ";
+  protected final String TEXT_203 = "() {" + NL + "\t\t\t\t\tpublic boolean canExecute() {" + NL + "\t\t\t\t\t\treturn source != null && edgeToRemove != null;" + NL + "\t\t\t\t\t}" + NL + "\t\t\t\t\tpublic boolean canUndo() {" + NL + "\t\t\t\t\t\treturn source != null && edgeToRemove != null;" + NL + "\t\t\t\t\t}" + NL + "\t\t\t\t\tpublic void undo() {" + NL + "\t\t\t\t\t\tsource.getDiagram().insertEdge(edgeToRemove);" + NL + "\t\t\t\t\t\tedgeToRemove.setSource(source);" + NL + "\t\t\t\t\t\tedgeToRemove.setTarget(target);" + NL + "\t\t\t\t\t}" + NL + "\t\t\t\t\tpublic void redo() {" + NL + "\t\t\t\t\t\texecute();" + NL + "\t\t\t\t\t}" + NL + "\t\t\t\t\tpublic void execute() {" + NL + "\t\t\t\t\t\tsource.getDiagram().removeEdge(edgeToRemove);" + NL + "\t\t\t\t\t\tedgeToRemove.setSource(null);" + NL + "\t\t\t\t\t\tedgeToRemove.setTarget(null);" + NL + "\t\t\t\t\t}" + NL + "\t\t\t\t});" + NL + "\t\t\t\treturn new ";
+  protected final String TEXT_204 = "(editingDomain, cc);" + NL + "\t\t\t}";
+  protected final String TEXT_205 = NL;
+  protected final String TEXT_206 = NL + "\t\t\tprivate ";
+  protected final String TEXT_207 = " createDomainModelRemoveCommand(";
+  protected final String TEXT_208 = " editingDomain) {";
+  protected final String TEXT_209 = NL + "\t\t\t\t";
+  protected final String TEXT_210 = " result = new ";
+  protected final String TEXT_211 = "();";
+  protected final String TEXT_212 = NL + "\t\t\t\tresult.append(";
+  protected final String TEXT_213 = ".create(" + NL + "\t\t\t\t\teditingDomain," + NL + "\t\t\t\t\t";
+  protected final String TEXT_214 = ".getElement().eContainer(), ";
+  protected final String TEXT_215 = ".getElement().eContainmentFeature(), ";
+  protected final String TEXT_216 = ".getElement()));";
+  protected final String TEXT_217 = NL + "\t\t\t\tresult.append(";
+  protected final String TEXT_218 = ".create(" + NL + "\t\t\t\t\teditingDomain," + NL + "\t\t\t\t\t";
+  protected final String TEXT_219 = ".getElement().eContainer(), ";
+  protected final String TEXT_220 = ".getElement().eContainmentFeature(), ";
+  protected final String TEXT_221 = ".UNSET_VALUE));";
+  protected final String TEXT_222 = NL + "\t\t\t\treturn ";
+  protected final String TEXT_223 = ".INSTANCE;";
+  protected final String TEXT_224 = NL + "\t\t\t\tresult.append(";
+  protected final String TEXT_225 = ".create(" + NL + "\t\t\t\t\teditingDomain," + NL + "\t\t\t\t\t";
+  protected final String TEXT_226 = ".getElement().eContainer(), ";
+  protected final String TEXT_227 = ".eINSTANCE.get";
+  protected final String TEXT_228 = "()," + NL + "\t\t\t\t\t";
+  protected final String TEXT_229 = ".getElement()));";
+  protected final String TEXT_230 = NL + "\t\t\t\tresult.append(";
+  protected final String TEXT_231 = ".create(" + NL + "\t\t\t\t\teditingDomain," + NL + "\t\t\t\t\t";
+  protected final String TEXT_232 = ".getElement().eContainer(), ";
+  protected final String TEXT_233 = ".eINSTANCE.get";
+  protected final String TEXT_234 = "()," + NL + "\t\t\t\t\t";
+  protected final String TEXT_235 = ".UNSET_VALUE));";
+  protected final String TEXT_236 = NL + "\t\t\t\tresult.append(";
+  protected final String TEXT_237 = ".create(" + NL + "\t\t\t\t\teditingDomain," + NL + "\t\t\t\t\t";
+  protected final String TEXT_238 = ".getElement(), ";
+  protected final String TEXT_239 = ".eINSTANCE.get";
+  protected final String TEXT_240 = "(), ";
+  protected final String TEXT_241 = ".getSource().getElement()));";
+  protected final String TEXT_242 = NL + "\t\t\t\tresult.append(";
+  protected final String TEXT_243 = ".create(" + NL + "\t\t\t\t\teditingDomain," + NL + "\t\t\t\t\t";
+  protected final String TEXT_244 = ".getElement(), ";
+  protected final String TEXT_245 = ".eINSTANCE.get";
+  protected final String TEXT_246 = "(), ";
+  protected final String TEXT_247 = ".UNSET_VALUE));";
+  protected final String TEXT_248 = NL + "\t\t\t\tresult.append(";
+  protected final String TEXT_249 = ".create(" + NL + "\t\t\t\t\teditingDomain," + NL + "\t\t\t\t\t";
+  protected final String TEXT_250 = ".getElement(), ";
+  protected final String TEXT_251 = ".eINSTANCE.get";
+  protected final String TEXT_252 = "(), ";
+  protected final String TEXT_253 = ".getTarget().getElement()));";
+  protected final String TEXT_254 = NL + "\t\t\t\tresult.append(";
+  protected final String TEXT_255 = ".create(" + NL + "\t\t\t\t\teditingDomain," + NL + "\t\t\t\t\t";
+  protected final String TEXT_256 = ".getElement(), ";
+  protected final String TEXT_257 = ".eINSTANCE.get";
+  protected final String TEXT_258 = "(), ";
+  protected final String TEXT_259 = ".UNSET_VALUE));";
+  protected final String TEXT_260 = NL + "\t\t\t\treturn result;";
+  protected final String TEXT_261 = NL + "\t\t\t\treturn ";
+  protected final String TEXT_262 = ".create(" + NL + "\t\t\t\t\teditingDomain," + NL + "\t\t\t\t\t";
+  protected final String TEXT_263 = ".getSource().getElement(), ";
+  protected final String TEXT_264 = ".eINSTANCE.get";
+  protected final String TEXT_265 = "(), ";
+  protected final String TEXT_266 = ".getTarget().getElement());";
+  protected final String TEXT_267 = NL + "\t\t\t\treturn ";
+  protected final String TEXT_268 = ".create(" + NL + "\t\t\t\t\teditingDomain," + NL + "\t\t\t\t\t";
+  protected final String TEXT_269 = ".getSource().getElement(), ";
+  protected final String TEXT_270 = ".eINSTANCE.get";
+  protected final String TEXT_271 = "(), ";
+  protected final String TEXT_272 = ".UNSET_VALUE);";
+  protected final String TEXT_273 = NL + "\t\t\t}";
+  protected final String TEXT_274 = NL + "\t\t});";
+  protected final String TEXT_275 = NL;
+  protected final String TEXT_276 = "\t\tinstallEditPolicy(";
+  protected final String TEXT_277 = ".DIRECT_EDIT_ROLE," + NL + "\t\t\t\tnew ";
+  protected final String TEXT_278 = "() {" + NL + "\t\t\t\t\tprotected void showCurrentEditValue(";
+  protected final String TEXT_279 = " request) {" + NL + "\t\t\t\t\t\tString value = (String) request.getCellEditor().getValue();" + NL + "\t\t\t\t\t\tsetWidgetText(value);" + NL + "\t\t\t\t\t}";
+  protected final String TEXT_280 = NL;
+  protected final String TEXT_281 = "\t\t\t\t\tprotected ";
+  protected final String TEXT_282 = " getDirectEditCommand(";
+  protected final String TEXT_283 = " request) {" + NL + "\t\t\t\t\t\tString value = (String) request.getCellEditor().getValue();" + NL + "\t\t\t\t\t\tif (value == null) {" + NL + "\t\t\t\t\t\t\t//Invalid value is transformed into a null by the validator." + NL + "\t\t\t\t\t\t\t//XXX: implement validator" + NL + "\t\t\t\t\t\t\treturn ";
+  protected final String TEXT_284 = ".INSTANCE;" + NL + "\t\t\t\t\t\t}" + NL + "\t\t\t\t\t\tfinal Object[] parseResult;" + NL + "\t\t\t\t\t\ttry {" + NL + "\t\t\t\t\t\t\tparseResult = new ";
+  protected final String TEXT_285 = "(";
+  protected final String TEXT_286 = ").parse(value);" + NL + "\t\t\t\t\t\t} catch (IllegalArgumentException e) {" + NL + "\t\t\t\t\t\t\treturn ";
+  protected final String TEXT_287 = ".INSTANCE;" + NL + "\t\t\t\t\t\t} catch (";
+  protected final String TEXT_288 = " e) {" + NL + "\t\t\t\t\t\t\treturn ";
+  protected final String TEXT_289 = ".INSTANCE;" + NL + "\t\t\t\t\t\t}" + NL + "\t\t\t\t\t\t";
+  protected final String TEXT_290 = " editingDomain = ";
+  protected final String TEXT_291 = ".getEditingDomain(";
+  protected final String TEXT_292 = ".getDiagram().getElement());";
+  protected final String TEXT_293 = NL + "\t\t\t\t\t\tif (parseResult.length != 1) {" + NL + "\t\t\t\t\t\t\treturn ";
+  protected final String TEXT_294 = ".INSTANCE;" + NL + "\t\t\t\t\t\t}" + NL + "\t\t\t\t\t\t";
+  protected final String TEXT_295 = " domainModelCommand = createDomainModelCommand(editingDomain, parseResult[0]);" + NL + "\t\t\t\t\t\treturn new ";
+  protected final String TEXT_296 = "(editingDomain, domainModelCommand);" + NL + "\t\t\t\t\t}" + NL + "\t\t\t\t\t";
+  protected final String TEXT_297 = " createDomainModelCommand(";
+  protected final String TEXT_298 = " editingDomain, Object value) {" + NL + "\t\t\t\t\t\t";
+  protected final String TEXT_299 = " element = ";
+  protected final String TEXT_300 = ";" + NL + "\t\t\t\t\t\t";
+  protected final String TEXT_301 = " feature = (";
+  protected final String TEXT_302 = ") ";
+  protected final String TEXT_303 = ".eINSTANCE.get";
+  protected final String TEXT_304 = "();" + NL + "\t\t\t\t\t\tObject valueToSet;" + NL + "\t\t\t\t\t\ttry {" + NL + "\t\t\t\t\t\t\tvalueToSet = ";
+  protected final String TEXT_305 = ".parseValue(feature, value);" + NL + "\t\t\t\t\t\t} catch (IllegalArgumentException e) {" + NL + "\t\t\t\t\t\t\treturn ";
+  protected final String TEXT_306 = ".INSTANCE;" + NL + "\t\t\t\t\t\t}";
+  protected final String TEXT_307 = NL + "\t\t\t\t\t\t";
+  protected final String TEXT_308 = " result = new ";
+  protected final String TEXT_309 = "();" + NL + "\t\t\t\t\t\t";
+  protected final String TEXT_310 = " values = new ";
+  protected final String TEXT_311 = "();" + NL + "\t\t\t\t\t\tvalues.addAll(element.get";
+  protected final String TEXT_312 = "());" + NL + "\t\t\t\t\t\tresult.append(";
+  protected final String TEXT_313 = ".create(editingDomain, element, feature, values));" + NL + "\t\t\t\t\t\tresult.append(";
+  protected final String TEXT_314 = ".create(editingDomain, element, feature, valueToSet));" + NL + "\t\t\t\t\t\treturn result;";
+  protected final String TEXT_315 = NL + "\t\t\t\t\t\treturn ";
+  protected final String TEXT_316 = ".create(editingDomain, element, feature, valueToSet);";
+  protected final String TEXT_317 = NL + "\t\t\t\t\t}";
+  protected final String TEXT_318 = NL + "\t\t\t\t\t\tif (parseResult.length != ";
+  protected final String TEXT_319 = ") {" + NL + "\t\t\t\t\t\t\treturn ";
+  protected final String TEXT_320 = ".INSTANCE;" + NL + "\t\t\t\t\t\t}" + NL + "\t\t\t\t\t\t";
+  protected final String TEXT_321 = " domainModelCommand = createDomainModelCommand(editingDomain, parseResult);" + NL + "\t\t\t\t\t\treturn new ";
+  protected final String TEXT_322 = "(editingDomain, domainModelCommand);" + NL + "\t\t\t\t\t}" + NL + "\t\t\t\t\t";
+  protected final String TEXT_323 = " createDomainModelCommand(";
+  protected final String TEXT_324 = " editingDomain, Object[] values) {" + NL + "\t\t\t\t\t\t";
+  protected final String TEXT_325 = " element = ";
+  protected final String TEXT_326 = ";" + NL + "\t\t\t\t\t\t";
+  protected final String TEXT_327 = " result = new ";
+  protected final String TEXT_328 = "();" + NL + "\t\t\t\t\t\tObject valueToSet;";
+  protected final String TEXT_329 = NL + "\t\t\t\t\t\t";
+  protected final String TEXT_330 = " ";
+  protected final String TEXT_331 = "feature = (";
+  protected final String TEXT_332 = ") ";
+  protected final String TEXT_333 = ".eINSTANCE.get";
+  protected final String TEXT_334 = "();" + NL + "\t\t\t\t\t\ttry {" + NL + "\t\t\t\t\t\t\tvalueToSet = ";
+  protected final String TEXT_335 = ".parseValue(feature, values[";
+  protected final String TEXT_336 = "]);" + NL + "\t\t\t\t\t\t} catch (IllegalArgumentException e) {" + NL + "\t\t\t\t\t\t\treturn ";
+  protected final String TEXT_337 = ".INSTANCE;" + NL + "\t\t\t\t\t\t}";
+  protected final String TEXT_338 = NL + "\t\t\t\t\t\t";
+  protected final String TEXT_339 = " ";
+  protected final String TEXT_340 = "values = new ";
+  protected final String TEXT_341 = "();" + NL + "\t\t\t\t\t\tvalues.addAll(element.get";
+  protected final String TEXT_342 = "());" + NL + "\t\t\t\t\t\tresult.append(";
+  protected final String TEXT_343 = ".create(editingDomain, element, feature, values));" + NL + "\t\t\t\t\t\tresult.append(";
+  protected final String TEXT_344 = ".create(editingDomain, element, feature, valueToSet));";
+  protected final String TEXT_345 = NL + "\t\t\t\t\t\tresult.append(";
+  protected final String TEXT_346 = ".create(editingDomain, element, feature, valueToSet));";
+  protected final String TEXT_347 = NL + "\t\t\t\t\t\treturn result;" + NL + "\t\t\t\t\t}";
+  protected final String TEXT_348 = NL + "\t\t\t\t});";
+  protected final String TEXT_349 = NL + "\t\t}" + NL;
+  protected final String TEXT_350 = NL;
+  protected final String TEXT_351 = "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate ";
+  protected final String TEXT_352 = " manager;" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic void performRequest(";
+  protected final String TEXT_353 = " req) {" + NL + "\t\tif (";
+  protected final String TEXT_354 = ".REQ_DIRECT_EDIT == req.getType()) {" + NL + "\t\t\tperformDirectEdit();" + NL + "\t\t} else {" + NL + "\t\t\tsuper.performRequest(req);" + NL + "\t\t}" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected ";
+  protected final String TEXT_355 = " getManager() {" + NL + "\t\tif (manager == null) {" + NL + "\t\t\tmanager = new ";
+  protected final String TEXT_356 = "(this, ";
+  protected final String TEXT_357 = ".class, new ";
+  protected final String TEXT_358 = "() {" + NL + "\t\t\t\tpublic void relocate(";
+  protected final String TEXT_359 = " celleditor) {" + NL + "\t\t\t\t\tif (checkTreeItem()) {" + NL + "\t\t\t\t\t\tcelleditor.getControl().setFont(((";
+  protected final String TEXT_360 = ") getWidget()).getFont());" + NL + "\t\t\t\t\t\tcelleditor.getControl().setBounds(((";
+  protected final String TEXT_361 = ") getWidget()).getBounds());" + NL + "\t\t\t\t\t}" + NL + "\t\t\t\t}" + NL + "\t\t\t}) {" + NL + "\t\t\t\tprotected void initCellEditor() {" + NL + "\t\t\t\t\tgetCellEditor().setValue(getEditText());" + NL + "\t\t\t\t}" + NL + "\t\t\t};" + NL + "\t\t}" + NL + "\t\treturn manager;" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected void performDirectEdit() {" + NL + "\t\tgetManager().show();" + NL + "\t}" + NL + "" + NL + "" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tprotected String getEditText() {" + NL + "\t\t\t";
+  protected final String TEXT_362 = " primaryLabelEditPart = getPrimaryLabelEditPart();" + NL + "\t" + NL + "\t\t\tif (primaryLabelEditPart != null) {" + NL + "\t\t\t\treturn primaryLabelEditPart.getLabelEditText();" + NL + "\t\t\t}" + NL + "\t\t\treturn \"\";" + NL + "\t\t}" + NL;
+  protected final String TEXT_363 = NL;
+  protected final String TEXT_364 = NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tpublic void activate() {" + NL + "\t\t\tsuper.activate();" + NL + "\t\t\tgetDiagramEdge().getElement().eAdapters().add(domainModelRefresher);" + NL + "\t\t}" + NL + "" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tpublic void deactivate() {" + NL + "\t\t\tgetDiagramEdge().getElement().eAdapters().remove(domainModelRefresher);" + NL + "\t\t\tsuper.deactivate();" + NL + "\t\t}" + NL;
+  protected final String TEXT_365 = NL;
+  protected final String TEXT_366 = "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate ";
+  protected final String TEXT_367 = " domainModelRefresher = new ";
+  protected final String TEXT_368 = "(this);" + NL;
+  protected final String TEXT_369 = NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tprotected void createRefreshers() {" + NL + "\t\t\tsuper.createRefreshers();";
+  protected final String TEXT_370 = NL + "\t\t\tRefresher labelRefresher = new Refresher() {" + NL + "\t\t\t\tpublic void refresh() {" + NL + "\t\t\t\t\trefreshVisuals();" + NL + "\t\t\t\t}" + NL + "\t\t\t};";
+  protected final String TEXT_371 = NL + "\t\t\tregisterRefresher(";
+  protected final String TEXT_372 = ".eINSTANCE.get";
+  protected final String TEXT_373 = "(), labelRefresher);";
+  protected final String TEXT_374 = NL + "\t\t\tregisterRefresher(";
+  protected final String TEXT_375 = ".eINSTANCE.get";
+  protected final String TEXT_376 = "(), labelRefresher);";
+  protected final String TEXT_377 = NL + "\t\t\tregisterRefresher(";
+  protected final String TEXT_378 = ".eINSTANCE.get";
+  protected final String TEXT_379 = "(), labelRefresher);";
+  protected final String TEXT_380 = NL + "\t\t}" + NL;
+  protected final String TEXT_381 = NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tprotected String getText() {" + NL + "\t\t\t";
+  protected final String TEXT_382 = " primaryLabelEditPart = getPrimaryLabelEditPart();" + NL + "\t\t\tif (primaryLabelEditPart != null) {" + NL + "\t\t\t\treturn primaryLabelEditPart.getLabelText();" + NL + "\t\t\t}" + NL + "\t\t\treturn super.getText();" + NL + "\t\t}" + NL + "" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tprivate ";
+  protected final String TEXT_383 = " getPrimaryLabelEditPart() {" + NL + "\t\t\tfor(";
+  protected final String TEXT_384 = " it = getDiagramEdge().getChildren().iterator(); it.hasNext(); ) {" + NL + "\t\t\t\t";
+  protected final String TEXT_385 = " nextChild = (";
+  protected final String TEXT_386 = ")it.next();" + NL + "\t\t\t\tif (";
+  protected final String TEXT_387 = ".getVisualID(nextChild) == ";
+  protected final String TEXT_388 = ".VISUAL_ID) {" + NL + "\t\t\t\t\treturn (";
+  protected final String TEXT_389 = ") ";
+  protected final String TEXT_390 = ".this.getViewer().getEditPartRegistry().get(nextChild);" + NL + "\t\t\t\t}" + NL + "\t\t\t}" + NL + "\t\t\treturn null;" + NL + "\t\t}";
+  protected final String TEXT_391 = NL + NL + "\t\t/**" + NL + "\t\t * Since labels are not selectable edit parts, they are filtered from the overview as well." + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tprotected ";
+  protected final String TEXT_392 = " getModelChildren() {" + NL + "\t\t\treturn ";
+  protected final String TEXT_393 = ".EMPTY_LIST;" + NL + "\t\t}" + NL + "\t}" + NL + "}";
+  protected final String TEXT_394 = NL;
 
   public String generate(Object argument)
   {
@@ -208,6 +420,7 @@
 GenLink genLink = (GenLink) ((Object[]) argument)[0];
 GenDiagram genDiagram = genLink.getDiagram();
 final ImportAssistant importManager = (ImportAssistant) ((Object[]) argument)[1];
+importManager.registerInnerClass("TreeEditPartAdapter");
 
     stringBuffer.append(TEXT_1);
     
@@ -258,41 +471,52 @@
     stringBuffer.append(TEXT_21);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.View"));
     stringBuffer.append(TEXT_22);
+    
+GenLinkLabel primaryLabel = null;
+for(Iterator it = genLink.getLabels().iterator(); it.hasNext(); ) {
+	GenLinkLabel next = (GenLinkLabel)it.next();
+	if (!next.isReadOnly()) {
+		primaryLabel = next;
+		break;
+	}
+}
+
     stringBuffer.append(TEXT_23);
     stringBuffer.append(TEXT_24);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.EditPolicy"));
     stringBuffer.append(TEXT_25);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.editpolicies.ComponentEditPolicy"));
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.EditPolicy"));
     stringBuffer.append(TEXT_26);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.commands.Command"));
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.editpolicies.ComponentEditPolicy"));
     stringBuffer.append(TEXT_27);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.requests.GroupRequest"));
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.commands.Command"));
     stringBuffer.append(TEXT_28);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.TransactionalEditingDomain"));
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.requests.GroupRequest"));
     stringBuffer.append(TEXT_29);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.util.TransactionUtil"));
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.TransactionalEditingDomain"));
     stringBuffer.append(TEXT_30);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.command.CompoundCommand"));
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.util.TransactionUtil"));
     stringBuffer.append(TEXT_31);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.command.CompoundCommand"));
     stringBuffer.append(TEXT_32);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.command.AbstractCommand"));
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.command.CompoundCommand"));
     stringBuffer.append(TEXT_33);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.lite.commands.WrappingCommand"));
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.command.AbstractCommand"));
     stringBuffer.append(TEXT_34);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.lite.commands.WrappingCommand"));
+    stringBuffer.append(TEXT_35);
     
 {
 	String _edge = "getDiagramEdge()";
 
-    stringBuffer.append(TEXT_35);
+    stringBuffer.append(TEXT_36);
     
 	//input: _edge : String
 
-    stringBuffer.append(TEXT_36);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.command.Command"));
     stringBuffer.append(TEXT_37);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.TransactionalEditingDomain"));
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.command.Command"));
     stringBuffer.append(TEXT_38);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.TransactionalEditingDomain"));
+    stringBuffer.append(TEXT_39);
     
 	if (genLink.getModelFacet() instanceof TypeLinkModelFacet) {
 		TypeLinkModelFacet modelFacet = (TypeLinkModelFacet) genLink.getModelFacet();
@@ -319,234 +543,244 @@
 				}
 			}
 
-    stringBuffer.append(TEXT_39);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.command.CompoundCommand"));
     stringBuffer.append(TEXT_40);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.command.CompoundCommand"));
     stringBuffer.append(TEXT_41);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.command.CompoundCommand"));
+    stringBuffer.append(TEXT_42);
     
 			if (containmentFeature.getEcoreFeature().isMany()) {
 
-    stringBuffer.append(TEXT_42);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.edit.command.RemoveCommand"));
     stringBuffer.append(TEXT_43);
-    stringBuffer.append(_edge);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.edit.command.RemoveCommand"));
     stringBuffer.append(TEXT_44);
     stringBuffer.append(_edge);
     stringBuffer.append(TEXT_45);
     stringBuffer.append(_edge);
     stringBuffer.append(TEXT_46);
+    stringBuffer.append(_edge);
+    stringBuffer.append(TEXT_47);
     
 			} else {
 
-    stringBuffer.append(TEXT_47);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.edit.command.SetCommand"));
     stringBuffer.append(TEXT_48);
-    stringBuffer.append(_edge);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.edit.command.SetCommand"));
     stringBuffer.append(TEXT_49);
     stringBuffer.append(_edge);
     stringBuffer.append(TEXT_50);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.edit.command.SetCommand"));
+    stringBuffer.append(_edge);
     stringBuffer.append(TEXT_51);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.edit.command.SetCommand"));
+    stringBuffer.append(TEXT_52);
     
 			}
 		} else {
 
-    stringBuffer.append(TEXT_52);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.command.UnexecutableCommand"));
     stringBuffer.append(TEXT_53);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.command.UnexecutableCommand"));
+    stringBuffer.append(TEXT_54);
     
 		}
 		if (removeChild) {
 			if (childFeature.getEcoreFeature().isMany()) {
 
-    stringBuffer.append(TEXT_54);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.edit.command.RemoveCommand"));
     stringBuffer.append(TEXT_55);
-    stringBuffer.append(_edge);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.edit.command.RemoveCommand"));
     stringBuffer.append(TEXT_56);
-    stringBuffer.append(importManager.getImportedName(childFeature.getGenPackage().getQualifiedPackageInterfaceName()));
+    stringBuffer.append(_edge);
     stringBuffer.append(TEXT_57);
-    stringBuffer.append(childFeature.getFeatureAccessorName());
+    stringBuffer.append(importManager.getImportedName(childFeature.getGenPackage().getQualifiedPackageInterfaceName()));
     stringBuffer.append(TEXT_58);
-    stringBuffer.append(_edge);
+    stringBuffer.append(childFeature.getFeatureAccessorName());
     stringBuffer.append(TEXT_59);
+    stringBuffer.append(_edge);
+    stringBuffer.append(TEXT_60);
     
 			} else {
 
-    stringBuffer.append(TEXT_60);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.edit.command.SetCommand"));
     stringBuffer.append(TEXT_61);
-    stringBuffer.append(_edge);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.edit.command.SetCommand"));
     stringBuffer.append(TEXT_62);
-    stringBuffer.append(importManager.getImportedName(childFeature.getGenPackage().getQualifiedPackageInterfaceName()));
+    stringBuffer.append(_edge);
     stringBuffer.append(TEXT_63);
-    stringBuffer.append(childFeature.getFeatureAccessorName());
+    stringBuffer.append(importManager.getImportedName(childFeature.getGenPackage().getQualifiedPackageInterfaceName()));
     stringBuffer.append(TEXT_64);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.edit.command.SetCommand"));
+    stringBuffer.append(childFeature.getFeatureAccessorName());
     stringBuffer.append(TEXT_65);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.edit.command.SetCommand"));
+    stringBuffer.append(TEXT_66);
     
 			}
 		}
 		if (removeSource) {
 			if (sourceFeature.getEcoreFeature().isMany()) {
 
-    stringBuffer.append(TEXT_66);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.edit.command.RemoveCommand"));
     stringBuffer.append(TEXT_67);
-    stringBuffer.append(_edge);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.edit.command.RemoveCommand"));
     stringBuffer.append(TEXT_68);
-    stringBuffer.append(importManager.getImportedName(sourceFeature.getGenPackage().getQualifiedPackageInterfaceName()));
+    stringBuffer.append(_edge);
     stringBuffer.append(TEXT_69);
-    stringBuffer.append(sourceFeature.getFeatureAccessorName());
+    stringBuffer.append(importManager.getImportedName(sourceFeature.getGenPackage().getQualifiedPackageInterfaceName()));
     stringBuffer.append(TEXT_70);
-    stringBuffer.append(_edge);
+    stringBuffer.append(sourceFeature.getFeatureAccessorName());
     stringBuffer.append(TEXT_71);
+    stringBuffer.append(_edge);
+    stringBuffer.append(TEXT_72);
     
 			} else {
 
-    stringBuffer.append(TEXT_72);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.edit.command.SetCommand"));
     stringBuffer.append(TEXT_73);
-    stringBuffer.append(_edge);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.edit.command.SetCommand"));
     stringBuffer.append(TEXT_74);
-    stringBuffer.append(importManager.getImportedName(sourceFeature.getGenPackage().getQualifiedPackageInterfaceName()));
+    stringBuffer.append(_edge);
     stringBuffer.append(TEXT_75);
-    stringBuffer.append(sourceFeature.getFeatureAccessorName());
+    stringBuffer.append(importManager.getImportedName(sourceFeature.getGenPackage().getQualifiedPackageInterfaceName()));
     stringBuffer.append(TEXT_76);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.edit.command.SetCommand"));
+    stringBuffer.append(sourceFeature.getFeatureAccessorName());
     stringBuffer.append(TEXT_77);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.edit.command.SetCommand"));
+    stringBuffer.append(TEXT_78);
     
 			}
 		}
 		if (removeTarget) {
 			if (targetFeature.getEcoreFeature().isMany()) {
 
-    stringBuffer.append(TEXT_78);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.edit.command.RemoveCommand"));
     stringBuffer.append(TEXT_79);
-    stringBuffer.append(_edge);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.edit.command.RemoveCommand"));
     stringBuffer.append(TEXT_80);
-    stringBuffer.append(importManager.getImportedName(targetFeature.getGenPackage().getQualifiedPackageInterfaceName()));
+    stringBuffer.append(_edge);
     stringBuffer.append(TEXT_81);
-    stringBuffer.append(targetFeature.getFeatureAccessorName());
+    stringBuffer.append(importManager.getImportedName(targetFeature.getGenPackage().getQualifiedPackageInterfaceName()));
     stringBuffer.append(TEXT_82);
-    stringBuffer.append(_edge);
+    stringBuffer.append(targetFeature.getFeatureAccessorName());
     stringBuffer.append(TEXT_83);
+    stringBuffer.append(_edge);
+    stringBuffer.append(TEXT_84);
     
 			} else {
 
-    stringBuffer.append(TEXT_84);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.edit.command.SetCommand"));
     stringBuffer.append(TEXT_85);
-    stringBuffer.append(_edge);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.edit.command.SetCommand"));
     stringBuffer.append(TEXT_86);
-    stringBuffer.append(importManager.getImportedName(targetFeature.getGenPackage().getQualifiedPackageInterfaceName()));
+    stringBuffer.append(_edge);
     stringBuffer.append(TEXT_87);
-    stringBuffer.append(targetFeature.getFeatureAccessorName());
+    stringBuffer.append(importManager.getImportedName(targetFeature.getGenPackage().getQualifiedPackageInterfaceName()));
     stringBuffer.append(TEXT_88);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.edit.command.SetCommand"));
+    stringBuffer.append(targetFeature.getFeatureAccessorName());
     stringBuffer.append(TEXT_89);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.edit.command.SetCommand"));
+    stringBuffer.append(TEXT_90);
     
 			}
 		}
 
-    stringBuffer.append(TEXT_90);
+    stringBuffer.append(TEXT_91);
     
 	} else if (genLink.getModelFacet() instanceof FeatureModelFacet) {
 		GenFeature metaFeature = ((FeatureModelFacet) genLink.getModelFacet()).getMetaFeature();
 		if (metaFeature.getEcoreFeature().isMany()) {
 
-    stringBuffer.append(TEXT_91);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.edit.command.RemoveCommand"));
     stringBuffer.append(TEXT_92);
-    stringBuffer.append(_edge);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.edit.command.RemoveCommand"));
     stringBuffer.append(TEXT_93);
-    stringBuffer.append(importManager.getImportedName(metaFeature.getGenPackage().getQualifiedPackageInterfaceName()));
+    stringBuffer.append(_edge);
     stringBuffer.append(TEXT_94);
-    stringBuffer.append(metaFeature.getFeatureAccessorName());
+    stringBuffer.append(importManager.getImportedName(metaFeature.getGenPackage().getQualifiedPackageInterfaceName()));
     stringBuffer.append(TEXT_95);
-    stringBuffer.append(_edge);
+    stringBuffer.append(metaFeature.getFeatureAccessorName());
     stringBuffer.append(TEXT_96);
+    stringBuffer.append(_edge);
+    stringBuffer.append(TEXT_97);
     
 		} else {
 
-    stringBuffer.append(TEXT_97);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.edit.command.SetCommand"));
     stringBuffer.append(TEXT_98);
-    stringBuffer.append(_edge);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.edit.command.SetCommand"));
     stringBuffer.append(TEXT_99);
-    stringBuffer.append(importManager.getImportedName(metaFeature.getGenPackage().getQualifiedPackageInterfaceName()));
+    stringBuffer.append(_edge);
     stringBuffer.append(TEXT_100);
-    stringBuffer.append(metaFeature.getFeatureAccessorName());
+    stringBuffer.append(importManager.getImportedName(metaFeature.getGenPackage().getQualifiedPackageInterfaceName()));
     stringBuffer.append(TEXT_101);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.edit.command.SetCommand"));
+    stringBuffer.append(metaFeature.getFeatureAccessorName());
     stringBuffer.append(TEXT_102);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.edit.command.SetCommand"));
+    stringBuffer.append(TEXT_103);
     
 		}
 
     
 	}
 
-    stringBuffer.append(TEXT_103);
+    stringBuffer.append(TEXT_104);
     
 }	//local declarations
 
-    stringBuffer.append(TEXT_104);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.EditPolicy"));
     stringBuffer.append(TEXT_105);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.editpolicies.ConnectionEndpointEditPolicy"));
-    stringBuffer.append(TEXT_106);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gef.EditPolicy"));
+    stringBuffer.append(TEXT_106);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.editpolicies.ConnectionEndpointEditPolicy"));
     stringBuffer.append(TEXT_107);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.lite.edit.policies.BendpointEditPolicy"));
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.EditPolicy"));
     stringBuffer.append(TEXT_108);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.lite.edit.policies.BendpointEditPolicy"));
+    stringBuffer.append(TEXT_109);
     
-GenLinkLabel primaryLabel = null;
-for(Iterator it = genLink.getLabels().iterator(); it.hasNext(); ) {
-	GenLinkLabel next = (GenLinkLabel)it.next();
-	if (!next.isReadOnly()) {
-		primaryLabel = next;
-		break;
-	}
-}
 if (primaryLabel != null) {
 
-    stringBuffer.append(TEXT_109);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.EditPart"));
     stringBuffer.append(TEXT_110);
-    stringBuffer.append(importManager.getImportedName("java.util.Iterator"));
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.EditPolicy"));
     stringBuffer.append(TEXT_111);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.View"));
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.editpolicies.DirectEditPolicy"));
     stringBuffer.append(TEXT_112);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.View"));
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.requests.DirectEditRequest"));
     stringBuffer.append(TEXT_113);
-    stringBuffer.append(importManager.getImportedName(genDiagram.getVisualIDRegistryQualifiedClassName()));
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.commands.Command"));
     stringBuffer.append(TEXT_114);
-    stringBuffer.append(importManager.getImportedName(primaryLabel.getEditPartQualifiedClassName()));
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.requests.DirectEditRequest"));
     stringBuffer.append(TEXT_115);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.Request"));
+    
+}
+
     stringBuffer.append(TEXT_116);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.RequestConstants"));
+    
+if (primaryLabel != null) {
+
     stringBuffer.append(TEXT_117);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gef.EditPart"));
     stringBuffer.append(TEXT_118);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.requests.DirectEditRequest"));
+    stringBuffer.append(importManager.getImportedName("java.util.Iterator"));
     stringBuffer.append(TEXT_119);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.requests.DirectEditRequest"));
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.View"));
     stringBuffer.append(TEXT_120);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.EditPart"));
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.View"));
     stringBuffer.append(TEXT_121);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.requests.DirectEditRequest"));
+    stringBuffer.append(importManager.getImportedName(genDiagram.getVisualIDRegistryQualifiedClassName()));
     stringBuffer.append(TEXT_122);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.EditPart"));
+    stringBuffer.append(importManager.getImportedName(primaryLabel.getEditPartQualifiedClassName()));
     stringBuffer.append(TEXT_123);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.View"));
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.Request"));
     stringBuffer.append(TEXT_124);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.View"));
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.RequestConstants"));
     stringBuffer.append(TEXT_125);
-    stringBuffer.append(importManager.getImportedName(genDiagram.getVisualIDRegistryQualifiedClassName()));
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.EditPart"));
     stringBuffer.append(TEXT_126);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.requests.DirectEditRequest"));
+    stringBuffer.append(TEXT_127);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.requests.DirectEditRequest"));
+    stringBuffer.append(TEXT_128);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.EditPart"));
+    stringBuffer.append(TEXT_129);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.requests.DirectEditRequest"));
+    stringBuffer.append(TEXT_130);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.EditPart"));
+    stringBuffer.append(TEXT_131);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.View"));
+    stringBuffer.append(TEXT_132);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.View"));
+    stringBuffer.append(TEXT_133);
+    stringBuffer.append(importManager.getImportedName(genDiagram.getVisualIDRegistryQualifiedClassName()));
+    stringBuffer.append(TEXT_134);
     
 		for (Iterator it = genLink.getLabels().iterator(); it.hasNext(); ) {
 			GenLinkLabel genLabel = (GenLinkLabel) it.next();
@@ -554,91 +788,93 @@
 				continue;
 			}
 
-    stringBuffer.append(TEXT_127);
+    stringBuffer.append(TEXT_135);
     stringBuffer.append(importManager.getImportedName(genLabel.getEditPartQualifiedClassName()));
-    stringBuffer.append(TEXT_128);
+    stringBuffer.append(TEXT_136);
     
 		}
 
-    stringBuffer.append(TEXT_129);
+    stringBuffer.append(TEXT_137);
     
 }	//if (primaryLabel != null, i.e., there are editable labels)
 
-    stringBuffer.append(TEXT_130);
-    stringBuffer.append(TEXT_131);
-    stringBuffer.append(TEXT_132);
+    stringBuffer.append(TEXT_138);
+    stringBuffer.append(TEXT_139);
+    stringBuffer.append(TEXT_140);
     stringBuffer.append(importManager.getImportedName("java.util.HashMap"));
-    stringBuffer.append(TEXT_133);
+    stringBuffer.append(TEXT_141);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EStructuralFeature"));
-    stringBuffer.append(TEXT_134);
+    stringBuffer.append(TEXT_142);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.notify.Notification"));
-    stringBuffer.append(TEXT_135);
+    stringBuffer.append(TEXT_143);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.TreeEditPart"));
+    stringBuffer.append(TEXT_144);
     
 if (genLink.getModelFacet() instanceof TypeLinkModelFacet) {
 	//Otherwise, there's no element associated with the element
 
-    stringBuffer.append(TEXT_136);
-    stringBuffer.append(TEXT_137);
-    stringBuffer.append(TEXT_138);
+    stringBuffer.append(TEXT_145);
+    stringBuffer.append(TEXT_146);
+    stringBuffer.append(TEXT_147);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.lite.edit.parts.update.RefreshAdapter"));
-    stringBuffer.append(TEXT_139);
+    stringBuffer.append(TEXT_148);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.lite.edit.parts.update.RefreshAdapter"));
-    stringBuffer.append(TEXT_140);
+    stringBuffer.append(TEXT_149);
     
 }
 
-    stringBuffer.append(TEXT_141);
-    stringBuffer.append(TEXT_142);
+    stringBuffer.append(TEXT_150);
+    stringBuffer.append(TEXT_151);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EStructuralFeature"));
-    stringBuffer.append(TEXT_143);
+    stringBuffer.append(TEXT_152);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EStructuralFeature"));
-    stringBuffer.append(TEXT_144);
+    stringBuffer.append(TEXT_153);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EStructuralFeature"));
-    stringBuffer.append(TEXT_145);
-    stringBuffer.append(TEXT_146);
-    stringBuffer.append(TEXT_147);
+    stringBuffer.append(TEXT_154);
+    stringBuffer.append(TEXT_155);
+    stringBuffer.append(TEXT_156);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.NotationPackage"));
-    stringBuffer.append(TEXT_148);
+    stringBuffer.append(TEXT_157);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.NotationPackage"));
-    stringBuffer.append(TEXT_149);
-    stringBuffer.append(TEXT_150);
-    stringBuffer.append(TEXT_151);
+    stringBuffer.append(TEXT_158);
+    stringBuffer.append(TEXT_159);
+    stringBuffer.append(TEXT_160);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.NotationPackage"));
-    stringBuffer.append(TEXT_152);
-    stringBuffer.append(TEXT_153);
-    stringBuffer.append(TEXT_154);
+    stringBuffer.append(TEXT_161);
+    stringBuffer.append(TEXT_162);
+    stringBuffer.append(TEXT_163);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.NotationPackage"));
-    stringBuffer.append(TEXT_155);
+    stringBuffer.append(TEXT_164);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.NotationPackage"));
-    stringBuffer.append(TEXT_156);
+    stringBuffer.append(TEXT_165);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.RelativeBendpoints"));
-    stringBuffer.append(TEXT_157);
+    stringBuffer.append(TEXT_166);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.RelativeBendpoints"));
-    stringBuffer.append(TEXT_158);
+    stringBuffer.append(TEXT_167);
     stringBuffer.append(importManager.getImportedName("java.util.Collections"));
-    stringBuffer.append(TEXT_159);
+    stringBuffer.append(TEXT_168);
     stringBuffer.append(importManager.getImportedName("java.util.List"));
-    stringBuffer.append(TEXT_160);
+    stringBuffer.append(TEXT_169);
     stringBuffer.append(importManager.getImportedName("java.util.List"));
-    stringBuffer.append(TEXT_161);
+    stringBuffer.append(TEXT_170);
     stringBuffer.append(importManager.getImportedName("java.util.ArrayList"));
-    stringBuffer.append(TEXT_162);
+    stringBuffer.append(TEXT_171);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.datatype.RelativeBendpoint"));
-    stringBuffer.append(TEXT_163);
+    stringBuffer.append(TEXT_172);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.datatype.RelativeBendpoint"));
-    stringBuffer.append(TEXT_164);
+    stringBuffer.append(TEXT_173);
     stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.RelativeBendpoint"));
-    stringBuffer.append(TEXT_165);
+    stringBuffer.append(TEXT_174);
     stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.RelativeBendpoint"));
-    stringBuffer.append(TEXT_166);
+    stringBuffer.append(TEXT_175);
     stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.geometry.Dimension"));
-    stringBuffer.append(TEXT_167);
+    stringBuffer.append(TEXT_176);
     stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.geometry.Dimension"));
-    stringBuffer.append(TEXT_168);
+    stringBuffer.append(TEXT_177);
     stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.BendpointConnectionRouter"));
-    stringBuffer.append(TEXT_169);
+    stringBuffer.append(TEXT_178);
     stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.IFigure"));
-    stringBuffer.append(TEXT_170);
+    stringBuffer.append(TEXT_179);
     
 Viewmap viewmap = genLink.getViewmap();
 if (viewmap instanceof FigureViewmap) {
@@ -648,41 +884,592 @@
 		figureQualifiedClassName = "org.eclipse.gmf.runtime.draw2d.PolylineConnection";
 	}
 
-    stringBuffer.append(TEXT_171);
+    stringBuffer.append(TEXT_180);
     stringBuffer.append(importManager.getImportedName(figureQualifiedClassName));
-    stringBuffer.append(TEXT_172);
+    stringBuffer.append(TEXT_181);
     } // instanceof FigureViewmap
 	else if (viewmap instanceof SnippetViewmap) {
-    stringBuffer.append(TEXT_173);
+    stringBuffer.append(TEXT_182);
     stringBuffer.append(((SnippetViewmap) viewmap).getBody());
-    stringBuffer.append(TEXT_174);
+    stringBuffer.append(TEXT_183);
     } // instanceof SnippetViewmap 
 	else if (viewmap instanceof InnerClassViewmap) {
-    stringBuffer.append(TEXT_175);
+    stringBuffer.append(TEXT_184);
     stringBuffer.append(((InnerClassViewmap) viewmap).getClassName());
-    stringBuffer.append(TEXT_176);
+    stringBuffer.append(TEXT_185);
     }
-    stringBuffer.append(TEXT_177);
+    stringBuffer.append(TEXT_186);
     
 if (genLink.getViewmap() instanceof InnerClassViewmap) {
 	String classBody = ((InnerClassViewmap) genLink.getViewmap()).getClassBody();
 
-    stringBuffer.append(TEXT_178);
+    stringBuffer.append(TEXT_187);
     stringBuffer.append(classBody);
-    stringBuffer.append(TEXT_179);
+    stringBuffer.append(TEXT_188);
     
 if (classBody.indexOf("DPtoLP") != -1) {
 
-    stringBuffer.append(TEXT_180);
+    stringBuffer.append(TEXT_189);
     
 }
 
     
 }
 
-    stringBuffer.append(TEXT_181);
+    stringBuffer.append(TEXT_190);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.lite.edit.parts.tree.BaseTreeEditPart"));
+    stringBuffer.append(TEXT_191);
+    stringBuffer.append(importManager.getImportedName(genDiagram.getEditorGen().getPlugin().getActivatorQualifiedClassName()));
+    stringBuffer.append(TEXT_192);
+    stringBuffer.append(TEXT_193);
+    stringBuffer.append(TEXT_194);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.EditPolicy"));
+    stringBuffer.append(TEXT_195);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.editpolicies.ComponentEditPolicy"));
+    stringBuffer.append(TEXT_196);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.commands.Command"));
+    stringBuffer.append(TEXT_197);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.requests.GroupRequest"));
+    stringBuffer.append(TEXT_198);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.TransactionalEditingDomain"));
+    stringBuffer.append(TEXT_199);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.util.TransactionUtil"));
+    stringBuffer.append(TEXT_200);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.command.CompoundCommand"));
+    stringBuffer.append(TEXT_201);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.command.CompoundCommand"));
+    stringBuffer.append(TEXT_202);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.command.AbstractCommand"));
+    stringBuffer.append(TEXT_203);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.lite.commands.WrappingCommand"));
+    stringBuffer.append(TEXT_204);
+    
+{
+	String _edge = "getDiagramEdge()";
+
+    stringBuffer.append(TEXT_205);
+    
+	//input: _edge : String
+
+    stringBuffer.append(TEXT_206);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.command.Command"));
+    stringBuffer.append(TEXT_207);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.TransactionalEditingDomain"));
+    stringBuffer.append(TEXT_208);
+    
+	if (genLink.getModelFacet() instanceof TypeLinkModelFacet) {
+		TypeLinkModelFacet modelFacet = (TypeLinkModelFacet) genLink.getModelFacet();
+		GenFeature sourceFeature = modelFacet.getSourceMetaFeature();
+		GenFeature containmentFeature = modelFacet.getContainmentMetaFeature();
+		GenFeature childFeature = modelFacet.getChildMetaFeature();
+		GenFeature targetFeature = modelFacet.getTargetMetaFeature();
+		//See creation of links in NodeEditPart
+
+		boolean removeSource = sourceFeature != null;
+		boolean removeTarget = targetFeature != null;
+		boolean removeChild = childFeature != null && childFeature != containmentFeature && !childFeature.isDerived();
+		if (containmentFeature != null) {
+			if (sourceFeature != null && sourceFeature.getEcoreFeature() instanceof EReference == true) {
+				EReference sourceEcoreFeature = (EReference)sourceFeature.getEcoreFeature();
+				if (sourceEcoreFeature.getEOpposite() == containmentFeature.getEcoreFeature()) {
+					removeSource = false;
+				}
+			}
+			if (targetFeature != null && targetFeature.getEcoreFeature() instanceof EReference == true) {
+				EReference targetEcoreFeature = (EReference)targetFeature.getEcoreFeature();
+				if (targetEcoreFeature.getEOpposite() == containmentFeature.getEcoreFeature()) {
+					removeTarget = false;
+				}
+			}
+
+    stringBuffer.append(TEXT_209);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.command.CompoundCommand"));
+    stringBuffer.append(TEXT_210);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.command.CompoundCommand"));
+    stringBuffer.append(TEXT_211);
+    
+			if (containmentFeature.getEcoreFeature().isMany()) {
+
+    stringBuffer.append(TEXT_212);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.edit.command.RemoveCommand"));
+    stringBuffer.append(TEXT_213);
+    stringBuffer.append(_edge);
+    stringBuffer.append(TEXT_214);
+    stringBuffer.append(_edge);
+    stringBuffer.append(TEXT_215);
+    stringBuffer.append(_edge);
+    stringBuffer.append(TEXT_216);
+    
+			} else {
+
+    stringBuffer.append(TEXT_217);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.edit.command.SetCommand"));
+    stringBuffer.append(TEXT_218);
+    stringBuffer.append(_edge);
+    stringBuffer.append(TEXT_219);
+    stringBuffer.append(_edge);
+    stringBuffer.append(TEXT_220);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.edit.command.SetCommand"));
+    stringBuffer.append(TEXT_221);
+    
+			}
+		} else {
+
+    stringBuffer.append(TEXT_222);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.command.UnexecutableCommand"));
+    stringBuffer.append(TEXT_223);
+    
+		}
+		if (removeChild) {
+			if (childFeature.getEcoreFeature().isMany()) {
+
+    stringBuffer.append(TEXT_224);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.edit.command.RemoveCommand"));
+    stringBuffer.append(TEXT_225);
+    stringBuffer.append(_edge);
+    stringBuffer.append(TEXT_226);
+    stringBuffer.append(importManager.getImportedName(childFeature.getGenPackage().getQualifiedPackageInterfaceName()));
+    stringBuffer.append(TEXT_227);
+    stringBuffer.append(childFeature.getFeatureAccessorName());
+    stringBuffer.append(TEXT_228);
+    stringBuffer.append(_edge);
+    stringBuffer.append(TEXT_229);
+    
+			} else {
+
+    stringBuffer.append(TEXT_230);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.edit.command.SetCommand"));
+    stringBuffer.append(TEXT_231);
+    stringBuffer.append(_edge);
+    stringBuffer.append(TEXT_232);
+    stringBuffer.append(importManager.getImportedName(childFeature.getGenPackage().getQualifiedPackageInterfaceName()));
+    stringBuffer.append(TEXT_233);
+    stringBuffer.append(childFeature.getFeatureAccessorName());
+    stringBuffer.append(TEXT_234);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.edit.command.SetCommand"));
+    stringBuffer.append(TEXT_235);
+    
+			}
+		}
+		if (removeSource) {
+			if (sourceFeature.getEcoreFeature().isMany()) {
+
+    stringBuffer.append(TEXT_236);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.edit.command.RemoveCommand"));
+    stringBuffer.append(TEXT_237);
+    stringBuffer.append(_edge);
+    stringBuffer.append(TEXT_238);
+    stringBuffer.append(importManager.getImportedName(sourceFeature.getGenPackage().getQualifiedPackageInterfaceName()));
+    stringBuffer.append(TEXT_239);
+    stringBuffer.append(sourceFeature.getFeatureAccessorName());
+    stringBuffer.append(TEXT_240);
+    stringBuffer.append(_edge);
+    stringBuffer.append(TEXT_241);
+    
+			} else {
+
+    stringBuffer.append(TEXT_242);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.edit.command.SetCommand"));
+    stringBuffer.append(TEXT_243);
+    stringBuffer.append(_edge);
+    stringBuffer.append(TEXT_244);
+    stringBuffer.append(importManager.getImportedName(sourceFeature.getGenPackage().getQualifiedPackageInterfaceName()));
+    stringBuffer.append(TEXT_245);
+    stringBuffer.append(sourceFeature.getFeatureAccessorName());
+    stringBuffer.append(TEXT_246);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.edit.command.SetCommand"));
+    stringBuffer.append(TEXT_247);
+    
+			}
+		}
+		if (removeTarget) {
+			if (targetFeature.getEcoreFeature().isMany()) {
+
+    stringBuffer.append(TEXT_248);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.edit.command.RemoveCommand"));
+    stringBuffer.append(TEXT_249);
+    stringBuffer.append(_edge);
+    stringBuffer.append(TEXT_250);
+    stringBuffer.append(importManager.getImportedName(targetFeature.getGenPackage().getQualifiedPackageInterfaceName()));
+    stringBuffer.append(TEXT_251);
+    stringBuffer.append(targetFeature.getFeatureAccessorName());
+    stringBuffer.append(TEXT_252);
+    stringBuffer.append(_edge);
+    stringBuffer.append(TEXT_253);
+    
+			} else {
+
+    stringBuffer.append(TEXT_254);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.edit.command.SetCommand"));
+    stringBuffer.append(TEXT_255);
+    stringBuffer.append(_edge);
+    stringBuffer.append(TEXT_256);
+    stringBuffer.append(importManager.getImportedName(targetFeature.getGenPackage().getQualifiedPackageInterfaceName()));
+    stringBuffer.append(TEXT_257);
+    stringBuffer.append(targetFeature.getFeatureAccessorName());
+    stringBuffer.append(TEXT_258);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.edit.command.SetCommand"));
+    stringBuffer.append(TEXT_259);
+    
+			}
+		}
+
+    stringBuffer.append(TEXT_260);
+    
+	} else if (genLink.getModelFacet() instanceof FeatureModelFacet) {
+		GenFeature metaFeature = ((FeatureModelFacet) genLink.getModelFacet()).getMetaFeature();
+		if (metaFeature.getEcoreFeature().isMany()) {
+
+    stringBuffer.append(TEXT_261);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.edit.command.RemoveCommand"));
+    stringBuffer.append(TEXT_262);
+    stringBuffer.append(_edge);
+    stringBuffer.append(TEXT_263);
+    stringBuffer.append(importManager.getImportedName(metaFeature.getGenPackage().getQualifiedPackageInterfaceName()));
+    stringBuffer.append(TEXT_264);
+    stringBuffer.append(metaFeature.getFeatureAccessorName());
+    stringBuffer.append(TEXT_265);
+    stringBuffer.append(_edge);
+    stringBuffer.append(TEXT_266);
+    
+		} else {
+
+    stringBuffer.append(TEXT_267);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.edit.command.SetCommand"));
+    stringBuffer.append(TEXT_268);
+    stringBuffer.append(_edge);
+    stringBuffer.append(TEXT_269);
+    stringBuffer.append(importManager.getImportedName(metaFeature.getGenPackage().getQualifiedPackageInterfaceName()));
+    stringBuffer.append(TEXT_270);
+    stringBuffer.append(metaFeature.getFeatureAccessorName());
+    stringBuffer.append(TEXT_271);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.edit.command.SetCommand"));
+    stringBuffer.append(TEXT_272);
+    
+		}
+
+    
+	}
+
+    stringBuffer.append(TEXT_273);
+    
+}	//local declarations
+
+    stringBuffer.append(TEXT_274);
+    
+if (primaryLabel != null && genLink.getModelFacet() instanceof TypeLinkModelFacet) {
+		String editPatternCode = importManager.getImportedName(primaryLabel.getEditPartQualifiedClassName()) + ".EDIT_PATTERN";
+		TypeLinkModelFacet typeLinkModelFacet = (TypeLinkModelFacet) genLink.getModelFacet();
+		String primaryView = "getDiagramEdge()";
+		String resolvedSemanticElement = "(" + importManager.getImportedName(typeLinkModelFacet.getMetaClass().getQualifiedInterfaceName()) + ") getDiagramEdge().getElement()";
+		LabelModelFacet labelModelFacet = primaryLabel.getModelFacet();
+		GenClass underlyingMetaClass = typeLinkModelFacet.getMetaClass();
+
+    stringBuffer.append(TEXT_275);
+    stringBuffer.append(TEXT_276);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.EditPolicy"));
+    stringBuffer.append(TEXT_277);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.editpolicies.DirectEditPolicy"));
+    stringBuffer.append(TEXT_278);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.requests.DirectEditRequest"));
+    stringBuffer.append(TEXT_279);
+    stringBuffer.append(TEXT_280);
+    stringBuffer.append(TEXT_281);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.commands.Command"));
+    stringBuffer.append(TEXT_282);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.requests.DirectEditRequest"));
+    stringBuffer.append(TEXT_283);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.commands.UnexecutableCommand"));
+    stringBuffer.append(TEXT_284);
+    stringBuffer.append(importManager.getImportedName("java.text.MessageFormat"));
+    stringBuffer.append(TEXT_285);
+    stringBuffer.append(editPatternCode);
+    stringBuffer.append(TEXT_286);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.commands.UnexecutableCommand"));
+    stringBuffer.append(TEXT_287);
+    stringBuffer.append(importManager.getImportedName("java.text.ParseException"));
+    stringBuffer.append(TEXT_288);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.commands.UnexecutableCommand"));
+    stringBuffer.append(TEXT_289);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.TransactionalEditingDomain"));
+    stringBuffer.append(TEXT_290);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.util.TransactionUtil"));
+    stringBuffer.append(TEXT_291);
+    stringBuffer.append(primaryView);
+    stringBuffer.append(TEXT_292);
+    
+if (labelModelFacet instanceof FeatureLabelModelFacet) {
+	GenFeature featureToSet = ((FeatureLabelModelFacet)labelModelFacet).getMetaFeature();
+	EStructuralFeature ecoreFeature = featureToSet.getEcoreFeature();
+
+    stringBuffer.append(TEXT_293);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.commands.UnexecutableCommand"));
+    stringBuffer.append(TEXT_294);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.command.Command"));
+    stringBuffer.append(TEXT_295);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.lite.commands.WrappingCommand"));
+    stringBuffer.append(TEXT_296);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.command.Command"));
+    stringBuffer.append(TEXT_297);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.TransactionalEditingDomain"));
+    stringBuffer.append(TEXT_298);
+    stringBuffer.append(importManager.getImportedName(underlyingMetaClass.getQualifiedInterfaceName()));
+    stringBuffer.append(TEXT_299);
+    stringBuffer.append(resolvedSemanticElement);
+    stringBuffer.append(TEXT_300);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EAttribute"));
+    stringBuffer.append(TEXT_301);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EAttribute"));
+    stringBuffer.append(TEXT_302);
+    stringBuffer.append(importManager.getImportedName(featureToSet.getGenPackage().getQualifiedPackageInterfaceName()));
+    stringBuffer.append(TEXT_303);
+    stringBuffer.append(featureToSet.getFeatureAccessorName());
+    stringBuffer.append(TEXT_304);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.lite.services.ParserUtil"));
+    stringBuffer.append(TEXT_305);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.command.UnexecutableCommand"));
+    stringBuffer.append(TEXT_306);
+    
+	if (ecoreFeature.isMany()) {
+
+    stringBuffer.append(TEXT_307);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.command.CompoundCommand"));
+    stringBuffer.append(TEXT_308);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.command.CompoundCommand"));
+    stringBuffer.append(TEXT_309);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.util.EList"));
+    stringBuffer.append(TEXT_310);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.util.BasicEList"));
+    stringBuffer.append(TEXT_311);
+    stringBuffer.append(featureToSet.getAccessorName());
+    stringBuffer.append(TEXT_312);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.edit.command.RemoveCommand"));
+    stringBuffer.append(TEXT_313);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.edit.command.AddCommand"));
+    stringBuffer.append(TEXT_314);
+    
+	} else {
+
+    stringBuffer.append(TEXT_315);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.edit.command.SetCommand"));
+    stringBuffer.append(TEXT_316);
+    
+	}
+
+    stringBuffer.append(TEXT_317);
+    
+} else if (labelModelFacet instanceof CompositeFeatureLabelModelFacet) {
+	CompositeFeatureLabelModelFacet compositeFeatureLabelModelFacet = (CompositeFeatureLabelModelFacet) labelModelFacet;
+	List metaFeatures = compositeFeatureLabelModelFacet.getMetaFeatures();
+
+    stringBuffer.append(TEXT_318);
+    stringBuffer.append(metaFeatures.size());
+    stringBuffer.append(TEXT_319);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.commands.UnexecutableCommand"));
+    stringBuffer.append(TEXT_320);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.command.Command"));
+    stringBuffer.append(TEXT_321);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.lite.commands.WrappingCommand"));
+    stringBuffer.append(TEXT_322);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.command.Command"));
+    stringBuffer.append(TEXT_323);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.TransactionalEditingDomain"));
+    stringBuffer.append(TEXT_324);
+    stringBuffer.append(importManager.getImportedName(underlyingMetaClass.getQualifiedInterfaceName()));
+    stringBuffer.append(TEXT_325);
+    stringBuffer.append(resolvedSemanticElement);
+    stringBuffer.append(TEXT_326);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.command.CompoundCommand"));
+    stringBuffer.append(TEXT_327);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.command.CompoundCommand"));
+    stringBuffer.append(TEXT_328);
+    
+	boolean haveDeclaredValues = false;
+	for(int i = 0; i < metaFeatures.size(); i++) {
+		GenFeature nextFeatureToSet = (GenFeature) metaFeatures.get(i);
+		EStructuralFeature nextEcoreFeature = nextFeatureToSet.getEcoreFeature();
+
+    stringBuffer.append(TEXT_329);
+    if (i == 0) {
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EAttribute"));
+    stringBuffer.append(TEXT_330);
+    }
+    stringBuffer.append(TEXT_331);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EAttribute"));
+    stringBuffer.append(TEXT_332);
+    stringBuffer.append(importManager.getImportedName(nextFeatureToSet.getGenPackage().getQualifiedPackageInterfaceName()));
+    stringBuffer.append(TEXT_333);
+    stringBuffer.append(nextFeatureToSet.getFeatureAccessorName());
+    stringBuffer.append(TEXT_334);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.lite.services.ParserUtil"));
+    stringBuffer.append(TEXT_335);
+    stringBuffer.append(i);
+    stringBuffer.append(TEXT_336);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.command.UnexecutableCommand"));
+    stringBuffer.append(TEXT_337);
+    
+		if (nextEcoreFeature.isMany()) {
+
+    stringBuffer.append(TEXT_338);
+    if (!haveDeclaredValues) { haveDeclaredValues = true;
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.util.EList"));
+    stringBuffer.append(TEXT_339);
+    }
+    stringBuffer.append(TEXT_340);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.util.BasicEList"));
+    stringBuffer.append(TEXT_341);
+    stringBuffer.append(nextFeatureToSet.getAccessorName());
+    stringBuffer.append(TEXT_342);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.edit.command.RemoveCommand"));
+    stringBuffer.append(TEXT_343);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.edit.command.AddCommand"));
+    stringBuffer.append(TEXT_344);
+    
+		} else {
+
+    stringBuffer.append(TEXT_345);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.edit.command.SetCommand"));
+    stringBuffer.append(TEXT_346);
+    
+		}
+
+    
+	}
+
+    stringBuffer.append(TEXT_347);
+    
+}
+
+    stringBuffer.append(TEXT_348);
+    
+}
+
+    stringBuffer.append(TEXT_349);
+    
+if (primaryLabel != null && genLink.getModelFacet() instanceof TypeLinkModelFacet) {
+
+    stringBuffer.append(TEXT_350);
+    stringBuffer.append(TEXT_351);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.lite.services.TreeDirectEditManager"));
+    stringBuffer.append(TEXT_352);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.Request"));
+    stringBuffer.append(TEXT_353);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.RequestConstants"));
+    stringBuffer.append(TEXT_354);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.lite.services.TreeDirectEditManager"));
+    stringBuffer.append(TEXT_355);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.lite.services.TreeDirectEditManager"));
+    stringBuffer.append(TEXT_356);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.jface.viewers.TextCellEditor"));
+    stringBuffer.append(TEXT_357);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.tools.CellEditorLocator"));
+    stringBuffer.append(TEXT_358);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.jface.viewers.CellEditor"));
+    stringBuffer.append(TEXT_359);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.swt.widgets.TreeItem"));
+    stringBuffer.append(TEXT_360);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.swt.widgets.TreeItem"));
+    stringBuffer.append(TEXT_361);
+    stringBuffer.append(importManager.getImportedName(primaryLabel.getEditPartQualifiedClassName()));
+    stringBuffer.append(TEXT_362);
+    
+}
+
+    stringBuffer.append(TEXT_363);
+    
+if (genLink.getModelFacet() instanceof TypeLinkModelFacet) {
+	//Otherwise, there's no element associated with the element
+
+    stringBuffer.append(TEXT_364);
+    stringBuffer.append(TEXT_365);
+    stringBuffer.append(TEXT_366);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.lite.edit.parts.update.RefreshAdapter"));
+    stringBuffer.append(TEXT_367);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.lite.edit.parts.update.RefreshAdapter"));
+    stringBuffer.append(TEXT_368);
+    
+}
+
+    stringBuffer.append(TEXT_369);
+    
+if (genLink.getModelFacet() instanceof TypeLinkModelFacet || primaryLabel != null) {
+	//Otherwise, an empty string will be returned, and it will not change no matter what.
+
+    stringBuffer.append(TEXT_370);
+    
+	if (primaryLabel != null) {
+		LabelModelFacet labelModelFacet = primaryLabel.getModelFacet();
+		if (labelModelFacet instanceof FeatureLabelModelFacet) {
+			GenFeature feature = ((FeatureLabelModelFacet)labelModelFacet).getMetaFeature();
+
+    stringBuffer.append(TEXT_371);
+    stringBuffer.append(importManager.getImportedName(feature.getGenPackage().getQualifiedPackageInterfaceName()));
+    stringBuffer.append(TEXT_372);
+    stringBuffer.append(feature.getFeatureAccessorName());
+    stringBuffer.append(TEXT_373);
+    
+		} else if (labelModelFacet instanceof CompositeFeatureLabelModelFacet) {
+			CompositeFeatureLabelModelFacet compositeFeatureLabelModelFacet = (CompositeFeatureLabelModelFacet) labelModelFacet;
+			for(Iterator it = compositeFeatureLabelModelFacet.getMetaFeatures().iterator(); it.hasNext(); ) {
+				GenFeature next = (GenFeature) it.next();
+
+    stringBuffer.append(TEXT_374);
+    stringBuffer.append(importManager.getImportedName(next.getGenPackage().getQualifiedPackageInterfaceName()));
+    stringBuffer.append(TEXT_375);
+    stringBuffer.append(next.getFeatureAccessorName());
+    stringBuffer.append(TEXT_376);
+    
+			}
+		}
+	} else {
+		GenClass metaClass = ((TypeLinkModelFacet) genLink.getModelFacet()).getMetaClass();
+		List labelNotifyFeatures = metaClass.getLabelNotifyFeatures();
+		for(Iterator it = labelNotifyFeatures.iterator(); it.hasNext(); ) {
+			GenFeature next = (GenFeature) it.next();
+
+    stringBuffer.append(TEXT_377);
+    stringBuffer.append(importManager.getImportedName(next.getGenPackage().getQualifiedPackageInterfaceName()));
+    stringBuffer.append(TEXT_378);
+    stringBuffer.append(next.getFeatureAccessorName());
+    stringBuffer.append(TEXT_379);
+    
+		}
+	}
+}
+
+    stringBuffer.append(TEXT_380);
+    
+if (primaryLabel != null) {
+
+    stringBuffer.append(TEXT_381);
+    stringBuffer.append(importManager.getImportedName(primaryLabel.getEditPartQualifiedClassName()));
+    stringBuffer.append(TEXT_382);
+    stringBuffer.append(importManager.getImportedName(primaryLabel.getEditPartQualifiedClassName()));
+    stringBuffer.append(TEXT_383);
+    stringBuffer.append(importManager.getImportedName("java.util.Iterator"));
+    stringBuffer.append(TEXT_384);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.View"));
+    stringBuffer.append(TEXT_385);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.View"));
+    stringBuffer.append(TEXT_386);
+    stringBuffer.append(importManager.getImportedName(genDiagram.getVisualIDRegistryQualifiedClassName()));
+    stringBuffer.append(TEXT_387);
+    stringBuffer.append(importManager.getImportedName(primaryLabel.getEditPartQualifiedClassName()));
+    stringBuffer.append(TEXT_388);
+    stringBuffer.append(importManager.getImportedName(primaryLabel.getEditPartQualifiedClassName()));
+    stringBuffer.append(TEXT_389);
+    stringBuffer.append(genLink.getEditPartClassName());
+    stringBuffer.append(TEXT_390);
+    
+}
+
+    stringBuffer.append(TEXT_391);
+    stringBuffer.append(importManager.getImportedName("java.util.List"));
+    stringBuffer.append(TEXT_392);
+    stringBuffer.append(importManager.getImportedName("java.util.Collections"));
+    stringBuffer.append(TEXT_393);
     importManager.emitSortedImports();
-    stringBuffer.append(TEXT_182);
+    stringBuffer.append(TEXT_394);
     return stringBuffer.toString();
   }
 }
Index: src-templates/org/eclipse/gmf/codegen/templates/lite/parts/LinkLabelEditPartGenerator.java
===================================================================
RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.codegen.lite/src-templates/org/eclipse/gmf/codegen/templates/lite/parts/LinkLabelEditPartGenerator.java,v
retrieving revision 1.11
diff -u -r1.11 LinkLabelEditPartGenerator.java
--- src-templates/org/eclipse/gmf/codegen/templates/lite/parts/LinkLabelEditPartGenerator.java	1 Sep 2006 16:14:08 -0000	1.11
+++ src-templates/org/eclipse/gmf/codegen/templates/lite/parts/LinkLabelEditPartGenerator.java	11 Sep 2006 10:18:30 -0000
@@ -56,236 +56,239 @@
   protected final String TEXT_36 = "\t\tinstallEditPolicy(";
   protected final String TEXT_37 = ".DIRECT_EDIT_ROLE," + NL + "\t\t\t\tnew ";
   protected final String TEXT_38 = "() {" + NL + "\t\t\t\t\tprotected void showCurrentEditValue(";
-  protected final String TEXT_39 = " request) {" + NL + "\t\t\t\t\t\tString value = (String) request.getCellEditor().getValue();" + NL + "\t\t\t\t\t\tgetLabel().setText(value);" + NL + "\t\t\t\t\t}" + NL + "\t\t\t\t\tprotected ";
-  protected final String TEXT_40 = " getDirectEditCommand(";
-  protected final String TEXT_41 = " request) {" + NL + "\t\t\t\t\t\tString value = (String) request.getCellEditor().getValue();" + NL + "\t\t\t\t\t\tif (value == null) {" + NL + "\t\t\t\t\t\t\t//Invalid value is transformed into a null by the validator." + NL + "\t\t\t\t\t\t\t//XXX: implement validator" + NL + "\t\t\t\t\t\t\treturn ";
-  protected final String TEXT_42 = ".INSTANCE;" + NL + "\t\t\t\t\t\t}" + NL + "\t\t\t\t\t\tfinal Object[] parseResult;" + NL + "\t\t\t\t\t\ttry {" + NL + "\t\t\t\t\t\t\tparseResult = new ";
-  protected final String TEXT_43 = "(EDIT_PATTERN).parse(value);" + NL + "\t\t\t\t\t\t} catch (IllegalArgumentException e) {" + NL + "\t\t\t\t\t\t\treturn ";
-  protected final String TEXT_44 = ".INSTANCE;" + NL + "\t\t\t\t\t\t} catch (";
-  protected final String TEXT_45 = " e) {" + NL + "\t\t\t\t\t\t\treturn ";
-  protected final String TEXT_46 = ".INSTANCE;" + NL + "\t\t\t\t\t\t}" + NL + "\t\t\t\t\t\t";
-  protected final String TEXT_47 = " editingDomain = ";
-  protected final String TEXT_48 = ".getEditingDomain(";
-  protected final String TEXT_49 = ".getDiagram().getElement());";
-  protected final String TEXT_50 = NL + "\t\t\t\t\t\tif (parseResult.length != 1) {" + NL + "\t\t\t\t\t\t\treturn ";
-  protected final String TEXT_51 = ".INSTANCE;" + NL + "\t\t\t\t\t\t}" + NL + "\t\t\t\t\t\t";
-  protected final String TEXT_52 = " domainModelCommand = createDomainModelCommand(editingDomain, parseResult[0]);" + NL + "\t\t\t\t\t\treturn new ";
-  protected final String TEXT_53 = "(editingDomain, domainModelCommand);" + NL + "\t\t\t\t\t}" + NL + "\t\t\t\t\t";
-  protected final String TEXT_54 = " createDomainModelCommand(";
-  protected final String TEXT_55 = " editingDomain, Object value) {" + NL + "\t\t\t\t\t\t";
-  protected final String TEXT_56 = " element = ";
-  protected final String TEXT_57 = ";" + NL + "\t\t\t\t\t\t";
-  protected final String TEXT_58 = " feature = (";
-  protected final String TEXT_59 = ") ";
-  protected final String TEXT_60 = ".eINSTANCE.get";
-  protected final String TEXT_61 = "();" + NL + "\t\t\t\t\t\tObject valueToSet;" + NL + "\t\t\t\t\t\ttry {" + NL + "\t\t\t\t\t\t\tvalueToSet = ";
-  protected final String TEXT_62 = ".parseValue(feature, value);" + NL + "\t\t\t\t\t\t} catch (IllegalArgumentException e) {" + NL + "\t\t\t\t\t\t\treturn ";
-  protected final String TEXT_63 = ".INSTANCE;" + NL + "\t\t\t\t\t\t}";
-  protected final String TEXT_64 = NL + "\t\t\t\t\t\t";
-  protected final String TEXT_65 = " result = new ";
-  protected final String TEXT_66 = "();" + NL + "\t\t\t\t\t\t";
-  protected final String TEXT_67 = " values = new ";
-  protected final String TEXT_68 = "();" + NL + "\t\t\t\t\t\tvalues.addAll(element.get";
-  protected final String TEXT_69 = "());" + NL + "\t\t\t\t\t\tresult.append(";
-  protected final String TEXT_70 = ".create(editingDomain, element, feature, values));" + NL + "\t\t\t\t\t\tresult.append(";
-  protected final String TEXT_71 = ".create(editingDomain, element, feature, valueToSet));" + NL + "\t\t\t\t\t\treturn result;";
-  protected final String TEXT_72 = NL + "\t\t\t\t\t\treturn ";
-  protected final String TEXT_73 = ".create(editingDomain, element, feature, valueToSet);";
-  protected final String TEXT_74 = NL + "\t\t\t\t\t}";
-  protected final String TEXT_75 = NL + "\t\t\t\t\t\tif (parseResult.length != ";
-  protected final String TEXT_76 = ") {" + NL + "\t\t\t\t\t\t\treturn ";
-  protected final String TEXT_77 = ".INSTANCE;" + NL + "\t\t\t\t\t\t}" + NL + "\t\t\t\t\t\t";
-  protected final String TEXT_78 = " domainModelCommand = createDomainModelCommand(editingDomain, parseResult);" + NL + "\t\t\t\t\t\treturn new ";
-  protected final String TEXT_79 = "(editingDomain, domainModelCommand);" + NL + "\t\t\t\t\t}" + NL + "\t\t\t\t\t";
-  protected final String TEXT_80 = " createDomainModelCommand(";
-  protected final String TEXT_81 = " editingDomain, Object[] values) {" + NL + "\t\t\t\t\t\t";
-  protected final String TEXT_82 = " element = ";
-  protected final String TEXT_83 = ";" + NL + "\t\t\t\t\t\t";
-  protected final String TEXT_84 = " result = new ";
-  protected final String TEXT_85 = "();" + NL + "\t\t\t\t\t\tObject valueToSet;";
-  protected final String TEXT_86 = NL + "\t\t\t\t\t\t";
-  protected final String TEXT_87 = " ";
-  protected final String TEXT_88 = "feature = (";
-  protected final String TEXT_89 = ") ";
-  protected final String TEXT_90 = ".eINSTANCE.get";
-  protected final String TEXT_91 = "();" + NL + "\t\t\t\t\t\ttry {" + NL + "\t\t\t\t\t\t\tvalueToSet = ";
-  protected final String TEXT_92 = ".parseValue(feature, values[";
-  protected final String TEXT_93 = "]);" + NL + "\t\t\t\t\t\t} catch (IllegalArgumentException e) {" + NL + "\t\t\t\t\t\t\treturn ";
-  protected final String TEXT_94 = ".INSTANCE;" + NL + "\t\t\t\t\t\t}";
-  protected final String TEXT_95 = NL + "\t\t\t\t\t\t";
-  protected final String TEXT_96 = " ";
-  protected final String TEXT_97 = "values = new ";
-  protected final String TEXT_98 = "();" + NL + "\t\t\t\t\t\tvalues.addAll(element.get";
-  protected final String TEXT_99 = "());" + NL + "\t\t\t\t\t\tresult.append(";
-  protected final String TEXT_100 = ".create(editingDomain, element, feature, values));" + NL + "\t\t\t\t\t\tresult.append(";
-  protected final String TEXT_101 = ".create(editingDomain, element, feature, valueToSet));";
-  protected final String TEXT_102 = NL + "\t\t\t\t\t\tresult.append(";
-  protected final String TEXT_103 = ".create(editingDomain, element, feature, valueToSet));";
-  protected final String TEXT_104 = NL + "\t\t\t\t\t\treturn result;" + NL + "\t\t\t\t\t}";
-  protected final String TEXT_105 = NL + "\t\t\t\t});";
-  protected final String TEXT_106 = NL + "\t}" + NL;
-  protected final String TEXT_107 = NL;
-  protected final String TEXT_108 = "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic void performRequest(";
-  protected final String TEXT_109 = " req) {" + NL + "\t\tif (";
-  protected final String TEXT_110 = ".REQ_DIRECT_EDIT == req.getType()) {" + NL + "\t\t\tperformDirectEdit();" + NL + "\t\t} else {" + NL + "\t\t\tsuper.performRequest(req);" + NL + "\t\t}" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected ";
-  protected final String TEXT_111 = " getManager() {" + NL + "\t\tif (manager == null) {" + NL + "\t\t\tmanager = new ";
-  protected final String TEXT_112 = "(this, ";
-  protected final String TEXT_113 = ".class, new ";
-  protected final String TEXT_114 = "() {" + NL + "\t\t\t\tpublic void relocate(";
-  protected final String TEXT_115 = " celleditor) {" + NL + "\t\t\t\t\t";
-  protected final String TEXT_116 = " rect = getLabel().getTextBounds();" + NL + "\t\t\t\t\tgetLabel().translateToAbsolute(rect);" + NL + "\t\t\t\t\tcelleditor.getControl().setBounds(rect.x, rect.y, rect.width, rect.height);" + NL + "\t\t\t\t}" + NL + "\t\t\t}) {" + NL + "\t\t\t\tprotected void initCellEditor() {" + NL + "\t\t\t\t\tgetCellEditor().setValue(getLabelEditText());" + NL + "\t\t\t\t}" + NL + "\t\t\t};" + NL + "\t\t}" + NL + "\t\treturn manager;" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected void performDirectEdit() {" + NL + "\t\tgetManager().show();" + NL + "\t}" + NL;
-  protected final String TEXT_117 = NL + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected void refreshVisuals() {" + NL + "\t\tsuper.refreshVisuals();" + NL + "\t\trefreshLabel();" + NL + "\t\trefreshFont();" + NL + "\t\trefreshFontColor();" + NL + "\t\trefreshBounds();" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected void refreshBounds() {" + NL + "\t\tNode node = getDiagramNode();" + NL + "\t\tassert node.getLayoutConstraint() instanceof Location;" + NL + "\t\tfinal Location location = (Location) node.getLayoutConstraint();" + NL + "\t\t";
-  protected final String TEXT_118 = " parent = getUpdatableParent();" + NL + "\t\t";
-  protected final String TEXT_119 = " connection = (";
-  protected final String TEXT_120 = ") parent.getFigure();";
-  protected final String TEXT_121 = NL + "\t\t((";
-  protected final String TEXT_122 = ") getParent()).setLayoutConstraint(this," + NL + "\t\t\t\tgetFigure(), new ";
-  protected final String TEXT_123 = "(connection, ";
-  protected final String TEXT_124 = ".";
-  protected final String TEXT_125 = ") {" + NL + "\t\t\t\t\tprotected ";
-  protected final String TEXT_126 = " getReferencePoint() {" + NL + "\t\t\t\t\t\treturn super.getReferencePoint().translate(location.getX(), location.getY());" + NL + "\t\t\t\t\t}" + NL + "\t\t\t\t});" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected void refreshLabel() {" + NL + "\t\tgetLabel().setText(getLabelText());" + NL + "\t\tgetLabel().setIcon(getLabelIcon());" + NL + "\t}" + NL;
-  protected final String TEXT_127 = NL;
-  protected final String TEXT_128 = NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate static final String VIEW_PATTERN = \"";
-  protected final String TEXT_129 = "\";" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate static final String EDIT_PATTERN = \"";
-  protected final String TEXT_130 = "\";" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected String getLabelText() {" + NL + "\t\t";
-  protected final String TEXT_131 = " element = ";
-  protected final String TEXT_132 = ";" + NL + "\t\tif (element == null) {" + NL + "\t\t\treturn defaultText;" + NL + "\t\t}" + NL + "\t\treturn buildTextByPattern(element, VIEW_PATTERN);" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected String getLabelEditText() {" + NL + "\t\t";
-  protected final String TEXT_133 = " element = ";
-  protected final String TEXT_134 = ";" + NL + "\t\tif (element == null) {" + NL + "\t\t\treturn defaultText;" + NL + "\t\t}" + NL + "\t\treturn buildTextByPattern(element, EDIT_PATTERN);" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected String buildTextByPattern(";
-  protected final String TEXT_135 = " element, String pattern) {";
-  protected final String TEXT_136 = NL + "\t\tif (";
-  protected final String TEXT_137 = " == null) {" + NL + "\t\t\treturn defaultText;" + NL + "\t\t}";
-  protected final String TEXT_138 = NL + "\t\treturn ";
-  protected final String TEXT_139 = ".format(pattern, new Object[] {";
-  protected final String TEXT_140 = NL + "\t\t\tnew ";
-  protected final String TEXT_141 = "(";
-  protected final String TEXT_142 = ")";
-  protected final String TEXT_143 = NL + "\t\t});";
-  protected final String TEXT_144 = NL + "\t\treturn ";
-  protected final String TEXT_145 = ".format(pattern, new Object[] {";
-  protected final String TEXT_146 = NL + "\t\t\tnew ";
-  protected final String TEXT_147 = "(";
-  protected final String TEXT_148 = ")";
-  protected final String TEXT_149 = ",";
-  protected final String TEXT_150 = NL + "\t\t});";
-  protected final String TEXT_151 = NL + "\t\t//XXX: unexpected model facet." + NL + "\t\treturn defaultText;";
-  protected final String TEXT_152 = NL + "\t}";
-  protected final String TEXT_153 = NL;
-  protected final String TEXT_154 = NL + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected void refreshFont() {";
-  protected final String TEXT_155 = NL + "\t\t";
-  protected final String TEXT_156 = " style =" + NL + "\t\t\t(";
-  protected final String TEXT_157 = ") ";
-  protected final String TEXT_158 = ".getStyle(" + NL + "\t\t\t\t";
-  protected final String TEXT_159 = ".eINSTANCE.getFontStyle());" + NL + "\t\t";
-  protected final String TEXT_160 = " toDispose = createdFont;" + NL + "\t\tif (style != null) {" + NL + "\t\t\tString fontName = style.getFontName();" + NL + "\t\t\tint fontHeight = style.getFontHeight();" + NL + "\t\t\tint fontStyle = ";
-  protected final String TEXT_161 = ".NORMAL;" + NL + "\t\t\tif (style.isBold()) {" + NL + "\t\t\t\tfontStyle |= ";
-  protected final String TEXT_162 = ".BOLD;" + NL + "\t\t\t}" + NL + "\t\t\tif (style.isItalic()) {" + NL + "\t\t\t\tfontStyle |= ";
-  protected final String TEXT_163 = ".ITALIC;" + NL + "\t\t\t}" + NL + "\t\t\t";
-  protected final String TEXT_164 = " currentFont = getFigure().getFont();" + NL + "\t\t\tif (currentFont != null) {" + NL + "\t\t\t\t";
-  protected final String TEXT_165 = " currentFontData = currentFont.getFontData()[0];" + NL + "\t\t\t\tif (currentFontData.getName().equals(fontName) && currentFontData.getHeight() == fontHeight && currentFontData.getStyle() == fontStyle) {" + NL + "\t\t\t\t\treturn;" + NL + "\t\t\t\t}" + NL + "\t\t\t}" + NL + "\t\t\tcreatedFont = new ";
-  protected final String TEXT_166 = "(null, fontName, fontHeight, fontStyle);" + NL + "\t\t\tgetFigure().setFont(createdFont);" + NL + "\t\t} else {" + NL + "\t\t\t//revert to the default font" + NL + "\t\t\tgetFigure().setFont(getViewer().getControl().getFont());" + NL + "\t\t\tcreatedFont = null;" + NL + "\t\t}" + NL + "\t\tif (toDispose != null) {" + NL + "\t\t\ttoDispose.dispose();" + NL + "\t\t}";
-  protected final String TEXT_167 = "\t" + NL + "\t}";
-  protected final String TEXT_168 = NL + NL + "\t/**" + NL + "\t * The font (created by {@link #refreshFont()}) currently assigned to the label (unless the default font is assigned)." + NL + "\t * Whenever another non-default font is assigned to it, it is safe to dispose the previous one." + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate ";
-  protected final String TEXT_169 = " createdFont;";
-  protected final String TEXT_170 = "\t";
-  protected final String TEXT_171 = NL;
-  protected final String TEXT_172 = "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected void refreshFontColor() {" + NL + "\t\t";
-  protected final String TEXT_173 = " style = (";
-  protected final String TEXT_174 = ")  ";
-  protected final String TEXT_175 = ".getStyle(";
-  protected final String TEXT_176 = ".eINSTANCE.getFontStyle());" + NL + "\t\t";
-  protected final String TEXT_177 = " toDispose = createdFontColor;" + NL + "\t\tif (style != null) {" + NL + "\t\t\tint fontColor = style.getFontColor();" + NL + "\t\t\tint red = fontColor & 0x000000FF;" + NL + "\t\t\tint green = (fontColor & 0x0000FF00) >> 8;" + NL + "\t\t\tint blue = (fontColor & 0x00FF0000) >> 16;" + NL + "\t\t\t";
-  protected final String TEXT_178 = " currentColor = getLabel().getForegroundColor();" + NL + "\t\t\tif (currentColor != null && currentColor.getRed() == red && currentColor.getGreen() == green && currentColor.getBlue() == blue) {" + NL + "\t\t\t\treturn;" + NL + "\t\t\t}" + NL + "\t\t\tcreatedFontColor = new ";
-  protected final String TEXT_179 = "(null, red, green, blue);" + NL + "\t\t\tgetFigure().setForegroundColor(createdFontColor);" + NL + "\t\t} else {" + NL + "\t\t\tgetFigure().setForegroundColor(getViewer().getControl().getForeground());" + NL + "\t\t\tcreatedFontColor = null;" + NL + "\t\t}" + NL + "\t\tif (toDispose != null) {" + NL + "\t\t\ttoDispose.dispose();" + NL + "\t\t}" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * The color (created by {@link #refreshFontColor()}) currently assigned to the label." + NL + "\t * Whenever another color is assigned to it, it is safe to dispose the previous one." + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate ";
-  protected final String TEXT_180 = " createdFontColor;" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected ";
-  protected final String TEXT_181 = " getLabelIcon() {";
-  protected final String TEXT_182 = NL + "\t\t";
-  protected final String TEXT_183 = " imageDescriptor = ";
-  protected final String TEXT_184 = ".getInstance().getItemImageDescriptor(resolveSemanticElement());" + NL + "\t\tif (imageDescriptor != null) {" + NL + "\t\t\treturn imageDescriptor.createImage();" + NL + "\t\t}";
-  protected final String TEXT_185 = NL + "\t\treturn null;" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate ";
-  protected final String TEXT_186 = " resolveSemanticElement() {" + NL + "\t\t";
-  protected final String TEXT_187 = " parent = getUpdatableParent();" + NL + "\t\tif (parent == null || parent.getModel() instanceof ";
-  protected final String TEXT_188 = " == false) {" + NL + "\t\t\treturn null;" + NL + "\t\t}";
-  protected final String TEXT_189 = NL + "\t\t";
-  protected final String TEXT_190 = " view = (";
-  protected final String TEXT_191 = ") parent.getModel();" + NL + "\t\treturn (";
-  protected final String TEXT_192 = ") view.getElement();";
-  protected final String TEXT_193 = NL + "\t\t";
-  protected final String TEXT_194 = " target = ((";
-  protected final String TEXT_195 = ") parent.getModel()).getTarget();" + NL + "\t\treturn (target != null && target.getElement() instanceof ";
-  protected final String TEXT_196 = ") ? (";
-  protected final String TEXT_197 = ") target.getElement() : null;";
-  protected final String TEXT_198 = NL + "\t\treturn null;";
-  protected final String TEXT_199 = NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate ";
-  protected final String TEXT_200 = " getUpdatableParent() {" + NL + "\t\tfor(EditPart editPart = getParent(); editPart != null; editPart = editPart.getParent()) {" + NL + "\t\t\tif (editPart instanceof ";
-  protected final String TEXT_201 = ") {" + NL + "\t\t\t\treturn (";
-  protected final String TEXT_202 = ") editPart;" + NL + "\t\t\t}" + NL + "\t\t}" + NL + "\t\treturn null;" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic void activate() {" + NL + "\t\tsuper.activate();" + NL + "\t\t";
-  protected final String TEXT_203 = " updatableParent = getUpdatableParent();" + NL + "\t\tif (updatableParent != null) {" + NL + "\t\t\tupdatableParent.addRefresher(";
-  protected final String TEXT_204 = ".eINSTANCE.getFontStyle_FontColor(), fontColorRefresher);" + NL + "\t\t\tupdatableParent.addRefresher(";
-  protected final String TEXT_205 = ".eINSTANCE.getFontStyle_FontHeight(), fontRefresher);" + NL + "\t\t\tupdatableParent.addRefresher(";
-  protected final String TEXT_206 = ".eINSTANCE.getFontStyle_FontName(), fontRefresher);" + NL + "\t\t\tupdatableParent.addRefresher(";
-  protected final String TEXT_207 = ".eINSTANCE.getFontStyle_Bold(), fontRefresher);" + NL + "\t\t\tupdatableParent.addRefresher(";
-  protected final String TEXT_208 = ".eINSTANCE.getFontStyle_Italic(), fontRefresher);";
-  protected final String TEXT_209 = NL + "\t\t\tupdatableParent.addRefresher(";
-  protected final String TEXT_210 = ".eINSTANCE.get";
-  protected final String TEXT_211 = "(), labelRefresher);";
+  protected final String TEXT_39 = " request) {" + NL + "\t\t\t\t\t\tString value = (String) request.getCellEditor().getValue();" + NL + "\t\t\t\t\t\tgetLabel().setText(value);" + NL + "\t\t\t\t\t}";
+  protected final String TEXT_40 = NL;
+  protected final String TEXT_41 = "\t\t\t\t\tprotected ";
+  protected final String TEXT_42 = " getDirectEditCommand(";
+  protected final String TEXT_43 = " request) {" + NL + "\t\t\t\t\t\tString value = (String) request.getCellEditor().getValue();" + NL + "\t\t\t\t\t\tif (value == null) {" + NL + "\t\t\t\t\t\t\t//Invalid value is transformed into a null by the validator." + NL + "\t\t\t\t\t\t\t//XXX: implement validator" + NL + "\t\t\t\t\t\t\treturn ";
+  protected final String TEXT_44 = ".INSTANCE;" + NL + "\t\t\t\t\t\t}" + NL + "\t\t\t\t\t\tfinal Object[] parseResult;" + NL + "\t\t\t\t\t\ttry {" + NL + "\t\t\t\t\t\t\tparseResult = new ";
+  protected final String TEXT_45 = "(";
+  protected final String TEXT_46 = ").parse(value);" + NL + "\t\t\t\t\t\t} catch (IllegalArgumentException e) {" + NL + "\t\t\t\t\t\t\treturn ";
+  protected final String TEXT_47 = ".INSTANCE;" + NL + "\t\t\t\t\t\t} catch (";
+  protected final String TEXT_48 = " e) {" + NL + "\t\t\t\t\t\t\treturn ";
+  protected final String TEXT_49 = ".INSTANCE;" + NL + "\t\t\t\t\t\t}" + NL + "\t\t\t\t\t\t";
+  protected final String TEXT_50 = " editingDomain = ";
+  protected final String TEXT_51 = ".getEditingDomain(";
+  protected final String TEXT_52 = ".getDiagram().getElement());";
+  protected final String TEXT_53 = NL + "\t\t\t\t\t\tif (parseResult.length != 1) {" + NL + "\t\t\t\t\t\t\treturn ";
+  protected final String TEXT_54 = ".INSTANCE;" + NL + "\t\t\t\t\t\t}" + NL + "\t\t\t\t\t\t";
+  protected final String TEXT_55 = " domainModelCommand = createDomainModelCommand(editingDomain, parseResult[0]);" + NL + "\t\t\t\t\t\treturn new ";
+  protected final String TEXT_56 = "(editingDomain, domainModelCommand);" + NL + "\t\t\t\t\t}" + NL + "\t\t\t\t\t";
+  protected final String TEXT_57 = " createDomainModelCommand(";
+  protected final String TEXT_58 = " editingDomain, Object value) {" + NL + "\t\t\t\t\t\t";
+  protected final String TEXT_59 = " element = ";
+  protected final String TEXT_60 = ";" + NL + "\t\t\t\t\t\t";
+  protected final String TEXT_61 = " feature = (";
+  protected final String TEXT_62 = ") ";
+  protected final String TEXT_63 = ".eINSTANCE.get";
+  protected final String TEXT_64 = "();" + NL + "\t\t\t\t\t\tObject valueToSet;" + NL + "\t\t\t\t\t\ttry {" + NL + "\t\t\t\t\t\t\tvalueToSet = ";
+  protected final String TEXT_65 = ".parseValue(feature, value);" + NL + "\t\t\t\t\t\t} catch (IllegalArgumentException e) {" + NL + "\t\t\t\t\t\t\treturn ";
+  protected final String TEXT_66 = ".INSTANCE;" + NL + "\t\t\t\t\t\t}";
+  protected final String TEXT_67 = NL + "\t\t\t\t\t\t";
+  protected final String TEXT_68 = " result = new ";
+  protected final String TEXT_69 = "();" + NL + "\t\t\t\t\t\t";
+  protected final String TEXT_70 = " values = new ";
+  protected final String TEXT_71 = "();" + NL + "\t\t\t\t\t\tvalues.addAll(element.get";
+  protected final String TEXT_72 = "());" + NL + "\t\t\t\t\t\tresult.append(";
+  protected final String TEXT_73 = ".create(editingDomain, element, feature, values));" + NL + "\t\t\t\t\t\tresult.append(";
+  protected final String TEXT_74 = ".create(editingDomain, element, feature, valueToSet));" + NL + "\t\t\t\t\t\treturn result;";
+  protected final String TEXT_75 = NL + "\t\t\t\t\t\treturn ";
+  protected final String TEXT_76 = ".create(editingDomain, element, feature, valueToSet);";
+  protected final String TEXT_77 = NL + "\t\t\t\t\t}";
+  protected final String TEXT_78 = NL + "\t\t\t\t\t\tif (parseResult.length != ";
+  protected final String TEXT_79 = ") {" + NL + "\t\t\t\t\t\t\treturn ";
+  protected final String TEXT_80 = ".INSTANCE;" + NL + "\t\t\t\t\t\t}" + NL + "\t\t\t\t\t\t";
+  protected final String TEXT_81 = " domainModelCommand = createDomainModelCommand(editingDomain, parseResult);" + NL + "\t\t\t\t\t\treturn new ";
+  protected final String TEXT_82 = "(editingDomain, domainModelCommand);" + NL + "\t\t\t\t\t}" + NL + "\t\t\t\t\t";
+  protected final String TEXT_83 = " createDomainModelCommand(";
+  protected final String TEXT_84 = " editingDomain, Object[] values) {" + NL + "\t\t\t\t\t\t";
+  protected final String TEXT_85 = " element = ";
+  protected final String TEXT_86 = ";" + NL + "\t\t\t\t\t\t";
+  protected final String TEXT_87 = " result = new ";
+  protected final String TEXT_88 = "();" + NL + "\t\t\t\t\t\tObject valueToSet;";
+  protected final String TEXT_89 = NL + "\t\t\t\t\t\t";
+  protected final String TEXT_90 = " ";
+  protected final String TEXT_91 = "feature = (";
+  protected final String TEXT_92 = ") ";
+  protected final String TEXT_93 = ".eINSTANCE.get";
+  protected final String TEXT_94 = "();" + NL + "\t\t\t\t\t\ttry {" + NL + "\t\t\t\t\t\t\tvalueToSet = ";
+  protected final String TEXT_95 = ".parseValue(feature, values[";
+  protected final String TEXT_96 = "]);" + NL + "\t\t\t\t\t\t} catch (IllegalArgumentException e) {" + NL + "\t\t\t\t\t\t\treturn ";
+  protected final String TEXT_97 = ".INSTANCE;" + NL + "\t\t\t\t\t\t}";
+  protected final String TEXT_98 = NL + "\t\t\t\t\t\t";
+  protected final String TEXT_99 = " ";
+  protected final String TEXT_100 = "values = new ";
+  protected final String TEXT_101 = "();" + NL + "\t\t\t\t\t\tvalues.addAll(element.get";
+  protected final String TEXT_102 = "());" + NL + "\t\t\t\t\t\tresult.append(";
+  protected final String TEXT_103 = ".create(editingDomain, element, feature, values));" + NL + "\t\t\t\t\t\tresult.append(";
+  protected final String TEXT_104 = ".create(editingDomain, element, feature, valueToSet));";
+  protected final String TEXT_105 = NL + "\t\t\t\t\t\tresult.append(";
+  protected final String TEXT_106 = ".create(editingDomain, element, feature, valueToSet));";
+  protected final String TEXT_107 = NL + "\t\t\t\t\t\treturn result;" + NL + "\t\t\t\t\t}";
+  protected final String TEXT_108 = NL + "\t\t\t\t});";
+  protected final String TEXT_109 = NL + "\t}" + NL;
+  protected final String TEXT_110 = NL;
+  protected final String TEXT_111 = "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic void performRequest(";
+  protected final String TEXT_112 = " req) {" + NL + "\t\tif (";
+  protected final String TEXT_113 = ".REQ_DIRECT_EDIT == req.getType()) {" + NL + "\t\t\tperformDirectEdit();" + NL + "\t\t} else {" + NL + "\t\t\tsuper.performRequest(req);" + NL + "\t\t}" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected ";
+  protected final String TEXT_114 = " getManager() {" + NL + "\t\tif (manager == null) {" + NL + "\t\t\tmanager = new ";
+  protected final String TEXT_115 = "(this, ";
+  protected final String TEXT_116 = ".class, new ";
+  protected final String TEXT_117 = "() {" + NL + "\t\t\t\tpublic void relocate(";
+  protected final String TEXT_118 = " celleditor) {" + NL + "\t\t\t\t\t";
+  protected final String TEXT_119 = " rect = getLabel().getTextBounds();" + NL + "\t\t\t\t\tgetLabel().translateToAbsolute(rect);" + NL + "\t\t\t\t\tcelleditor.getControl().setBounds(rect.x, rect.y, rect.width, rect.height);" + NL + "\t\t\t\t}" + NL + "\t\t\t}) {" + NL + "\t\t\t\tprotected void initCellEditor() {" + NL + "\t\t\t\t\tgetCellEditor().setValue(getLabelEditText());" + NL + "\t\t\t\t}" + NL + "\t\t\t};" + NL + "\t\t}" + NL + "\t\treturn manager;" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected void performDirectEdit() {" + NL + "\t\tgetManager().show();" + NL + "\t}" + NL;
+  protected final String TEXT_120 = NL + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected void refreshVisuals() {" + NL + "\t\tsuper.refreshVisuals();" + NL + "\t\trefreshLabel();" + NL + "\t\trefreshFont();" + NL + "\t\trefreshFontColor();" + NL + "\t\trefreshBounds();" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected void refreshBounds() {" + NL + "\t\tNode node = getDiagramNode();" + NL + "\t\tassert node.getLayoutConstraint() instanceof Location;" + NL + "\t\tfinal Location location = (Location) node.getLayoutConstraint();" + NL + "\t\t";
+  protected final String TEXT_121 = " parent = getUpdatableParent();" + NL + "\t\t";
+  protected final String TEXT_122 = " connection = (";
+  protected final String TEXT_123 = ") parent.getFigure();";
+  protected final String TEXT_124 = NL + "\t\t((";
+  protected final String TEXT_125 = ") getParent()).setLayoutConstraint(this," + NL + "\t\t\t\tgetFigure(), new ";
+  protected final String TEXT_126 = "(connection, ";
+  protected final String TEXT_127 = ".";
+  protected final String TEXT_128 = ") {" + NL + "\t\t\t\t\tprotected ";
+  protected final String TEXT_129 = " getReferencePoint() {" + NL + "\t\t\t\t\t\treturn super.getReferencePoint().translate(location.getX(), location.getY());" + NL + "\t\t\t\t\t}" + NL + "\t\t\t\t});" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected void refreshLabel() {" + NL + "\t\tgetLabel().setText(getLabelText());" + NL + "\t\tgetLabel().setIcon(getLabelIcon());" + NL + "\t}" + NL;
+  protected final String TEXT_130 = NL;
+  protected final String TEXT_131 = NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate static final String VIEW_PATTERN = \"";
+  protected final String TEXT_132 = "\";" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic static final String EDIT_PATTERN = \"";
+  protected final String TEXT_133 = "\";" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected String getLabelText() {" + NL + "\t\t";
+  protected final String TEXT_134 = " element = ";
+  protected final String TEXT_135 = ";" + NL + "\t\tif (element == null) {" + NL + "\t\t\treturn defaultText;" + NL + "\t\t}" + NL + "\t\treturn buildTextByPattern(element, VIEW_PATTERN);" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected String getLabelEditText() {" + NL + "\t\t";
+  protected final String TEXT_136 = " element = ";
+  protected final String TEXT_137 = ";" + NL + "\t\tif (element == null) {" + NL + "\t\t\treturn defaultText;" + NL + "\t\t}" + NL + "\t\treturn buildTextByPattern(element, EDIT_PATTERN);" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected String buildTextByPattern(";
+  protected final String TEXT_138 = " element, String pattern) {";
+  protected final String TEXT_139 = NL + "\t\tif (";
+  protected final String TEXT_140 = " == null) {" + NL + "\t\t\treturn defaultText;" + NL + "\t\t}";
+  protected final String TEXT_141 = NL + "\t\treturn ";
+  protected final String TEXT_142 = ".format(pattern, new Object[] {";
+  protected final String TEXT_143 = NL + "\t\t\tnew ";
+  protected final String TEXT_144 = "(";
+  protected final String TEXT_145 = ")";
+  protected final String TEXT_146 = NL + "\t\t});";
+  protected final String TEXT_147 = NL + "\t\treturn ";
+  protected final String TEXT_148 = ".format(pattern, new Object[] {";
+  protected final String TEXT_149 = NL + "\t\t\tnew ";
+  protected final String TEXT_150 = "(";
+  protected final String TEXT_151 = ")";
+  protected final String TEXT_152 = ",";
+  protected final String TEXT_153 = NL + "\t\t});";
+  protected final String TEXT_154 = NL + "\t\t//XXX: unexpected model facet." + NL + "\t\treturn defaultText;";
+  protected final String TEXT_155 = NL + "\t}";
+  protected final String TEXT_156 = NL;
+  protected final String TEXT_157 = NL + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected void refreshFont() {";
+  protected final String TEXT_158 = NL + "\t\t";
+  protected final String TEXT_159 = " style =" + NL + "\t\t\t(";
+  protected final String TEXT_160 = ") ";
+  protected final String TEXT_161 = ".getStyle(" + NL + "\t\t\t\t";
+  protected final String TEXT_162 = ".eINSTANCE.getFontStyle());" + NL + "\t\t";
+  protected final String TEXT_163 = " toDispose = createdFont;" + NL + "\t\tif (style != null) {" + NL + "\t\t\tString fontName = style.getFontName();" + NL + "\t\t\tint fontHeight = style.getFontHeight();" + NL + "\t\t\tint fontStyle = ";
+  protected final String TEXT_164 = ".NORMAL;" + NL + "\t\t\tif (style.isBold()) {" + NL + "\t\t\t\tfontStyle |= ";
+  protected final String TEXT_165 = ".BOLD;" + NL + "\t\t\t}" + NL + "\t\t\tif (style.isItalic()) {" + NL + "\t\t\t\tfontStyle |= ";
+  protected final String TEXT_166 = ".ITALIC;" + NL + "\t\t\t}" + NL + "\t\t\t";
+  protected final String TEXT_167 = " currentFont = getFigure().getFont();" + NL + "\t\t\tif (currentFont != null) {" + NL + "\t\t\t\t";
+  protected final String TEXT_168 = " currentFontData = currentFont.getFontData()[0];" + NL + "\t\t\t\tif (currentFontData.getName().equals(fontName) && currentFontData.getHeight() == fontHeight && currentFontData.getStyle() == fontStyle) {" + NL + "\t\t\t\t\treturn;" + NL + "\t\t\t\t}" + NL + "\t\t\t}" + NL + "\t\t\tcreatedFont = new ";
+  protected final String TEXT_169 = "(null, fontName, fontHeight, fontStyle);" + NL + "\t\t\tgetFigure().setFont(createdFont);" + NL + "\t\t} else {" + NL + "\t\t\t//revert to the default font" + NL + "\t\t\tgetFigure().setFont(getViewer().getControl().getFont());" + NL + "\t\t\tcreatedFont = null;" + NL + "\t\t}" + NL + "\t\tif (toDispose != null) {" + NL + "\t\t\ttoDispose.dispose();" + NL + "\t\t}";
+  protected final String TEXT_170 = "\t" + NL + "\t}";
+  protected final String TEXT_171 = NL + NL + "\t/**" + NL + "\t * The font (created by {@link #refreshFont()}) currently assigned to the label (unless the default font is assigned)." + NL + "\t * Whenever another non-default font is assigned to it, it is safe to dispose the previous one." + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate ";
+  protected final String TEXT_172 = " createdFont;";
+  protected final String TEXT_173 = "\t";
+  protected final String TEXT_174 = NL;
+  protected final String TEXT_175 = "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected void refreshFontColor() {" + NL + "\t\t";
+  protected final String TEXT_176 = " style = (";
+  protected final String TEXT_177 = ")  ";
+  protected final String TEXT_178 = ".getStyle(";
+  protected final String TEXT_179 = ".eINSTANCE.getFontStyle());" + NL + "\t\t";
+  protected final String TEXT_180 = " toDispose = createdFontColor;" + NL + "\t\tif (style != null) {" + NL + "\t\t\tint fontColor = style.getFontColor();" + NL + "\t\t\tint red = fontColor & 0x000000FF;" + NL + "\t\t\tint green = (fontColor & 0x0000FF00) >> 8;" + NL + "\t\t\tint blue = (fontColor & 0x00FF0000) >> 16;" + NL + "\t\t\t";
+  protected final String TEXT_181 = " currentColor = getLabel().getForegroundColor();" + NL + "\t\t\tif (currentColor != null && currentColor.getRed() == red && currentColor.getGreen() == green && currentColor.getBlue() == blue) {" + NL + "\t\t\t\treturn;" + NL + "\t\t\t}" + NL + "\t\t\tcreatedFontColor = new ";
+  protected final String TEXT_182 = "(null, red, green, blue);" + NL + "\t\t\tgetFigure().setForegroundColor(createdFontColor);" + NL + "\t\t} else {" + NL + "\t\t\tgetFigure().setForegroundColor(getViewer().getControl().getForeground());" + NL + "\t\t\tcreatedFontColor = null;" + NL + "\t\t}" + NL + "\t\tif (toDispose != null) {" + NL + "\t\t\ttoDispose.dispose();" + NL + "\t\t}" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * The color (created by {@link #refreshFontColor()}) currently assigned to the label." + NL + "\t * Whenever another color is assigned to it, it is safe to dispose the previous one." + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate ";
+  protected final String TEXT_183 = " createdFontColor;" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected ";
+  protected final String TEXT_184 = " getLabelIcon() {";
+  protected final String TEXT_185 = NL + "\t\t";
+  protected final String TEXT_186 = " imageDescriptor = ";
+  protected final String TEXT_187 = ".getInstance().getItemImageDescriptor(resolveSemanticElement());" + NL + "\t\tif (imageDescriptor != null) {" + NL + "\t\t\treturn imageDescriptor.createImage();" + NL + "\t\t}";
+  protected final String TEXT_188 = NL + "\t\treturn null;" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate ";
+  protected final String TEXT_189 = " resolveSemanticElement() {" + NL + "\t\t";
+  protected final String TEXT_190 = " parent = getUpdatableParent();" + NL + "\t\tif (parent == null || parent.getModel() instanceof ";
+  protected final String TEXT_191 = " == false) {" + NL + "\t\t\treturn null;" + NL + "\t\t}";
+  protected final String TEXT_192 = NL + "\t\t";
+  protected final String TEXT_193 = " view = (";
+  protected final String TEXT_194 = ") parent.getModel();" + NL + "\t\treturn (";
+  protected final String TEXT_195 = ") view.getElement();";
+  protected final String TEXT_196 = NL + "\t\t";
+  protected final String TEXT_197 = " target = ((";
+  protected final String TEXT_198 = ") parent.getModel()).getTarget();" + NL + "\t\treturn (target != null && target.getElement() instanceof ";
+  protected final String TEXT_199 = ") ? (";
+  protected final String TEXT_200 = ") target.getElement() : null;";
+  protected final String TEXT_201 = NL + "\t\treturn null;";
+  protected final String TEXT_202 = NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate ";
+  protected final String TEXT_203 = " getUpdatableParent() {" + NL + "\t\tfor(EditPart editPart = getParent(); editPart != null; editPart = editPart.getParent()) {" + NL + "\t\t\tif (editPart instanceof ";
+  protected final String TEXT_204 = ") {" + NL + "\t\t\t\treturn (";
+  protected final String TEXT_205 = ") editPart;" + NL + "\t\t\t}" + NL + "\t\t}" + NL + "\t\treturn null;" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic void activate() {" + NL + "\t\tsuper.activate();" + NL + "\t\t";
+  protected final String TEXT_206 = " updatableParent = getUpdatableParent();" + NL + "\t\tif (updatableParent != null) {" + NL + "\t\t\tupdatableParent.addRefresher(";
+  protected final String TEXT_207 = ".eINSTANCE.getFontStyle_FontColor(), fontColorRefresher);" + NL + "\t\t\tupdatableParent.addRefresher(";
+  protected final String TEXT_208 = ".eINSTANCE.getFontStyle_FontHeight(), fontRefresher);" + NL + "\t\t\tupdatableParent.addRefresher(";
+  protected final String TEXT_209 = ".eINSTANCE.getFontStyle_FontName(), fontRefresher);" + NL + "\t\t\tupdatableParent.addRefresher(";
+  protected final String TEXT_210 = ".eINSTANCE.getFontStyle_Bold(), fontRefresher);" + NL + "\t\t\tupdatableParent.addRefresher(";
+  protected final String TEXT_211 = ".eINSTANCE.getFontStyle_Italic(), fontRefresher);";
   protected final String TEXT_212 = NL + "\t\t\tupdatableParent.addRefresher(";
   protected final String TEXT_213 = ".eINSTANCE.get";
   protected final String TEXT_214 = "(), labelRefresher);";
-  protected final String TEXT_215 = NL + "\t\t}" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic void deactivate() {" + NL + "\t\tsuper.deactivate();" + NL + "\t\t";
-  protected final String TEXT_216 = " updatableParent = getUpdatableParent();" + NL + "\t\tif (updatableParent != null) {" + NL + "\t\t\tupdatableParent.removeRefresher(";
-  protected final String TEXT_217 = ".eINSTANCE.getFontStyle_FontColor(), fontColorRefresher);" + NL + "\t\t\tupdatableParent.removeRefresher(";
-  protected final String TEXT_218 = ".eINSTANCE.getFontStyle_FontHeight(), fontRefresher);" + NL + "\t\t\tupdatableParent.removeRefresher(";
-  protected final String TEXT_219 = ".eINSTANCE.getFontStyle_FontName(), fontRefresher);" + NL + "\t\t\tupdatableParent.removeRefresher(";
-  protected final String TEXT_220 = ".eINSTANCE.getFontStyle_Bold(), fontRefresher);" + NL + "\t\t\tupdatableParent.removeRefresher(";
-  protected final String TEXT_221 = ".eINSTANCE.getFontStyle_Italic(), fontRefresher);";
-  protected final String TEXT_222 = NL + "\t\t\tupdatableParent.removeRefresher(";
-  protected final String TEXT_223 = ".eINSTANCE.get";
-  protected final String TEXT_224 = "(), labelRefresher);";
+  protected final String TEXT_215 = NL + "\t\t\tupdatableParent.addRefresher(";
+  protected final String TEXT_216 = ".eINSTANCE.get";
+  protected final String TEXT_217 = "(), labelRefresher);";
+  protected final String TEXT_218 = NL + "\t\t}" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic void deactivate() {" + NL + "\t\tsuper.deactivate();" + NL + "\t\t";
+  protected final String TEXT_219 = " updatableParent = getUpdatableParent();" + NL + "\t\tif (updatableParent != null) {" + NL + "\t\t\tupdatableParent.removeRefresher(";
+  protected final String TEXT_220 = ".eINSTANCE.getFontStyle_FontColor(), fontColorRefresher);" + NL + "\t\t\tupdatableParent.removeRefresher(";
+  protected final String TEXT_221 = ".eINSTANCE.getFontStyle_FontHeight(), fontRefresher);" + NL + "\t\t\tupdatableParent.removeRefresher(";
+  protected final String TEXT_222 = ".eINSTANCE.getFontStyle_FontName(), fontRefresher);" + NL + "\t\t\tupdatableParent.removeRefresher(";
+  protected final String TEXT_223 = ".eINSTANCE.getFontStyle_Bold(), fontRefresher);" + NL + "\t\t\tupdatableParent.removeRefresher(";
+  protected final String TEXT_224 = ".eINSTANCE.getFontStyle_Italic(), fontRefresher);";
   protected final String TEXT_225 = NL + "\t\t\tupdatableParent.removeRefresher(";
   protected final String TEXT_226 = ".eINSTANCE.get";
   protected final String TEXT_227 = "(), labelRefresher);";
-  protected final String TEXT_228 = NL + "\t\t}" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate ";
-  protected final String TEXT_229 = ".Refresher labelRefresher = new ";
-  protected final String TEXT_230 = ".Refresher() {" + NL + "\t\tpublic void refresh() {" + NL + "\t\t\trefreshLabel();" + NL + "\t\t}" + NL + "\t};" + NL + "" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate ";
-  protected final String TEXT_231 = ".Refresher fontColorRefresher = new ";
-  protected final String TEXT_232 = ".Refresher() {" + NL + "\t\tpublic void refresh() {" + NL + "\t\t\trefreshFontColor();" + NL + "\t\t}" + NL + "\t};" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate ";
-  protected final String TEXT_233 = ".Refresher fontRefresher = new ";
-  protected final String TEXT_234 = ".Refresher() {" + NL + "\t\tpublic void refresh() {" + NL + "\t\t\trefreshFont();" + NL + "\t\t}" + NL + "\t};" + NL;
-  protected final String TEXT_235 = NL;
-  protected final String TEXT_236 = NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected ";
-  protected final String TEXT_237 = " createFigure() {" + NL + "\t\t// Parent should assign one using ";
-  protected final String TEXT_238 = " method" + NL + "\t\treturn null;" + NL + "\t}";
-  protected final String TEXT_239 = NL + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected ";
-  protected final String TEXT_240 = " createLabel() {";
-  protected final String TEXT_241 = NL + "\t\treturn new ";
-  protected final String TEXT_242 = "();";
-  protected final String TEXT_243 = NL + "\t\treturn ";
-  protected final String TEXT_244 = ";";
-  protected final String TEXT_245 = NL + "\t\treturn new ";
-  protected final String TEXT_246 = "();";
-  protected final String TEXT_247 = NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected ";
-  protected final String TEXT_248 = " createFigure() {" + NL + "\t\t";
-  protected final String TEXT_249 = " label = createLabel();";
-  protected final String TEXT_250 = NL + "\t\tdefaultText = label.getText();";
-  protected final String TEXT_251 = NL + "\t\tdefaultText = \"\";\t//$NON-NLS-1$";
-  protected final String TEXT_252 = NL + "\t\treturn label;" + NL + "\t}";
-  protected final String TEXT_253 = NL + NL + "\t/**";
-  protected final String TEXT_254 = NL + "\t * TODO: reimplement, since the figure used by this editpart is not a Label.";
-  protected final String TEXT_255 = NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic ";
-  protected final String TEXT_256 = " getLabel() {" + NL + "\t\treturn (";
-  protected final String TEXT_257 = ") getFigure();" + NL + "\t}" + NL;
-  protected final String TEXT_258 = NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic void ";
-  protected final String TEXT_259 = "(";
-  protected final String TEXT_260 = " figure) {" + NL + "\t\tunregisterVisuals();" + NL + "\t\tsetFigure(figure);";
-  protected final String TEXT_261 = NL + "\t\tdefaultText = figure.getText();";
-  protected final String TEXT_262 = NL + "\t\tdefaultText = \"\";\t//$NON-NLS-1$";
-  protected final String TEXT_263 = NL + "\t\tregisterVisuals();" + NL + "\t\trefreshVisuals();" + NL + "\t}" + NL;
-  protected final String TEXT_264 = NL;
-  protected final String TEXT_265 = NL;
-  protected final String TEXT_266 = NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate static class MapModeWorkaround {" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tpublic int DPtoLP(int dp) {" + NL + "\t\t\treturn dp;" + NL + "\t\t}" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tpublic static MapModeWorkaround INSTANCE = new MapModeWorkaround();" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate MapModeWorkaround getMapMode() {" + NL + "\t\treturn MapModeWorkaround.INSTANCE;" + NL + "\t}";
-  protected final String TEXT_267 = NL + "}";
+  protected final String TEXT_228 = NL + "\t\t\tupdatableParent.removeRefresher(";
+  protected final String TEXT_229 = ".eINSTANCE.get";
+  protected final String TEXT_230 = "(), labelRefresher);";
+  protected final String TEXT_231 = NL + "\t\t}" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate ";
+  protected final String TEXT_232 = ".Refresher labelRefresher = new ";
+  protected final String TEXT_233 = ".Refresher() {" + NL + "\t\tpublic void refresh() {" + NL + "\t\t\trefreshLabel();" + NL + "\t\t}" + NL + "\t};" + NL + "" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate ";
+  protected final String TEXT_234 = ".Refresher fontColorRefresher = new ";
+  protected final String TEXT_235 = ".Refresher() {" + NL + "\t\tpublic void refresh() {" + NL + "\t\t\trefreshFontColor();" + NL + "\t\t}" + NL + "\t};" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate ";
+  protected final String TEXT_236 = ".Refresher fontRefresher = new ";
+  protected final String TEXT_237 = ".Refresher() {" + NL + "\t\tpublic void refresh() {" + NL + "\t\t\trefreshFont();" + NL + "\t\t}" + NL + "\t};" + NL;
+  protected final String TEXT_238 = NL;
+  protected final String TEXT_239 = NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected ";
+  protected final String TEXT_240 = " createFigure() {" + NL + "\t\t// Parent should assign one using ";
+  protected final String TEXT_241 = " method" + NL + "\t\treturn null;" + NL + "\t}";
+  protected final String TEXT_242 = NL + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected ";
+  protected final String TEXT_243 = " createLabel() {";
+  protected final String TEXT_244 = NL + "\t\treturn new ";
+  protected final String TEXT_245 = "();";
+  protected final String TEXT_246 = NL + "\t\treturn ";
+  protected final String TEXT_247 = ";";
+  protected final String TEXT_248 = NL + "\t\treturn new ";
+  protected final String TEXT_249 = "();";
+  protected final String TEXT_250 = NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected ";
+  protected final String TEXT_251 = " createFigure() {" + NL + "\t\t";
+  protected final String TEXT_252 = " label = createLabel();";
+  protected final String TEXT_253 = NL + "\t\tdefaultText = label.getText();";
+  protected final String TEXT_254 = NL + "\t\tdefaultText = \"\";\t//$NON-NLS-1$";
+  protected final String TEXT_255 = NL + "\t\treturn label;" + NL + "\t}";
+  protected final String TEXT_256 = NL + NL + "\t/**";
+  protected final String TEXT_257 = NL + "\t * TODO: reimplement, since the figure used by this editpart is not a Label.";
+  protected final String TEXT_258 = NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic ";
+  protected final String TEXT_259 = " getLabel() {" + NL + "\t\treturn (";
+  protected final String TEXT_260 = ") getFigure();" + NL + "\t}" + NL;
+  protected final String TEXT_261 = NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic void ";
+  protected final String TEXT_262 = "(";
+  protected final String TEXT_263 = " figure) {" + NL + "\t\tunregisterVisuals();" + NL + "\t\tsetFigure(figure);";
+  protected final String TEXT_264 = NL + "\t\tdefaultText = figure.getText();";
+  protected final String TEXT_265 = NL + "\t\tdefaultText = \"\";\t//$NON-NLS-1$";
+  protected final String TEXT_266 = NL + "\t\tregisterVisuals();" + NL + "\t\trefreshVisuals();" + NL + "\t}" + NL;
+  protected final String TEXT_267 = NL;
   protected final String TEXT_268 = NL;
+  protected final String TEXT_269 = NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate static class MapModeWorkaround {" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tpublic int DPtoLP(int dp) {" + NL + "\t\t\treturn dp;" + NL + "\t\t}" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tpublic static MapModeWorkaround INSTANCE = new MapModeWorkaround();" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate MapModeWorkaround getMapMode() {" + NL + "\t\treturn MapModeWorkaround.INSTANCE;" + NL + "\t}";
+  protected final String TEXT_270 = NL + "}";
+  protected final String TEXT_271 = NL;
 
   public String generate(Object argument)
   {
@@ -438,6 +441,7 @@
     stringBuffer.append(TEXT_34);
     
 if (labelModelFacet instanceof FeatureLabelModelFacet || labelModelFacet instanceof CompositeFeatureLabelModelFacet && !isReadOnly) {
+		String editPatternCode = "EDIT_PATTERN";	//declared in labelText.javajetinc, used in directEditCommand.jetinc.
 
     stringBuffer.append(TEXT_35);
     stringBuffer.append(TEXT_36);
@@ -447,205 +451,209 @@
     stringBuffer.append(TEXT_38);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gef.requests.DirectEditRequest"));
     stringBuffer.append(TEXT_39);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.commands.Command"));
     stringBuffer.append(TEXT_40);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.requests.DirectEditRequest"));
     stringBuffer.append(TEXT_41);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.commands.UnexecutableCommand"));
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.commands.Command"));
     stringBuffer.append(TEXT_42);
-    stringBuffer.append(importManager.getImportedName("java.text.MessageFormat"));
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.requests.DirectEditRequest"));
     stringBuffer.append(TEXT_43);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gef.commands.UnexecutableCommand"));
     stringBuffer.append(TEXT_44);
-    stringBuffer.append(importManager.getImportedName("java.text.ParseException"));
+    stringBuffer.append(importManager.getImportedName("java.text.MessageFormat"));
     stringBuffer.append(TEXT_45);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.commands.UnexecutableCommand"));
+    stringBuffer.append(editPatternCode);
     stringBuffer.append(TEXT_46);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.TransactionalEditingDomain"));
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.commands.UnexecutableCommand"));
     stringBuffer.append(TEXT_47);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.util.TransactionUtil"));
+    stringBuffer.append(importManager.getImportedName("java.text.ParseException"));
     stringBuffer.append(TEXT_48);
-    stringBuffer.append(primaryView);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.commands.UnexecutableCommand"));
     stringBuffer.append(TEXT_49);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.TransactionalEditingDomain"));
+    stringBuffer.append(TEXT_50);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.util.TransactionUtil"));
+    stringBuffer.append(TEXT_51);
+    stringBuffer.append(primaryView);
+    stringBuffer.append(TEXT_52);
     
 if (labelModelFacet instanceof FeatureLabelModelFacet) {
 	GenFeature featureToSet = ((FeatureLabelModelFacet)labelModelFacet).getMetaFeature();
 	EStructuralFeature ecoreFeature = featureToSet.getEcoreFeature();
 
-    stringBuffer.append(TEXT_50);
+    stringBuffer.append(TEXT_53);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gef.commands.UnexecutableCommand"));
-    stringBuffer.append(TEXT_51);
+    stringBuffer.append(TEXT_54);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.command.Command"));
-    stringBuffer.append(TEXT_52);
+    stringBuffer.append(TEXT_55);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.lite.commands.WrappingCommand"));
-    stringBuffer.append(TEXT_53);
+    stringBuffer.append(TEXT_56);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.command.Command"));
-    stringBuffer.append(TEXT_54);
+    stringBuffer.append(TEXT_57);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.TransactionalEditingDomain"));
-    stringBuffer.append(TEXT_55);
+    stringBuffer.append(TEXT_58);
     stringBuffer.append(importManager.getImportedName(underlyingMetaClass.getQualifiedInterfaceName()));
-    stringBuffer.append(TEXT_56);
+    stringBuffer.append(TEXT_59);
     stringBuffer.append(resolvedSemanticElement);
-    stringBuffer.append(TEXT_57);
+    stringBuffer.append(TEXT_60);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EAttribute"));
-    stringBuffer.append(TEXT_58);
+    stringBuffer.append(TEXT_61);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EAttribute"));
-    stringBuffer.append(TEXT_59);
+    stringBuffer.append(TEXT_62);
     stringBuffer.append(importManager.getImportedName(featureToSet.getGenPackage().getQualifiedPackageInterfaceName()));
-    stringBuffer.append(TEXT_60);
+    stringBuffer.append(TEXT_63);
     stringBuffer.append(featureToSet.getFeatureAccessorName());
-    stringBuffer.append(TEXT_61);
+    stringBuffer.append(TEXT_64);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.lite.services.ParserUtil"));
-    stringBuffer.append(TEXT_62);
+    stringBuffer.append(TEXT_65);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.command.UnexecutableCommand"));
-    stringBuffer.append(TEXT_63);
+    stringBuffer.append(TEXT_66);
     
 	if (ecoreFeature.isMany()) {
 
-    stringBuffer.append(TEXT_64);
+    stringBuffer.append(TEXT_67);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.command.CompoundCommand"));
-    stringBuffer.append(TEXT_65);
+    stringBuffer.append(TEXT_68);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.command.CompoundCommand"));
-    stringBuffer.append(TEXT_66);
+    stringBuffer.append(TEXT_69);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.util.EList"));
-    stringBuffer.append(TEXT_67);
+    stringBuffer.append(TEXT_70);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.util.BasicEList"));
-    stringBuffer.append(TEXT_68);
+    stringBuffer.append(TEXT_71);
     stringBuffer.append(featureToSet.getAccessorName());
-    stringBuffer.append(TEXT_69);
+    stringBuffer.append(TEXT_72);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.edit.command.RemoveCommand"));
-    stringBuffer.append(TEXT_70);
+    stringBuffer.append(TEXT_73);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.edit.command.AddCommand"));
-    stringBuffer.append(TEXT_71);
+    stringBuffer.append(TEXT_74);
     
 	} else {
 
-    stringBuffer.append(TEXT_72);
+    stringBuffer.append(TEXT_75);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.edit.command.SetCommand"));
-    stringBuffer.append(TEXT_73);
+    stringBuffer.append(TEXT_76);
     
 	}
 
-    stringBuffer.append(TEXT_74);
+    stringBuffer.append(TEXT_77);
     
 } else if (labelModelFacet instanceof CompositeFeatureLabelModelFacet) {
 	CompositeFeatureLabelModelFacet compositeFeatureLabelModelFacet = (CompositeFeatureLabelModelFacet) labelModelFacet;
 	List metaFeatures = compositeFeatureLabelModelFacet.getMetaFeatures();
 
-    stringBuffer.append(TEXT_75);
+    stringBuffer.append(TEXT_78);
     stringBuffer.append(metaFeatures.size());
-    stringBuffer.append(TEXT_76);
+    stringBuffer.append(TEXT_79);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gef.commands.UnexecutableCommand"));
-    stringBuffer.append(TEXT_77);
+    stringBuffer.append(TEXT_80);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.command.Command"));
-    stringBuffer.append(TEXT_78);
+    stringBuffer.append(TEXT_81);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.lite.commands.WrappingCommand"));
-    stringBuffer.append(TEXT_79);
+    stringBuffer.append(TEXT_82);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.command.Command"));
-    stringBuffer.append(TEXT_80);
+    stringBuffer.append(TEXT_83);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.TransactionalEditingDomain"));
-    stringBuffer.append(TEXT_81);
+    stringBuffer.append(TEXT_84);
     stringBuffer.append(importManager.getImportedName(underlyingMetaClass.getQualifiedInterfaceName()));
-    stringBuffer.append(TEXT_82);
+    stringBuffer.append(TEXT_85);
     stringBuffer.append(resolvedSemanticElement);
-    stringBuffer.append(TEXT_83);
+    stringBuffer.append(TEXT_86);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.command.CompoundCommand"));
-    stringBuffer.append(TEXT_84);
+    stringBuffer.append(TEXT_87);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.command.CompoundCommand"));
-    stringBuffer.append(TEXT_85);
+    stringBuffer.append(TEXT_88);
     
 	boolean haveDeclaredValues = false;
 	for(int i = 0; i < metaFeatures.size(); i++) {
 		GenFeature nextFeatureToSet = (GenFeature) metaFeatures.get(i);
 		EStructuralFeature nextEcoreFeature = nextFeatureToSet.getEcoreFeature();
 
-    stringBuffer.append(TEXT_86);
+    stringBuffer.append(TEXT_89);
     if (i == 0) {
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EAttribute"));
-    stringBuffer.append(TEXT_87);
+    stringBuffer.append(TEXT_90);
     }
-    stringBuffer.append(TEXT_88);
+    stringBuffer.append(TEXT_91);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EAttribute"));
-    stringBuffer.append(TEXT_89);
+    stringBuffer.append(TEXT_92);
     stringBuffer.append(importManager.getImportedName(nextFeatureToSet.getGenPackage().getQualifiedPackageInterfaceName()));
-    stringBuffer.append(TEXT_90);
+    stringBuffer.append(TEXT_93);
     stringBuffer.append(nextFeatureToSet.getFeatureAccessorName());
-    stringBuffer.append(TEXT_91);
+    stringBuffer.append(TEXT_94);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.lite.services.ParserUtil"));
-    stringBuffer.append(TEXT_92);
+    stringBuffer.append(TEXT_95);
     stringBuffer.append(i);
-    stringBuffer.append(TEXT_93);
+    stringBuffer.append(TEXT_96);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.command.UnexecutableCommand"));
-    stringBuffer.append(TEXT_94);
+    stringBuffer.append(TEXT_97);
     
 		if (nextEcoreFeature.isMany()) {
 
-    stringBuffer.append(TEXT_95);
+    stringBuffer.append(TEXT_98);
     if (!haveDeclaredValues) { haveDeclaredValues = true;
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.util.EList"));
-    stringBuffer.append(TEXT_96);
+    stringBuffer.append(TEXT_99);
     }
-    stringBuffer.append(TEXT_97);
+    stringBuffer.append(TEXT_100);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.util.BasicEList"));
-    stringBuffer.append(TEXT_98);
+    stringBuffer.append(TEXT_101);
     stringBuffer.append(nextFeatureToSet.getAccessorName());
-    stringBuffer.append(TEXT_99);
+    stringBuffer.append(TEXT_102);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.edit.command.RemoveCommand"));
-    stringBuffer.append(TEXT_100);
+    stringBuffer.append(TEXT_103);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.edit.command.AddCommand"));
-    stringBuffer.append(TEXT_101);
+    stringBuffer.append(TEXT_104);
     
 		} else {
 
-    stringBuffer.append(TEXT_102);
+    stringBuffer.append(TEXT_105);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.edit.command.SetCommand"));
-    stringBuffer.append(TEXT_103);
+    stringBuffer.append(TEXT_106);
     
 		}
 
     
 	}
 
-    stringBuffer.append(TEXT_104);
+    stringBuffer.append(TEXT_107);
     
 }
 
-    stringBuffer.append(TEXT_105);
+    stringBuffer.append(TEXT_108);
     
 }
 
-    stringBuffer.append(TEXT_106);
+    stringBuffer.append(TEXT_109);
     
 if (labelModelFacet instanceof FeatureLabelModelFacet || labelModelFacet instanceof CompositeFeatureLabelModelFacet && !isReadOnly) {
 
-    stringBuffer.append(TEXT_107);
-    stringBuffer.append(TEXT_108);
+    stringBuffer.append(TEXT_110);
+    stringBuffer.append(TEXT_111);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gef.Request"));
-    stringBuffer.append(TEXT_109);
+    stringBuffer.append(TEXT_112);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gef.RequestConstants"));
-    stringBuffer.append(TEXT_110);
+    stringBuffer.append(TEXT_113);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gef.tools.DirectEditManager"));
-    stringBuffer.append(TEXT_111);
+    stringBuffer.append(TEXT_114);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gef.tools.DirectEditManager"));
-    stringBuffer.append(TEXT_112);
+    stringBuffer.append(TEXT_115);
     stringBuffer.append(importManager.getImportedName("org.eclipse.jface.viewers.TextCellEditor"));
-    stringBuffer.append(TEXT_113);
+    stringBuffer.append(TEXT_116);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gef.tools.CellEditorLocator"));
-    stringBuffer.append(TEXT_114);
+    stringBuffer.append(TEXT_117);
     stringBuffer.append(importManager.getImportedName("org.eclipse.jface.viewers.CellEditor"));
-    stringBuffer.append(TEXT_115);
+    stringBuffer.append(TEXT_118);
     stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.geometry.Rectangle"));
-    stringBuffer.append(TEXT_116);
+    stringBuffer.append(TEXT_119);
     
 }
 
-    stringBuffer.append(TEXT_117);
+    stringBuffer.append(TEXT_120);
     stringBuffer.append(importManager.getImportedName(genHost.getEditPartQualifiedClassName()));
-    stringBuffer.append(TEXT_118);
+    stringBuffer.append(TEXT_121);
     stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.Connection"));
-    stringBuffer.append(TEXT_119);
+    stringBuffer.append(TEXT_122);
     stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.Connection"));
-    stringBuffer.append(TEXT_120);
+    stringBuffer.append(TEXT_123);
     
 	final String alignment;
 	LinkLabelAlignment genAlignment = genLabel.getAlignment();
@@ -668,18 +676,18 @@
 		}
 	}
 
-    stringBuffer.append(TEXT_121);
+    stringBuffer.append(TEXT_124);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gef.GraphicalEditPart"));
-    stringBuffer.append(TEXT_122);
+    stringBuffer.append(TEXT_125);
     stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.ConnectionLocator"));
-    stringBuffer.append(TEXT_123);
+    stringBuffer.append(TEXT_126);
     stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.ConnectionLocator"));
-    stringBuffer.append(TEXT_124);
+    stringBuffer.append(TEXT_127);
     stringBuffer.append(alignment);
-    stringBuffer.append(TEXT_125);
+    stringBuffer.append(TEXT_128);
     stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.geometry.Point"));
-    stringBuffer.append(TEXT_126);
-    stringBuffer.append(TEXT_127);
+    stringBuffer.append(TEXT_129);
+    stringBuffer.append(TEXT_130);
     
 /*genFeature.getObjectType() throws NPE on primitive types. This is a workaround. */
 HashMap primitiveTypeToWrapperClassName = new HashMap();
@@ -723,91 +731,91 @@
 	}
 }
 
-    stringBuffer.append(TEXT_128);
+    stringBuffer.append(TEXT_131);
     stringBuffer.append(viewPattern);
-    stringBuffer.append(TEXT_129);
+    stringBuffer.append(TEXT_132);
     stringBuffer.append(editPattern);
-    stringBuffer.append(TEXT_130);
+    stringBuffer.append(TEXT_133);
     stringBuffer.append(importManager.getImportedName(underlyingMetaClass.getQualifiedInterfaceName()));
-    stringBuffer.append(TEXT_131);
+    stringBuffer.append(TEXT_134);
     stringBuffer.append(resolvedSemanticElement);
-    stringBuffer.append(TEXT_132);
+    stringBuffer.append(TEXT_135);
     stringBuffer.append(importManager.getImportedName(underlyingMetaClass.getQualifiedInterfaceName()));
-    stringBuffer.append(TEXT_133);
+    stringBuffer.append(TEXT_136);
     stringBuffer.append(resolvedSemanticElement);
-    stringBuffer.append(TEXT_134);
+    stringBuffer.append(TEXT_137);
     stringBuffer.append(importManager.getImportedName(underlyingMetaClass.getQualifiedInterfaceName()));
-    stringBuffer.append(TEXT_135);
+    stringBuffer.append(TEXT_138);
     
 if (labelModelFacet instanceof FeatureLabelModelFacet) {
 	FeatureLabelModelFacet featureLabelModelFacet = (FeatureLabelModelFacet) labelModelFacet;
 	GenFeature feature = featureLabelModelFacet.getMetaFeature();
 	if (!feature.isPrimitiveType()) {
 
-    stringBuffer.append(TEXT_136);
+    stringBuffer.append(TEXT_139);
     myFeatureGetAccessorHelper.appendFeatureValueGetter("element", feature, underlyingMetaClass, false);
-    stringBuffer.append(TEXT_137);
+    stringBuffer.append(TEXT_140);
     
 	}
 
-    stringBuffer.append(TEXT_138);
+    stringBuffer.append(TEXT_141);
     stringBuffer.append(importManager.getImportedName("java.text.MessageFormat"));
-    stringBuffer.append(TEXT_139);
+    stringBuffer.append(TEXT_142);
     
 		if (feature.isPrimitiveType()) {
 
-    stringBuffer.append(TEXT_140);
+    stringBuffer.append(TEXT_143);
     stringBuffer.append(primitiveTypeToWrapperClassName.get(feature.getTypeGenClassifier().getEcoreClassifier().getInstanceClass()));
-    stringBuffer.append(TEXT_141);
+    stringBuffer.append(TEXT_144);
     
 		}
 		myFeatureGetAccessorHelper.appendFeatureValueGetter("element", feature, underlyingMetaClass, false);
 		if (feature.isPrimitiveType()) {
 
-    stringBuffer.append(TEXT_142);
+    stringBuffer.append(TEXT_145);
     
 		}
 
-    stringBuffer.append(TEXT_143);
+    stringBuffer.append(TEXT_146);
     
 } else if (labelModelFacet instanceof CompositeFeatureLabelModelFacet) {
 	CompositeFeatureLabelModelFacet compositeFeatureLabelModelFacet = (CompositeFeatureLabelModelFacet) labelModelFacet;
 
-    stringBuffer.append(TEXT_144);
+    stringBuffer.append(TEXT_147);
     stringBuffer.append(importManager.getImportedName("java.text.MessageFormat"));
-    stringBuffer.append(TEXT_145);
+    stringBuffer.append(TEXT_148);
     
 	for(Iterator it = compositeFeatureLabelModelFacet.getMetaFeatures().iterator(); it.hasNext(); ) {
 		GenFeature next = (GenFeature) it.next();
 		if (next.isPrimitiveType()) {
 
-    stringBuffer.append(TEXT_146);
+    stringBuffer.append(TEXT_149);
     stringBuffer.append(primitiveTypeToWrapperClassName.get(next.getTypeGenClassifier().getEcoreClassifier().getInstanceClass()));
-    stringBuffer.append(TEXT_147);
+    stringBuffer.append(TEXT_150);
     
 		}
 		myFeatureGetAccessorHelper.appendFeatureValueGetter("element", next, underlyingMetaClass, false);
 		if (next.isPrimitiveType()) {
 
-    stringBuffer.append(TEXT_148);
+    stringBuffer.append(TEXT_151);
     
 		}
 		if (it.hasNext()) {
-    stringBuffer.append(TEXT_149);
+    stringBuffer.append(TEXT_152);
     }
     
 	}
 
-    stringBuffer.append(TEXT_150);
+    stringBuffer.append(TEXT_153);
     
 } else {
 
-    stringBuffer.append(TEXT_151);
+    stringBuffer.append(TEXT_154);
     
 }
 
-    stringBuffer.append(TEXT_152);
-    stringBuffer.append(TEXT_153);
+    stringBuffer.append(TEXT_155);
+    stringBuffer.append(TEXT_156);
     
 boolean isFixedFontSetInFigure;
 {
@@ -815,200 +823,194 @@
 	isFixedFontSetInFigure = styleAttributes != null && styleAttributes.isFixedFont();
 }
 
-    stringBuffer.append(TEXT_154);
+    stringBuffer.append(TEXT_157);
     
 if (!isFixedFontSetInFigure) {
 
-    stringBuffer.append(TEXT_155);
+    stringBuffer.append(TEXT_158);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.FontStyle"));
-    stringBuffer.append(TEXT_156);
+    stringBuffer.append(TEXT_159);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.FontStyle"));
-    stringBuffer.append(TEXT_157);
+    stringBuffer.append(TEXT_160);
     stringBuffer.append(primaryView);
-    stringBuffer.append(TEXT_158);
+    stringBuffer.append(TEXT_161);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.NotationPackage"));
-    stringBuffer.append(TEXT_159);
+    stringBuffer.append(TEXT_162);
     stringBuffer.append(importManager.getImportedName("org.eclipse.swt.graphics.Font"));
-    stringBuffer.append(TEXT_160);
+    stringBuffer.append(TEXT_163);
     stringBuffer.append(importManager.getImportedName("org.eclipse.swt.SWT"));
-    stringBuffer.append(TEXT_161);
+    stringBuffer.append(TEXT_164);
     stringBuffer.append(importManager.getImportedName("org.eclipse.swt.SWT"));
-    stringBuffer.append(TEXT_162);
+    stringBuffer.append(TEXT_165);
     stringBuffer.append(importManager.getImportedName("org.eclipse.swt.SWT"));
-    stringBuffer.append(TEXT_163);
+    stringBuffer.append(TEXT_166);
     stringBuffer.append(importManager.getImportedName("org.eclipse.swt.graphics.Font"));
-    stringBuffer.append(TEXT_164);
+    stringBuffer.append(TEXT_167);
     stringBuffer.append(importManager.getImportedName("org.eclipse.swt.graphics.FontData"));
-    stringBuffer.append(TEXT_165);
+    stringBuffer.append(TEXT_168);
     stringBuffer.append(importManager.getImportedName("org.eclipse.swt.graphics.Font"));
-    stringBuffer.append(TEXT_166);
+    stringBuffer.append(TEXT_169);
     
 }
 
-    stringBuffer.append(TEXT_167);
+    stringBuffer.append(TEXT_170);
     
 if (!isFixedFontSetInFigure) {
 
-    stringBuffer.append(TEXT_168);
+    stringBuffer.append(TEXT_171);
     stringBuffer.append(importManager.getImportedName("org.eclipse.swt.graphics.Font"));
-    stringBuffer.append(TEXT_169);
+    stringBuffer.append(TEXT_172);
     
 }
 
-    stringBuffer.append(TEXT_170);
-    stringBuffer.append(TEXT_171);
-    stringBuffer.append(TEXT_172);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.FontStyle"));
     stringBuffer.append(TEXT_173);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.FontStyle"));
     stringBuffer.append(TEXT_174);
-    stringBuffer.append(primaryView);
     stringBuffer.append(TEXT_175);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.NotationPackage"));
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.FontStyle"));
     stringBuffer.append(TEXT_176);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.swt.graphics.Color"));
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.FontStyle"));
     stringBuffer.append(TEXT_177);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.swt.graphics.Color"));
+    stringBuffer.append(primaryView);
     stringBuffer.append(TEXT_178);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.swt.graphics.Color"));
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.NotationPackage"));
     stringBuffer.append(TEXT_179);
     stringBuffer.append(importManager.getImportedName("org.eclipse.swt.graphics.Color"));
     stringBuffer.append(TEXT_180);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.swt.graphics.Image"));
+    stringBuffer.append(importManager.getImportedName("org.eclipse.swt.graphics.Color"));
     stringBuffer.append(TEXT_181);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.swt.graphics.Color"));
+    stringBuffer.append(TEXT_182);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.swt.graphics.Color"));
+    stringBuffer.append(TEXT_183);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.swt.graphics.Image"));
+    stringBuffer.append(TEXT_184);
     
 if (genLabel.isElementIcon()) {
 
-    stringBuffer.append(TEXT_182);
+    stringBuffer.append(TEXT_185);
     stringBuffer.append(importManager.getImportedName("org.eclipse.jface.resource.ImageDescriptor"));
-    stringBuffer.append(TEXT_183);
+    stringBuffer.append(TEXT_186);
     stringBuffer.append(importManager.getImportedName(genDiagram.getEditorGen().getPlugin().getActivatorQualifiedClassName()));
-    stringBuffer.append(TEXT_184);
+    stringBuffer.append(TEXT_187);
     
 }
 
-    stringBuffer.append(TEXT_185);
+    stringBuffer.append(TEXT_188);
     stringBuffer.append(importManager.getImportedName(underlyingMetaClass.getQualifiedInterfaceName()));
-    stringBuffer.append(TEXT_186);
+    stringBuffer.append(TEXT_189);
     stringBuffer.append(importManager.getImportedName(genHost.getEditPartQualifiedClassName()));
-    stringBuffer.append(TEXT_187);
+    stringBuffer.append(TEXT_190);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.Edge"));
-    stringBuffer.append(TEXT_188);
+    stringBuffer.append(TEXT_191);
     
 if (genHost.getModelFacet() instanceof TypeLinkModelFacet) {
 
-    stringBuffer.append(TEXT_189);
+    stringBuffer.append(TEXT_192);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.View"));
-    stringBuffer.append(TEXT_190);
+    stringBuffer.append(TEXT_193);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.View"));
-    stringBuffer.append(TEXT_191);
+    stringBuffer.append(TEXT_194);
     stringBuffer.append(importManager.getImportedName(underlyingMetaClass.getQualifiedInterfaceName()));
-    stringBuffer.append(TEXT_192);
+    stringBuffer.append(TEXT_195);
     
 } else if (genHost.getModelFacet() instanceof FeatureLinkModelFacet) {
 
-    stringBuffer.append(TEXT_193);
+    stringBuffer.append(TEXT_196);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.View"));
-    stringBuffer.append(TEXT_194);
+    stringBuffer.append(TEXT_197);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.Edge"));
-    stringBuffer.append(TEXT_195);
+    stringBuffer.append(TEXT_198);
     stringBuffer.append(importManager.getImportedName(underlyingMetaClass.getQualifiedInterfaceName()));
-    stringBuffer.append(TEXT_196);
+    stringBuffer.append(TEXT_199);
     stringBuffer.append(importManager.getImportedName(underlyingMetaClass.getQualifiedInterfaceName()));
-    stringBuffer.append(TEXT_197);
+    stringBuffer.append(TEXT_200);
     
 } else {
 
-    stringBuffer.append(TEXT_198);
+    stringBuffer.append(TEXT_201);
     
 }
 
-    stringBuffer.append(TEXT_199);
-    stringBuffer.append(importManager.getImportedName(genHost.getEditPartQualifiedClassName()));
-    stringBuffer.append(TEXT_200);
-    stringBuffer.append(importManager.getImportedName(genHost.getEditPartQualifiedClassName()));
-    stringBuffer.append(TEXT_201);
-    stringBuffer.append(importManager.getImportedName(genHost.getEditPartQualifiedClassName()));
     stringBuffer.append(TEXT_202);
     stringBuffer.append(importManager.getImportedName(genHost.getEditPartQualifiedClassName()));
     stringBuffer.append(TEXT_203);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.NotationPackage"));
+    stringBuffer.append(importManager.getImportedName(genHost.getEditPartQualifiedClassName()));
     stringBuffer.append(TEXT_204);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.NotationPackage"));
+    stringBuffer.append(importManager.getImportedName(genHost.getEditPartQualifiedClassName()));
     stringBuffer.append(TEXT_205);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.NotationPackage"));
+    stringBuffer.append(importManager.getImportedName(genHost.getEditPartQualifiedClassName()));
     stringBuffer.append(TEXT_206);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.NotationPackage"));
     stringBuffer.append(TEXT_207);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.NotationPackage"));
     stringBuffer.append(TEXT_208);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.NotationPackage"));
+    stringBuffer.append(TEXT_209);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.NotationPackage"));
+    stringBuffer.append(TEXT_210);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.NotationPackage"));
+    stringBuffer.append(TEXT_211);
     
 if (labelModelFacet instanceof FeatureLabelModelFacet) {
 	GenFeature feature = ((FeatureLabelModelFacet)labelModelFacet).getMetaFeature();
 
-    stringBuffer.append(TEXT_209);
+    stringBuffer.append(TEXT_212);
     stringBuffer.append(importManager.getImportedName(feature.getGenPackage().getQualifiedPackageInterfaceName()));
-    stringBuffer.append(TEXT_210);
+    stringBuffer.append(TEXT_213);
     stringBuffer.append(feature.getFeatureAccessorName());
-    stringBuffer.append(TEXT_211);
+    stringBuffer.append(TEXT_214);
     
 } else if (labelModelFacet instanceof CompositeFeatureLabelModelFacet) {
 	CompositeFeatureLabelModelFacet compositeFeatureLabelModelFacet = (CompositeFeatureLabelModelFacet) labelModelFacet;
 	for(Iterator it = compositeFeatureLabelModelFacet.getMetaFeatures().iterator(); it.hasNext(); ) {
 		GenFeature next = (GenFeature) it.next();
 
-    stringBuffer.append(TEXT_212);
+    stringBuffer.append(TEXT_215);
     stringBuffer.append(importManager.getImportedName(next.getGenPackage().getQualifiedPackageInterfaceName()));
-    stringBuffer.append(TEXT_213);
+    stringBuffer.append(TEXT_216);
     stringBuffer.append(next.getFeatureAccessorName());
-    stringBuffer.append(TEXT_214);
+    stringBuffer.append(TEXT_217);
     
 	}
 }
 
-    stringBuffer.append(TEXT_215);
-    stringBuffer.append(importManager.getImportedName(genHost.getEditPartQualifiedClassName()));
-    stringBuffer.append(TEXT_216);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.NotationPackage"));
-    stringBuffer.append(TEXT_217);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.NotationPackage"));
     stringBuffer.append(TEXT_218);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.NotationPackage"));
+    stringBuffer.append(importManager.getImportedName(genHost.getEditPartQualifiedClassName()));
     stringBuffer.append(TEXT_219);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.NotationPackage"));
     stringBuffer.append(TEXT_220);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.NotationPackage"));
     stringBuffer.append(TEXT_221);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.NotationPackage"));
+    stringBuffer.append(TEXT_222);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.NotationPackage"));
+    stringBuffer.append(TEXT_223);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.NotationPackage"));
+    stringBuffer.append(TEXT_224);
     
 if (labelModelFacet instanceof FeatureLabelModelFacet) {
 	GenFeature feature = ((FeatureLabelModelFacet)labelModelFacet).getMetaFeature();
 
-    stringBuffer.append(TEXT_222);
+    stringBuffer.append(TEXT_225);
     stringBuffer.append(importManager.getImportedName(feature.getGenPackage().getQualifiedPackageInterfaceName()));
-    stringBuffer.append(TEXT_223);
+    stringBuffer.append(TEXT_226);
     stringBuffer.append(feature.getFeatureAccessorName());
-    stringBuffer.append(TEXT_224);
+    stringBuffer.append(TEXT_227);
     
 } else if (labelModelFacet instanceof CompositeFeatureLabelModelFacet) {
 	CompositeFeatureLabelModelFacet compositeFeatureLabelModelFacet = (CompositeFeatureLabelModelFacet) labelModelFacet;
 	for(Iterator it = compositeFeatureLabelModelFacet.getMetaFeatures().iterator(); it.hasNext(); ) {
 		GenFeature next = (GenFeature) it.next();
 
-    stringBuffer.append(TEXT_225);
+    stringBuffer.append(TEXT_228);
     stringBuffer.append(importManager.getImportedName(next.getGenPackage().getQualifiedPackageInterfaceName()));
-    stringBuffer.append(TEXT_226);
+    stringBuffer.append(TEXT_229);
     stringBuffer.append(next.getFeatureAccessorName());
-    stringBuffer.append(TEXT_227);
+    stringBuffer.append(TEXT_230);
     
 	}
 }
 
-    stringBuffer.append(TEXT_228);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.lite.edit.parts.update.IUpdatableEditPart"));
-    stringBuffer.append(TEXT_229);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.lite.edit.parts.update.IUpdatableEditPart"));
-    stringBuffer.append(TEXT_230);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.lite.edit.parts.update.IUpdatableEditPart"));
     stringBuffer.append(TEXT_231);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.lite.edit.parts.update.IUpdatableEditPart"));
     stringBuffer.append(TEXT_232);
@@ -1016,10 +1018,16 @@
     stringBuffer.append(TEXT_233);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.lite.edit.parts.update.IUpdatableEditPart"));
     stringBuffer.append(TEXT_234);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.lite.edit.parts.update.IUpdatableEditPart"));
+    stringBuffer.append(TEXT_235);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.lite.edit.parts.update.IUpdatableEditPart"));
+    stringBuffer.append(TEXT_236);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.lite.edit.parts.update.IUpdatableEditPart"));
+    stringBuffer.append(TEXT_237);
     
 final Viewmap viewmap = genLabel.getViewmap();
 
-    stringBuffer.append(TEXT_235);
+    stringBuffer.append(TEXT_238);
     
 final String figureQualifiedClassName;
 if (viewmap instanceof ParentAssignedViewmap) {
@@ -1048,64 +1056,64 @@
 if (viewmap instanceof ParentAssignedViewmap) {
 	final ParentAssignedViewmap parentAssignedViewmap = (ParentAssignedViewmap) viewmap;
 
-    stringBuffer.append(TEXT_236);
+    stringBuffer.append(TEXT_239);
     stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.IFigure"));
-    stringBuffer.append(TEXT_237);
+    stringBuffer.append(TEXT_240);
     stringBuffer.append((parentAssignedViewmap.getSetterName() == null ? "setLabel" : parentAssignedViewmap.getSetterName()));
-    stringBuffer.append(TEXT_238);
+    stringBuffer.append(TEXT_241);
     } else { 
-    stringBuffer.append(TEXT_239);
+    stringBuffer.append(TEXT_242);
     stringBuffer.append(figureImportedName);
-    stringBuffer.append(TEXT_240);
+    stringBuffer.append(TEXT_243);
     
 if (viewmap instanceof FigureViewmap) {
 
-    stringBuffer.append(TEXT_241);
+    stringBuffer.append(TEXT_244);
     stringBuffer.append(figureImportedName);
-    stringBuffer.append(TEXT_242);
+    stringBuffer.append(TEXT_245);
     } // instanceof FigureViewmap
  else if (viewmap instanceof SnippetViewmap) {
-    stringBuffer.append(TEXT_243);
+    stringBuffer.append(TEXT_246);
     stringBuffer.append(((SnippetViewmap) viewmap).getBody());
-    stringBuffer.append(TEXT_244);
+    stringBuffer.append(TEXT_247);
     } // instanceof SnippetViewmap; FIXME : obtain figure class name to generate getter
  else if (viewmap instanceof InnerClassViewmap) {
 
-    stringBuffer.append(TEXT_245);
+    stringBuffer.append(TEXT_248);
     stringBuffer.append(figureImportedName);
-    stringBuffer.append(TEXT_246);
+    stringBuffer.append(TEXT_249);
     }
-    stringBuffer.append(TEXT_247);
+    stringBuffer.append(TEXT_250);
     stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.IFigure"));
-    stringBuffer.append(TEXT_248);
+    stringBuffer.append(TEXT_251);
     stringBuffer.append(figureImportedName);
-    stringBuffer.append(TEXT_249);
+    stringBuffer.append(TEXT_252);
     
 if ("org.eclipse.draw2d.Label".equals(figureQualifiedClassName) || viewmap instanceof InnerClassViewmap) {
 
-    stringBuffer.append(TEXT_250);
+    stringBuffer.append(TEXT_253);
     
 } else {
 
-    stringBuffer.append(TEXT_251);
+    stringBuffer.append(TEXT_254);
     
 }
 
-    stringBuffer.append(TEXT_252);
+    stringBuffer.append(TEXT_255);
     }	/*not parent-assigned*/
-    stringBuffer.append(TEXT_253);
+    stringBuffer.append(TEXT_256);
     
 if (!"org.eclipse.draw2d.Label".equals(figureQualifiedClassName) && viewmap instanceof InnerClassViewmap==false) {
 
-    stringBuffer.append(TEXT_254);
+    stringBuffer.append(TEXT_257);
     
 }
 
-    stringBuffer.append(TEXT_255);
+    stringBuffer.append(TEXT_258);
     stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.Label"));
-    stringBuffer.append(TEXT_256);
+    stringBuffer.append(TEXT_259);
     stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.Label"));
-    stringBuffer.append(TEXT_257);
+    stringBuffer.append(TEXT_260);
     
 String labelSetterName = "setLabel"; // same assumption in NodeEditPart
 String labelFigureClassName = "org.eclipse.draw2d.IFigure";
@@ -1119,43 +1127,43 @@
 	}
 } // FIXME perhaps, there's no sense to have setLabel for any other viewmap than ParentAssigned?
 
-    stringBuffer.append(TEXT_258);
+    stringBuffer.append(TEXT_261);
     stringBuffer.append(labelSetterName);
-    stringBuffer.append(TEXT_259);
+    stringBuffer.append(TEXT_262);
     stringBuffer.append(importManager.getImportedName(labelFigureClassName));
-    stringBuffer.append(TEXT_260);
+    stringBuffer.append(TEXT_263);
     
 if ("org.eclipse.draw2d.Label".equals(labelFigureClassName)) {
 
-    stringBuffer.append(TEXT_261);
+    stringBuffer.append(TEXT_264);
     
 } else {
 
-    stringBuffer.append(TEXT_262);
+    stringBuffer.append(TEXT_265);
     
 }
 
-    stringBuffer.append(TEXT_263);
+    stringBuffer.append(TEXT_266);
     
 if (viewmap instanceof InnerClassViewmap) {
 	String classBody = ((InnerClassViewmap) viewmap).getClassBody();
 
-    stringBuffer.append(TEXT_264);
+    stringBuffer.append(TEXT_267);
     stringBuffer.append(classBody);
-    stringBuffer.append(TEXT_265);
+    stringBuffer.append(TEXT_268);
     
 if (classBody.indexOf("DPtoLP") != -1) {
 
-    stringBuffer.append(TEXT_266);
+    stringBuffer.append(TEXT_269);
     
 }
 
     
 }
 
-    stringBuffer.append(TEXT_267);
+    stringBuffer.append(TEXT_270);
     importManager.emitSortedImports();
-    stringBuffer.append(TEXT_268);
+    stringBuffer.append(TEXT_271);
     return stringBuffer.toString();
   }
 }
Index: src-templates/org/eclipse/gmf/codegen/templates/lite/parts/NodeLabelEditPartGenerator.java
===================================================================
RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.codegen.lite/src-templates/org/eclipse/gmf/codegen/templates/lite/parts/NodeLabelEditPartGenerator.java,v
retrieving revision 1.10
diff -u -r1.10 NodeLabelEditPartGenerator.java
--- src-templates/org/eclipse/gmf/codegen/templates/lite/parts/NodeLabelEditPartGenerator.java	1 Sep 2006 16:14:08 -0000	1.10
+++ src-templates/org/eclipse/gmf/codegen/templates/lite/parts/NodeLabelEditPartGenerator.java	11 Sep 2006 10:18:30 -0000
@@ -54,217 +54,220 @@
   protected final String TEXT_34 = "\t\tinstallEditPolicy(";
   protected final String TEXT_35 = ".DIRECT_EDIT_ROLE," + NL + "\t\t\t\tnew ";
   protected final String TEXT_36 = "() {" + NL + "\t\t\t\t\tprotected void showCurrentEditValue(";
-  protected final String TEXT_37 = " request) {" + NL + "\t\t\t\t\t\tString value = (String) request.getCellEditor().getValue();" + NL + "\t\t\t\t\t\tgetLabel().setText(value);" + NL + "\t\t\t\t\t}" + NL + "\t\t\t\t\tprotected ";
-  protected final String TEXT_38 = " getDirectEditCommand(";
-  protected final String TEXT_39 = " request) {" + NL + "\t\t\t\t\t\tString value = (String) request.getCellEditor().getValue();" + NL + "\t\t\t\t\t\tif (value == null) {" + NL + "\t\t\t\t\t\t\t//Invalid value is transformed into a null by the validator." + NL + "\t\t\t\t\t\t\t//XXX: implement validator" + NL + "\t\t\t\t\t\t\treturn ";
-  protected final String TEXT_40 = ".INSTANCE;" + NL + "\t\t\t\t\t\t}" + NL + "\t\t\t\t\t\tfinal Object[] parseResult;" + NL + "\t\t\t\t\t\ttry {" + NL + "\t\t\t\t\t\t\tparseResult = new ";
-  protected final String TEXT_41 = "(EDIT_PATTERN).parse(value);" + NL + "\t\t\t\t\t\t} catch (IllegalArgumentException e) {" + NL + "\t\t\t\t\t\t\treturn ";
-  protected final String TEXT_42 = ".INSTANCE;" + NL + "\t\t\t\t\t\t} catch (";
-  protected final String TEXT_43 = " e) {" + NL + "\t\t\t\t\t\t\treturn ";
-  protected final String TEXT_44 = ".INSTANCE;" + NL + "\t\t\t\t\t\t}" + NL + "\t\t\t\t\t\t";
-  protected final String TEXT_45 = " editingDomain = ";
-  protected final String TEXT_46 = ".getEditingDomain(";
-  protected final String TEXT_47 = ".getDiagram().getElement());";
-  protected final String TEXT_48 = NL + "\t\t\t\t\t\tif (parseResult.length != 1) {" + NL + "\t\t\t\t\t\t\treturn ";
-  protected final String TEXT_49 = ".INSTANCE;" + NL + "\t\t\t\t\t\t}" + NL + "\t\t\t\t\t\t";
-  protected final String TEXT_50 = " domainModelCommand = createDomainModelCommand(editingDomain, parseResult[0]);" + NL + "\t\t\t\t\t\treturn new ";
-  protected final String TEXT_51 = "(editingDomain, domainModelCommand);" + NL + "\t\t\t\t\t}" + NL + "\t\t\t\t\t";
-  protected final String TEXT_52 = " createDomainModelCommand(";
-  protected final String TEXT_53 = " editingDomain, Object value) {" + NL + "\t\t\t\t\t\t";
-  protected final String TEXT_54 = " element = ";
-  protected final String TEXT_55 = ";" + NL + "\t\t\t\t\t\t";
-  protected final String TEXT_56 = " feature = (";
-  protected final String TEXT_57 = ") ";
-  protected final String TEXT_58 = ".eINSTANCE.get";
-  protected final String TEXT_59 = "();" + NL + "\t\t\t\t\t\tObject valueToSet;" + NL + "\t\t\t\t\t\ttry {" + NL + "\t\t\t\t\t\t\tvalueToSet = ";
-  protected final String TEXT_60 = ".parseValue(feature, value);" + NL + "\t\t\t\t\t\t} catch (IllegalArgumentException e) {" + NL + "\t\t\t\t\t\t\treturn ";
-  protected final String TEXT_61 = ".INSTANCE;" + NL + "\t\t\t\t\t\t}";
-  protected final String TEXT_62 = NL + "\t\t\t\t\t\t";
-  protected final String TEXT_63 = " result = new ";
-  protected final String TEXT_64 = "();" + NL + "\t\t\t\t\t\t";
-  protected final String TEXT_65 = " values = new ";
-  protected final String TEXT_66 = "();" + NL + "\t\t\t\t\t\tvalues.addAll(element.get";
-  protected final String TEXT_67 = "());" + NL + "\t\t\t\t\t\tresult.append(";
-  protected final String TEXT_68 = ".create(editingDomain, element, feature, values));" + NL + "\t\t\t\t\t\tresult.append(";
-  protected final String TEXT_69 = ".create(editingDomain, element, feature, valueToSet));" + NL + "\t\t\t\t\t\treturn result;";
-  protected final String TEXT_70 = NL + "\t\t\t\t\t\treturn ";
-  protected final String TEXT_71 = ".create(editingDomain, element, feature, valueToSet);";
-  protected final String TEXT_72 = NL + "\t\t\t\t\t}";
-  protected final String TEXT_73 = NL + "\t\t\t\t\t\tif (parseResult.length != ";
-  protected final String TEXT_74 = ") {" + NL + "\t\t\t\t\t\t\treturn ";
-  protected final String TEXT_75 = ".INSTANCE;" + NL + "\t\t\t\t\t\t}" + NL + "\t\t\t\t\t\t";
-  protected final String TEXT_76 = " domainModelCommand = createDomainModelCommand(editingDomain, parseResult);" + NL + "\t\t\t\t\t\treturn new ";
-  protected final String TEXT_77 = "(editingDomain, domainModelCommand);" + NL + "\t\t\t\t\t}" + NL + "\t\t\t\t\t";
-  protected final String TEXT_78 = " createDomainModelCommand(";
-  protected final String TEXT_79 = " editingDomain, Object[] values) {" + NL + "\t\t\t\t\t\t";
-  protected final String TEXT_80 = " element = ";
-  protected final String TEXT_81 = ";" + NL + "\t\t\t\t\t\t";
-  protected final String TEXT_82 = " result = new ";
-  protected final String TEXT_83 = "();" + NL + "\t\t\t\t\t\tObject valueToSet;";
-  protected final String TEXT_84 = NL + "\t\t\t\t\t\t";
-  protected final String TEXT_85 = " ";
-  protected final String TEXT_86 = "feature = (";
-  protected final String TEXT_87 = ") ";
-  protected final String TEXT_88 = ".eINSTANCE.get";
-  protected final String TEXT_89 = "();" + NL + "\t\t\t\t\t\ttry {" + NL + "\t\t\t\t\t\t\tvalueToSet = ";
-  protected final String TEXT_90 = ".parseValue(feature, values[";
-  protected final String TEXT_91 = "]);" + NL + "\t\t\t\t\t\t} catch (IllegalArgumentException e) {" + NL + "\t\t\t\t\t\t\treturn ";
-  protected final String TEXT_92 = ".INSTANCE;" + NL + "\t\t\t\t\t\t}";
-  protected final String TEXT_93 = NL + "\t\t\t\t\t\t";
-  protected final String TEXT_94 = " ";
-  protected final String TEXT_95 = "values = new ";
-  protected final String TEXT_96 = "();" + NL + "\t\t\t\t\t\tvalues.addAll(element.get";
-  protected final String TEXT_97 = "());" + NL + "\t\t\t\t\t\tresult.append(";
-  protected final String TEXT_98 = ".create(editingDomain, element, feature, values));" + NL + "\t\t\t\t\t\tresult.append(";
-  protected final String TEXT_99 = ".create(editingDomain, element, feature, valueToSet));";
-  protected final String TEXT_100 = NL + "\t\t\t\t\t\tresult.append(";
-  protected final String TEXT_101 = ".create(editingDomain, element, feature, valueToSet));";
-  protected final String TEXT_102 = NL + "\t\t\t\t\t\treturn result;" + NL + "\t\t\t\t\t}";
-  protected final String TEXT_103 = NL + "\t\t\t\t});";
-  protected final String TEXT_104 = NL + "\t}" + NL;
-  protected final String TEXT_105 = NL;
-  protected final String TEXT_106 = "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic void performRequest(";
-  protected final String TEXT_107 = " req) {" + NL + "\t\tif (";
-  protected final String TEXT_108 = ".REQ_DIRECT_EDIT == req.getType()) {" + NL + "\t\t\tperformDirectEdit();" + NL + "\t\t} else {" + NL + "\t\t\tsuper.performRequest(req);" + NL + "\t\t}" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected ";
-  protected final String TEXT_109 = " getManager() {" + NL + "\t\tif (manager == null) {" + NL + "\t\t\tmanager = new ";
-  protected final String TEXT_110 = "(this, ";
-  protected final String TEXT_111 = ".class, new ";
-  protected final String TEXT_112 = "() {" + NL + "\t\t\t\tpublic void relocate(";
-  protected final String TEXT_113 = " celleditor) {" + NL + "\t\t\t\t\t";
-  protected final String TEXT_114 = " rect = getLabel().getTextBounds();" + NL + "\t\t\t\t\tgetLabel().translateToAbsolute(rect);" + NL + "\t\t\t\t\tcelleditor.getControl().setBounds(rect.x, rect.y, rect.width, rect.height);" + NL + "\t\t\t\t}" + NL + "\t\t\t}) {" + NL + "\t\t\t\tprotected void initCellEditor() {" + NL + "\t\t\t\t\tgetCellEditor().setValue(getLabelEditText());" + NL + "\t\t\t\t}" + NL + "\t\t\t};" + NL + "\t\t}" + NL + "\t\treturn manager;" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected void performDirectEdit() {" + NL + "\t\tgetManager().show();" + NL + "\t}" + NL;
-  protected final String TEXT_115 = NL + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected void refreshVisuals() {" + NL + "\t\tsuper.refreshVisuals();" + NL + "\t\trefreshLabel();" + NL + "\t\trefreshFont();" + NL + "\t\trefreshFontColor();" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected void refreshLabel() {" + NL + "\t\tgetLabel().setText(getLabelText());" + NL + "\t\tgetLabel().setIcon(getLabelIcon());" + NL + "\t}" + NL;
-  protected final String TEXT_116 = NL;
-  protected final String TEXT_117 = NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate static final String VIEW_PATTERN = \"";
-  protected final String TEXT_118 = "\";" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate static final String EDIT_PATTERN = \"";
-  protected final String TEXT_119 = "\";" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected String getLabelText() {" + NL + "\t\t";
-  protected final String TEXT_120 = " element = ";
-  protected final String TEXT_121 = ";" + NL + "\t\tif (element == null) {" + NL + "\t\t\treturn defaultText;" + NL + "\t\t}" + NL + "\t\treturn buildTextByPattern(element, VIEW_PATTERN);" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected String getLabelEditText() {" + NL + "\t\t";
-  protected final String TEXT_122 = " element = ";
-  protected final String TEXT_123 = ";" + NL + "\t\tif (element == null) {" + NL + "\t\t\treturn defaultText;" + NL + "\t\t}" + NL + "\t\treturn buildTextByPattern(element, EDIT_PATTERN);" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected String buildTextByPattern(";
-  protected final String TEXT_124 = " element, String pattern) {";
-  protected final String TEXT_125 = NL + "\t\tif (";
-  protected final String TEXT_126 = " == null) {" + NL + "\t\t\treturn defaultText;" + NL + "\t\t}";
-  protected final String TEXT_127 = NL + "\t\treturn ";
-  protected final String TEXT_128 = ".format(pattern, new Object[] {";
-  protected final String TEXT_129 = NL + "\t\t\tnew ";
-  protected final String TEXT_130 = "(";
-  protected final String TEXT_131 = ")";
-  protected final String TEXT_132 = NL + "\t\t});";
-  protected final String TEXT_133 = NL + "\t\treturn ";
-  protected final String TEXT_134 = ".format(pattern, new Object[] {";
-  protected final String TEXT_135 = NL + "\t\t\tnew ";
-  protected final String TEXT_136 = "(";
-  protected final String TEXT_137 = ")";
-  protected final String TEXT_138 = ",";
-  protected final String TEXT_139 = NL + "\t\t});";
-  protected final String TEXT_140 = NL + "\t\t//XXX: unexpected model facet." + NL + "\t\treturn defaultText;";
-  protected final String TEXT_141 = NL + "\t}";
-  protected final String TEXT_142 = NL;
-  protected final String TEXT_143 = NL + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected void refreshFont() {";
-  protected final String TEXT_144 = NL + "\t\t";
-  protected final String TEXT_145 = " style =" + NL + "\t\t\t(";
-  protected final String TEXT_146 = ") ";
-  protected final String TEXT_147 = ".getStyle(" + NL + "\t\t\t\t";
-  protected final String TEXT_148 = ".eINSTANCE.getFontStyle());" + NL + "\t\t";
-  protected final String TEXT_149 = " toDispose = createdFont;" + NL + "\t\tif (style != null) {" + NL + "\t\t\tString fontName = style.getFontName();" + NL + "\t\t\tint fontHeight = style.getFontHeight();" + NL + "\t\t\tint fontStyle = ";
-  protected final String TEXT_150 = ".NORMAL;" + NL + "\t\t\tif (style.isBold()) {" + NL + "\t\t\t\tfontStyle |= ";
-  protected final String TEXT_151 = ".BOLD;" + NL + "\t\t\t}" + NL + "\t\t\tif (style.isItalic()) {" + NL + "\t\t\t\tfontStyle |= ";
-  protected final String TEXT_152 = ".ITALIC;" + NL + "\t\t\t}" + NL + "\t\t\t";
-  protected final String TEXT_153 = " currentFont = getFigure().getFont();" + NL + "\t\t\tif (currentFont != null) {" + NL + "\t\t\t\t";
-  protected final String TEXT_154 = " currentFontData = currentFont.getFontData()[0];" + NL + "\t\t\t\tif (currentFontData.getName().equals(fontName) && currentFontData.getHeight() == fontHeight && currentFontData.getStyle() == fontStyle) {" + NL + "\t\t\t\t\treturn;" + NL + "\t\t\t\t}" + NL + "\t\t\t}" + NL + "\t\t\tcreatedFont = new ";
-  protected final String TEXT_155 = "(null, fontName, fontHeight, fontStyle);" + NL + "\t\t\tgetFigure().setFont(createdFont);" + NL + "\t\t} else {" + NL + "\t\t\t//revert to the default font" + NL + "\t\t\tgetFigure().setFont(getViewer().getControl().getFont());" + NL + "\t\t\tcreatedFont = null;" + NL + "\t\t}" + NL + "\t\tif (toDispose != null) {" + NL + "\t\t\ttoDispose.dispose();" + NL + "\t\t}";
-  protected final String TEXT_156 = "\t" + NL + "\t}";
-  protected final String TEXT_157 = NL + NL + "\t/**" + NL + "\t * The font (created by {@link #refreshFont()}) currently assigned to the label (unless the default font is assigned)." + NL + "\t * Whenever another non-default font is assigned to it, it is safe to dispose the previous one." + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate ";
-  protected final String TEXT_158 = " createdFont;";
-  protected final String TEXT_159 = "\t";
-  protected final String TEXT_160 = NL;
-  protected final String TEXT_161 = "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected void refreshFontColor() {" + NL + "\t\t";
-  protected final String TEXT_162 = " style = (";
-  protected final String TEXT_163 = ")  ";
-  protected final String TEXT_164 = ".getStyle(";
-  protected final String TEXT_165 = ".eINSTANCE.getFontStyle());" + NL + "\t\t";
-  protected final String TEXT_166 = " toDispose = createdFontColor;" + NL + "\t\tif (style != null) {" + NL + "\t\t\tint fontColor = style.getFontColor();" + NL + "\t\t\tint red = fontColor & 0x000000FF;" + NL + "\t\t\tint green = (fontColor & 0x0000FF00) >> 8;" + NL + "\t\t\tint blue = (fontColor & 0x00FF0000) >> 16;" + NL + "\t\t\t";
-  protected final String TEXT_167 = " currentColor = getLabel().getForegroundColor();" + NL + "\t\t\tif (currentColor != null && currentColor.getRed() == red && currentColor.getGreen() == green && currentColor.getBlue() == blue) {" + NL + "\t\t\t\treturn;" + NL + "\t\t\t}" + NL + "\t\t\tcreatedFontColor = new ";
-  protected final String TEXT_168 = "(null, red, green, blue);" + NL + "\t\t\tgetFigure().setForegroundColor(createdFontColor);" + NL + "\t\t} else {" + NL + "\t\t\tgetFigure().setForegroundColor(getViewer().getControl().getForeground());" + NL + "\t\t\tcreatedFontColor = null;" + NL + "\t\t}" + NL + "\t\tif (toDispose != null) {" + NL + "\t\t\ttoDispose.dispose();" + NL + "\t\t}" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * The color (created by {@link #refreshFontColor()}) currently assigned to the label." + NL + "\t * Whenever another color is assigned to it, it is safe to dispose the previous one." + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate ";
-  protected final String TEXT_169 = " createdFontColor;" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected ";
-  protected final String TEXT_170 = " getLabelIcon() {";
-  protected final String TEXT_171 = NL + "\t\t";
-  protected final String TEXT_172 = " element = resolveSemanticElement();" + NL + "\t\t";
-  protected final String TEXT_173 = " imageDescriptor = ";
-  protected final String TEXT_174 = ".getInstance().getItemImageDescriptor(element);" + NL + "\t\tif (imageDescriptor != null) {" + NL + "\t\t\treturn imageDescriptor.createImage();" + NL + "\t\t}";
-  protected final String TEXT_175 = NL + "\t\treturn null;" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate ";
-  protected final String TEXT_176 = " resolveSemanticElement() {" + NL + "\t\tView view = (View) getModel();" + NL + "\t\treturn (view.getElement() instanceof ";
-  protected final String TEXT_177 = ") ? (";
-  protected final String TEXT_178 = ") view.getElement() : null;" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate ";
-  protected final String TEXT_179 = " getUpdatableParent() {" + NL + "\t\tfor(EditPart editPart = getParent(); editPart != null; editPart = editPart.getParent()) {" + NL + "\t\t\tif (editPart instanceof ";
-  protected final String TEXT_180 = ") {" + NL + "\t\t\t\treturn (";
-  protected final String TEXT_181 = ") editPart;" + NL + "\t\t\t}" + NL + "\t\t}" + NL + "\t\treturn null;" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic void activate() {" + NL + "\t\tsuper.activate();" + NL + "\t\t";
-  protected final String TEXT_182 = " updatableParent = getUpdatableParent();" + NL + "\t\tif (updatableParent != null) {" + NL + "\t\t\tupdatableParent.addRefresher(";
-  protected final String TEXT_183 = ".eINSTANCE.getFontStyle_FontColor(), fontColorRefresher);" + NL + "\t\t\tupdatableParent.addRefresher(";
-  protected final String TEXT_184 = ".eINSTANCE.getFontStyle_FontHeight(), fontRefresher);" + NL + "\t\t\tupdatableParent.addRefresher(";
-  protected final String TEXT_185 = ".eINSTANCE.getFontStyle_FontName(), fontRefresher);" + NL + "\t\t\tupdatableParent.addRefresher(";
-  protected final String TEXT_186 = ".eINSTANCE.getFontStyle_Bold(), fontRefresher);" + NL + "\t\t\tupdatableParent.addRefresher(";
-  protected final String TEXT_187 = ".eINSTANCE.getFontStyle_Italic(), fontRefresher);";
-  protected final String TEXT_188 = NL + "\t\t\tupdatableParent.addRefresher(";
-  protected final String TEXT_189 = ".eINSTANCE.get";
-  protected final String TEXT_190 = "(), labelRefresher);";
+  protected final String TEXT_37 = " request) {" + NL + "\t\t\t\t\t\tString value = (String) request.getCellEditor().getValue();" + NL + "\t\t\t\t\t\tgetLabel().setText(value);" + NL + "\t\t\t\t\t}";
+  protected final String TEXT_38 = NL;
+  protected final String TEXT_39 = "\t\t\t\t\tprotected ";
+  protected final String TEXT_40 = " getDirectEditCommand(";
+  protected final String TEXT_41 = " request) {" + NL + "\t\t\t\t\t\tString value = (String) request.getCellEditor().getValue();" + NL + "\t\t\t\t\t\tif (value == null) {" + NL + "\t\t\t\t\t\t\t//Invalid value is transformed into a null by the validator." + NL + "\t\t\t\t\t\t\t//XXX: implement validator" + NL + "\t\t\t\t\t\t\treturn ";
+  protected final String TEXT_42 = ".INSTANCE;" + NL + "\t\t\t\t\t\t}" + NL + "\t\t\t\t\t\tfinal Object[] parseResult;" + NL + "\t\t\t\t\t\ttry {" + NL + "\t\t\t\t\t\t\tparseResult = new ";
+  protected final String TEXT_43 = "(";
+  protected final String TEXT_44 = ").parse(value);" + NL + "\t\t\t\t\t\t} catch (IllegalArgumentException e) {" + NL + "\t\t\t\t\t\t\treturn ";
+  protected final String TEXT_45 = ".INSTANCE;" + NL + "\t\t\t\t\t\t} catch (";
+  protected final String TEXT_46 = " e) {" + NL + "\t\t\t\t\t\t\treturn ";
+  protected final String TEXT_47 = ".INSTANCE;" + NL + "\t\t\t\t\t\t}" + NL + "\t\t\t\t\t\t";
+  protected final String TEXT_48 = " editingDomain = ";
+  protected final String TEXT_49 = ".getEditingDomain(";
+  protected final String TEXT_50 = ".getDiagram().getElement());";
+  protected final String TEXT_51 = NL + "\t\t\t\t\t\tif (parseResult.length != 1) {" + NL + "\t\t\t\t\t\t\treturn ";
+  protected final String TEXT_52 = ".INSTANCE;" + NL + "\t\t\t\t\t\t}" + NL + "\t\t\t\t\t\t";
+  protected final String TEXT_53 = " domainModelCommand = createDomainModelCommand(editingDomain, parseResult[0]);" + NL + "\t\t\t\t\t\treturn new ";
+  protected final String TEXT_54 = "(editingDomain, domainModelCommand);" + NL + "\t\t\t\t\t}" + NL + "\t\t\t\t\t";
+  protected final String TEXT_55 = " createDomainModelCommand(";
+  protected final String TEXT_56 = " editingDomain, Object value) {" + NL + "\t\t\t\t\t\t";
+  protected final String TEXT_57 = " element = ";
+  protected final String TEXT_58 = ";" + NL + "\t\t\t\t\t\t";
+  protected final String TEXT_59 = " feature = (";
+  protected final String TEXT_60 = ") ";
+  protected final String TEXT_61 = ".eINSTANCE.get";
+  protected final String TEXT_62 = "();" + NL + "\t\t\t\t\t\tObject valueToSet;" + NL + "\t\t\t\t\t\ttry {" + NL + "\t\t\t\t\t\t\tvalueToSet = ";
+  protected final String TEXT_63 = ".parseValue(feature, value);" + NL + "\t\t\t\t\t\t} catch (IllegalArgumentException e) {" + NL + "\t\t\t\t\t\t\treturn ";
+  protected final String TEXT_64 = ".INSTANCE;" + NL + "\t\t\t\t\t\t}";
+  protected final String TEXT_65 = NL + "\t\t\t\t\t\t";
+  protected final String TEXT_66 = " result = new ";
+  protected final String TEXT_67 = "();" + NL + "\t\t\t\t\t\t";
+  protected final String TEXT_68 = " values = new ";
+  protected final String TEXT_69 = "();" + NL + "\t\t\t\t\t\tvalues.addAll(element.get";
+  protected final String TEXT_70 = "());" + NL + "\t\t\t\t\t\tresult.append(";
+  protected final String TEXT_71 = ".create(editingDomain, element, feature, values));" + NL + "\t\t\t\t\t\tresult.append(";
+  protected final String TEXT_72 = ".create(editingDomain, element, feature, valueToSet));" + NL + "\t\t\t\t\t\treturn result;";
+  protected final String TEXT_73 = NL + "\t\t\t\t\t\treturn ";
+  protected final String TEXT_74 = ".create(editingDomain, element, feature, valueToSet);";
+  protected final String TEXT_75 = NL + "\t\t\t\t\t}";
+  protected final String TEXT_76 = NL + "\t\t\t\t\t\tif (parseResult.length != ";
+  protected final String TEXT_77 = ") {" + NL + "\t\t\t\t\t\t\treturn ";
+  protected final String TEXT_78 = ".INSTANCE;" + NL + "\t\t\t\t\t\t}" + NL + "\t\t\t\t\t\t";
+  protected final String TEXT_79 = " domainModelCommand = createDomainModelCommand(editingDomain, parseResult);" + NL + "\t\t\t\t\t\treturn new ";
+  protected final String TEXT_80 = "(editingDomain, domainModelCommand);" + NL + "\t\t\t\t\t}" + NL + "\t\t\t\t\t";
+  protected final String TEXT_81 = " createDomainModelCommand(";
+  protected final String TEXT_82 = " editingDomain, Object[] values) {" + NL + "\t\t\t\t\t\t";
+  protected final String TEXT_83 = " element = ";
+  protected final String TEXT_84 = ";" + NL + "\t\t\t\t\t\t";
+  protected final String TEXT_85 = " result = new ";
+  protected final String TEXT_86 = "();" + NL + "\t\t\t\t\t\tObject valueToSet;";
+  protected final String TEXT_87 = NL + "\t\t\t\t\t\t";
+  protected final String TEXT_88 = " ";
+  protected final String TEXT_89 = "feature = (";
+  protected final String TEXT_90 = ") ";
+  protected final String TEXT_91 = ".eINSTANCE.get";
+  protected final String TEXT_92 = "();" + NL + "\t\t\t\t\t\ttry {" + NL + "\t\t\t\t\t\t\tvalueToSet = ";
+  protected final String TEXT_93 = ".parseValue(feature, values[";
+  protected final String TEXT_94 = "]);" + NL + "\t\t\t\t\t\t} catch (IllegalArgumentException e) {" + NL + "\t\t\t\t\t\t\treturn ";
+  protected final String TEXT_95 = ".INSTANCE;" + NL + "\t\t\t\t\t\t}";
+  protected final String TEXT_96 = NL + "\t\t\t\t\t\t";
+  protected final String TEXT_97 = " ";
+  protected final String TEXT_98 = "values = new ";
+  protected final String TEXT_99 = "();" + NL + "\t\t\t\t\t\tvalues.addAll(element.get";
+  protected final String TEXT_100 = "());" + NL + "\t\t\t\t\t\tresult.append(";
+  protected final String TEXT_101 = ".create(editingDomain, element, feature, values));" + NL + "\t\t\t\t\t\tresult.append(";
+  protected final String TEXT_102 = ".create(editingDomain, element, feature, valueToSet));";
+  protected final String TEXT_103 = NL + "\t\t\t\t\t\tresult.append(";
+  protected final String TEXT_104 = ".create(editingDomain, element, feature, valueToSet));";
+  protected final String TEXT_105 = NL + "\t\t\t\t\t\treturn result;" + NL + "\t\t\t\t\t}";
+  protected final String TEXT_106 = NL + "\t\t\t\t});";
+  protected final String TEXT_107 = NL + "\t}" + NL;
+  protected final String TEXT_108 = NL;
+  protected final String TEXT_109 = "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic void performRequest(";
+  protected final String TEXT_110 = " req) {" + NL + "\t\tif (";
+  protected final String TEXT_111 = ".REQ_DIRECT_EDIT == req.getType()) {" + NL + "\t\t\tperformDirectEdit();" + NL + "\t\t} else {" + NL + "\t\t\tsuper.performRequest(req);" + NL + "\t\t}" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected ";
+  protected final String TEXT_112 = " getManager() {" + NL + "\t\tif (manager == null) {" + NL + "\t\t\tmanager = new ";
+  protected final String TEXT_113 = "(this, ";
+  protected final String TEXT_114 = ".class, new ";
+  protected final String TEXT_115 = "() {" + NL + "\t\t\t\tpublic void relocate(";
+  protected final String TEXT_116 = " celleditor) {" + NL + "\t\t\t\t\t";
+  protected final String TEXT_117 = " rect = getLabel().getTextBounds();" + NL + "\t\t\t\t\tgetLabel().translateToAbsolute(rect);" + NL + "\t\t\t\t\tcelleditor.getControl().setBounds(rect.x, rect.y, rect.width, rect.height);" + NL + "\t\t\t\t}" + NL + "\t\t\t}) {" + NL + "\t\t\t\tprotected void initCellEditor() {" + NL + "\t\t\t\t\tgetCellEditor().setValue(getLabelEditText());" + NL + "\t\t\t\t}" + NL + "\t\t\t};" + NL + "\t\t}" + NL + "\t\treturn manager;" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected void performDirectEdit() {" + NL + "\t\tgetManager().show();" + NL + "\t}" + NL;
+  protected final String TEXT_118 = NL + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected void refreshVisuals() {" + NL + "\t\tsuper.refreshVisuals();" + NL + "\t\trefreshLabel();" + NL + "\t\trefreshFont();" + NL + "\t\trefreshFontColor();" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected void refreshLabel() {" + NL + "\t\tgetLabel().setText(getLabelText());" + NL + "\t\tgetLabel().setIcon(getLabelIcon());" + NL + "\t}" + NL;
+  protected final String TEXT_119 = NL;
+  protected final String TEXT_120 = NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate static final String VIEW_PATTERN = \"";
+  protected final String TEXT_121 = "\";" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic static final String EDIT_PATTERN = \"";
+  protected final String TEXT_122 = "\";" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected String getLabelText() {" + NL + "\t\t";
+  protected final String TEXT_123 = " element = ";
+  protected final String TEXT_124 = ";" + NL + "\t\tif (element == null) {" + NL + "\t\t\treturn defaultText;" + NL + "\t\t}" + NL + "\t\treturn buildTextByPattern(element, VIEW_PATTERN);" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected String getLabelEditText() {" + NL + "\t\t";
+  protected final String TEXT_125 = " element = ";
+  protected final String TEXT_126 = ";" + NL + "\t\tif (element == null) {" + NL + "\t\t\treturn defaultText;" + NL + "\t\t}" + NL + "\t\treturn buildTextByPattern(element, EDIT_PATTERN);" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected String buildTextByPattern(";
+  protected final String TEXT_127 = " element, String pattern) {";
+  protected final String TEXT_128 = NL + "\t\tif (";
+  protected final String TEXT_129 = " == null) {" + NL + "\t\t\treturn defaultText;" + NL + "\t\t}";
+  protected final String TEXT_130 = NL + "\t\treturn ";
+  protected final String TEXT_131 = ".format(pattern, new Object[] {";
+  protected final String TEXT_132 = NL + "\t\t\tnew ";
+  protected final String TEXT_133 = "(";
+  protected final String TEXT_134 = ")";
+  protected final String TEXT_135 = NL + "\t\t});";
+  protected final String TEXT_136 = NL + "\t\treturn ";
+  protected final String TEXT_137 = ".format(pattern, new Object[] {";
+  protected final String TEXT_138 = NL + "\t\t\tnew ";
+  protected final String TEXT_139 = "(";
+  protected final String TEXT_140 = ")";
+  protected final String TEXT_141 = ",";
+  protected final String TEXT_142 = NL + "\t\t});";
+  protected final String TEXT_143 = NL + "\t\t//XXX: unexpected model facet." + NL + "\t\treturn defaultText;";
+  protected final String TEXT_144 = NL + "\t}";
+  protected final String TEXT_145 = NL;
+  protected final String TEXT_146 = NL + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected void refreshFont() {";
+  protected final String TEXT_147 = NL + "\t\t";
+  protected final String TEXT_148 = " style =" + NL + "\t\t\t(";
+  protected final String TEXT_149 = ") ";
+  protected final String TEXT_150 = ".getStyle(" + NL + "\t\t\t\t";
+  protected final String TEXT_151 = ".eINSTANCE.getFontStyle());" + NL + "\t\t";
+  protected final String TEXT_152 = " toDispose = createdFont;" + NL + "\t\tif (style != null) {" + NL + "\t\t\tString fontName = style.getFontName();" + NL + "\t\t\tint fontHeight = style.getFontHeight();" + NL + "\t\t\tint fontStyle = ";
+  protected final String TEXT_153 = ".NORMAL;" + NL + "\t\t\tif (style.isBold()) {" + NL + "\t\t\t\tfontStyle |= ";
+  protected final String TEXT_154 = ".BOLD;" + NL + "\t\t\t}" + NL + "\t\t\tif (style.isItalic()) {" + NL + "\t\t\t\tfontStyle |= ";
+  protected final String TEXT_155 = ".ITALIC;" + NL + "\t\t\t}" + NL + "\t\t\t";
+  protected final String TEXT_156 = " currentFont = getFigure().getFont();" + NL + "\t\t\tif (currentFont != null) {" + NL + "\t\t\t\t";
+  protected final String TEXT_157 = " currentFontData = currentFont.getFontData()[0];" + NL + "\t\t\t\tif (currentFontData.getName().equals(fontName) && currentFontData.getHeight() == fontHeight && currentFontData.getStyle() == fontStyle) {" + NL + "\t\t\t\t\treturn;" + NL + "\t\t\t\t}" + NL + "\t\t\t}" + NL + "\t\t\tcreatedFont = new ";
+  protected final String TEXT_158 = "(null, fontName, fontHeight, fontStyle);" + NL + "\t\t\tgetFigure().setFont(createdFont);" + NL + "\t\t} else {" + NL + "\t\t\t//revert to the default font" + NL + "\t\t\tgetFigure().setFont(getViewer().getControl().getFont());" + NL + "\t\t\tcreatedFont = null;" + NL + "\t\t}" + NL + "\t\tif (toDispose != null) {" + NL + "\t\t\ttoDispose.dispose();" + NL + "\t\t}";
+  protected final String TEXT_159 = "\t" + NL + "\t}";
+  protected final String TEXT_160 = NL + NL + "\t/**" + NL + "\t * The font (created by {@link #refreshFont()}) currently assigned to the label (unless the default font is assigned)." + NL + "\t * Whenever another non-default font is assigned to it, it is safe to dispose the previous one." + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate ";
+  protected final String TEXT_161 = " createdFont;";
+  protected final String TEXT_162 = "\t";
+  protected final String TEXT_163 = NL;
+  protected final String TEXT_164 = "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected void refreshFontColor() {" + NL + "\t\t";
+  protected final String TEXT_165 = " style = (";
+  protected final String TEXT_166 = ")  ";
+  protected final String TEXT_167 = ".getStyle(";
+  protected final String TEXT_168 = ".eINSTANCE.getFontStyle());" + NL + "\t\t";
+  protected final String TEXT_169 = " toDispose = createdFontColor;" + NL + "\t\tif (style != null) {" + NL + "\t\t\tint fontColor = style.getFontColor();" + NL + "\t\t\tint red = fontColor & 0x000000FF;" + NL + "\t\t\tint green = (fontColor & 0x0000FF00) >> 8;" + NL + "\t\t\tint blue = (fontColor & 0x00FF0000) >> 16;" + NL + "\t\t\t";
+  protected final String TEXT_170 = " currentColor = getLabel().getForegroundColor();" + NL + "\t\t\tif (currentColor != null && currentColor.getRed() == red && currentColor.getGreen() == green && currentColor.getBlue() == blue) {" + NL + "\t\t\t\treturn;" + NL + "\t\t\t}" + NL + "\t\t\tcreatedFontColor = new ";
+  protected final String TEXT_171 = "(null, red, green, blue);" + NL + "\t\t\tgetFigure().setForegroundColor(createdFontColor);" + NL + "\t\t} else {" + NL + "\t\t\tgetFigure().setForegroundColor(getViewer().getControl().getForeground());" + NL + "\t\t\tcreatedFontColor = null;" + NL + "\t\t}" + NL + "\t\tif (toDispose != null) {" + NL + "\t\t\ttoDispose.dispose();" + NL + "\t\t}" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * The color (created by {@link #refreshFontColor()}) currently assigned to the label." + NL + "\t * Whenever another color is assigned to it, it is safe to dispose the previous one." + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate ";
+  protected final String TEXT_172 = " createdFontColor;" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected ";
+  protected final String TEXT_173 = " getLabelIcon() {";
+  protected final String TEXT_174 = NL + "\t\t";
+  protected final String TEXT_175 = " element = resolveSemanticElement();" + NL + "\t\t";
+  protected final String TEXT_176 = " imageDescriptor = ";
+  protected final String TEXT_177 = ".getInstance().getItemImageDescriptor(element);" + NL + "\t\tif (imageDescriptor != null) {" + NL + "\t\t\treturn imageDescriptor.createImage();" + NL + "\t\t}";
+  protected final String TEXT_178 = NL + "\t\treturn null;" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate ";
+  protected final String TEXT_179 = " resolveSemanticElement() {" + NL + "\t\tView view = (View) getModel();" + NL + "\t\treturn (view.getElement() instanceof ";
+  protected final String TEXT_180 = ") ? (";
+  protected final String TEXT_181 = ") view.getElement() : null;" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate ";
+  protected final String TEXT_182 = " getUpdatableParent() {" + NL + "\t\tfor(EditPart editPart = getParent(); editPart != null; editPart = editPart.getParent()) {" + NL + "\t\t\tif (editPart instanceof ";
+  protected final String TEXT_183 = ") {" + NL + "\t\t\t\treturn (";
+  protected final String TEXT_184 = ") editPart;" + NL + "\t\t\t}" + NL + "\t\t}" + NL + "\t\treturn null;" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic void activate() {" + NL + "\t\tsuper.activate();" + NL + "\t\t";
+  protected final String TEXT_185 = " updatableParent = getUpdatableParent();" + NL + "\t\tif (updatableParent != null) {" + NL + "\t\t\tupdatableParent.addRefresher(";
+  protected final String TEXT_186 = ".eINSTANCE.getFontStyle_FontColor(), fontColorRefresher);" + NL + "\t\t\tupdatableParent.addRefresher(";
+  protected final String TEXT_187 = ".eINSTANCE.getFontStyle_FontHeight(), fontRefresher);" + NL + "\t\t\tupdatableParent.addRefresher(";
+  protected final String TEXT_188 = ".eINSTANCE.getFontStyle_FontName(), fontRefresher);" + NL + "\t\t\tupdatableParent.addRefresher(";
+  protected final String TEXT_189 = ".eINSTANCE.getFontStyle_Bold(), fontRefresher);" + NL + "\t\t\tupdatableParent.addRefresher(";
+  protected final String TEXT_190 = ".eINSTANCE.getFontStyle_Italic(), fontRefresher);";
   protected final String TEXT_191 = NL + "\t\t\tupdatableParent.addRefresher(";
   protected final String TEXT_192 = ".eINSTANCE.get";
   protected final String TEXT_193 = "(), labelRefresher);";
-  protected final String TEXT_194 = NL + "\t\t}" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic void deactivate() {" + NL + "\t\tsuper.deactivate();" + NL + "\t\t";
-  protected final String TEXT_195 = " updatableParent = getUpdatableParent();" + NL + "\t\tif (updatableParent != null) {" + NL + "\t\t\tupdatableParent.removeRefresher(";
-  protected final String TEXT_196 = ".eINSTANCE.getFontStyle_FontColor(), fontColorRefresher);" + NL + "\t\t\tupdatableParent.removeRefresher(";
-  protected final String TEXT_197 = ".eINSTANCE.getFontStyle_FontHeight(), fontRefresher);" + NL + "\t\t\tupdatableParent.removeRefresher(";
-  protected final String TEXT_198 = ".eINSTANCE.getFontStyle_FontName(), fontRefresher);" + NL + "\t\t\tupdatableParent.removeRefresher(";
-  protected final String TEXT_199 = ".eINSTANCE.getFontStyle_Bold(), fontRefresher);" + NL + "\t\t\tupdatableParent.removeRefresher(";
-  protected final String TEXT_200 = ".eINSTANCE.getFontStyle_Italic(), fontRefresher);";
-  protected final String TEXT_201 = NL + "\t\t\tupdatableParent.removeRefresher(";
-  protected final String TEXT_202 = ".eINSTANCE.get";
-  protected final String TEXT_203 = "(), labelRefresher);";
+  protected final String TEXT_194 = NL + "\t\t\tupdatableParent.addRefresher(";
+  protected final String TEXT_195 = ".eINSTANCE.get";
+  protected final String TEXT_196 = "(), labelRefresher);";
+  protected final String TEXT_197 = NL + "\t\t}" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic void deactivate() {" + NL + "\t\tsuper.deactivate();" + NL + "\t\t";
+  protected final String TEXT_198 = " updatableParent = getUpdatableParent();" + NL + "\t\tif (updatableParent != null) {" + NL + "\t\t\tupdatableParent.removeRefresher(";
+  protected final String TEXT_199 = ".eINSTANCE.getFontStyle_FontColor(), fontColorRefresher);" + NL + "\t\t\tupdatableParent.removeRefresher(";
+  protected final String TEXT_200 = ".eINSTANCE.getFontStyle_FontHeight(), fontRefresher);" + NL + "\t\t\tupdatableParent.removeRefresher(";
+  protected final String TEXT_201 = ".eINSTANCE.getFontStyle_FontName(), fontRefresher);" + NL + "\t\t\tupdatableParent.removeRefresher(";
+  protected final String TEXT_202 = ".eINSTANCE.getFontStyle_Bold(), fontRefresher);" + NL + "\t\t\tupdatableParent.removeRefresher(";
+  protected final String TEXT_203 = ".eINSTANCE.getFontStyle_Italic(), fontRefresher);";
   protected final String TEXT_204 = NL + "\t\t\tupdatableParent.removeRefresher(";
   protected final String TEXT_205 = ".eINSTANCE.get";
   protected final String TEXT_206 = "(), labelRefresher);";
-  protected final String TEXT_207 = NL + "\t\t}" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate ";
-  protected final String TEXT_208 = ".Refresher labelRefresher = new ";
-  protected final String TEXT_209 = ".Refresher() {" + NL + "\t\tpublic void refresh() {" + NL + "\t\t\trefreshLabel();" + NL + "\t\t}" + NL + "\t};" + NL + "" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate ";
-  protected final String TEXT_210 = ".Refresher fontColorRefresher = new ";
-  protected final String TEXT_211 = ".Refresher() {" + NL + "\t\tpublic void refresh() {" + NL + "\t\t\trefreshFontColor();" + NL + "\t\t}" + NL + "\t};" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate ";
-  protected final String TEXT_212 = ".Refresher fontRefresher = new ";
-  protected final String TEXT_213 = ".Refresher() {" + NL + "\t\tpublic void refresh() {" + NL + "\t\t\trefreshFont();" + NL + "\t\t}" + NL + "\t};";
-  protected final String TEXT_214 = NL;
-  protected final String TEXT_215 = NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected ";
-  protected final String TEXT_216 = " createFigure() {" + NL + "\t\t// Parent should assign one using ";
-  protected final String TEXT_217 = " method" + NL + "\t\treturn null;" + NL + "\t}";
-  protected final String TEXT_218 = NL + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected ";
-  protected final String TEXT_219 = " createLabel() {";
-  protected final String TEXT_220 = NL + "\t\treturn new ";
-  protected final String TEXT_221 = "();";
-  protected final String TEXT_222 = NL + "\t\treturn ";
-  protected final String TEXT_223 = ";";
-  protected final String TEXT_224 = NL + "\t\treturn new ";
-  protected final String TEXT_225 = "();";
-  protected final String TEXT_226 = NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected ";
-  protected final String TEXT_227 = " createFigure() {" + NL + "\t\t";
-  protected final String TEXT_228 = " label = createLabel();";
-  protected final String TEXT_229 = NL + "\t\tdefaultText = label.getText();";
-  protected final String TEXT_230 = NL + "\t\tdefaultText = \"\";\t//$NON-NLS-1$";
-  protected final String TEXT_231 = NL + "\t\treturn label;" + NL + "\t}";
-  protected final String TEXT_232 = NL + NL + "\t/**";
-  protected final String TEXT_233 = NL + "\t * TODO: reimplement, since the figure used by this editpart is not a Label.";
-  protected final String TEXT_234 = NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic ";
-  protected final String TEXT_235 = " getLabel() {" + NL + "\t\treturn (";
-  protected final String TEXT_236 = ") getFigure();" + NL + "\t}" + NL;
-  protected final String TEXT_237 = NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic void ";
-  protected final String TEXT_238 = "(";
-  protected final String TEXT_239 = " figure) {" + NL + "\t\tunregisterVisuals();" + NL + "\t\tsetFigure(figure);";
-  protected final String TEXT_240 = NL + "\t\tdefaultText = figure.getText();";
-  protected final String TEXT_241 = NL + "\t\tdefaultText = \"\";\t//$NON-NLS-1$";
-  protected final String TEXT_242 = NL + "\t\tregisterVisuals();" + NL + "\t\trefreshVisuals();" + NL + "\t}" + NL;
-  protected final String TEXT_243 = NL;
-  protected final String TEXT_244 = NL;
-  protected final String TEXT_245 = NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate static class MapModeWorkaround {" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tpublic int DPtoLP(int dp) {" + NL + "\t\t\treturn dp;" + NL + "\t\t}" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tpublic static MapModeWorkaround INSTANCE = new MapModeWorkaround();" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate MapModeWorkaround getMapMode() {" + NL + "\t\treturn MapModeWorkaround.INSTANCE;" + NL + "\t}";
-  protected final String TEXT_246 = NL + "}";
+  protected final String TEXT_207 = NL + "\t\t\tupdatableParent.removeRefresher(";
+  protected final String TEXT_208 = ".eINSTANCE.get";
+  protected final String TEXT_209 = "(), labelRefresher);";
+  protected final String TEXT_210 = NL + "\t\t}" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate ";
+  protected final String TEXT_211 = ".Refresher labelRefresher = new ";
+  protected final String TEXT_212 = ".Refresher() {" + NL + "\t\tpublic void refresh() {" + NL + "\t\t\trefreshLabel();" + NL + "\t\t}" + NL + "\t};" + NL + "" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate ";
+  protected final String TEXT_213 = ".Refresher fontColorRefresher = new ";
+  protected final String TEXT_214 = ".Refresher() {" + NL + "\t\tpublic void refresh() {" + NL + "\t\t\trefreshFontColor();" + NL + "\t\t}" + NL + "\t};" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate ";
+  protected final String TEXT_215 = ".Refresher fontRefresher = new ";
+  protected final String TEXT_216 = ".Refresher() {" + NL + "\t\tpublic void refresh() {" + NL + "\t\t\trefreshFont();" + NL + "\t\t}" + NL + "\t};";
+  protected final String TEXT_217 = NL;
+  protected final String TEXT_218 = NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected ";
+  protected final String TEXT_219 = " createFigure() {" + NL + "\t\t// Parent should assign one using ";
+  protected final String TEXT_220 = " method" + NL + "\t\treturn null;" + NL + "\t}";
+  protected final String TEXT_221 = NL + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected ";
+  protected final String TEXT_222 = " createLabel() {";
+  protected final String TEXT_223 = NL + "\t\treturn new ";
+  protected final String TEXT_224 = "();";
+  protected final String TEXT_225 = NL + "\t\treturn ";
+  protected final String TEXT_226 = ";";
+  protected final String TEXT_227 = NL + "\t\treturn new ";
+  protected final String TEXT_228 = "();";
+  protected final String TEXT_229 = NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected ";
+  protected final String TEXT_230 = " createFigure() {" + NL + "\t\t";
+  protected final String TEXT_231 = " label = createLabel();";
+  protected final String TEXT_232 = NL + "\t\tdefaultText = label.getText();";
+  protected final String TEXT_233 = NL + "\t\tdefaultText = \"\";\t//$NON-NLS-1$";
+  protected final String TEXT_234 = NL + "\t\treturn label;" + NL + "\t}";
+  protected final String TEXT_235 = NL + NL + "\t/**";
+  protected final String TEXT_236 = NL + "\t * TODO: reimplement, since the figure used by this editpart is not a Label.";
+  protected final String TEXT_237 = NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic ";
+  protected final String TEXT_238 = " getLabel() {" + NL + "\t\treturn (";
+  protected final String TEXT_239 = ") getFigure();" + NL + "\t}" + NL;
+  protected final String TEXT_240 = NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic void ";
+  protected final String TEXT_241 = "(";
+  protected final String TEXT_242 = " figure) {" + NL + "\t\tunregisterVisuals();" + NL + "\t\tsetFigure(figure);";
+  protected final String TEXT_243 = NL + "\t\tdefaultText = figure.getText();";
+  protected final String TEXT_244 = NL + "\t\tdefaultText = \"\";\t//$NON-NLS-1$";
+  protected final String TEXT_245 = NL + "\t\tregisterVisuals();" + NL + "\t\trefreshVisuals();" + NL + "\t}" + NL;
+  protected final String TEXT_246 = NL;
   protected final String TEXT_247 = NL;
+  protected final String TEXT_248 = NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate static class MapModeWorkaround {" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tpublic int DPtoLP(int dp) {" + NL + "\t\t\treturn dp;" + NL + "\t\t}" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tpublic static MapModeWorkaround INSTANCE = new MapModeWorkaround();" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate MapModeWorkaround getMapMode() {" + NL + "\t\treturn MapModeWorkaround.INSTANCE;" + NL + "\t}";
+  protected final String TEXT_249 = NL + "}";
+  protected final String TEXT_250 = NL;
 
   public String generate(Object argument)
   {
@@ -400,6 +403,7 @@
 	final String primaryView = "getUpdatableParent().getDiagramNode()";
 	final String resolvedSemanticElement = "resolveSemanticElement()";
 	if (!isReadOnly) {
+		String editPatternCode = "EDIT_PATTERN";	//declared in labelText.javajetinc, used in directEditCommand.jetinc.
 
     stringBuffer.append(TEXT_33);
     stringBuffer.append(TEXT_34);
@@ -409,200 +413,204 @@
     stringBuffer.append(TEXT_36);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gef.requests.DirectEditRequest"));
     stringBuffer.append(TEXT_37);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.commands.Command"));
     stringBuffer.append(TEXT_38);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.requests.DirectEditRequest"));
     stringBuffer.append(TEXT_39);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.commands.UnexecutableCommand"));
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.commands.Command"));
     stringBuffer.append(TEXT_40);
-    stringBuffer.append(importManager.getImportedName("java.text.MessageFormat"));
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.requests.DirectEditRequest"));
     stringBuffer.append(TEXT_41);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gef.commands.UnexecutableCommand"));
     stringBuffer.append(TEXT_42);
-    stringBuffer.append(importManager.getImportedName("java.text.ParseException"));
+    stringBuffer.append(importManager.getImportedName("java.text.MessageFormat"));
     stringBuffer.append(TEXT_43);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.commands.UnexecutableCommand"));
+    stringBuffer.append(editPatternCode);
     stringBuffer.append(TEXT_44);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.TransactionalEditingDomain"));
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.commands.UnexecutableCommand"));
     stringBuffer.append(TEXT_45);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.util.TransactionUtil"));
+    stringBuffer.append(importManager.getImportedName("java.text.ParseException"));
     stringBuffer.append(TEXT_46);
-    stringBuffer.append(primaryView);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.commands.UnexecutableCommand"));
     stringBuffer.append(TEXT_47);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.TransactionalEditingDomain"));
+    stringBuffer.append(TEXT_48);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.util.TransactionUtil"));
+    stringBuffer.append(TEXT_49);
+    stringBuffer.append(primaryView);
+    stringBuffer.append(TEXT_50);
     
 if (labelModelFacet instanceof FeatureLabelModelFacet) {
 	GenFeature featureToSet = ((FeatureLabelModelFacet)labelModelFacet).getMetaFeature();
 	EStructuralFeature ecoreFeature = featureToSet.getEcoreFeature();
 
-    stringBuffer.append(TEXT_48);
+    stringBuffer.append(TEXT_51);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gef.commands.UnexecutableCommand"));
-    stringBuffer.append(TEXT_49);
+    stringBuffer.append(TEXT_52);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.command.Command"));
-    stringBuffer.append(TEXT_50);
+    stringBuffer.append(TEXT_53);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.lite.commands.WrappingCommand"));
-    stringBuffer.append(TEXT_51);
+    stringBuffer.append(TEXT_54);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.command.Command"));
-    stringBuffer.append(TEXT_52);
+    stringBuffer.append(TEXT_55);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.TransactionalEditingDomain"));
-    stringBuffer.append(TEXT_53);
+    stringBuffer.append(TEXT_56);
     stringBuffer.append(importManager.getImportedName(underlyingMetaClass.getQualifiedInterfaceName()));
-    stringBuffer.append(TEXT_54);
+    stringBuffer.append(TEXT_57);
     stringBuffer.append(resolvedSemanticElement);
-    stringBuffer.append(TEXT_55);
+    stringBuffer.append(TEXT_58);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EAttribute"));
-    stringBuffer.append(TEXT_56);
+    stringBuffer.append(TEXT_59);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EAttribute"));
-    stringBuffer.append(TEXT_57);
+    stringBuffer.append(TEXT_60);
     stringBuffer.append(importManager.getImportedName(featureToSet.getGenPackage().getQualifiedPackageInterfaceName()));
-    stringBuffer.append(TEXT_58);
+    stringBuffer.append(TEXT_61);
     stringBuffer.append(featureToSet.getFeatureAccessorName());
-    stringBuffer.append(TEXT_59);
+    stringBuffer.append(TEXT_62);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.lite.services.ParserUtil"));
-    stringBuffer.append(TEXT_60);
+    stringBuffer.append(TEXT_63);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.command.UnexecutableCommand"));
-    stringBuffer.append(TEXT_61);
+    stringBuffer.append(TEXT_64);
     
 	if (ecoreFeature.isMany()) {
 
-    stringBuffer.append(TEXT_62);
+    stringBuffer.append(TEXT_65);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.command.CompoundCommand"));
-    stringBuffer.append(TEXT_63);
+    stringBuffer.append(TEXT_66);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.command.CompoundCommand"));
-    stringBuffer.append(TEXT_64);
+    stringBuffer.append(TEXT_67);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.util.EList"));
-    stringBuffer.append(TEXT_65);
+    stringBuffer.append(TEXT_68);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.util.BasicEList"));
-    stringBuffer.append(TEXT_66);
+    stringBuffer.append(TEXT_69);
     stringBuffer.append(featureToSet.getAccessorName());
-    stringBuffer.append(TEXT_67);
+    stringBuffer.append(TEXT_70);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.edit.command.RemoveCommand"));
-    stringBuffer.append(TEXT_68);
+    stringBuffer.append(TEXT_71);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.edit.command.AddCommand"));
-    stringBuffer.append(TEXT_69);
+    stringBuffer.append(TEXT_72);
     
 	} else {
 
-    stringBuffer.append(TEXT_70);
+    stringBuffer.append(TEXT_73);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.edit.command.SetCommand"));
-    stringBuffer.append(TEXT_71);
+    stringBuffer.append(TEXT_74);
     
 	}
 
-    stringBuffer.append(TEXT_72);
+    stringBuffer.append(TEXT_75);
     
 } else if (labelModelFacet instanceof CompositeFeatureLabelModelFacet) {
 	CompositeFeatureLabelModelFacet compositeFeatureLabelModelFacet = (CompositeFeatureLabelModelFacet) labelModelFacet;
 	List metaFeatures = compositeFeatureLabelModelFacet.getMetaFeatures();
 
-    stringBuffer.append(TEXT_73);
+    stringBuffer.append(TEXT_76);
     stringBuffer.append(metaFeatures.size());
-    stringBuffer.append(TEXT_74);
+    stringBuffer.append(TEXT_77);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gef.commands.UnexecutableCommand"));
-    stringBuffer.append(TEXT_75);
+    stringBuffer.append(TEXT_78);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.command.Command"));
-    stringBuffer.append(TEXT_76);
+    stringBuffer.append(TEXT_79);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.lite.commands.WrappingCommand"));
-    stringBuffer.append(TEXT_77);
+    stringBuffer.append(TEXT_80);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.command.Command"));
-    stringBuffer.append(TEXT_78);
+    stringBuffer.append(TEXT_81);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.TransactionalEditingDomain"));
-    stringBuffer.append(TEXT_79);
+    stringBuffer.append(TEXT_82);
     stringBuffer.append(importManager.getImportedName(underlyingMetaClass.getQualifiedInterfaceName()));
-    stringBuffer.append(TEXT_80);
+    stringBuffer.append(TEXT_83);
     stringBuffer.append(resolvedSemanticElement);
-    stringBuffer.append(TEXT_81);
+    stringBuffer.append(TEXT_84);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.command.CompoundCommand"));
-    stringBuffer.append(TEXT_82);
+    stringBuffer.append(TEXT_85);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.command.CompoundCommand"));
-    stringBuffer.append(TEXT_83);
+    stringBuffer.append(TEXT_86);
     
 	boolean haveDeclaredValues = false;
 	for(int i = 0; i < metaFeatures.size(); i++) {
 		GenFeature nextFeatureToSet = (GenFeature) metaFeatures.get(i);
 		EStructuralFeature nextEcoreFeature = nextFeatureToSet.getEcoreFeature();
 
-    stringBuffer.append(TEXT_84);
+    stringBuffer.append(TEXT_87);
     if (i == 0) {
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EAttribute"));
-    stringBuffer.append(TEXT_85);
+    stringBuffer.append(TEXT_88);
     }
-    stringBuffer.append(TEXT_86);
+    stringBuffer.append(TEXT_89);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EAttribute"));
-    stringBuffer.append(TEXT_87);
+    stringBuffer.append(TEXT_90);
     stringBuffer.append(importManager.getImportedName(nextFeatureToSet.getGenPackage().getQualifiedPackageInterfaceName()));
-    stringBuffer.append(TEXT_88);
+    stringBuffer.append(TEXT_91);
     stringBuffer.append(nextFeatureToSet.getFeatureAccessorName());
-    stringBuffer.append(TEXT_89);
+    stringBuffer.append(TEXT_92);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.lite.services.ParserUtil"));
-    stringBuffer.append(TEXT_90);
+    stringBuffer.append(TEXT_93);
     stringBuffer.append(i);
-    stringBuffer.append(TEXT_91);
+    stringBuffer.append(TEXT_94);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.command.UnexecutableCommand"));
-    stringBuffer.append(TEXT_92);
+    stringBuffer.append(TEXT_95);
     
 		if (nextEcoreFeature.isMany()) {
 
-    stringBuffer.append(TEXT_93);
+    stringBuffer.append(TEXT_96);
     if (!haveDeclaredValues) { haveDeclaredValues = true;
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.util.EList"));
-    stringBuffer.append(TEXT_94);
+    stringBuffer.append(TEXT_97);
     }
-    stringBuffer.append(TEXT_95);
+    stringBuffer.append(TEXT_98);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.util.BasicEList"));
-    stringBuffer.append(TEXT_96);
+    stringBuffer.append(TEXT_99);
     stringBuffer.append(nextFeatureToSet.getAccessorName());
-    stringBuffer.append(TEXT_97);
+    stringBuffer.append(TEXT_100);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.edit.command.RemoveCommand"));
-    stringBuffer.append(TEXT_98);
+    stringBuffer.append(TEXT_101);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.edit.command.AddCommand"));
-    stringBuffer.append(TEXT_99);
+    stringBuffer.append(TEXT_102);
     
 		} else {
 
-    stringBuffer.append(TEXT_100);
+    stringBuffer.append(TEXT_103);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.edit.command.SetCommand"));
-    stringBuffer.append(TEXT_101);
+    stringBuffer.append(TEXT_104);
     
 		}
 
     
 	}
 
-    stringBuffer.append(TEXT_102);
+    stringBuffer.append(TEXT_105);
     
 }
 
-    stringBuffer.append(TEXT_103);
+    stringBuffer.append(TEXT_106);
     
 	}
 
-    stringBuffer.append(TEXT_104);
+    stringBuffer.append(TEXT_107);
     
 	if (!isReadOnly) {
 
-    stringBuffer.append(TEXT_105);
-    stringBuffer.append(TEXT_106);
+    stringBuffer.append(TEXT_108);
+    stringBuffer.append(TEXT_109);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gef.Request"));
-    stringBuffer.append(TEXT_107);
+    stringBuffer.append(TEXT_110);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gef.RequestConstants"));
-    stringBuffer.append(TEXT_108);
+    stringBuffer.append(TEXT_111);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gef.tools.DirectEditManager"));
-    stringBuffer.append(TEXT_109);
+    stringBuffer.append(TEXT_112);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gef.tools.DirectEditManager"));
-    stringBuffer.append(TEXT_110);
+    stringBuffer.append(TEXT_113);
     stringBuffer.append(importManager.getImportedName("org.eclipse.jface.viewers.TextCellEditor"));
-    stringBuffer.append(TEXT_111);
+    stringBuffer.append(TEXT_114);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gef.tools.CellEditorLocator"));
-    stringBuffer.append(TEXT_112);
+    stringBuffer.append(TEXT_115);
     stringBuffer.append(importManager.getImportedName("org.eclipse.jface.viewers.CellEditor"));
-    stringBuffer.append(TEXT_113);
+    stringBuffer.append(TEXT_116);
     stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.geometry.Rectangle"));
-    stringBuffer.append(TEXT_114);
+    stringBuffer.append(TEXT_117);
     
 	}
 
-    stringBuffer.append(TEXT_115);
-    stringBuffer.append(TEXT_116);
+    stringBuffer.append(TEXT_118);
+    stringBuffer.append(TEXT_119);
     
 /*genFeature.getObjectType() throws NPE on primitive types. This is a workaround. */
 HashMap primitiveTypeToWrapperClassName = new HashMap();
@@ -646,91 +654,91 @@
 	}
 }
 
-    stringBuffer.append(TEXT_117);
+    stringBuffer.append(TEXT_120);
     stringBuffer.append(viewPattern);
-    stringBuffer.append(TEXT_118);
+    stringBuffer.append(TEXT_121);
     stringBuffer.append(editPattern);
-    stringBuffer.append(TEXT_119);
+    stringBuffer.append(TEXT_122);
     stringBuffer.append(importManager.getImportedName(underlyingMetaClass.getQualifiedInterfaceName()));
-    stringBuffer.append(TEXT_120);
+    stringBuffer.append(TEXT_123);
     stringBuffer.append(resolvedSemanticElement);
-    stringBuffer.append(TEXT_121);
+    stringBuffer.append(TEXT_124);
     stringBuffer.append(importManager.getImportedName(underlyingMetaClass.getQualifiedInterfaceName()));
-    stringBuffer.append(TEXT_122);
+    stringBuffer.append(TEXT_125);
     stringBuffer.append(resolvedSemanticElement);
-    stringBuffer.append(TEXT_123);
+    stringBuffer.append(TEXT_126);
     stringBuffer.append(importManager.getImportedName(underlyingMetaClass.getQualifiedInterfaceName()));
-    stringBuffer.append(TEXT_124);
+    stringBuffer.append(TEXT_127);
     
 if (labelModelFacet instanceof FeatureLabelModelFacet) {
 	FeatureLabelModelFacet featureLabelModelFacet = (FeatureLabelModelFacet) labelModelFacet;
 	GenFeature feature = featureLabelModelFacet.getMetaFeature();
 	if (!feature.isPrimitiveType()) {
 
-    stringBuffer.append(TEXT_125);
+    stringBuffer.append(TEXT_128);
     myFeatureGetAccessorHelper.appendFeatureValueGetter("element", feature, underlyingMetaClass, false);
-    stringBuffer.append(TEXT_126);
+    stringBuffer.append(TEXT_129);
     
 	}
 
-    stringBuffer.append(TEXT_127);
+    stringBuffer.append(TEXT_130);
     stringBuffer.append(importManager.getImportedName("java.text.MessageFormat"));
-    stringBuffer.append(TEXT_128);
+    stringBuffer.append(TEXT_131);
     
 		if (feature.isPrimitiveType()) {
 
-    stringBuffer.append(TEXT_129);
+    stringBuffer.append(TEXT_132);
     stringBuffer.append(primitiveTypeToWrapperClassName.get(feature.getTypeGenClassifier().getEcoreClassifier().getInstanceClass()));
-    stringBuffer.append(TEXT_130);
+    stringBuffer.append(TEXT_133);
     
 		}
 		myFeatureGetAccessorHelper.appendFeatureValueGetter("element", feature, underlyingMetaClass, false);
 		if (feature.isPrimitiveType()) {
 
-    stringBuffer.append(TEXT_131);
+    stringBuffer.append(TEXT_134);
     
 		}
 
-    stringBuffer.append(TEXT_132);
+    stringBuffer.append(TEXT_135);
     
 } else if (labelModelFacet instanceof CompositeFeatureLabelModelFacet) {
 	CompositeFeatureLabelModelFacet compositeFeatureLabelModelFacet = (CompositeFeatureLabelModelFacet) labelModelFacet;
 
-    stringBuffer.append(TEXT_133);
+    stringBuffer.append(TEXT_136);
     stringBuffer.append(importManager.getImportedName("java.text.MessageFormat"));
-    stringBuffer.append(TEXT_134);
+    stringBuffer.append(TEXT_137);
     
 	for(Iterator it = compositeFeatureLabelModelFacet.getMetaFeatures().iterator(); it.hasNext(); ) {
 		GenFeature next = (GenFeature) it.next();
 		if (next.isPrimitiveType()) {
 
-    stringBuffer.append(TEXT_135);
+    stringBuffer.append(TEXT_138);
     stringBuffer.append(primitiveTypeToWrapperClassName.get(next.getTypeGenClassifier().getEcoreClassifier().getInstanceClass()));
-    stringBuffer.append(TEXT_136);
+    stringBuffer.append(TEXT_139);
     
 		}
 		myFeatureGetAccessorHelper.appendFeatureValueGetter("element", next, underlyingMetaClass, false);
 		if (next.isPrimitiveType()) {
 
-    stringBuffer.append(TEXT_137);
+    stringBuffer.append(TEXT_140);
     
 		}
 		if (it.hasNext()) {
-    stringBuffer.append(TEXT_138);
+    stringBuffer.append(TEXT_141);
     }
     
 	}
 
-    stringBuffer.append(TEXT_139);
+    stringBuffer.append(TEXT_142);
     
 } else {
 
-    stringBuffer.append(TEXT_140);
+    stringBuffer.append(TEXT_143);
     
 }
 
-    stringBuffer.append(TEXT_141);
-    stringBuffer.append(TEXT_142);
+    stringBuffer.append(TEXT_144);
+    stringBuffer.append(TEXT_145);
     
 boolean isFixedFontSetInFigure;
 {
@@ -738,172 +746,166 @@
 	isFixedFontSetInFigure = styleAttributes != null && styleAttributes.isFixedFont();
 }
 
-    stringBuffer.append(TEXT_143);
+    stringBuffer.append(TEXT_146);
     
 if (!isFixedFontSetInFigure) {
 
-    stringBuffer.append(TEXT_144);
+    stringBuffer.append(TEXT_147);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.FontStyle"));
-    stringBuffer.append(TEXT_145);
+    stringBuffer.append(TEXT_148);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.FontStyle"));
-    stringBuffer.append(TEXT_146);
+    stringBuffer.append(TEXT_149);
     stringBuffer.append(primaryView);
-    stringBuffer.append(TEXT_147);
+    stringBuffer.append(TEXT_150);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.NotationPackage"));
-    stringBuffer.append(TEXT_148);
+    stringBuffer.append(TEXT_151);
     stringBuffer.append(importManager.getImportedName("org.eclipse.swt.graphics.Font"));
-    stringBuffer.append(TEXT_149);
+    stringBuffer.append(TEXT_152);
     stringBuffer.append(importManager.getImportedName("org.eclipse.swt.SWT"));
-    stringBuffer.append(TEXT_150);
+    stringBuffer.append(TEXT_153);
     stringBuffer.append(importManager.getImportedName("org.eclipse.swt.SWT"));
-    stringBuffer.append(TEXT_151);
+    stringBuffer.append(TEXT_154);
     stringBuffer.append(importManager.getImportedName("org.eclipse.swt.SWT"));
-    stringBuffer.append(TEXT_152);
+    stringBuffer.append(TEXT_155);
     stringBuffer.append(importManager.getImportedName("org.eclipse.swt.graphics.Font"));
-    stringBuffer.append(TEXT_153);
+    stringBuffer.append(TEXT_156);
     stringBuffer.append(importManager.getImportedName("org.eclipse.swt.graphics.FontData"));
-    stringBuffer.append(TEXT_154);
+    stringBuffer.append(TEXT_157);
     stringBuffer.append(importManager.getImportedName("org.eclipse.swt.graphics.Font"));
-    stringBuffer.append(TEXT_155);
+    stringBuffer.append(TEXT_158);
     
 }
 
-    stringBuffer.append(TEXT_156);
+    stringBuffer.append(TEXT_159);
     
 if (!isFixedFontSetInFigure) {
 
-    stringBuffer.append(TEXT_157);
+    stringBuffer.append(TEXT_160);
     stringBuffer.append(importManager.getImportedName("org.eclipse.swt.graphics.Font"));
-    stringBuffer.append(TEXT_158);
+    stringBuffer.append(TEXT_161);
     
 }
 
-    stringBuffer.append(TEXT_159);
-    stringBuffer.append(TEXT_160);
-    stringBuffer.append(TEXT_161);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.FontStyle"));
     stringBuffer.append(TEXT_162);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.FontStyle"));
     stringBuffer.append(TEXT_163);
-    stringBuffer.append(primaryView);
     stringBuffer.append(TEXT_164);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.NotationPackage"));
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.FontStyle"));
     stringBuffer.append(TEXT_165);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.swt.graphics.Color"));
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.FontStyle"));
     stringBuffer.append(TEXT_166);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.swt.graphics.Color"));
+    stringBuffer.append(primaryView);
     stringBuffer.append(TEXT_167);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.swt.graphics.Color"));
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.NotationPackage"));
     stringBuffer.append(TEXT_168);
     stringBuffer.append(importManager.getImportedName("org.eclipse.swt.graphics.Color"));
     stringBuffer.append(TEXT_169);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.swt.graphics.Image"));
+    stringBuffer.append(importManager.getImportedName("org.eclipse.swt.graphics.Color"));
     stringBuffer.append(TEXT_170);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.swt.graphics.Color"));
+    stringBuffer.append(TEXT_171);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.swt.graphics.Color"));
+    stringBuffer.append(TEXT_172);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.swt.graphics.Image"));
+    stringBuffer.append(TEXT_173);
     
 if (genLabel.isElementIcon()) {
 
-    stringBuffer.append(TEXT_171);
+    stringBuffer.append(TEXT_174);
     stringBuffer.append(importManager.getImportedName(genHost.getDomainMetaClass().getQualifiedInterfaceName()));
-    stringBuffer.append(TEXT_172);
+    stringBuffer.append(TEXT_175);
     stringBuffer.append(importManager.getImportedName("org.eclipse.jface.resource.ImageDescriptor"));
-    stringBuffer.append(TEXT_173);
+    stringBuffer.append(TEXT_176);
     stringBuffer.append(importManager.getImportedName(genDiagram.getEditorGen().getPlugin().getActivatorQualifiedClassName()));
-    stringBuffer.append(TEXT_174);
+    stringBuffer.append(TEXT_177);
     
 }
 
-    stringBuffer.append(TEXT_175);
-    stringBuffer.append(importManager.getImportedName(genHost.getDomainMetaClass().getQualifiedInterfaceName()));
-    stringBuffer.append(TEXT_176);
-    stringBuffer.append(importManager.getImportedName(genHost.getDomainMetaClass().getQualifiedInterfaceName()));
-    stringBuffer.append(TEXT_177);
-    stringBuffer.append(importManager.getImportedName(genHost.getDomainMetaClass().getQualifiedInterfaceName()));
     stringBuffer.append(TEXT_178);
-    stringBuffer.append(importManager.getImportedName(genHost.getEditPartQualifiedClassName()));
+    stringBuffer.append(importManager.getImportedName(genHost.getDomainMetaClass().getQualifiedInterfaceName()));
     stringBuffer.append(TEXT_179);
-    stringBuffer.append(importManager.getImportedName(genHost.getEditPartQualifiedClassName()));
+    stringBuffer.append(importManager.getImportedName(genHost.getDomainMetaClass().getQualifiedInterfaceName()));
     stringBuffer.append(TEXT_180);
-    stringBuffer.append(importManager.getImportedName(genHost.getEditPartQualifiedClassName()));
+    stringBuffer.append(importManager.getImportedName(genHost.getDomainMetaClass().getQualifiedInterfaceName()));
     stringBuffer.append(TEXT_181);
     stringBuffer.append(importManager.getImportedName(genHost.getEditPartQualifiedClassName()));
     stringBuffer.append(TEXT_182);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.NotationPackage"));
+    stringBuffer.append(importManager.getImportedName(genHost.getEditPartQualifiedClassName()));
     stringBuffer.append(TEXT_183);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.NotationPackage"));
+    stringBuffer.append(importManager.getImportedName(genHost.getEditPartQualifiedClassName()));
     stringBuffer.append(TEXT_184);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.NotationPackage"));
+    stringBuffer.append(importManager.getImportedName(genHost.getEditPartQualifiedClassName()));
     stringBuffer.append(TEXT_185);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.NotationPackage"));
     stringBuffer.append(TEXT_186);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.NotationPackage"));
     stringBuffer.append(TEXT_187);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.NotationPackage"));
+    stringBuffer.append(TEXT_188);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.NotationPackage"));
+    stringBuffer.append(TEXT_189);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.NotationPackage"));
+    stringBuffer.append(TEXT_190);
     
 if (labelModelFacet instanceof FeatureLabelModelFacet) {
 	GenFeature feature = ((FeatureLabelModelFacet)labelModelFacet).getMetaFeature();
 
-    stringBuffer.append(TEXT_188);
+    stringBuffer.append(TEXT_191);
     stringBuffer.append(importManager.getImportedName(feature.getGenPackage().getQualifiedPackageInterfaceName()));
-    stringBuffer.append(TEXT_189);
+    stringBuffer.append(TEXT_192);
     stringBuffer.append(feature.getFeatureAccessorName());
-    stringBuffer.append(TEXT_190);
+    stringBuffer.append(TEXT_193);
     
 } else if (labelModelFacet instanceof CompositeFeatureLabelModelFacet) {
 	CompositeFeatureLabelModelFacet compositeFeatureLabelModelFacet = (CompositeFeatureLabelModelFacet) labelModelFacet;
 	for(Iterator it = compositeFeatureLabelModelFacet.getMetaFeatures().iterator(); it.hasNext(); ) {
 		GenFeature next = (GenFeature) it.next();
 
-    stringBuffer.append(TEXT_191);
+    stringBuffer.append(TEXT_194);
     stringBuffer.append(importManager.getImportedName(next.getGenPackage().getQualifiedPackageInterfaceName()));
-    stringBuffer.append(TEXT_192);
+    stringBuffer.append(TEXT_195);
     stringBuffer.append(next.getFeatureAccessorName());
-    stringBuffer.append(TEXT_193);
+    stringBuffer.append(TEXT_196);
     
 	}
 }
 
-    stringBuffer.append(TEXT_194);
-    stringBuffer.append(importManager.getImportedName(genHost.getEditPartQualifiedClassName()));
-    stringBuffer.append(TEXT_195);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.NotationPackage"));
-    stringBuffer.append(TEXT_196);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.NotationPackage"));
     stringBuffer.append(TEXT_197);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.NotationPackage"));
+    stringBuffer.append(importManager.getImportedName(genHost.getEditPartQualifiedClassName()));
     stringBuffer.append(TEXT_198);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.NotationPackage"));
     stringBuffer.append(TEXT_199);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.NotationPackage"));
     stringBuffer.append(TEXT_200);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.NotationPackage"));
+    stringBuffer.append(TEXT_201);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.NotationPackage"));
+    stringBuffer.append(TEXT_202);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.NotationPackage"));
+    stringBuffer.append(TEXT_203);
     
 if (labelModelFacet instanceof FeatureLabelModelFacet) {
 	GenFeature feature = ((FeatureLabelModelFacet)labelModelFacet).getMetaFeature();
 
-    stringBuffer.append(TEXT_201);
+    stringBuffer.append(TEXT_204);
     stringBuffer.append(importManager.getImportedName(feature.getGenPackage().getQualifiedPackageInterfaceName()));
-    stringBuffer.append(TEXT_202);
+    stringBuffer.append(TEXT_205);
     stringBuffer.append(feature.getFeatureAccessorName());
-    stringBuffer.append(TEXT_203);
+    stringBuffer.append(TEXT_206);
     
 } else if (labelModelFacet instanceof CompositeFeatureLabelModelFacet) {
 	CompositeFeatureLabelModelFacet compositeFeatureLabelModelFacet = (CompositeFeatureLabelModelFacet) labelModelFacet;
 	for(Iterator it = compositeFeatureLabelModelFacet.getMetaFeatures().iterator(); it.hasNext(); ) {
 		GenFeature next = (GenFeature) it.next();
 
-    stringBuffer.append(TEXT_204);
+    stringBuffer.append(TEXT_207);
     stringBuffer.append(importManager.getImportedName(next.getGenPackage().getQualifiedPackageInterfaceName()));
-    stringBuffer.append(TEXT_205);
+    stringBuffer.append(TEXT_208);
     stringBuffer.append(next.getFeatureAccessorName());
-    stringBuffer.append(TEXT_206);
+    stringBuffer.append(TEXT_209);
     
 	}
 }
 
-    stringBuffer.append(TEXT_207);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.lite.edit.parts.update.IUpdatableEditPart"));
-    stringBuffer.append(TEXT_208);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.lite.edit.parts.update.IUpdatableEditPart"));
-    stringBuffer.append(TEXT_209);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.lite.edit.parts.update.IUpdatableEditPart"));
     stringBuffer.append(TEXT_210);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.lite.edit.parts.update.IUpdatableEditPart"));
     stringBuffer.append(TEXT_211);
@@ -911,10 +913,16 @@
     stringBuffer.append(TEXT_212);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.lite.edit.parts.update.IUpdatableEditPart"));
     stringBuffer.append(TEXT_213);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.lite.edit.parts.update.IUpdatableEditPart"));
+    stringBuffer.append(TEXT_214);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.lite.edit.parts.update.IUpdatableEditPart"));
+    stringBuffer.append(TEXT_215);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.lite.edit.parts.update.IUpdatableEditPart"));
+    stringBuffer.append(TEXT_216);
     
 final Viewmap viewmap = genLabel.getViewmap();
 
-    stringBuffer.append(TEXT_214);
+    stringBuffer.append(TEXT_217);
     
 final String figureQualifiedClassName;
 if (viewmap instanceof ParentAssignedViewmap) {
@@ -943,64 +951,64 @@
 if (viewmap instanceof ParentAssignedViewmap) {
 	final ParentAssignedViewmap parentAssignedViewmap = (ParentAssignedViewmap) viewmap;
 
-    stringBuffer.append(TEXT_215);
+    stringBuffer.append(TEXT_218);
     stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.IFigure"));
-    stringBuffer.append(TEXT_216);
+    stringBuffer.append(TEXT_219);
     stringBuffer.append((parentAssignedViewmap.getSetterName() == null ? "setLabel" : parentAssignedViewmap.getSetterName()));
-    stringBuffer.append(TEXT_217);
+    stringBuffer.append(TEXT_220);
     } else { 
-    stringBuffer.append(TEXT_218);
+    stringBuffer.append(TEXT_221);
     stringBuffer.append(figureImportedName);
-    stringBuffer.append(TEXT_219);
+    stringBuffer.append(TEXT_222);
     
 if (viewmap instanceof FigureViewmap) {
 
-    stringBuffer.append(TEXT_220);
+    stringBuffer.append(TEXT_223);
     stringBuffer.append(figureImportedName);
-    stringBuffer.append(TEXT_221);
+    stringBuffer.append(TEXT_224);
     } // instanceof FigureViewmap
  else if (viewmap instanceof SnippetViewmap) {
-    stringBuffer.append(TEXT_222);
+    stringBuffer.append(TEXT_225);
     stringBuffer.append(((SnippetViewmap) viewmap).getBody());
-    stringBuffer.append(TEXT_223);
+    stringBuffer.append(TEXT_226);
     } // instanceof SnippetViewmap; FIXME : obtain figure class name to generate getter
  else if (viewmap instanceof InnerClassViewmap) {
 
-    stringBuffer.append(TEXT_224);
+    stringBuffer.append(TEXT_227);
     stringBuffer.append(figureImportedName);
-    stringBuffer.append(TEXT_225);
+    stringBuffer.append(TEXT_228);
     }
-    stringBuffer.append(TEXT_226);
+    stringBuffer.append(TEXT_229);
     stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.IFigure"));
-    stringBuffer.append(TEXT_227);
+    stringBuffer.append(TEXT_230);
     stringBuffer.append(figureImportedName);
-    stringBuffer.append(TEXT_228);
+    stringBuffer.append(TEXT_231);
     
 if ("org.eclipse.draw2d.Label".equals(figureQualifiedClassName) || viewmap instanceof InnerClassViewmap) {
 
-    stringBuffer.append(TEXT_229);
+    stringBuffer.append(TEXT_232);
     
 } else {
 
-    stringBuffer.append(TEXT_230);
+    stringBuffer.append(TEXT_233);
     
 }
 
-    stringBuffer.append(TEXT_231);
+    stringBuffer.append(TEXT_234);
     }	/*not parent-assigned*/
-    stringBuffer.append(TEXT_232);
+    stringBuffer.append(TEXT_235);
     
 if (!"org.eclipse.draw2d.Label".equals(figureQualifiedClassName) && viewmap instanceof InnerClassViewmap==false) {
 
-    stringBuffer.append(TEXT_233);
+    stringBuffer.append(TEXT_236);
     
 }
 
-    stringBuffer.append(TEXT_234);
+    stringBuffer.append(TEXT_237);
     stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.Label"));
-    stringBuffer.append(TEXT_235);
+    stringBuffer.append(TEXT_238);
     stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.Label"));
-    stringBuffer.append(TEXT_236);
+    stringBuffer.append(TEXT_239);
     
 String labelSetterName = "setLabel"; // same assumption in NodeEditPart
 String labelFigureClassName = "org.eclipse.draw2d.IFigure";
@@ -1014,43 +1022,43 @@
 	}
 } // FIXME perhaps, there's no sense to have setLabel for any other viewmap than ParentAssigned?
 
-    stringBuffer.append(TEXT_237);
+    stringBuffer.append(TEXT_240);
     stringBuffer.append(labelSetterName);
-    stringBuffer.append(TEXT_238);
+    stringBuffer.append(TEXT_241);
     stringBuffer.append(importManager.getImportedName(labelFigureClassName));
-    stringBuffer.append(TEXT_239);
+    stringBuffer.append(TEXT_242);
     
 if ("org.eclipse.draw2d.Label".equals(labelFigureClassName)) {
 
-    stringBuffer.append(TEXT_240);
+    stringBuffer.append(TEXT_243);
     
 } else {
 
-    stringBuffer.append(TEXT_241);
+    stringBuffer.append(TEXT_244);
     
 }
 
-    stringBuffer.append(TEXT_242);
+    stringBuffer.append(TEXT_245);
     
 if (viewmap instanceof InnerClassViewmap) {
 	String classBody = ((InnerClassViewmap) viewmap).getClassBody();
 
-    stringBuffer.append(TEXT_243);
+    stringBuffer.append(TEXT_246);
     stringBuffer.append(classBody);
-    stringBuffer.append(TEXT_244);
+    stringBuffer.append(TEXT_247);
     
 if (classBody.indexOf("DPtoLP") != -1) {
 
-    stringBuffer.append(TEXT_245);
+    stringBuffer.append(TEXT_248);
     
 }
 
     
 }
 
-    stringBuffer.append(TEXT_246);
+    stringBuffer.append(TEXT_249);
     importManager.emitSortedImports();
-    stringBuffer.append(TEXT_247);
+    stringBuffer.append(TEXT_250);
     return stringBuffer.toString();
   }
 }
Index: src-templates/org/eclipse/gmf/codegen/templates/lite/parts/NodeEditPartGenerator.java
===================================================================
RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.codegen.lite/src-templates/org/eclipse/gmf/codegen/templates/lite/parts/NodeEditPartGenerator.java,v
retrieving revision 1.21
diff -u -r1.21 NodeEditPartGenerator.java
--- src-templates/org/eclipse/gmf/codegen/templates/lite/parts/NodeEditPartGenerator.java	6 Sep 2006 20:09:23 -0000	1.21
+++ src-templates/org/eclipse/gmf/codegen/templates/lite/parts/NodeEditPartGenerator.java	11 Sep 2006 10:18:30 -0000
@@ -257,1112 +257,1292 @@
   protected final String TEXT_236 = ".getEditingDomain(getDiagramNode().getDiagram().getElement()), result);" + NL + "\t\t\t\t}";
   protected final String TEXT_237 = NL + "\t\t\t\treturn ";
   protected final String TEXT_238 = ".INSTANCE;" + NL + "\t\t\t}" + NL + "\t\t});";
-  protected final String TEXT_239 = NL + "\t\tinstallNotationModelRefresher();";
-  protected final String TEXT_240 = NL + "\t\tinstallLinkNotationModelRefresher();";
-  protected final String TEXT_241 = NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected ";
-  protected final String TEXT_242 = " createFigure() {" + NL + "\t\t";
-  protected final String TEXT_243 = " invisibleRectangle = new ";
-  protected final String TEXT_244 = "();" + NL + "\t\tinvisibleRectangle.setLayoutManager(new ";
-  protected final String TEXT_245 = "());" + NL + "\t\t";
-  protected final String TEXT_246 = " shape = createNodeShape();" + NL + "\t\tinvisibleRectangle.add(shape);" + NL + "\t\tcontentPane = setupContentPane(shape);";
-  protected final String TEXT_247 = NL + "\t\tchildNodesPane = createChildNodesPane();" + NL + "\t\tshape.add(childNodesPane);";
-  protected final String TEXT_248 = NL + NL + "\t\t";
-  protected final String TEXT_249 = " decorationShape = createDecorationPane();" + NL + "\t\tif (decorationShape != null) {" + NL + "\t\t\tinvisibleRectangle.add(decorationShape);" + NL + "\t\t}" + NL + "" + NL + "\t\treturn invisibleRectangle;" + NL + "\t}" + NL;
-  protected final String TEXT_250 = NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected ";
-  protected final String TEXT_251 = " createChildNodesPane() {" + NL + "\t\t";
-  protected final String TEXT_252 = " result = new ";
-  protected final String TEXT_253 = "();" + NL + "\t\tsetupContentPane(result);" + NL + "\t\treturn result;" + NL + "\t}";
-  protected final String TEXT_254 = NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected ";
-  protected final String TEXT_255 = " createNodeShape() {";
-  protected final String TEXT_256 = NL + "\t\tprimaryShape = new ";
-  protected final String TEXT_257 = "()";
-  protected final String TEXT_258 = " {" + NL + "\t\t\tprotected boolean useLocalCoordinates() {" + NL + "\t\t\t\treturn true;" + NL + "\t\t\t}" + NL + "\t\t}";
-  protected final String TEXT_259 = ";";
-  protected final String TEXT_260 = NL + "\t\tprimaryShape = ";
-  protected final String TEXT_261 = ";";
-  protected final String TEXT_262 = NL + "\t\t";
-  protected final String TEXT_263 = " figure = new ";
-  protected final String TEXT_264 = "();";
-  protected final String TEXT_265 = NL + " \t\tfigure.setUseLocalCoordinates(true);";
-  protected final String TEXT_266 = NL + " \t\tprimaryShape = figure;";
-  protected final String TEXT_267 = NL + "\t\treturn primaryShape;" + NL + "\t}";
-  protected final String TEXT_268 = NL + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic ";
-  protected final String TEXT_269 = " getPrimaryShape() {" + NL + "\t\treturn (";
-  protected final String TEXT_270 = ") primaryShape;" + NL + "\t}";
-  protected final String TEXT_271 = NL + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate ";
-  protected final String TEXT_272 = " createDecorationPane() {" + NL + "\t\t";
-  protected final String TEXT_273 = " view = (";
-  protected final String TEXT_274 = ") getModel();" + NL + "\t\t";
-  protected final String TEXT_275 = " annotation = view.getEAnnotation(\"Shortcut\"); //$NON-NLS-1$" + NL + "\t\tif (annotation == null) {" + NL + "\t\t\treturn null;" + NL + "\t\t}" + NL + "\t\t" + NL + "\t\t";
-  protected final String TEXT_276 = " decorationPane = new ";
-  protected final String TEXT_277 = "();" + NL + "\t\tdecorationPane.setLayoutManager(new ";
-  protected final String TEXT_278 = "());" + NL + "" + NL + "\t\t";
-  protected final String TEXT_279 = " imageFigure = new ";
-  protected final String TEXT_280 = "(";
-  protected final String TEXT_281 = ".getInstance().getBundledImage(\"icons/shortcut.gif\"), ";
-  protected final String TEXT_282 = ".EAST);" + NL + "\t\tdecorationPane.add(imageFigure, ";
-  protected final String TEXT_283 = ".BOTTOM);" + NL + " \t\treturn decorationPane;" + 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 ";
-  protected final String TEXT_284 = " setupContentPane(";
-  protected final String TEXT_285 = " nodeShape) {" + NL + "\t\tif (nodeShape.getLayoutManager() == null) {";
-  protected final String TEXT_286 = NL + "\t\t\t";
-  protected final String TEXT_287 = " layout = new ";
-  protected final String TEXT_288 = "();" + NL + "\t\t\tlayout.setSpacing(5);" + NL + "\t\t\tnodeShape.setLayoutManager(layout);";
-  protected final String TEXT_289 = NL + "\t\tnodeShape.setLayoutManager(new ";
-  protected final String TEXT_290 = "() {" + NL + "" + NL + "\t\t\tpublic Object getConstraint(";
-  protected final String TEXT_291 = " figure) {" + NL + "\t\t\t\tObject result = constraints.get(figure);" + NL + "\t\t\t\tif (result == null) {" + NL + "\t\t\t\t\tresult = new ";
-  protected final String TEXT_292 = "(0, 0, -1, -1);" + NL + "\t\t\t\t}" + NL + "\t\t\t\treturn result;" + NL + "\t\t\t}" + NL + "\t\t});";
-  protected final String TEXT_293 = NL + "\t\t}" + NL + "\t\treturn nodeShape; // use nodeShape itself as contentPane" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic ";
-  protected final String TEXT_294 = " getContentPane() {" + NL + "\t\tif (contentPane == null) {" + NL + "\t\t\treturn super.getContentPane();" + NL + "\t\t}" + NL + "\t\treturn contentPane;" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic ";
-  protected final String TEXT_295 = " getDiagramNode() {" + NL + "\t\treturn (";
-  protected final String TEXT_296 = ") getModel();" + NL + "\t}" + NL;
-  protected final String TEXT_297 = NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected boolean addFixedChild(";
-  protected final String TEXT_298 = " childEditPart) {";
-  protected final String TEXT_299 = NL + "\t\tif (childEditPart instanceof ";
-  protected final String TEXT_300 = ") {" + NL + "\t\t\t((";
-  protected final String TEXT_301 = ") childEditPart).";
-  protected final String TEXT_302 = "(getPrimaryShape().";
-  protected final String TEXT_303 = "());" + NL + "\t\t\treturn true;" + NL + "\t\t}";
-  protected final String TEXT_304 = NL + "\t\tif (childEditPart instanceof ";
-  protected final String TEXT_305 = ") {" + NL + "\t\t\t";
-  protected final String TEXT_306 = " pane = getPrimaryShape().";
-  protected final String TEXT_307 = "();" + NL + "\t\t\tsetupContentPane(pane); // FIXME each comparment should handle his content pane in his own way " + NL + "\t\t\tpane.add(((";
-  protected final String TEXT_308 = ")childEditPart).getFigure());" + NL + "\t\t\treturn true;" + NL + "\t\t}\t";
-  protected final String TEXT_309 = NL + "\t\treturn false;" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected boolean removeFixedChild(EditPart childEditPart) {";
-  protected final String TEXT_310 = "\t\t" + NL + "\t\tif (childEditPart instanceof ";
+  protected final String TEXT_239 = NL + "\t\t//This edit part understands the direct edit request and delegates it to the appropriate label, so no command is needed here." + NL + "\t\tinstallEditPolicy(";
+  protected final String TEXT_240 = ".DIRECT_EDIT_ROLE, new ";
+  protected final String TEXT_241 = "() {" + NL + "\t\t\tprotected void showCurrentEditValue(";
+  protected final String TEXT_242 = " request) {" + NL + "\t\t\t}" + NL + "\t\t\tprotected ";
+  protected final String TEXT_243 = " getDirectEditCommand(";
+  protected final String TEXT_244 = " request) {" + NL + "\t\t\t\treturn null;" + NL + "\t\t\t}" + NL + "\t\t});";
+  protected final String TEXT_245 = NL + "\t\tinstallNotationModelRefresher();";
+  protected final String TEXT_246 = NL + "\t\tinstallLinkNotationModelRefresher();";
+  protected final String TEXT_247 = NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected ";
+  protected final String TEXT_248 = " createFigure() {" + NL + "\t\t";
+  protected final String TEXT_249 = " invisibleRectangle = new ";
+  protected final String TEXT_250 = "();" + NL + "\t\tinvisibleRectangle.setLayoutManager(new ";
+  protected final String TEXT_251 = "());" + NL + "\t\t";
+  protected final String TEXT_252 = " shape = createNodeShape();" + NL + "\t\tinvisibleRectangle.add(shape);" + NL + "\t\tcontentPane = setupContentPane(shape);";
+  protected final String TEXT_253 = NL + "\t\tchildNodesPane = createChildNodesPane();" + NL + "\t\tshape.add(childNodesPane);";
+  protected final String TEXT_254 = NL + NL + "\t\t";
+  protected final String TEXT_255 = " decorationShape = createDecorationPane();" + NL + "\t\tif (decorationShape != null) {" + NL + "\t\t\tinvisibleRectangle.add(decorationShape);" + NL + "\t\t}" + NL + "" + NL + "\t\treturn invisibleRectangle;" + NL + "\t}" + NL;
+  protected final String TEXT_256 = NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected ";
+  protected final String TEXT_257 = " createChildNodesPane() {" + NL + "\t\t";
+  protected final String TEXT_258 = " result = new ";
+  protected final String TEXT_259 = "();" + NL + "\t\tsetupContentPane(result);" + NL + "\t\treturn result;" + NL + "\t}";
+  protected final String TEXT_260 = NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected ";
+  protected final String TEXT_261 = " createNodeShape() {";
+  protected final String TEXT_262 = NL + "\t\tprimaryShape = new ";
+  protected final String TEXT_263 = "()";
+  protected final String TEXT_264 = " {" + NL + "\t\t\tprotected boolean useLocalCoordinates() {" + NL + "\t\t\t\treturn true;" + NL + "\t\t\t}" + NL + "\t\t}";
+  protected final String TEXT_265 = ";";
+  protected final String TEXT_266 = NL + "\t\tprimaryShape = ";
+  protected final String TEXT_267 = ";";
+  protected final String TEXT_268 = NL + "\t\t";
+  protected final String TEXT_269 = " figure = new ";
+  protected final String TEXT_270 = "();";
+  protected final String TEXT_271 = NL + " \t\tfigure.setUseLocalCoordinates(true);";
+  protected final String TEXT_272 = NL + " \t\tprimaryShape = figure;";
+  protected final String TEXT_273 = NL + "\t\treturn primaryShape;" + NL + "\t}";
+  protected final String TEXT_274 = NL + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic ";
+  protected final String TEXT_275 = " getPrimaryShape() {" + NL + "\t\treturn (";
+  protected final String TEXT_276 = ") primaryShape;" + NL + "\t}";
+  protected final String TEXT_277 = NL + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate ";
+  protected final String TEXT_278 = " createDecorationPane() {" + NL + "\t\t";
+  protected final String TEXT_279 = " view = (";
+  protected final String TEXT_280 = ") getModel();" + NL + "\t\t";
+  protected final String TEXT_281 = " annotation = view.getEAnnotation(\"Shortcut\"); //$NON-NLS-1$" + NL + "\t\tif (annotation == null) {" + NL + "\t\t\treturn null;" + NL + "\t\t}" + NL + "\t\t" + NL + "\t\t";
+  protected final String TEXT_282 = " decorationPane = new ";
+  protected final String TEXT_283 = "();" + NL + "\t\tdecorationPane.setLayoutManager(new ";
+  protected final String TEXT_284 = "());" + NL + "" + NL + "\t\t";
+  protected final String TEXT_285 = " imageFigure = new ";
+  protected final String TEXT_286 = "(";
+  protected final String TEXT_287 = ".getInstance().getBundledImage(\"icons/shortcut.gif\"), ";
+  protected final String TEXT_288 = ".EAST);" + NL + "\t\tdecorationPane.add(imageFigure, ";
+  protected final String TEXT_289 = ".BOTTOM);" + NL + " \t\treturn decorationPane;" + 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 ";
+  protected final String TEXT_290 = " setupContentPane(";
+  protected final String TEXT_291 = " nodeShape) {" + NL + "\t\tif (nodeShape.getLayoutManager() == null) {";
+  protected final String TEXT_292 = NL + "\t\t\t";
+  protected final String TEXT_293 = " layout = new ";
+  protected final String TEXT_294 = "();" + NL + "\t\t\tlayout.setSpacing(5);" + NL + "\t\t\tnodeShape.setLayoutManager(layout);";
+  protected final String TEXT_295 = NL + "\t\tnodeShape.setLayoutManager(new ";
+  protected final String TEXT_296 = "() {" + NL + "" + NL + "\t\t\tpublic Object getConstraint(";
+  protected final String TEXT_297 = " figure) {" + NL + "\t\t\t\tObject result = constraints.get(figure);" + NL + "\t\t\t\tif (result == null) {" + NL + "\t\t\t\t\tresult = new ";
+  protected final String TEXT_298 = "(0, 0, -1, -1);" + NL + "\t\t\t\t}" + NL + "\t\t\t\treturn result;" + NL + "\t\t\t}" + NL + "\t\t});";
+  protected final String TEXT_299 = NL + "\t\t}" + NL + "\t\treturn nodeShape; // use nodeShape itself as contentPane" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic ";
+  protected final String TEXT_300 = " getContentPane() {" + NL + "\t\tif (contentPane == null) {" + NL + "\t\t\treturn super.getContentPane();" + NL + "\t\t}" + NL + "\t\treturn contentPane;" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic ";
+  protected final String TEXT_301 = " getDiagramNode() {" + NL + "\t\treturn (";
+  protected final String TEXT_302 = ") getModel();" + NL + "\t}" + NL;
+  protected final String TEXT_303 = NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected boolean addFixedChild(";
+  protected final String TEXT_304 = " childEditPart) {";
+  protected final String TEXT_305 = NL + "\t\tif (childEditPart instanceof ";
+  protected final String TEXT_306 = ") {" + NL + "\t\t\t((";
+  protected final String TEXT_307 = ") childEditPart).";
+  protected final String TEXT_308 = "(getPrimaryShape().";
+  protected final String TEXT_309 = "());" + NL + "\t\t\treturn true;" + NL + "\t\t}";
+  protected final String TEXT_310 = NL + "\t\tif (childEditPart instanceof ";
   protected final String TEXT_311 = ") {" + NL + "\t\t\t";
   protected final String TEXT_312 = " pane = getPrimaryShape().";
-  protected final String TEXT_313 = "();" + NL + "\t\t\tpane.remove(((";
+  protected final String TEXT_313 = "();" + NL + "\t\t\tsetupContentPane(pane); // FIXME each comparment should handle his content pane in his own way " + NL + "\t\t\tpane.add(((";
   protected final String TEXT_314 = ")childEditPart).getFigure());" + NL + "\t\t\treturn true;" + NL + "\t\t}\t";
-  protected final String TEXT_315 = NL + "\t\treturn false;" + NL + "\t}";
-  protected final String TEXT_316 = NL + NL + "\t/**" + NL + "\t * Returns the label which should be direct-edited by default." + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate ";
-  protected final String TEXT_317 = " getPrimaryLabelEditPart() {";
-  protected final String TEXT_318 = NL + "\t\tfor(";
-  protected final String TEXT_319 = " it = getDiagramNode().getChildren().iterator(); it.hasNext(); ) {" + NL + "\t\t\t";
-  protected final String TEXT_320 = " nextChild = (";
-  protected final String TEXT_321 = ")it.next();" + NL + "\t\t\tif (";
-  protected final String TEXT_322 = ".getVisualID(nextChild) == ";
-  protected final String TEXT_323 = ".VISUAL_ID) {" + NL + "\t\t\t\treturn (";
-  protected final String TEXT_324 = ") getViewer().getEditPartRegistry().get(nextChild);" + NL + "\t\t\t}" + NL + "\t\t}";
-  protected final String TEXT_325 = NL + "\t\treturn null;" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic void performRequest(";
-  protected final String TEXT_326 = " req) {" + NL + "\t\tif (";
-  protected final String TEXT_327 = ".REQ_DIRECT_EDIT == req.getType()) {" + NL + "\t\t\t";
-  protected final String TEXT_328 = " labelToEdit;" + NL + "\t\t\tif (req instanceof ";
-  protected final String TEXT_329 = ") {" + NL + "\t\t\t\tlabelToEdit = getLabelEditPart((";
-  protected final String TEXT_330 = ")req);" + NL + "\t\t\t} else {" + NL + "\t\t\t\tlabelToEdit = getPrimaryLabelEditPart();" + NL + "\t\t\t}" + NL + "\t\t\tif (labelToEdit != null) {" + NL + "\t\t\t\tlabelToEdit.performRequest(req);" + NL + "\t\t\t}" + NL + "\t\t}" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate ";
-  protected final String TEXT_331 = " getLabelEditPart(";
-  protected final String TEXT_332 = " req) {" + NL + "\t\t";
-  protected final String TEXT_333 = " result = getViewer().findObjectAt(req.getLocation());" + NL + "\t\tif (result != null) {" + NL + "\t\t\t";
-  protected final String TEXT_334 = " view = (";
-  protected final String TEXT_335 = ") result.getModel();" + NL + "\t\t\tif (getDiagramNode().getChildren().contains(view)) {" + NL + "\t\t\t\tint visualId = ";
-  protected final String TEXT_336 = ".getVisualID(view);" + NL + "\t\t\t\tswitch (visualId) {";
-  protected final String TEXT_337 = NL + "\t\t\t\tcase ";
-  protected final String TEXT_338 = ".VISUAL_ID:" + NL + "\t\t\t\t\treturn result;";
-  protected final String TEXT_339 = NL + "\t\t\t\t}" + NL + "\t\t\t}" + NL + "\t\t}" + NL + "\t\treturn getPrimaryLabelEditPart();" + NL + "\t}" + NL;
-  protected final String TEXT_340 = NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected boolean isExternalLabel(";
-  protected final String TEXT_341 = " childEditPart) {";
-  protected final String TEXT_342 = NL + "\t\tif (childEditPart instanceof ";
-  protected final String TEXT_343 = ") {" + NL + "\t\t\treturn true;" + NL + "\t\t}";
-  protected final String TEXT_344 = NL + "\t\treturn false;" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected ";
-  protected final String TEXT_345 = " getExternalLabelsContainer() {" + NL + "\t\t";
-  protected final String TEXT_346 = " root = (";
-  protected final String TEXT_347 = ") getRoot();" + NL + "\t\treturn root.getLayer(";
-  protected final String TEXT_348 = ".EXTERNAL_NODE_LABELS_LAYER);" + NL + "\t}" + NL;
-  protected final String TEXT_349 = NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected boolean isDirectChild(";
-  protected final String TEXT_350 = " childEditPart) {";
-  protected final String TEXT_351 = NL + "\t\tif (childEditPart instanceof ";
-  protected final String TEXT_352 = ") {" + NL + "\t\t\treturn true;" + NL + "\t\t}";
-  protected final String TEXT_353 = NL + "\t\treturn false;" + NL + "\t}";
-  protected final String TEXT_354 = NL + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected void addChildVisual(";
-  protected final String TEXT_355 = " childEditPart, int index) {";
-  protected final String TEXT_356 = NL + "\t\tif (isExternalLabel(childEditPart)) {" + NL + "\t\t\t";
-  protected final String TEXT_357 = " labelFigure = ((";
-  protected final String TEXT_358 = ") childEditPart).getFigure();" + NL + "\t\t\tgetExternalLabelsContainer().add(labelFigure);" + NL + "\t\t\treturn;" + NL + "\t\t}";
-  protected final String TEXT_359 = NL + "\t\tif (addFixedChild(childEditPart)) {" + NL + "\t\t\treturn;" + NL + "\t\t}";
-  protected final String TEXT_360 = NL + "\t\tif (isDirectChild(childEditPart)) {" + NL + "\t\t\t";
-  protected final String TEXT_361 = " childFigure = ((";
-  protected final String TEXT_362 = ") childEditPart).getFigure();" + NL + "\t\t\tchildNodesPane.add(childFigure);" + NL + "\t\t\treturn;" + NL + "\t\t}";
-  protected final String TEXT_363 = NL + "\t\tsuper.addChildVisual(childEditPart, -1);" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected void removeChildVisual(";
-  protected final String TEXT_364 = " childEditPart) {";
-  protected final String TEXT_365 = NL + "\t\tif (isExternalLabel(childEditPart)) {" + NL + "\t\t\t";
-  protected final String TEXT_366 = " labelFigure = ((";
-  protected final String TEXT_367 = ") childEditPart).getFigure();" + NL + "\t\t\tgetExternalLabelsContainer().remove(labelFigure);" + NL + "\t\t\treturn;" + NL + "\t\t}";
-  protected final String TEXT_368 = NL + "\t\tif (removeFixedChild(childEditPart)){" + NL + "\t\t\treturn;" + NL + "\t\t}";
-  protected final String TEXT_369 = NL + "\t\tif (isDirectChild(childEditPart)) {" + NL + "\t\t\t";
-  protected final String TEXT_370 = " childFigure = ((";
-  protected final String TEXT_371 = ") childEditPart).getFigure();" + NL + "\t\t\tchildNodesPane.remove(childFigure);" + NL + "\t\t\treturn;" + NL + "\t\t}";
-  protected final String TEXT_372 = NL + "\t\tsuper.removeChildVisual(childEditPart);" + NL + "\t}";
-  protected final String TEXT_373 = NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic void removeNotify() {" + NL + "\t\tfor (";
-  protected final String TEXT_374 = " it = getChildren().iterator(); it.hasNext();) {" + NL + "\t\t\t";
-  protected final String TEXT_375 = " childEditPart = (";
-  protected final String TEXT_376 = ") it.next();" + NL + "\t\t\tif (isExternalLabel(childEditPart)) {" + NL + "\t\t\t\tIFigure labelFigure = ((";
-  protected final String TEXT_377 = ") childEditPart).getFigure();" + NL + "\t\t\t\tgetExternalLabelsContainer().remove(labelFigure);" + NL + "\t\t\t}" + NL + "\t\t}" + NL + "\t\tsuper.removeNotify();" + NL + "\t}";
-  protected final String TEXT_378 = NL + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected void refreshVisuals() {" + NL + "\t\tsuper.refreshVisuals();" + NL + "\t\trefreshBounds();" + NL + "\t\trefreshBackgroundColor();" + NL + "\t\trefreshForegroundColor();" + NL + "\t\trefreshFont();" + NL + "\t\trefreshVisibility();" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected void refreshVisibility() {" + NL + "\t\tboolean isVisible = getDiagramNode().isVisible();" + NL + "\t\tboolean wasVisible = getFigure().isVisible();" + NL + "\t\tif (isVisible == wasVisible) {" + NL + "\t\t\treturn;" + NL + "\t\t}" + NL + "\t\tif (!isVisible && (getSelected() != SELECTED_NONE)) {" + NL + "\t\t\tgetViewer().deselect(this);" + NL + "\t\t}" + NL + "" + NL + "\t\tgetFigure().setVisible(isVisible);" + NL + "\t\tgetFigure().revalidate();" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected void refreshBounds() {" + NL + "\t\t";
-  protected final String TEXT_379 = " node = getDiagramNode();" + NL + "\t\tif (node.getLayoutConstraint() == null) {" + NL + "\t\t\treturn;" + NL + "\t\t}" + NL + "\t\tassert node.getLayoutConstraint() instanceof ";
-  protected final String TEXT_380 = ";" + NL + "\t\t";
-  protected final String TEXT_381 = " bounds = (";
-  protected final String TEXT_382 = ") node.getLayoutConstraint();" + NL + "\t\t((";
-  protected final String TEXT_383 = ") getParent()).setLayoutConstraint(this, getFigure(), " + NL + "\t\t\tnew ";
-  protected final String TEXT_384 = "(bounds.getX(), bounds.getY(), bounds.getWidth(), bounds.getHeight()));" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected ";
-  protected final String TEXT_385 = " getModelChildren() {" + NL + "\t\treturn getDiagramNode().getVisibleChildren();" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected ";
-  protected final String TEXT_386 = " getModelSourceConnections() {" + NL + "\t\treturn getDiagramNode().getSourceEdges();" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected ";
-  protected final String TEXT_387 = " getModelTargetConnections() {" + NL + "\t\treturn getDiagramNode().getTargetEdges();" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic ";
-  protected final String TEXT_388 = " getSourceConnectionAnchor(";
-  protected final String TEXT_389 = " connection) {" + NL + "\t\treturn new ";
-  protected final String TEXT_390 = "(getFigure());" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic ";
-  protected final String TEXT_391 = " getSourceConnectionAnchor(";
-  protected final String TEXT_392 = " request) {" + NL + "\t\treturn new ";
-  protected final String TEXT_393 = "(getFigure());" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic ";
-  protected final String TEXT_394 = "  getTargetConnectionAnchor(";
+  protected final String TEXT_315 = NL + "\t\treturn false;" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected boolean removeFixedChild(EditPart childEditPart) {";
+  protected final String TEXT_316 = "\t\t" + NL + "\t\tif (childEditPart instanceof ";
+  protected final String TEXT_317 = ") {" + NL + "\t\t\t";
+  protected final String TEXT_318 = " pane = getPrimaryShape().";
+  protected final String TEXT_319 = "();" + NL + "\t\t\tpane.remove(((";
+  protected final String TEXT_320 = ")childEditPart).getFigure());" + NL + "\t\t\treturn true;" + NL + "\t\t}\t";
+  protected final String TEXT_321 = NL + "\t\treturn false;" + NL + "\t}";
+  protected final String TEXT_322 = NL + NL + "\t/**" + NL + "\t * Returns the label which should be direct-edited by default." + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate ";
+  protected final String TEXT_323 = " getPrimaryLabelEditPart() {";
+  protected final String TEXT_324 = NL + "\t\tfor(";
+  protected final String TEXT_325 = " it = getDiagramNode().getChildren().iterator(); it.hasNext(); ) {" + NL + "\t\t\t";
+  protected final String TEXT_326 = " nextChild = (";
+  protected final String TEXT_327 = ")it.next();" + NL + "\t\t\tif (";
+  protected final String TEXT_328 = ".getVisualID(nextChild) == ";
+  protected final String TEXT_329 = ".VISUAL_ID) {" + NL + "\t\t\t\treturn (";
+  protected final String TEXT_330 = ") getViewer().getEditPartRegistry().get(nextChild);" + NL + "\t\t\t}" + NL + "\t\t}";
+  protected final String TEXT_331 = NL + "\t\treturn null;" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic void performRequest(";
+  protected final String TEXT_332 = " req) {" + NL + "\t\tif (";
+  protected final String TEXT_333 = ".REQ_DIRECT_EDIT == req.getType()) {" + NL + "\t\t\t";
+  protected final String TEXT_334 = " labelToEdit;" + NL + "\t\t\tif (req instanceof ";
+  protected final String TEXT_335 = ") {" + NL + "\t\t\t\tlabelToEdit = getLabelEditPart((";
+  protected final String TEXT_336 = ")req);" + NL + "\t\t\t} else {" + NL + "\t\t\t\tlabelToEdit = getPrimaryLabelEditPart();" + NL + "\t\t\t}" + NL + "\t\t\tif (labelToEdit != null) {" + NL + "\t\t\t\tlabelToEdit.performRequest(req);" + NL + "\t\t\t}" + NL + "\t\t}" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate ";
+  protected final String TEXT_337 = " getLabelEditPart(";
+  protected final String TEXT_338 = " req) {" + NL + "\t\t";
+  protected final String TEXT_339 = " result = getViewer().findObjectAt(req.getLocation());" + NL + "\t\tif (result != null) {" + NL + "\t\t\t";
+  protected final String TEXT_340 = " view = (";
+  protected final String TEXT_341 = ") result.getModel();" + NL + "\t\t\tif (getDiagramNode().getChildren().contains(view)) {" + NL + "\t\t\t\tint visualId = ";
+  protected final String TEXT_342 = ".getVisualID(view);" + NL + "\t\t\t\tswitch (visualId) {";
+  protected final String TEXT_343 = NL + "\t\t\t\tcase ";
+  protected final String TEXT_344 = ".VISUAL_ID:" + NL + "\t\t\t\t\treturn result;";
+  protected final String TEXT_345 = NL + "\t\t\t\t}" + NL + "\t\t\t}" + NL + "\t\t}" + NL + "\t\treturn getPrimaryLabelEditPart();" + NL + "\t}" + NL;
+  protected final String TEXT_346 = NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected boolean isExternalLabel(";
+  protected final String TEXT_347 = " childEditPart) {";
+  protected final String TEXT_348 = NL + "\t\tif (childEditPart instanceof ";
+  protected final String TEXT_349 = ") {" + NL + "\t\t\treturn true;" + NL + "\t\t}";
+  protected final String TEXT_350 = NL + "\t\treturn false;" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected ";
+  protected final String TEXT_351 = " getExternalLabelsContainer() {" + NL + "\t\t";
+  protected final String TEXT_352 = " root = (";
+  protected final String TEXT_353 = ") getRoot();" + NL + "\t\treturn root.getLayer(";
+  protected final String TEXT_354 = ".EXTERNAL_NODE_LABELS_LAYER);" + NL + "\t}" + NL;
+  protected final String TEXT_355 = NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected boolean isDirectChild(";
+  protected final String TEXT_356 = " childEditPart) {";
+  protected final String TEXT_357 = NL + "\t\tif (childEditPart instanceof ";
+  protected final String TEXT_358 = ") {" + NL + "\t\t\treturn true;" + NL + "\t\t}";
+  protected final String TEXT_359 = NL + "\t\treturn false;" + NL + "\t}";
+  protected final String TEXT_360 = NL + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected void addChildVisual(";
+  protected final String TEXT_361 = " childEditPart, int index) {";
+  protected final String TEXT_362 = NL + "\t\tif (isExternalLabel(childEditPart)) {" + NL + "\t\t\t";
+  protected final String TEXT_363 = " labelFigure = ((";
+  protected final String TEXT_364 = ") childEditPart).getFigure();" + NL + "\t\t\tgetExternalLabelsContainer().add(labelFigure);" + NL + "\t\t\treturn;" + NL + "\t\t}";
+  protected final String TEXT_365 = NL + "\t\tif (addFixedChild(childEditPart)) {" + NL + "\t\t\treturn;" + NL + "\t\t}";
+  protected final String TEXT_366 = NL + "\t\tif (isDirectChild(childEditPart)) {" + NL + "\t\t\t";
+  protected final String TEXT_367 = " childFigure = ((";
+  protected final String TEXT_368 = ") childEditPart).getFigure();" + NL + "\t\t\tchildNodesPane.add(childFigure);" + NL + "\t\t\treturn;" + NL + "\t\t}";
+  protected final String TEXT_369 = NL + "\t\tsuper.addChildVisual(childEditPart, -1);" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected void removeChildVisual(";
+  protected final String TEXT_370 = " childEditPart) {";
+  protected final String TEXT_371 = NL + "\t\tif (isExternalLabel(childEditPart)) {" + NL + "\t\t\t";
+  protected final String TEXT_372 = " labelFigure = ((";
+  protected final String TEXT_373 = ") childEditPart).getFigure();" + NL + "\t\t\tgetExternalLabelsContainer().remove(labelFigure);" + NL + "\t\t\treturn;" + NL + "\t\t}";
+  protected final String TEXT_374 = NL + "\t\tif (removeFixedChild(childEditPart)){" + NL + "\t\t\treturn;" + NL + "\t\t}";
+  protected final String TEXT_375 = NL + "\t\tif (isDirectChild(childEditPart)) {" + NL + "\t\t\t";
+  protected final String TEXT_376 = " childFigure = ((";
+  protected final String TEXT_377 = ") childEditPart).getFigure();" + NL + "\t\t\tchildNodesPane.remove(childFigure);" + NL + "\t\t\treturn;" + NL + "\t\t}";
+  protected final String TEXT_378 = NL + "\t\tsuper.removeChildVisual(childEditPart);" + NL + "\t}";
+  protected final String TEXT_379 = NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic void removeNotify() {" + NL + "\t\tfor (";
+  protected final String TEXT_380 = " it = getChildren().iterator(); it.hasNext();) {" + NL + "\t\t\t";
+  protected final String TEXT_381 = " childEditPart = (";
+  protected final String TEXT_382 = ") it.next();" + NL + "\t\t\tif (isExternalLabel(childEditPart)) {" + NL + "\t\t\t\tIFigure labelFigure = ((";
+  protected final String TEXT_383 = ") childEditPart).getFigure();" + NL + "\t\t\t\tgetExternalLabelsContainer().remove(labelFigure);" + NL + "\t\t\t}" + NL + "\t\t}" + NL + "\t\tsuper.removeNotify();" + NL + "\t}";
+  protected final String TEXT_384 = NL + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected void refreshVisuals() {" + NL + "\t\tsuper.refreshVisuals();" + NL + "\t\trefreshBounds();" + NL + "\t\trefreshBackgroundColor();" + NL + "\t\trefreshForegroundColor();" + NL + "\t\trefreshFont();" + NL + "\t\trefreshVisibility();" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected void refreshVisibility() {" + NL + "\t\tboolean isVisible = getDiagramNode().isVisible();" + NL + "\t\tboolean wasVisible = getFigure().isVisible();" + NL + "\t\tif (isVisible == wasVisible) {" + NL + "\t\t\treturn;" + NL + "\t\t}" + NL + "\t\tif (!isVisible && (getSelected() != SELECTED_NONE)) {" + NL + "\t\t\tgetViewer().deselect(this);" + NL + "\t\t}" + NL + "" + NL + "\t\tgetFigure().setVisible(isVisible);" + NL + "\t\tgetFigure().revalidate();" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected void refreshBounds() {" + NL + "\t\t";
+  protected final String TEXT_385 = " node = getDiagramNode();" + NL + "\t\tif (node.getLayoutConstraint() == null) {" + NL + "\t\t\treturn;" + NL + "\t\t}" + NL + "\t\tassert node.getLayoutConstraint() instanceof ";
+  protected final String TEXT_386 = ";" + NL + "\t\t";
+  protected final String TEXT_387 = " bounds = (";
+  protected final String TEXT_388 = ") node.getLayoutConstraint();" + NL + "\t\t((";
+  protected final String TEXT_389 = ") getParent()).setLayoutConstraint(this, getFigure(), " + NL + "\t\t\tnew ";
+  protected final String TEXT_390 = "(bounds.getX(), bounds.getY(), bounds.getWidth(), bounds.getHeight()));" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected ";
+  protected final String TEXT_391 = " getModelChildren() {" + NL + "\t\treturn getDiagramNode().getVisibleChildren();" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected ";
+  protected final String TEXT_392 = " getModelSourceConnections() {" + NL + "\t\treturn getDiagramNode().getSourceEdges();" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected ";
+  protected final String TEXT_393 = " getModelTargetConnections() {" + NL + "\t\treturn getDiagramNode().getTargetEdges();" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic ";
+  protected final String TEXT_394 = " getSourceConnectionAnchor(";
   protected final String TEXT_395 = " connection) {" + NL + "\t\treturn new ";
   protected final String TEXT_396 = "(getFigure());" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic ";
-  protected final String TEXT_397 = "  getTargetConnectionAnchor(";
+  protected final String TEXT_397 = " getSourceConnectionAnchor(";
   protected final String TEXT_398 = " request) {" + NL + "\t\treturn new ";
-  protected final String TEXT_399 = "(getFigure());" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic Object getAdapter(Class key) {";
-  protected final String TEXT_400 = NL + "\t\treturn super.getAdapter(key);" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic void activate() {" + NL + "\t\tsuper.activate();" + NL + "\t\tgetDiagramNode().getElement().eAdapters().add(domainModelRefresher);";
-  protected final String TEXT_401 = NL + "\t\tinstallNotationModelRefresher();";
-  protected final String TEXT_402 = NL + "\t\tinstallLinkNotationModelRefresher();";
-  protected final String TEXT_403 = NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic void deactivate() {";
-  protected final String TEXT_404 = NL + "\t\tuninstallLinkNotationModelRefresher();";
-  protected final String TEXT_405 = NL + "\t\tuninstallNotationModelRefresher();";
-  protected final String TEXT_406 = NL + "\t\tgetDiagramNode().getElement().eAdapters().remove(domainModelRefresher);" + NL + "\t\tsuper.deactivate();" + NL + "\t}";
-  protected final String TEXT_407 = NL;
-  protected final String TEXT_408 = "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate void installNotationModelRefresher() {" + NL + "\t\t";
-  protected final String TEXT_409 = " refresher = getNotationModelRefresher();" + NL + "\t\tif (refresher.isInstalled()) {" + NL + "\t\t\treturn;" + NL + "\t\t}" + NL + "\t\t";
-  protected final String TEXT_410 = " domainModelEditDomain = ";
-  protected final String TEXT_411 = ".getEditingDomain(";
-  protected final String TEXT_412 = ".getElement());" + NL + "\t\trefresher.install(domainModelEditDomain);" + NL + "\t\trefreshNotationModel();" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate void uninstallNotationModelRefresher() {" + NL + "\t\tgetNotationModelRefresher().uninstall();" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate ";
-  protected final String TEXT_413 = " notationModelRefresher;" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate ";
-  protected final String TEXT_414 = " getNotationModelRefresher() {" + NL + "\t\tif (notationModelRefresher == null) {" + NL + "\t\t\tnotationModelRefresher = new NotationModelRefresher();" + NL + "\t\t}" + NL + "\t\treturn notationModelRefresher;" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate class NotationModelRefresher extends ";
-  protected final String TEXT_415 = " {";
-  protected final String TEXT_416 = NL + NL + "\t\t/**" + NL + "\t\t * NB: Children of this element are selected based on constraint declared in ";
-  protected final String TEXT_417 = ". " + NL + "\t\t * Since no assumptions may be made concerning the runtime behavior of the constraint, <b>any</b> non-touch notification may result in " + NL + "\t\t * notational model having to be updated." + NL + "\t\t * <p/>User is encouraged to change implementation of this method to provide an optimization if it is safe to assume that not all notifications" + NL + "\t\t * result in such an update." + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tprivate ";
-  protected final String TEXT_418 = " getConstrainedChildrenFilter() {" + NL + "\t\t\treturn ";
-  protected final String TEXT_419 = ".NOT_TOUCH;" + NL + "\t\t}";
-  protected final String TEXT_420 = NL + NL + "\t\t/**" + NL + "\t\t * Creates a notification filter which filters notifications that may possibly affect the notational model" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tprotected ";
-  protected final String TEXT_421 = " createFilter() {";
-  protected final String TEXT_422 = NL + "\t\t\t";
-  protected final String TEXT_423 = " filter = ";
-  protected final String TEXT_424 = ".createFeatureFilter(";
-  protected final String TEXT_425 = ".eINSTANCE.get";
-  protected final String TEXT_426 = "());";
-  protected final String TEXT_427 = NL + "\t\t\tfilter = filter.or(";
-  protected final String TEXT_428 = ".createFeatureFilter(";
-  protected final String TEXT_429 = ".eINSTANCE.get";
-  protected final String TEXT_430 = "()));";
-  protected final String TEXT_431 = NL + "\t\t\tfilter = filter.and(";
-  protected final String TEXT_432 = ".createNotifierFilter(";
-  protected final String TEXT_433 = ".getElement()));";
-  protected final String TEXT_434 = NL + "\t\t\t";
-  protected final String TEXT_435 = " filter = ";
-  protected final String TEXT_436 = ".createNotifierFilter(";
-  protected final String TEXT_437 = ".getElement());";
-  protected final String TEXT_438 = NL + "\t\t\tfilter = getConstrainedChildrenFilter().or(filter);";
-  protected final String TEXT_439 = NL + "\t\t\t";
-  protected final String TEXT_440 = " filter = getConstrainedChildrenFilter();";
+  protected final String TEXT_399 = "(getFigure());" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic ";
+  protected final String TEXT_400 = "  getTargetConnectionAnchor(";
+  protected final String TEXT_401 = " connection) {" + NL + "\t\treturn new ";
+  protected final String TEXT_402 = "(getFigure());" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic ";
+  protected final String TEXT_403 = "  getTargetConnectionAnchor(";
+  protected final String TEXT_404 = " request) {" + NL + "\t\treturn new ";
+  protected final String TEXT_405 = "(getFigure());" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic Object getAdapter(Class key) {" + NL + "\t\tif (";
+  protected final String TEXT_406 = ".class == key) {" + NL + "\t\t\treturn getTreeEditPartAdapter();" + NL + "\t\t}";
+  protected final String TEXT_407 = NL + "\t\treturn super.getAdapter(key);" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate TreeEditPartAdapter myTreeEditPartAdapter;" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate TreeEditPartAdapter getTreeEditPartAdapter() {" + NL + "\t\tif (myTreeEditPartAdapter == null) {" + NL + "\t\t\tmyTreeEditPartAdapter = new TreeEditPartAdapter();" + NL + "\t\t}" + NL + "\t\treturn myTreeEditPartAdapter;" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic void activate() {" + NL + "\t\tsuper.activate();" + NL + "\t\tgetDiagramNode().getElement().eAdapters().add(domainModelRefresher);";
+  protected final String TEXT_408 = NL + "\t\tinstallNotationModelRefresher();";
+  protected final String TEXT_409 = NL + "\t\tinstallLinkNotationModelRefresher();";
+  protected final String TEXT_410 = NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic void deactivate() {";
+  protected final String TEXT_411 = NL + "\t\tuninstallLinkNotationModelRefresher();";
+  protected final String TEXT_412 = NL + "\t\tuninstallNotationModelRefresher();";
+  protected final String TEXT_413 = NL + "\t\tgetDiagramNode().getElement().eAdapters().remove(domainModelRefresher);" + NL + "\t\tsuper.deactivate();" + NL + "\t}";
+  protected final String TEXT_414 = NL;
+  protected final String TEXT_415 = "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate void installNotationModelRefresher() {" + NL + "\t\t";
+  protected final String TEXT_416 = " refresher = getNotationModelRefresher();" + NL + "\t\tif (refresher.isInstalled()) {" + NL + "\t\t\treturn;" + NL + "\t\t}" + NL + "\t\t";
+  protected final String TEXT_417 = " domainModelEditDomain = ";
+  protected final String TEXT_418 = ".getEditingDomain(";
+  protected final String TEXT_419 = ".getElement());" + NL + "\t\trefresher.install(domainModelEditDomain);" + NL + "\t\trefreshNotationModel();" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate void uninstallNotationModelRefresher() {" + NL + "\t\tgetNotationModelRefresher().uninstall();" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate ";
+  protected final String TEXT_420 = " notationModelRefresher;" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate ";
+  protected final String TEXT_421 = " getNotationModelRefresher() {" + NL + "\t\tif (notationModelRefresher == null) {" + NL + "\t\t\tnotationModelRefresher = new NotationModelRefresher();" + NL + "\t\t}" + NL + "\t\treturn notationModelRefresher;" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate class NotationModelRefresher extends ";
+  protected final String TEXT_422 = " {";
+  protected final String TEXT_423 = NL + NL + "\t\t/**" + NL + "\t\t * NB: Children of this element are selected based on constraint declared in ";
+  protected final String TEXT_424 = ". " + NL + "\t\t * Since no assumptions may be made concerning the runtime behavior of the constraint, <b>any</b> non-touch notification may result in " + NL + "\t\t * notational model having to be updated." + NL + "\t\t * <p/>User is encouraged to change implementation of this method to provide an optimization if it is safe to assume that not all notifications" + NL + "\t\t * result in such an update." + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tprivate ";
+  protected final String TEXT_425 = " getConstrainedChildrenFilter() {" + NL + "\t\t\treturn ";
+  protected final String TEXT_426 = ".NOT_TOUCH;" + NL + "\t\t}";
+  protected final String TEXT_427 = NL + NL + "\t\t/**" + NL + "\t\t * Creates a notification filter which filters notifications that may possibly affect the notational model" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tprotected ";
+  protected final String TEXT_428 = " createFilter() {";
+  protected final String TEXT_429 = NL + "\t\t\t";
+  protected final String TEXT_430 = " filter = ";
+  protected final String TEXT_431 = ".createFeatureFilter(";
+  protected final String TEXT_432 = ".eINSTANCE.get";
+  protected final String TEXT_433 = "());";
+  protected final String TEXT_434 = NL + "\t\t\tfilter = filter.or(";
+  protected final String TEXT_435 = ".createFeatureFilter(";
+  protected final String TEXT_436 = ".eINSTANCE.get";
+  protected final String TEXT_437 = "()));";
+  protected final String TEXT_438 = NL + "\t\t\tfilter = filter.and(";
+  protected final String TEXT_439 = ".createNotifierFilter(";
+  protected final String TEXT_440 = ".getElement()));";
   protected final String TEXT_441 = NL + "\t\t\t";
   protected final String TEXT_442 = " filter = ";
-  protected final String TEXT_443 = ".NOT_TOUCH;";
-  protected final String TEXT_444 = NL + "\t\t\treturn filter;";
-  protected final String TEXT_445 = NL + "\t\t}" + NL + "" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tprotected ";
-  protected final String TEXT_446 = " getCreateNotationalElementCommand(";
-  protected final String TEXT_447 = " descriptor) {" + NL + "\t\t\t";
-  protected final String TEXT_448 = " domainElement = descriptor.getElement();" + NL + "\t\t\tint nodeVisualID = descriptor.getVisualID();" + NL + "\t\t\tswitch (nodeVisualID) {";
-  protected final String TEXT_449 = NL + "\t\t\tcase ";
-  protected final String TEXT_450 = ".VISUAL_ID:" + NL + "\t\t\t\tif (domainElement instanceof ";
-  protected final String TEXT_451 = ") {" + NL + "\t\t\t\t\treturn new Create";
-  protected final String TEXT_452 = "NotationCommand(getHost(), domainElement";
-  protected final String TEXT_453 = ", new Rectangle(0, 0, 0, 0)";
-  protected final String TEXT_454 = ");" + NL + "\t\t\t\t}" + NL + "\t\t\t\treturn null;";
-  protected final String TEXT_455 = NL + "\t\t\tdefault:" + NL + "\t\t\t\treturn null;" + NL + "\t\t\t}" + NL + "\t\t}" + NL + "" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tprotected ";
-  protected final String TEXT_456 = " getSemanticChildNodes() {";
-  protected final String TEXT_457 = NL;
-  protected final String TEXT_458 = NL + "\treturn ";
-  protected final String TEXT_459 = ".EMPTY_LIST;";
-  protected final String TEXT_460 = NL + "\t";
-  protected final String TEXT_461 = " result = new ";
-  protected final String TEXT_462 = "();";
-  protected final String TEXT_463 = NL + "\t";
-  protected final String TEXT_464 = " viewObject = ";
-  protected final String TEXT_465 = ";" + NL + "\t";
-  protected final String TEXT_466 = " modelObject = viewObject.getElement();" + NL + "\t";
-  protected final String TEXT_467 = " nextValue;" + NL + "\tint nodeVID;";
-  protected final String TEXT_468 = NL + "\tfor(";
-  protected final String TEXT_469 = " it = ";
-  protected final String TEXT_470 = ".iterator(); it.hasNext(); ) {" + NL + "\t\tnextValue = (";
-  protected final String TEXT_471 = ") it.next();";
-  protected final String TEXT_472 = NL + "\tnextValue = (";
-  protected final String TEXT_473 = ")";
-  protected final String TEXT_474 = ";";
-  protected final String TEXT_475 = NL + "\tnodeVID = ";
-  protected final String TEXT_476 = ".INSTANCE.getNodeVisualID(viewObject, nextValue);";
-  protected final String TEXT_477 = NL + "\tswitch (nodeVID) {";
-  protected final String TEXT_478 = NL + "\tcase ";
-  protected final String TEXT_479 = ".VISUAL_ID: {";
-  protected final String TEXT_480 = NL + "\tif (";
-  protected final String TEXT_481 = ".VISUAL_ID == nodeVID) {";
-  protected final String TEXT_482 = NL + "\t\tresult.add(new ";
-  protected final String TEXT_483 = "(nextValue, nodeVID));";
-  protected final String TEXT_484 = NL + "\t\tbreak;" + NL + "\t\t}";
-  protected final String TEXT_485 = NL + "\t\t}";
-  protected final String TEXT_486 = NL + "\t}";
-  protected final String TEXT_487 = NL + "\t}";
-  protected final String TEXT_488 = NL + "\treturn result;";
-  protected final String TEXT_489 = NL + "\t\t}" + NL + "" + NL + "\t\t/**" + NL + "\t\t * Returns whether a notational element should be created for the given domain element. " + NL + "\t\t * The generated code always returns ";
-  protected final String TEXT_490 = ". " + NL + "\t\t * User can change implementation of this method to handle a more sophisticated logic." + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tprotected boolean shouldCreateView(";
-  protected final String TEXT_491 = " descriptor) {" + NL + "\t\t\treturn ";
-  protected final String TEXT_492 = ";" + NL + "\t\t}" + NL + "" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tprotected ";
-  protected final String TEXT_493 = " getHost() {" + NL + "\t\t\treturn ";
-  protected final String TEXT_494 = ";" + NL + "\t\t}" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected void refreshNotationModel() {" + NL + "\t\t";
-  protected final String TEXT_495 = " childRefresher = getNotationModelRefresher();" + NL + "\t\tif (!childRefresher.isInstalled()) {" + NL + "\t\t\treturn;" + NL + "\t\t}" + NL + "\t\t";
-  protected final String TEXT_496 = " command = childRefresher.buildRefreshNotationModelCommand();" + NL + "\t\tif (command == null) {" + NL + "\t\t\treturn;" + NL + "\t\t}" + NL + "\t\t";
-  protected final String TEXT_497 = " domainModelEditDomain = ";
-  protected final String TEXT_498 = ".getEditingDomain(";
-  protected final String TEXT_499 = ".getElement());" + NL + "\t\tgetViewer().getEditDomain().getCommandStack().execute(new ";
-  protected final String TEXT_500 = "(domainModelEditDomain, command));" + NL + "\t}" + NL;
-  protected final String TEXT_501 = NL;
-  protected final String TEXT_502 = NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate void installLinkNotationModelRefresher() {" + NL + "\t\tLinkNotationModelRefresher refresher = getLinkNotationModelRefresher();" + NL + "\t\tif (refresher.isInstalled()) {" + NL + "\t\t\treturn;" + NL + "\t\t}" + NL + "\t\t";
-  protected final String TEXT_503 = " domainModelEditDomain = ";
-  protected final String TEXT_504 = ".getEditingDomain(";
-  protected final String TEXT_505 = ".getElement());" + NL + "\t\trefresher.install(domainModelEditDomain);" + NL + "\t\trefreshLinkNotationModel();" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate void uninstallLinkNotationModelRefresher() {" + NL + "\t\tgetLinkNotationModelRefresher().uninstall();" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate LinkNotationModelRefresher linkNotationModelRefresher;" + NL + "" + NL + "\t/**" + NL + "\t * Service to find a notational element that corresponds to the given underlying domain element. " + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate ";
-  protected final String TEXT_506 = " viewService;" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate ";
-  protected final String TEXT_507 = " getViewService() {" + NL + "\t\tif (viewService == null) {" + NL + "\t\t\tviewService = new ";
-  protected final String TEXT_508 = "(getViewer());" + NL + "\t\t}" + NL + "\t\treturn viewService;" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate LinkNotationModelRefresher getLinkNotationModelRefresher() {" + NL + "\t\tif (linkNotationModelRefresher == null) {" + NL + "\t\t\tlinkNotationModelRefresher = new LinkNotationModelRefresher(getViewService());" + NL + "\t\t}" + NL + "\t\treturn linkNotationModelRefresher;" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate class LinkNotationModelRefresher extends ";
-  protected final String TEXT_509 = " {" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tpublic LinkNotationModelRefresher(";
-  protected final String TEXT_510 = " viewService) {" + NL + "\t\t\tsuper(viewService);" + NL + "\t\t}";
-  protected final String TEXT_511 = NL + NL + "\t\t/**" + NL + "\t\t * NB: Child links of this element are selected based on constraint declared in ";
-  protected final String TEXT_512 = ". " + NL + "\t\t * Since no assumptions may be made concerning the runtime behavior of the constraint, <b>any</b> non-touch notification may result in " + NL + "\t\t * notational model having to be updated." + NL + "\t\t * <p/>User is encouraged to change implementation of this method to provide an optimization if it is safe to assume that not all notifications" + NL + "\t\t * result in such an update." + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tprivate ";
-  protected final String TEXT_513 = " getConstrainedChildLinksFilter() {" + NL + "\t\t\treturn ";
-  protected final String TEXT_514 = ".NOT_TOUCH;" + NL + "\t\t}";
-  protected final String TEXT_515 = NL + "\t\t/**" + NL + "\t\t * Creates a notification filter which filters notifications that may possibly result in uncontained links. " + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tprivate ";
-  protected final String TEXT_516 = " createUncontainedLinksFilter() {" + NL + "\t\t\treturn ";
-  protected final String TEXT_517 = ".createEventTypeFilter(";
-  protected final String TEXT_518 = ".SET).or(" + NL + "\t\t\t\t";
-  protected final String TEXT_519 = ".createEventTypeFilter(";
-  protected final String TEXT_520 = ".UNSET).or(" + NL + "\t\t\t\t";
-  protected final String TEXT_521 = ".createEventTypeFilter(";
-  protected final String TEXT_522 = ".REMOVE).or(" + NL + "\t\t\t\t";
-  protected final String TEXT_523 = ".createEventTypeFilter(";
-  protected final String TEXT_524 = ".REMOVE_MANY)" + NL + "\t\t\t)));" + NL + "\t\t}";
-  protected final String TEXT_525 = NL + "\t\t/**" + NL + "\t\t * Creates a notification filter which filters notifications that may possibly affect the notational model" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tprotected ";
-  protected final String TEXT_526 = " createFilter() {";
-  protected final String TEXT_527 = NL;
-  protected final String TEXT_528 = NL + "\t\t\t";
-  protected final String TEXT_529 = " filter = ";
-  protected final String TEXT_530 = ".createFeatureFilter(";
-  protected final String TEXT_531 = ".eINSTANCE.get";
-  protected final String TEXT_532 = "());";
-  protected final String TEXT_533 = NL + "\t\t\tfilter = filter.or(";
-  protected final String TEXT_534 = ".createFeatureFilter(";
-  protected final String TEXT_535 = ".eINSTANCE.get";
-  protected final String TEXT_536 = "()));";
-  protected final String TEXT_537 = NL;
-  protected final String TEXT_538 = NL + "\t\t\t";
-  protected final String TEXT_539 = " filter = ";
-  protected final String TEXT_540 = ".createFeatureFilter(";
-  protected final String TEXT_541 = ".eINSTANCE.get";
-  protected final String TEXT_542 = "());";
-  protected final String TEXT_543 = NL + "\t\t\tfilter = filter.or(";
-  protected final String TEXT_544 = ".createFeatureFilter(";
-  protected final String TEXT_545 = ".eINSTANCE.get";
-  protected final String TEXT_546 = "()));";
-  protected final String TEXT_547 = NL;
-  protected final String TEXT_548 = NL + "\t\t\t";
-  protected final String TEXT_549 = " filter = ";
-  protected final String TEXT_550 = ".createFeatureFilter(";
-  protected final String TEXT_551 = ".eINSTANCE.get";
-  protected final String TEXT_552 = "());";
-  protected final String TEXT_553 = NL + "\t\t\tfilter = filter.or(";
-  protected final String TEXT_554 = ".createFeatureFilter(";
-  protected final String TEXT_555 = ".eINSTANCE.get";
-  protected final String TEXT_556 = "()));";
-  protected final String TEXT_557 = NL;
-  protected final String TEXT_558 = NL + "\t\t\t";
-  protected final String TEXT_559 = " filter = ";
-  protected final String TEXT_560 = ".createFeatureFilter(";
-  protected final String TEXT_561 = ".eINSTANCE.get";
-  protected final String TEXT_562 = "());";
-  protected final String TEXT_563 = NL + "\t\t\tfilter = filter.or(";
-  protected final String TEXT_564 = ".createFeatureFilter(";
-  protected final String TEXT_565 = ".eINSTANCE.get";
-  protected final String TEXT_566 = "()));";
-  protected final String TEXT_567 = NL + "\t\t\tfilter = getConstrainedChildLinksFilter().or(filter);";
-  protected final String TEXT_568 = NL + "\t\t\t";
-  protected final String TEXT_569 = " filter = getConstrainedChildLinksFilter();";
-  protected final String TEXT_570 = NL + "\t\t\tfilter = filter.or(createUncontainedLinksFilter());";
-  protected final String TEXT_571 = NL + "\t\t\t";
-  protected final String TEXT_572 = " filter = createUncontainedLinksFilter();";
-  protected final String TEXT_573 = NL + "\t\t\t";
-  protected final String TEXT_574 = " filter = ";
-  protected final String TEXT_575 = ".NOT_TOUCH;";
-  protected final String TEXT_576 = NL + "\t\t\treturn filter;" + NL + "\t\t}" + NL + "" + NL + "\t\t/**" + NL + "\t \t * @generated" + NL + "\t \t */" + NL + "\t\tprotected ";
-  protected final String TEXT_577 = " getCreateNotationalElementCommand(";
-  protected final String TEXT_578 = " descriptor) {" + NL + "\t\t\t";
-  protected final String TEXT_579 = " linkDescriptor = (";
-  protected final String TEXT_580 = ") descriptor;" + NL + "\t\t\t";
-  protected final String TEXT_581 = " sourceView = getViewService().findView(linkDescriptor.getSource());" + NL + "\t\t\t";
-  protected final String TEXT_582 = " targetView = getViewService().findView(linkDescriptor.getDestination());" + NL + "\t\t\tif (sourceView == null || targetView == null) {" + NL + "\t\t\t\treturn null;" + NL + "\t\t\t}" + NL + "\t\t\t";
-  protected final String TEXT_583 = " createdEdge = ";
-  protected final String TEXT_584 = ".eINSTANCE.createEdge();" + NL + "\t\t\tswitch (linkDescriptor.getVisualID()) {";
-  protected final String TEXT_585 = NL + "\t\t\tcase ";
-  protected final String TEXT_586 = ".VISUAL_ID:" + NL + "\t\t\t\tif (linkDescriptor.getElement() instanceof ";
-  protected final String TEXT_587 = ") {" + NL + "\t\t\t\t\tcreatedEdge.setElement(linkDescriptor.getElement());" + NL + "\t\t\t\t\t";
-  protected final String TEXT_588 = ".decorateView(createdEdge);" + NL + "\t\t\t\t}" + NL + "\t\t\t\tbreak;";
-  protected final String TEXT_589 = NL + "\t\t\tcase ";
-  protected final String TEXT_590 = ".VISUAL_ID:" + NL + "\t\t\t\tif (linkDescriptor.getElement() == null) {" + NL + "\t\t\t\t\tcreatedEdge.setElement(null);" + NL + "\t\t\t\t\t";
-  protected final String TEXT_591 = ".decorateView(createdEdge);" + NL + "\t\t\t\t}" + NL + "\t\t\t\tbreak;";
-  protected final String TEXT_592 = NL + "\t\t\t}" + NL + "\t\t\tif (createdEdge.getType() == null) {" + NL + "\t\t\t\treturn null;" + NL + "\t\t\t}" + NL + "\t\t\treturn new ";
-  protected final String TEXT_593 = "(getHost().getDiagram(), createdEdge, sourceView, targetView);" + NL + "\t\t}" + NL + "" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tprotected ";
-  protected final String TEXT_594 = " getSemanticChildLinks() {";
-  protected final String TEXT_595 = NL;
-  protected final String TEXT_596 = "\t";
-  protected final String TEXT_597 = " result = new ";
-  protected final String TEXT_598 = "();";
-  protected final String TEXT_599 = NL + "\t";
-  protected final String TEXT_600 = " modelObject = ";
-  protected final String TEXT_601 = ".getElement();" + NL + "\t";
-  protected final String TEXT_602 = " nextValue;";
-  protected final String TEXT_603 = NL + "\tint linkVID;";
-  protected final String TEXT_604 = NL + "\tfor(";
-  protected final String TEXT_605 = " it = ";
-  protected final String TEXT_606 = ".iterator(); it.hasNext(); ) {" + NL + "\t\tnextValue = (";
-  protected final String TEXT_607 = ") it.next();";
-  protected final String TEXT_608 = NL + "\tnextValue = (";
-  protected final String TEXT_609 = ")";
-  protected final String TEXT_610 = ";";
-  protected final String TEXT_611 = NL + "\tlinkVID = ";
-  protected final String TEXT_612 = ".INSTANCE.getLinkWithClassVisualID(nextValue);";
-  protected final String TEXT_613 = NL + "\tswitch (linkVID) {";
-  protected final String TEXT_614 = NL + "\tcase ";
-  protected final String TEXT_615 = ".VISUAL_ID: {";
-  protected final String TEXT_616 = NL + "\tif (";
-  protected final String TEXT_617 = ".VISUAL_ID == linkVID) {";
-  protected final String TEXT_618 = NL + "\t\t";
-  protected final String TEXT_619 = " source = (";
-  protected final String TEXT_620 = ")";
-  protected final String TEXT_621 = ";";
-  protected final String TEXT_622 = NL + "\t\t";
-  protected final String TEXT_623 = " source = ";
-  protected final String TEXT_624 = ".getElement();";
+  protected final String TEXT_443 = ".createNotifierFilter(";
+  protected final String TEXT_444 = ".getElement());";
+  protected final String TEXT_445 = NL + "\t\t\tfilter = getConstrainedChildrenFilter().or(filter);";
+  protected final String TEXT_446 = NL + "\t\t\t";
+  protected final String TEXT_447 = " filter = getConstrainedChildrenFilter();";
+  protected final String TEXT_448 = NL + "\t\t\t";
+  protected final String TEXT_449 = " filter = ";
+  protected final String TEXT_450 = ".NOT_TOUCH;";
+  protected final String TEXT_451 = NL + "\t\t\treturn filter;";
+  protected final String TEXT_452 = NL + "\t\t}" + NL + "" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tprotected ";
+  protected final String TEXT_453 = " getCreateNotationalElementCommand(";
+  protected final String TEXT_454 = " descriptor) {" + NL + "\t\t\t";
+  protected final String TEXT_455 = " domainElement = descriptor.getElement();" + NL + "\t\t\tint nodeVisualID = descriptor.getVisualID();" + NL + "\t\t\tswitch (nodeVisualID) {";
+  protected final String TEXT_456 = NL + "\t\t\tcase ";
+  protected final String TEXT_457 = ".VISUAL_ID:" + NL + "\t\t\t\tif (domainElement instanceof ";
+  protected final String TEXT_458 = ") {" + NL + "\t\t\t\t\treturn new Create";
+  protected final String TEXT_459 = "NotationCommand(getHost(), domainElement";
+  protected final String TEXT_460 = ", new Rectangle(0, 0, 0, 0)";
+  protected final String TEXT_461 = ");" + NL + "\t\t\t\t}" + NL + "\t\t\t\treturn null;";
+  protected final String TEXT_462 = NL + "\t\t\tdefault:" + NL + "\t\t\t\treturn null;" + NL + "\t\t\t}" + NL + "\t\t}" + NL + "" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tprotected ";
+  protected final String TEXT_463 = " getSemanticChildNodes() {";
+  protected final String TEXT_464 = NL;
+  protected final String TEXT_465 = NL + "\treturn ";
+  protected final String TEXT_466 = ".EMPTY_LIST;";
+  protected final String TEXT_467 = NL + "\t";
+  protected final String TEXT_468 = " result = new ";
+  protected final String TEXT_469 = "();";
+  protected final String TEXT_470 = NL + "\t";
+  protected final String TEXT_471 = " viewObject = ";
+  protected final String TEXT_472 = ";" + NL + "\t";
+  protected final String TEXT_473 = " modelObject = viewObject.getElement();" + NL + "\t";
+  protected final String TEXT_474 = " nextValue;" + NL + "\tint nodeVID;";
+  protected final String TEXT_475 = NL + "\tfor(";
+  protected final String TEXT_476 = " it = ";
+  protected final String TEXT_477 = ".iterator(); it.hasNext(); ) {" + NL + "\t\tnextValue = (";
+  protected final String TEXT_478 = ") it.next();";
+  protected final String TEXT_479 = NL + "\tnextValue = (";
+  protected final String TEXT_480 = ")";
+  protected final String TEXT_481 = ";";
+  protected final String TEXT_482 = NL + "\tnodeVID = ";
+  protected final String TEXT_483 = ".INSTANCE.getNodeVisualID(viewObject, nextValue);";
+  protected final String TEXT_484 = NL + "\tswitch (nodeVID) {";
+  protected final String TEXT_485 = NL + "\tcase ";
+  protected final String TEXT_486 = ".VISUAL_ID: {";
+  protected final String TEXT_487 = NL + "\tif (";
+  protected final String TEXT_488 = ".VISUAL_ID == nodeVID) {";
+  protected final String TEXT_489 = NL + "\t\tresult.add(new ";
+  protected final String TEXT_490 = "(nextValue, nodeVID));";
+  protected final String TEXT_491 = NL + "\t\tbreak;" + NL + "\t\t}";
+  protected final String TEXT_492 = NL + "\t\t}";
+  protected final String TEXT_493 = NL + "\t}";
+  protected final String TEXT_494 = NL + "\t}";
+  protected final String TEXT_495 = NL + "\treturn result;";
+  protected final String TEXT_496 = NL + "\t\t}" + NL + "" + NL + "\t\t/**" + NL + "\t\t * Returns whether a notational element should be created for the given domain element. " + NL + "\t\t * The generated code always returns ";
+  protected final String TEXT_497 = ". " + NL + "\t\t * User can change implementation of this method to handle a more sophisticated logic." + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tprotected boolean shouldCreateView(";
+  protected final String TEXT_498 = " descriptor) {" + NL + "\t\t\treturn ";
+  protected final String TEXT_499 = ";" + NL + "\t\t}" + NL + "" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tprotected ";
+  protected final String TEXT_500 = " getHost() {" + NL + "\t\t\treturn ";
+  protected final String TEXT_501 = ";" + NL + "\t\t}" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected void refreshNotationModel() {" + NL + "\t\t";
+  protected final String TEXT_502 = " childRefresher = getNotationModelRefresher();" + NL + "\t\tif (!childRefresher.isInstalled()) {" + NL + "\t\t\treturn;" + NL + "\t\t}" + NL + "\t\t";
+  protected final String TEXT_503 = " command = childRefresher.buildRefreshNotationModelCommand();" + NL + "\t\tif (command == null) {" + NL + "\t\t\treturn;" + NL + "\t\t}" + NL + "\t\t";
+  protected final String TEXT_504 = " domainModelEditDomain = ";
+  protected final String TEXT_505 = ".getEditingDomain(";
+  protected final String TEXT_506 = ".getElement());" + NL + "\t\tgetViewer().getEditDomain().getCommandStack().execute(new ";
+  protected final String TEXT_507 = "(domainModelEditDomain, command));" + NL + "\t}" + NL;
+  protected final String TEXT_508 = NL;
+  protected final String TEXT_509 = NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate void installLinkNotationModelRefresher() {" + NL + "\t\tLinkNotationModelRefresher refresher = getLinkNotationModelRefresher();" + NL + "\t\tif (refresher.isInstalled()) {" + NL + "\t\t\treturn;" + NL + "\t\t}" + NL + "\t\t";
+  protected final String TEXT_510 = " domainModelEditDomain = ";
+  protected final String TEXT_511 = ".getEditingDomain(";
+  protected final String TEXT_512 = ".getElement());" + NL + "\t\trefresher.install(domainModelEditDomain);" + NL + "\t\trefreshLinkNotationModel();" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate void uninstallLinkNotationModelRefresher() {" + NL + "\t\tgetLinkNotationModelRefresher().uninstall();" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate LinkNotationModelRefresher linkNotationModelRefresher;" + NL + "" + NL + "\t/**" + NL + "\t * Service to find a notational element that corresponds to the given underlying domain element. " + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate ";
+  protected final String TEXT_513 = " viewService;" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate ";
+  protected final String TEXT_514 = " getViewService() {" + NL + "\t\tif (viewService == null) {" + NL + "\t\t\tviewService = new ";
+  protected final String TEXT_515 = "(getViewer());" + NL + "\t\t}" + NL + "\t\treturn viewService;" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate LinkNotationModelRefresher getLinkNotationModelRefresher() {" + NL + "\t\tif (linkNotationModelRefresher == null) {" + NL + "\t\t\tlinkNotationModelRefresher = new LinkNotationModelRefresher(getViewService());" + NL + "\t\t}" + NL + "\t\treturn linkNotationModelRefresher;" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate class LinkNotationModelRefresher extends ";
+  protected final String TEXT_516 = " {" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tpublic LinkNotationModelRefresher(";
+  protected final String TEXT_517 = " viewService) {" + NL + "\t\t\tsuper(viewService);" + NL + "\t\t}";
+  protected final String TEXT_518 = NL + NL + "\t\t/**" + NL + "\t\t * NB: Child links of this element are selected based on constraint declared in ";
+  protected final String TEXT_519 = ". " + NL + "\t\t * Since no assumptions may be made concerning the runtime behavior of the constraint, <b>any</b> non-touch notification may result in " + NL + "\t\t * notational model having to be updated." + NL + "\t\t * <p/>User is encouraged to change implementation of this method to provide an optimization if it is safe to assume that not all notifications" + NL + "\t\t * result in such an update." + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tprivate ";
+  protected final String TEXT_520 = " getConstrainedChildLinksFilter() {" + NL + "\t\t\treturn ";
+  protected final String TEXT_521 = ".NOT_TOUCH;" + NL + "\t\t}";
+  protected final String TEXT_522 = NL + "\t\t/**" + NL + "\t\t * Creates a notification filter which filters notifications that may possibly result in uncontained links. " + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tprivate ";
+  protected final String TEXT_523 = " createUncontainedLinksFilter() {" + NL + "\t\t\treturn ";
+  protected final String TEXT_524 = ".createEventTypeFilter(";
+  protected final String TEXT_525 = ".SET).or(" + NL + "\t\t\t\t";
+  protected final String TEXT_526 = ".createEventTypeFilter(";
+  protected final String TEXT_527 = ".UNSET).or(" + NL + "\t\t\t\t";
+  protected final String TEXT_528 = ".createEventTypeFilter(";
+  protected final String TEXT_529 = ".REMOVE).or(" + NL + "\t\t\t\t";
+  protected final String TEXT_530 = ".createEventTypeFilter(";
+  protected final String TEXT_531 = ".REMOVE_MANY)" + NL + "\t\t\t)));" + NL + "\t\t}";
+  protected final String TEXT_532 = NL + "\t\t/**" + NL + "\t\t * Creates a notification filter which filters notifications that may possibly affect the notational model" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tprotected ";
+  protected final String TEXT_533 = " createFilter() {";
+  protected final String TEXT_534 = NL;
+  protected final String TEXT_535 = NL + "\t\t\t";
+  protected final String TEXT_536 = " filter = ";
+  protected final String TEXT_537 = ".createFeatureFilter(";
+  protected final String TEXT_538 = ".eINSTANCE.get";
+  protected final String TEXT_539 = "());";
+  protected final String TEXT_540 = NL + "\t\t\tfilter = filter.or(";
+  protected final String TEXT_541 = ".createFeatureFilter(";
+  protected final String TEXT_542 = ".eINSTANCE.get";
+  protected final String TEXT_543 = "()));";
+  protected final String TEXT_544 = NL;
+  protected final String TEXT_545 = NL + "\t\t\t";
+  protected final String TEXT_546 = " filter = ";
+  protected final String TEXT_547 = ".createFeatureFilter(";
+  protected final String TEXT_548 = ".eINSTANCE.get";
+  protected final String TEXT_549 = "());";
+  protected final String TEXT_550 = NL + "\t\t\tfilter = filter.or(";
+  protected final String TEXT_551 = ".createFeatureFilter(";
+  protected final String TEXT_552 = ".eINSTANCE.get";
+  protected final String TEXT_553 = "()));";
+  protected final String TEXT_554 = NL;
+  protected final String TEXT_555 = NL + "\t\t\t";
+  protected final String TEXT_556 = " filter = ";
+  protected final String TEXT_557 = ".createFeatureFilter(";
+  protected final String TEXT_558 = ".eINSTANCE.get";
+  protected final String TEXT_559 = "());";
+  protected final String TEXT_560 = NL + "\t\t\tfilter = filter.or(";
+  protected final String TEXT_561 = ".createFeatureFilter(";
+  protected final String TEXT_562 = ".eINSTANCE.get";
+  protected final String TEXT_563 = "()));";
+  protected final String TEXT_564 = NL;
+  protected final String TEXT_565 = NL + "\t\t\t";
+  protected final String TEXT_566 = " filter = ";
+  protected final String TEXT_567 = ".createFeatureFilter(";
+  protected final String TEXT_568 = ".eINSTANCE.get";
+  protected final String TEXT_569 = "());";
+  protected final String TEXT_570 = NL + "\t\t\tfilter = filter.or(";
+  protected final String TEXT_571 = ".createFeatureFilter(";
+  protected final String TEXT_572 = ".eINSTANCE.get";
+  protected final String TEXT_573 = "()));";
+  protected final String TEXT_574 = NL + "\t\t\tfilter = getConstrainedChildLinksFilter().or(filter);";
+  protected final String TEXT_575 = NL + "\t\t\t";
+  protected final String TEXT_576 = " filter = getConstrainedChildLinksFilter();";
+  protected final String TEXT_577 = NL + "\t\t\tfilter = filter.or(createUncontainedLinksFilter());";
+  protected final String TEXT_578 = NL + "\t\t\t";
+  protected final String TEXT_579 = " filter = createUncontainedLinksFilter();";
+  protected final String TEXT_580 = NL + "\t\t\t";
+  protected final String TEXT_581 = " filter = ";
+  protected final String TEXT_582 = ".NOT_TOUCH;";
+  protected final String TEXT_583 = NL + "\t\t\treturn filter;" + NL + "\t\t}" + NL + "" + NL + "\t\t/**" + NL + "\t \t * @generated" + NL + "\t \t */" + NL + "\t\tprotected ";
+  protected final String TEXT_584 = " getCreateNotationalElementCommand(";
+  protected final String TEXT_585 = " descriptor) {" + NL + "\t\t\t";
+  protected final String TEXT_586 = " linkDescriptor = (";
+  protected final String TEXT_587 = ") descriptor;" + NL + "\t\t\t";
+  protected final String TEXT_588 = " sourceView = getViewService().findView(linkDescriptor.getSource());" + NL + "\t\t\t";
+  protected final String TEXT_589 = " targetView = getViewService().findView(linkDescriptor.getDestination());" + NL + "\t\t\tif (sourceView == null || targetView == null) {" + NL + "\t\t\t\treturn null;" + NL + "\t\t\t}" + NL + "\t\t\t";
+  protected final String TEXT_590 = " createdEdge = ";
+  protected final String TEXT_591 = ".eINSTANCE.createEdge();" + NL + "\t\t\tswitch (linkDescriptor.getVisualID()) {";
+  protected final String TEXT_592 = NL + "\t\t\tcase ";
+  protected final String TEXT_593 = ".VISUAL_ID:" + NL + "\t\t\t\tif (linkDescriptor.getElement() instanceof ";
+  protected final String TEXT_594 = ") {" + NL + "\t\t\t\t\tcreatedEdge.setElement(linkDescriptor.getElement());" + NL + "\t\t\t\t\t";
+  protected final String TEXT_595 = ".decorateView(createdEdge);" + NL + "\t\t\t\t}" + NL + "\t\t\t\tbreak;";
+  protected final String TEXT_596 = NL + "\t\t\tcase ";
+  protected final String TEXT_597 = ".VISUAL_ID:" + NL + "\t\t\t\tif (linkDescriptor.getElement() == null) {" + NL + "\t\t\t\t\tcreatedEdge.setElement(null);" + NL + "\t\t\t\t\t";
+  protected final String TEXT_598 = ".decorateView(createdEdge);" + NL + "\t\t\t\t}" + NL + "\t\t\t\tbreak;";
+  protected final String TEXT_599 = NL + "\t\t\t}" + NL + "\t\t\tif (createdEdge.getType() == null) {" + NL + "\t\t\t\treturn null;" + NL + "\t\t\t}" + NL + "\t\t\treturn new ";
+  protected final String TEXT_600 = "(getHost().getDiagram(), createdEdge, sourceView, targetView);" + NL + "\t\t}" + NL + "" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tprotected ";
+  protected final String TEXT_601 = " getSemanticChildLinks() {";
+  protected final String TEXT_602 = NL;
+  protected final String TEXT_603 = "\t";
+  protected final String TEXT_604 = " result = new ";
+  protected final String TEXT_605 = "();";
+  protected final String TEXT_606 = NL + "\t";
+  protected final String TEXT_607 = " modelObject = ";
+  protected final String TEXT_608 = ".getElement();" + NL + "\t";
+  protected final String TEXT_609 = " nextValue;";
+  protected final String TEXT_610 = NL + "\tint linkVID;";
+  protected final String TEXT_611 = NL + "\tfor(";
+  protected final String TEXT_612 = " it = ";
+  protected final String TEXT_613 = ".iterator(); it.hasNext(); ) {" + NL + "\t\tnextValue = (";
+  protected final String TEXT_614 = ") it.next();";
+  protected final String TEXT_615 = NL + "\tnextValue = (";
+  protected final String TEXT_616 = ")";
+  protected final String TEXT_617 = ";";
+  protected final String TEXT_618 = NL + "\tlinkVID = ";
+  protected final String TEXT_619 = ".INSTANCE.getLinkWithClassVisualID(nextValue);";
+  protected final String TEXT_620 = NL + "\tswitch (linkVID) {";
+  protected final String TEXT_621 = NL + "\tcase ";
+  protected final String TEXT_622 = ".VISUAL_ID: {";
+  protected final String TEXT_623 = NL + "\tif (";
+  protected final String TEXT_624 = ".VISUAL_ID == linkVID) {";
   protected final String TEXT_625 = NL + "\t\t";
-  protected final String TEXT_626 = " target = (";
+  protected final String TEXT_626 = " source = (";
   protected final String TEXT_627 = ")";
   protected final String TEXT_628 = ";";
   protected final String TEXT_629 = NL + "\t\t";
-  protected final String TEXT_630 = " target = ";
+  protected final String TEXT_630 = " source = ";
   protected final String TEXT_631 = ".getElement();";
-  protected final String TEXT_632 = NL + "\t\tif (source != null && target != null) {" + NL + "\t\t\tresult.add(new ";
-  protected final String TEXT_633 = "(source, target, nextValue, linkVID));" + NL + "\t\t}";
-  protected final String TEXT_634 = NL + "\t\tbreak;" + NL + "\t}";
-  protected final String TEXT_635 = NL + "\t}";
-  protected final String TEXT_636 = NL + "\t}";
-  protected final String TEXT_637 = NL + "\t}";
-  protected final String TEXT_638 = NL + "\tfor(";
-  protected final String TEXT_639 = " it = ";
-  protected final String TEXT_640 = ".iterator(); it.hasNext(); ) {" + NL + "\t\tnextValue = (";
-  protected final String TEXT_641 = ") it.next();";
-  protected final String TEXT_642 = NL + "\tnextValue = (";
-  protected final String TEXT_643 = ")";
-  protected final String TEXT_644 = ";";
-  protected final String TEXT_645 = NL + "\tif (nextValue != null) {";
-  protected final String TEXT_646 = NL + "\t\tresult.add(new ";
-  protected final String TEXT_647 = "(modelObject, nextValue, null, ";
-  protected final String TEXT_648 = ".VISUAL_ID));";
-  protected final String TEXT_649 = NL + "\t}";
-  protected final String TEXT_650 = NL + "\t}";
-  protected final String TEXT_651 = NL + "\treturn result;" + NL + "\t\t}" + NL + "" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tprotected ";
-  protected final String TEXT_652 = " getNotationalChildLinks() {" + NL + "\t\t\t";
-  protected final String TEXT_653 = " result = new ";
-  protected final String TEXT_654 = "();" + NL + "\t\t\t";
-  protected final String TEXT_655 = " allLinks = ";
-  protected final String TEXT_656 = ".getEdges();" + NL + "\t\t\tfor(";
-  protected final String TEXT_657 = " it = allLinks.iterator(); it.hasNext(); ) {" + NL + "\t\t\t\t";
-  protected final String TEXT_658 = " next = (";
-  protected final String TEXT_659 = ") it.next();";
-  protected final String TEXT_660 = NL + "\t\t\t\tif (next.isSetElement() && next.getElement() != null && next.getElement().eResource() == null) {" + NL + "\t\t\t\t\tresult.add(next);" + NL + "\t\t\t\t\tcontinue;" + NL + "\t\t\t\t}" + NL + "\t\t\t\t";
-  protected final String TEXT_661 = " source = next.getSource();" + NL + "\t\t\t\tif (source == null || (source.isSetElement() && source.getElement() != null && source.getElement().eResource() == null)) {" + NL + "\t\t\t\t\tresult.add(next);" + NL + "\t\t\t\t\tcontinue;" + NL + "\t\t\t\t}" + NL + "\t\t\t\t";
-  protected final String TEXT_662 = " target = next.getTarget();" + NL + "\t\t\t\tif (target == null || (target.isSetElement() && target.getElement() != null && target.getElement().eResource() == null)) {" + NL + "\t\t\t\t\tresult.add(next);" + NL + "\t\t\t\t\tcontinue;" + NL + "\t\t\t\t}";
-  protected final String TEXT_663 = NL + "\t\t\t\tif (!next.isSetElement() || next.getElement() == null) {" + NL + "\t\t\t\t\tif (next.getSource() == ";
-  protected final String TEXT_664 = ") {" + NL + "\t\t\t\t\t\tint linkVID = ";
-  protected final String TEXT_665 = ".getVisualID(next);" + NL + "\t\t\t\t\t\tswitch (linkVID) {";
-  protected final String TEXT_666 = NL + "\t\t\t\t\t\tcase ";
-  protected final String TEXT_667 = ".VISUAL_ID:";
-  protected final String TEXT_668 = NL + "\t\t\t\t\t\t\tresult.add(next);" + NL + "\t\t\t\t\t\t\tbreak;" + NL + "\t\t\t\t\t\t}" + NL + "\t\t\t\t\t}";
-  protected final String TEXT_669 = NL + "\t\t\t\t} else {";
-  protected final String TEXT_670 = NL + "\t\t\t\t}";
-  protected final String TEXT_671 = NL + "\t\t\t\tif (next.isSetElement() && next.getElement() != null) {";
-  protected final String TEXT_672 = NL + "\t\t\t\t\tif (next.getElement().eContainer() == ";
-  protected final String TEXT_673 = ".getElement()) {" + NL + "\t\t\t\t\t\tint linkVID = ";
-  protected final String TEXT_674 = ".getVisualID(next);" + NL + "\t\t\t\t\t\tswitch (linkVID) {";
-  protected final String TEXT_675 = NL + "\t\t\t\t\t\tcase ";
-  protected final String TEXT_676 = ".VISUAL_ID:";
-  protected final String TEXT_677 = NL + "\t\t\t\t\t\t\tresult.add(next);" + NL + "\t\t\t\t\t\t\tbreak;" + NL + "\t\t\t\t\t\t}" + NL + "\t\t\t\t\t}" + NL + "\t\t\t\t}";
-  protected final String TEXT_678 = NL + "\t\t\t}" + NL + "\t\t\treturn result;" + NL + "\t\t}" + NL + "" + NL + "\t\t/**" + NL + "\t\t * Returns whether a notational edge should be created for the given domain element. " + NL + "\t\t * The generated code always returns ";
-  protected final String TEXT_679 = ". " + NL + "\t\t * User can change implementation of this method to handle a more sophisticated logic." + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tprotected boolean shouldCreateView(";
-  protected final String TEXT_680 = " descriptor) {" + NL + "\t\t\treturn ";
-  protected final String TEXT_681 = ";" + NL + "\t\t}" + NL + "" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tprotected ";
-  protected final String TEXT_682 = " getHost() {" + NL + "\t\t\treturn ";
-  protected final String TEXT_683 = ";" + NL + "\t\t}" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected void refreshLinkNotationModel() {" + NL + "\t\t";
-  protected final String TEXT_684 = " linkRefresher = getLinkNotationModelRefresher();" + NL + "\t\tif (!linkRefresher.isInstalled()) {" + NL + "\t\t\treturn;" + NL + "\t\t}" + NL + "\t\t";
-  protected final String TEXT_685 = " command = linkRefresher.buildRefreshNotationModelCommand();" + NL + "\t\tif (command == null) {" + NL + "\t\t\treturn;" + NL + "\t\t}" + NL + "\t\t";
-  protected final String TEXT_686 = " domainModelEditDomain = ";
-  protected final String TEXT_687 = ".getEditingDomain(";
-  protected final String TEXT_688 = ".getElement());" + NL + "\t\tgetViewer().getEditDomain().getCommandStack().execute(new ";
-  protected final String TEXT_689 = "(domainModelEditDomain, command));" + NL + "\t}";
-  protected final String TEXT_690 = NL;
-  protected final String TEXT_691 = NL;
-  protected final String TEXT_692 = "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate ";
-  protected final String TEXT_693 = " domainModelRefresher = new ";
-  protected final String TEXT_694 = "(this);" + NL;
-  protected final String TEXT_695 = NL;
-  protected final String TEXT_696 = "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic void addRefresher(";
-  protected final String TEXT_697 = " feature, Refresher refresher) {" + NL + "\t\tCompositeRefresher compositeRefresher = getCompositeRefresher(feature);" + NL + "\t\tcompositeRefresher.addRefresher(refresher);" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic void removeRefresher(";
-  protected final String TEXT_698 = " feature, Refresher refresher) {" + NL + "\t\tCompositeRefresher compositeRefresher = getCompositeRefresher(feature);" + NL + "\t\tcompositeRefresher.removeRefresher(refresher);" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate CompositeRefresher getCompositeRefresher(";
-  protected final String TEXT_699 = " feature) {" + NL + "\t\tif (structuralFeatures2Refresher == null) {" + NL + "\t\t\tcreateRefreshers();" + NL + "\t\t}" + NL + "\t\tRefresher refresher = (Refresher) structuralFeatures2Refresher.get(feature);" + NL + "\t\tif (refresher instanceof CompositeRefresher) {" + NL + "\t\t\treturn (CompositeRefresher) refresher;" + NL + "\t\t}" + NL + "\t\tCompositeRefresher result = new CompositeRefresher();" + NL + "\t\tif (refresher != null) {" + NL + "\t\t\tresult.addRefresher(refresher);" + NL + "\t\t}" + NL + "\t\tstructuralFeatures2Refresher.put(feature, result);" + NL + "\t\treturn result;" + NL + "\t}" + NL;
-  protected final String TEXT_700 = NL;
-  protected final String TEXT_701 = NL + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected void refreshFont() {";
-  protected final String TEXT_702 = NL + "\t\t";
-  protected final String TEXT_703 = " style =" + NL + "\t\t\t(";
-  protected final String TEXT_704 = ") ";
-  protected final String TEXT_705 = ".getStyle(" + NL + "\t\t\t\t";
-  protected final String TEXT_706 = ".eINSTANCE.getFontStyle());" + NL + "\t\t";
-  protected final String TEXT_707 = " toDispose = createdFont;" + NL + "\t\tif (style != null) {" + NL + "\t\t\tString fontName = style.getFontName();" + NL + "\t\t\tint fontHeight = style.getFontHeight();" + NL + "\t\t\tint fontStyle = ";
-  protected final String TEXT_708 = ".NORMAL;" + NL + "\t\t\tif (style.isBold()) {" + NL + "\t\t\t\tfontStyle |= ";
-  protected final String TEXT_709 = ".BOLD;" + NL + "\t\t\t}" + NL + "\t\t\tif (style.isItalic()) {" + NL + "\t\t\t\tfontStyle |= ";
-  protected final String TEXT_710 = ".ITALIC;" + NL + "\t\t\t}" + NL + "\t\t\t";
-  protected final String TEXT_711 = " currentFont = getFigure().getFont();" + NL + "\t\t\tif (currentFont != null) {" + NL + "\t\t\t\t";
-  protected final String TEXT_712 = " currentFontData = currentFont.getFontData()[0];" + NL + "\t\t\t\tif (currentFontData.getName().equals(fontName) && currentFontData.getHeight() == fontHeight && currentFontData.getStyle() == fontStyle) {" + NL + "\t\t\t\t\treturn;" + NL + "\t\t\t\t}" + NL + "\t\t\t}" + NL + "\t\t\tcreatedFont = new ";
-  protected final String TEXT_713 = "(null, fontName, fontHeight, fontStyle);" + NL + "\t\t\tgetFigure().setFont(createdFont);" + NL + "\t\t} else {" + NL + "\t\t\t//revert to the default font" + NL + "\t\t\tgetFigure().setFont(getViewer().getControl().getFont());" + NL + "\t\t\tcreatedFont = null;" + NL + "\t\t}" + NL + "\t\tif (toDispose != null) {" + NL + "\t\t\ttoDispose.dispose();" + NL + "\t\t}";
-  protected final String TEXT_714 = "\t" + NL + "\t}";
-  protected final String TEXT_715 = NL + NL + "\t/**" + NL + "\t * The font (created by {@link #refreshFont()}) currently assigned to the label (unless the default font is assigned)." + NL + "\t * Whenever another non-default font is assigned to it, it is safe to dispose the previous one." + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate ";
-  protected final String TEXT_716 = " createdFont;";
-  protected final String TEXT_717 = "\t" + NL;
-  protected final String TEXT_718 = NL;
-  protected final String TEXT_719 = "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected void refreshForegroundColor() {" + NL + "\t\t";
-  protected final String TEXT_720 = " style = (";
-  protected final String TEXT_721 = ")  ";
-  protected final String TEXT_722 = ".getStyle(";
-  protected final String TEXT_723 = ".eINSTANCE.getLineStyle());" + NL + "\t\t";
-  protected final String TEXT_724 = " toDispose = createdForegroundColor;" + NL + "\t\tif (style != null) {" + NL + "\t\t\tint foregroundColor = style.getLineColor();" + NL + "\t\t\tint red = foregroundColor & 0x000000FF;" + NL + "\t\t\tint green = (foregroundColor & 0x0000FF00) >> 8;" + NL + "\t\t\tint blue = (foregroundColor & 0x00FF0000) >> 16;" + NL + "\t\t\t";
-  protected final String TEXT_725 = " currentColor = getFigure().getForegroundColor();" + NL + "\t\t\tif (currentColor != null && currentColor.getRed() == red && currentColor.getGreen() == green && currentColor.getBlue() == blue) {" + NL + "\t\t\t\treturn;" + NL + "\t\t\t}" + NL + "\t\t\tcreatedForegroundColor = new ";
-  protected final String TEXT_726 = "(null, red, green, blue);" + NL + "\t\t\tgetFigure().setForegroundColor(createdForegroundColor);" + NL + "\t\t} else {" + NL + "\t\t\tgetFigure().setForegroundColor(getViewer().getControl().getForeground());" + NL + "\t\t\tcreatedForegroundColor = null;" + NL + "\t\t}" + NL + "\t\tif (toDispose != null) {" + NL + "\t\t\ttoDispose.dispose();" + NL + "\t\t}" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * The color (created by {@link #refreshForegroundColor()}) currently assigned to the figure." + NL + "\t * Whenever another color is assigned to it, it is safe to dispose the previous one." + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate ";
-  protected final String TEXT_727 = " createdForegroundColor;" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected void refreshBackgroundColor() {" + NL + "\t\t";
-  protected final String TEXT_728 = " style = (";
-  protected final String TEXT_729 = ")  ";
-  protected final String TEXT_730 = ".getStyle(";
-  protected final String TEXT_731 = ".eINSTANCE.getFillStyle());" + NL + "\t\t";
-  protected final String TEXT_732 = " toDispose = createdBackgroundColor;" + NL + "\t\tif (style != null) {" + NL + "\t\t\tint backgroundColor = style.getFillColor();" + NL + "\t\t\tint red = backgroundColor & 0x000000FF;" + NL + "\t\t\tint green = (backgroundColor & 0x0000FF00) >> 8;" + NL + "\t\t\tint blue = (backgroundColor & 0x00FF0000) >> 16;" + NL + "\t\t\t";
-  protected final String TEXT_733 = " currentColor = getFigure().getBackgroundColor();" + NL + "\t\t\tif (currentColor != null && currentColor.getRed() == red && currentColor.getGreen() == green && currentColor.getBlue() == blue) {" + NL + "\t\t\t\treturn;" + NL + "\t\t\t}" + NL + "\t\t\tcreatedBackgroundColor = new ";
-  protected final String TEXT_734 = "(null, red, green, blue);" + NL + "\t\t\tgetFigure().setBackgroundColor(createdBackgroundColor);" + NL + "\t\t} else {" + NL + "\t\t\tgetFigure().setBackgroundColor(getViewer().getControl().getBackground());" + NL + "\t\t}" + NL + "\t\tif (toDispose != null) {" + NL + "\t\t\ttoDispose.dispose();" + NL + "\t\t}" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * The color (created by {@link #refreshBackgroundColor()}) currently assigned to the figure." + NL + "\t * Whenever another color is assigned to it, it is safe to dispose the previous one." + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate ";
-  protected final String TEXT_735 = " createdBackgroundColor;" + NL;
-  protected final String TEXT_736 = NL;
-  protected final String TEXT_737 = "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate ";
-  protected final String TEXT_738 = " structuralFeatures2Refresher;" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic Refresher getRefresher(";
-  protected final String TEXT_739 = " feature, ";
-  protected final String TEXT_740 = " msg) {" + NL + "\t\tif (structuralFeatures2Refresher == null) {" + NL + "\t\t\tcreateRefreshers();" + NL + "\t\t}" + NL + "\t\treturn (Refresher) structuralFeatures2Refresher.get(feature);" + NL + "\t}" + NL + "" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate void createRefreshers() {" + NL + "\t\tstructuralFeatures2Refresher = new ";
-  protected final String TEXT_741 = "();";
-  protected final String TEXT_742 = NL;
-  protected final String TEXT_743 = "\t\tRefresher childrenRefresher = new Refresher() {" + NL + "\t\t\tpublic void refresh() {" + NL + "\t\t\t\trefreshChildren();" + NL + "\t\t\t}" + NL + "\t\t};" + NL + "\t\tstructuralFeatures2Refresher.put(";
-  protected final String TEXT_744 = ".eINSTANCE.getView_PersistedChildren(), childrenRefresher);" + NL + "\t\tstructuralFeatures2Refresher.put(";
-  protected final String TEXT_745 = ".eINSTANCE.getView_TransientChildren(), childrenRefresher);";
-  protected final String TEXT_746 = NL;
-  protected final String TEXT_747 = "\t\tRefresher boundsRefresher = new Refresher() {" + NL + "\t\t\tpublic void refresh() {" + NL + "\t\t\t\trefreshBounds();" + NL + "\t\t\t}" + NL + "\t\t};" + NL + "\t\tstructuralFeatures2Refresher.put(";
-  protected final String TEXT_748 = ".eINSTANCE.getNode_LayoutConstraint(), boundsRefresher);" + NL + "\t\tstructuralFeatures2Refresher.put(";
-  protected final String TEXT_749 = ".eINSTANCE.getSize_Width(), boundsRefresher);" + NL + "\t\tstructuralFeatures2Refresher.put(";
-  protected final String TEXT_750 = ".eINSTANCE.getSize_Height(), boundsRefresher);" + NL + "\t\tstructuralFeatures2Refresher.put(";
-  protected final String TEXT_751 = ".eINSTANCE.getLocation_X(), boundsRefresher);" + NL + "\t\tstructuralFeatures2Refresher.put(";
-  protected final String TEXT_752 = ".eINSTANCE.getLocation_Y(), boundsRefresher);";
+  protected final String TEXT_632 = NL + "\t\t";
+  protected final String TEXT_633 = " target = (";
+  protected final String TEXT_634 = ")";
+  protected final String TEXT_635 = ";";
+  protected final String TEXT_636 = NL + "\t\t";
+  protected final String TEXT_637 = " target = ";
+  protected final String TEXT_638 = ".getElement();";
+  protected final String TEXT_639 = NL + "\t\tif (source != null && target != null) {" + NL + "\t\t\tresult.add(new ";
+  protected final String TEXT_640 = "(source, target, nextValue, linkVID));" + NL + "\t\t}";
+  protected final String TEXT_641 = NL + "\t\tbreak;" + NL + "\t}";
+  protected final String TEXT_642 = NL + "\t}";
+  protected final String TEXT_643 = NL + "\t}";
+  protected final String TEXT_644 = NL + "\t}";
+  protected final String TEXT_645 = NL + "\tfor(";
+  protected final String TEXT_646 = " it = ";
+  protected final String TEXT_647 = ".iterator(); it.hasNext(); ) {" + NL + "\t\tnextValue = (";
+  protected final String TEXT_648 = ") it.next();";
+  protected final String TEXT_649 = NL + "\tnextValue = (";
+  protected final String TEXT_650 = ")";
+  protected final String TEXT_651 = ";";
+  protected final String TEXT_652 = NL + "\tif (nextValue != null) {";
+  protected final String TEXT_653 = NL + "\t\tresult.add(new ";
+  protected final String TEXT_654 = "(modelObject, nextValue, null, ";
+  protected final String TEXT_655 = ".VISUAL_ID));";
+  protected final String TEXT_656 = NL + "\t}";
+  protected final String TEXT_657 = NL + "\t}";
+  protected final String TEXT_658 = NL + "\treturn result;" + NL + "\t\t}" + NL + "" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tprotected ";
+  protected final String TEXT_659 = " getNotationalChildLinks() {" + NL + "\t\t\t";
+  protected final String TEXT_660 = " result = new ";
+  protected final String TEXT_661 = "();" + NL + "\t\t\t";
+  protected final String TEXT_662 = " allLinks = ";
+  protected final String TEXT_663 = ".getEdges();" + NL + "\t\t\tfor(";
+  protected final String TEXT_664 = " it = allLinks.iterator(); it.hasNext(); ) {" + NL + "\t\t\t\t";
+  protected final String TEXT_665 = " next = (";
+  protected final String TEXT_666 = ") it.next();";
+  protected final String TEXT_667 = NL + "\t\t\t\tif (next.isSetElement() && next.getElement() != null && next.getElement().eResource() == null) {" + NL + "\t\t\t\t\tresult.add(next);" + NL + "\t\t\t\t\tcontinue;" + NL + "\t\t\t\t}" + NL + "\t\t\t\t";
+  protected final String TEXT_668 = " source = next.getSource();" + NL + "\t\t\t\tif (source == null || (source.isSetElement() && source.getElement() != null && source.getElement().eResource() == null)) {" + NL + "\t\t\t\t\tresult.add(next);" + NL + "\t\t\t\t\tcontinue;" + NL + "\t\t\t\t}" + NL + "\t\t\t\t";
+  protected final String TEXT_669 = " target = next.getTarget();" + NL + "\t\t\t\tif (target == null || (target.isSetElement() && target.getElement() != null && target.getElement().eResource() == null)) {" + NL + "\t\t\t\t\tresult.add(next);" + NL + "\t\t\t\t\tcontinue;" + NL + "\t\t\t\t}";
+  protected final String TEXT_670 = NL + "\t\t\t\tif (!next.isSetElement() || next.getElement() == null) {" + NL + "\t\t\t\t\tif (next.getSource() == ";
+  protected final String TEXT_671 = ") {" + NL + "\t\t\t\t\t\tint linkVID = ";
+  protected final String TEXT_672 = ".getVisualID(next);" + NL + "\t\t\t\t\t\tswitch (linkVID) {";
+  protected final String TEXT_673 = NL + "\t\t\t\t\t\tcase ";
+  protected final String TEXT_674 = ".VISUAL_ID:";
+  protected final String TEXT_675 = NL + "\t\t\t\t\t\t\tresult.add(next);" + NL + "\t\t\t\t\t\t\tbreak;" + NL + "\t\t\t\t\t\t}" + NL + "\t\t\t\t\t}";
+  protected final String TEXT_676 = NL + "\t\t\t\t} else {";
+  protected final String TEXT_677 = NL + "\t\t\t\t}";
+  protected final String TEXT_678 = NL + "\t\t\t\tif (next.isSetElement() && next.getElement() != null) {";
+  protected final String TEXT_679 = NL + "\t\t\t\t\tif (next.getElement().eContainer() == ";
+  protected final String TEXT_680 = ".getElement()) {" + NL + "\t\t\t\t\t\tint linkVID = ";
+  protected final String TEXT_681 = ".getVisualID(next);" + NL + "\t\t\t\t\t\tswitch (linkVID) {";
+  protected final String TEXT_682 = NL + "\t\t\t\t\t\tcase ";
+  protected final String TEXT_683 = ".VISUAL_ID:";
+  protected final String TEXT_684 = NL + "\t\t\t\t\t\t\tresult.add(next);" + NL + "\t\t\t\t\t\t\tbreak;" + NL + "\t\t\t\t\t\t}" + NL + "\t\t\t\t\t}" + NL + "\t\t\t\t}";
+  protected final String TEXT_685 = NL + "\t\t\t}" + NL + "\t\t\treturn result;" + NL + "\t\t}" + NL + "" + NL + "\t\t/**" + NL + "\t\t * Returns whether a notational edge should be created for the given domain element. " + NL + "\t\t * The generated code always returns ";
+  protected final String TEXT_686 = ". " + NL + "\t\t * User can change implementation of this method to handle a more sophisticated logic." + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tprotected boolean shouldCreateView(";
+  protected final String TEXT_687 = " descriptor) {" + NL + "\t\t\treturn ";
+  protected final String TEXT_688 = ";" + NL + "\t\t}" + NL + "" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tprotected ";
+  protected final String TEXT_689 = " getHost() {" + NL + "\t\t\treturn ";
+  protected final String TEXT_690 = ";" + NL + "\t\t}" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected void refreshLinkNotationModel() {" + NL + "\t\t";
+  protected final String TEXT_691 = " linkRefresher = getLinkNotationModelRefresher();" + NL + "\t\tif (!linkRefresher.isInstalled()) {" + NL + "\t\t\treturn;" + NL + "\t\t}" + NL + "\t\t";
+  protected final String TEXT_692 = " command = linkRefresher.buildRefreshNotationModelCommand();" + NL + "\t\tif (command == null) {" + NL + "\t\t\treturn;" + NL + "\t\t}" + NL + "\t\t";
+  protected final String TEXT_693 = " domainModelEditDomain = ";
+  protected final String TEXT_694 = ".getEditingDomain(";
+  protected final String TEXT_695 = ".getElement());" + NL + "\t\tgetViewer().getEditDomain().getCommandStack().execute(new ";
+  protected final String TEXT_696 = "(domainModelEditDomain, command));" + NL + "\t}";
+  protected final String TEXT_697 = NL;
+  protected final String TEXT_698 = NL;
+  protected final String TEXT_699 = "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate ";
+  protected final String TEXT_700 = " domainModelRefresher = new ";
+  protected final String TEXT_701 = "(this);" + NL;
+  protected final String TEXT_702 = NL;
+  protected final String TEXT_703 = "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic void addRefresher(";
+  protected final String TEXT_704 = " feature, Refresher refresher) {" + NL + "\t\tCompositeRefresher compositeRefresher = getCompositeRefresher(feature);" + NL + "\t\tcompositeRefresher.addRefresher(refresher);" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic void removeRefresher(";
+  protected final String TEXT_705 = " feature, Refresher refresher) {" + NL + "\t\tCompositeRefresher compositeRefresher = getCompositeRefresher(feature);" + NL + "\t\tcompositeRefresher.removeRefresher(refresher);" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate CompositeRefresher getCompositeRefresher(";
+  protected final String TEXT_706 = " feature) {" + NL + "\t\tif (structuralFeatures2Refresher == null) {" + NL + "\t\t\tcreateRefreshers();" + NL + "\t\t}" + NL + "\t\tRefresher refresher = (Refresher) structuralFeatures2Refresher.get(feature);" + NL + "\t\tif (refresher instanceof CompositeRefresher) {" + NL + "\t\t\treturn (CompositeRefresher) refresher;" + NL + "\t\t}" + NL + "\t\tCompositeRefresher result = new CompositeRefresher();" + NL + "\t\tif (refresher != null) {" + NL + "\t\t\tresult.addRefresher(refresher);" + NL + "\t\t}" + NL + "\t\tstructuralFeatures2Refresher.put(feature, result);" + NL + "\t\treturn result;" + NL + "\t}" + NL;
+  protected final String TEXT_707 = NL;
+  protected final String TEXT_708 = NL + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected void refreshFont() {";
+  protected final String TEXT_709 = NL + "\t\t";
+  protected final String TEXT_710 = " style =" + NL + "\t\t\t(";
+  protected final String TEXT_711 = ") ";
+  protected final String TEXT_712 = ".getStyle(" + NL + "\t\t\t\t";
+  protected final String TEXT_713 = ".eINSTANCE.getFontStyle());" + NL + "\t\t";
+  protected final String TEXT_714 = " toDispose = createdFont;" + NL + "\t\tif (style != null) {" + NL + "\t\t\tString fontName = style.getFontName();" + NL + "\t\t\tint fontHeight = style.getFontHeight();" + NL + "\t\t\tint fontStyle = ";
+  protected final String TEXT_715 = ".NORMAL;" + NL + "\t\t\tif (style.isBold()) {" + NL + "\t\t\t\tfontStyle |= ";
+  protected final String TEXT_716 = ".BOLD;" + NL + "\t\t\t}" + NL + "\t\t\tif (style.isItalic()) {" + NL + "\t\t\t\tfontStyle |= ";
+  protected final String TEXT_717 = ".ITALIC;" + NL + "\t\t\t}" + NL + "\t\t\t";
+  protected final String TEXT_718 = " currentFont = getFigure().getFont();" + NL + "\t\t\tif (currentFont != null) {" + NL + "\t\t\t\t";
+  protected final String TEXT_719 = " currentFontData = currentFont.getFontData()[0];" + NL + "\t\t\t\tif (currentFontData.getName().equals(fontName) && currentFontData.getHeight() == fontHeight && currentFontData.getStyle() == fontStyle) {" + NL + "\t\t\t\t\treturn;" + NL + "\t\t\t\t}" + NL + "\t\t\t}" + NL + "\t\t\tcreatedFont = new ";
+  protected final String TEXT_720 = "(null, fontName, fontHeight, fontStyle);" + NL + "\t\t\tgetFigure().setFont(createdFont);" + NL + "\t\t} else {" + NL + "\t\t\t//revert to the default font" + NL + "\t\t\tgetFigure().setFont(getViewer().getControl().getFont());" + NL + "\t\t\tcreatedFont = null;" + NL + "\t\t}" + NL + "\t\tif (toDispose != null) {" + NL + "\t\t\ttoDispose.dispose();" + NL + "\t\t}";
+  protected final String TEXT_721 = "\t" + NL + "\t}";
+  protected final String TEXT_722 = NL + NL + "\t/**" + NL + "\t * The font (created by {@link #refreshFont()}) currently assigned to the label (unless the default font is assigned)." + NL + "\t * Whenever another non-default font is assigned to it, it is safe to dispose the previous one." + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate ";
+  protected final String TEXT_723 = " createdFont;";
+  protected final String TEXT_724 = "\t" + NL;
+  protected final String TEXT_725 = NL;
+  protected final String TEXT_726 = "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected void refreshForegroundColor() {" + NL + "\t\t";
+  protected final String TEXT_727 = " style = (";
+  protected final String TEXT_728 = ")  ";
+  protected final String TEXT_729 = ".getStyle(";
+  protected final String TEXT_730 = ".eINSTANCE.getLineStyle());" + NL + "\t\t";
+  protected final String TEXT_731 = " toDispose = createdForegroundColor;" + NL + "\t\tif (style != null) {" + NL + "\t\t\tint foregroundColor = style.getLineColor();" + NL + "\t\t\tint red = foregroundColor & 0x000000FF;" + NL + "\t\t\tint green = (foregroundColor & 0x0000FF00) >> 8;" + NL + "\t\t\tint blue = (foregroundColor & 0x00FF0000) >> 16;" + NL + "\t\t\t";
+  protected final String TEXT_732 = " currentColor = getFigure().getForegroundColor();" + NL + "\t\t\tif (currentColor != null && currentColor.getRed() == red && currentColor.getGreen() == green && currentColor.getBlue() == blue) {" + NL + "\t\t\t\treturn;" + NL + "\t\t\t}" + NL + "\t\t\tcreatedForegroundColor = new ";
+  protected final String TEXT_733 = "(null, red, green, blue);" + NL + "\t\t\tgetFigure().setForegroundColor(createdForegroundColor);" + NL + "\t\t} else {" + NL + "\t\t\tgetFigure().setForegroundColor(getViewer().getControl().getForeground());" + NL + "\t\t\tcreatedForegroundColor = null;" + NL + "\t\t}" + NL + "\t\tif (toDispose != null) {" + NL + "\t\t\ttoDispose.dispose();" + NL + "\t\t}" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * The color (created by {@link #refreshForegroundColor()}) currently assigned to the figure." + NL + "\t * Whenever another color is assigned to it, it is safe to dispose the previous one." + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate ";
+  protected final String TEXT_734 = " createdForegroundColor;" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected void refreshBackgroundColor() {" + NL + "\t\t";
+  protected final String TEXT_735 = " style = (";
+  protected final String TEXT_736 = ")  ";
+  protected final String TEXT_737 = ".getStyle(";
+  protected final String TEXT_738 = ".eINSTANCE.getFillStyle());" + NL + "\t\t";
+  protected final String TEXT_739 = " toDispose = createdBackgroundColor;" + NL + "\t\tif (style != null) {" + NL + "\t\t\tint backgroundColor = style.getFillColor();" + NL + "\t\t\tint red = backgroundColor & 0x000000FF;" + NL + "\t\t\tint green = (backgroundColor & 0x0000FF00) >> 8;" + NL + "\t\t\tint blue = (backgroundColor & 0x00FF0000) >> 16;" + NL + "\t\t\t";
+  protected final String TEXT_740 = " currentColor = getFigure().getBackgroundColor();" + NL + "\t\t\tif (currentColor != null && currentColor.getRed() == red && currentColor.getGreen() == green && currentColor.getBlue() == blue) {" + NL + "\t\t\t\treturn;" + NL + "\t\t\t}" + NL + "\t\t\tcreatedBackgroundColor = new ";
+  protected final String TEXT_741 = "(null, red, green, blue);" + NL + "\t\t\tgetFigure().setBackgroundColor(createdBackgroundColor);" + NL + "\t\t} else {" + NL + "\t\t\tgetFigure().setBackgroundColor(getViewer().getControl().getBackground());" + NL + "\t\t}" + NL + "\t\tif (toDispose != null) {" + NL + "\t\t\ttoDispose.dispose();" + NL + "\t\t}" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * The color (created by {@link #refreshBackgroundColor()}) currently assigned to the figure." + NL + "\t * Whenever another color is assigned to it, it is safe to dispose the previous one." + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate ";
+  protected final String TEXT_742 = " createdBackgroundColor;" + NL;
+  protected final String TEXT_743 = NL;
+  protected final String TEXT_744 = "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate ";
+  protected final String TEXT_745 = " structuralFeatures2Refresher;" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic Refresher getRefresher(";
+  protected final String TEXT_746 = " feature, ";
+  protected final String TEXT_747 = " msg) {" + NL + "\t\tif (structuralFeatures2Refresher == null) {" + NL + "\t\t\tcreateRefreshers();" + NL + "\t\t}" + NL + "\t\treturn (Refresher) structuralFeatures2Refresher.get(feature);" + NL + "\t}" + NL + "" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate void createRefreshers() {" + NL + "\t\tstructuralFeatures2Refresher = new ";
+  protected final String TEXT_748 = "();";
+  protected final String TEXT_749 = NL;
+  protected final String TEXT_750 = "\t\tRefresher childrenRefresher = new Refresher() {" + NL + "\t\t\tpublic void refresh() {" + NL + "\t\t\t\trefreshChildren();" + NL + "\t\t\t}" + NL + "\t\t};" + NL + "\t\tstructuralFeatures2Refresher.put(";
+  protected final String TEXT_751 = ".eINSTANCE.getView_PersistedChildren(), childrenRefresher);" + NL + "\t\tstructuralFeatures2Refresher.put(";
+  protected final String TEXT_752 = ".eINSTANCE.getView_TransientChildren(), childrenRefresher);";
   protected final String TEXT_753 = NL;
-  protected final String TEXT_754 = "\t\tRefresher visibilityRefresher = new Refresher() {" + NL + "\t\t\tpublic void refresh() {" + NL + "\t\t\t\trefreshVisibility();" + NL + "\t\t\t}" + NL + "\t\t};" + NL + "\t\tstructuralFeatures2Refresher.put(";
-  protected final String TEXT_755 = ".eINSTANCE.getView_Visible(), visibilityRefresher);";
-  protected final String TEXT_756 = NL;
-  protected final String TEXT_757 = "\t\tRefresher sourceEdgesRefresher = new Refresher() {" + NL + "\t\t\tpublic void refresh() {" + NL + "\t\t\t\trefreshSourceConnections();" + NL + "\t\t\t}" + NL + "\t\t};" + NL + "\t\tstructuralFeatures2Refresher.put(";
-  protected final String TEXT_758 = ".eINSTANCE.getView_SourceEdges(), sourceEdgesRefresher);";
-  protected final String TEXT_759 = NL;
-  protected final String TEXT_760 = "\t\tRefresher targetEdgesRefresher = new Refresher() {" + NL + "\t\t\tpublic void refresh() {" + NL + "\t\t\t\trefreshTargetConnections();" + NL + "\t\t\t}" + NL + "\t\t};" + NL + "\t\tstructuralFeatures2Refresher.put(";
-  protected final String TEXT_761 = ".eINSTANCE.getView_TargetEdges(), targetEdgesRefresher);";
-  protected final String TEXT_762 = NL;
-  protected final String TEXT_763 = "\t\tRefresher fontRefresher = new Refresher() {" + NL + "\t\t\tpublic void refresh() {" + NL + "\t\t\t\trefreshFont();" + NL + "\t\t\t}" + NL + "\t\t};" + NL + "\t\tstructuralFeatures2Refresher.put(";
-  protected final String TEXT_764 = ".eINSTANCE.getFontStyle_FontHeight(), fontRefresher);" + NL + "\t\tstructuralFeatures2Refresher.put(";
-  protected final String TEXT_765 = ".eINSTANCE.getFontStyle_FontName(), fontRefresher);" + NL + "\t\tstructuralFeatures2Refresher.put(";
-  protected final String TEXT_766 = ".eINSTANCE.getFontStyle_Bold(), fontRefresher);" + NL + "\t\tstructuralFeatures2Refresher.put(";
-  protected final String TEXT_767 = ".eINSTANCE.getFontStyle_Italic(), fontRefresher);" + NL + "\t\t";
-  protected final String TEXT_768 = NL;
-  protected final String TEXT_769 = "\t\tRefresher backgroundColorRefresher = new Refresher() {" + NL + "\t\t\tpublic void refresh() {" + NL + "\t\t\t\trefreshBackgroundColor();" + NL + "\t\t\t}" + NL + "\t\t};" + NL + "\t\tstructuralFeatures2Refresher.put(";
-  protected final String TEXT_770 = ".eINSTANCE.getFillStyle_FillColor(), backgroundColorRefresher);" + NL + "\t\tRefresher foregroundColorRefresher = new Refresher() {" + NL + "\t\t\tpublic void refresh() {" + NL + "\t\t\t\trefreshForegroundColor();" + NL + "\t\t\t}" + NL + "\t\t};" + NL + "\t\tstructuralFeatures2Refresher.put(";
-  protected final String TEXT_771 = ".eINSTANCE.getLineStyle_LineColor(), foregroundColorRefresher);" + NL + "\t}" + NL;
-  protected final String TEXT_772 = NL;
-  protected final String TEXT_773 = "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate ";
-  protected final String TEXT_774 = "static ";
-  protected final String TEXT_775 = "class Create";
-  protected final String TEXT_776 = "NotationCommand extends ";
-  protected final String TEXT_777 = " {" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tprivate Create";
-  protected final String TEXT_778 = "NotationCommand(";
-  protected final String TEXT_779 = " parent, " + NL + "\t\t\t\t";
-  protected final String TEXT_780 = " domainElement";
-  protected final String TEXT_781 = ", ";
-  protected final String TEXT_782 = " constraint";
-  protected final String TEXT_783 = ") {" + NL + "\t\t\tsuper(parent);" + NL + "\t\t\tNode createdNode = ";
-  protected final String TEXT_784 = ".eINSTANCE.createNode();" + NL + "\t\t\tsetCreatedView(createdNode);" + NL + "\t\t\tcreatedNode.setElement(domainElement);" + NL + "\t\t\t";
-  protected final String TEXT_785 = ".decorateView(createdNode);";
-  protected final String TEXT_786 = NL + "\t\t\t";
-  protected final String TEXT_787 = " bounds = ";
-  protected final String TEXT_788 = ".eINSTANCE.createBounds();" + NL + "\t\t\tcreatedNode.setLayoutConstraint(bounds);" + NL + "\t\t\tbounds.setX(constraint.x);" + NL + "\t\t\tbounds.setY(constraint.y);";
-  protected final String TEXT_789 = NL + "\t\t\tbounds.setWidth(Math.max(constraint.width, ";
-  protected final String TEXT_790 = "));" + NL + "\t\t\tbounds.setHeight(Math.max(constraint.height, ";
-  protected final String TEXT_791 = "));";
-  protected final String TEXT_792 = NL + "\t\t}" + NL + "\t}" + NL;
-  protected final String TEXT_793 = NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate ";
-  protected final String TEXT_794 = "static ";
-  protected final String TEXT_795 = "class Create";
-  protected final String TEXT_796 = "Command extends ";
-  protected final String TEXT_797 = " {" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tprivate final Create";
-  protected final String TEXT_798 = "NotationCommand notationAddCommand;" + NL + "" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tpublic Create";
-  protected final String TEXT_799 = "Command(";
-  protected final String TEXT_800 = " parent, ";
-  protected final String TEXT_801 = " request";
-  protected final String TEXT_802 = ", ";
-  protected final String TEXT_803 = " constraint";
-  protected final String TEXT_804 = ") {" + NL + "\t\t\t";
-  protected final String TEXT_805 = " domainModelEditDomain = ";
-  protected final String TEXT_806 = ".getEditingDomain(parent.getDiagram().getElement());";
-  protected final String TEXT_807 = NL + "\t\t\t";
-  protected final String TEXT_808 = " createdDomainElement = ";
-  protected final String TEXT_809 = ".eINSTANCE.create(" + NL + "\t\t\t\t";
-  protected final String TEXT_810 = ".eINSTANCE.get";
-  protected final String TEXT_811 = "());";
-  protected final String TEXT_812 = NL + "\t\t\t";
-  protected final String TEXT_813 = " createdDomainElement = ";
-  protected final String TEXT_814 = ".eINSTANCE.create";
-  protected final String TEXT_815 = "();";
-  protected final String TEXT_816 = NL + "\t\t\t";
-  protected final String TEXT_817 = NL + "\t\t\t";
-  protected final String TEXT_818 = ".";
-  protected final String TEXT_819 = ".initializeElement(";
-  protected final String TEXT_820 = "(";
-  protected final String TEXT_821 = ") ";
-  protected final String TEXT_822 = "createdDomainElement);";
+  protected final String TEXT_754 = "\t\tRefresher boundsRefresher = new Refresher() {" + NL + "\t\t\tpublic void refresh() {" + NL + "\t\t\t\trefreshBounds();" + NL + "\t\t\t}" + NL + "\t\t};" + NL + "\t\tstructuralFeatures2Refresher.put(";
+  protected final String TEXT_755 = ".eINSTANCE.getNode_LayoutConstraint(), boundsRefresher);" + NL + "\t\tstructuralFeatures2Refresher.put(";
+  protected final String TEXT_756 = ".eINSTANCE.getSize_Width(), boundsRefresher);" + NL + "\t\tstructuralFeatures2Refresher.put(";
+  protected final String TEXT_757 = ".eINSTANCE.getSize_Height(), boundsRefresher);" + NL + "\t\tstructuralFeatures2Refresher.put(";
+  protected final String TEXT_758 = ".eINSTANCE.getLocation_X(), boundsRefresher);" + NL + "\t\tstructuralFeatures2Refresher.put(";
+  protected final String TEXT_759 = ".eINSTANCE.getLocation_Y(), boundsRefresher);";
+  protected final String TEXT_760 = NL;
+  protected final String TEXT_761 = "\t\tRefresher visibilityRefresher = new Refresher() {" + NL + "\t\t\tpublic void refresh() {" + NL + "\t\t\t\trefreshVisibility();" + NL + "\t\t\t}" + NL + "\t\t};" + NL + "\t\tstructuralFeatures2Refresher.put(";
+  protected final String TEXT_762 = ".eINSTANCE.getView_Visible(), visibilityRefresher);";
+  protected final String TEXT_763 = NL;
+  protected final String TEXT_764 = "\t\tRefresher sourceEdgesRefresher = new Refresher() {" + NL + "\t\t\tpublic void refresh() {" + NL + "\t\t\t\trefreshSourceConnections();" + NL + "\t\t\t}" + NL + "\t\t};" + NL + "\t\tstructuralFeatures2Refresher.put(";
+  protected final String TEXT_765 = ".eINSTANCE.getView_SourceEdges(), sourceEdgesRefresher);";
+  protected final String TEXT_766 = NL;
+  protected final String TEXT_767 = "\t\tRefresher targetEdgesRefresher = new Refresher() {" + NL + "\t\t\tpublic void refresh() {" + NL + "\t\t\t\trefreshTargetConnections();" + NL + "\t\t\t}" + NL + "\t\t};" + NL + "\t\tstructuralFeatures2Refresher.put(";
+  protected final String TEXT_768 = ".eINSTANCE.getView_TargetEdges(), targetEdgesRefresher);";
+  protected final String TEXT_769 = NL;
+  protected final String TEXT_770 = "\t\tRefresher fontRefresher = new Refresher() {" + NL + "\t\t\tpublic void refresh() {" + NL + "\t\t\t\trefreshFont();" + NL + "\t\t\t}" + NL + "\t\t};" + NL + "\t\tstructuralFeatures2Refresher.put(";
+  protected final String TEXT_771 = ".eINSTANCE.getFontStyle_FontHeight(), fontRefresher);" + NL + "\t\tstructuralFeatures2Refresher.put(";
+  protected final String TEXT_772 = ".eINSTANCE.getFontStyle_FontName(), fontRefresher);" + NL + "\t\tstructuralFeatures2Refresher.put(";
+  protected final String TEXT_773 = ".eINSTANCE.getFontStyle_Bold(), fontRefresher);" + NL + "\t\tstructuralFeatures2Refresher.put(";
+  protected final String TEXT_774 = ".eINSTANCE.getFontStyle_Italic(), fontRefresher);" + NL + "\t\t";
+  protected final String TEXT_775 = NL;
+  protected final String TEXT_776 = "\t\tRefresher backgroundColorRefresher = new Refresher() {" + NL + "\t\t\tpublic void refresh() {" + NL + "\t\t\t\trefreshBackgroundColor();" + NL + "\t\t\t}" + NL + "\t\t};" + NL + "\t\tstructuralFeatures2Refresher.put(";
+  protected final String TEXT_777 = ".eINSTANCE.getFillStyle_FillColor(), backgroundColorRefresher);" + NL + "\t\tRefresher foregroundColorRefresher = new Refresher() {" + NL + "\t\t\tpublic void refresh() {" + NL + "\t\t\t\trefreshForegroundColor();" + NL + "\t\t\t}" + NL + "\t\t};" + NL + "\t\tstructuralFeatures2Refresher.put(";
+  protected final String TEXT_778 = ".eINSTANCE.getLineStyle_LineColor(), foregroundColorRefresher);" + NL + "\t}" + NL;
+  protected final String TEXT_779 = NL;
+  protected final String TEXT_780 = "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate ";
+  protected final String TEXT_781 = "static ";
+  protected final String TEXT_782 = "class Create";
+  protected final String TEXT_783 = "NotationCommand extends ";
+  protected final String TEXT_784 = " {" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tprivate Create";
+  protected final String TEXT_785 = "NotationCommand(";
+  protected final String TEXT_786 = " parent, " + NL + "\t\t\t\t";
+  protected final String TEXT_787 = " domainElement";
+  protected final String TEXT_788 = ", ";
+  protected final String TEXT_789 = " constraint";
+  protected final String TEXT_790 = ") {" + NL + "\t\t\tsuper(parent);" + NL + "\t\t\tNode createdNode = ";
+  protected final String TEXT_791 = ".eINSTANCE.createNode();" + NL + "\t\t\tsetCreatedView(createdNode);" + NL + "\t\t\tcreatedNode.setElement(domainElement);" + NL + "\t\t\t";
+  protected final String TEXT_792 = ".decorateView(createdNode);";
+  protected final String TEXT_793 = NL + "\t\t\t";
+  protected final String TEXT_794 = " bounds = ";
+  protected final String TEXT_795 = ".eINSTANCE.createBounds();" + NL + "\t\t\tcreatedNode.setLayoutConstraint(bounds);" + NL + "\t\t\tbounds.setX(constraint.x);" + NL + "\t\t\tbounds.setY(constraint.y);";
+  protected final String TEXT_796 = NL + "\t\t\tbounds.setWidth(Math.max(constraint.width, ";
+  protected final String TEXT_797 = "));" + NL + "\t\t\tbounds.setHeight(Math.max(constraint.height, ";
+  protected final String TEXT_798 = "));";
+  protected final String TEXT_799 = NL + "\t\t}" + NL + "\t}" + NL;
+  protected final String TEXT_800 = NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate ";
+  protected final String TEXT_801 = "static ";
+  protected final String TEXT_802 = "class Create";
+  protected final String TEXT_803 = "Command extends ";
+  protected final String TEXT_804 = " {" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tprivate final Create";
+  protected final String TEXT_805 = "NotationCommand notationAddCommand;" + NL + "" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tpublic Create";
+  protected final String TEXT_806 = "Command(";
+  protected final String TEXT_807 = " parent, ";
+  protected final String TEXT_808 = " request";
+  protected final String TEXT_809 = ", ";
+  protected final String TEXT_810 = " constraint";
+  protected final String TEXT_811 = ") {" + NL + "\t\t\t";
+  protected final String TEXT_812 = " domainModelEditDomain = ";
+  protected final String TEXT_813 = ".getEditingDomain(parent.getDiagram().getElement());";
+  protected final String TEXT_814 = NL + "\t\t\t";
+  protected final String TEXT_815 = " createdDomainElement = ";
+  protected final String TEXT_816 = ".eINSTANCE.create(" + NL + "\t\t\t\t";
+  protected final String TEXT_817 = ".eINSTANCE.get";
+  protected final String TEXT_818 = "());";
+  protected final String TEXT_819 = NL + "\t\t\t";
+  protected final String TEXT_820 = " createdDomainElement = ";
+  protected final String TEXT_821 = ".eINSTANCE.create";
+  protected final String TEXT_822 = "();";
   protected final String TEXT_823 = NL + "\t\t\t";
-  protected final String TEXT_824 = " compoundCommand = new ";
-  protected final String TEXT_825 = "();" + NL + "\t\t\tcompoundCommand.append(";
-  protected final String TEXT_826 = ".create(domainModelEditDomain, ";
-  protected final String TEXT_827 = ", " + NL + "\t\t\t\t";
-  protected final String TEXT_828 = ".eINSTANCE.get";
-  protected final String TEXT_829 = "(), createdDomainElement));" + NL + "\t\t\tcompoundCommand.append(";
-  protected final String TEXT_830 = ".create(domainModelEditDomain, ";
-  protected final String TEXT_831 = ", " + NL + "\t\t\t\t";
-  protected final String TEXT_832 = ".eINSTANCE.get";
-  protected final String TEXT_833 = "(), createdDomainElement));" + NL + "\t\t\tthis.domainModelAddCommand = compoundCommand;";
-  protected final String TEXT_834 = NL + "\t\t\tthis.domainModelAddCommand = ";
-  protected final String TEXT_835 = ".create(domainModelEditDomain, ";
-  protected final String TEXT_836 = ", " + NL + "\t\t\t\t";
-  protected final String TEXT_837 = ".eINSTANCE.get";
-  protected final String TEXT_838 = "(), createdDomainElement);";
-  protected final String TEXT_839 = NL + "\t\t\tthis.notationAddCommand = new Create";
-  protected final String TEXT_840 = "NotationCommand(parent, ";
-  protected final String TEXT_841 = "(";
-  protected final String TEXT_842 = ") ";
-  protected final String TEXT_843 = "createdDomainElement";
-  protected final String TEXT_844 = ", constraint";
-  protected final String TEXT_845 = ");" + NL + "\t\t\trequest.setCreatedObject(notationAddCommand.getCreatedView());" + NL + "\t\t}" + NL + "" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tprivate final org.eclipse.emf.common.command.Command domainModelAddCommand;" + NL + "" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tpublic boolean canExecute() {" + NL + "\t\t\treturn domainModelAddCommand != null" + NL + "\t\t\t\t\t&& domainModelAddCommand.canExecute() && notationAddCommand != null && notationAddCommand.canExecute();" + NL + "\t\t}" + NL + "" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tpublic boolean canUndo() {" + NL + "\t\t\treturn domainModelAddCommand != null" + NL + "\t\t\t\t\t&& domainModelAddCommand.canUndo() && notationAddCommand != null && notationAddCommand.canUndo();" + NL + "\t\t}" + NL + "" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tpublic void execute() {" + NL + "\t\t\tdomainModelAddCommand.execute();" + NL + "\t\t\tnotationAddCommand.execute();" + NL + "\t\t}" + NL + "" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tpublic void undo() {" + NL + "\t\t\tnotationAddCommand.undo();" + NL + "\t\t\tdomainModelAddCommand.undo();" + NL + "\t\t}" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tpublic void redo() {" + NL + "\t\t\texecute();" + NL + "\t\t}" + NL + "\t}";
-  protected final String TEXT_846 = NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate static class Reconnect";
-  protected final String TEXT_847 = "SourceCommand extends ";
-  protected final String TEXT_848 = " {" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tprivate ";
-  protected final String TEXT_849 = " edge;" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tprivate ";
-  protected final String TEXT_850 = " newSource;" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tprivate ";
-  protected final String TEXT_851 = " oldSource;" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tprivate ";
-  protected final String TEXT_852 = " reconnectCommand;" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tpublic Reconnect";
-  protected final String TEXT_853 = "SourceCommand(";
-  protected final String TEXT_854 = " request) {" + NL + "\t\t\tthis((";
-  protected final String TEXT_855 = ")request.getConnectionEditPart().getModel(), (";
-  protected final String TEXT_856 = ")request.getTarget().getModel());" + NL + "\t\t}" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tpublic Reconnect";
-  protected final String TEXT_857 = "SourceCommand(";
-  protected final String TEXT_858 = " edge, ";
-  protected final String TEXT_859 = " newSource) {" + NL + "\t\t\tthis.edge = edge;" + NL + "\t\t\tthis.newSource = newSource;" + NL + "\t\t\tthis.oldSource = edge.getSource();" + NL + "\t\t}" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tpublic void execute() {" + NL + "\t\t\treconnectCommand.execute();" + NL + "\t\t}" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tpublic boolean canUndo() {" + NL + "\t\t\treturn reconnectCommand.canUndo();" + NL + "\t\t}" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tpublic void undo() {" + NL + "\t\t\treconnectCommand.undo();" + NL + "\t\t}" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tpublic void redo() {" + NL + "\t\t\texecute();" + NL + "\t\t}" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tprotected boolean prepare() {";
-  protected final String TEXT_860 = NL + "\t\t\tfinal boolean[] resultHolder = new boolean[1];" + NL + "\t\t\t//To validate the reconnection against constraints, the current link should be deleted. Of course, we must then undo its deletion." + NL + "\t\t\tfinal ";
-  protected final String TEXT_861 = " domainModelEditDomain = ";
-  protected final String TEXT_862 = ".getEditingDomain(oldSource.getDiagram().getElement());" + NL + "\t\t\t";
-  protected final String TEXT_863 = " command = new ";
-  protected final String TEXT_864 = "() {" + NL + "\t\t\t\tprivate ";
-  protected final String TEXT_865 = " deleteCommand = createDomainModelRemoveCommand(domainModelEditDomain);" + NL + "\t\t\t\tpublic boolean canExecute() {" + NL + "\t\t\t\t\treturn deleteCommand.canExecute();" + NL + "\t\t\t\t}" + NL + "\t\t\t\tpublic boolean canUndo() {" + NL + "\t\t\t\t\treturn true;" + NL + "\t\t\t\t}" + NL + "\t\t\t\tpublic void redo() {" + NL + "\t\t\t\t}" + NL + "\t\t\t\tpublic void undo() {" + NL + "\t\t\t\t}" + NL + "\t\t\t\tpublic void execute() {" + NL + "\t\t\t\t\tdeleteCommand.execute();" + NL + "\t\t\t\t\ttry {" + NL + "\t\t\t\t\t\tresultHolder[0] = canReconnect();" + NL + "\t\t\t\t\t} finally {" + NL + "\t\t\t\t\t\tdeleteCommand.undo();" + NL + "\t\t\t\t\t}" + NL + "\t\t\t\t}" + NL + "\t\t\t};" + NL + "\t\t\tif (!command.canExecute()) {" + NL + "\t\t\t\treturn false;" + NL + "\t\t\t}" + NL + "\t\t\tnew ";
-  protected final String TEXT_866 = "(domainModelEditDomain, command).execute();" + NL + "\t\t\tif (resultHolder[0]) {" + NL + "\t\t\t\treconnectCommand = createReconnectCommand();" + NL + "\t\t\t}" + NL + "\t\t\treturn resultHolder[0] && reconnectCommand.canExecute();";
-  protected final String TEXT_867 = NL + "\t\t\tif (canReconnect()) {" + NL + "\t\t\t\treconnectCommand = createReconnectCommand();" + NL + "\t\t\t\treturn reconnectCommand.canExecute();" + NL + "\t\t\t}" + NL + "\t\t\treturn false;";
-  protected final String TEXT_868 = NL + "\t\t}" + NL + "" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tprivate boolean canReconnect() {";
-  protected final String TEXT_869 = NL + "\t\t\treturn false;";
-  protected final String TEXT_870 = NL + "\t\t\t";
-  protected final String TEXT_871 = " container = (";
-  protected final String TEXT_872 = ")getRelationshipContainer(newSource.getElement(), ";
-  protected final String TEXT_873 = ".eINSTANCE.get";
-  protected final String TEXT_874 = "());" + NL + "\t\t\tif (container == null) {" + NL + "\t\t\t\treturn false;" + NL + "\t\t\t}";
-  protected final String TEXT_875 = NL;
-  protected final String TEXT_876 = NL + "\t\tif (";
-  protected final String TEXT_877 = " != null) {" + NL + "\t\t\t";
-  protected final String TEXT_878 = NL + "\t\t}";
-  protected final String TEXT_879 = NL + "\t\tif (";
-  protected final String TEXT_880 = ".size() >= ";
-  protected final String TEXT_881 = ".eINSTANCE.get";
-  protected final String TEXT_882 = ".getUpperBound()) {" + NL + "\t\t\t";
-  protected final String TEXT_883 = NL + "\t\t}";
-  protected final String TEXT_884 = NL;
-  protected final String TEXT_885 = NL + "\t\tif (";
-  protected final String TEXT_886 = " != null) {" + NL + "\t\t\t";
-  protected final String TEXT_887 = NL + "\t\t}";
-  protected final String TEXT_888 = NL + "\t\tif (";
-  protected final String TEXT_889 = ".size() >= ";
-  protected final String TEXT_890 = ".eINSTANCE.get";
-  protected final String TEXT_891 = ".getUpperBound()) {" + NL + "\t\t\t";
-  protected final String TEXT_892 = NL + "\t\t}";
-  protected final String TEXT_893 = NL;
-  protected final String TEXT_894 = NL + "\t\t\tif(!";
-  protected final String TEXT_895 = ".canCreateLink(";
-  protected final String TEXT_896 = ", ";
-  protected final String TEXT_897 = ", false)) {" + NL + "\t\t\t\treturn false;" + NL + "\t\t\t}";
-  protected final String TEXT_898 = NL + "\t\t\treturn true;";
-  protected final String TEXT_899 = NL;
-  protected final String TEXT_900 = NL + "\t\tif (";
-  protected final String TEXT_901 = " != null) {" + NL + "\t\t\t";
-  protected final String TEXT_902 = NL + "\t\t}";
-  protected final String TEXT_903 = NL + "\t\tif (";
-  protected final String TEXT_904 = ".size() >= ";
-  protected final String TEXT_905 = ".eINSTANCE.get";
-  protected final String TEXT_906 = ".getUpperBound()) {" + NL + "\t\t\t";
-  protected final String TEXT_907 = NL + "\t\t}";
-  protected final String TEXT_908 = NL;
-  protected final String TEXT_909 = NL + "\t\t\tif(!";
-  protected final String TEXT_910 = ".canCreateLink(";
-  protected final String TEXT_911 = ", ";
-  protected final String TEXT_912 = ", false)) {" + NL + "\t\t\t\treturn false;" + NL + "\t\t\t}";
-  protected final String TEXT_913 = NL + "\t\t\treturn true;";
-  protected final String TEXT_914 = NL + "\t\t\treturn false;";
-  protected final String TEXT_915 = NL + "\t\t}" + NL + "" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tprivate ";
-  protected final String TEXT_916 = " createReconnectCommand() {" + NL + "\t\t\t";
-  protected final String TEXT_917 = " editingDomain = ";
-  protected final String TEXT_918 = ".getEditingDomain(oldSource.getDiagram().getElement());" + NL + "\t\t\t";
-  protected final String TEXT_919 = " result = new ";
-  protected final String TEXT_920 = "();" + NL + "\t\t\tresult.append(new ";
-  protected final String TEXT_921 = "(edge, newSource));";
-  protected final String TEXT_922 = NL + "\t\t\t";
-  protected final String TEXT_923 = " container = getRelationshipContainer(newSource.getElement(), ";
-  protected final String TEXT_924 = ".eINSTANCE.get";
-  protected final String TEXT_925 = "());" + NL + "\t\t\tif (container == null) {" + NL + "\t\t\t\treturn ";
-  protected final String TEXT_926 = ".INSTANCE;" + NL + "\t\t\t}" + NL + "\t\t\t";
-  protected final String TEXT_927 = " oldContainer = edge.getElement().eContainer();" + NL + "\t\t\tif (oldContainer == null) {" + NL + "\t\t\t\treturn ";
-  protected final String TEXT_928 = ".INSTANCE;" + NL + "\t\t\t}" + NL + "\t\t\tif (oldContainer != container) {";
-  protected final String TEXT_929 = NL + "\t\t\t\tresult.append(";
-  protected final String TEXT_930 = ".create(" + NL + "\t\t\t\t\teditingDomain," + NL + "\t\t\t\t\tedge.getElement().eContainer(), edge.getElement().eContainmentFeature(), edge.getElement()));";
-  protected final String TEXT_931 = NL + "\t\t\t\tresult.append(";
-  protected final String TEXT_932 = ".create(" + NL + "\t\t\t\t\teditingDomain," + NL + "\t\t\t\t\tedge.getElement().eContainer(), edge.getElement().eContainmentFeature(), ";
-  protected final String TEXT_933 = ".UNSET_VALUE));";
-  protected final String TEXT_934 = NL + "\t\t\t\tresult.append(";
-  protected final String TEXT_935 = ".create(" + NL + "\t\t\t\t\teditingDomain," + NL + "\t\t\t\t\tcontainer, ";
-  protected final String TEXT_936 = ".eINSTANCE.get";
-  protected final String TEXT_937 = "(), edge.getElement()));";
+  protected final String TEXT_824 = NL + "\t\t\t";
+  protected final String TEXT_825 = ".";
+  protected final String TEXT_826 = ".initializeElement(";
+  protected final String TEXT_827 = "(";
+  protected final String TEXT_828 = ") ";
+  protected final String TEXT_829 = "createdDomainElement);";
+  protected final String TEXT_830 = NL + "\t\t\t";
+  protected final String TEXT_831 = " compoundCommand = new ";
+  protected final String TEXT_832 = "();" + NL + "\t\t\tcompoundCommand.append(";
+  protected final String TEXT_833 = ".create(domainModelEditDomain, ";
+  protected final String TEXT_834 = ", " + NL + "\t\t\t\t";
+  protected final String TEXT_835 = ".eINSTANCE.get";
+  protected final String TEXT_836 = "(), createdDomainElement));" + NL + "\t\t\tcompoundCommand.append(";
+  protected final String TEXT_837 = ".create(domainModelEditDomain, ";
+  protected final String TEXT_838 = ", " + NL + "\t\t\t\t";
+  protected final String TEXT_839 = ".eINSTANCE.get";
+  protected final String TEXT_840 = "(), createdDomainElement));" + NL + "\t\t\tthis.domainModelAddCommand = compoundCommand;";
+  protected final String TEXT_841 = NL + "\t\t\tthis.domainModelAddCommand = ";
+  protected final String TEXT_842 = ".create(domainModelEditDomain, ";
+  protected final String TEXT_843 = ", " + NL + "\t\t\t\t";
+  protected final String TEXT_844 = ".eINSTANCE.get";
+  protected final String TEXT_845 = "(), createdDomainElement);";
+  protected final String TEXT_846 = NL + "\t\t\tthis.notationAddCommand = new Create";
+  protected final String TEXT_847 = "NotationCommand(parent, ";
+  protected final String TEXT_848 = "(";
+  protected final String TEXT_849 = ") ";
+  protected final String TEXT_850 = "createdDomainElement";
+  protected final String TEXT_851 = ", constraint";
+  protected final String TEXT_852 = ");" + NL + "\t\t\trequest.setCreatedObject(notationAddCommand.getCreatedView());" + NL + "\t\t}" + NL + "" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tprivate final org.eclipse.emf.common.command.Command domainModelAddCommand;" + NL + "" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tpublic boolean canExecute() {" + NL + "\t\t\treturn domainModelAddCommand != null" + NL + "\t\t\t\t\t&& domainModelAddCommand.canExecute() && notationAddCommand != null && notationAddCommand.canExecute();" + NL + "\t\t}" + NL + "" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tpublic boolean canUndo() {" + NL + "\t\t\treturn domainModelAddCommand != null" + NL + "\t\t\t\t\t&& domainModelAddCommand.canUndo() && notationAddCommand != null && notationAddCommand.canUndo();" + NL + "\t\t}" + NL + "" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tpublic void execute() {" + NL + "\t\t\tdomainModelAddCommand.execute();" + NL + "\t\t\tnotationAddCommand.execute();" + NL + "\t\t}" + NL + "" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tpublic void undo() {" + NL + "\t\t\tnotationAddCommand.undo();" + NL + "\t\t\tdomainModelAddCommand.undo();" + NL + "\t\t}" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tpublic void redo() {" + NL + "\t\t\texecute();" + NL + "\t\t}" + NL + "\t}";
+  protected final String TEXT_853 = NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate static class Reconnect";
+  protected final String TEXT_854 = "SourceCommand extends ";
+  protected final String TEXT_855 = " {" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tprivate ";
+  protected final String TEXT_856 = " edge;" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tprivate ";
+  protected final String TEXT_857 = " newSource;" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tprivate ";
+  protected final String TEXT_858 = " oldSource;" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tprivate ";
+  protected final String TEXT_859 = " reconnectCommand;" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tpublic Reconnect";
+  protected final String TEXT_860 = "SourceCommand(";
+  protected final String TEXT_861 = " request) {" + NL + "\t\t\tthis((";
+  protected final String TEXT_862 = ")request.getConnectionEditPart().getModel(), (";
+  protected final String TEXT_863 = ")request.getTarget().getModel());" + NL + "\t\t}" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tpublic Reconnect";
+  protected final String TEXT_864 = "SourceCommand(";
+  protected final String TEXT_865 = " edge, ";
+  protected final String TEXT_866 = " newSource) {" + NL + "\t\t\tthis.edge = edge;" + NL + "\t\t\tthis.newSource = newSource;" + NL + "\t\t\tthis.oldSource = edge.getSource();" + NL + "\t\t}" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tpublic void execute() {" + NL + "\t\t\treconnectCommand.execute();" + NL + "\t\t}" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tpublic boolean canUndo() {" + NL + "\t\t\treturn reconnectCommand.canUndo();" + NL + "\t\t}" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tpublic void undo() {" + NL + "\t\t\treconnectCommand.undo();" + NL + "\t\t}" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tpublic void redo() {" + NL + "\t\t\texecute();" + NL + "\t\t}" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tprotected boolean prepare() {";
+  protected final String TEXT_867 = NL + "\t\t\tfinal boolean[] resultHolder = new boolean[1];" + NL + "\t\t\t//To validate the reconnection against constraints, the current link should be deleted. Of course, we must then undo its deletion." + NL + "\t\t\tfinal ";
+  protected final String TEXT_868 = " domainModelEditDomain = ";
+  protected final String TEXT_869 = ".getEditingDomain(oldSource.getDiagram().getElement());" + NL + "\t\t\t";
+  protected final String TEXT_870 = " command = new ";
+  protected final String TEXT_871 = "() {" + NL + "\t\t\t\tprivate ";
+  protected final String TEXT_872 = " deleteCommand = createDomainModelRemoveCommand(domainModelEditDomain);" + NL + "\t\t\t\tpublic boolean canExecute() {" + NL + "\t\t\t\t\treturn deleteCommand.canExecute();" + NL + "\t\t\t\t}" + NL + "\t\t\t\tpublic boolean canUndo() {" + NL + "\t\t\t\t\treturn true;" + NL + "\t\t\t\t}" + NL + "\t\t\t\tpublic void redo() {" + NL + "\t\t\t\t}" + NL + "\t\t\t\tpublic void undo() {" + NL + "\t\t\t\t}" + NL + "\t\t\t\tpublic void execute() {" + NL + "\t\t\t\t\tdeleteCommand.execute();" + NL + "\t\t\t\t\ttry {" + NL + "\t\t\t\t\t\tresultHolder[0] = canReconnect();" + NL + "\t\t\t\t\t} finally {" + NL + "\t\t\t\t\t\tdeleteCommand.undo();" + NL + "\t\t\t\t\t}" + NL + "\t\t\t\t}" + NL + "\t\t\t};" + NL + "\t\t\tif (!command.canExecute()) {" + NL + "\t\t\t\treturn false;" + NL + "\t\t\t}" + NL + "\t\t\tnew ";
+  protected final String TEXT_873 = "(domainModelEditDomain, command).execute();" + NL + "\t\t\tif (resultHolder[0]) {" + NL + "\t\t\t\treconnectCommand = createReconnectCommand();" + NL + "\t\t\t}" + NL + "\t\t\treturn resultHolder[0] && reconnectCommand.canExecute();";
+  protected final String TEXT_874 = NL + "\t\t\tif (canReconnect()) {" + NL + "\t\t\t\treconnectCommand = createReconnectCommand();" + NL + "\t\t\t\treturn reconnectCommand.canExecute();" + NL + "\t\t\t}" + NL + "\t\t\treturn false;";
+  protected final String TEXT_875 = NL + "\t\t}" + NL + "" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tprivate boolean canReconnect() {";
+  protected final String TEXT_876 = NL + "\t\t\treturn false;";
+  protected final String TEXT_877 = NL + "\t\t\t";
+  protected final String TEXT_878 = " container = (";
+  protected final String TEXT_879 = ")getRelationshipContainer(newSource.getElement(), ";
+  protected final String TEXT_880 = ".eINSTANCE.get";
+  protected final String TEXT_881 = "());" + NL + "\t\t\tif (container == null) {" + NL + "\t\t\t\treturn false;" + NL + "\t\t\t}";
+  protected final String TEXT_882 = NL;
+  protected final String TEXT_883 = NL + "\t\tif (";
+  protected final String TEXT_884 = " != null) {" + NL + "\t\t\t";
+  protected final String TEXT_885 = NL + "\t\t}";
+  protected final String TEXT_886 = NL + "\t\tif (";
+  protected final String TEXT_887 = ".size() >= ";
+  protected final String TEXT_888 = ".eINSTANCE.get";
+  protected final String TEXT_889 = ".getUpperBound()) {" + NL + "\t\t\t";
+  protected final String TEXT_890 = NL + "\t\t}";
+  protected final String TEXT_891 = NL;
+  protected final String TEXT_892 = NL + "\t\tif (";
+  protected final String TEXT_893 = " != null) {" + NL + "\t\t\t";
+  protected final String TEXT_894 = NL + "\t\t}";
+  protected final String TEXT_895 = NL + "\t\tif (";
+  protected final String TEXT_896 = ".size() >= ";
+  protected final String TEXT_897 = ".eINSTANCE.get";
+  protected final String TEXT_898 = ".getUpperBound()) {" + NL + "\t\t\t";
+  protected final String TEXT_899 = NL + "\t\t}";
+  protected final String TEXT_900 = NL;
+  protected final String TEXT_901 = NL + "\t\t\tif(!";
+  protected final String TEXT_902 = ".canCreateLink(";
+  protected final String TEXT_903 = ", ";
+  protected final String TEXT_904 = ", false)) {" + NL + "\t\t\t\treturn false;" + NL + "\t\t\t}";
+  protected final String TEXT_905 = NL + "\t\t\treturn true;";
+  protected final String TEXT_906 = NL;
+  protected final String TEXT_907 = NL + "\t\tif (";
+  protected final String TEXT_908 = " != null) {" + NL + "\t\t\t";
+  protected final String TEXT_909 = NL + "\t\t}";
+  protected final String TEXT_910 = NL + "\t\tif (";
+  protected final String TEXT_911 = ".size() >= ";
+  protected final String TEXT_912 = ".eINSTANCE.get";
+  protected final String TEXT_913 = ".getUpperBound()) {" + NL + "\t\t\t";
+  protected final String TEXT_914 = NL + "\t\t}";
+  protected final String TEXT_915 = NL;
+  protected final String TEXT_916 = NL + "\t\t\tif(!";
+  protected final String TEXT_917 = ".canCreateLink(";
+  protected final String TEXT_918 = ", ";
+  protected final String TEXT_919 = ", false)) {" + NL + "\t\t\t\treturn false;" + NL + "\t\t\t}";
+  protected final String TEXT_920 = NL + "\t\t\treturn true;";
+  protected final String TEXT_921 = NL + "\t\t\treturn false;";
+  protected final String TEXT_922 = NL + "\t\t}" + NL + "" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tprivate ";
+  protected final String TEXT_923 = " createReconnectCommand() {" + NL + "\t\t\t";
+  protected final String TEXT_924 = " editingDomain = ";
+  protected final String TEXT_925 = ".getEditingDomain(oldSource.getDiagram().getElement());" + NL + "\t\t\t";
+  protected final String TEXT_926 = " result = new ";
+  protected final String TEXT_927 = "();" + NL + "\t\t\tresult.append(new ";
+  protected final String TEXT_928 = "(edge, newSource));";
+  protected final String TEXT_929 = NL + "\t\t\t";
+  protected final String TEXT_930 = " container = getRelationshipContainer(newSource.getElement(), ";
+  protected final String TEXT_931 = ".eINSTANCE.get";
+  protected final String TEXT_932 = "());" + NL + "\t\t\tif (container == null) {" + NL + "\t\t\t\treturn ";
+  protected final String TEXT_933 = ".INSTANCE;" + NL + "\t\t\t}" + NL + "\t\t\t";
+  protected final String TEXT_934 = " oldContainer = edge.getElement().eContainer();" + NL + "\t\t\tif (oldContainer == null) {" + NL + "\t\t\t\treturn ";
+  protected final String TEXT_935 = ".INSTANCE;" + NL + "\t\t\t}" + NL + "\t\t\tif (oldContainer != container) {";
+  protected final String TEXT_936 = NL + "\t\t\t\tresult.append(";
+  protected final String TEXT_937 = ".create(" + NL + "\t\t\t\t\teditingDomain," + NL + "\t\t\t\t\tedge.getElement().eContainer(), edge.getElement().eContainmentFeature(), edge.getElement()));";
   protected final String TEXT_938 = NL + "\t\t\t\tresult.append(";
-  protected final String TEXT_939 = ".create(" + NL + "\t\t\t\t\teditingDomain," + NL + "\t\t\t\t\tedge.getElement().eContainer(), ";
-  protected final String TEXT_940 = ".eINSTANCE.get";
-  protected final String TEXT_941 = "()," + NL + "\t\t\t\t\tedge.getElement()));";
-  protected final String TEXT_942 = NL + "\t\t\t\tresult.append(";
-  protected final String TEXT_943 = ".create(" + NL + "\t\t\t\t\teditingDomain," + NL + "\t\t\t\t\tedge.getElement().eContainer(), ";
-  protected final String TEXT_944 = ".eINSTANCE.get";
-  protected final String TEXT_945 = "()," + NL + "\t\t\t\t\t";
-  protected final String TEXT_946 = ".UNSET_VALUE));";
-  protected final String TEXT_947 = NL + "\t\t\t\tresult.append(";
-  protected final String TEXT_948 = ".create(" + NL + "\t\t\t\t\teditingDomain," + NL + "\t\t\t\t\tcontainer, ";
-  protected final String TEXT_949 = ".eINSTANCE.get";
-  protected final String TEXT_950 = "(), edge.getElement()));";
-  protected final String TEXT_951 = NL + "\t\t\t}";
-  protected final String TEXT_952 = NL + "\t\t\tresult.append(";
-  protected final String TEXT_953 = ".create(" + NL + "\t\t\t\teditingDomain," + NL + "\t\t\t\tedge.getElement(), ";
-  protected final String TEXT_954 = ".eINSTANCE.get";
-  protected final String TEXT_955 = "()," + NL + "\t\t\t\toldSource.getElement()));" + NL + "\t\t\tresult.append(";
-  protected final String TEXT_956 = ".create(" + NL + "\t\t\t\teditingDomain," + NL + "\t\t\t\tedge.getElement(), ";
-  protected final String TEXT_957 = ".eINSTANCE.get";
-  protected final String TEXT_958 = "()," + NL + "\t\t\t\tnewSource.getElement()));";
+  protected final String TEXT_939 = ".create(" + NL + "\t\t\t\t\teditingDomain," + NL + "\t\t\t\t\tedge.getElement().eContainer(), edge.getElement().eContainmentFeature(), ";
+  protected final String TEXT_940 = ".UNSET_VALUE));";
+  protected final String TEXT_941 = NL + "\t\t\t\tresult.append(";
+  protected final String TEXT_942 = ".create(" + NL + "\t\t\t\t\teditingDomain," + NL + "\t\t\t\t\tcontainer, ";
+  protected final String TEXT_943 = ".eINSTANCE.get";
+  protected final String TEXT_944 = "(), edge.getElement()));";
+  protected final String TEXT_945 = NL + "\t\t\t\tresult.append(";
+  protected final String TEXT_946 = ".create(" + NL + "\t\t\t\t\teditingDomain," + NL + "\t\t\t\t\tedge.getElement().eContainer(), ";
+  protected final String TEXT_947 = ".eINSTANCE.get";
+  protected final String TEXT_948 = "()," + NL + "\t\t\t\t\tedge.getElement()));";
+  protected final String TEXT_949 = NL + "\t\t\t\tresult.append(";
+  protected final String TEXT_950 = ".create(" + NL + "\t\t\t\t\teditingDomain," + NL + "\t\t\t\t\tedge.getElement().eContainer(), ";
+  protected final String TEXT_951 = ".eINSTANCE.get";
+  protected final String TEXT_952 = "()," + NL + "\t\t\t\t\t";
+  protected final String TEXT_953 = ".UNSET_VALUE));";
+  protected final String TEXT_954 = NL + "\t\t\t\tresult.append(";
+  protected final String TEXT_955 = ".create(" + NL + "\t\t\t\t\teditingDomain," + NL + "\t\t\t\t\tcontainer, ";
+  protected final String TEXT_956 = ".eINSTANCE.get";
+  protected final String TEXT_957 = "(), edge.getElement()));";
+  protected final String TEXT_958 = NL + "\t\t\t}";
   protected final String TEXT_959 = NL + "\t\t\tresult.append(";
   protected final String TEXT_960 = ".create(" + NL + "\t\t\t\teditingDomain," + NL + "\t\t\t\tedge.getElement(), ";
   protected final String TEXT_961 = ".eINSTANCE.get";
-  protected final String TEXT_962 = "()," + NL + "\t\t\t\tnewSource.getElement()));";
-  protected final String TEXT_963 = NL + "\t\t\tresult.append(";
-  protected final String TEXT_964 = ".create(" + NL + "\t\t\t\teditingDomain," + NL + "\t\t\t\toldSource.getElement(), ";
-  protected final String TEXT_965 = ".eINSTANCE.get";
-  protected final String TEXT_966 = "(), edge.getTarget().getElement()));" + NL + "\t\t\tresult.append(";
-  protected final String TEXT_967 = ".create(" + NL + "\t\t\t\teditingDomain," + NL + "\t\t\t\tnewSource.getElement(), ";
+  protected final String TEXT_962 = "()," + NL + "\t\t\t\toldSource.getElement()));" + NL + "\t\t\tresult.append(";
+  protected final String TEXT_963 = ".create(" + NL + "\t\t\t\teditingDomain," + NL + "\t\t\t\tedge.getElement(), ";
+  protected final String TEXT_964 = ".eINSTANCE.get";
+  protected final String TEXT_965 = "()," + NL + "\t\t\t\tnewSource.getElement()));";
+  protected final String TEXT_966 = NL + "\t\t\tresult.append(";
+  protected final String TEXT_967 = ".create(" + NL + "\t\t\t\teditingDomain," + NL + "\t\t\t\tedge.getElement(), ";
   protected final String TEXT_968 = ".eINSTANCE.get";
-  protected final String TEXT_969 = "(), edge.getTarget().getElement()));";
+  protected final String TEXT_969 = "()," + NL + "\t\t\t\tnewSource.getElement()));";
   protected final String TEXT_970 = NL + "\t\t\tresult.append(";
   protected final String TEXT_971 = ".create(" + NL + "\t\t\t\teditingDomain," + NL + "\t\t\t\toldSource.getElement(), ";
   protected final String TEXT_972 = ".eINSTANCE.get";
-  protected final String TEXT_973 = "(), ";
-  protected final String TEXT_974 = ".UNSET_VALUE));" + NL + "\t\t\tresult.append(";
-  protected final String TEXT_975 = ".create(" + NL + "\t\t\t\teditingDomain," + NL + "\t\t\t\tnewSource.getElement(), ";
-  protected final String TEXT_976 = ".eINSTANCE.get";
-  protected final String TEXT_977 = "(), edge.getTarget().getElement()));";
-  protected final String TEXT_978 = NL + "\t\t\treturn result;" + NL + "\t\t}" + NL;
-  protected final String TEXT_979 = NL;
-  protected final String TEXT_980 = NL + "\t\t/**" + NL + "\t\t * Finds container element for the relationship of the specified type." + NL + "\t\t * Default implementation goes up by containment hierarchy starting from" + NL + "\t\t * the specified element and returns the first element that is instance of" + NL + "\t\t * the specified container class." + NL + "\t\t * " + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tprotected ";
-  protected final String TEXT_981 = " getRelationshipContainer(";
-  protected final String TEXT_982 = " element, ";
-  protected final String TEXT_983 = " containerClass) {" + NL + "\t\t\tfor (; element != null; element = element.eContainer()) {" + NL + "\t\t\t\tif (containerClass.isSuperTypeOf(element.eClass())) {" + NL + "\t\t\t\t\treturn element;" + NL + "\t\t\t\t}" + NL + "\t\t\t}" + NL + "\t\t\treturn null;" + NL + "\t\t}";
-  protected final String TEXT_984 = NL + "\t/**" + NL + "\t * @generated" + NL + "\t */";
-  protected final String TEXT_985 = NL;
-  protected final String TEXT_986 = NL + "\t\t\tprivate ";
-  protected final String TEXT_987 = " createDomainModelRemoveCommand(";
-  protected final String TEXT_988 = " editingDomain) {";
-  protected final String TEXT_989 = NL + "\t\t\t\t";
-  protected final String TEXT_990 = " result = new ";
-  protected final String TEXT_991 = "();";
-  protected final String TEXT_992 = NL + "\t\t\t\tresult.append(";
-  protected final String TEXT_993 = ".create(" + NL + "\t\t\t\t\teditingDomain," + NL + "\t\t\t\t\t";
-  protected final String TEXT_994 = ".getElement().eContainer(), ";
-  protected final String TEXT_995 = ".getElement().eContainmentFeature(), ";
-  protected final String TEXT_996 = ".getElement()));";
-  protected final String TEXT_997 = NL + "\t\t\t\tresult.append(";
-  protected final String TEXT_998 = ".create(" + NL + "\t\t\t\t\teditingDomain," + NL + "\t\t\t\t\t";
-  protected final String TEXT_999 = ".getElement().eContainer(), ";
-  protected final String TEXT_1000 = ".getElement().eContainmentFeature(), ";
-  protected final String TEXT_1001 = ".UNSET_VALUE));";
-  protected final String TEXT_1002 = NL + "\t\t\t\treturn ";
-  protected final String TEXT_1003 = ".INSTANCE;";
+  protected final String TEXT_973 = "(), edge.getTarget().getElement()));" + NL + "\t\t\tresult.append(";
+  protected final String TEXT_974 = ".create(" + NL + "\t\t\t\teditingDomain," + NL + "\t\t\t\tnewSource.getElement(), ";
+  protected final String TEXT_975 = ".eINSTANCE.get";
+  protected final String TEXT_976 = "(), edge.getTarget().getElement()));";
+  protected final String TEXT_977 = NL + "\t\t\tresult.append(";
+  protected final String TEXT_978 = ".create(" + NL + "\t\t\t\teditingDomain," + NL + "\t\t\t\toldSource.getElement(), ";
+  protected final String TEXT_979 = ".eINSTANCE.get";
+  protected final String TEXT_980 = "(), ";
+  protected final String TEXT_981 = ".UNSET_VALUE));" + NL + "\t\t\tresult.append(";
+  protected final String TEXT_982 = ".create(" + NL + "\t\t\t\teditingDomain," + NL + "\t\t\t\tnewSource.getElement(), ";
+  protected final String TEXT_983 = ".eINSTANCE.get";
+  protected final String TEXT_984 = "(), edge.getTarget().getElement()));";
+  protected final String TEXT_985 = NL + "\t\t\treturn result;" + NL + "\t\t}" + NL;
+  protected final String TEXT_986 = NL;
+  protected final String TEXT_987 = NL + "\t\t/**" + NL + "\t\t * Finds container element for the relationship of the specified type." + NL + "\t\t * Default implementation goes up by containment hierarchy starting from" + NL + "\t\t * the specified element and returns the first element that is instance of" + NL + "\t\t * the specified container class." + NL + "\t\t * " + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tprotected ";
+  protected final String TEXT_988 = " getRelationshipContainer(";
+  protected final String TEXT_989 = " element, ";
+  protected final String TEXT_990 = " containerClass) {" + NL + "\t\t\tfor (; element != null; element = element.eContainer()) {" + NL + "\t\t\t\tif (containerClass.isSuperTypeOf(element.eClass())) {" + NL + "\t\t\t\t\treturn element;" + NL + "\t\t\t\t}" + NL + "\t\t\t}" + NL + "\t\t\treturn null;" + NL + "\t\t}";
+  protected final String TEXT_991 = NL + "\t/**" + NL + "\t * @generated" + NL + "\t */";
+  protected final String TEXT_992 = NL;
+  protected final String TEXT_993 = NL + "\t\t\tprivate ";
+  protected final String TEXT_994 = " createDomainModelRemoveCommand(";
+  protected final String TEXT_995 = " editingDomain) {";
+  protected final String TEXT_996 = NL + "\t\t\t\t";
+  protected final String TEXT_997 = " result = new ";
+  protected final String TEXT_998 = "();";
+  protected final String TEXT_999 = NL + "\t\t\t\tresult.append(";
+  protected final String TEXT_1000 = ".create(" + NL + "\t\t\t\t\teditingDomain," + NL + "\t\t\t\t\t";
+  protected final String TEXT_1001 = ".getElement().eContainer(), ";
+  protected final String TEXT_1002 = ".getElement().eContainmentFeature(), ";
+  protected final String TEXT_1003 = ".getElement()));";
   protected final String TEXT_1004 = NL + "\t\t\t\tresult.append(";
   protected final String TEXT_1005 = ".create(" + NL + "\t\t\t\t\teditingDomain," + NL + "\t\t\t\t\t";
   protected final String TEXT_1006 = ".getElement().eContainer(), ";
-  protected final String TEXT_1007 = ".eINSTANCE.get";
-  protected final String TEXT_1008 = "()," + NL + "\t\t\t\t\t";
-  protected final String TEXT_1009 = ".getElement()));";
-  protected final String TEXT_1010 = NL + "\t\t\t\tresult.append(";
-  protected final String TEXT_1011 = ".create(" + NL + "\t\t\t\t\teditingDomain," + NL + "\t\t\t\t\t";
-  protected final String TEXT_1012 = ".getElement().eContainer(), ";
-  protected final String TEXT_1013 = ".eINSTANCE.get";
-  protected final String TEXT_1014 = "()," + NL + "\t\t\t\t\t";
-  protected final String TEXT_1015 = ".UNSET_VALUE));";
-  protected final String TEXT_1016 = NL + "\t\t\t\tresult.append(";
-  protected final String TEXT_1017 = ".create(" + NL + "\t\t\t\t\teditingDomain," + NL + "\t\t\t\t\t";
-  protected final String TEXT_1018 = ".getElement(), ";
-  protected final String TEXT_1019 = ".eINSTANCE.get";
-  protected final String TEXT_1020 = "(), ";
-  protected final String TEXT_1021 = ".getSource().getElement()));";
-  protected final String TEXT_1022 = NL + "\t\t\t\tresult.append(";
-  protected final String TEXT_1023 = ".create(" + NL + "\t\t\t\t\teditingDomain," + NL + "\t\t\t\t\t";
-  protected final String TEXT_1024 = ".getElement(), ";
-  protected final String TEXT_1025 = ".eINSTANCE.get";
-  protected final String TEXT_1026 = "(), ";
-  protected final String TEXT_1027 = ".UNSET_VALUE));";
-  protected final String TEXT_1028 = NL + "\t\t\t\tresult.append(";
-  protected final String TEXT_1029 = ".create(" + NL + "\t\t\t\t\teditingDomain," + NL + "\t\t\t\t\t";
-  protected final String TEXT_1030 = ".getElement(), ";
-  protected final String TEXT_1031 = ".eINSTANCE.get";
-  protected final String TEXT_1032 = "(), ";
-  protected final String TEXT_1033 = ".getTarget().getElement()));";
-  protected final String TEXT_1034 = NL + "\t\t\t\tresult.append(";
-  protected final String TEXT_1035 = ".create(" + NL + "\t\t\t\t\teditingDomain," + NL + "\t\t\t\t\t";
-  protected final String TEXT_1036 = ".getElement(), ";
-  protected final String TEXT_1037 = ".eINSTANCE.get";
-  protected final String TEXT_1038 = "(), ";
-  protected final String TEXT_1039 = ".UNSET_VALUE));";
-  protected final String TEXT_1040 = NL + "\t\t\t\treturn result;";
-  protected final String TEXT_1041 = NL + "\t\t\t\treturn ";
+  protected final String TEXT_1007 = ".getElement().eContainmentFeature(), ";
+  protected final String TEXT_1008 = ".UNSET_VALUE));";
+  protected final String TEXT_1009 = NL + "\t\t\t\treturn ";
+  protected final String TEXT_1010 = ".INSTANCE;";
+  protected final String TEXT_1011 = NL + "\t\t\t\tresult.append(";
+  protected final String TEXT_1012 = ".create(" + NL + "\t\t\t\t\teditingDomain," + NL + "\t\t\t\t\t";
+  protected final String TEXT_1013 = ".getElement().eContainer(), ";
+  protected final String TEXT_1014 = ".eINSTANCE.get";
+  protected final String TEXT_1015 = "()," + NL + "\t\t\t\t\t";
+  protected final String TEXT_1016 = ".getElement()));";
+  protected final String TEXT_1017 = NL + "\t\t\t\tresult.append(";
+  protected final String TEXT_1018 = ".create(" + NL + "\t\t\t\t\teditingDomain," + NL + "\t\t\t\t\t";
+  protected final String TEXT_1019 = ".getElement().eContainer(), ";
+  protected final String TEXT_1020 = ".eINSTANCE.get";
+  protected final String TEXT_1021 = "()," + NL + "\t\t\t\t\t";
+  protected final String TEXT_1022 = ".UNSET_VALUE));";
+  protected final String TEXT_1023 = NL + "\t\t\t\tresult.append(";
+  protected final String TEXT_1024 = ".create(" + NL + "\t\t\t\t\teditingDomain," + NL + "\t\t\t\t\t";
+  protected final String TEXT_1025 = ".getElement(), ";
+  protected final String TEXT_1026 = ".eINSTANCE.get";
+  protected final String TEXT_1027 = "(), ";
+  protected final String TEXT_1028 = ".getSource().getElement()));";
+  protected final String TEXT_1029 = NL + "\t\t\t\tresult.append(";
+  protected final String TEXT_1030 = ".create(" + NL + "\t\t\t\t\teditingDomain," + NL + "\t\t\t\t\t";
+  protected final String TEXT_1031 = ".getElement(), ";
+  protected final String TEXT_1032 = ".eINSTANCE.get";
+  protected final String TEXT_1033 = "(), ";
+  protected final String TEXT_1034 = ".UNSET_VALUE));";
+  protected final String TEXT_1035 = NL + "\t\t\t\tresult.append(";
+  protected final String TEXT_1036 = ".create(" + NL + "\t\t\t\t\teditingDomain," + NL + "\t\t\t\t\t";
+  protected final String TEXT_1037 = ".getElement(), ";
+  protected final String TEXT_1038 = ".eINSTANCE.get";
+  protected final String TEXT_1039 = "(), ";
+  protected final String TEXT_1040 = ".getTarget().getElement()));";
+  protected final String TEXT_1041 = NL + "\t\t\t\tresult.append(";
   protected final String TEXT_1042 = ".create(" + NL + "\t\t\t\t\teditingDomain," + NL + "\t\t\t\t\t";
-  protected final String TEXT_1043 = ".getSource().getElement(), ";
+  protected final String TEXT_1043 = ".getElement(), ";
   protected final String TEXT_1044 = ".eINSTANCE.get";
   protected final String TEXT_1045 = "(), ";
-  protected final String TEXT_1046 = ".getTarget().getElement());";
-  protected final String TEXT_1047 = NL + "\t\t\t\treturn ";
-  protected final String TEXT_1048 = ".create(" + NL + "\t\t\t\t\teditingDomain," + NL + "\t\t\t\t\t";
-  protected final String TEXT_1049 = ".getSource().getElement(), ";
-  protected final String TEXT_1050 = ".eINSTANCE.get";
-  protected final String TEXT_1051 = "(), ";
-  protected final String TEXT_1052 = ".UNSET_VALUE);";
-  protected final String TEXT_1053 = NL + "\t\t\t}";
-  protected final String TEXT_1054 = NL + "\t}" + NL;
-  protected final String TEXT_1055 = NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate static class Create";
-  protected final String TEXT_1056 = "StartCommand extends ";
-  protected final String TEXT_1057 = " {" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tprivate ";
-  protected final String TEXT_1058 = " source;" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tpublic Create";
-  protected final String TEXT_1059 = "StartCommand(";
-  protected final String TEXT_1060 = " requestEx) {" + NL + "\t\t\t//Until the mouse button is pressed, the source of the connection is in request.getTargetEditPart(), not in request.getSourceEditPart()." + NL + "\t\t\tsource = (";
-  protected final String TEXT_1061 = ")requestEx.getTargetEditPart().getModel();" + NL + "\t\t}" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tpublic void execute() {" + NL + "\t\t\t//This command never gets executed" + NL + "\t\t}" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tpublic void undo() {" + NL + "\t\t\t//This command never gets executed" + NL + "\t\t}" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tpublic void redo() {" + NL + "\t\t\t//This command never gets executed" + NL + "\t\t}" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tpublic boolean canUndo() {" + NL + "\t\t\treturn true;" + NL + "\t\t}" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tprotected boolean prepare() {" + NL + "\t\t\tif (source == null) {" + NL + "\t\t\t\treturn false;" + NL + "\t\t\t}";
-  protected final String TEXT_1062 = NL + "\t\t\treturn false;";
-  protected final String TEXT_1063 = NL + "\t\t\t";
-  protected final String TEXT_1064 = " container = (";
-  protected final String TEXT_1065 = ")getRelationshipContainer(source.getElement(), ";
-  protected final String TEXT_1066 = ".eINSTANCE.get";
-  protected final String TEXT_1067 = "());" + NL + "\t\t\tif (container == null) {" + NL + "\t\t\t\treturn false;" + NL + "\t\t\t}";
-  protected final String TEXT_1068 = NL;
-  protected final String TEXT_1069 = NL + "\t\tif (";
-  protected final String TEXT_1070 = " != null) {" + NL + "\t\t\t";
-  protected final String TEXT_1071 = NL + "\t\t}";
-  protected final String TEXT_1072 = NL + "\t\tif (";
-  protected final String TEXT_1073 = ".size() >= ";
-  protected final String TEXT_1074 = ".eINSTANCE.get";
-  protected final String TEXT_1075 = ".getUpperBound()) {" + NL + "\t\t\t";
-  protected final String TEXT_1076 = NL + "\t\t}";
-  protected final String TEXT_1077 = NL;
-  protected final String TEXT_1078 = NL + "\t\tif (";
-  protected final String TEXT_1079 = " != null) {" + NL + "\t\t\t";
-  protected final String TEXT_1080 = NL + "\t\t}";
-  protected final String TEXT_1081 = NL + "\t\tif (";
-  protected final String TEXT_1082 = ".size() >= ";
-  protected final String TEXT_1083 = ".eINSTANCE.get";
-  protected final String TEXT_1084 = ".getUpperBound()) {" + NL + "\t\t\t";
-  protected final String TEXT_1085 = NL + "\t\t}";
-  protected final String TEXT_1086 = NL;
-  protected final String TEXT_1087 = NL + "\t\t\tif(!";
-  protected final String TEXT_1088 = ".canCreateLink(";
-  protected final String TEXT_1089 = ", ";
-  protected final String TEXT_1090 = ", false)) {" + NL + "\t\t\t\treturn false;" + NL + "\t\t\t}";
-  protected final String TEXT_1091 = NL + "\t\t\treturn true;";
-  protected final String TEXT_1092 = NL;
-  protected final String TEXT_1093 = NL + "\t\tif (";
-  protected final String TEXT_1094 = " != null) {" + NL + "\t\t\t";
-  protected final String TEXT_1095 = NL + "\t\t}";
-  protected final String TEXT_1096 = NL + "\t\tif (";
-  protected final String TEXT_1097 = ".size() >= ";
-  protected final String TEXT_1098 = ".eINSTANCE.get";
-  protected final String TEXT_1099 = ".getUpperBound()) {" + NL + "\t\t\t";
-  protected final String TEXT_1100 = NL + "\t\t}";
-  protected final String TEXT_1101 = NL;
-  protected final String TEXT_1102 = NL + "\t\t\tif(!";
-  protected final String TEXT_1103 = ".canCreateLink(";
-  protected final String TEXT_1104 = ", ";
-  protected final String TEXT_1105 = ", false)) {" + NL + "\t\t\t\treturn false;" + NL + "\t\t\t}";
-  protected final String TEXT_1106 = NL + "\t\t\treturn true;";
-  protected final String TEXT_1107 = NL + "\t\t\treturn false;";
-  protected final String TEXT_1108 = NL + "\t\t}";
-  protected final String TEXT_1109 = NL;
-  protected final String TEXT_1110 = NL + "\t\t/**" + NL + "\t\t * Finds container element for the relationship of the specified type." + NL + "\t\t * Default implementation goes up by containment hierarchy starting from" + NL + "\t\t * the specified element and returns the first element that is instance of" + NL + "\t\t * the specified container class." + NL + "\t\t * " + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tprotected ";
-  protected final String TEXT_1111 = " getRelationshipContainer(";
-  protected final String TEXT_1112 = " element, ";
-  protected final String TEXT_1113 = " containerClass) {" + NL + "\t\t\tfor (; element != null; element = element.eContainer()) {" + NL + "\t\t\t\tif (containerClass.isSuperTypeOf(element.eClass())) {" + NL + "\t\t\t\t\treturn element;" + NL + "\t\t\t\t}" + NL + "\t\t\t}" + NL + "\t\t\treturn null;" + NL + "\t\t}";
-  protected final String TEXT_1114 = NL + NL + "\t}";
-  protected final String TEXT_1115 = NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate static class Reconnect";
-  protected final String TEXT_1116 = "TargetCommand extends ";
-  protected final String TEXT_1117 = " {" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tprivate ";
-  protected final String TEXT_1118 = " edge;" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tprivate ";
-  protected final String TEXT_1119 = " newTarget;" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tprivate ";
-  protected final String TEXT_1120 = " oldTarget;" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tprivate ";
-  protected final String TEXT_1121 = " reconnectCommand;" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tpublic Reconnect";
-  protected final String TEXT_1122 = "TargetCommand(";
-  protected final String TEXT_1123 = " request) {" + NL + "\t\t\tthis((";
-  protected final String TEXT_1124 = ")request.getConnectionEditPart().getModel(), (";
-  protected final String TEXT_1125 = ")request.getTarget().getModel());" + NL + "\t\t}" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tpublic Reconnect";
-  protected final String TEXT_1126 = "TargetCommand(";
-  protected final String TEXT_1127 = " edge, ";
-  protected final String TEXT_1128 = " newTarget) {" + NL + "\t\t\tthis.edge = edge;" + NL + "\t\t\tthis.newTarget = newTarget;" + NL + "\t\t\tthis.oldTarget = edge.getTarget();" + NL + "\t\t}" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tpublic void execute() {" + NL + "\t\t\treconnectCommand.execute();" + NL + "\t\t}" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tpublic boolean canUndo() {" + NL + "\t\t\treturn reconnectCommand.canUndo();" + NL + "\t\t}" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tpublic void undo() {" + NL + "\t\t\treconnectCommand.undo();" + NL + "\t\t}" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tpublic void redo() {" + NL + "\t\t\texecute();" + NL + "\t\t}" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tprotected boolean prepare() {";
-  protected final String TEXT_1129 = NL + "\t\t\tfinal boolean[] resultHolder = new boolean[1];" + NL + "\t\t\t//To validate the reconnection against constraints, the current link should be deleted. Of course, we must then undo its deletion." + NL + "\t\t\tfinal ";
-  protected final String TEXT_1130 = " domainModelEditDomain = ";
-  protected final String TEXT_1131 = ".getEditingDomain(oldTarget.getDiagram().getElement());" + NL + "\t\t\t";
-  protected final String TEXT_1132 = " command = new ";
-  protected final String TEXT_1133 = "() {" + NL + "\t\t\t\tprivate ";
-  protected final String TEXT_1134 = " deleteCommand = createDomainModelRemoveCommand(domainModelEditDomain);" + NL + "\t\t\t\tpublic boolean canExecute() {" + NL + "\t\t\t\t\treturn deleteCommand.canExecute();" + NL + "\t\t\t\t}" + NL + "\t\t\t\tpublic boolean canUndo() {" + NL + "\t\t\t\t\treturn true;" + NL + "\t\t\t\t}" + NL + "\t\t\t\tpublic void redo() {" + NL + "\t\t\t\t}" + NL + "\t\t\t\tpublic void undo() {" + NL + "\t\t\t\t}" + NL + "\t\t\t\tpublic void execute() {" + NL + "\t\t\t\t\tdeleteCommand.execute();" + NL + "\t\t\t\t\ttry {" + NL + "\t\t\t\t\t\tresultHolder[0] = canReconnect();" + NL + "\t\t\t\t\t} finally {" + NL + "\t\t\t\t\t\tdeleteCommand.undo();" + NL + "\t\t\t\t\t}" + NL + "\t\t\t\t}" + NL + "\t\t\t};" + NL + "\t\t\tif (!command.canExecute()) {" + NL + "\t\t\t\treturn false;" + NL + "\t\t\t}" + NL + "\t\t\tnew ";
-  protected final String TEXT_1135 = "(domainModelEditDomain, command).execute();" + NL + "\t\t\tif (resultHolder[0]) {" + NL + "\t\t\t\treconnectCommand = createReconnectCommand();" + NL + "\t\t\t}" + NL + "\t\t\treturn resultHolder[0] && reconnectCommand.canExecute();";
-  protected final String TEXT_1136 = NL + "\t\t\tif (canReconnect()) {" + NL + "\t\t\t\treconnectCommand = createReconnectCommand();" + NL + "\t\t\t\treturn reconnectCommand.canExecute();" + NL + "\t\t\t}" + NL + "\t\t\treturn false;";
-  protected final String TEXT_1137 = NL + "\t\t}" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tprivate boolean canReconnect() {";
-  protected final String TEXT_1138 = NL;
-  protected final String TEXT_1139 = NL + "\t\t\tif(!";
-  protected final String TEXT_1140 = ".canCreateLink(";
-  protected final String TEXT_1141 = ", ";
-  protected final String TEXT_1142 = ", false)) {" + NL + "\t\t\t\treturn false;" + NL + "\t\t\t}";
-  protected final String TEXT_1143 = NL + "\t\t\treturn true;";
-  protected final String TEXT_1144 = NL;
-  protected final String TEXT_1145 = NL + "\t\t\tif(!";
-  protected final String TEXT_1146 = ".canCreateLink(";
-  protected final String TEXT_1147 = ", ";
-  protected final String TEXT_1148 = ", false)) {" + NL + "\t\t\t\treturn false;" + NL + "\t\t\t}";
-  protected final String TEXT_1149 = NL + "\t\t\treturn true;";
-  protected final String TEXT_1150 = NL + "\t\t\treturn false;";
-  protected final String TEXT_1151 = NL + "\t\t}" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tprivate ";
-  protected final String TEXT_1152 = " createReconnectCommand() {" + NL + "\t\t\t";
-  protected final String TEXT_1153 = " editingDomain = ";
-  protected final String TEXT_1154 = ".getEditingDomain(oldTarget.getDiagram().getElement());" + NL + "\t\t\t";
-  protected final String TEXT_1155 = " result = new ";
-  protected final String TEXT_1156 = "();" + NL + "\t\t\tresult.append(new ";
-  protected final String TEXT_1157 = "(edge, newTarget));";
-  protected final String TEXT_1158 = NL + "\t\t\tresult.append(";
-  protected final String TEXT_1159 = ".create(" + NL + "\t\t\t\teditingDomain," + NL + "\t\t\t\tedge.getElement(), ";
-  protected final String TEXT_1160 = ".eINSTANCE.get";
-  protected final String TEXT_1161 = "()," + NL + "\t\t\t\toldTarget.getElement()));" + NL + "\t\t\tresult.append(";
-  protected final String TEXT_1162 = ".create(" + NL + "\t\t\t\teditingDomain," + NL + "\t\t\t\tedge.getElement(), ";
-  protected final String TEXT_1163 = ".eINSTANCE.get";
-  protected final String TEXT_1164 = "()," + NL + "\t\t\t\tnewTarget.getElement()));";
+  protected final String TEXT_1046 = ".UNSET_VALUE));";
+  protected final String TEXT_1047 = NL + "\t\t\t\treturn result;";
+  protected final String TEXT_1048 = NL + "\t\t\t\treturn ";
+  protected final String TEXT_1049 = ".create(" + NL + "\t\t\t\t\teditingDomain," + NL + "\t\t\t\t\t";
+  protected final String TEXT_1050 = ".getSource().getElement(), ";
+  protected final String TEXT_1051 = ".eINSTANCE.get";
+  protected final String TEXT_1052 = "(), ";
+  protected final String TEXT_1053 = ".getTarget().getElement());";
+  protected final String TEXT_1054 = NL + "\t\t\t\treturn ";
+  protected final String TEXT_1055 = ".create(" + NL + "\t\t\t\t\teditingDomain," + NL + "\t\t\t\t\t";
+  protected final String TEXT_1056 = ".getSource().getElement(), ";
+  protected final String TEXT_1057 = ".eINSTANCE.get";
+  protected final String TEXT_1058 = "(), ";
+  protected final String TEXT_1059 = ".UNSET_VALUE);";
+  protected final String TEXT_1060 = NL + "\t\t\t}";
+  protected final String TEXT_1061 = NL + "\t}" + NL;
+  protected final String TEXT_1062 = NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate static class Create";
+  protected final String TEXT_1063 = "StartCommand extends ";
+  protected final String TEXT_1064 = " {" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tprivate ";
+  protected final String TEXT_1065 = " source;" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tpublic Create";
+  protected final String TEXT_1066 = "StartCommand(";
+  protected final String TEXT_1067 = " requestEx) {" + NL + "\t\t\t//Until the mouse button is pressed, the source of the connection is in request.getTargetEditPart(), not in request.getSourceEditPart()." + NL + "\t\t\tsource = (";
+  protected final String TEXT_1068 = ")requestEx.getTargetEditPart().getModel();" + NL + "\t\t}" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tpublic void execute() {" + NL + "\t\t\t//This command never gets executed" + NL + "\t\t}" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tpublic void undo() {" + NL + "\t\t\t//This command never gets executed" + NL + "\t\t}" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tpublic void redo() {" + NL + "\t\t\t//This command never gets executed" + NL + "\t\t}" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tpublic boolean canUndo() {" + NL + "\t\t\treturn true;" + NL + "\t\t}" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tprotected boolean prepare() {" + NL + "\t\t\tif (source == null) {" + NL + "\t\t\t\treturn false;" + NL + "\t\t\t}";
+  protected final String TEXT_1069 = NL + "\t\t\treturn false;";
+  protected final String TEXT_1070 = NL + "\t\t\t";
+  protected final String TEXT_1071 = " container = (";
+  protected final String TEXT_1072 = ")getRelationshipContainer(source.getElement(), ";
+  protected final String TEXT_1073 = ".eINSTANCE.get";
+  protected final String TEXT_1074 = "());" + NL + "\t\t\tif (container == null) {" + NL + "\t\t\t\treturn false;" + NL + "\t\t\t}";
+  protected final String TEXT_1075 = NL;
+  protected final String TEXT_1076 = NL + "\t\tif (";
+  protected final String TEXT_1077 = " != null) {" + NL + "\t\t\t";
+  protected final String TEXT_1078 = NL + "\t\t}";
+  protected final String TEXT_1079 = NL + "\t\tif (";
+  protected final String TEXT_1080 = ".size() >= ";
+  protected final String TEXT_1081 = ".eINSTANCE.get";
+  protected final String TEXT_1082 = ".getUpperBound()) {" + NL + "\t\t\t";
+  protected final String TEXT_1083 = NL + "\t\t}";
+  protected final String TEXT_1084 = NL;
+  protected final String TEXT_1085 = NL + "\t\tif (";
+  protected final String TEXT_1086 = " != null) {" + NL + "\t\t\t";
+  protected final String TEXT_1087 = NL + "\t\t}";
+  protected final String TEXT_1088 = NL + "\t\tif (";
+  protected final String TEXT_1089 = ".size() >= ";
+  protected final String TEXT_1090 = ".eINSTANCE.get";
+  protected final String TEXT_1091 = ".getUpperBound()) {" + NL + "\t\t\t";
+  protected final String TEXT_1092 = NL + "\t\t}";
+  protected final String TEXT_1093 = NL;
+  protected final String TEXT_1094 = NL + "\t\t\tif(!";
+  protected final String TEXT_1095 = ".canCreateLink(";
+  protected final String TEXT_1096 = ", ";
+  protected final String TEXT_1097 = ", false)) {" + NL + "\t\t\t\treturn false;" + NL + "\t\t\t}";
+  protected final String TEXT_1098 = NL + "\t\t\treturn true;";
+  protected final String TEXT_1099 = NL;
+  protected final String TEXT_1100 = NL + "\t\tif (";
+  protected final String TEXT_1101 = " != null) {" + NL + "\t\t\t";
+  protected final String TEXT_1102 = NL + "\t\t}";
+  protected final String TEXT_1103 = NL + "\t\tif (";
+  protected final String TEXT_1104 = ".size() >= ";
+  protected final String TEXT_1105 = ".eINSTANCE.get";
+  protected final String TEXT_1106 = ".getUpperBound()) {" + NL + "\t\t\t";
+  protected final String TEXT_1107 = NL + "\t\t}";
+  protected final String TEXT_1108 = NL;
+  protected final String TEXT_1109 = NL + "\t\t\tif(!";
+  protected final String TEXT_1110 = ".canCreateLink(";
+  protected final String TEXT_1111 = ", ";
+  protected final String TEXT_1112 = ", false)) {" + NL + "\t\t\t\treturn false;" + NL + "\t\t\t}";
+  protected final String TEXT_1113 = NL + "\t\t\treturn true;";
+  protected final String TEXT_1114 = NL + "\t\t\treturn false;";
+  protected final String TEXT_1115 = NL + "\t\t}";
+  protected final String TEXT_1116 = NL;
+  protected final String TEXT_1117 = NL + "\t\t/**" + NL + "\t\t * Finds container element for the relationship of the specified type." + NL + "\t\t * Default implementation goes up by containment hierarchy starting from" + NL + "\t\t * the specified element and returns the first element that is instance of" + NL + "\t\t * the specified container class." + NL + "\t\t * " + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tprotected ";
+  protected final String TEXT_1118 = " getRelationshipContainer(";
+  protected final String TEXT_1119 = " element, ";
+  protected final String TEXT_1120 = " containerClass) {" + NL + "\t\t\tfor (; element != null; element = element.eContainer()) {" + NL + "\t\t\t\tif (containerClass.isSuperTypeOf(element.eClass())) {" + NL + "\t\t\t\t\treturn element;" + NL + "\t\t\t\t}" + NL + "\t\t\t}" + NL + "\t\t\treturn null;" + NL + "\t\t}";
+  protected final String TEXT_1121 = NL + NL + "\t}";
+  protected final String TEXT_1122 = NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate static class Reconnect";
+  protected final String TEXT_1123 = "TargetCommand extends ";
+  protected final String TEXT_1124 = " {" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tprivate ";
+  protected final String TEXT_1125 = " edge;" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tprivate ";
+  protected final String TEXT_1126 = " newTarget;" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tprivate ";
+  protected final String TEXT_1127 = " oldTarget;" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tprivate ";
+  protected final String TEXT_1128 = " reconnectCommand;" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tpublic Reconnect";
+  protected final String TEXT_1129 = "TargetCommand(";
+  protected final String TEXT_1130 = " request) {" + NL + "\t\t\tthis((";
+  protected final String TEXT_1131 = ")request.getConnectionEditPart().getModel(), (";
+  protected final String TEXT_1132 = ")request.getTarget().getModel());" + NL + "\t\t}" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tpublic Reconnect";
+  protected final String TEXT_1133 = "TargetCommand(";
+  protected final String TEXT_1134 = " edge, ";
+  protected final String TEXT_1135 = " newTarget) {" + NL + "\t\t\tthis.edge = edge;" + NL + "\t\t\tthis.newTarget = newTarget;" + NL + "\t\t\tthis.oldTarget = edge.getTarget();" + NL + "\t\t}" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tpublic void execute() {" + NL + "\t\t\treconnectCommand.execute();" + NL + "\t\t}" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tpublic boolean canUndo() {" + NL + "\t\t\treturn reconnectCommand.canUndo();" + NL + "\t\t}" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tpublic void undo() {" + NL + "\t\t\treconnectCommand.undo();" + NL + "\t\t}" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tpublic void redo() {" + NL + "\t\t\texecute();" + NL + "\t\t}" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tprotected boolean prepare() {";
+  protected final String TEXT_1136 = NL + "\t\t\tfinal boolean[] resultHolder = new boolean[1];" + NL + "\t\t\t//To validate the reconnection against constraints, the current link should be deleted. Of course, we must then undo its deletion." + NL + "\t\t\tfinal ";
+  protected final String TEXT_1137 = " domainModelEditDomain = ";
+  protected final String TEXT_1138 = ".getEditingDomain(oldTarget.getDiagram().getElement());" + NL + "\t\t\t";
+  protected final String TEXT_1139 = " command = new ";
+  protected final String TEXT_1140 = "() {" + NL + "\t\t\t\tprivate ";
+  protected final String TEXT_1141 = " deleteCommand = createDomainModelRemoveCommand(domainModelEditDomain);" + NL + "\t\t\t\tpublic boolean canExecute() {" + NL + "\t\t\t\t\treturn deleteCommand.canExecute();" + NL + "\t\t\t\t}" + NL + "\t\t\t\tpublic boolean canUndo() {" + NL + "\t\t\t\t\treturn true;" + NL + "\t\t\t\t}" + NL + "\t\t\t\tpublic void redo() {" + NL + "\t\t\t\t}" + NL + "\t\t\t\tpublic void undo() {" + NL + "\t\t\t\t}" + NL + "\t\t\t\tpublic void execute() {" + NL + "\t\t\t\t\tdeleteCommand.execute();" + NL + "\t\t\t\t\ttry {" + NL + "\t\t\t\t\t\tresultHolder[0] = canReconnect();" + NL + "\t\t\t\t\t} finally {" + NL + "\t\t\t\t\t\tdeleteCommand.undo();" + NL + "\t\t\t\t\t}" + NL + "\t\t\t\t}" + NL + "\t\t\t};" + NL + "\t\t\tif (!command.canExecute()) {" + NL + "\t\t\t\treturn false;" + NL + "\t\t\t}" + NL + "\t\t\tnew ";
+  protected final String TEXT_1142 = "(domainModelEditDomain, command).execute();" + NL + "\t\t\tif (resultHolder[0]) {" + NL + "\t\t\t\treconnectCommand = createReconnectCommand();" + NL + "\t\t\t}" + NL + "\t\t\treturn resultHolder[0] && reconnectCommand.canExecute();";
+  protected final String TEXT_1143 = NL + "\t\t\tif (canReconnect()) {" + NL + "\t\t\t\treconnectCommand = createReconnectCommand();" + NL + "\t\t\t\treturn reconnectCommand.canExecute();" + NL + "\t\t\t}" + NL + "\t\t\treturn false;";
+  protected final String TEXT_1144 = NL + "\t\t}" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tprivate boolean canReconnect() {";
+  protected final String TEXT_1145 = NL;
+  protected final String TEXT_1146 = NL + "\t\t\tif(!";
+  protected final String TEXT_1147 = ".canCreateLink(";
+  protected final String TEXT_1148 = ", ";
+  protected final String TEXT_1149 = ", false)) {" + NL + "\t\t\t\treturn false;" + NL + "\t\t\t}";
+  protected final String TEXT_1150 = NL + "\t\t\treturn true;";
+  protected final String TEXT_1151 = NL;
+  protected final String TEXT_1152 = NL + "\t\t\tif(!";
+  protected final String TEXT_1153 = ".canCreateLink(";
+  protected final String TEXT_1154 = ", ";
+  protected final String TEXT_1155 = ", false)) {" + NL + "\t\t\t\treturn false;" + NL + "\t\t\t}";
+  protected final String TEXT_1156 = NL + "\t\t\treturn true;";
+  protected final String TEXT_1157 = NL + "\t\t\treturn false;";
+  protected final String TEXT_1158 = NL + "\t\t}" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tprivate ";
+  protected final String TEXT_1159 = " createReconnectCommand() {" + NL + "\t\t\t";
+  protected final String TEXT_1160 = " editingDomain = ";
+  protected final String TEXT_1161 = ".getEditingDomain(oldTarget.getDiagram().getElement());" + NL + "\t\t\t";
+  protected final String TEXT_1162 = " result = new ";
+  protected final String TEXT_1163 = "();" + NL + "\t\t\tresult.append(new ";
+  protected final String TEXT_1164 = "(edge, newTarget));";
   protected final String TEXT_1165 = NL + "\t\t\tresult.append(";
   protected final String TEXT_1166 = ".create(" + NL + "\t\t\t\teditingDomain," + NL + "\t\t\t\tedge.getElement(), ";
   protected final String TEXT_1167 = ".eINSTANCE.get";
-  protected final String TEXT_1168 = "()," + NL + "\t\t\t\tnewTarget.getElement()));";
-  protected final String TEXT_1169 = NL + "\t\t\tresult.append(";
-  protected final String TEXT_1170 = ".create(" + NL + "\t\t\t\teditingDomain," + NL + "\t\t\t\tedge.getSource().getElement(), ";
-  protected final String TEXT_1171 = ".eINSTANCE.get";
-  protected final String TEXT_1172 = "(), oldTarget.getElement()));" + NL + "\t\t\tresult.append(";
-  protected final String TEXT_1173 = ".create(" + NL + "\t\t\t\teditingDomain," + NL + "\t\t\t\tedge.getSource().getElement(), ";
+  protected final String TEXT_1168 = "()," + NL + "\t\t\t\toldTarget.getElement()));" + NL + "\t\t\tresult.append(";
+  protected final String TEXT_1169 = ".create(" + NL + "\t\t\t\teditingDomain," + NL + "\t\t\t\tedge.getElement(), ";
+  protected final String TEXT_1170 = ".eINSTANCE.get";
+  protected final String TEXT_1171 = "()," + NL + "\t\t\t\tnewTarget.getElement()));";
+  protected final String TEXT_1172 = NL + "\t\t\tresult.append(";
+  protected final String TEXT_1173 = ".create(" + NL + "\t\t\t\teditingDomain," + NL + "\t\t\t\tedge.getElement(), ";
   protected final String TEXT_1174 = ".eINSTANCE.get";
-  protected final String TEXT_1175 = "(), newTarget.getElement()));";
+  protected final String TEXT_1175 = "()," + NL + "\t\t\t\tnewTarget.getElement()));";
   protected final String TEXT_1176 = NL + "\t\t\tresult.append(";
   protected final String TEXT_1177 = ".create(" + NL + "\t\t\t\teditingDomain," + NL + "\t\t\t\tedge.getSource().getElement(), ";
   protected final String TEXT_1178 = ".eINSTANCE.get";
-  protected final String TEXT_1179 = "(), newTarget.getElement()));";
-  protected final String TEXT_1180 = NL + "\t\t\treturn result;" + NL + "\t\t}";
-  protected final String TEXT_1181 = NL + "\t/**" + NL + "\t * @generated" + NL + "\t */";
-  protected final String TEXT_1182 = NL;
-  protected final String TEXT_1183 = NL + "\t\t\tprivate ";
-  protected final String TEXT_1184 = " createDomainModelRemoveCommand(";
-  protected final String TEXT_1185 = " editingDomain) {";
-  protected final String TEXT_1186 = NL + "\t\t\t\t";
-  protected final String TEXT_1187 = " result = new ";
-  protected final String TEXT_1188 = "();";
-  protected final String TEXT_1189 = NL + "\t\t\t\tresult.append(";
-  protected final String TEXT_1190 = ".create(" + NL + "\t\t\t\t\teditingDomain," + NL + "\t\t\t\t\t";
-  protected final String TEXT_1191 = ".getElement().eContainer(), ";
-  protected final String TEXT_1192 = ".getElement().eContainmentFeature(), ";
-  protected final String TEXT_1193 = ".getElement()));";
-  protected final String TEXT_1194 = NL + "\t\t\t\tresult.append(";
-  protected final String TEXT_1195 = ".create(" + NL + "\t\t\t\t\teditingDomain," + NL + "\t\t\t\t\t";
-  protected final String TEXT_1196 = ".getElement().eContainer(), ";
-  protected final String TEXT_1197 = ".getElement().eContainmentFeature(), ";
-  protected final String TEXT_1198 = ".UNSET_VALUE));";
-  protected final String TEXT_1199 = NL + "\t\t\t\treturn ";
-  protected final String TEXT_1200 = ".INSTANCE;";
+  protected final String TEXT_1179 = "(), oldTarget.getElement()));" + NL + "\t\t\tresult.append(";
+  protected final String TEXT_1180 = ".create(" + NL + "\t\t\t\teditingDomain," + NL + "\t\t\t\tedge.getSource().getElement(), ";
+  protected final String TEXT_1181 = ".eINSTANCE.get";
+  protected final String TEXT_1182 = "(), newTarget.getElement()));";
+  protected final String TEXT_1183 = NL + "\t\t\tresult.append(";
+  protected final String TEXT_1184 = ".create(" + NL + "\t\t\t\teditingDomain," + NL + "\t\t\t\tedge.getSource().getElement(), ";
+  protected final String TEXT_1185 = ".eINSTANCE.get";
+  protected final String TEXT_1186 = "(), newTarget.getElement()));";
+  protected final String TEXT_1187 = NL + "\t\t\treturn result;" + NL + "\t\t}";
+  protected final String TEXT_1188 = NL + "\t/**" + NL + "\t * @generated" + NL + "\t */";
+  protected final String TEXT_1189 = NL;
+  protected final String TEXT_1190 = NL + "\t\t\tprivate ";
+  protected final String TEXT_1191 = " createDomainModelRemoveCommand(";
+  protected final String TEXT_1192 = " editingDomain) {";
+  protected final String TEXT_1193 = NL + "\t\t\t\t";
+  protected final String TEXT_1194 = " result = new ";
+  protected final String TEXT_1195 = "();";
+  protected final String TEXT_1196 = NL + "\t\t\t\tresult.append(";
+  protected final String TEXT_1197 = ".create(" + NL + "\t\t\t\t\teditingDomain," + NL + "\t\t\t\t\t";
+  protected final String TEXT_1198 = ".getElement().eContainer(), ";
+  protected final String TEXT_1199 = ".getElement().eContainmentFeature(), ";
+  protected final String TEXT_1200 = ".getElement()));";
   protected final String TEXT_1201 = NL + "\t\t\t\tresult.append(";
   protected final String TEXT_1202 = ".create(" + NL + "\t\t\t\t\teditingDomain," + NL + "\t\t\t\t\t";
   protected final String TEXT_1203 = ".getElement().eContainer(), ";
-  protected final String TEXT_1204 = ".eINSTANCE.get";
-  protected final String TEXT_1205 = "()," + NL + "\t\t\t\t\t";
-  protected final String TEXT_1206 = ".getElement()));";
-  protected final String TEXT_1207 = NL + "\t\t\t\tresult.append(";
-  protected final String TEXT_1208 = ".create(" + NL + "\t\t\t\t\teditingDomain," + NL + "\t\t\t\t\t";
-  protected final String TEXT_1209 = ".getElement().eContainer(), ";
-  protected final String TEXT_1210 = ".eINSTANCE.get";
-  protected final String TEXT_1211 = "()," + NL + "\t\t\t\t\t";
-  protected final String TEXT_1212 = ".UNSET_VALUE));";
-  protected final String TEXT_1213 = NL + "\t\t\t\tresult.append(";
-  protected final String TEXT_1214 = ".create(" + NL + "\t\t\t\t\teditingDomain," + NL + "\t\t\t\t\t";
-  protected final String TEXT_1215 = ".getElement(), ";
-  protected final String TEXT_1216 = ".eINSTANCE.get";
-  protected final String TEXT_1217 = "(), ";
-  protected final String TEXT_1218 = ".getSource().getElement()));";
-  protected final String TEXT_1219 = NL + "\t\t\t\tresult.append(";
-  protected final String TEXT_1220 = ".create(" + NL + "\t\t\t\t\teditingDomain," + NL + "\t\t\t\t\t";
-  protected final String TEXT_1221 = ".getElement(), ";
-  protected final String TEXT_1222 = ".eINSTANCE.get";
-  protected final String TEXT_1223 = "(), ";
-  protected final String TEXT_1224 = ".UNSET_VALUE));";
-  protected final String TEXT_1225 = NL + "\t\t\t\tresult.append(";
-  protected final String TEXT_1226 = ".create(" + NL + "\t\t\t\t\teditingDomain," + NL + "\t\t\t\t\t";
-  protected final String TEXT_1227 = ".getElement(), ";
-  protected final String TEXT_1228 = ".eINSTANCE.get";
-  protected final String TEXT_1229 = "(), ";
-  protected final String TEXT_1230 = ".getTarget().getElement()));";
-  protected final String TEXT_1231 = NL + "\t\t\t\tresult.append(";
-  protected final String TEXT_1232 = ".create(" + NL + "\t\t\t\t\teditingDomain," + NL + "\t\t\t\t\t";
-  protected final String TEXT_1233 = ".getElement(), ";
-  protected final String TEXT_1234 = ".eINSTANCE.get";
-  protected final String TEXT_1235 = "(), ";
-  protected final String TEXT_1236 = ".UNSET_VALUE));";
-  protected final String TEXT_1237 = NL + "\t\t\t\treturn result;";
-  protected final String TEXT_1238 = NL + "\t\t\t\treturn ";
+  protected final String TEXT_1204 = ".getElement().eContainmentFeature(), ";
+  protected final String TEXT_1205 = ".UNSET_VALUE));";
+  protected final String TEXT_1206 = NL + "\t\t\t\treturn ";
+  protected final String TEXT_1207 = ".INSTANCE;";
+  protected final String TEXT_1208 = NL + "\t\t\t\tresult.append(";
+  protected final String TEXT_1209 = ".create(" + NL + "\t\t\t\t\teditingDomain," + NL + "\t\t\t\t\t";
+  protected final String TEXT_1210 = ".getElement().eContainer(), ";
+  protected final String TEXT_1211 = ".eINSTANCE.get";
+  protected final String TEXT_1212 = "()," + NL + "\t\t\t\t\t";
+  protected final String TEXT_1213 = ".getElement()));";
+  protected final String TEXT_1214 = NL + "\t\t\t\tresult.append(";
+  protected final String TEXT_1215 = ".create(" + NL + "\t\t\t\t\teditingDomain," + NL + "\t\t\t\t\t";
+  protected final String TEXT_1216 = ".getElement().eContainer(), ";
+  protected final String TEXT_1217 = ".eINSTANCE.get";
+  protected final String TEXT_1218 = "()," + NL + "\t\t\t\t\t";
+  protected final String TEXT_1219 = ".UNSET_VALUE));";
+  protected final String TEXT_1220 = NL + "\t\t\t\tresult.append(";
+  protected final String TEXT_1221 = ".create(" + NL + "\t\t\t\t\teditingDomain," + NL + "\t\t\t\t\t";
+  protected final String TEXT_1222 = ".getElement(), ";
+  protected final String TEXT_1223 = ".eINSTANCE.get";
+  protected final String TEXT_1224 = "(), ";
+  protected final String TEXT_1225 = ".getSource().getElement()));";
+  protected final String TEXT_1226 = NL + "\t\t\t\tresult.append(";
+  protected final String TEXT_1227 = ".create(" + NL + "\t\t\t\t\teditingDomain," + NL + "\t\t\t\t\t";
+  protected final String TEXT_1228 = ".getElement(), ";
+  protected final String TEXT_1229 = ".eINSTANCE.get";
+  protected final String TEXT_1230 = "(), ";
+  protected final String TEXT_1231 = ".UNSET_VALUE));";
+  protected final String TEXT_1232 = NL + "\t\t\t\tresult.append(";
+  protected final String TEXT_1233 = ".create(" + NL + "\t\t\t\t\teditingDomain," + NL + "\t\t\t\t\t";
+  protected final String TEXT_1234 = ".getElement(), ";
+  protected final String TEXT_1235 = ".eINSTANCE.get";
+  protected final String TEXT_1236 = "(), ";
+  protected final String TEXT_1237 = ".getTarget().getElement()));";
+  protected final String TEXT_1238 = NL + "\t\t\t\tresult.append(";
   protected final String TEXT_1239 = ".create(" + NL + "\t\t\t\t\teditingDomain," + NL + "\t\t\t\t\t";
-  protected final String TEXT_1240 = ".getSource().getElement(), ";
+  protected final String TEXT_1240 = ".getElement(), ";
   protected final String TEXT_1241 = ".eINSTANCE.get";
   protected final String TEXT_1242 = "(), ";
-  protected final String TEXT_1243 = ".getTarget().getElement());";
-  protected final String TEXT_1244 = NL + "\t\t\t\treturn ";
-  protected final String TEXT_1245 = ".create(" + NL + "\t\t\t\t\teditingDomain," + NL + "\t\t\t\t\t";
-  protected final String TEXT_1246 = ".getSource().getElement(), ";
-  protected final String TEXT_1247 = ".eINSTANCE.get";
-  protected final String TEXT_1248 = "(), ";
-  protected final String TEXT_1249 = ".UNSET_VALUE);";
-  protected final String TEXT_1250 = NL + "\t\t\t}";
-  protected final String TEXT_1251 = NL + "\t}" + NL;
-  protected final String TEXT_1252 = NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate static class Create";
-  protected final String TEXT_1253 = "Command extends ";
-  protected final String TEXT_1254 = " {" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tprivate final ";
-  protected final String TEXT_1255 = " source;" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tprivate final ";
-  protected final String TEXT_1256 = " target;" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tprivate final ";
-  protected final String TEXT_1257 = " createdEdge;" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tprivate final org.eclipse.emf.common.command.Command domainModelAddCommand;" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tpublic Create";
-  protected final String TEXT_1258 = "Command(";
-  protected final String TEXT_1259 = " requestEx) {" + NL + "\t\t\tif (requestEx.getSourceEditPart().getModel() instanceof ";
-  protected final String TEXT_1260 = ") {" + NL + "\t\t\t\tsource = (";
-  protected final String TEXT_1261 = ")requestEx.getSourceEditPart().getModel();" + NL + "\t\t\t} else {" + NL + "\t\t\t\tsource = null;" + NL + "\t\t\t}" + NL + "\t\t\tif (requestEx.getTargetEditPart().getModel() instanceof ";
-  protected final String TEXT_1262 = ") {" + NL + "\t\t\t\ttarget = (";
-  protected final String TEXT_1263 = ")requestEx.getTargetEditPart().getModel();" + NL + "\t\t\t} else {" + NL + "\t\t\t\ttarget = null;" + NL + "\t\t\t}" + NL + "\t\t\tif (source == null || target == null) {" + NL + "\t\t\t\tcreatedEdge = null;" + NL + "\t\t\t\tdomainModelAddCommand = ";
-  protected final String TEXT_1264 = ".INSTANCE;" + NL + "\t\t\t\treturn;" + NL + "\t\t\t}" + NL + "\t\t\tcreatedEdge = ";
-  protected final String TEXT_1265 = ".eINSTANCE.createEdge();";
-  protected final String TEXT_1266 = NL + "\t\t\t";
-  protected final String TEXT_1267 = " createdDomainElement = ";
-  protected final String TEXT_1268 = ".eINSTANCE.create";
-  protected final String TEXT_1269 = "();" + NL + "\t\t\tcreatedEdge.setElement(";
-  protected final String TEXT_1270 = "(";
-  protected final String TEXT_1271 = ") ";
-  protected final String TEXT_1272 = "createdDomainElement);" + NL + "\t\t\t";
+  protected final String TEXT_1243 = ".UNSET_VALUE));";
+  protected final String TEXT_1244 = NL + "\t\t\t\treturn result;";
+  protected final String TEXT_1245 = NL + "\t\t\t\treturn ";
+  protected final String TEXT_1246 = ".create(" + NL + "\t\t\t\t\teditingDomain," + NL + "\t\t\t\t\t";
+  protected final String TEXT_1247 = ".getSource().getElement(), ";
+  protected final String TEXT_1248 = ".eINSTANCE.get";
+  protected final String TEXT_1249 = "(), ";
+  protected final String TEXT_1250 = ".getTarget().getElement());";
+  protected final String TEXT_1251 = NL + "\t\t\t\treturn ";
+  protected final String TEXT_1252 = ".create(" + NL + "\t\t\t\t\teditingDomain," + NL + "\t\t\t\t\t";
+  protected final String TEXT_1253 = ".getSource().getElement(), ";
+  protected final String TEXT_1254 = ".eINSTANCE.get";
+  protected final String TEXT_1255 = "(), ";
+  protected final String TEXT_1256 = ".UNSET_VALUE);";
+  protected final String TEXT_1257 = NL + "\t\t\t}";
+  protected final String TEXT_1258 = NL + "\t}" + NL;
+  protected final String TEXT_1259 = NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate static class Create";
+  protected final String TEXT_1260 = "Command extends ";
+  protected final String TEXT_1261 = " {" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tprivate final ";
+  protected final String TEXT_1262 = " source;" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tprivate final ";
+  protected final String TEXT_1263 = " target;" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tprivate final ";
+  protected final String TEXT_1264 = " createdEdge;" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tprivate final org.eclipse.emf.common.command.Command domainModelAddCommand;" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tpublic Create";
+  protected final String TEXT_1265 = "Command(";
+  protected final String TEXT_1266 = " requestEx) {" + NL + "\t\t\tif (requestEx.getSourceEditPart().getModel() instanceof ";
+  protected final String TEXT_1267 = ") {" + NL + "\t\t\t\tsource = (";
+  protected final String TEXT_1268 = ")requestEx.getSourceEditPart().getModel();" + NL + "\t\t\t} else {" + NL + "\t\t\t\tsource = null;" + NL + "\t\t\t}" + NL + "\t\t\tif (requestEx.getTargetEditPart().getModel() instanceof ";
+  protected final String TEXT_1269 = ") {" + NL + "\t\t\t\ttarget = (";
+  protected final String TEXT_1270 = ")requestEx.getTargetEditPart().getModel();" + NL + "\t\t\t} else {" + NL + "\t\t\t\ttarget = null;" + NL + "\t\t\t}" + NL + "\t\t\tif (source == null || target == null) {" + NL + "\t\t\t\tcreatedEdge = null;" + NL + "\t\t\t\tdomainModelAddCommand = ";
+  protected final String TEXT_1271 = ".INSTANCE;" + NL + "\t\t\t\treturn;" + NL + "\t\t\t}" + NL + "\t\t\tcreatedEdge = ";
+  protected final String TEXT_1272 = ".eINSTANCE.createEdge();";
   protected final String TEXT_1273 = NL + "\t\t\t";
-  protected final String TEXT_1274 = ".";
-  protected final String TEXT_1275 = ".initializeElement(";
-  protected final String TEXT_1276 = "(";
-  protected final String TEXT_1277 = ") ";
-  protected final String TEXT_1278 = "createdDomainElement);";
-  protected final String TEXT_1279 = NL + "\t\t\tcreatedEdge.setElement(null);";
+  protected final String TEXT_1274 = " createdDomainElement = ";
+  protected final String TEXT_1275 = ".eINSTANCE.create";
+  protected final String TEXT_1276 = "();" + NL + "\t\t\tcreatedEdge.setElement(";
+  protected final String TEXT_1277 = "(";
+  protected final String TEXT_1278 = ") ";
+  protected final String TEXT_1279 = "createdDomainElement);" + NL + "\t\t\t";
   protected final String TEXT_1280 = NL + "\t\t\t";
-  protected final String TEXT_1281 = ".decorateView(createdEdge);" + NL + "\t\t\t";
-  protected final String TEXT_1282 = " domainModelEditDomain = ";
-  protected final String TEXT_1283 = ".getEditingDomain(source.getDiagram().getElement());";
-  protected final String TEXT_1284 = NL + "\t\t\torg.eclipse.emf.common.command.CompoundCommand addLinkEndsCommand = new org.eclipse.emf.common.command.CompoundCommand();";
-  protected final String TEXT_1285 = NL + "\t\t\t";
-  protected final String TEXT_1286 = " container = getRelationshipContainer(source.getElement(), ";
-  protected final String TEXT_1287 = ".eINSTANCE.get";
-  protected final String TEXT_1288 = "());" + NL + "\t\t\tif (container == null) {" + NL + "\t\t\t\tdomainModelAddCommand = null;" + NL + "\t\t\t\treturn;" + NL + "\t\t\t}" + NL + "\t\t\taddLinkEndsCommand.append(";
-  protected final String TEXT_1289 = ".create(domainModelEditDomain, " + NL + "\t\t\t\tcontainer, ";
-  protected final String TEXT_1290 = ".eINSTANCE.get";
-  protected final String TEXT_1291 = "(), createdDomainElement));";
-  protected final String TEXT_1292 = NL + "\t\t\taddLinkEndsCommand.append(";
-  protected final String TEXT_1293 = ".create(domainModelEditDomain," + NL + "\t\t\t\tcontainer, ";
+  protected final String TEXT_1281 = ".";
+  protected final String TEXT_1282 = ".initializeElement(";
+  protected final String TEXT_1283 = "(";
+  protected final String TEXT_1284 = ") ";
+  protected final String TEXT_1285 = "createdDomainElement);";
+  protected final String TEXT_1286 = NL + "\t\t\tcreatedEdge.setElement(null);";
+  protected final String TEXT_1287 = NL + "\t\t\t";
+  protected final String TEXT_1288 = ".decorateView(createdEdge);" + NL + "\t\t\t";
+  protected final String TEXT_1289 = " domainModelEditDomain = ";
+  protected final String TEXT_1290 = ".getEditingDomain(source.getDiagram().getElement());";
+  protected final String TEXT_1291 = NL + "\t\t\torg.eclipse.emf.common.command.CompoundCommand addLinkEndsCommand = new org.eclipse.emf.common.command.CompoundCommand();";
+  protected final String TEXT_1292 = NL + "\t\t\t";
+  protected final String TEXT_1293 = " container = getRelationshipContainer(source.getElement(), ";
   protected final String TEXT_1294 = ".eINSTANCE.get";
-  protected final String TEXT_1295 = "(), createdDomainElement));";
-  protected final String TEXT_1296 = NL;
-  protected final String TEXT_1297 = NL + "\t\tif (";
-  protected final String TEXT_1298 = " != null) {" + NL + "\t\t\t";
-  protected final String TEXT_1299 = NL + "\t\t}";
-  protected final String TEXT_1300 = NL + "\t\tif (";
-  protected final String TEXT_1301 = ".size() >= ";
-  protected final String TEXT_1302 = ".eINSTANCE.get";
-  protected final String TEXT_1303 = ".getUpperBound()) {" + NL + "\t\t\t";
-  protected final String TEXT_1304 = NL + "\t\t}";
-  protected final String TEXT_1305 = NL + "\t\t\taddLinkEndsCommand.append(";
-  protected final String TEXT_1306 = ".create(domainModelEditDomain, " + NL + "\t\t\t\tcreatedDomainElement, ";
-  protected final String TEXT_1307 = ".eINSTANCE.get";
-  protected final String TEXT_1308 = "(), source.getElement()));";
-  protected final String TEXT_1309 = NL;
-  protected final String TEXT_1310 = NL + "\t\tif (";
-  protected final String TEXT_1311 = " != null) {" + NL + "\t\t\t";
-  protected final String TEXT_1312 = NL + "\t\t}";
-  protected final String TEXT_1313 = NL + "\t\tif (";
-  protected final String TEXT_1314 = ".size() >= ";
-  protected final String TEXT_1315 = ".eINSTANCE.get";
-  protected final String TEXT_1316 = ".getUpperBound()) {" + NL + "\t\t\t";
-  protected final String TEXT_1317 = NL + "\t\t}";
-  protected final String TEXT_1318 = NL + "\t\t\taddLinkEndsCommand.append(";
-  protected final String TEXT_1319 = ".create(domainModelEditDomain, " + NL + "\t\t\t\tcreatedDomainElement, ";
-  protected final String TEXT_1320 = ".eINSTANCE.get";
-  protected final String TEXT_1321 = "(), target.getElement()));";
-  protected final String TEXT_1322 = NL + "\t\tdomainModelAddCommand = addLinkEndsCommand;";
-  protected final String TEXT_1323 = NL + "\t\t\tdomainModelAddCommand = ";
-  protected final String TEXT_1324 = ".create(domainModelEditDomain, source.getElement(), " + NL + "\t\t\t\t";
-  protected final String TEXT_1325 = ".eINSTANCE.get";
-  protected final String TEXT_1326 = "(), target.getElement());";
-  protected final String TEXT_1327 = NL + "\t\t}" + NL;
-  protected final String TEXT_1328 = NL;
-  protected final String TEXT_1329 = NL + "\t\t/**" + NL + "\t\t * Finds container element for the relationship of the specified type." + NL + "\t\t * Default implementation goes up by containment hierarchy starting from" + NL + "\t\t * the specified element and returns the first element that is instance of" + NL + "\t\t * the specified container class." + NL + "\t\t * " + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tprotected ";
-  protected final String TEXT_1330 = " getRelationshipContainer(";
-  protected final String TEXT_1331 = " element, ";
-  protected final String TEXT_1332 = " containerClass) {" + NL + "\t\t\tfor (; element != null; element = element.eContainer()) {" + NL + "\t\t\t\tif (containerClass.isSuperTypeOf(element.eClass())) {" + NL + "\t\t\t\t\treturn element;" + NL + "\t\t\t\t}" + NL + "\t\t\t}" + NL + "\t\t\treturn null;" + NL + "\t\t}";
-  protected final String TEXT_1333 = NL + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tpublic boolean canExecute() {" + NL + "\t\t\tif (source == null || target == null || createdEdge == null || domainModelAddCommand == null || !domainModelAddCommand.canExecute()) {" + NL + "\t\t\t\treturn false;" + NL + "\t\t\t}";
-  protected final String TEXT_1334 = NL;
-  protected final String TEXT_1335 = NL + "\t\t\tif(!";
-  protected final String TEXT_1336 = ".canCreateLink(";
-  protected final String TEXT_1337 = ", ";
-  protected final String TEXT_1338 = ", false)) {" + NL + "\t\t\t\treturn false;" + NL + "\t\t\t}";
-  protected final String TEXT_1339 = NL + "\t\t\treturn true;" + NL + "\t\t}" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tpublic boolean canUndo() {" + NL + "\t\t\treturn source != null && target != null && createdEdge != null && domainModelAddCommand != null && domainModelAddCommand.canUndo();" + NL + "\t\t}" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tpublic void execute() {" + NL + "\t\t\tdomainModelAddCommand.execute();" + NL + "\t\t\tsource.getDiagram().insertEdge(createdEdge);" + NL + "\t\t\tcreatedEdge.setSource(source);" + NL + "\t\t\tcreatedEdge.setTarget(target);" + NL + "\t\t}" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tpublic void undo() {" + NL + "\t\t\tdomainModelAddCommand.undo();" + NL + "\t\t\tsource.getDiagram().removeEdge(createdEdge);" + NL + "\t\t\tcreatedEdge.setSource(null);" + NL + "\t\t\tcreatedEdge.setTarget(null);" + NL + "\t\t}" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tpublic void redo() {" + NL + "\t\t\texecute();" + NL + "\t\t}" + NL + "\t}";
-  protected final String TEXT_1340 = NL;
+  protected final String TEXT_1295 = "());" + NL + "\t\t\tif (container == null) {" + NL + "\t\t\t\tdomainModelAddCommand = null;" + NL + "\t\t\t\treturn;" + NL + "\t\t\t}" + NL + "\t\t\taddLinkEndsCommand.append(";
+  protected final String TEXT_1296 = ".create(domainModelEditDomain, " + NL + "\t\t\t\tcontainer, ";
+  protected final String TEXT_1297 = ".eINSTANCE.get";
+  protected final String TEXT_1298 = "(), createdDomainElement));";
+  protected final String TEXT_1299 = NL + "\t\t\taddLinkEndsCommand.append(";
+  protected final String TEXT_1300 = ".create(domainModelEditDomain," + NL + "\t\t\t\tcontainer, ";
+  protected final String TEXT_1301 = ".eINSTANCE.get";
+  protected final String TEXT_1302 = "(), createdDomainElement));";
+  protected final String TEXT_1303 = NL;
+  protected final String TEXT_1304 = NL + "\t\tif (";
+  protected final String TEXT_1305 = " != null) {" + NL + "\t\t\t";
+  protected final String TEXT_1306 = NL + "\t\t}";
+  protected final String TEXT_1307 = NL + "\t\tif (";
+  protected final String TEXT_1308 = ".size() >= ";
+  protected final String TEXT_1309 = ".eINSTANCE.get";
+  protected final String TEXT_1310 = ".getUpperBound()) {" + NL + "\t\t\t";
+  protected final String TEXT_1311 = NL + "\t\t}";
+  protected final String TEXT_1312 = NL + "\t\t\taddLinkEndsCommand.append(";
+  protected final String TEXT_1313 = ".create(domainModelEditDomain, " + NL + "\t\t\t\tcreatedDomainElement, ";
+  protected final String TEXT_1314 = ".eINSTANCE.get";
+  protected final String TEXT_1315 = "(), source.getElement()));";
+  protected final String TEXT_1316 = NL;
+  protected final String TEXT_1317 = NL + "\t\tif (";
+  protected final String TEXT_1318 = " != null) {" + NL + "\t\t\t";
+  protected final String TEXT_1319 = NL + "\t\t}";
+  protected final String TEXT_1320 = NL + "\t\tif (";
+  protected final String TEXT_1321 = ".size() >= ";
+  protected final String TEXT_1322 = ".eINSTANCE.get";
+  protected final String TEXT_1323 = ".getUpperBound()) {" + NL + "\t\t\t";
+  protected final String TEXT_1324 = NL + "\t\t}";
+  protected final String TEXT_1325 = NL + "\t\t\taddLinkEndsCommand.append(";
+  protected final String TEXT_1326 = ".create(domainModelEditDomain, " + NL + "\t\t\t\tcreatedDomainElement, ";
+  protected final String TEXT_1327 = ".eINSTANCE.get";
+  protected final String TEXT_1328 = "(), target.getElement()));";
+  protected final String TEXT_1329 = NL + "\t\tdomainModelAddCommand = addLinkEndsCommand;";
+  protected final String TEXT_1330 = NL + "\t\t\tdomainModelAddCommand = ";
+  protected final String TEXT_1331 = ".create(domainModelEditDomain, source.getElement(), " + NL + "\t\t\t\t";
+  protected final String TEXT_1332 = ".eINSTANCE.get";
+  protected final String TEXT_1333 = "(), target.getElement());";
+  protected final String TEXT_1334 = NL + "\t\t}" + NL;
+  protected final String TEXT_1335 = NL;
+  protected final String TEXT_1336 = NL + "\t\t/**" + NL + "\t\t * Finds container element for the relationship of the specified type." + NL + "\t\t * Default implementation goes up by containment hierarchy starting from" + NL + "\t\t * the specified element and returns the first element that is instance of" + NL + "\t\t * the specified container class." + NL + "\t\t * " + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tprotected ";
+  protected final String TEXT_1337 = " getRelationshipContainer(";
+  protected final String TEXT_1338 = " element, ";
+  protected final String TEXT_1339 = " containerClass) {" + NL + "\t\t\tfor (; element != null; element = element.eContainer()) {" + NL + "\t\t\t\tif (containerClass.isSuperTypeOf(element.eClass())) {" + NL + "\t\t\t\t\treturn element;" + NL + "\t\t\t\t}" + NL + "\t\t\t}" + NL + "\t\t\treturn null;" + NL + "\t\t}";
+  protected final String TEXT_1340 = NL + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tpublic boolean canExecute() {" + NL + "\t\t\tif (source == null || target == null || createdEdge == null || domainModelAddCommand == null || !domainModelAddCommand.canExecute()) {" + NL + "\t\t\t\treturn false;" + NL + "\t\t\t}";
   protected final String TEXT_1341 = NL;
-  protected final String TEXT_1342 = NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate static class MapModeWorkaround {" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tpublic int DPtoLP(int dp) {" + NL + "\t\t\treturn dp;" + NL + "\t\t}" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tpublic static MapModeWorkaround INSTANCE = new MapModeWorkaround();" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate MapModeWorkaround getMapMode() {" + NL + "\t\treturn MapModeWorkaround.INSTANCE;" + NL + "\t}";
-  protected final String TEXT_1343 = NL + "}";
-  protected final String TEXT_1344 = NL;
+  protected final String TEXT_1342 = NL + "\t\t\tif(!";
+  protected final String TEXT_1343 = ".canCreateLink(";
+  protected final String TEXT_1344 = ", ";
+  protected final String TEXT_1345 = ", false)) {" + NL + "\t\t\t\treturn false;" + NL + "\t\t\t}";
+  protected final String TEXT_1346 = NL + "\t\t\treturn true;" + NL + "\t\t}" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tpublic boolean canUndo() {" + NL + "\t\t\treturn source != null && target != null && createdEdge != null && domainModelAddCommand != null && domainModelAddCommand.canUndo();" + NL + "\t\t}" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tpublic void execute() {" + NL + "\t\t\tdomainModelAddCommand.execute();" + NL + "\t\t\tsource.getDiagram().insertEdge(createdEdge);" + NL + "\t\t\tcreatedEdge.setSource(source);" + NL + "\t\t\tcreatedEdge.setTarget(target);" + NL + "\t\t}" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tpublic void undo() {" + NL + "\t\t\tdomainModelAddCommand.undo();" + NL + "\t\t\tsource.getDiagram().removeEdge(createdEdge);" + NL + "\t\t\tcreatedEdge.setSource(null);" + NL + "\t\t\tcreatedEdge.setTarget(null);" + NL + "\t\t}" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tpublic void redo() {" + NL + "\t\t\texecute();" + NL + "\t\t}" + NL + "\t}";
+  protected final String TEXT_1347 = NL;
+  protected final String TEXT_1348 = NL;
+  protected final String TEXT_1349 = NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate static class MapModeWorkaround {" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tpublic int DPtoLP(int dp) {" + NL + "\t\t\treturn dp;" + NL + "\t\t}" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tpublic static MapModeWorkaround INSTANCE = new MapModeWorkaround();" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate MapModeWorkaround getMapMode() {" + NL + "\t\treturn MapModeWorkaround.INSTANCE;" + NL + "\t}";
+  protected final String TEXT_1350 = NL + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate class TreeEditPartAdapter extends ";
+  protected final String TEXT_1351 = " {" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tpublic TreeEditPartAdapter() {" + NL + "\t\t\tsuper(getDiagramNode(), ";
+  protected final String TEXT_1352 = ".getInstance().getItemProvidersAdapterFactory());" + NL + "\t\t}" + NL + "" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tprotected void createEditPolicies() {";
+  protected final String TEXT_1353 = NL;
+  protected final String TEXT_1354 = "\t\tinstallEditPolicy(";
+  protected final String TEXT_1355 = ".COMPONENT_ROLE, new ";
+  protected final String TEXT_1356 = "() {" + NL + "\t\t\tprotected ";
+  protected final String TEXT_1357 = " createDeleteCommand(";
+  protected final String TEXT_1358 = " deleteRequest) {" + NL + "\t\t\t\t";
+  protected final String TEXT_1359 = " editingDomain = ";
+  protected final String TEXT_1360 = ".getEditingDomain(getDiagramNode().getDiagram().getElement());" + NL + "\t\t\t\t";
+  protected final String TEXT_1361 = " cc = new ";
+  protected final String TEXT_1362 = "();" + NL + "\t\t\t\tcc.append(getDomainModelRemoveCommand(editingDomain));" + NL + "\t\t\t\tcc.append(";
+  protected final String TEXT_1363 = ".create(editingDomain, getDiagramNode()));" + NL + "\t\t\t\treturn new ";
+  protected final String TEXT_1364 = "(editingDomain, cc);" + NL + "\t\t\t}" + NL + "" + NL + "\t\t\tprivate org.eclipse.emf.common.command.Command getDomainModelRemoveCommand(";
+  protected final String TEXT_1365 = " editingDomain) {";
+  protected final String TEXT_1366 = NL + "\t\t\t\t";
+  protected final String TEXT_1367 = " result = new ";
+  protected final String TEXT_1368 = "();";
+  protected final String TEXT_1369 = NL + "\t\t\t\tresult.append(";
+  protected final String TEXT_1370 = ".create(" + NL + "\t\t\t\t\teditingDomain, " + NL + "\t\t\t\t\tgetDiagramNode().getElement().eContainer(), ";
+  protected final String TEXT_1371 = ".eINSTANCE.get";
+  protected final String TEXT_1372 = "()," + NL + "\t\t\t\t\tgetDiagramNode().getElement()));";
+  protected final String TEXT_1373 = NL + "\t\t\t\tresult.append(";
+  protected final String TEXT_1374 = ".create(" + NL + "\t\t\t\t\teditingDomain, " + NL + "\t\t\t\t\tgetDiagramNode().getElement().eContainer(), ";
+  protected final String TEXT_1375 = ".eINSTANCE.get";
+  protected final String TEXT_1376 = "()," + NL + "\t\t\t\t\t";
+  protected final String TEXT_1377 = ".UNSET_VALUE));";
+  protected final String TEXT_1378 = NL + "\t\t\t\tresult.append(";
+  protected final String TEXT_1379 = ".create(" + NL + "\t\t\t\t\teditingDomain, " + NL + "\t\t\t\t\tgetDiagramNode().getElement().eContainer(), ";
+  protected final String TEXT_1380 = ".eINSTANCE.get";
+  protected final String TEXT_1381 = "()," + NL + "\t\t\t\t\tgetDiagramNode().getElement()));";
+  protected final String TEXT_1382 = NL + "\t\t\t\tresult.append(";
+  protected final String TEXT_1383 = ".create(" + NL + "\t\t\t\t\teditingDomain, " + NL + "\t\t\t\t\tgetDiagramNode().getElement().eContainer(), ";
+  protected final String TEXT_1384 = ".eINSTANCE.get";
+  protected final String TEXT_1385 = "()," + NL + "\t\t\t\t\t";
+  protected final String TEXT_1386 = ".UNSET_VALUE));";
+  protected final String TEXT_1387 = NL + "\t\t\t\treturn result;";
+  protected final String TEXT_1388 = NL + "\t\t\t\treturn ";
+  protected final String TEXT_1389 = ".create(" + NL + "\t\t\t\t\teditingDomain, " + NL + "\t\t\t\t\tgetDiagramNode().getElement().eContainer(), ";
+  protected final String TEXT_1390 = ".eINSTANCE.get";
+  protected final String TEXT_1391 = "()," + NL + "\t\t\t\t\tgetDiagramNode().getElement());";
+  protected final String TEXT_1392 = NL + "\t\t\t\treturn ";
+  protected final String TEXT_1393 = ".create(" + NL + "\t\t\t\t\teditingDomain, " + NL + "\t\t\t\t\tgetDiagramNode().getElement().eContainer(), ";
+  protected final String TEXT_1394 = ".eINSTANCE.get";
+  protected final String TEXT_1395 = "()," + NL + "\t\t\t\t\t";
+  protected final String TEXT_1396 = ".UNSET_VALUE);";
+  protected final String TEXT_1397 = NL + "\t\t\t}" + NL + "\t\t});";
+  protected final String TEXT_1398 = NL;
+  protected final String TEXT_1399 = "\t\tinstallEditPolicy(";
+  protected final String TEXT_1400 = ".DIRECT_EDIT_ROLE," + NL + "\t\t\t\tnew ";
+  protected final String TEXT_1401 = "() {" + NL + "\t\t\t\t\tprotected void showCurrentEditValue(";
+  protected final String TEXT_1402 = " request) {" + NL + "\t\t\t\t\t\tString value = (String) request.getCellEditor().getValue();" + NL + "\t\t\t\t\t\tsetWidgetText(value);" + NL + "\t\t\t\t\t}";
+  protected final String TEXT_1403 = NL;
+  protected final String TEXT_1404 = "\t\t\t\t\tprotected ";
+  protected final String TEXT_1405 = " getDirectEditCommand(";
+  protected final String TEXT_1406 = " request) {" + NL + "\t\t\t\t\t\tString value = (String) request.getCellEditor().getValue();" + NL + "\t\t\t\t\t\tif (value == null) {" + NL + "\t\t\t\t\t\t\t//Invalid value is transformed into a null by the validator." + NL + "\t\t\t\t\t\t\t//XXX: implement validator" + NL + "\t\t\t\t\t\t\treturn ";
+  protected final String TEXT_1407 = ".INSTANCE;" + NL + "\t\t\t\t\t\t}" + NL + "\t\t\t\t\t\tfinal Object[] parseResult;" + NL + "\t\t\t\t\t\ttry {" + NL + "\t\t\t\t\t\t\tparseResult = new ";
+  protected final String TEXT_1408 = "(";
+  protected final String TEXT_1409 = ").parse(value);" + NL + "\t\t\t\t\t\t} catch (IllegalArgumentException e) {" + NL + "\t\t\t\t\t\t\treturn ";
+  protected final String TEXT_1410 = ".INSTANCE;" + NL + "\t\t\t\t\t\t} catch (";
+  protected final String TEXT_1411 = " e) {" + NL + "\t\t\t\t\t\t\treturn ";
+  protected final String TEXT_1412 = ".INSTANCE;" + NL + "\t\t\t\t\t\t}" + NL + "\t\t\t\t\t\t";
+  protected final String TEXT_1413 = " editingDomain = ";
+  protected final String TEXT_1414 = ".getEditingDomain(";
+  protected final String TEXT_1415 = ".getDiagram().getElement());";
+  protected final String TEXT_1416 = NL + "\t\t\t\t\t\tif (parseResult.length != 1) {" + NL + "\t\t\t\t\t\t\treturn ";
+  protected final String TEXT_1417 = ".INSTANCE;" + NL + "\t\t\t\t\t\t}" + NL + "\t\t\t\t\t\t";
+  protected final String TEXT_1418 = " domainModelCommand = createDomainModelCommand(editingDomain, parseResult[0]);" + NL + "\t\t\t\t\t\treturn new ";
+  protected final String TEXT_1419 = "(editingDomain, domainModelCommand);" + NL + "\t\t\t\t\t}" + NL + "\t\t\t\t\t";
+  protected final String TEXT_1420 = " createDomainModelCommand(";
+  protected final String TEXT_1421 = " editingDomain, Object value) {" + NL + "\t\t\t\t\t\t";
+  protected final String TEXT_1422 = " element = ";
+  protected final String TEXT_1423 = ";" + NL + "\t\t\t\t\t\t";
+  protected final String TEXT_1424 = " feature = (";
+  protected final String TEXT_1425 = ") ";
+  protected final String TEXT_1426 = ".eINSTANCE.get";
+  protected final String TEXT_1427 = "();" + NL + "\t\t\t\t\t\tObject valueToSet;" + NL + "\t\t\t\t\t\ttry {" + NL + "\t\t\t\t\t\t\tvalueToSet = ";
+  protected final String TEXT_1428 = ".parseValue(feature, value);" + NL + "\t\t\t\t\t\t} catch (IllegalArgumentException e) {" + NL + "\t\t\t\t\t\t\treturn ";
+  protected final String TEXT_1429 = ".INSTANCE;" + NL + "\t\t\t\t\t\t}";
+  protected final String TEXT_1430 = NL + "\t\t\t\t\t\t";
+  protected final String TEXT_1431 = " result = new ";
+  protected final String TEXT_1432 = "();" + NL + "\t\t\t\t\t\t";
+  protected final String TEXT_1433 = " values = new ";
+  protected final String TEXT_1434 = "();" + NL + "\t\t\t\t\t\tvalues.addAll(element.get";
+  protected final String TEXT_1435 = "());" + NL + "\t\t\t\t\t\tresult.append(";
+  protected final String TEXT_1436 = ".create(editingDomain, element, feature, values));" + NL + "\t\t\t\t\t\tresult.append(";
+  protected final String TEXT_1437 = ".create(editingDomain, element, feature, valueToSet));" + NL + "\t\t\t\t\t\treturn result;";
+  protected final String TEXT_1438 = NL + "\t\t\t\t\t\treturn ";
+  protected final String TEXT_1439 = ".create(editingDomain, element, feature, valueToSet);";
+  protected final String TEXT_1440 = NL + "\t\t\t\t\t}";
+  protected final String TEXT_1441 = NL + "\t\t\t\t\t\tif (parseResult.length != ";
+  protected final String TEXT_1442 = ") {" + NL + "\t\t\t\t\t\t\treturn ";
+  protected final String TEXT_1443 = ".INSTANCE;" + NL + "\t\t\t\t\t\t}" + NL + "\t\t\t\t\t\t";
+  protected final String TEXT_1444 = " domainModelCommand = createDomainModelCommand(editingDomain, parseResult);" + NL + "\t\t\t\t\t\treturn new ";
+  protected final String TEXT_1445 = "(editingDomain, domainModelCommand);" + NL + "\t\t\t\t\t}" + NL + "\t\t\t\t\t";
+  protected final String TEXT_1446 = " createDomainModelCommand(";
+  protected final String TEXT_1447 = " editingDomain, Object[] values) {" + NL + "\t\t\t\t\t\t";
+  protected final String TEXT_1448 = " element = ";
+  protected final String TEXT_1449 = ";" + NL + "\t\t\t\t\t\t";
+  protected final String TEXT_1450 = " result = new ";
+  protected final String TEXT_1451 = "();" + NL + "\t\t\t\t\t\tObject valueToSet;";
+  protected final String TEXT_1452 = NL + "\t\t\t\t\t\t";
+  protected final String TEXT_1453 = " ";
+  protected final String TEXT_1454 = "feature = (";
+  protected final String TEXT_1455 = ") ";
+  protected final String TEXT_1456 = ".eINSTANCE.get";
+  protected final String TEXT_1457 = "();" + NL + "\t\t\t\t\t\ttry {" + NL + "\t\t\t\t\t\t\tvalueToSet = ";
+  protected final String TEXT_1458 = ".parseValue(feature, values[";
+  protected final String TEXT_1459 = "]);" + NL + "\t\t\t\t\t\t} catch (IllegalArgumentException e) {" + NL + "\t\t\t\t\t\t\treturn ";
+  protected final String TEXT_1460 = ".INSTANCE;" + NL + "\t\t\t\t\t\t}";
+  protected final String TEXT_1461 = NL + "\t\t\t\t\t\t";
+  protected final String TEXT_1462 = " ";
+  protected final String TEXT_1463 = "values = new ";
+  protected final String TEXT_1464 = "();" + NL + "\t\t\t\t\t\tvalues.addAll(element.get";
+  protected final String TEXT_1465 = "());" + NL + "\t\t\t\t\t\tresult.append(";
+  protected final String TEXT_1466 = ".create(editingDomain, element, feature, values));" + NL + "\t\t\t\t\t\tresult.append(";
+  protected final String TEXT_1467 = ".create(editingDomain, element, feature, valueToSet));";
+  protected final String TEXT_1468 = NL + "\t\t\t\t\t\tresult.append(";
+  protected final String TEXT_1469 = ".create(editingDomain, element, feature, valueToSet));";
+  protected final String TEXT_1470 = NL + "\t\t\t\t\t\treturn result;" + NL + "\t\t\t\t\t}";
+  protected final String TEXT_1471 = NL + "\t\t\t\t});";
+  protected final String TEXT_1472 = NL + "\t\t}" + NL;
+  protected final String TEXT_1473 = NL;
+  protected final String TEXT_1474 = "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate ";
+  protected final String TEXT_1475 = " manager;" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic void performRequest(";
+  protected final String TEXT_1476 = " req) {" + NL + "\t\tif (";
+  protected final String TEXT_1477 = ".REQ_DIRECT_EDIT == req.getType()) {" + NL + "\t\t\tperformDirectEdit();" + NL + "\t\t} else {" + NL + "\t\t\tsuper.performRequest(req);" + NL + "\t\t}" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected ";
+  protected final String TEXT_1478 = " getManager() {" + NL + "\t\tif (manager == null) {" + NL + "\t\t\tmanager = new ";
+  protected final String TEXT_1479 = "(this, ";
+  protected final String TEXT_1480 = ".class, new ";
+  protected final String TEXT_1481 = "() {" + NL + "\t\t\t\tpublic void relocate(";
+  protected final String TEXT_1482 = " celleditor) {" + NL + "\t\t\t\t\tif (checkTreeItem()) {" + NL + "\t\t\t\t\t\tcelleditor.getControl().setFont(((";
+  protected final String TEXT_1483 = ") getWidget()).getFont());" + NL + "\t\t\t\t\t\tcelleditor.getControl().setBounds(((";
+  protected final String TEXT_1484 = ") getWidget()).getBounds());" + NL + "\t\t\t\t\t}" + NL + "\t\t\t\t}" + NL + "\t\t\t}) {" + NL + "\t\t\t\tprotected void initCellEditor() {" + NL + "\t\t\t\t\tgetCellEditor().setValue(getEditText());" + NL + "\t\t\t\t}" + NL + "\t\t\t};" + NL + "\t\t}" + NL + "\t\treturn manager;" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected void performDirectEdit() {" + NL + "\t\tgetManager().show();" + NL + "\t}" + NL + "" + NL + "" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tprotected String getEditText() {" + NL + "\t\t\t";
+  protected final String TEXT_1485 = " primaryLabelEditPart = getPrimaryLabelEditPart();" + NL + "\t\t\tif (primaryLabelEditPart != null) {" + NL + "\t\t\t\treturn primaryLabelEditPart.getLabelEditText();" + NL + "\t\t\t}" + NL + "\t\t\treturn \"\";" + NL + "\t\t}" + NL;
+  protected final String TEXT_1486 = NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tpublic void activate() {" + NL + "\t\t\tsuper.activate();" + NL + "\t\t\tgetDiagramNode().getElement().eAdapters().add(domainModelRefresher);" + NL + "\t\t}" + NL + "" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tpublic void deactivate() {" + NL + "\t\t\tgetDiagramNode().getElement().eAdapters().remove(domainModelRefresher);" + NL + "\t\t\tsuper.deactivate();" + NL + "\t\t}" + NL;
+  protected final String TEXT_1487 = NL;
+  protected final String TEXT_1488 = "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate ";
+  protected final String TEXT_1489 = " domainModelRefresher = new ";
+  protected final String TEXT_1490 = "(this);" + NL;
+  protected final String TEXT_1491 = NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tprotected String getText() {" + NL + "\t\t\t";
+  protected final String TEXT_1492 = " primaryLabelEditPart = getPrimaryLabelEditPart();" + NL + "\t\t\tif (primaryLabelEditPart != null) {" + NL + "\t\t\t\treturn primaryLabelEditPart.getLabelText();" + NL + "\t\t\t}" + NL + "\t\t\treturn super.getText();" + NL + "\t\t}" + NL + "" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tprivate ";
+  protected final String TEXT_1493 = " getPrimaryLabelEditPart() {" + NL + "\t\t\tfor(";
+  protected final String TEXT_1494 = " it = getDiagramNode().getChildren().iterator(); it.hasNext(); ) {" + NL + "\t\t\t\t";
+  protected final String TEXT_1495 = " nextChild = (";
+  protected final String TEXT_1496 = ")it.next();" + NL + "\t\t\t\tif (";
+  protected final String TEXT_1497 = ".getVisualID(nextChild) == ";
+  protected final String TEXT_1498 = ".VISUAL_ID) {" + NL + "\t\t\t\t\treturn (";
+  protected final String TEXT_1499 = ") ";
+  protected final String TEXT_1500 = ".this.getViewer().getEditPartRegistry().get(nextChild);" + NL + "\t\t\t\t}" + NL + "\t\t\t}" + NL + "\t\t\treturn null;" + NL + "\t\t}";
+  protected final String TEXT_1501 = NL + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tprotected void createRefreshers() {" + NL + "\t\t\tsuper.createRefreshers();" + NL + "\t\t\tRefresher labelRefresher = new Refresher() {" + NL + "\t\t\t\tpublic void refresh() {" + NL + "\t\t\t\t\trefreshVisuals();" + NL + "\t\t\t\t}" + NL + "\t\t\t};";
+  protected final String TEXT_1502 = NL + "\t\t\tregisterRefresher(";
+  protected final String TEXT_1503 = ".eINSTANCE.get";
+  protected final String TEXT_1504 = "(), labelRefresher);";
+  protected final String TEXT_1505 = NL + "\t\t\tregisterRefresher(";
+  protected final String TEXT_1506 = ".eINSTANCE.get";
+  protected final String TEXT_1507 = "(), labelRefresher);";
+  protected final String TEXT_1508 = NL + "\t\t\tregisterRefresher(";
+  protected final String TEXT_1509 = ".eINSTANCE.get";
+  protected final String TEXT_1510 = "(), labelRefresher);";
+  protected final String TEXT_1511 = NL + "\t\t}" + NL + "" + NL + "\t\t/**" + NL + "\t\t * Since compartments and labels are not selectable edit parts, they are filtered from the overview as well." + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tprotected ";
+  protected final String TEXT_1512 = " getModelChildren() {" + NL + "\t\t\t";
+  protected final String TEXT_1513 = " result = new ";
+  protected final String TEXT_1514 = "();" + NL + "\t\t\tfor(";
+  protected final String TEXT_1515 = " it = getDiagramNode().getVisibleChildren().iterator(); it.hasNext(); ) {" + NL + "\t\t\t\t";
+  protected final String TEXT_1516 = " next = (";
+  protected final String TEXT_1517 = ") it.next();" + NL + "\t\t\t\tswitch (";
+  protected final String TEXT_1518 = ".getVisualID(next)) {";
+  protected final String TEXT_1519 = NL + "\t\t\t\tcase ";
+  protected final String TEXT_1520 = ".VISUAL_ID:" + NL + "\t\t\t\t\tresult.add(next);" + NL + "\t\t\t\t\tbreak;";
+  protected final String TEXT_1521 = NL + "\t\t\t\tcase ";
+  protected final String TEXT_1522 = ".VISUAL_ID:" + NL + "\t\t\t\t\tresult.addAll(next.getChildren());" + NL + "\t\t\t\t\tbreak;";
+  protected final String TEXT_1523 = NL + "\t\t\t\t}" + NL + "\t\t\t}" + NL + "\t\t\tresult.addAll(getDiagramNode().getSourceEdges());" + NL + "\t\t\treturn result;" + NL + "\t\t}" + NL + "\t}" + NL + "}";
+  protected final String TEXT_1524 = NL;
 
   public String generate(Object argument)
   {
@@ -1375,6 +1555,8 @@
 boolean isXYLayout = ViewmapLayoutTypeHelper.getSharedInstance().isStoringChildPositions(genNode);
 final ImportAssistant importManager = (ImportAssistant) ((Object[]) argument)[1];
 importManager.registerInnerClass("LinkNotationModelRefresher");	//from linkNotationModelRefresher.jetinc
+importManager.registerInnerClass("NotationModelRefresher");	//from notationModelRefresher.jetinc
+importManager.registerInnerClass("TreeEditPartAdapter");
 
     stringBuffer.append(TEXT_1);
     stringBuffer.append(TEXT_2);
@@ -1470,7 +1652,7 @@
 
 		for (Iterator labels = genNode.getLabels().iterator(); labels.hasNext();) {
 			GenNodeLabel next = (GenNodeLabel) labels.next();
-			if (myPrimaryLabel == null){
+			if (myPrimaryLabel == null && !next.isReadOnly()){
 				myPrimaryLabel = next;
 			}
 			if (next instanceof GenExternalNodeLabel) {
@@ -2227,56 +2409,73 @@
     stringBuffer.append(importManager.getImportedName("org.eclipse.gef.commands.UnexecutableCommand"));
     stringBuffer.append(TEXT_238);
     
-if (!genNode.getChildNodes().isEmpty()) {
+if (myHelper.getPrimaryLabel() != null) {
 
     stringBuffer.append(TEXT_239);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.EditPolicy"));
+    stringBuffer.append(TEXT_240);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.editpolicies.DirectEditPolicy"));
+    stringBuffer.append(TEXT_241);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.requests.DirectEditRequest"));
+    stringBuffer.append(TEXT_242);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.commands.Command"));
+    stringBuffer.append(TEXT_243);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.requests.DirectEditRequest"));
+    stringBuffer.append(TEXT_244);
+    
+}
+
+    
+if (!genNode.getChildNodes().isEmpty()) {
+
+    stringBuffer.append(TEXT_245);
     
 }
 
     
 if (myHelper.containsLinks()) {
 
-    stringBuffer.append(TEXT_240);
+    stringBuffer.append(TEXT_246);
     
 }
 
-    stringBuffer.append(TEXT_241);
+    stringBuffer.append(TEXT_247);
     stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.IFigure"));
-    stringBuffer.append(TEXT_242);
+    stringBuffer.append(TEXT_248);
     stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.IFigure"));
-    stringBuffer.append(TEXT_243);
+    stringBuffer.append(TEXT_249);
     stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.Figure"));
-    stringBuffer.append(TEXT_244);
+    stringBuffer.append(TEXT_250);
     stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.StackLayout"));
-    stringBuffer.append(TEXT_245);
+    stringBuffer.append(TEXT_251);
     stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.IFigure"));
-    stringBuffer.append(TEXT_246);
+    stringBuffer.append(TEXT_252);
     
 	if (myHelper.hasBothChildrenAndCompartments()) {
 
-    stringBuffer.append(TEXT_247);
+    stringBuffer.append(TEXT_253);
     
 	}
 
-    stringBuffer.append(TEXT_248);
+    stringBuffer.append(TEXT_254);
     stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.IFigure"));
-    stringBuffer.append(TEXT_249);
+    stringBuffer.append(TEXT_255);
     
 	if (!genNode.getCompartments().isEmpty() && !genNode.getChildNodes().isEmpty()) {
 
-    stringBuffer.append(TEXT_250);
+    stringBuffer.append(TEXT_256);
     stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.IFigure"));
-    stringBuffer.append(TEXT_251);
+    stringBuffer.append(TEXT_257);
     stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.IFigure"));
-    stringBuffer.append(TEXT_252);
+    stringBuffer.append(TEXT_258);
     stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.RectangleFigure"));
-    stringBuffer.append(TEXT_253);
+    stringBuffer.append(TEXT_259);
     
 	}
 
-    stringBuffer.append(TEXT_254);
+    stringBuffer.append(TEXT_260);
     stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.IFigure"));
-    stringBuffer.append(TEXT_255);
+    stringBuffer.append(TEXT_261);
     
 String figureQualifiedClassName = null;
 Viewmap viewmap = genNode.getViewmap();
@@ -2286,98 +2485,98 @@
 		figureQualifiedClassName = "org.eclipse.draw2d.RectangleFigure";
 	}
 
-    stringBuffer.append(TEXT_256);
+    stringBuffer.append(TEXT_262);
     stringBuffer.append(importManager.getImportedName(figureQualifiedClassName));
-    stringBuffer.append(TEXT_257);
+    stringBuffer.append(TEXT_263);
     if (isXYLayout) {
-    stringBuffer.append(TEXT_258);
+    stringBuffer.append(TEXT_264);
     } /* use flow layout*/ 
-    stringBuffer.append(TEXT_259);
+    stringBuffer.append(TEXT_265);
     } else if (viewmap instanceof SnippetViewmap) {
-    stringBuffer.append(TEXT_260);
+    stringBuffer.append(TEXT_266);
     stringBuffer.append(((SnippetViewmap) viewmap).getBody());
-    stringBuffer.append(TEXT_261);
+    stringBuffer.append(TEXT_267);
     } else if (viewmap instanceof InnerClassViewmap) {
  	figureQualifiedClassName = ((InnerClassViewmap) viewmap).getClassName();
 
-    stringBuffer.append(TEXT_262);
+    stringBuffer.append(TEXT_268);
     stringBuffer.append(figureQualifiedClassName);
-    stringBuffer.append(TEXT_263);
+    stringBuffer.append(TEXT_269);
     stringBuffer.append(figureQualifiedClassName);
-    stringBuffer.append(TEXT_264);
+    stringBuffer.append(TEXT_270);
     if (!genNode.getChildNodes().isEmpty() && isXYLayout) { /*otherwise, leave to figure's default value*/
-    stringBuffer.append(TEXT_265);
+    stringBuffer.append(TEXT_271);
     }
-    stringBuffer.append(TEXT_266);
+    stringBuffer.append(TEXT_272);
     }
-    stringBuffer.append(TEXT_267);
+    stringBuffer.append(TEXT_273);
     if (figureQualifiedClassName != null) {
-    stringBuffer.append(TEXT_268);
+    stringBuffer.append(TEXT_274);
     stringBuffer.append(figureQualifiedClassName);
-    stringBuffer.append(TEXT_269);
+    stringBuffer.append(TEXT_275);
     stringBuffer.append(figureQualifiedClassName);
-    stringBuffer.append(TEXT_270);
+    stringBuffer.append(TEXT_276);
     }
-    stringBuffer.append(TEXT_271);
+    stringBuffer.append(TEXT_277);
     stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.IFigure"));
-    stringBuffer.append(TEXT_272);
+    stringBuffer.append(TEXT_278);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.View"));
-    stringBuffer.append(TEXT_273);
+    stringBuffer.append(TEXT_279);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.View"));
-    stringBuffer.append(TEXT_274);
+    stringBuffer.append(TEXT_280);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EAnnotation"));
-    stringBuffer.append(TEXT_275);
+    stringBuffer.append(TEXT_281);
     stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.Figure"));
-    stringBuffer.append(TEXT_276);
+    stringBuffer.append(TEXT_282);
     stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.Figure"));
-    stringBuffer.append(TEXT_277);
+    stringBuffer.append(TEXT_283);
     stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.BorderLayout"));
-    stringBuffer.append(TEXT_278);
+    stringBuffer.append(TEXT_284);
     stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.ImageFigure"));
-    stringBuffer.append(TEXT_279);
+    stringBuffer.append(TEXT_285);
     stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.ImageFigure"));
-    stringBuffer.append(TEXT_280);
+    stringBuffer.append(TEXT_286);
     stringBuffer.append(importManager.getImportedName(genDiagram.getEditorGen().getPlugin().getActivatorQualifiedClassName()));
-    stringBuffer.append(TEXT_281);
+    stringBuffer.append(TEXT_287);
     stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.PositionConstants"));
-    stringBuffer.append(TEXT_282);
+    stringBuffer.append(TEXT_288);
     stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.BorderLayout"));
-    stringBuffer.append(TEXT_283);
+    stringBuffer.append(TEXT_289);
     stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.IFigure"));
-    stringBuffer.append(TEXT_284);
+    stringBuffer.append(TEXT_290);
     stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.IFigure"));
-    stringBuffer.append(TEXT_285);
+    stringBuffer.append(TEXT_291);
     
 if (!isXYLayout) {
 	String layoutClassName = importManager.getImportedName("org.eclipse.draw2d.ToolbarLayout");
 
-    stringBuffer.append(TEXT_286);
+    stringBuffer.append(TEXT_292);
     stringBuffer.append(layoutClassName);
-    stringBuffer.append(TEXT_287);
+    stringBuffer.append(TEXT_293);
     stringBuffer.append(layoutClassName);
-    stringBuffer.append(TEXT_288);
+    stringBuffer.append(TEXT_294);
     } else {
-    stringBuffer.append(TEXT_289);
+    stringBuffer.append(TEXT_295);
     stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.FreeformLayout"));
-    stringBuffer.append(TEXT_290);
+    stringBuffer.append(TEXT_296);
     stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.IFigure"));
-    stringBuffer.append(TEXT_291);
+    stringBuffer.append(TEXT_297);
     stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.geometry.Rectangle"));
-    stringBuffer.append(TEXT_292);
+    stringBuffer.append(TEXT_298);
     }
-    stringBuffer.append(TEXT_293);
+    stringBuffer.append(TEXT_299);
     stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.IFigure"));
-    stringBuffer.append(TEXT_294);
+    stringBuffer.append(TEXT_300);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.Node"));
-    stringBuffer.append(TEXT_295);
+    stringBuffer.append(TEXT_301);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.Node"));
-    stringBuffer.append(TEXT_296);
+    stringBuffer.append(TEXT_302);
     
 	if (myHelper.hasFixedChildren()) {
 
-    stringBuffer.append(TEXT_297);
+    stringBuffer.append(TEXT_303);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gef.EditPart"));
-    stringBuffer.append(TEXT_298);
+    stringBuffer.append(TEXT_304);
     
 for (Iterator it = myHelper.getInnerFixedLabels(); it.hasNext(); ) {
 	GenNodeLabel genLabel = (GenNodeLabel) it.next();
@@ -2385,15 +2584,15 @@
 	final ParentAssignedViewmap childViewmap = (ParentAssignedViewmap) genLabel.getViewmap();
 	final String childSetterName = childViewmap.getSetterName() == null ? "setLabel" : childViewmap.getSetterName();
 
-    stringBuffer.append(TEXT_299);
+    stringBuffer.append(TEXT_305);
     stringBuffer.append(labelEditPart);
-    stringBuffer.append(TEXT_300);
+    stringBuffer.append(TEXT_306);
     stringBuffer.append(labelEditPart);
-    stringBuffer.append(TEXT_301);
+    stringBuffer.append(TEXT_307);
     stringBuffer.append(childSetterName);
-    stringBuffer.append(TEXT_302);
+    stringBuffer.append(TEXT_308);
     stringBuffer.append(childViewmap.getGetterName());
-    stringBuffer.append(TEXT_303);
+    stringBuffer.append(TEXT_309);
     
 }
 
@@ -2402,19 +2601,19 @@
 	final ParentAssignedViewmap childViewmap = (ParentAssignedViewmap) next.getViewmap();
 	String compartmentEditPartFQN = importManager.getImportedName(next.getEditPartQualifiedClassName());
 
-    stringBuffer.append(TEXT_304);
+    stringBuffer.append(TEXT_310);
     stringBuffer.append(compartmentEditPartFQN);
-    stringBuffer.append(TEXT_305);
+    stringBuffer.append(TEXT_311);
     stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.IFigure"));
-    stringBuffer.append(TEXT_306);
+    stringBuffer.append(TEXT_312);
     stringBuffer.append(childViewmap.getGetterName());
-    stringBuffer.append(TEXT_307);
+    stringBuffer.append(TEXT_313);
     stringBuffer.append(compartmentEditPartFQN);
-    stringBuffer.append(TEXT_308);
+    stringBuffer.append(TEXT_314);
     	
 } // for pinned compartments
 
-    stringBuffer.append(TEXT_309);
+    stringBuffer.append(TEXT_315);
     
 //XXX: ignore labels assuming that they never may be removed
 for (Iterator it = myHelper.getPinnedCompartments(); it.hasNext(); ) {
@@ -2422,75 +2621,67 @@
 	final ParentAssignedViewmap childViewmap = (ParentAssignedViewmap) next.getViewmap();
 	String compartmentEditPartFQN = importManager.getImportedName(next.getEditPartQualifiedClassName());
 
-    stringBuffer.append(TEXT_310);
+    stringBuffer.append(TEXT_316);
     stringBuffer.append(compartmentEditPartFQN);
-    stringBuffer.append(TEXT_311);
+    stringBuffer.append(TEXT_317);
     stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.IFigure"));
-    stringBuffer.append(TEXT_312);
+    stringBuffer.append(TEXT_318);
     stringBuffer.append(childViewmap.getGetterName());
-    stringBuffer.append(TEXT_313);
+    stringBuffer.append(TEXT_319);
     stringBuffer.append(compartmentEditPartFQN);
-    stringBuffer.append(TEXT_314);
+    stringBuffer.append(TEXT_320);
     
 } // for pinned compartments
 
-    stringBuffer.append(TEXT_315);
+    stringBuffer.append(TEXT_321);
     
 } // if myHelper.hasFixedChildren()
 
-    stringBuffer.append(TEXT_316);
+    stringBuffer.append(TEXT_322);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gef.EditPart"));
-    stringBuffer.append(TEXT_317);
+    stringBuffer.append(TEXT_323);
     
-		GenNodeLabel firstEditableLabel = null;
-		for (Iterator it = myHelper.getAllInnerLabels(); it.hasNext(); ) {
-			GenNodeLabel genLabel = (GenNodeLabel) it.next();
-			if (!genLabel.isReadOnly()) {
-				firstEditableLabel = genLabel;
-				break;
-			}
-		}
-		if (firstEditableLabel != null) {
+		if (myHelper.getPrimaryLabel() != null) {
 
-    stringBuffer.append(TEXT_318);
+    stringBuffer.append(TEXT_324);
     stringBuffer.append(importManager.getImportedName("java.util.Iterator"));
-    stringBuffer.append(TEXT_319);
+    stringBuffer.append(TEXT_325);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.View"));
-    stringBuffer.append(TEXT_320);
+    stringBuffer.append(TEXT_326);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.View"));
-    stringBuffer.append(TEXT_321);
+    stringBuffer.append(TEXT_327);
     stringBuffer.append(importManager.getImportedName(genDiagram.getVisualIDRegistryQualifiedClassName()));
-    stringBuffer.append(TEXT_322);
-    stringBuffer.append(importManager.getImportedName(firstEditableLabel.getEditPartQualifiedClassName()));
-    stringBuffer.append(TEXT_323);
+    stringBuffer.append(TEXT_328);
+    stringBuffer.append(importManager.getImportedName(myHelper.getPrimaryLabel().getEditPartQualifiedClassName()));
+    stringBuffer.append(TEXT_329);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gef.EditPart"));
-    stringBuffer.append(TEXT_324);
+    stringBuffer.append(TEXT_330);
     
 		}
 
-    stringBuffer.append(TEXT_325);
+    stringBuffer.append(TEXT_331);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gef.Request"));
-    stringBuffer.append(TEXT_326);
+    stringBuffer.append(TEXT_332);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gef.RequestConstants"));
-    stringBuffer.append(TEXT_327);
+    stringBuffer.append(TEXT_333);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gef.EditPart"));
-    stringBuffer.append(TEXT_328);
+    stringBuffer.append(TEXT_334);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gef.requests.DirectEditRequest"));
-    stringBuffer.append(TEXT_329);
+    stringBuffer.append(TEXT_335);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gef.requests.DirectEditRequest"));
-    stringBuffer.append(TEXT_330);
+    stringBuffer.append(TEXT_336);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gef.EditPart"));
-    stringBuffer.append(TEXT_331);
+    stringBuffer.append(TEXT_337);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gef.requests.DirectEditRequest"));
-    stringBuffer.append(TEXT_332);
+    stringBuffer.append(TEXT_338);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gef.EditPart"));
-    stringBuffer.append(TEXT_333);
+    stringBuffer.append(TEXT_339);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.View"));
-    stringBuffer.append(TEXT_334);
+    stringBuffer.append(TEXT_340);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.View"));
-    stringBuffer.append(TEXT_335);
+    stringBuffer.append(TEXT_341);
     stringBuffer.append(importManager.getImportedName(genDiagram.getVisualIDRegistryQualifiedClassName()));
-    stringBuffer.append(TEXT_336);
+    stringBuffer.append(TEXT_342);
     
 		for (Iterator it = myHelper.getAllInnerLabels(); it.hasNext(); ) {
 			GenNodeLabel genLabel = (GenNodeLabel) it.next();
@@ -2498,165 +2689,153 @@
 				continue;
 			}
 
-    stringBuffer.append(TEXT_337);
+    stringBuffer.append(TEXT_343);
     stringBuffer.append(importManager.getImportedName(genLabel.getEditPartQualifiedClassName()));
-    stringBuffer.append(TEXT_338);
+    stringBuffer.append(TEXT_344);
     
 		}
 
-    stringBuffer.append(TEXT_339);
+    stringBuffer.append(TEXT_345);
     
 if (myHelper.hasExternalLabels()) {
 
-    stringBuffer.append(TEXT_340);
+    stringBuffer.append(TEXT_346);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gef.EditPart"));
-    stringBuffer.append(TEXT_341);
+    stringBuffer.append(TEXT_347);
     
 	for (Iterator externalLabels = myHelper.getExternalLabels(); externalLabels.hasNext();) {
 		GenNodeLabel next = (GenNodeLabel) externalLabels.next();
 
-    stringBuffer.append(TEXT_342);
+    stringBuffer.append(TEXT_348);
     stringBuffer.append(importManager.getImportedName(next.getEditPartQualifiedClassName()));
-    stringBuffer.append(TEXT_343);
+    stringBuffer.append(TEXT_349);
     
 	}
 
-    stringBuffer.append(TEXT_344);
+    stringBuffer.append(TEXT_350);
     stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.IFigure"));
-    stringBuffer.append(TEXT_345);
+    stringBuffer.append(TEXT_351);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gef.editparts.LayerManager"));
-    stringBuffer.append(TEXT_346);
+    stringBuffer.append(TEXT_352);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gef.editparts.LayerManager"));
-    stringBuffer.append(TEXT_347);
+    stringBuffer.append(TEXT_353);
     stringBuffer.append(importManager.getImportedName(genDiagram.getEditPartFactoryQualifiedClassName()));
-    stringBuffer.append(TEXT_348);
+    stringBuffer.append(TEXT_354);
     
 }
 if (!genNode.getChildNodes().isEmpty()) {
 
-    stringBuffer.append(TEXT_349);
+    stringBuffer.append(TEXT_355);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gef.EditPart"));
-    stringBuffer.append(TEXT_350);
+    stringBuffer.append(TEXT_356);
     
 	for(Iterator directChildren = genNode.getChildNodes().iterator(); directChildren.hasNext(); ) {
 		GenChildNode next = (GenChildNode) directChildren.next();
 
-    stringBuffer.append(TEXT_351);
+    stringBuffer.append(TEXT_357);
     stringBuffer.append(importManager.getImportedName(next.getEditPartQualifiedClassName()));
-    stringBuffer.append(TEXT_352);
+    stringBuffer.append(TEXT_358);
     
 	}
 
-    stringBuffer.append(TEXT_353);
+    stringBuffer.append(TEXT_359);
     
 }
 if (myHelper.hasExternalLabels() || myHelper.hasFixedChildren() || myHelper.hasBothChildrenAndCompartments()) {
 
-    stringBuffer.append(TEXT_354);
+    stringBuffer.append(TEXT_360);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gef.EditPart"));
-    stringBuffer.append(TEXT_355);
+    stringBuffer.append(TEXT_361);
     
 	if (myHelper.hasExternalLabels()) {
 
-    stringBuffer.append(TEXT_356);
+    stringBuffer.append(TEXT_362);
     stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.IFigure"));
-    stringBuffer.append(TEXT_357);
+    stringBuffer.append(TEXT_363);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gef.GraphicalEditPart"));
-    stringBuffer.append(TEXT_358);
+    stringBuffer.append(TEXT_364);
     
 	}
 	if (myHelper.hasFixedChildren()) {
 
-    stringBuffer.append(TEXT_359);
+    stringBuffer.append(TEXT_365);
     
 	}
 	if (myHelper.hasBothChildrenAndCompartments()) {
 
-    stringBuffer.append(TEXT_360);
+    stringBuffer.append(TEXT_366);
     stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.IFigure"));
-    stringBuffer.append(TEXT_361);
+    stringBuffer.append(TEXT_367);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gef.GraphicalEditPart"));
-    stringBuffer.append(TEXT_362);
+    stringBuffer.append(TEXT_368);
     
 	}
 
-    stringBuffer.append(TEXT_363);
+    stringBuffer.append(TEXT_369);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gef.EditPart"));
-    stringBuffer.append(TEXT_364);
+    stringBuffer.append(TEXT_370);
     
 	if (myHelper.hasExternalLabels()) {
 
-    stringBuffer.append(TEXT_365);
+    stringBuffer.append(TEXT_371);
     stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.IFigure"));
-    stringBuffer.append(TEXT_366);
+    stringBuffer.append(TEXT_372);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gef.GraphicalEditPart"));
-    stringBuffer.append(TEXT_367);
+    stringBuffer.append(TEXT_373);
     
 	}
 	if (myHelper.hasFixedChildren()){
 
-    stringBuffer.append(TEXT_368);
+    stringBuffer.append(TEXT_374);
     
 	}
 	if (myHelper.hasBothChildrenAndCompartments()) {
 
-    stringBuffer.append(TEXT_369);
+    stringBuffer.append(TEXT_375);
     stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.IFigure"));
-    stringBuffer.append(TEXT_370);
+    stringBuffer.append(TEXT_376);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gef.GraphicalEditPart"));
-    stringBuffer.append(TEXT_371);
+    stringBuffer.append(TEXT_377);
     
 	}
 
-    stringBuffer.append(TEXT_372);
+    stringBuffer.append(TEXT_378);
     
 }
 
     
 if (myHelper.hasExternalLabels()) {
 
-    stringBuffer.append(TEXT_373);
+    stringBuffer.append(TEXT_379);
     stringBuffer.append(importManager.getImportedName("java.util.Iterator"));
-    stringBuffer.append(TEXT_374);
+    stringBuffer.append(TEXT_380);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gef.EditPart"));
-    stringBuffer.append(TEXT_375);
+    stringBuffer.append(TEXT_381);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gef.EditPart"));
-    stringBuffer.append(TEXT_376);
+    stringBuffer.append(TEXT_382);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gef.GraphicalEditPart"));
-    stringBuffer.append(TEXT_377);
+    stringBuffer.append(TEXT_383);
     
 }
 
-    stringBuffer.append(TEXT_378);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.Node"));
-    stringBuffer.append(TEXT_379);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.Bounds"));
-    stringBuffer.append(TEXT_380);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.Bounds"));
-    stringBuffer.append(TEXT_381);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.Bounds"));
-    stringBuffer.append(TEXT_382);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.GraphicalEditPart"));
-    stringBuffer.append(TEXT_383);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.geometry.Rectangle"));
     stringBuffer.append(TEXT_384);
-    stringBuffer.append(importManager.getImportedName("java.util.List"));
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.Node"));
     stringBuffer.append(TEXT_385);
-    stringBuffer.append(importManager.getImportedName("java.util.List"));
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.Bounds"));
     stringBuffer.append(TEXT_386);
-    stringBuffer.append(importManager.getImportedName("java.util.List"));
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.Bounds"));
     stringBuffer.append(TEXT_387);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.ConnectionAnchor"));
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.Bounds"));
     stringBuffer.append(TEXT_388);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.ConnectionEditPart"));
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.GraphicalEditPart"));
     stringBuffer.append(TEXT_389);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.ChopboxAnchor"));
+    stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.geometry.Rectangle"));
     stringBuffer.append(TEXT_390);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.ConnectionAnchor"));
+    stringBuffer.append(importManager.getImportedName("java.util.List"));
     stringBuffer.append(TEXT_391);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.Request"));
+    stringBuffer.append(importManager.getImportedName("java.util.List"));
     stringBuffer.append(TEXT_392);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.ChopboxAnchor"));
+    stringBuffer.append(importManager.getImportedName("java.util.List"));
     stringBuffer.append(TEXT_393);
     stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.ConnectionAnchor"));
     stringBuffer.append(TEXT_394);
@@ -2670,38 +2849,52 @@
     stringBuffer.append(TEXT_398);
     stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.ChopboxAnchor"));
     stringBuffer.append(TEXT_399);
-    /*@ include file="adapters/propertySource.javajetinc"*/
+    stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.ConnectionAnchor"));
     stringBuffer.append(TEXT_400);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.ConnectionEditPart"));
+    stringBuffer.append(TEXT_401);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.ChopboxAnchor"));
+    stringBuffer.append(TEXT_402);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.ConnectionAnchor"));
+    stringBuffer.append(TEXT_403);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.Request"));
+    stringBuffer.append(TEXT_404);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.ChopboxAnchor"));
+    stringBuffer.append(TEXT_405);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.TreeEditPart"));
+    stringBuffer.append(TEXT_406);
+    /*@ include file="adapters/propertySource.javajetinc"*/
+    stringBuffer.append(TEXT_407);
     
 if (!genNode.getChildNodes().isEmpty()) {
 
-    stringBuffer.append(TEXT_401);
+    stringBuffer.append(TEXT_408);
     
 }
 
     
 if (myHelper.containsLinks()) {
 
-    stringBuffer.append(TEXT_402);
+    stringBuffer.append(TEXT_409);
     
 }
 
-    stringBuffer.append(TEXT_403);
+    stringBuffer.append(TEXT_410);
     
 if (myHelper.containsLinks()) {
 
-    stringBuffer.append(TEXT_404);
+    stringBuffer.append(TEXT_411);
     
 }
 
     
 if (!genNode.getChildNodes().isEmpty()) {
 
-    stringBuffer.append(TEXT_405);
+    stringBuffer.append(TEXT_412);
     
 }
 
-    stringBuffer.append(TEXT_406);
+    stringBuffer.append(TEXT_413);
     
 {
 	final String _getViewCode = "getDiagramNode()";
@@ -2711,22 +2904,22 @@
 		final boolean isListLayout = !isXYLayout;
 		final List childNodes = genNode.getChildNodes();
 
-    stringBuffer.append(TEXT_407);
-    stringBuffer.append(TEXT_408);
+    stringBuffer.append(TEXT_414);
+    stringBuffer.append(TEXT_415);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.lite.edit.parts.update.canonical.ChildNotationModelRefresher"));
-    stringBuffer.append(TEXT_409);
+    stringBuffer.append(TEXT_416);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.TransactionalEditingDomain"));
-    stringBuffer.append(TEXT_410);
+    stringBuffer.append(TEXT_417);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.util.TransactionUtil"));
-    stringBuffer.append(TEXT_411);
+    stringBuffer.append(TEXT_418);
     stringBuffer.append(_getDiagramCode);
-    stringBuffer.append(TEXT_412);
+    stringBuffer.append(TEXT_419);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.lite.edit.parts.update.canonical.ChildNotationModelRefresher"));
-    stringBuffer.append(TEXT_413);
+    stringBuffer.append(TEXT_420);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.lite.edit.parts.update.canonical.ChildNotationModelRefresher"));
-    stringBuffer.append(TEXT_414);
+    stringBuffer.append(TEXT_421);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.lite.edit.parts.update.canonical.ChildNotationModelRefresher"));
-    stringBuffer.append(TEXT_415);
+    stringBuffer.append(TEXT_422);
     
 boolean hasConstraintsInChildren = false;
 for (Iterator it = childNodes.iterator(); it.hasNext(); ) {
@@ -2741,19 +2934,19 @@
     
 if (hasConstraintsInChildren) {
 
-    stringBuffer.append(TEXT_416);
+    stringBuffer.append(TEXT_423);
     stringBuffer.append(genDiagram.getVisualIDRegistryQualifiedClassName());
-    stringBuffer.append(TEXT_417);
+    stringBuffer.append(TEXT_424);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.NotificationFilter"));
-    stringBuffer.append(TEXT_418);
+    stringBuffer.append(TEXT_425);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.NotificationFilter"));
-    stringBuffer.append(TEXT_419);
+    stringBuffer.append(TEXT_426);
     
 }
 
-    stringBuffer.append(TEXT_420);
+    stringBuffer.append(TEXT_427);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.NotificationFilter"));
-    stringBuffer.append(TEXT_421);
+    stringBuffer.append(TEXT_428);
     
 {
 	boolean hasDeclaredFilter = false;
@@ -2772,25 +2965,25 @@
 		if (!hasDeclaredFilter) {
 			hasDeclaredFilter = true;
 
-    stringBuffer.append(TEXT_422);
+    stringBuffer.append(TEXT_429);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.NotificationFilter"));
-    stringBuffer.append(TEXT_423);
+    stringBuffer.append(TEXT_430);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.NotificationFilter"));
-    stringBuffer.append(TEXT_424);
+    stringBuffer.append(TEXT_431);
     stringBuffer.append(importManager.getImportedName(childMetaFeature.getGenPackage().getQualifiedPackageInterfaceName()));
-    stringBuffer.append(TEXT_425);
+    stringBuffer.append(TEXT_432);
     stringBuffer.append(childMetaFeature.getFeatureAccessorName());
-    stringBuffer.append(TEXT_426);
+    stringBuffer.append(TEXT_433);
     
 		} else {
 
-    stringBuffer.append(TEXT_427);
+    stringBuffer.append(TEXT_434);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.NotificationFilter"));
-    stringBuffer.append(TEXT_428);
+    stringBuffer.append(TEXT_435);
     stringBuffer.append(importManager.getImportedName(childMetaFeature.getGenPackage().getQualifiedPackageInterfaceName()));
-    stringBuffer.append(TEXT_429);
+    stringBuffer.append(TEXT_436);
     stringBuffer.append(childMetaFeature.getFeatureAccessorName());
-    stringBuffer.append(TEXT_430);
+    stringBuffer.append(TEXT_437);
     
 		}
 	}	//for
@@ -2798,22 +2991,22 @@
     
 	if (hasDeclaredFilter) {
 
-    stringBuffer.append(TEXT_431);
+    stringBuffer.append(TEXT_438);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.NotificationFilter"));
-    stringBuffer.append(TEXT_432);
+    stringBuffer.append(TEXT_439);
     stringBuffer.append(_getViewCode);
-    stringBuffer.append(TEXT_433);
+    stringBuffer.append(TEXT_440);
     
 	} else {
 		hasDeclaredFilter = true;
 
-    stringBuffer.append(TEXT_434);
+    stringBuffer.append(TEXT_441);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.NotificationFilter"));
-    stringBuffer.append(TEXT_435);
+    stringBuffer.append(TEXT_442);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.NotificationFilter"));
-    stringBuffer.append(TEXT_436);
+    stringBuffer.append(TEXT_443);
     stringBuffer.append(_getViewCode);
-    stringBuffer.append(TEXT_437);
+    stringBuffer.append(TEXT_444);
     
 	}
 
@@ -2822,37 +3015,37 @@
 		if (hasDeclaredFilter) {
 			hasDeclaredFilter = true;
 
-    stringBuffer.append(TEXT_438);
+    stringBuffer.append(TEXT_445);
     
 		} else {
 
-    stringBuffer.append(TEXT_439);
+    stringBuffer.append(TEXT_446);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.NotificationFilter"));
-    stringBuffer.append(TEXT_440);
+    stringBuffer.append(TEXT_447);
     
 		}
 	}
 	if (!hasDeclaredFilter) {
 
-    stringBuffer.append(TEXT_441);
+    stringBuffer.append(TEXT_448);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.NotificationFilter"));
-    stringBuffer.append(TEXT_442);
+    stringBuffer.append(TEXT_449);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.NotificationFilter"));
-    stringBuffer.append(TEXT_443);
+    stringBuffer.append(TEXT_450);
     
 	}
 
-    stringBuffer.append(TEXT_444);
+    stringBuffer.append(TEXT_451);
     
 }	//local declaration of hasDeclaredFilter
 
-    stringBuffer.append(TEXT_445);
+    stringBuffer.append(TEXT_452);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.lite.commands.CreateNotationalElementCommand"));
-    stringBuffer.append(TEXT_446);
+    stringBuffer.append(TEXT_453);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.lite.edit.parts.update.canonical.ElementDescriptor"));
-    stringBuffer.append(TEXT_447);
+    stringBuffer.append(TEXT_454);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EObject"));
-    stringBuffer.append(TEXT_448);
+    stringBuffer.append(TEXT_455);
     
 for (Iterator it = childNodes.iterator(); it.hasNext(); ) {
 	GenNode nextNode = (GenNode) it.next();
@@ -2862,39 +3055,39 @@
 	}
 	String childNodeInterfaceName = importManager.getImportedName(nextNode.getDomainMetaClass().getQualifiedInterfaceName());
 
-    stringBuffer.append(TEXT_449);
+    stringBuffer.append(TEXT_456);
     stringBuffer.append(importManager.getImportedName(nextNode.getEditPartQualifiedClassName()));
-    stringBuffer.append(TEXT_450);
+    stringBuffer.append(TEXT_457);
     stringBuffer.append(childNodeInterfaceName);
-    stringBuffer.append(TEXT_451);
+    stringBuffer.append(TEXT_458);
     stringBuffer.append(nextNode.getDomainMetaClass().getName());
     stringBuffer.append(nextNode.getVisualID());
-    stringBuffer.append(TEXT_452);
+    stringBuffer.append(TEXT_459);
     if (!isListLayout) {
-    stringBuffer.append(TEXT_453);
+    stringBuffer.append(TEXT_460);
     }
-    stringBuffer.append(TEXT_454);
+    stringBuffer.append(TEXT_461);
     
 }
 
-    stringBuffer.append(TEXT_455);
+    stringBuffer.append(TEXT_462);
     stringBuffer.append(importManager.getImportedName("java.util.List"));
-    stringBuffer.append(TEXT_456);
-    stringBuffer.append(TEXT_457);
+    stringBuffer.append(TEXT_463);
+    stringBuffer.append(TEXT_464);
     
 if (childNodes.size() == 0) {
 
-    stringBuffer.append(TEXT_458);
+    stringBuffer.append(TEXT_465);
     stringBuffer.append(importManager.getImportedName("java.util.Collections"));
-    stringBuffer.append(TEXT_459);
+    stringBuffer.append(TEXT_466);
     
 } else {
 
-    stringBuffer.append(TEXT_460);
+    stringBuffer.append(TEXT_467);
     stringBuffer.append(importManager.getImportedName("java.util.List"));
-    stringBuffer.append(TEXT_461);
+    stringBuffer.append(TEXT_468);
     stringBuffer.append(importManager.getImportedName("java.util.LinkedList"));
-    stringBuffer.append(TEXT_462);
+    stringBuffer.append(TEXT_469);
     
 	Map genFeature2genNodeMap = new LinkedHashMap();
 	for (int nodeIndex = 0; nodeIndex < childNodes.size(); nodeIndex++) {
@@ -2912,15 +3105,15 @@
 	Set entrySet = genFeature2genNodeMap.entrySet();
 	if (entrySet.size() > 0) {
 
-    stringBuffer.append(TEXT_463);
+    stringBuffer.append(TEXT_470);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.View"));
-    stringBuffer.append(TEXT_464);
+    stringBuffer.append(TEXT_471);
     stringBuffer.append(_getViewCode);
-    stringBuffer.append(TEXT_465);
+    stringBuffer.append(TEXT_472);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EObject"));
-    stringBuffer.append(TEXT_466);
+    stringBuffer.append(TEXT_473);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EObject"));
-    stringBuffer.append(TEXT_467);
+    stringBuffer.append(TEXT_474);
     
 	}
 	for (Iterator entries = entrySet.iterator(); entries.hasNext();) {
@@ -2929,127 +3122,127 @@
 		Collection genNodesCollection = (Collection) nextEntry.getValue();
 		if (childMetaFeature.isListType()) {
 
-    stringBuffer.append(TEXT_468);
+    stringBuffer.append(TEXT_475);
     stringBuffer.append(importManager.getImportedName("java.util.Iterator"));
-    stringBuffer.append(TEXT_469);
+    stringBuffer.append(TEXT_476);
     myFeatureGetAccessorHelper.appendFeatureValueGetter("modelObject", childMetaFeature, null, true);
-    stringBuffer.append(TEXT_470);
+    stringBuffer.append(TEXT_477);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EObject"));
-    stringBuffer.append(TEXT_471);
+    stringBuffer.append(TEXT_478);
     
 		} else {
 
-    stringBuffer.append(TEXT_472);
+    stringBuffer.append(TEXT_479);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EObject"));
-    stringBuffer.append(TEXT_473);
+    stringBuffer.append(TEXT_480);
     myFeatureGetAccessorHelper.appendFeatureValueGetter("modelObject", childMetaFeature, null, false);
-    stringBuffer.append(TEXT_474);
+    stringBuffer.append(TEXT_481);
     
 	}
 
-    stringBuffer.append(TEXT_475);
+    stringBuffer.append(TEXT_482);
     stringBuffer.append(importManager.getImportedName(genDiagram.getVisualIDRegistryQualifiedClassName()));
-    stringBuffer.append(TEXT_476);
+    stringBuffer.append(TEXT_483);
     
 	boolean generateSwitch = genNodesCollection.size() != 1;
 	if (generateSwitch) {
 
-    stringBuffer.append(TEXT_477);
+    stringBuffer.append(TEXT_484);
     
 	}
 	for (Iterator genNodesIterator = genNodesCollection.iterator(); genNodesIterator.hasNext();) {
 		GenNode nextNode = (GenNode) genNodesIterator.next();
 		if (generateSwitch) {
 
-    stringBuffer.append(TEXT_478);
+    stringBuffer.append(TEXT_485);
     stringBuffer.append(importManager.getImportedName(nextNode.getEditPartQualifiedClassName()));
-    stringBuffer.append(TEXT_479);
+    stringBuffer.append(TEXT_486);
     
 		} else {
 
-    stringBuffer.append(TEXT_480);
+    stringBuffer.append(TEXT_487);
     stringBuffer.append(importManager.getImportedName(nextNode.getEditPartQualifiedClassName()));
-    stringBuffer.append(TEXT_481);
+    stringBuffer.append(TEXT_488);
     
 		}
 
-    stringBuffer.append(TEXT_482);
+    stringBuffer.append(TEXT_489);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.lite.edit.parts.update.canonical.ElementDescriptor"));
-    stringBuffer.append(TEXT_483);
+    stringBuffer.append(TEXT_490);
     
 		if (generateSwitch) {
 
-    stringBuffer.append(TEXT_484);
+    stringBuffer.append(TEXT_491);
     
 		} else {
 
-    stringBuffer.append(TEXT_485);
+    stringBuffer.append(TEXT_492);
     
 		}
 	}
 	if (generateSwitch) {
 
-    stringBuffer.append(TEXT_486);
+    stringBuffer.append(TEXT_493);
     
 	}
 	if (childMetaFeature.isListType()) {
 
-    stringBuffer.append(TEXT_487);
+    stringBuffer.append(TEXT_494);
     
 	}
 }
 
-    stringBuffer.append(TEXT_488);
+    stringBuffer.append(TEXT_495);
     
 }
 
-    stringBuffer.append(TEXT_489);
+    stringBuffer.append(TEXT_496);
     stringBuffer.append(genDiagram.isSynchronized());
-    stringBuffer.append(TEXT_490);
+    stringBuffer.append(TEXT_497);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.lite.edit.parts.update.canonical.ElementDescriptor"));
-    stringBuffer.append(TEXT_491);
+    stringBuffer.append(TEXT_498);
     stringBuffer.append(genDiagram.isSynchronized());
-    stringBuffer.append(TEXT_492);
+    stringBuffer.append(TEXT_499);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.View"));
-    stringBuffer.append(TEXT_493);
+    stringBuffer.append(TEXT_500);
     stringBuffer.append(_getViewCode);
-    stringBuffer.append(TEXT_494);
+    stringBuffer.append(TEXT_501);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.lite.edit.parts.update.canonical.AbstractNotationModelRefresher"));
-    stringBuffer.append(TEXT_495);
+    stringBuffer.append(TEXT_502);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.command.Command"));
-    stringBuffer.append(TEXT_496);
+    stringBuffer.append(TEXT_503);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.TransactionalEditingDomain"));
-    stringBuffer.append(TEXT_497);
+    stringBuffer.append(TEXT_504);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.util.TransactionUtil"));
-    stringBuffer.append(TEXT_498);
+    stringBuffer.append(TEXT_505);
     stringBuffer.append(_getDiagramCode);
-    stringBuffer.append(TEXT_499);
+    stringBuffer.append(TEXT_506);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.lite.commands.WrappingCommand"));
-    stringBuffer.append(TEXT_500);
+    stringBuffer.append(TEXT_507);
     
 	}
 
-    stringBuffer.append(TEXT_501);
+    stringBuffer.append(TEXT_508);
     
 if (myHelper.containsLinks() || _includeUncontainedLinks) {
 
-    stringBuffer.append(TEXT_502);
+    stringBuffer.append(TEXT_509);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.TransactionalEditingDomain"));
-    stringBuffer.append(TEXT_503);
+    stringBuffer.append(TEXT_510);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.util.TransactionUtil"));
-    stringBuffer.append(TEXT_504);
+    stringBuffer.append(TEXT_511);
     stringBuffer.append(_getDiagramCode);
-    stringBuffer.append(TEXT_505);
+    stringBuffer.append(TEXT_512);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.lite.edit.parts.update.canonical.IViewService"));
-    stringBuffer.append(TEXT_506);
+    stringBuffer.append(TEXT_513);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.lite.edit.parts.update.canonical.IViewService"));
-    stringBuffer.append(TEXT_507);
+    stringBuffer.append(TEXT_514);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.lite.edit.parts.update.canonical.EditPartRegistryBasedViewService"));
-    stringBuffer.append(TEXT_508);
+    stringBuffer.append(TEXT_515);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.lite.edit.parts.update.canonical.OwnedLinksNotationModelRefresher"));
-    stringBuffer.append(TEXT_509);
+    stringBuffer.append(TEXT_516);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.lite.edit.parts.update.canonical.IViewService"));
-    stringBuffer.append(TEXT_510);
+    stringBuffer.append(TEXT_517);
     
 	boolean hasConstraintsInContainedLinks = false;
 	for (Iterator it = myHelper.getContainedTypeModelFacetLinks(); it.hasNext(); ) {
@@ -3062,42 +3255,42 @@
 	}
 	if (hasConstraintsInContainedLinks) {
 
-    stringBuffer.append(TEXT_511);
+    stringBuffer.append(TEXT_518);
     stringBuffer.append(genDiagram.getVisualIDRegistryQualifiedClassName());
-    stringBuffer.append(TEXT_512);
+    stringBuffer.append(TEXT_519);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.NotificationFilter"));
-    stringBuffer.append(TEXT_513);
+    stringBuffer.append(TEXT_520);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.NotificationFilter"));
-    stringBuffer.append(TEXT_514);
+    stringBuffer.append(TEXT_521);
     
 	}
 	if (_includeUncontainedLinks) {
 
-    stringBuffer.append(TEXT_515);
+    stringBuffer.append(TEXT_522);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.NotificationFilter"));
-    stringBuffer.append(TEXT_516);
+    stringBuffer.append(TEXT_523);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.NotificationFilter"));
-    stringBuffer.append(TEXT_517);
+    stringBuffer.append(TEXT_524);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.notify.Notification"));
-    stringBuffer.append(TEXT_518);
+    stringBuffer.append(TEXT_525);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.NotificationFilter"));
-    stringBuffer.append(TEXT_519);
+    stringBuffer.append(TEXT_526);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.notify.Notification"));
-    stringBuffer.append(TEXT_520);
+    stringBuffer.append(TEXT_527);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.NotificationFilter"));
-    stringBuffer.append(TEXT_521);
+    stringBuffer.append(TEXT_528);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.notify.Notification"));
-    stringBuffer.append(TEXT_522);
+    stringBuffer.append(TEXT_529);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.NotificationFilter"));
-    stringBuffer.append(TEXT_523);
+    stringBuffer.append(TEXT_530);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.notify.Notification"));
-    stringBuffer.append(TEXT_524);
+    stringBuffer.append(TEXT_531);
     
 	}
 
-    stringBuffer.append(TEXT_525);
+    stringBuffer.append(TEXT_532);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.NotificationFilter"));
-    stringBuffer.append(TEXT_526);
+    stringBuffer.append(TEXT_533);
     
 	{
 		boolean hasDeclaredFilter = false;
@@ -3110,7 +3303,7 @@
 			}
 			GenFeature _feature = modelFacet.getChildMetaFeature();
 
-    stringBuffer.append(TEXT_527);
+    stringBuffer.append(TEXT_534);
     
 	/*
 	 * input: 
@@ -3124,32 +3317,32 @@
 	if (!hasDeclaredFilter) {
 		hasDeclaredFilter = true;
 
-    stringBuffer.append(TEXT_528);
+    stringBuffer.append(TEXT_535);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.NotificationFilter"));
-    stringBuffer.append(TEXT_529);
+    stringBuffer.append(TEXT_536);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.NotificationFilter"));
-    stringBuffer.append(TEXT_530);
+    stringBuffer.append(TEXT_537);
     stringBuffer.append(importManager.getImportedName(_feature.getGenPackage().getQualifiedPackageInterfaceName()));
-    stringBuffer.append(TEXT_531);
+    stringBuffer.append(TEXT_538);
     stringBuffer.append(_feature.getFeatureAccessorName());
-    stringBuffer.append(TEXT_532);
+    stringBuffer.append(TEXT_539);
     
 	} else {
 
-    stringBuffer.append(TEXT_533);
+    stringBuffer.append(TEXT_540);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.NotificationFilter"));
-    stringBuffer.append(TEXT_534);
+    stringBuffer.append(TEXT_541);
     stringBuffer.append(importManager.getImportedName(_feature.getGenPackage().getQualifiedPackageInterfaceName()));
-    stringBuffer.append(TEXT_535);
+    stringBuffer.append(TEXT_542);
     stringBuffer.append(_feature.getFeatureAccessorName());
-    stringBuffer.append(TEXT_536);
+    stringBuffer.append(TEXT_543);
     
 	}
 
     
 			_feature = modelFacet.getSourceMetaFeature();
 
-    stringBuffer.append(TEXT_537);
+    stringBuffer.append(TEXT_544);
     
 	/*
 	 * input: 
@@ -3163,32 +3356,32 @@
 	if (!hasDeclaredFilter) {
 		hasDeclaredFilter = true;
 
-    stringBuffer.append(TEXT_538);
+    stringBuffer.append(TEXT_545);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.NotificationFilter"));
-    stringBuffer.append(TEXT_539);
+    stringBuffer.append(TEXT_546);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.NotificationFilter"));
-    stringBuffer.append(TEXT_540);
+    stringBuffer.append(TEXT_547);
     stringBuffer.append(importManager.getImportedName(_feature.getGenPackage().getQualifiedPackageInterfaceName()));
-    stringBuffer.append(TEXT_541);
+    stringBuffer.append(TEXT_548);
     stringBuffer.append(_feature.getFeatureAccessorName());
-    stringBuffer.append(TEXT_542);
+    stringBuffer.append(TEXT_549);
     
 	} else {
 
-    stringBuffer.append(TEXT_543);
+    stringBuffer.append(TEXT_550);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.NotificationFilter"));
-    stringBuffer.append(TEXT_544);
+    stringBuffer.append(TEXT_551);
     stringBuffer.append(importManager.getImportedName(_feature.getGenPackage().getQualifiedPackageInterfaceName()));
-    stringBuffer.append(TEXT_545);
+    stringBuffer.append(TEXT_552);
     stringBuffer.append(_feature.getFeatureAccessorName());
-    stringBuffer.append(TEXT_546);
+    stringBuffer.append(TEXT_553);
     
 	}
 
     
 			_feature = modelFacet.getTargetMetaFeature();
 
-    stringBuffer.append(TEXT_547);
+    stringBuffer.append(TEXT_554);
     
 	/*
 	 * input: 
@@ -3202,25 +3395,25 @@
 	if (!hasDeclaredFilter) {
 		hasDeclaredFilter = true;
 
-    stringBuffer.append(TEXT_548);
+    stringBuffer.append(TEXT_555);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.NotificationFilter"));
-    stringBuffer.append(TEXT_549);
+    stringBuffer.append(TEXT_556);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.NotificationFilter"));
-    stringBuffer.append(TEXT_550);
+    stringBuffer.append(TEXT_557);
     stringBuffer.append(importManager.getImportedName(_feature.getGenPackage().getQualifiedPackageInterfaceName()));
-    stringBuffer.append(TEXT_551);
+    stringBuffer.append(TEXT_558);
     stringBuffer.append(_feature.getFeatureAccessorName());
-    stringBuffer.append(TEXT_552);
+    stringBuffer.append(TEXT_559);
     
 	} else {
 
-    stringBuffer.append(TEXT_553);
+    stringBuffer.append(TEXT_560);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.NotificationFilter"));
-    stringBuffer.append(TEXT_554);
+    stringBuffer.append(TEXT_561);
     stringBuffer.append(importManager.getImportedName(_feature.getGenPackage().getQualifiedPackageInterfaceName()));
-    stringBuffer.append(TEXT_555);
+    stringBuffer.append(TEXT_562);
     stringBuffer.append(_feature.getFeatureAccessorName());
-    stringBuffer.append(TEXT_556);
+    stringBuffer.append(TEXT_563);
     
 	}
 
@@ -3230,7 +3423,7 @@
 			GenLink nextLink = (GenLink) it.next();
 			GenFeature _feature = ((FeatureModelFacet) nextLink.getModelFacet()).getMetaFeature();
 
-    stringBuffer.append(TEXT_557);
+    stringBuffer.append(TEXT_564);
     
 	/*
 	 * input: 
@@ -3244,25 +3437,25 @@
 	if (!hasDeclaredFilter) {
 		hasDeclaredFilter = true;
 
-    stringBuffer.append(TEXT_558);
+    stringBuffer.append(TEXT_565);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.NotificationFilter"));
-    stringBuffer.append(TEXT_559);
+    stringBuffer.append(TEXT_566);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.NotificationFilter"));
-    stringBuffer.append(TEXT_560);
+    stringBuffer.append(TEXT_567);
     stringBuffer.append(importManager.getImportedName(_feature.getGenPackage().getQualifiedPackageInterfaceName()));
-    stringBuffer.append(TEXT_561);
+    stringBuffer.append(TEXT_568);
     stringBuffer.append(_feature.getFeatureAccessorName());
-    stringBuffer.append(TEXT_562);
+    stringBuffer.append(TEXT_569);
     
 	} else {
 
-    stringBuffer.append(TEXT_563);
+    stringBuffer.append(TEXT_570);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.NotificationFilter"));
-    stringBuffer.append(TEXT_564);
+    stringBuffer.append(TEXT_571);
     stringBuffer.append(importManager.getImportedName(_feature.getGenPackage().getQualifiedPackageInterfaceName()));
-    stringBuffer.append(TEXT_565);
+    stringBuffer.append(TEXT_572);
     stringBuffer.append(_feature.getFeatureAccessorName());
-    stringBuffer.append(TEXT_566);
+    stringBuffer.append(TEXT_573);
     
 	}
 
@@ -3271,59 +3464,59 @@
 		if (hasConstraintsInContainedLinks) {
 			if (hasDeclaredFilter) {
 
-    stringBuffer.append(TEXT_567);
+    stringBuffer.append(TEXT_574);
     
 			} else {
 				hasDeclaredFilter = true;
 
-    stringBuffer.append(TEXT_568);
+    stringBuffer.append(TEXT_575);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.NotificationFilter"));
-    stringBuffer.append(TEXT_569);
+    stringBuffer.append(TEXT_576);
     
 			}
 		}
 		if (_includeUncontainedLinks) {
 			if (hasDeclaredFilter) {
 
-    stringBuffer.append(TEXT_570);
+    stringBuffer.append(TEXT_577);
     
 			} else {
 				hasDeclaredFilter = true;
 
-    stringBuffer.append(TEXT_571);
+    stringBuffer.append(TEXT_578);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.NotificationFilter"));
-    stringBuffer.append(TEXT_572);
+    stringBuffer.append(TEXT_579);
     
 			}
 		}
 		if (!hasDeclaredFilter) {
 
-    stringBuffer.append(TEXT_573);
+    stringBuffer.append(TEXT_580);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.NotificationFilter"));
-    stringBuffer.append(TEXT_574);
+    stringBuffer.append(TEXT_581);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.NotificationFilter"));
-    stringBuffer.append(TEXT_575);
+    stringBuffer.append(TEXT_582);
     
 		}
 	}	//local declaration of hasDeclaredFilter
 
-    stringBuffer.append(TEXT_576);
+    stringBuffer.append(TEXT_583);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.lite.commands.CreateNotationalElementCommand"));
-    stringBuffer.append(TEXT_577);
+    stringBuffer.append(TEXT_584);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.lite.edit.parts.update.canonical.ElementDescriptor"));
-    stringBuffer.append(TEXT_578);
+    stringBuffer.append(TEXT_585);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.lite.edit.parts.update.canonical.LinkDescriptor"));
-    stringBuffer.append(TEXT_579);
+    stringBuffer.append(TEXT_586);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.lite.edit.parts.update.canonical.LinkDescriptor"));
-    stringBuffer.append(TEXT_580);
+    stringBuffer.append(TEXT_587);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.View"));
-    stringBuffer.append(TEXT_581);
+    stringBuffer.append(TEXT_588);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.View"));
-    stringBuffer.append(TEXT_582);
+    stringBuffer.append(TEXT_589);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.Edge"));
-    stringBuffer.append(TEXT_583);
+    stringBuffer.append(TEXT_590);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.NotationFactory"));
-    stringBuffer.append(TEXT_584);
+    stringBuffer.append(TEXT_591);
     
 	for(Iterator it = myHelper.getContainedTypeModelFacetLinks(); it.hasNext(); ) {
 		GenLink nextLink = (GenLink) it.next();
@@ -3332,37 +3525,37 @@
 			continue;
 		}
 
-    stringBuffer.append(TEXT_585);
+    stringBuffer.append(TEXT_592);
     stringBuffer.append(importManager.getImportedName(nextLink.getEditPartQualifiedClassName()));
-    stringBuffer.append(TEXT_586);
+    stringBuffer.append(TEXT_593);
     stringBuffer.append(importManager.getImportedName(modelFacet.getMetaClass().getQualifiedInterfaceName()));
-    stringBuffer.append(TEXT_587);
+    stringBuffer.append(TEXT_594);
     stringBuffer.append(importManager.getImportedName(nextLink.getNotationViewFactoryQualifiedClassName()));
-    stringBuffer.append(TEXT_588);
+    stringBuffer.append(TEXT_595);
     
 	}
 	for(Iterator it = myHelper.getContainedFeatureModelFacetLinks(); it.hasNext(); ) {
 		GenLink nextLink = (GenLink) it.next();
 
-    stringBuffer.append(TEXT_589);
+    stringBuffer.append(TEXT_596);
     stringBuffer.append(importManager.getImportedName(nextLink.getEditPartQualifiedClassName()));
-    stringBuffer.append(TEXT_590);
+    stringBuffer.append(TEXT_597);
     stringBuffer.append(importManager.getImportedName(nextLink.getNotationViewFactoryQualifiedClassName()));
-    stringBuffer.append(TEXT_591);
+    stringBuffer.append(TEXT_598);
     
 	}
 
-    stringBuffer.append(TEXT_592);
+    stringBuffer.append(TEXT_599);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.lite.commands.CreateNotationalEdgeCommand"));
-    stringBuffer.append(TEXT_593);
+    stringBuffer.append(TEXT_600);
     stringBuffer.append(importManager.getImportedName("java.util.List"));
-    stringBuffer.append(TEXT_594);
-    stringBuffer.append(TEXT_595);
-    stringBuffer.append(TEXT_596);
+    stringBuffer.append(TEXT_601);
+    stringBuffer.append(TEXT_602);
+    stringBuffer.append(TEXT_603);
     stringBuffer.append(importManager.getImportedName("java.util.List"));
-    stringBuffer.append(TEXT_597);
+    stringBuffer.append(TEXT_604);
     stringBuffer.append(importManager.getImportedName("java.util.LinkedList"));
-    stringBuffer.append(TEXT_598);
+    stringBuffer.append(TEXT_605);
     
 Map genFeature2genLinkMap = new LinkedHashMap();
 for(Iterator it = myHelper.getContainedTypeModelFacetLinks(); it.hasNext(); ) {
@@ -3385,18 +3578,18 @@
 }
 if (!genFeature2genLinkMap.isEmpty() || !genFeature2featureGenLinkMap.isEmpty()) {
 
-    stringBuffer.append(TEXT_599);
+    stringBuffer.append(TEXT_606);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EObject"));
-    stringBuffer.append(TEXT_600);
+    stringBuffer.append(TEXT_607);
     stringBuffer.append(_getViewCode);
-    stringBuffer.append(TEXT_601);
+    stringBuffer.append(TEXT_608);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EObject"));
-    stringBuffer.append(TEXT_602);
+    stringBuffer.append(TEXT_609);
     
 }
 if (!genFeature2genLinkMap.isEmpty()) {
 
-    stringBuffer.append(TEXT_603);
+    stringBuffer.append(TEXT_610);
     
 }
 for (Iterator entries = genFeature2genLinkMap.entrySet().iterator(); entries.hasNext();) {
@@ -3405,32 +3598,32 @@
 	Collection genLinksCollection = (Collection) nextEntry.getValue();
 	if (metaFeature.isListType()) {
 
-    stringBuffer.append(TEXT_604);
+    stringBuffer.append(TEXT_611);
     stringBuffer.append(importManager.getImportedName("java.util.Iterator"));
-    stringBuffer.append(TEXT_605);
+    stringBuffer.append(TEXT_612);
     myFeatureGetAccessorHelper.appendFeatureValueGetter("modelObject", metaFeature, null, true);
-    stringBuffer.append(TEXT_606);
+    stringBuffer.append(TEXT_613);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EObject"));
-    stringBuffer.append(TEXT_607);
+    stringBuffer.append(TEXT_614);
     
 	} else {
 
-    stringBuffer.append(TEXT_608);
+    stringBuffer.append(TEXT_615);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EObject"));
-    stringBuffer.append(TEXT_609);
+    stringBuffer.append(TEXT_616);
     myFeatureGetAccessorHelper.appendFeatureValueGetter("modelObject", metaFeature, null, false);
-    stringBuffer.append(TEXT_610);
+    stringBuffer.append(TEXT_617);
     
 	}
 
-    stringBuffer.append(TEXT_611);
+    stringBuffer.append(TEXT_618);
     stringBuffer.append(importManager.getImportedName(genDiagram.getVisualIDRegistryQualifiedClassName()));
-    stringBuffer.append(TEXT_612);
+    stringBuffer.append(TEXT_619);
     
 	boolean generateSwitch = genLinksCollection.size() != 1;
 	if (generateSwitch) {
 
-    stringBuffer.append(TEXT_613);
+    stringBuffer.append(TEXT_620);
     
 	}
 	for (Iterator genLinksIterator = genLinksCollection.iterator(); genLinksIterator.hasNext(); ) {
@@ -3438,67 +3631,67 @@
 		TypeLinkModelFacet modelFacet = (TypeLinkModelFacet) nextLink.getModelFacet();
 		if (generateSwitch) {
 
-    stringBuffer.append(TEXT_614);
+    stringBuffer.append(TEXT_621);
     stringBuffer.append(importManager.getImportedName(nextLink.getEditPartQualifiedClassName()));
-    stringBuffer.append(TEXT_615);
+    stringBuffer.append(TEXT_622);
     
 		} else {
 
-    stringBuffer.append(TEXT_616);
+    stringBuffer.append(TEXT_623);
     stringBuffer.append(importManager.getImportedName(nextLink.getEditPartQualifiedClassName()));
-    stringBuffer.append(TEXT_617);
+    stringBuffer.append(TEXT_624);
     
 		}
 		if (modelFacet.getSourceMetaFeature() != null) {
 
-    stringBuffer.append(TEXT_618);
+    stringBuffer.append(TEXT_625);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EObject"));
-    stringBuffer.append(TEXT_619);
+    stringBuffer.append(TEXT_626);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EObject"));
-    stringBuffer.append(TEXT_620);
+    stringBuffer.append(TEXT_627);
     myFeatureGetAccessorHelper.appendFeatureValueGetter("nextValue", modelFacet.getSourceMetaFeature(), null, false);
-    stringBuffer.append(TEXT_621);
+    stringBuffer.append(TEXT_628);
     
 		} else {
 
-    stringBuffer.append(TEXT_622);
+    stringBuffer.append(TEXT_629);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EObject"));
-    stringBuffer.append(TEXT_623);
+    stringBuffer.append(TEXT_630);
     stringBuffer.append(_getViewCode);
-    stringBuffer.append(TEXT_624);
+    stringBuffer.append(TEXT_631);
     
 		}
 		if (modelFacet.getTargetMetaFeature() != null) {
 
-    stringBuffer.append(TEXT_625);
+    stringBuffer.append(TEXT_632);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EObject"));
-    stringBuffer.append(TEXT_626);
+    stringBuffer.append(TEXT_633);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EObject"));
-    stringBuffer.append(TEXT_627);
+    stringBuffer.append(TEXT_634);
     myFeatureGetAccessorHelper.appendFeatureValueGetter("nextValue", modelFacet.getTargetMetaFeature(), null, false);
-    stringBuffer.append(TEXT_628);
+    stringBuffer.append(TEXT_635);
     
 		} else {
 
-    stringBuffer.append(TEXT_629);
+    stringBuffer.append(TEXT_636);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EObject"));
-    stringBuffer.append(TEXT_630);
+    stringBuffer.append(TEXT_637);
     stringBuffer.append(_getViewCode);
-    stringBuffer.append(TEXT_631);
+    stringBuffer.append(TEXT_638);
     
 		}
 
-    stringBuffer.append(TEXT_632);
+    stringBuffer.append(TEXT_639);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.lite.edit.parts.update.canonical.LinkDescriptor"));
-    stringBuffer.append(TEXT_633);
+    stringBuffer.append(TEXT_640);
     
 		if (generateSwitch) {
 
-    stringBuffer.append(TEXT_634);
+    stringBuffer.append(TEXT_641);
     
 		} else {
 
-    stringBuffer.append(TEXT_635);
+    stringBuffer.append(TEXT_642);
     
 		}
 
@@ -3506,12 +3699,12 @@
 	}	//iterate over genLinksCollection
 	if (generateSwitch) {
 
-    stringBuffer.append(TEXT_636);
+    stringBuffer.append(TEXT_643);
     
 	}
 	if (metaFeature.isListType()) {
 
-    stringBuffer.append(TEXT_637);
+    stringBuffer.append(TEXT_644);
     
 	}
 }
@@ -3521,176 +3714,176 @@
 	Collection genLinksCollection = (Collection) nextEntry.getValue();
 	if (metaFeature.isListType()) {
 
-    stringBuffer.append(TEXT_638);
+    stringBuffer.append(TEXT_645);
     stringBuffer.append(importManager.getImportedName("java.util.Iterator"));
-    stringBuffer.append(TEXT_639);
+    stringBuffer.append(TEXT_646);
     myFeatureGetAccessorHelper.appendFeatureValueGetter("modelObject", metaFeature, null, true);
-    stringBuffer.append(TEXT_640);
+    stringBuffer.append(TEXT_647);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EObject"));
-    stringBuffer.append(TEXT_641);
+    stringBuffer.append(TEXT_648);
     
 	} else {
 
-    stringBuffer.append(TEXT_642);
+    stringBuffer.append(TEXT_649);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EObject"));
-    stringBuffer.append(TEXT_643);
+    stringBuffer.append(TEXT_650);
     myFeatureGetAccessorHelper.appendFeatureValueGetter("modelObject", metaFeature, null, false);
-    stringBuffer.append(TEXT_644);
+    stringBuffer.append(TEXT_651);
     
 	}
 
-    stringBuffer.append(TEXT_645);
+    stringBuffer.append(TEXT_652);
     
 	for (Iterator genLinksIterator = genLinksCollection.iterator(); genLinksIterator.hasNext(); ) {
 		GenLink nextLink = (GenLink) genLinksIterator.next();
 
-    stringBuffer.append(TEXT_646);
+    stringBuffer.append(TEXT_653);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.lite.edit.parts.update.canonical.LinkDescriptor"));
-    stringBuffer.append(TEXT_647);
+    stringBuffer.append(TEXT_654);
     stringBuffer.append(importManager.getImportedName(nextLink.getEditPartQualifiedClassName()));
-    stringBuffer.append(TEXT_648);
+    stringBuffer.append(TEXT_655);
     
 	}
 
-    stringBuffer.append(TEXT_649);
+    stringBuffer.append(TEXT_656);
     
 	if (metaFeature.isListType()) {
 
-    stringBuffer.append(TEXT_650);
+    stringBuffer.append(TEXT_657);
     
 	}
 }
 
-    stringBuffer.append(TEXT_651);
+    stringBuffer.append(TEXT_658);
     stringBuffer.append(importManager.getImportedName("java.util.List"));
-    stringBuffer.append(TEXT_652);
+    stringBuffer.append(TEXT_659);
     stringBuffer.append(importManager.getImportedName("java.util.List"));
-    stringBuffer.append(TEXT_653);
+    stringBuffer.append(TEXT_660);
     stringBuffer.append(importManager.getImportedName("java.util.LinkedList"));
-    stringBuffer.append(TEXT_654);
+    stringBuffer.append(TEXT_661);
     stringBuffer.append(importManager.getImportedName("java.util.List"));
-    stringBuffer.append(TEXT_655);
+    stringBuffer.append(TEXT_662);
     stringBuffer.append(_getDiagramCode);
-    stringBuffer.append(TEXT_656);
+    stringBuffer.append(TEXT_663);
     stringBuffer.append(importManager.getImportedName("java.util.Iterator"));
-    stringBuffer.append(TEXT_657);
+    stringBuffer.append(TEXT_664);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.Edge"));
-    stringBuffer.append(TEXT_658);
+    stringBuffer.append(TEXT_665);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.Edge"));
-    stringBuffer.append(TEXT_659);
+    stringBuffer.append(TEXT_666);
     
 	if (_includeUncontainedLinks) {
 
-    stringBuffer.append(TEXT_660);
+    stringBuffer.append(TEXT_667);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.View"));
-    stringBuffer.append(TEXT_661);
+    stringBuffer.append(TEXT_668);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.View"));
-    stringBuffer.append(TEXT_662);
+    stringBuffer.append(TEXT_669);
     
 	}
 	if (myHelper.containsFeatureModelFacetLinks()) {
 
-    stringBuffer.append(TEXT_663);
+    stringBuffer.append(TEXT_670);
     stringBuffer.append(_getViewCode);
-    stringBuffer.append(TEXT_664);
+    stringBuffer.append(TEXT_671);
     stringBuffer.append(importManager.getImportedName(genDiagram.getVisualIDRegistryQualifiedClassName()));
-    stringBuffer.append(TEXT_665);
+    stringBuffer.append(TEXT_672);
     
 		for(Iterator it = myHelper.getContainedFeatureModelFacetLinks(); it.hasNext(); ) {
 			GenLink nextLink = (GenLink) it.next();
 
-    stringBuffer.append(TEXT_666);
+    stringBuffer.append(TEXT_673);
     stringBuffer.append(importManager.getImportedName(nextLink.getEditPartQualifiedClassName()));
-    stringBuffer.append(TEXT_667);
+    stringBuffer.append(TEXT_674);
     
 		}
 
-    stringBuffer.append(TEXT_668);
+    stringBuffer.append(TEXT_675);
     
 		if (myHelper.containsTypeModelFacetLinks()) {
 
-    stringBuffer.append(TEXT_669);
+    stringBuffer.append(TEXT_676);
     
 		} else {
 
-    stringBuffer.append(TEXT_670);
+    stringBuffer.append(TEXT_677);
     
 		}
 	}
 	if (myHelper.containsTypeModelFacetLinks()) {
 		if (!myHelper.containsFeatureModelFacetLinks()) {
 
-    stringBuffer.append(TEXT_671);
+    stringBuffer.append(TEXT_678);
     
 		}
 
-    stringBuffer.append(TEXT_672);
+    stringBuffer.append(TEXT_679);
     stringBuffer.append(_getViewCode);
-    stringBuffer.append(TEXT_673);
+    stringBuffer.append(TEXT_680);
     stringBuffer.append(importManager.getImportedName(genDiagram.getVisualIDRegistryQualifiedClassName()));
-    stringBuffer.append(TEXT_674);
+    stringBuffer.append(TEXT_681);
     
 		for(Iterator it = myHelper.getContainedTypeModelFacetLinks(); it.hasNext(); ) {
 			GenLink nextLink = (GenLink) it.next();
 
-    stringBuffer.append(TEXT_675);
+    stringBuffer.append(TEXT_682);
     stringBuffer.append(importManager.getImportedName(nextLink.getEditPartQualifiedClassName()));
-    stringBuffer.append(TEXT_676);
+    stringBuffer.append(TEXT_683);
     
 		}
 
-    stringBuffer.append(TEXT_677);
+    stringBuffer.append(TEXT_684);
     
 	}
 
-    stringBuffer.append(TEXT_678);
+    stringBuffer.append(TEXT_685);
     stringBuffer.append(genDiagram.isSynchronized());
-    stringBuffer.append(TEXT_679);
+    stringBuffer.append(TEXT_686);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.lite.edit.parts.update.canonical.ElementDescriptor"));
-    stringBuffer.append(TEXT_680);
+    stringBuffer.append(TEXT_687);
     stringBuffer.append(genDiagram.isSynchronized());
-    stringBuffer.append(TEXT_681);
+    stringBuffer.append(TEXT_688);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.View"));
-    stringBuffer.append(TEXT_682);
+    stringBuffer.append(TEXT_689);
     stringBuffer.append(_getViewCode);
-    stringBuffer.append(TEXT_683);
+    stringBuffer.append(TEXT_690);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.lite.edit.parts.update.canonical.AbstractNotationModelRefresher"));
-    stringBuffer.append(TEXT_684);
+    stringBuffer.append(TEXT_691);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.command.Command"));
-    stringBuffer.append(TEXT_685);
+    stringBuffer.append(TEXT_692);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.TransactionalEditingDomain"));
-    stringBuffer.append(TEXT_686);
+    stringBuffer.append(TEXT_693);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.util.TransactionUtil"));
-    stringBuffer.append(TEXT_687);
+    stringBuffer.append(TEXT_694);
     stringBuffer.append(_getDiagramCode);
-    stringBuffer.append(TEXT_688);
+    stringBuffer.append(TEXT_695);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.lite.commands.WrappingCommand"));
-    stringBuffer.append(TEXT_689);
+    stringBuffer.append(TEXT_696);
     
 }
 
     
 }	//end of local declarations
 
-    stringBuffer.append(TEXT_690);
-    stringBuffer.append(TEXT_691);
-    stringBuffer.append(TEXT_692);
+    stringBuffer.append(TEXT_697);
+    stringBuffer.append(TEXT_698);
+    stringBuffer.append(TEXT_699);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.lite.edit.parts.update.RefreshAdapter"));
-    stringBuffer.append(TEXT_693);
+    stringBuffer.append(TEXT_700);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.lite.edit.parts.update.RefreshAdapter"));
-    stringBuffer.append(TEXT_694);
-    stringBuffer.append(TEXT_695);
-    stringBuffer.append(TEXT_696);
+    stringBuffer.append(TEXT_701);
+    stringBuffer.append(TEXT_702);
+    stringBuffer.append(TEXT_703);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EStructuralFeature"));
-    stringBuffer.append(TEXT_697);
+    stringBuffer.append(TEXT_704);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EStructuralFeature"));
-    stringBuffer.append(TEXT_698);
+    stringBuffer.append(TEXT_705);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EStructuralFeature"));
-    stringBuffer.append(TEXT_699);
+    stringBuffer.append(TEXT_706);
     
 	final String primaryView = "getDiagramNode()";
 
-    stringBuffer.append(TEXT_700);
+    stringBuffer.append(TEXT_707);
     
 boolean isFixedFontSetInFigure;
 {
@@ -3698,72 +3891,58 @@
 	isFixedFontSetInFigure = styleAttributes != null && styleAttributes.isFixedFont();
 }
 
-    stringBuffer.append(TEXT_701);
+    stringBuffer.append(TEXT_708);
     
 if (!isFixedFontSetInFigure) {
 
-    stringBuffer.append(TEXT_702);
+    stringBuffer.append(TEXT_709);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.FontStyle"));
-    stringBuffer.append(TEXT_703);
+    stringBuffer.append(TEXT_710);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.FontStyle"));
-    stringBuffer.append(TEXT_704);
+    stringBuffer.append(TEXT_711);
     stringBuffer.append(primaryView);
-    stringBuffer.append(TEXT_705);
+    stringBuffer.append(TEXT_712);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.NotationPackage"));
-    stringBuffer.append(TEXT_706);
+    stringBuffer.append(TEXT_713);
     stringBuffer.append(importManager.getImportedName("org.eclipse.swt.graphics.Font"));
-    stringBuffer.append(TEXT_707);
+    stringBuffer.append(TEXT_714);
     stringBuffer.append(importManager.getImportedName("org.eclipse.swt.SWT"));
-    stringBuffer.append(TEXT_708);
+    stringBuffer.append(TEXT_715);
     stringBuffer.append(importManager.getImportedName("org.eclipse.swt.SWT"));
-    stringBuffer.append(TEXT_709);
+    stringBuffer.append(TEXT_716);
     stringBuffer.append(importManager.getImportedName("org.eclipse.swt.SWT"));
-    stringBuffer.append(TEXT_710);
+    stringBuffer.append(TEXT_717);
     stringBuffer.append(importManager.getImportedName("org.eclipse.swt.graphics.Font"));
-    stringBuffer.append(TEXT_711);
+    stringBuffer.append(TEXT_718);
     stringBuffer.append(importManager.getImportedName("org.eclipse.swt.graphics.FontData"));
-    stringBuffer.append(TEXT_712);
+    stringBuffer.append(TEXT_719);
     stringBuffer.append(importManager.getImportedName("org.eclipse.swt.graphics.Font"));
-    stringBuffer.append(TEXT_713);
+    stringBuffer.append(TEXT_720);
     
 }
 
-    stringBuffer.append(TEXT_714);
+    stringBuffer.append(TEXT_721);
     
 if (!isFixedFontSetInFigure) {
 
-    stringBuffer.append(TEXT_715);
+    stringBuffer.append(TEXT_722);
     stringBuffer.append(importManager.getImportedName("org.eclipse.swt.graphics.Font"));
-    stringBuffer.append(TEXT_716);
+    stringBuffer.append(TEXT_723);
     
 }
 
-    stringBuffer.append(TEXT_717);
-    stringBuffer.append(TEXT_718);
-    stringBuffer.append(TEXT_719);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.LineStyle"));
-    stringBuffer.append(TEXT_720);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.LineStyle"));
-    stringBuffer.append(TEXT_721);
-    stringBuffer.append(primaryView);
-    stringBuffer.append(TEXT_722);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.NotationPackage"));
-    stringBuffer.append(TEXT_723);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.swt.graphics.Color"));
     stringBuffer.append(TEXT_724);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.swt.graphics.Color"));
     stringBuffer.append(TEXT_725);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.swt.graphics.Color"));
     stringBuffer.append(TEXT_726);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.swt.graphics.Color"));
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.LineStyle"));
     stringBuffer.append(TEXT_727);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.FillStyle"));
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.LineStyle"));
     stringBuffer.append(TEXT_728);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.FillStyle"));
-    stringBuffer.append(TEXT_729);
     stringBuffer.append(primaryView);
-    stringBuffer.append(TEXT_730);
+    stringBuffer.append(TEXT_729);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.NotationPackage"));
+    stringBuffer.append(TEXT_730);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.swt.graphics.Color"));
     stringBuffer.append(TEXT_731);
     stringBuffer.append(importManager.getImportedName("org.eclipse.swt.graphics.Color"));
     stringBuffer.append(TEXT_732);
@@ -3771,31 +3950,33 @@
     stringBuffer.append(TEXT_733);
     stringBuffer.append(importManager.getImportedName("org.eclipse.swt.graphics.Color"));
     stringBuffer.append(TEXT_734);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.swt.graphics.Color"));
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.FillStyle"));
     stringBuffer.append(TEXT_735);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.FillStyle"));
     stringBuffer.append(TEXT_736);
+    stringBuffer.append(primaryView);
     stringBuffer.append(TEXT_737);
-    stringBuffer.append(importManager.getImportedName("java.util.HashMap"));
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.NotationPackage"));
     stringBuffer.append(TEXT_738);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EStructuralFeature"));
+    stringBuffer.append(importManager.getImportedName("org.eclipse.swt.graphics.Color"));
     stringBuffer.append(TEXT_739);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.notify.Notification"));
+    stringBuffer.append(importManager.getImportedName("org.eclipse.swt.graphics.Color"));
     stringBuffer.append(TEXT_740);
-    stringBuffer.append(importManager.getImportedName("java.util.HashMap"));
+    stringBuffer.append(importManager.getImportedName("org.eclipse.swt.graphics.Color"));
     stringBuffer.append(TEXT_741);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.swt.graphics.Color"));
     stringBuffer.append(TEXT_742);
     stringBuffer.append(TEXT_743);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.NotationPackage"));
     stringBuffer.append(TEXT_744);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.NotationPackage"));
+    stringBuffer.append(importManager.getImportedName("java.util.HashMap"));
     stringBuffer.append(TEXT_745);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EStructuralFeature"));
     stringBuffer.append(TEXT_746);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.notify.Notification"));
     stringBuffer.append(TEXT_747);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.NotationPackage"));
+    stringBuffer.append(importManager.getImportedName("java.util.HashMap"));
     stringBuffer.append(TEXT_748);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.NotationPackage"));
     stringBuffer.append(TEXT_749);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.NotationPackage"));
     stringBuffer.append(TEXT_750);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.NotationPackage"));
     stringBuffer.append(TEXT_751);
@@ -3805,30 +3986,42 @@
     stringBuffer.append(TEXT_754);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.NotationPackage"));
     stringBuffer.append(TEXT_755);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.NotationPackage"));
     stringBuffer.append(TEXT_756);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.NotationPackage"));
     stringBuffer.append(TEXT_757);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.NotationPackage"));
     stringBuffer.append(TEXT_758);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.NotationPackage"));
     stringBuffer.append(TEXT_759);
     stringBuffer.append(TEXT_760);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.NotationPackage"));
     stringBuffer.append(TEXT_761);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.NotationPackage"));
     stringBuffer.append(TEXT_762);
     stringBuffer.append(TEXT_763);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.NotationPackage"));
     stringBuffer.append(TEXT_764);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.NotationPackage"));
     stringBuffer.append(TEXT_765);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.NotationPackage"));
     stringBuffer.append(TEXT_766);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.NotationPackage"));
     stringBuffer.append(TEXT_767);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.NotationPackage"));
     stringBuffer.append(TEXT_768);
     stringBuffer.append(TEXT_769);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.NotationPackage"));
     stringBuffer.append(TEXT_770);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.NotationPackage"));
     stringBuffer.append(TEXT_771);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.NotationPackage"));
+    stringBuffer.append(TEXT_772);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.NotationPackage"));
+    stringBuffer.append(TEXT_773);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.NotationPackage"));
+    stringBuffer.append(TEXT_774);
+    stringBuffer.append(TEXT_775);
+    stringBuffer.append(TEXT_776);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.NotationPackage"));
+    stringBuffer.append(TEXT_777);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.NotationPackage"));
+    stringBuffer.append(TEXT_778);
     
 for(Iterator it = genNode.getChildNodes().iterator(); it.hasNext(); ) {
 	GenChildNode next = (GenChildNode)it.next();
@@ -3836,42 +4029,42 @@
 	boolean isListLayout = !isXYLayout;
 	String resolvedSemanticElement = "parent.getElement()";
 
-    stringBuffer.append(TEXT_772);
-    stringBuffer.append(TEXT_773);
+    stringBuffer.append(TEXT_779);
+    stringBuffer.append(TEXT_780);
     if (isStatic) {
-    stringBuffer.append(TEXT_774);
+    stringBuffer.append(TEXT_781);
     }
-    stringBuffer.append(TEXT_775);
+    stringBuffer.append(TEXT_782);
     stringBuffer.append(next.getDomainMetaClass().getName());
     stringBuffer.append(next.getVisualID());
-    stringBuffer.append(TEXT_776);
+    stringBuffer.append(TEXT_783);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.lite.commands.CreateNotationalNodeCommand"));
-    stringBuffer.append(TEXT_777);
+    stringBuffer.append(TEXT_784);
     stringBuffer.append(next.getDomainMetaClass().getName());
     stringBuffer.append(next.getVisualID());
-    stringBuffer.append(TEXT_778);
+    stringBuffer.append(TEXT_785);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.View"));
-    stringBuffer.append(TEXT_779);
+    stringBuffer.append(TEXT_786);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EObject"));
-    stringBuffer.append(TEXT_780);
+    stringBuffer.append(TEXT_787);
     if (!isListLayout) {
-    stringBuffer.append(TEXT_781);
+    stringBuffer.append(TEXT_788);
     stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.geometry.Rectangle"));
-    stringBuffer.append(TEXT_782);
+    stringBuffer.append(TEXT_789);
     }
-    stringBuffer.append(TEXT_783);
+    stringBuffer.append(TEXT_790);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.NotationFactory"));
-    stringBuffer.append(TEXT_784);
+    stringBuffer.append(TEXT_791);
     stringBuffer.append(importManager.getImportedName(next.getNotationViewFactoryQualifiedClassName()));
-    stringBuffer.append(TEXT_785);
+    stringBuffer.append(TEXT_792);
     
 	if (!isListLayout) {
 
-    stringBuffer.append(TEXT_786);
+    stringBuffer.append(TEXT_793);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.Bounds"));
-    stringBuffer.append(TEXT_787);
+    stringBuffer.append(TEXT_794);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.NotationFactory"));
-    stringBuffer.append(TEXT_788);
+    stringBuffer.append(TEXT_795);
     
 		int defaultWidth = 40;
 		int defaultHeight = 40;
@@ -3881,143 +4074,143 @@
 			defaultHeight = defSizeAttrs.getHeight();
 		}
 
-    stringBuffer.append(TEXT_789);
+    stringBuffer.append(TEXT_796);
     stringBuffer.append(defaultWidth);
-    stringBuffer.append(TEXT_790);
+    stringBuffer.append(TEXT_797);
     stringBuffer.append(defaultHeight);
-    stringBuffer.append(TEXT_791);
+    stringBuffer.append(TEXT_798);
     
 	}
 
-    stringBuffer.append(TEXT_792);
+    stringBuffer.append(TEXT_799);
     
 if (genDiagram.getPalette() != null) {
 
-    stringBuffer.append(TEXT_793);
+    stringBuffer.append(TEXT_800);
     if (isStatic) {
-    stringBuffer.append(TEXT_794);
+    stringBuffer.append(TEXT_801);
     }
-    stringBuffer.append(TEXT_795);
+    stringBuffer.append(TEXT_802);
     stringBuffer.append(next.getDomainMetaClass().getName());
     stringBuffer.append(next.getVisualID());
-    stringBuffer.append(TEXT_796);
+    stringBuffer.append(TEXT_803);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.command.AbstractCommand"));
-    stringBuffer.append(TEXT_797);
+    stringBuffer.append(TEXT_804);
     stringBuffer.append(next.getDomainMetaClass().getName());
     stringBuffer.append(next.getVisualID());
-    stringBuffer.append(TEXT_798);
+    stringBuffer.append(TEXT_805);
     stringBuffer.append(next.getDomainMetaClass().getName());
     stringBuffer.append(next.getVisualID());
-    stringBuffer.append(TEXT_799);
+    stringBuffer.append(TEXT_806);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.View"));
-    stringBuffer.append(TEXT_800);
+    stringBuffer.append(TEXT_807);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.lite.requests.CreateRequestEx"));
-    stringBuffer.append(TEXT_801);
+    stringBuffer.append(TEXT_808);
     if (!isListLayout) {
-    stringBuffer.append(TEXT_802);
+    stringBuffer.append(TEXT_809);
     stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.geometry.Rectangle"));
-    stringBuffer.append(TEXT_803);
+    stringBuffer.append(TEXT_810);
     }
-    stringBuffer.append(TEXT_804);
+    stringBuffer.append(TEXT_811);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.TransactionalEditingDomain"));
-    stringBuffer.append(TEXT_805);
+    stringBuffer.append(TEXT_812);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.util.TransactionUtil"));
-    stringBuffer.append(TEXT_806);
+    stringBuffer.append(TEXT_813);
     
 	if (next.getDomainMetaClass().isMapEntry()) {
 	/*Workaround for Ecore example: map entries cannot be created using factory, only using reflective EFactory.create() method*/
 
-    stringBuffer.append(TEXT_807);
+    stringBuffer.append(TEXT_814);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EObject"));
-    stringBuffer.append(TEXT_808);
+    stringBuffer.append(TEXT_815);
     stringBuffer.append(importManager.getImportedName(next.getDomainMetaClass().getGenPackage().getQualifiedFactoryInterfaceName()));
-    stringBuffer.append(TEXT_809);
+    stringBuffer.append(TEXT_816);
     stringBuffer.append(importManager.getImportedName(next.getDomainMetaClass().getGenPackage().getQualifiedPackageInterfaceName()));
-    stringBuffer.append(TEXT_810);
+    stringBuffer.append(TEXT_817);
     stringBuffer.append(next.getDomainMetaClass().getClassifierAccessorName());
-    stringBuffer.append(TEXT_811);
+    stringBuffer.append(TEXT_818);
     
 	} else {
 
-    stringBuffer.append(TEXT_812);
+    stringBuffer.append(TEXT_819);
     stringBuffer.append(importManager.getImportedName(next.getDomainMetaClass().getQualifiedInterfaceName()));
-    stringBuffer.append(TEXT_813);
+    stringBuffer.append(TEXT_820);
     stringBuffer.append(importManager.getImportedName(next.getDomainMetaClass().getGenPackage().getQualifiedFactoryInterfaceName()));
-    stringBuffer.append(TEXT_814);
+    stringBuffer.append(TEXT_821);
     stringBuffer.append(next.getDomainMetaClass().getClassifierAccessorName());
-    stringBuffer.append(TEXT_815);
+    stringBuffer.append(TEXT_822);
     
 	}
 
-    stringBuffer.append(TEXT_816);
+    stringBuffer.append(TEXT_823);
     /*XXX: Class name DomainElementInitializer should be user-customizable*/
-    stringBuffer.append(TEXT_817);
+    stringBuffer.append(TEXT_824);
     stringBuffer.append(importManager.getImportedName(genDiagram.getNotationViewFactoriesPackageName() + ".DomainElementInitializer"));
-    stringBuffer.append(TEXT_818);
+    stringBuffer.append(TEXT_825);
     stringBuffer.append(next.getUniqueIdentifier());
-    stringBuffer.append(TEXT_819);
+    stringBuffer.append(TEXT_826);
     if (next.getDomainMetaClass().isExternalInterface()) {
-    stringBuffer.append(TEXT_820);
+    stringBuffer.append(TEXT_827);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EObject"));
-    stringBuffer.append(TEXT_821);
+    stringBuffer.append(TEXT_828);
     }
-    stringBuffer.append(TEXT_822);
+    stringBuffer.append(TEXT_829);
     
 	TypeModelFacet facet = next.getModelFacet();
 	GenFeature childFeature = facet.getChildMetaFeature();
 	GenFeature containmentFeature = facet.getContainmentMetaFeature();
 	if (childFeature != null && childFeature != containmentFeature && !childFeature.isDerived()) {
 
-    stringBuffer.append(TEXT_823);
+    stringBuffer.append(TEXT_830);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.command.CompoundCommand"));
-    stringBuffer.append(TEXT_824);
+    stringBuffer.append(TEXT_831);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.command.CompoundCommand"));
-    stringBuffer.append(TEXT_825);
+    stringBuffer.append(TEXT_832);
     stringBuffer.append(importManager.getImportedName(containmentFeature.getEcoreFeature().isMany() ? "org.eclipse.emf.edit.command.AddCommand" : "org.eclipse.emf.edit.command.SetCommand"));
-    stringBuffer.append(TEXT_826);
+    stringBuffer.append(TEXT_833);
     stringBuffer.append(resolvedSemanticElement);
-    stringBuffer.append(TEXT_827);
+    stringBuffer.append(TEXT_834);
     stringBuffer.append(importManager.getImportedName(containmentFeature.getGenPackage().getQualifiedPackageInterfaceName()));
-    stringBuffer.append(TEXT_828);
+    stringBuffer.append(TEXT_835);
     stringBuffer.append(containmentFeature.getFeatureAccessorName());
-    stringBuffer.append(TEXT_829);
+    stringBuffer.append(TEXT_836);
     stringBuffer.append(importManager.getImportedName(childFeature.getEcoreFeature().isMany() ? "org.eclipse.emf.edit.command.AddCommand" : "org.eclipse.emf.edit.command.SetCommand"));
-    stringBuffer.append(TEXT_830);
+    stringBuffer.append(TEXT_837);
     stringBuffer.append(resolvedSemanticElement);
-    stringBuffer.append(TEXT_831);
+    stringBuffer.append(TEXT_838);
     stringBuffer.append(importManager.getImportedName(childFeature.getGenPackage().getQualifiedPackageInterfaceName()));
-    stringBuffer.append(TEXT_832);
+    stringBuffer.append(TEXT_839);
     stringBuffer.append(childFeature.getFeatureAccessorName());
-    stringBuffer.append(TEXT_833);
+    stringBuffer.append(TEXT_840);
     
 	} else {
 
-    stringBuffer.append(TEXT_834);
+    stringBuffer.append(TEXT_841);
     stringBuffer.append(importManager.getImportedName(containmentFeature.getEcoreFeature().isMany() ? "org.eclipse.emf.edit.command.AddCommand" : "org.eclipse.emf.edit.command.SetCommand"));
-    stringBuffer.append(TEXT_835);
+    stringBuffer.append(TEXT_842);
     stringBuffer.append(resolvedSemanticElement);
-    stringBuffer.append(TEXT_836);
+    stringBuffer.append(TEXT_843);
     stringBuffer.append(importManager.getImportedName(containmentFeature.getGenPackage().getQualifiedPackageInterfaceName()));
-    stringBuffer.append(TEXT_837);
+    stringBuffer.append(TEXT_844);
     stringBuffer.append(containmentFeature.getFeatureAccessorName());
-    stringBuffer.append(TEXT_838);
+    stringBuffer.append(TEXT_845);
     
 	}
 
-    stringBuffer.append(TEXT_839);
+    stringBuffer.append(TEXT_846);
     stringBuffer.append(next.getDomainMetaClass().getName());
     stringBuffer.append(next.getVisualID());
-    stringBuffer.append(TEXT_840);
+    stringBuffer.append(TEXT_847);
     if (next.getDomainMetaClass().isExternalInterface()) {
-    stringBuffer.append(TEXT_841);
+    stringBuffer.append(TEXT_848);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EObject"));
-    stringBuffer.append(TEXT_842);
+    stringBuffer.append(TEXT_849);
     }
-    stringBuffer.append(TEXT_843);
+    stringBuffer.append(TEXT_850);
     if(!isListLayout) {
-    stringBuffer.append(TEXT_844);
+    stringBuffer.append(TEXT_851);
     }
-    stringBuffer.append(TEXT_845);
+    stringBuffer.append(TEXT_852);
     
 }
 
@@ -4049,79 +4242,79 @@
 	}
 	GenLinkConstraints linkConstraints = genLink.getCreationConstraints();
 
-    stringBuffer.append(TEXT_846);
+    stringBuffer.append(TEXT_853);
     stringBuffer.append(reconnectCommandNameInfix);
     stringBuffer.append(genLink.getVisualID());
-    stringBuffer.append(TEXT_847);
+    stringBuffer.append(TEXT_854);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.command.AbstractCommand"));
-    stringBuffer.append(TEXT_848);
+    stringBuffer.append(TEXT_855);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.Edge"));
-    stringBuffer.append(TEXT_849);
+    stringBuffer.append(TEXT_856);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.View"));
-    stringBuffer.append(TEXT_850);
+    stringBuffer.append(TEXT_857);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.View"));
-    stringBuffer.append(TEXT_851);
+    stringBuffer.append(TEXT_858);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.command.Command"));
-    stringBuffer.append(TEXT_852);
+    stringBuffer.append(TEXT_859);
     stringBuffer.append(reconnectCommandNameInfix);
     stringBuffer.append(genLink.getVisualID());
-    stringBuffer.append(TEXT_853);
+    stringBuffer.append(TEXT_860);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gef.requests.ReconnectRequest"));
-    stringBuffer.append(TEXT_854);
+    stringBuffer.append(TEXT_861);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.Edge"));
-    stringBuffer.append(TEXT_855);
+    stringBuffer.append(TEXT_862);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.View"));
-    stringBuffer.append(TEXT_856);
+    stringBuffer.append(TEXT_863);
     stringBuffer.append(reconnectCommandNameInfix);
     stringBuffer.append(genLink.getVisualID());
-    stringBuffer.append(TEXT_857);
+    stringBuffer.append(TEXT_864);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.Edge"));
-    stringBuffer.append(TEXT_858);
+    stringBuffer.append(TEXT_865);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.View"));
-    stringBuffer.append(TEXT_859);
+    stringBuffer.append(TEXT_866);
     
 	if (linkConstraints != null) {
 
-    stringBuffer.append(TEXT_860);
+    stringBuffer.append(TEXT_867);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.TransactionalEditingDomain"));
-    stringBuffer.append(TEXT_861);
+    stringBuffer.append(TEXT_868);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.util.TransactionUtil"));
-    stringBuffer.append(TEXT_862);
+    stringBuffer.append(TEXT_869);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.command.Command"));
-    stringBuffer.append(TEXT_863);
+    stringBuffer.append(TEXT_870);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.command.AbstractCommand"));
-    stringBuffer.append(TEXT_864);
+    stringBuffer.append(TEXT_871);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.command.Command"));
-    stringBuffer.append(TEXT_865);
+    stringBuffer.append(TEXT_872);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.lite.commands.WrappingCommand"));
-    stringBuffer.append(TEXT_866);
+    stringBuffer.append(TEXT_873);
     
 	} else {
 
-    stringBuffer.append(TEXT_867);
+    stringBuffer.append(TEXT_874);
     
 	}
 
-    stringBuffer.append(TEXT_868);
+    stringBuffer.append(TEXT_875);
     
 		if (genLink.getModelFacet() instanceof TypeLinkModelFacet) {
 			TypeLinkModelFacet modelFacet = (TypeLinkModelFacet) genLink.getModelFacet();
 			GenFeature containmentFeature = modelFacet.getContainmentMetaFeature();
 			if (containmentFeature == null) {
 
-    stringBuffer.append(TEXT_869);
+    stringBuffer.append(TEXT_876);
     
 			} else {
 
-    stringBuffer.append(TEXT_870);
+    stringBuffer.append(TEXT_877);
     stringBuffer.append(importManager.getImportedName(containmentFeature.getGenClass().getQualifiedInterfaceName()));
-    stringBuffer.append(TEXT_871);
+    stringBuffer.append(TEXT_878);
     stringBuffer.append(importManager.getImportedName(containmentFeature.getGenClass().getQualifiedInterfaceName()));
-    stringBuffer.append(TEXT_872);
+    stringBuffer.append(TEXT_879);
     stringBuffer.append(importManager.getImportedName(containmentFeature.getGenClass().getGenPackage().getQualifiedPackageInterfaceName()));
-    stringBuffer.append(TEXT_873);
+    stringBuffer.append(TEXT_880);
     stringBuffer.append(containmentFeature.getGenClass().getClassifierAccessorName());
-    stringBuffer.append(TEXT_874);
+    stringBuffer.append(TEXT_881);
     
 				{
 					GenFeature _feature = containmentFeature;
@@ -4129,29 +4322,29 @@
 					String _exceedsUpperBound = "return false;";
 					GenClass _ownerGenClass = containmentFeature.getGenClass();
 
-    stringBuffer.append(TEXT_875);
+    stringBuffer.append(TEXT_882);
     
 int upperBound = _feature.getEcoreFeature().getUpperBound();
 if (upperBound > 0) {
 	if (upperBound == 1) {
 
-    stringBuffer.append(TEXT_876);
+    stringBuffer.append(TEXT_883);
     myFeatureGetAccessorHelper.appendFeatureValueGetter(_ownerInstance, _feature, _ownerGenClass, false);
-    stringBuffer.append(TEXT_877);
+    stringBuffer.append(TEXT_884);
     stringBuffer.append(_exceedsUpperBound);
-    stringBuffer.append(TEXT_878);
+    stringBuffer.append(TEXT_885);
     
 	} else {
 
-    stringBuffer.append(TEXT_879);
+    stringBuffer.append(TEXT_886);
     myFeatureGetAccessorHelper.appendFeatureValueGetter(_ownerInstance, _feature, _ownerGenClass, true);
-    stringBuffer.append(TEXT_880);
+    stringBuffer.append(TEXT_887);
     stringBuffer.append(importManager.getImportedName(_feature.getGenPackage().getQualifiedPackageInterfaceName()));
-    stringBuffer.append(TEXT_881);
+    stringBuffer.append(TEXT_888);
     stringBuffer.append(_feature.getFeatureAccessorName());
-    stringBuffer.append(TEXT_882);
+    stringBuffer.append(TEXT_889);
     stringBuffer.append(_exceedsUpperBound);
-    stringBuffer.append(TEXT_883);
+    stringBuffer.append(TEXT_890);
     
 	}
 }
@@ -4166,29 +4359,29 @@
 						String _exceedsUpperBound = "return false;";
 						GenClass _ownerGenClass = containmentFeature.getGenClass();
 
-    stringBuffer.append(TEXT_884);
+    stringBuffer.append(TEXT_891);
     
 int upperBound = _feature.getEcoreFeature().getUpperBound();
 if (upperBound > 0) {
 	if (upperBound == 1) {
 
-    stringBuffer.append(TEXT_885);
+    stringBuffer.append(TEXT_892);
     myFeatureGetAccessorHelper.appendFeatureValueGetter(_ownerInstance, _feature, _ownerGenClass, false);
-    stringBuffer.append(TEXT_886);
+    stringBuffer.append(TEXT_893);
     stringBuffer.append(_exceedsUpperBound);
-    stringBuffer.append(TEXT_887);
+    stringBuffer.append(TEXT_894);
     
 	} else {
 
-    stringBuffer.append(TEXT_888);
+    stringBuffer.append(TEXT_895);
     myFeatureGetAccessorHelper.appendFeatureValueGetter(_ownerInstance, _feature, _ownerGenClass, true);
-    stringBuffer.append(TEXT_889);
+    stringBuffer.append(TEXT_896);
     stringBuffer.append(importManager.getImportedName(_feature.getGenPackage().getQualifiedPackageInterfaceName()));
-    stringBuffer.append(TEXT_890);
+    stringBuffer.append(TEXT_897);
     stringBuffer.append(_feature.getFeatureAccessorName());
-    stringBuffer.append(TEXT_891);
+    stringBuffer.append(TEXT_898);
     stringBuffer.append(_exceedsUpperBound);
-    stringBuffer.append(TEXT_892);
+    stringBuffer.append(TEXT_899);
     
 	}
 }
@@ -4202,24 +4395,24 @@
 	String _source = "newSource.getElement()";
 	String _target = "edge.getTarget().getElement()";
 
-    stringBuffer.append(TEXT_893);
+    stringBuffer.append(TEXT_900);
     
 			if (linkConstraints != null) {
 
-    stringBuffer.append(TEXT_894);
+    stringBuffer.append(TEXT_901);
     stringBuffer.append(importManager.getImportedName(genDiagram.getNotationViewFactoriesPackageName() + ".DomainElementInitializer")+"."+genDiagram.getLinkCreationConstraintsClassName()+"."+linkConstraints.getConstraintsInstanceFieldName());
-    stringBuffer.append(TEXT_895);
+    stringBuffer.append(TEXT_902);
     stringBuffer.append(_source);
-    stringBuffer.append(TEXT_896);
+    stringBuffer.append(TEXT_903);
     stringBuffer.append(_target);
-    stringBuffer.append(TEXT_897);
+    stringBuffer.append(TEXT_904);
     
 			}
 
     
 }	//local declarations for linkConstraints.jetinc
 
-    stringBuffer.append(TEXT_898);
+    stringBuffer.append(TEXT_905);
     
 		} else if (genLink.getModelFacet() instanceof FeatureModelFacet) {
 			GenFeature metaFeature = ((FeatureModelFacet) genLink.getModelFacet()).getMetaFeature();
@@ -4229,29 +4422,29 @@
 				String _exceedsUpperBound = "return false;";
 				GenClass _ownerGenClass = null;
 
-    stringBuffer.append(TEXT_899);
+    stringBuffer.append(TEXT_906);
     
 int upperBound = _feature.getEcoreFeature().getUpperBound();
 if (upperBound > 0) {
 	if (upperBound == 1) {
 
-    stringBuffer.append(TEXT_900);
+    stringBuffer.append(TEXT_907);
     myFeatureGetAccessorHelper.appendFeatureValueGetter(_ownerInstance, _feature, _ownerGenClass, false);
-    stringBuffer.append(TEXT_901);
+    stringBuffer.append(TEXT_908);
     stringBuffer.append(_exceedsUpperBound);
-    stringBuffer.append(TEXT_902);
+    stringBuffer.append(TEXT_909);
     
 	} else {
 
-    stringBuffer.append(TEXT_903);
+    stringBuffer.append(TEXT_910);
     myFeatureGetAccessorHelper.appendFeatureValueGetter(_ownerInstance, _feature, _ownerGenClass, true);
-    stringBuffer.append(TEXT_904);
+    stringBuffer.append(TEXT_911);
     stringBuffer.append(importManager.getImportedName(_feature.getGenPackage().getQualifiedPackageInterfaceName()));
-    stringBuffer.append(TEXT_905);
+    stringBuffer.append(TEXT_912);
     stringBuffer.append(_feature.getFeatureAccessorName());
-    stringBuffer.append(TEXT_906);
+    stringBuffer.append(TEXT_913);
     stringBuffer.append(_exceedsUpperBound);
-    stringBuffer.append(TEXT_907);
+    stringBuffer.append(TEXT_914);
     
 	}
 }
@@ -4262,44 +4455,44 @@
 	String _source = "newSource.getElement()";
 	String _target = "edge.getTarget().getElement()";
 
-    stringBuffer.append(TEXT_908);
+    stringBuffer.append(TEXT_915);
     
 			if (linkConstraints != null) {
 
-    stringBuffer.append(TEXT_909);
+    stringBuffer.append(TEXT_916);
     stringBuffer.append(importManager.getImportedName(genDiagram.getNotationViewFactoriesPackageName() + ".DomainElementInitializer")+"."+genDiagram.getLinkCreationConstraintsClassName()+"."+linkConstraints.getConstraintsInstanceFieldName());
-    stringBuffer.append(TEXT_910);
+    stringBuffer.append(TEXT_917);
     stringBuffer.append(_source);
-    stringBuffer.append(TEXT_911);
+    stringBuffer.append(TEXT_918);
     stringBuffer.append(_target);
-    stringBuffer.append(TEXT_912);
+    stringBuffer.append(TEXT_919);
     
 			}
 
     
 }	//local declarations for linkConstraints.jetinc
 
-    stringBuffer.append(TEXT_913);
+    stringBuffer.append(TEXT_920);
     
 		} else {
 
-    stringBuffer.append(TEXT_914);
+    stringBuffer.append(TEXT_921);
     
 		}
 
-    stringBuffer.append(TEXT_915);
+    stringBuffer.append(TEXT_922);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.command.Command"));
-    stringBuffer.append(TEXT_916);
+    stringBuffer.append(TEXT_923);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.TransactionalEditingDomain"));
-    stringBuffer.append(TEXT_917);
+    stringBuffer.append(TEXT_924);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.util.TransactionUtil"));
-    stringBuffer.append(TEXT_918);
+    stringBuffer.append(TEXT_925);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.command.CompoundCommand"));
-    stringBuffer.append(TEXT_919);
+    stringBuffer.append(TEXT_926);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.command.CompoundCommand"));
-    stringBuffer.append(TEXT_920);
+    stringBuffer.append(TEXT_927);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.lite.commands.ReconnectNotationalEdgeSourceCommand"));
-    stringBuffer.append(TEXT_921);
+    stringBuffer.append(TEXT_928);
     
 		if (genLink.getModelFacet() instanceof TypeLinkModelFacet) {
 			TypeLinkModelFacet modelFacet = (TypeLinkModelFacet) genLink.getModelFacet();
@@ -4318,110 +4511,110 @@
 			}
 			if (containmentFeature != null || setChild) {
 
-    stringBuffer.append(TEXT_922);
+    stringBuffer.append(TEXT_929);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EObject"));
-    stringBuffer.append(TEXT_923);
+    stringBuffer.append(TEXT_930);
     stringBuffer.append(importManager.getImportedName(containmentFeature.getGenClass().getGenPackage().getQualifiedPackageInterfaceName()));
-    stringBuffer.append(TEXT_924);
+    stringBuffer.append(TEXT_931);
     stringBuffer.append(containmentFeature.getGenClass().getClassifierAccessorName());
-    stringBuffer.append(TEXT_925);
+    stringBuffer.append(TEXT_932);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.command.UnexecutableCommand"));
-    stringBuffer.append(TEXT_926);
+    stringBuffer.append(TEXT_933);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EObject"));
-    stringBuffer.append(TEXT_927);
+    stringBuffer.append(TEXT_934);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.command.UnexecutableCommand"));
-    stringBuffer.append(TEXT_928);
+    stringBuffer.append(TEXT_935);
     
 			}
 			if (containmentFeature != null) {
 				if (containmentFeature.getEcoreFeature().isMany()) {
 
-    stringBuffer.append(TEXT_929);
+    stringBuffer.append(TEXT_936);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.edit.command.RemoveCommand"));
-    stringBuffer.append(TEXT_930);
+    stringBuffer.append(TEXT_937);
     
 				} else {
 
-    stringBuffer.append(TEXT_931);
+    stringBuffer.append(TEXT_938);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.edit.command.SetCommand"));
-    stringBuffer.append(TEXT_932);
+    stringBuffer.append(TEXT_939);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.edit.command.SetCommand"));
-    stringBuffer.append(TEXT_933);
+    stringBuffer.append(TEXT_940);
     
 				}
 
-    stringBuffer.append(TEXT_934);
+    stringBuffer.append(TEXT_941);
     stringBuffer.append(importManager.getImportedName(containmentFeature.getEcoreFeature().isMany() ? "org.eclipse.emf.edit.command.AddCommand" : "org.eclipse.emf.edit.command.SetCommand"));
-    stringBuffer.append(TEXT_935);
+    stringBuffer.append(TEXT_942);
     stringBuffer.append(importManager.getImportedName(containmentFeature.getGenPackage().getQualifiedPackageInterfaceName()));
-    stringBuffer.append(TEXT_936);
+    stringBuffer.append(TEXT_943);
     stringBuffer.append(containmentFeature.getFeatureAccessorName());
-    stringBuffer.append(TEXT_937);
+    stringBuffer.append(TEXT_944);
     
 			}
 			if (setChild) {
 				if (childFeature.getEcoreFeature().isMany()) {
 
-    stringBuffer.append(TEXT_938);
+    stringBuffer.append(TEXT_945);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.edit.command.RemoveCommand"));
-    stringBuffer.append(TEXT_939);
+    stringBuffer.append(TEXT_946);
     stringBuffer.append(importManager.getImportedName(childFeature.getGenPackage().getQualifiedPackageInterfaceName()));
-    stringBuffer.append(TEXT_940);
+    stringBuffer.append(TEXT_947);
     stringBuffer.append(childFeature.getFeatureAccessorName());
-    stringBuffer.append(TEXT_941);
+    stringBuffer.append(TEXT_948);
     
 				} else {
 
-    stringBuffer.append(TEXT_942);
+    stringBuffer.append(TEXT_949);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.edit.command.SetCommand"));
-    stringBuffer.append(TEXT_943);
+    stringBuffer.append(TEXT_950);
     stringBuffer.append(importManager.getImportedName(childFeature.getGenPackage().getQualifiedPackageInterfaceName()));
-    stringBuffer.append(TEXT_944);
+    stringBuffer.append(TEXT_951);
     stringBuffer.append(childFeature.getFeatureAccessorName());
-    stringBuffer.append(TEXT_945);
+    stringBuffer.append(TEXT_952);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.edit.command.SetCommand"));
-    stringBuffer.append(TEXT_946);
+    stringBuffer.append(TEXT_953);
     
 				}
 
-    stringBuffer.append(TEXT_947);
+    stringBuffer.append(TEXT_954);
     stringBuffer.append(importManager.getImportedName(childFeature.getEcoreFeature().isMany() ? "org.eclipse.emf.edit.command.AddCommand" : "org.eclipse.emf.edit.command.SetCommand"));
-    stringBuffer.append(TEXT_948);
+    stringBuffer.append(TEXT_955);
     stringBuffer.append(importManager.getImportedName(childFeature.getGenPackage().getQualifiedPackageInterfaceName()));
-    stringBuffer.append(TEXT_949);
+    stringBuffer.append(TEXT_956);
     stringBuffer.append(childFeature.getFeatureAccessorName());
-    stringBuffer.append(TEXT_950);
+    stringBuffer.append(TEXT_957);
     
 			}
 
-    stringBuffer.append(TEXT_951);
+    stringBuffer.append(TEXT_958);
     
 			if (setSource) {
 				if (sourceFeature.getEcoreFeature().isMany()) {
 
-    stringBuffer.append(TEXT_952);
+    stringBuffer.append(TEXT_959);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.edit.command.RemoveCommand"));
-    stringBuffer.append(TEXT_953);
+    stringBuffer.append(TEXT_960);
     stringBuffer.append(importManager.getImportedName(sourceFeature.getGenPackage().getQualifiedPackageInterfaceName()));
-    stringBuffer.append(TEXT_954);
+    stringBuffer.append(TEXT_961);
     stringBuffer.append(sourceFeature.getFeatureAccessorName());
-    stringBuffer.append(TEXT_955);
+    stringBuffer.append(TEXT_962);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.edit.command.AddCommand"));
-    stringBuffer.append(TEXT_956);
+    stringBuffer.append(TEXT_963);
     stringBuffer.append(importManager.getImportedName(sourceFeature.getGenPackage().getQualifiedPackageInterfaceName()));
-    stringBuffer.append(TEXT_957);
+    stringBuffer.append(TEXT_964);
     stringBuffer.append(sourceFeature.getFeatureAccessorName());
-    stringBuffer.append(TEXT_958);
+    stringBuffer.append(TEXT_965);
     
 				} else {
 
-    stringBuffer.append(TEXT_959);
+    stringBuffer.append(TEXT_966);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.edit.command.SetCommand"));
-    stringBuffer.append(TEXT_960);
+    stringBuffer.append(TEXT_967);
     stringBuffer.append(importManager.getImportedName(sourceFeature.getGenPackage().getQualifiedPackageInterfaceName()));
-    stringBuffer.append(TEXT_961);
+    stringBuffer.append(TEXT_968);
     stringBuffer.append(sourceFeature.getFeatureAccessorName());
-    stringBuffer.append(TEXT_962);
+    stringBuffer.append(TEXT_969);
     
 				}
 			}
@@ -4429,53 +4622,53 @@
 			GenFeature metaFeature = ((FeatureModelFacet) genLink.getModelFacet()).getMetaFeature();
 			if (metaFeature.getEcoreFeature().isMany()) {
 
-    stringBuffer.append(TEXT_963);
+    stringBuffer.append(TEXT_970);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.edit.command.RemoveCommand"));
-    stringBuffer.append(TEXT_964);
+    stringBuffer.append(TEXT_971);
     stringBuffer.append(importManager.getImportedName(metaFeature.getGenPackage().getQualifiedPackageInterfaceName()));
-    stringBuffer.append(TEXT_965);
+    stringBuffer.append(TEXT_972);
     stringBuffer.append(metaFeature.getFeatureAccessorName());
-    stringBuffer.append(TEXT_966);
+    stringBuffer.append(TEXT_973);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.edit.command.AddCommand"));
-    stringBuffer.append(TEXT_967);
+    stringBuffer.append(TEXT_974);
     stringBuffer.append(importManager.getImportedName(metaFeature.getGenPackage().getQualifiedPackageInterfaceName()));
-    stringBuffer.append(TEXT_968);
+    stringBuffer.append(TEXT_975);
     stringBuffer.append(metaFeature.getFeatureAccessorName());
-    stringBuffer.append(TEXT_969);
+    stringBuffer.append(TEXT_976);
     
 			} else {
 
-    stringBuffer.append(TEXT_970);
+    stringBuffer.append(TEXT_977);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.edit.command.SetCommand"));
-    stringBuffer.append(TEXT_971);
+    stringBuffer.append(TEXT_978);
     stringBuffer.append(importManager.getImportedName(metaFeature.getGenPackage().getQualifiedPackageInterfaceName()));
-    stringBuffer.append(TEXT_972);
+    stringBuffer.append(TEXT_979);
     stringBuffer.append(metaFeature.getFeatureAccessorName());
-    stringBuffer.append(TEXT_973);
+    stringBuffer.append(TEXT_980);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.edit.command.SetCommand"));
-    stringBuffer.append(TEXT_974);
+    stringBuffer.append(TEXT_981);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.edit.command.SetCommand"));
-    stringBuffer.append(TEXT_975);
+    stringBuffer.append(TEXT_982);
     stringBuffer.append(importManager.getImportedName(metaFeature.getGenPackage().getQualifiedPackageInterfaceName()));
-    stringBuffer.append(TEXT_976);
+    stringBuffer.append(TEXT_983);
     stringBuffer.append(metaFeature.getFeatureAccessorName());
-    stringBuffer.append(TEXT_977);
+    stringBuffer.append(TEXT_984);
     
 			}
 		}
 
-    stringBuffer.append(TEXT_978);
-    stringBuffer.append(TEXT_979);
+    stringBuffer.append(TEXT_985);
+    stringBuffer.append(TEXT_986);
     
 		if (genLink.getModelFacet() instanceof TypeLinkModelFacet) {
 
-    stringBuffer.append(TEXT_980);
+    stringBuffer.append(TEXT_987);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EObject"));
-    stringBuffer.append(TEXT_981);
+    stringBuffer.append(TEXT_988);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EObject"));
-    stringBuffer.append(TEXT_982);
+    stringBuffer.append(TEXT_989);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EClass"));
-    stringBuffer.append(TEXT_983);
+    stringBuffer.append(TEXT_990);
     
 		}
 
@@ -4483,16 +4676,16 @@
 	if (linkConstraints != null) {
 		String _edge = "edge";
 
-    stringBuffer.append(TEXT_984);
-    stringBuffer.append(TEXT_985);
+    stringBuffer.append(TEXT_991);
+    stringBuffer.append(TEXT_992);
     
 	//input: _edge : String
 
-    stringBuffer.append(TEXT_986);
+    stringBuffer.append(TEXT_993);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.command.Command"));
-    stringBuffer.append(TEXT_987);
+    stringBuffer.append(TEXT_994);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.TransactionalEditingDomain"));
-    stringBuffer.append(TEXT_988);
+    stringBuffer.append(TEXT_995);
     
 	if (genLink.getModelFacet() instanceof TypeLinkModelFacet) {
 		TypeLinkModelFacet modelFacet = (TypeLinkModelFacet) genLink.getModelFacet();
@@ -4519,217 +4712,217 @@
 				}
 			}
 
-    stringBuffer.append(TEXT_989);
+    stringBuffer.append(TEXT_996);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.command.CompoundCommand"));
-    stringBuffer.append(TEXT_990);
+    stringBuffer.append(TEXT_997);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.command.CompoundCommand"));
-    stringBuffer.append(TEXT_991);
+    stringBuffer.append(TEXT_998);
     
 			if (containmentFeature.getEcoreFeature().isMany()) {
 
-    stringBuffer.append(TEXT_992);
+    stringBuffer.append(TEXT_999);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.edit.command.RemoveCommand"));
-    stringBuffer.append(TEXT_993);
+    stringBuffer.append(TEXT_1000);
     stringBuffer.append(_edge);
-    stringBuffer.append(TEXT_994);
+    stringBuffer.append(TEXT_1001);
     stringBuffer.append(_edge);
-    stringBuffer.append(TEXT_995);
+    stringBuffer.append(TEXT_1002);
     stringBuffer.append(_edge);
-    stringBuffer.append(TEXT_996);
+    stringBuffer.append(TEXT_1003);
     
 			} else {
 
-    stringBuffer.append(TEXT_997);
+    stringBuffer.append(TEXT_1004);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.edit.command.SetCommand"));
-    stringBuffer.append(TEXT_998);
+    stringBuffer.append(TEXT_1005);
     stringBuffer.append(_edge);
-    stringBuffer.append(TEXT_999);
+    stringBuffer.append(TEXT_1006);
     stringBuffer.append(_edge);
-    stringBuffer.append(TEXT_1000);
+    stringBuffer.append(TEXT_1007);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.edit.command.SetCommand"));
-    stringBuffer.append(TEXT_1001);
+    stringBuffer.append(TEXT_1008);
     
 			}
 		} else {
 
-    stringBuffer.append(TEXT_1002);
+    stringBuffer.append(TEXT_1009);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.command.UnexecutableCommand"));
-    stringBuffer.append(TEXT_1003);
+    stringBuffer.append(TEXT_1010);
     
 		}
 		if (removeChild) {
 			if (childFeature.getEcoreFeature().isMany()) {
 
-    stringBuffer.append(TEXT_1004);
+    stringBuffer.append(TEXT_1011);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.edit.command.RemoveCommand"));
-    stringBuffer.append(TEXT_1005);
+    stringBuffer.append(TEXT_1012);
     stringBuffer.append(_edge);
-    stringBuffer.append(TEXT_1006);
+    stringBuffer.append(TEXT_1013);
     stringBuffer.append(importManager.getImportedName(childFeature.getGenPackage().getQualifiedPackageInterfaceName()));
-    stringBuffer.append(TEXT_1007);
+    stringBuffer.append(TEXT_1014);
     stringBuffer.append(childFeature.getFeatureAccessorName());
-    stringBuffer.append(TEXT_1008);
+    stringBuffer.append(TEXT_1015);
     stringBuffer.append(_edge);
-    stringBuffer.append(TEXT_1009);
+    stringBuffer.append(TEXT_1016);
     
 			} else {
 
-    stringBuffer.append(TEXT_1010);
+    stringBuffer.append(TEXT_1017);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.edit.command.SetCommand"));
-    stringBuffer.append(TEXT_1011);
+    stringBuffer.append(TEXT_1018);
     stringBuffer.append(_edge);
-    stringBuffer.append(TEXT_1012);
+    stringBuffer.append(TEXT_1019);
     stringBuffer.append(importManager.getImportedName(childFeature.getGenPackage().getQualifiedPackageInterfaceName()));
-    stringBuffer.append(TEXT_1013);
+    stringBuffer.append(TEXT_1020);
     stringBuffer.append(childFeature.getFeatureAccessorName());
-    stringBuffer.append(TEXT_1014);
+    stringBuffer.append(TEXT_1021);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.edit.command.SetCommand"));
-    stringBuffer.append(TEXT_1015);
+    stringBuffer.append(TEXT_1022);
     
 			}
 		}
 		if (removeSource) {
 			if (sourceFeature.getEcoreFeature().isMany()) {
 
-    stringBuffer.append(TEXT_1016);
+    stringBuffer.append(TEXT_1023);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.edit.command.RemoveCommand"));
-    stringBuffer.append(TEXT_1017);
+    stringBuffer.append(TEXT_1024);
     stringBuffer.append(_edge);
-    stringBuffer.append(TEXT_1018);
+    stringBuffer.append(TEXT_1025);
     stringBuffer.append(importManager.getImportedName(sourceFeature.getGenPackage().getQualifiedPackageInterfaceName()));
-    stringBuffer.append(TEXT_1019);
+    stringBuffer.append(TEXT_1026);
     stringBuffer.append(sourceFeature.getFeatureAccessorName());
-    stringBuffer.append(TEXT_1020);
+    stringBuffer.append(TEXT_1027);
     stringBuffer.append(_edge);
-    stringBuffer.append(TEXT_1021);
+    stringBuffer.append(TEXT_1028);
     
 			} else {
 
-    stringBuffer.append(TEXT_1022);
+    stringBuffer.append(TEXT_1029);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.edit.command.SetCommand"));
-    stringBuffer.append(TEXT_1023);
+    stringBuffer.append(TEXT_1030);
     stringBuffer.append(_edge);
-    stringBuffer.append(TEXT_1024);
+    stringBuffer.append(TEXT_1031);
     stringBuffer.append(importManager.getImportedName(sourceFeature.getGenPackage().getQualifiedPackageInterfaceName()));
-    stringBuffer.append(TEXT_1025);
+    stringBuffer.append(TEXT_1032);
     stringBuffer.append(sourceFeature.getFeatureAccessorName());
-    stringBuffer.append(TEXT_1026);
+    stringBuffer.append(TEXT_1033);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.edit.command.SetCommand"));
-    stringBuffer.append(TEXT_1027);
+    stringBuffer.append(TEXT_1034);
     
 			}
 		}
 		if (removeTarget) {
 			if (targetFeature.getEcoreFeature().isMany()) {
 
-    stringBuffer.append(TEXT_1028);
+    stringBuffer.append(TEXT_1035);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.edit.command.RemoveCommand"));
-    stringBuffer.append(TEXT_1029);
+    stringBuffer.append(TEXT_1036);
     stringBuffer.append(_edge);
-    stringBuffer.append(TEXT_1030);
+    stringBuffer.append(TEXT_1037);
     stringBuffer.append(importManager.getImportedName(targetFeature.getGenPackage().getQualifiedPackageInterfaceName()));
-    stringBuffer.append(TEXT_1031);
+    stringBuffer.append(TEXT_1038);
     stringBuffer.append(targetFeature.getFeatureAccessorName());
-    stringBuffer.append(TEXT_1032);
+    stringBuffer.append(TEXT_1039);
     stringBuffer.append(_edge);
-    stringBuffer.append(TEXT_1033);
+    stringBuffer.append(TEXT_1040);
     
 			} else {
 
-    stringBuffer.append(TEXT_1034);
+    stringBuffer.append(TEXT_1041);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.edit.command.SetCommand"));
-    stringBuffer.append(TEXT_1035);
+    stringBuffer.append(TEXT_1042);
     stringBuffer.append(_edge);
-    stringBuffer.append(TEXT_1036);
+    stringBuffer.append(TEXT_1043);
     stringBuffer.append(importManager.getImportedName(targetFeature.getGenPackage().getQualifiedPackageInterfaceName()));
-    stringBuffer.append(TEXT_1037);
+    stringBuffer.append(TEXT_1044);
     stringBuffer.append(targetFeature.getFeatureAccessorName());
-    stringBuffer.append(TEXT_1038);
+    stringBuffer.append(TEXT_1045);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.edit.command.SetCommand"));
-    stringBuffer.append(TEXT_1039);
+    stringBuffer.append(TEXT_1046);
     
 			}
 		}
 
-    stringBuffer.append(TEXT_1040);
+    stringBuffer.append(TEXT_1047);
     
 	} else if (genLink.getModelFacet() instanceof FeatureModelFacet) {
 		GenFeature metaFeature = ((FeatureModelFacet) genLink.getModelFacet()).getMetaFeature();
 		if (metaFeature.getEcoreFeature().isMany()) {
 
-    stringBuffer.append(TEXT_1041);
+    stringBuffer.append(TEXT_1048);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.edit.command.RemoveCommand"));
-    stringBuffer.append(TEXT_1042);
+    stringBuffer.append(TEXT_1049);
     stringBuffer.append(_edge);
-    stringBuffer.append(TEXT_1043);
+    stringBuffer.append(TEXT_1050);
     stringBuffer.append(importManager.getImportedName(metaFeature.getGenPackage().getQualifiedPackageInterfaceName()));
-    stringBuffer.append(TEXT_1044);
+    stringBuffer.append(TEXT_1051);
     stringBuffer.append(metaFeature.getFeatureAccessorName());
-    stringBuffer.append(TEXT_1045);
+    stringBuffer.append(TEXT_1052);
     stringBuffer.append(_edge);
-    stringBuffer.append(TEXT_1046);
+    stringBuffer.append(TEXT_1053);
     
 		} else {
 
-    stringBuffer.append(TEXT_1047);
+    stringBuffer.append(TEXT_1054);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.edit.command.SetCommand"));
-    stringBuffer.append(TEXT_1048);
+    stringBuffer.append(TEXT_1055);
     stringBuffer.append(_edge);
-    stringBuffer.append(TEXT_1049);
+    stringBuffer.append(TEXT_1056);
     stringBuffer.append(importManager.getImportedName(metaFeature.getGenPackage().getQualifiedPackageInterfaceName()));
-    stringBuffer.append(TEXT_1050);
+    stringBuffer.append(TEXT_1057);
     stringBuffer.append(metaFeature.getFeatureAccessorName());
-    stringBuffer.append(TEXT_1051);
+    stringBuffer.append(TEXT_1058);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.edit.command.SetCommand"));
-    stringBuffer.append(TEXT_1052);
+    stringBuffer.append(TEXT_1059);
     
 		}
 
     
 	}
 
-    stringBuffer.append(TEXT_1053);
+    stringBuffer.append(TEXT_1060);
     
 	}
 
-    stringBuffer.append(TEXT_1054);
+    stringBuffer.append(TEXT_1061);
     
 	if (palette != null) {
 
-    stringBuffer.append(TEXT_1055);
+    stringBuffer.append(TEXT_1062);
     stringBuffer.append(createCommandNameInfix);
     stringBuffer.append(genLink.getVisualID());
-    stringBuffer.append(TEXT_1056);
+    stringBuffer.append(TEXT_1063);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.command.AbstractCommand"));
-    stringBuffer.append(TEXT_1057);
+    stringBuffer.append(TEXT_1064);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.View"));
-    stringBuffer.append(TEXT_1058);
+    stringBuffer.append(TEXT_1065);
     stringBuffer.append(createCommandNameInfix);
     stringBuffer.append(genLink.getVisualID());
-    stringBuffer.append(TEXT_1059);
+    stringBuffer.append(TEXT_1066);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.lite.requests.CreateConnectionRequestEx"));
-    stringBuffer.append(TEXT_1060);
+    stringBuffer.append(TEXT_1067);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.View"));
-    stringBuffer.append(TEXT_1061);
+    stringBuffer.append(TEXT_1068);
     
 		if (genLink.getModelFacet() instanceof TypeLinkModelFacet) {
 			TypeLinkModelFacet modelFacet = (TypeLinkModelFacet) genLink.getModelFacet();
 			GenFeature containmentFeature = modelFacet.getContainmentMetaFeature();
 			if (containmentFeature == null) {
 
-    stringBuffer.append(TEXT_1062);
+    stringBuffer.append(TEXT_1069);
     
 			} else {
 
-    stringBuffer.append(TEXT_1063);
+    stringBuffer.append(TEXT_1070);
     stringBuffer.append(importManager.getImportedName(containmentFeature.getGenClass().getQualifiedInterfaceName()));
-    stringBuffer.append(TEXT_1064);
+    stringBuffer.append(TEXT_1071);
     stringBuffer.append(importManager.getImportedName(containmentFeature.getGenClass().getQualifiedInterfaceName()));
-    stringBuffer.append(TEXT_1065);
+    stringBuffer.append(TEXT_1072);
     stringBuffer.append(importManager.getImportedName(containmentFeature.getGenClass().getGenPackage().getQualifiedPackageInterfaceName()));
-    stringBuffer.append(TEXT_1066);
+    stringBuffer.append(TEXT_1073);
     stringBuffer.append(containmentFeature.getGenClass().getClassifierAccessorName());
-    stringBuffer.append(TEXT_1067);
+    stringBuffer.append(TEXT_1074);
     
 				{
 					GenFeature _feature = containmentFeature;
@@ -4737,29 +4930,29 @@
 					String _exceedsUpperBound = "return false;";
 					GenClass _ownerGenClass = containmentFeature.getGenClass();
 
-    stringBuffer.append(TEXT_1068);
+    stringBuffer.append(TEXT_1075);
     
 int upperBound = _feature.getEcoreFeature().getUpperBound();
 if (upperBound > 0) {
 	if (upperBound == 1) {
 
-    stringBuffer.append(TEXT_1069);
+    stringBuffer.append(TEXT_1076);
     myFeatureGetAccessorHelper.appendFeatureValueGetter(_ownerInstance, _feature, _ownerGenClass, false);
-    stringBuffer.append(TEXT_1070);
+    stringBuffer.append(TEXT_1077);
     stringBuffer.append(_exceedsUpperBound);
-    stringBuffer.append(TEXT_1071);
+    stringBuffer.append(TEXT_1078);
     
 	} else {
 
-    stringBuffer.append(TEXT_1072);
+    stringBuffer.append(TEXT_1079);
     myFeatureGetAccessorHelper.appendFeatureValueGetter(_ownerInstance, _feature, _ownerGenClass, true);
-    stringBuffer.append(TEXT_1073);
+    stringBuffer.append(TEXT_1080);
     stringBuffer.append(importManager.getImportedName(_feature.getGenPackage().getQualifiedPackageInterfaceName()));
-    stringBuffer.append(TEXT_1074);
+    stringBuffer.append(TEXT_1081);
     stringBuffer.append(_feature.getFeatureAccessorName());
-    stringBuffer.append(TEXT_1075);
+    stringBuffer.append(TEXT_1082);
     stringBuffer.append(_exceedsUpperBound);
-    stringBuffer.append(TEXT_1076);
+    stringBuffer.append(TEXT_1083);
     
 	}
 }
@@ -4774,29 +4967,29 @@
 						String _exceedsUpperBound = "return false;";
 						GenClass _ownerGenClass = containmentFeature.getGenClass();
 
-    stringBuffer.append(TEXT_1077);
+    stringBuffer.append(TEXT_1084);
     
 int upperBound = _feature.getEcoreFeature().getUpperBound();
 if (upperBound > 0) {
 	if (upperBound == 1) {
 
-    stringBuffer.append(TEXT_1078);
+    stringBuffer.append(TEXT_1085);
     myFeatureGetAccessorHelper.appendFeatureValueGetter(_ownerInstance, _feature, _ownerGenClass, false);
-    stringBuffer.append(TEXT_1079);
+    stringBuffer.append(TEXT_1086);
     stringBuffer.append(_exceedsUpperBound);
-    stringBuffer.append(TEXT_1080);
+    stringBuffer.append(TEXT_1087);
     
 	} else {
 
-    stringBuffer.append(TEXT_1081);
+    stringBuffer.append(TEXT_1088);
     myFeatureGetAccessorHelper.appendFeatureValueGetter(_ownerInstance, _feature, _ownerGenClass, true);
-    stringBuffer.append(TEXT_1082);
+    stringBuffer.append(TEXT_1089);
     stringBuffer.append(importManager.getImportedName(_feature.getGenPackage().getQualifiedPackageInterfaceName()));
-    stringBuffer.append(TEXT_1083);
+    stringBuffer.append(TEXT_1090);
     stringBuffer.append(_feature.getFeatureAccessorName());
-    stringBuffer.append(TEXT_1084);
+    stringBuffer.append(TEXT_1091);
     stringBuffer.append(_exceedsUpperBound);
-    stringBuffer.append(TEXT_1085);
+    stringBuffer.append(TEXT_1092);
     
 	}
 }
@@ -4808,24 +5001,24 @@
 	String _source = "source.getElement()";
 	String _target = "null";
 
-    stringBuffer.append(TEXT_1086);
+    stringBuffer.append(TEXT_1093);
     
 			if (linkConstraints != null) {
 
-    stringBuffer.append(TEXT_1087);
+    stringBuffer.append(TEXT_1094);
     stringBuffer.append(importManager.getImportedName(genDiagram.getNotationViewFactoriesPackageName() + ".DomainElementInitializer")+"."+genDiagram.getLinkCreationConstraintsClassName()+"."+linkConstraints.getConstraintsInstanceFieldName());
-    stringBuffer.append(TEXT_1088);
+    stringBuffer.append(TEXT_1095);
     stringBuffer.append(_source);
-    stringBuffer.append(TEXT_1089);
+    stringBuffer.append(TEXT_1096);
     stringBuffer.append(_target);
-    stringBuffer.append(TEXT_1090);
+    stringBuffer.append(TEXT_1097);
     
 			}
 
     
 }	//local declarations for linkConstraints.jetinc
 
-    stringBuffer.append(TEXT_1091);
+    stringBuffer.append(TEXT_1098);
     
 			}
 		} else if (genLink.getModelFacet() instanceof FeatureModelFacet) {
@@ -4836,29 +5029,29 @@
 			String _exceedsUpperBound = "return false;";
 			GenClass _ownerGenClass = null;
 
-    stringBuffer.append(TEXT_1092);
+    stringBuffer.append(TEXT_1099);
     
 int upperBound = _feature.getEcoreFeature().getUpperBound();
 if (upperBound > 0) {
 	if (upperBound == 1) {
 
-    stringBuffer.append(TEXT_1093);
+    stringBuffer.append(TEXT_1100);
     myFeatureGetAccessorHelper.appendFeatureValueGetter(_ownerInstance, _feature, _ownerGenClass, false);
-    stringBuffer.append(TEXT_1094);
+    stringBuffer.append(TEXT_1101);
     stringBuffer.append(_exceedsUpperBound);
-    stringBuffer.append(TEXT_1095);
+    stringBuffer.append(TEXT_1102);
     
 	} else {
 
-    stringBuffer.append(TEXT_1096);
+    stringBuffer.append(TEXT_1103);
     myFeatureGetAccessorHelper.appendFeatureValueGetter(_ownerInstance, _feature, _ownerGenClass, true);
-    stringBuffer.append(TEXT_1097);
+    stringBuffer.append(TEXT_1104);
     stringBuffer.append(importManager.getImportedName(_feature.getGenPackage().getQualifiedPackageInterfaceName()));
-    stringBuffer.append(TEXT_1098);
+    stringBuffer.append(TEXT_1105);
     stringBuffer.append(_feature.getFeatureAccessorName());
-    stringBuffer.append(TEXT_1099);
+    stringBuffer.append(TEXT_1106);
     stringBuffer.append(_exceedsUpperBound);
-    stringBuffer.append(TEXT_1100);
+    stringBuffer.append(TEXT_1107);
     
 	}
 }
@@ -4869,47 +5062,47 @@
 	String _source = "source.getElement()";
 	String _target = "null";
 
-    stringBuffer.append(TEXT_1101);
+    stringBuffer.append(TEXT_1108);
     
 			if (linkConstraints != null) {
 
-    stringBuffer.append(TEXT_1102);
+    stringBuffer.append(TEXT_1109);
     stringBuffer.append(importManager.getImportedName(genDiagram.getNotationViewFactoriesPackageName() + ".DomainElementInitializer")+"."+genDiagram.getLinkCreationConstraintsClassName()+"."+linkConstraints.getConstraintsInstanceFieldName());
-    stringBuffer.append(TEXT_1103);
+    stringBuffer.append(TEXT_1110);
     stringBuffer.append(_source);
-    stringBuffer.append(TEXT_1104);
+    stringBuffer.append(TEXT_1111);
     stringBuffer.append(_target);
-    stringBuffer.append(TEXT_1105);
+    stringBuffer.append(TEXT_1112);
     
 			}
 
     
 }	//local declarations for linkConstraints.jetinc
 
-    stringBuffer.append(TEXT_1106);
+    stringBuffer.append(TEXT_1113);
     
 		} else {
 
-    stringBuffer.append(TEXT_1107);
+    stringBuffer.append(TEXT_1114);
     
 		}
 
-    stringBuffer.append(TEXT_1108);
-    stringBuffer.append(TEXT_1109);
+    stringBuffer.append(TEXT_1115);
+    stringBuffer.append(TEXT_1116);
     
 		if (genLink.getModelFacet() instanceof TypeLinkModelFacet) {
 
-    stringBuffer.append(TEXT_1110);
+    stringBuffer.append(TEXT_1117);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EObject"));
-    stringBuffer.append(TEXT_1111);
+    stringBuffer.append(TEXT_1118);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EObject"));
-    stringBuffer.append(TEXT_1112);
+    stringBuffer.append(TEXT_1119);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EClass"));
-    stringBuffer.append(TEXT_1113);
+    stringBuffer.append(TEXT_1120);
     
 		}
 
-    stringBuffer.append(TEXT_1114);
+    stringBuffer.append(TEXT_1121);
     
 	}	//if there's palette 
 }	//outgoing links
@@ -4939,205 +5132,205 @@
 	}
 	GenLinkConstraints linkConstraints = genLink.getCreationConstraints();
 
-    stringBuffer.append(TEXT_1115);
+    stringBuffer.append(TEXT_1122);
     stringBuffer.append(reconnectCommandNameInfix);
     stringBuffer.append(genLink.getVisualID());
-    stringBuffer.append(TEXT_1116);
+    stringBuffer.append(TEXT_1123);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.command.AbstractCommand"));
-    stringBuffer.append(TEXT_1117);
+    stringBuffer.append(TEXT_1124);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.Edge"));
-    stringBuffer.append(TEXT_1118);
+    stringBuffer.append(TEXT_1125);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.View"));
-    stringBuffer.append(TEXT_1119);
+    stringBuffer.append(TEXT_1126);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.View"));
-    stringBuffer.append(TEXT_1120);
+    stringBuffer.append(TEXT_1127);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.command.Command"));
-    stringBuffer.append(TEXT_1121);
+    stringBuffer.append(TEXT_1128);
     stringBuffer.append(reconnectCommandNameInfix);
     stringBuffer.append(genLink.getVisualID());
-    stringBuffer.append(TEXT_1122);
+    stringBuffer.append(TEXT_1129);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gef.requests.ReconnectRequest"));
-    stringBuffer.append(TEXT_1123);
+    stringBuffer.append(TEXT_1130);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.Edge"));
-    stringBuffer.append(TEXT_1124);
+    stringBuffer.append(TEXT_1131);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.View"));
-    stringBuffer.append(TEXT_1125);
+    stringBuffer.append(TEXT_1132);
     stringBuffer.append(reconnectCommandNameInfix);
     stringBuffer.append(genLink.getVisualID());
-    stringBuffer.append(TEXT_1126);
+    stringBuffer.append(TEXT_1133);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.Edge"));
-    stringBuffer.append(TEXT_1127);
+    stringBuffer.append(TEXT_1134);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.View"));
-    stringBuffer.append(TEXT_1128);
+    stringBuffer.append(TEXT_1135);
     
 	if (linkConstraints != null) {
 
-    stringBuffer.append(TEXT_1129);
+    stringBuffer.append(TEXT_1136);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.TransactionalEditingDomain"));
-    stringBuffer.append(TEXT_1130);
+    stringBuffer.append(TEXT_1137);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.util.TransactionUtil"));
-    stringBuffer.append(TEXT_1131);
+    stringBuffer.append(TEXT_1138);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.command.Command"));
-    stringBuffer.append(TEXT_1132);
+    stringBuffer.append(TEXT_1139);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.command.AbstractCommand"));
-    stringBuffer.append(TEXT_1133);
+    stringBuffer.append(TEXT_1140);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.command.Command"));
-    stringBuffer.append(TEXT_1134);
+    stringBuffer.append(TEXT_1141);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.lite.commands.WrappingCommand"));
-    stringBuffer.append(TEXT_1135);
+    stringBuffer.append(TEXT_1142);
     
 	} else {
 
-    stringBuffer.append(TEXT_1136);
+    stringBuffer.append(TEXT_1143);
     
 	}
 
-    stringBuffer.append(TEXT_1137);
+    stringBuffer.append(TEXT_1144);
     
 		if (genLink.getModelFacet() instanceof TypeLinkModelFacet) {
 {
 	String _source = "edge.getSource().getElement()";
 	String _target = "newTarget.getElement()";
 
-    stringBuffer.append(TEXT_1138);
+    stringBuffer.append(TEXT_1145);
     
 			if (linkConstraints != null) {
 
-    stringBuffer.append(TEXT_1139);
+    stringBuffer.append(TEXT_1146);
     stringBuffer.append(importManager.getImportedName(genDiagram.getNotationViewFactoriesPackageName() + ".DomainElementInitializer")+"."+genDiagram.getLinkCreationConstraintsClassName()+"."+linkConstraints.getConstraintsInstanceFieldName());
-    stringBuffer.append(TEXT_1140);
+    stringBuffer.append(TEXT_1147);
     stringBuffer.append(_source);
-    stringBuffer.append(TEXT_1141);
+    stringBuffer.append(TEXT_1148);
     stringBuffer.append(_target);
-    stringBuffer.append(TEXT_1142);
+    stringBuffer.append(TEXT_1149);
     
 			}
 
     
 }	//local declarations for linkConstraints.jetinc
 
-    stringBuffer.append(TEXT_1143);
+    stringBuffer.append(TEXT_1150);
     
 		} else if (genLink.getModelFacet() instanceof FeatureModelFacet) {
 {
 	String _source = "edge.getSource().getElement()";
 	String _target = "newTarget.getElement()";
 
-    stringBuffer.append(TEXT_1144);
+    stringBuffer.append(TEXT_1151);
     
 			if (linkConstraints != null) {
 
-    stringBuffer.append(TEXT_1145);
+    stringBuffer.append(TEXT_1152);
     stringBuffer.append(importManager.getImportedName(genDiagram.getNotationViewFactoriesPackageName() + ".DomainElementInitializer")+"."+genDiagram.getLinkCreationConstraintsClassName()+"."+linkConstraints.getConstraintsInstanceFieldName());
-    stringBuffer.append(TEXT_1146);
+    stringBuffer.append(TEXT_1153);
     stringBuffer.append(_source);
-    stringBuffer.append(TEXT_1147);
+    stringBuffer.append(TEXT_1154);
     stringBuffer.append(_target);
-    stringBuffer.append(TEXT_1148);
+    stringBuffer.append(TEXT_1155);
     
 			}
 
     
 }	//local declarations for linkConstraints.jetinc
 
-    stringBuffer.append(TEXT_1149);
+    stringBuffer.append(TEXT_1156);
     
 		} else {
 
-    stringBuffer.append(TEXT_1150);
+    stringBuffer.append(TEXT_1157);
     
 		}
 
-    stringBuffer.append(TEXT_1151);
+    stringBuffer.append(TEXT_1158);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.command.Command"));
-    stringBuffer.append(TEXT_1152);
+    stringBuffer.append(TEXT_1159);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.TransactionalEditingDomain"));
-    stringBuffer.append(TEXT_1153);
+    stringBuffer.append(TEXT_1160);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.util.TransactionUtil"));
-    stringBuffer.append(TEXT_1154);
+    stringBuffer.append(TEXT_1161);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.command.CompoundCommand"));
-    stringBuffer.append(TEXT_1155);
+    stringBuffer.append(TEXT_1162);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.command.CompoundCommand"));
-    stringBuffer.append(TEXT_1156);
+    stringBuffer.append(TEXT_1163);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.lite.commands.ReconnectNotationalEdgeTargetCommand"));
-    stringBuffer.append(TEXT_1157);
+    stringBuffer.append(TEXT_1164);
     
 		if (genLink.getModelFacet() instanceof TypeLinkModelFacet) {
 			TypeLinkModelFacet modelFacet = (TypeLinkModelFacet) genLink.getModelFacet();
 			GenFeature targetFeature = modelFacet.getTargetMetaFeature();
 			if (targetFeature.getEcoreFeature().isMany()) {
 
-    stringBuffer.append(TEXT_1158);
+    stringBuffer.append(TEXT_1165);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.edit.command.RemoveCommand"));
-    stringBuffer.append(TEXT_1159);
+    stringBuffer.append(TEXT_1166);
     stringBuffer.append(importManager.getImportedName(targetFeature.getGenPackage().getQualifiedPackageInterfaceName()));
-    stringBuffer.append(TEXT_1160);
+    stringBuffer.append(TEXT_1167);
     stringBuffer.append(targetFeature.getFeatureAccessorName());
-    stringBuffer.append(TEXT_1161);
+    stringBuffer.append(TEXT_1168);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.edit.command.AddCommand"));
-    stringBuffer.append(TEXT_1162);
+    stringBuffer.append(TEXT_1169);
     stringBuffer.append(importManager.getImportedName(targetFeature.getGenPackage().getQualifiedPackageInterfaceName()));
-    stringBuffer.append(TEXT_1163);
+    stringBuffer.append(TEXT_1170);
     stringBuffer.append(targetFeature.getFeatureAccessorName());
-    stringBuffer.append(TEXT_1164);
+    stringBuffer.append(TEXT_1171);
     
 			} else {
 
-    stringBuffer.append(TEXT_1165);
+    stringBuffer.append(TEXT_1172);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.edit.command.SetCommand"));
-    stringBuffer.append(TEXT_1166);
+    stringBuffer.append(TEXT_1173);
     stringBuffer.append(importManager.getImportedName(targetFeature.getGenPackage().getQualifiedPackageInterfaceName()));
-    stringBuffer.append(TEXT_1167);
+    stringBuffer.append(TEXT_1174);
     stringBuffer.append(targetFeature.getFeatureAccessorName());
-    stringBuffer.append(TEXT_1168);
+    stringBuffer.append(TEXT_1175);
     
 			}
 		} else if (genLink.getModelFacet() instanceof FeatureModelFacet) {
 			GenFeature metaFeature = ((FeatureModelFacet) genLink.getModelFacet()).getMetaFeature();
 			if (metaFeature.getEcoreFeature().isMany()) {
 
-    stringBuffer.append(TEXT_1169);
+    stringBuffer.append(TEXT_1176);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.edit.command.RemoveCommand"));
-    stringBuffer.append(TEXT_1170);
+    stringBuffer.append(TEXT_1177);
     stringBuffer.append(importManager.getImportedName(metaFeature.getGenPackage().getQualifiedPackageInterfaceName()));
-    stringBuffer.append(TEXT_1171);
+    stringBuffer.append(TEXT_1178);
     stringBuffer.append(metaFeature.getFeatureAccessorName());
-    stringBuffer.append(TEXT_1172);
+    stringBuffer.append(TEXT_1179);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.edit.command.AddCommand"));
-    stringBuffer.append(TEXT_1173);
+    stringBuffer.append(TEXT_1180);
     stringBuffer.append(importManager.getImportedName(metaFeature.getGenPackage().getQualifiedPackageInterfaceName()));
-    stringBuffer.append(TEXT_1174);
+    stringBuffer.append(TEXT_1181);
     stringBuffer.append(metaFeature.getFeatureAccessorName());
-    stringBuffer.append(TEXT_1175);
+    stringBuffer.append(TEXT_1182);
     
 			} else {
 
-    stringBuffer.append(TEXT_1176);
+    stringBuffer.append(TEXT_1183);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.edit.command.SetCommand"));
-    stringBuffer.append(TEXT_1177);
+    stringBuffer.append(TEXT_1184);
     stringBuffer.append(importManager.getImportedName(metaFeature.getGenPackage().getQualifiedPackageInterfaceName()));
-    stringBuffer.append(TEXT_1178);
+    stringBuffer.append(TEXT_1185);
     stringBuffer.append(metaFeature.getFeatureAccessorName());
-    stringBuffer.append(TEXT_1179);
+    stringBuffer.append(TEXT_1186);
     
 			}
 		}
 
-    stringBuffer.append(TEXT_1180);
+    stringBuffer.append(TEXT_1187);
     
 	if (linkConstraints != null) {
 		String _edge = "edge";
 
-    stringBuffer.append(TEXT_1181);
-    stringBuffer.append(TEXT_1182);
+    stringBuffer.append(TEXT_1188);
+    stringBuffer.append(TEXT_1189);
     
 	//input: _edge : String
 
-    stringBuffer.append(TEXT_1183);
+    stringBuffer.append(TEXT_1190);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.command.Command"));
-    stringBuffer.append(TEXT_1184);
+    stringBuffer.append(TEXT_1191);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.TransactionalEditingDomain"));
-    stringBuffer.append(TEXT_1185);
+    stringBuffer.append(TEXT_1192);
     
 	if (genLink.getModelFacet() instanceof TypeLinkModelFacet) {
 		TypeLinkModelFacet modelFacet = (TypeLinkModelFacet) genLink.getModelFacet();
@@ -5164,260 +5357,260 @@
 				}
 			}
 
-    stringBuffer.append(TEXT_1186);
+    stringBuffer.append(TEXT_1193);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.command.CompoundCommand"));
-    stringBuffer.append(TEXT_1187);
+    stringBuffer.append(TEXT_1194);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.command.CompoundCommand"));
-    stringBuffer.append(TEXT_1188);
+    stringBuffer.append(TEXT_1195);
     
 			if (containmentFeature.getEcoreFeature().isMany()) {
 
-    stringBuffer.append(TEXT_1189);
+    stringBuffer.append(TEXT_1196);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.edit.command.RemoveCommand"));
-    stringBuffer.append(TEXT_1190);
+    stringBuffer.append(TEXT_1197);
     stringBuffer.append(_edge);
-    stringBuffer.append(TEXT_1191);
+    stringBuffer.append(TEXT_1198);
     stringBuffer.append(_edge);
-    stringBuffer.append(TEXT_1192);
+    stringBuffer.append(TEXT_1199);
     stringBuffer.append(_edge);
-    stringBuffer.append(TEXT_1193);
+    stringBuffer.append(TEXT_1200);
     
 			} else {
 
-    stringBuffer.append(TEXT_1194);
+    stringBuffer.append(TEXT_1201);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.edit.command.SetCommand"));
-    stringBuffer.append(TEXT_1195);
+    stringBuffer.append(TEXT_1202);
     stringBuffer.append(_edge);
-    stringBuffer.append(TEXT_1196);
+    stringBuffer.append(TEXT_1203);
     stringBuffer.append(_edge);
-    stringBuffer.append(TEXT_1197);
+    stringBuffer.append(TEXT_1204);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.edit.command.SetCommand"));
-    stringBuffer.append(TEXT_1198);
+    stringBuffer.append(TEXT_1205);
     
 			}
 		} else {
 
-    stringBuffer.append(TEXT_1199);
+    stringBuffer.append(TEXT_1206);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.command.UnexecutableCommand"));
-    stringBuffer.append(TEXT_1200);
+    stringBuffer.append(TEXT_1207);
     
 		}
 		if (removeChild) {
 			if (childFeature.getEcoreFeature().isMany()) {
 
-    stringBuffer.append(TEXT_1201);
+    stringBuffer.append(TEXT_1208);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.edit.command.RemoveCommand"));
-    stringBuffer.append(TEXT_1202);
+    stringBuffer.append(TEXT_1209);
     stringBuffer.append(_edge);
-    stringBuffer.append(TEXT_1203);
+    stringBuffer.append(TEXT_1210);
     stringBuffer.append(importManager.getImportedName(childFeature.getGenPackage().getQualifiedPackageInterfaceName()));
-    stringBuffer.append(TEXT_1204);
+    stringBuffer.append(TEXT_1211);
     stringBuffer.append(childFeature.getFeatureAccessorName());
-    stringBuffer.append(TEXT_1205);
+    stringBuffer.append(TEXT_1212);
     stringBuffer.append(_edge);
-    stringBuffer.append(TEXT_1206);
+    stringBuffer.append(TEXT_1213);
     
 			} else {
 
-    stringBuffer.append(TEXT_1207);
+    stringBuffer.append(TEXT_1214);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.edit.command.SetCommand"));
-    stringBuffer.append(TEXT_1208);
+    stringBuffer.append(TEXT_1215);
     stringBuffer.append(_edge);
-    stringBuffer.append(TEXT_1209);
+    stringBuffer.append(TEXT_1216);
     stringBuffer.append(importManager.getImportedName(childFeature.getGenPackage().getQualifiedPackageInterfaceName()));
-    stringBuffer.append(TEXT_1210);
+    stringBuffer.append(TEXT_1217);
     stringBuffer.append(childFeature.getFeatureAccessorName());
-    stringBuffer.append(TEXT_1211);
+    stringBuffer.append(TEXT_1218);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.edit.command.SetCommand"));
-    stringBuffer.append(TEXT_1212);
+    stringBuffer.append(TEXT_1219);
     
 			}
 		}
 		if (removeSource) {
 			if (sourceFeature.getEcoreFeature().isMany()) {
 
-    stringBuffer.append(TEXT_1213);
+    stringBuffer.append(TEXT_1220);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.edit.command.RemoveCommand"));
-    stringBuffer.append(TEXT_1214);
+    stringBuffer.append(TEXT_1221);
     stringBuffer.append(_edge);
-    stringBuffer.append(TEXT_1215);
+    stringBuffer.append(TEXT_1222);
     stringBuffer.append(importManager.getImportedName(sourceFeature.getGenPackage().getQualifiedPackageInterfaceName()));
-    stringBuffer.append(TEXT_1216);
+    stringBuffer.append(TEXT_1223);
     stringBuffer.append(sourceFeature.getFeatureAccessorName());
-    stringBuffer.append(TEXT_1217);
+    stringBuffer.append(TEXT_1224);
     stringBuffer.append(_edge);
-    stringBuffer.append(TEXT_1218);
+    stringBuffer.append(TEXT_1225);
     
 			} else {
 
-    stringBuffer.append(TEXT_1219);
+    stringBuffer.append(TEXT_1226);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.edit.command.SetCommand"));
-    stringBuffer.append(TEXT_1220);
+    stringBuffer.append(TEXT_1227);
     stringBuffer.append(_edge);
-    stringBuffer.append(TEXT_1221);
+    stringBuffer.append(TEXT_1228);
     stringBuffer.append(importManager.getImportedName(sourceFeature.getGenPackage().getQualifiedPackageInterfaceName()));
-    stringBuffer.append(TEXT_1222);
+    stringBuffer.append(TEXT_1229);
     stringBuffer.append(sourceFeature.getFeatureAccessorName());
-    stringBuffer.append(TEXT_1223);
+    stringBuffer.append(TEXT_1230);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.edit.command.SetCommand"));
-    stringBuffer.append(TEXT_1224);
+    stringBuffer.append(TEXT_1231);
     
 			}
 		}
 		if (removeTarget) {
 			if (targetFeature.getEcoreFeature().isMany()) {
 
-    stringBuffer.append(TEXT_1225);
+    stringBuffer.append(TEXT_1232);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.edit.command.RemoveCommand"));
-    stringBuffer.append(TEXT_1226);
+    stringBuffer.append(TEXT_1233);
     stringBuffer.append(_edge);
-    stringBuffer.append(TEXT_1227);
+    stringBuffer.append(TEXT_1234);
     stringBuffer.append(importManager.getImportedName(targetFeature.getGenPackage().getQualifiedPackageInterfaceName()));
-    stringBuffer.append(TEXT_1228);
+    stringBuffer.append(TEXT_1235);
     stringBuffer.append(targetFeature.getFeatureAccessorName());
-    stringBuffer.append(TEXT_1229);
+    stringBuffer.append(TEXT_1236);
     stringBuffer.append(_edge);
-    stringBuffer.append(TEXT_1230);
+    stringBuffer.append(TEXT_1237);
     
 			} else {
 
-    stringBuffer.append(TEXT_1231);
+    stringBuffer.append(TEXT_1238);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.edit.command.SetCommand"));
-    stringBuffer.append(TEXT_1232);
+    stringBuffer.append(TEXT_1239);
     stringBuffer.append(_edge);
-    stringBuffer.append(TEXT_1233);
+    stringBuffer.append(TEXT_1240);
     stringBuffer.append(importManager.getImportedName(targetFeature.getGenPackage().getQualifiedPackageInterfaceName()));
-    stringBuffer.append(TEXT_1234);
+    stringBuffer.append(TEXT_1241);
     stringBuffer.append(targetFeature.getFeatureAccessorName());
-    stringBuffer.append(TEXT_1235);
+    stringBuffer.append(TEXT_1242);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.edit.command.SetCommand"));
-    stringBuffer.append(TEXT_1236);
+    stringBuffer.append(TEXT_1243);
     
 			}
 		}
 
-    stringBuffer.append(TEXT_1237);
+    stringBuffer.append(TEXT_1244);
     
 	} else if (genLink.getModelFacet() instanceof FeatureModelFacet) {
 		GenFeature metaFeature = ((FeatureModelFacet) genLink.getModelFacet()).getMetaFeature();
 		if (metaFeature.getEcoreFeature().isMany()) {
 
-    stringBuffer.append(TEXT_1238);
+    stringBuffer.append(TEXT_1245);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.edit.command.RemoveCommand"));
-    stringBuffer.append(TEXT_1239);
+    stringBuffer.append(TEXT_1246);
     stringBuffer.append(_edge);
-    stringBuffer.append(TEXT_1240);
+    stringBuffer.append(TEXT_1247);
     stringBuffer.append(importManager.getImportedName(metaFeature.getGenPackage().getQualifiedPackageInterfaceName()));
-    stringBuffer.append(TEXT_1241);
+    stringBuffer.append(TEXT_1248);
     stringBuffer.append(metaFeature.getFeatureAccessorName());
-    stringBuffer.append(TEXT_1242);
+    stringBuffer.append(TEXT_1249);
     stringBuffer.append(_edge);
-    stringBuffer.append(TEXT_1243);
+    stringBuffer.append(TEXT_1250);
     
 		} else {
 
-    stringBuffer.append(TEXT_1244);
+    stringBuffer.append(TEXT_1251);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.edit.command.SetCommand"));
-    stringBuffer.append(TEXT_1245);
+    stringBuffer.append(TEXT_1252);
     stringBuffer.append(_edge);
-    stringBuffer.append(TEXT_1246);
+    stringBuffer.append(TEXT_1253);
     stringBuffer.append(importManager.getImportedName(metaFeature.getGenPackage().getQualifiedPackageInterfaceName()));
-    stringBuffer.append(TEXT_1247);
+    stringBuffer.append(TEXT_1254);
     stringBuffer.append(metaFeature.getFeatureAccessorName());
-    stringBuffer.append(TEXT_1248);
+    stringBuffer.append(TEXT_1255);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.edit.command.SetCommand"));
-    stringBuffer.append(TEXT_1249);
+    stringBuffer.append(TEXT_1256);
     
 		}
 
     
 	}
 
-    stringBuffer.append(TEXT_1250);
+    stringBuffer.append(TEXT_1257);
     
 	}
 
-    stringBuffer.append(TEXT_1251);
+    stringBuffer.append(TEXT_1258);
     
 	if (palette != null) {
 
-    stringBuffer.append(TEXT_1252);
+    stringBuffer.append(TEXT_1259);
     stringBuffer.append(createCommandNameInfix);
     stringBuffer.append(genLink.getVisualID());
-    stringBuffer.append(TEXT_1253);
+    stringBuffer.append(TEXT_1260);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.command.AbstractCommand"));
-    stringBuffer.append(TEXT_1254);
+    stringBuffer.append(TEXT_1261);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.View"));
-    stringBuffer.append(TEXT_1255);
+    stringBuffer.append(TEXT_1262);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.View"));
-    stringBuffer.append(TEXT_1256);
+    stringBuffer.append(TEXT_1263);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.Edge"));
-    stringBuffer.append(TEXT_1257);
+    stringBuffer.append(TEXT_1264);
     stringBuffer.append(createCommandNameInfix);
     stringBuffer.append(genLink.getVisualID());
-    stringBuffer.append(TEXT_1258);
+    stringBuffer.append(TEXT_1265);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.lite.requests.CreateConnectionRequestEx"));
-    stringBuffer.append(TEXT_1259);
+    stringBuffer.append(TEXT_1266);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.View"));
-    stringBuffer.append(TEXT_1260);
+    stringBuffer.append(TEXT_1267);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.View"));
-    stringBuffer.append(TEXT_1261);
+    stringBuffer.append(TEXT_1268);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.View"));
-    stringBuffer.append(TEXT_1262);
+    stringBuffer.append(TEXT_1269);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.View"));
-    stringBuffer.append(TEXT_1263);
+    stringBuffer.append(TEXT_1270);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.command.UnexecutableCommand"));
-    stringBuffer.append(TEXT_1264);
+    stringBuffer.append(TEXT_1271);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.NotationFactory"));
-    stringBuffer.append(TEXT_1265);
+    stringBuffer.append(TEXT_1272);
     
 		if (genLink.getModelFacet() instanceof TypeLinkModelFacet) {
 			TypeLinkModelFacet modelFacet = (TypeLinkModelFacet) genLink.getModelFacet();
 			GenClass linkClass = modelFacet.getMetaClass();
 
-    stringBuffer.append(TEXT_1266);
+    stringBuffer.append(TEXT_1273);
     stringBuffer.append(importManager.getImportedName(importManager.getImportedName(linkClass.getQualifiedInterfaceName())));
-    stringBuffer.append(TEXT_1267);
+    stringBuffer.append(TEXT_1274);
     stringBuffer.append(importManager.getImportedName(linkClass.getGenPackage().getQualifiedFactoryInterfaceName()));
-    stringBuffer.append(TEXT_1268);
+    stringBuffer.append(TEXT_1275);
     stringBuffer.append(linkClass.getClassifierAccessorName());
-    stringBuffer.append(TEXT_1269);
+    stringBuffer.append(TEXT_1276);
     if (linkClass.isExternalInterface()) {
-    stringBuffer.append(TEXT_1270);
+    stringBuffer.append(TEXT_1277);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EObject"));
-    stringBuffer.append(TEXT_1271);
+    stringBuffer.append(TEXT_1278);
     }
-    stringBuffer.append(TEXT_1272);
+    stringBuffer.append(TEXT_1279);
     /*XXX: Class name DomainElementInitializer should be user-customizable*/
-    stringBuffer.append(TEXT_1273);
+    stringBuffer.append(TEXT_1280);
     stringBuffer.append(importManager.getImportedName(genDiagram.getNotationViewFactoriesPackageName() + ".DomainElementInitializer"));
-    stringBuffer.append(TEXT_1274);
+    stringBuffer.append(TEXT_1281);
     stringBuffer.append(genLink.getUniqueIdentifier());
-    stringBuffer.append(TEXT_1275);
+    stringBuffer.append(TEXT_1282);
     if (linkClass.isExternalInterface()) {
-    stringBuffer.append(TEXT_1276);
+    stringBuffer.append(TEXT_1283);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EObject"));
-    stringBuffer.append(TEXT_1277);
+    stringBuffer.append(TEXT_1284);
     }
-    stringBuffer.append(TEXT_1278);
+    stringBuffer.append(TEXT_1285);
     
 		} else if (genLink.getModelFacet() instanceof FeatureModelFacet) {
 
-    stringBuffer.append(TEXT_1279);
+    stringBuffer.append(TEXT_1286);
     
 		}
 
-    stringBuffer.append(TEXT_1280);
+    stringBuffer.append(TEXT_1287);
     stringBuffer.append(importManager.getImportedName(genLink.getNotationViewFactoryQualifiedClassName()));
-    stringBuffer.append(TEXT_1281);
+    stringBuffer.append(TEXT_1288);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.TransactionalEditingDomain"));
-    stringBuffer.append(TEXT_1282);
+    stringBuffer.append(TEXT_1289);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.util.TransactionUtil"));
-    stringBuffer.append(TEXT_1283);
+    stringBuffer.append(TEXT_1290);
     
 		if (genLink.getModelFacet() instanceof TypeLinkModelFacet) {
 
-    stringBuffer.append(TEXT_1284);
+    stringBuffer.append(TEXT_1291);
     
 			TypeLinkModelFacet modelFacet = (TypeLinkModelFacet) genLink.getModelFacet();
 			GenFeature sourceFeature = modelFacet.getSourceMetaFeature();
@@ -5444,30 +5637,30 @@
 					}
 				}
 
-    stringBuffer.append(TEXT_1285);
+    stringBuffer.append(TEXT_1292);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EObject"));
-    stringBuffer.append(TEXT_1286);
+    stringBuffer.append(TEXT_1293);
     stringBuffer.append(importManager.getImportedName(containmentFeature.getGenClass().getGenPackage().getQualifiedPackageInterfaceName()));
-    stringBuffer.append(TEXT_1287);
+    stringBuffer.append(TEXT_1294);
     stringBuffer.append(containmentFeature.getGenClass().getClassifierAccessorName());
-    stringBuffer.append(TEXT_1288);
+    stringBuffer.append(TEXT_1295);
     stringBuffer.append(importManager.getImportedName(containmentFeature.getEcoreFeature().isMany() ? "org.eclipse.emf.edit.command.AddCommand" : "org.eclipse.emf.edit.command.SetCommand"));
-    stringBuffer.append(TEXT_1289);
+    stringBuffer.append(TEXT_1296);
     stringBuffer.append(importManager.getImportedName(containmentFeature.getGenPackage().getQualifiedPackageInterfaceName()));
-    stringBuffer.append(TEXT_1290);
+    stringBuffer.append(TEXT_1297);
     stringBuffer.append(containmentFeature.getFeatureAccessorName());
-    stringBuffer.append(TEXT_1291);
+    stringBuffer.append(TEXT_1298);
     
 			}
 			if (addChild) {
 
-    stringBuffer.append(TEXT_1292);
+    stringBuffer.append(TEXT_1299);
     stringBuffer.append(importManager.getImportedName(childFeature.getEcoreFeature().isMany() ? "org.eclipse.emf.edit.command.AddCommand" : "org.eclipse.emf.edit.command.SetCommand"));
-    stringBuffer.append(TEXT_1293);
+    stringBuffer.append(TEXT_1300);
     stringBuffer.append(importManager.getImportedName(childFeature.getGenPackage().getQualifiedPackageInterfaceName()));
-    stringBuffer.append(TEXT_1294);
+    stringBuffer.append(TEXT_1301);
     stringBuffer.append(childFeature.getFeatureAccessorName());
-    stringBuffer.append(TEXT_1295);
+    stringBuffer.append(TEXT_1302);
     
 			}
 			if (addSource) {
@@ -5477,29 +5670,29 @@
 					String _exceedsUpperBound = "domainModelAddCommand = null;\nreturn;";
 					GenClass _ownerGenClass = modelFacet.getMetaClass();
 
-    stringBuffer.append(TEXT_1296);
+    stringBuffer.append(TEXT_1303);
     
 int upperBound = _feature.getEcoreFeature().getUpperBound();
 if (upperBound > 0) {
 	if (upperBound == 1) {
 
-    stringBuffer.append(TEXT_1297);
+    stringBuffer.append(TEXT_1304);
     myFeatureGetAccessorHelper.appendFeatureValueGetter(_ownerInstance, _feature, _ownerGenClass, false);
-    stringBuffer.append(TEXT_1298);
+    stringBuffer.append(TEXT_1305);
     stringBuffer.append(_exceedsUpperBound);
-    stringBuffer.append(TEXT_1299);
+    stringBuffer.append(TEXT_1306);
     
 	} else {
 
-    stringBuffer.append(TEXT_1300);
+    stringBuffer.append(TEXT_1307);
     myFeatureGetAccessorHelper.appendFeatureValueGetter(_ownerInstance, _feature, _ownerGenClass, true);
-    stringBuffer.append(TEXT_1301);
+    stringBuffer.append(TEXT_1308);
     stringBuffer.append(importManager.getImportedName(_feature.getGenPackage().getQualifiedPackageInterfaceName()));
-    stringBuffer.append(TEXT_1302);
+    stringBuffer.append(TEXT_1309);
     stringBuffer.append(_feature.getFeatureAccessorName());
-    stringBuffer.append(TEXT_1303);
+    stringBuffer.append(TEXT_1310);
     stringBuffer.append(_exceedsUpperBound);
-    stringBuffer.append(TEXT_1304);
+    stringBuffer.append(TEXT_1311);
     
 	}
 }
@@ -5507,13 +5700,13 @@
     
 				}
 
-    stringBuffer.append(TEXT_1305);
+    stringBuffer.append(TEXT_1312);
     stringBuffer.append(importManager.getImportedName(sourceFeature.getEcoreFeature().isMany() ? "org.eclipse.emf.edit.command.AddCommand" : "org.eclipse.emf.edit.command.SetCommand"));
-    stringBuffer.append(TEXT_1306);
+    stringBuffer.append(TEXT_1313);
     stringBuffer.append(importManager.getImportedName(sourceFeature.getGenPackage().getQualifiedPackageInterfaceName()));
-    stringBuffer.append(TEXT_1307);
+    stringBuffer.append(TEXT_1314);
     stringBuffer.append(sourceFeature.getFeatureAccessorName());
-    stringBuffer.append(TEXT_1308);
+    stringBuffer.append(TEXT_1315);
     
 			}
 			if (addTarget) {
@@ -5523,29 +5716,29 @@
 					String _exceedsUpperBound = "domainModelAddCommand = null;\nreturn;";
 					GenClass _ownerGenClass = modelFacet.getMetaClass();
 
-    stringBuffer.append(TEXT_1309);
+    stringBuffer.append(TEXT_1316);
     
 int upperBound = _feature.getEcoreFeature().getUpperBound();
 if (upperBound > 0) {
 	if (upperBound == 1) {
 
-    stringBuffer.append(TEXT_1310);
+    stringBuffer.append(TEXT_1317);
     myFeatureGetAccessorHelper.appendFeatureValueGetter(_ownerInstance, _feature, _ownerGenClass, false);
-    stringBuffer.append(TEXT_1311);
+    stringBuffer.append(TEXT_1318);
     stringBuffer.append(_exceedsUpperBound);
-    stringBuffer.append(TEXT_1312);
+    stringBuffer.append(TEXT_1319);
     
 	} else {
 
-    stringBuffer.append(TEXT_1313);
+    stringBuffer.append(TEXT_1320);
     myFeatureGetAccessorHelper.appendFeatureValueGetter(_ownerInstance, _feature, _ownerGenClass, true);
-    stringBuffer.append(TEXT_1314);
+    stringBuffer.append(TEXT_1321);
     stringBuffer.append(importManager.getImportedName(_feature.getGenPackage().getQualifiedPackageInterfaceName()));
-    stringBuffer.append(TEXT_1315);
+    stringBuffer.append(TEXT_1322);
     stringBuffer.append(_feature.getFeatureAccessorName());
-    stringBuffer.append(TEXT_1316);
+    stringBuffer.append(TEXT_1323);
     stringBuffer.append(_exceedsUpperBound);
-    stringBuffer.append(TEXT_1317);
+    stringBuffer.append(TEXT_1324);
     
 	}
 }
@@ -5553,70 +5746,70 @@
     
 				}
 
-    stringBuffer.append(TEXT_1318);
+    stringBuffer.append(TEXT_1325);
     stringBuffer.append(importManager.getImportedName(targetFeature.getEcoreFeature().isMany() ? "org.eclipse.emf.edit.command.AddCommand" : "org.eclipse.emf.edit.command.SetCommand"));
-    stringBuffer.append(TEXT_1319);
+    stringBuffer.append(TEXT_1326);
     stringBuffer.append(importManager.getImportedName(targetFeature.getGenPackage().getQualifiedPackageInterfaceName()));
-    stringBuffer.append(TEXT_1320);
+    stringBuffer.append(TEXT_1327);
     stringBuffer.append(targetFeature.getFeatureAccessorName());
-    stringBuffer.append(TEXT_1321);
+    stringBuffer.append(TEXT_1328);
     
 			}
 
-    stringBuffer.append(TEXT_1322);
+    stringBuffer.append(TEXT_1329);
     
 		} else if (genLink.getModelFacet() instanceof FeatureModelFacet) {
 			GenFeature metaFeature = ((FeatureModelFacet) genLink.getModelFacet()).getMetaFeature();
 
-    stringBuffer.append(TEXT_1323);
+    stringBuffer.append(TEXT_1330);
     stringBuffer.append(importManager.getImportedName(metaFeature.getEcoreFeature().isMany()? "org.eclipse.emf.edit.command.AddCommand" : "org.eclipse.emf.edit.command.SetCommand"));
-    stringBuffer.append(TEXT_1324);
+    stringBuffer.append(TEXT_1331);
     stringBuffer.append(importManager.getImportedName(metaFeature.getGenPackage().getQualifiedPackageInterfaceName()));
-    stringBuffer.append(TEXT_1325);
+    stringBuffer.append(TEXT_1332);
     stringBuffer.append(metaFeature.getFeatureAccessorName());
-    stringBuffer.append(TEXT_1326);
+    stringBuffer.append(TEXT_1333);
     
 		}
 
-    stringBuffer.append(TEXT_1327);
-    stringBuffer.append(TEXT_1328);
+    stringBuffer.append(TEXT_1334);
+    stringBuffer.append(TEXT_1335);
     
 		if (genLink.getModelFacet() instanceof TypeLinkModelFacet) {
 
-    stringBuffer.append(TEXT_1329);
+    stringBuffer.append(TEXT_1336);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EObject"));
-    stringBuffer.append(TEXT_1330);
+    stringBuffer.append(TEXT_1337);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EObject"));
-    stringBuffer.append(TEXT_1331);
+    stringBuffer.append(TEXT_1338);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EClass"));
-    stringBuffer.append(TEXT_1332);
+    stringBuffer.append(TEXT_1339);
     
 		}
 
-    stringBuffer.append(TEXT_1333);
+    stringBuffer.append(TEXT_1340);
     
 {
 	String _source = "source.getElement()";
 	String _target = "target.getElement()";
 
-    stringBuffer.append(TEXT_1334);
+    stringBuffer.append(TEXT_1341);
     
 			if (linkConstraints != null) {
 
-    stringBuffer.append(TEXT_1335);
+    stringBuffer.append(TEXT_1342);
     stringBuffer.append(importManager.getImportedName(genDiagram.getNotationViewFactoriesPackageName() + ".DomainElementInitializer")+"."+genDiagram.getLinkCreationConstraintsClassName()+"."+linkConstraints.getConstraintsInstanceFieldName());
-    stringBuffer.append(TEXT_1336);
+    stringBuffer.append(TEXT_1343);
     stringBuffer.append(_source);
-    stringBuffer.append(TEXT_1337);
+    stringBuffer.append(TEXT_1344);
     stringBuffer.append(_target);
-    stringBuffer.append(TEXT_1338);
+    stringBuffer.append(TEXT_1345);
     
 			}
 
     
 }	//local declarations for linkConstraints.jetinc
 
-    stringBuffer.append(TEXT_1339);
+    stringBuffer.append(TEXT_1346);
     
 	}
 
@@ -5625,22 +5818,474 @@
 if (genNode.getViewmap() instanceof InnerClassViewmap) {
 	String classBody = ((InnerClassViewmap) genNode.getViewmap()).getClassBody();
 
-    stringBuffer.append(TEXT_1340);
+    stringBuffer.append(TEXT_1347);
     stringBuffer.append(classBody);
-    stringBuffer.append(TEXT_1341);
+    stringBuffer.append(TEXT_1348);
     
 if (classBody.indexOf("DPtoLP") != -1) {
 
-    stringBuffer.append(TEXT_1342);
+    stringBuffer.append(TEXT_1349);
     
 }
 
     
 }
 
-    stringBuffer.append(TEXT_1343);
+    stringBuffer.append(TEXT_1350);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.lite.edit.parts.tree.BaseTreeEditPart"));
+    stringBuffer.append(TEXT_1351);
+    stringBuffer.append(importManager.getImportedName(genDiagram.getEditorGen().getPlugin().getActivatorQualifiedClassName()));
+    stringBuffer.append(TEXT_1352);
+    stringBuffer.append(TEXT_1353);
+    stringBuffer.append(TEXT_1354);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.EditPolicy"));
+    stringBuffer.append(TEXT_1355);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.editpolicies.ComponentEditPolicy"));
+    stringBuffer.append(TEXT_1356);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.commands.Command"));
+    stringBuffer.append(TEXT_1357);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.requests.GroupRequest"));
+    stringBuffer.append(TEXT_1358);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.TransactionalEditingDomain"));
+    stringBuffer.append(TEXT_1359);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.util.TransactionUtil"));
+    stringBuffer.append(TEXT_1360);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.command.CompoundCommand"));
+    stringBuffer.append(TEXT_1361);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.command.CompoundCommand"));
+    stringBuffer.append(TEXT_1362);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.edit.command.RemoveCommand"));
+    stringBuffer.append(TEXT_1363);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.lite.commands.WrappingCommand"));
+    stringBuffer.append(TEXT_1364);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.TransactionalEditingDomain"));
+    stringBuffer.append(TEXT_1365);
+    
+{
+TypeModelFacet facet = genNode.getModelFacet();
+GenFeature childFeature = facet.getChildMetaFeature();
+GenFeature containmentFeature = facet.getContainmentMetaFeature();
+if (childFeature != null && childFeature != containmentFeature && !childFeature.isDerived()) {
+
+    stringBuffer.append(TEXT_1366);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.command.CompoundCommand"));
+    stringBuffer.append(TEXT_1367);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.command.CompoundCommand"));
+    stringBuffer.append(TEXT_1368);
+    
+	if (containmentFeature.getEcoreFeature().isMany()) {
+
+    stringBuffer.append(TEXT_1369);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.edit.command.RemoveCommand"));
+    stringBuffer.append(TEXT_1370);
+    stringBuffer.append(importManager.getImportedName(containmentFeature.getGenPackage().getQualifiedPackageInterfaceName()));
+    stringBuffer.append(TEXT_1371);
+    stringBuffer.append(containmentFeature.getFeatureAccessorName());
+    stringBuffer.append(TEXT_1372);
+    
+	} else {
+
+    stringBuffer.append(TEXT_1373);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.edit.command.SetCommand"));
+    stringBuffer.append(TEXT_1374);
+    stringBuffer.append(importManager.getImportedName(containmentFeature.getGenPackage().getQualifiedPackageInterfaceName()));
+    stringBuffer.append(TEXT_1375);
+    stringBuffer.append(containmentFeature.getFeatureAccessorName());
+    stringBuffer.append(TEXT_1376);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.edit.command.SetCommand"));
+    stringBuffer.append(TEXT_1377);
+    
+	}
+
+    
+	if (childFeature.getEcoreFeature().isMany()) {
+
+    stringBuffer.append(TEXT_1378);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.edit.command.RemoveCommand"));
+    stringBuffer.append(TEXT_1379);
+    stringBuffer.append(importManager.getImportedName(childFeature.getGenPackage().getQualifiedPackageInterfaceName()));
+    stringBuffer.append(TEXT_1380);
+    stringBuffer.append(childFeature.getFeatureAccessorName());
+    stringBuffer.append(TEXT_1381);
+    
+	} else {
+
+    stringBuffer.append(TEXT_1382);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.edit.command.SetCommand"));
+    stringBuffer.append(TEXT_1383);
+    stringBuffer.append(importManager.getImportedName(childFeature.getGenPackage().getQualifiedPackageInterfaceName()));
+    stringBuffer.append(TEXT_1384);
+    stringBuffer.append(childFeature.getFeatureAccessorName());
+    stringBuffer.append(TEXT_1385);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.edit.command.SetCommand"));
+    stringBuffer.append(TEXT_1386);
+    
+	}
+
+    stringBuffer.append(TEXT_1387);
+    
+} else {
+	if (containmentFeature.getEcoreFeature().isMany()) {
+
+    stringBuffer.append(TEXT_1388);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.edit.command.RemoveCommand"));
+    stringBuffer.append(TEXT_1389);
+    stringBuffer.append(importManager.getImportedName(containmentFeature.getGenPackage().getQualifiedPackageInterfaceName()));
+    stringBuffer.append(TEXT_1390);
+    stringBuffer.append(containmentFeature.getFeatureAccessorName());
+    stringBuffer.append(TEXT_1391);
+    
+	} else {
+
+    stringBuffer.append(TEXT_1392);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.edit.command.SetCommand"));
+    stringBuffer.append(TEXT_1393);
+    stringBuffer.append(importManager.getImportedName(containmentFeature.getGenPackage().getQualifiedPackageInterfaceName()));
+    stringBuffer.append(TEXT_1394);
+    stringBuffer.append(containmentFeature.getFeatureAccessorName());
+    stringBuffer.append(TEXT_1395);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.edit.command.SetCommand"));
+    stringBuffer.append(TEXT_1396);
+    
+	}
+}
+
+    stringBuffer.append(TEXT_1397);
+    
+}	/*restrict local vars used in component edit policy*/
+
+    
+if (myHelper.getPrimaryLabel() != null) {
+		String editPatternCode = importManager.getImportedName(myHelper.getPrimaryLabel().getEditPartQualifiedClassName()) + ".EDIT_PATTERN";
+		String resolvedSemanticElement = "(" + importManager.getImportedName(genNode.getDomainMetaClass().getQualifiedInterfaceName()) + ") getDiagramNode().getElement()";
+		LabelModelFacet labelModelFacet = myHelper.getPrimaryLabel().getModelFacet();
+		GenClass underlyingMetaClass = genNode.getDomainMetaClass();
+
+    stringBuffer.append(TEXT_1398);
+    stringBuffer.append(TEXT_1399);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.EditPolicy"));
+    stringBuffer.append(TEXT_1400);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.editpolicies.DirectEditPolicy"));
+    stringBuffer.append(TEXT_1401);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.requests.DirectEditRequest"));
+    stringBuffer.append(TEXT_1402);
+    stringBuffer.append(TEXT_1403);
+    stringBuffer.append(TEXT_1404);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.commands.Command"));
+    stringBuffer.append(TEXT_1405);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.requests.DirectEditRequest"));
+    stringBuffer.append(TEXT_1406);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.commands.UnexecutableCommand"));
+    stringBuffer.append(TEXT_1407);
+    stringBuffer.append(importManager.getImportedName("java.text.MessageFormat"));
+    stringBuffer.append(TEXT_1408);
+    stringBuffer.append(editPatternCode);
+    stringBuffer.append(TEXT_1409);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.commands.UnexecutableCommand"));
+    stringBuffer.append(TEXT_1410);
+    stringBuffer.append(importManager.getImportedName("java.text.ParseException"));
+    stringBuffer.append(TEXT_1411);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.commands.UnexecutableCommand"));
+    stringBuffer.append(TEXT_1412);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.TransactionalEditingDomain"));
+    stringBuffer.append(TEXT_1413);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.util.TransactionUtil"));
+    stringBuffer.append(TEXT_1414);
+    stringBuffer.append(primaryView);
+    stringBuffer.append(TEXT_1415);
+    
+if (labelModelFacet instanceof FeatureLabelModelFacet) {
+	GenFeature featureToSet = ((FeatureLabelModelFacet)labelModelFacet).getMetaFeature();
+	EStructuralFeature ecoreFeature = featureToSet.getEcoreFeature();
+
+    stringBuffer.append(TEXT_1416);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.commands.UnexecutableCommand"));
+    stringBuffer.append(TEXT_1417);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.command.Command"));
+    stringBuffer.append(TEXT_1418);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.lite.commands.WrappingCommand"));
+    stringBuffer.append(TEXT_1419);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.command.Command"));
+    stringBuffer.append(TEXT_1420);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.TransactionalEditingDomain"));
+    stringBuffer.append(TEXT_1421);
+    stringBuffer.append(importManager.getImportedName(underlyingMetaClass.getQualifiedInterfaceName()));
+    stringBuffer.append(TEXT_1422);
+    stringBuffer.append(resolvedSemanticElement);
+    stringBuffer.append(TEXT_1423);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EAttribute"));
+    stringBuffer.append(TEXT_1424);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EAttribute"));
+    stringBuffer.append(TEXT_1425);
+    stringBuffer.append(importManager.getImportedName(featureToSet.getGenPackage().getQualifiedPackageInterfaceName()));
+    stringBuffer.append(TEXT_1426);
+    stringBuffer.append(featureToSet.getFeatureAccessorName());
+    stringBuffer.append(TEXT_1427);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.lite.services.ParserUtil"));
+    stringBuffer.append(TEXT_1428);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.command.UnexecutableCommand"));
+    stringBuffer.append(TEXT_1429);
+    
+	if (ecoreFeature.isMany()) {
+
+    stringBuffer.append(TEXT_1430);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.command.CompoundCommand"));
+    stringBuffer.append(TEXT_1431);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.command.CompoundCommand"));
+    stringBuffer.append(TEXT_1432);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.util.EList"));
+    stringBuffer.append(TEXT_1433);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.util.BasicEList"));
+    stringBuffer.append(TEXT_1434);
+    stringBuffer.append(featureToSet.getAccessorName());
+    stringBuffer.append(TEXT_1435);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.edit.command.RemoveCommand"));
+    stringBuffer.append(TEXT_1436);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.edit.command.AddCommand"));
+    stringBuffer.append(TEXT_1437);
+    
+	} else {
+
+    stringBuffer.append(TEXT_1438);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.edit.command.SetCommand"));
+    stringBuffer.append(TEXT_1439);
+    
+	}
+
+    stringBuffer.append(TEXT_1440);
+    
+} else if (labelModelFacet instanceof CompositeFeatureLabelModelFacet) {
+	CompositeFeatureLabelModelFacet compositeFeatureLabelModelFacet = (CompositeFeatureLabelModelFacet) labelModelFacet;
+	List metaFeatures = compositeFeatureLabelModelFacet.getMetaFeatures();
+
+    stringBuffer.append(TEXT_1441);
+    stringBuffer.append(metaFeatures.size());
+    stringBuffer.append(TEXT_1442);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.commands.UnexecutableCommand"));
+    stringBuffer.append(TEXT_1443);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.command.Command"));
+    stringBuffer.append(TEXT_1444);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.lite.commands.WrappingCommand"));
+    stringBuffer.append(TEXT_1445);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.command.Command"));
+    stringBuffer.append(TEXT_1446);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.TransactionalEditingDomain"));
+    stringBuffer.append(TEXT_1447);
+    stringBuffer.append(importManager.getImportedName(underlyingMetaClass.getQualifiedInterfaceName()));
+    stringBuffer.append(TEXT_1448);
+    stringBuffer.append(resolvedSemanticElement);
+    stringBuffer.append(TEXT_1449);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.command.CompoundCommand"));
+    stringBuffer.append(TEXT_1450);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.command.CompoundCommand"));
+    stringBuffer.append(TEXT_1451);
+    
+	boolean haveDeclaredValues = false;
+	for(int i = 0; i < metaFeatures.size(); i++) {
+		GenFeature nextFeatureToSet = (GenFeature) metaFeatures.get(i);
+		EStructuralFeature nextEcoreFeature = nextFeatureToSet.getEcoreFeature();
+
+    stringBuffer.append(TEXT_1452);
+    if (i == 0) {
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EAttribute"));
+    stringBuffer.append(TEXT_1453);
+    }
+    stringBuffer.append(TEXT_1454);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EAttribute"));
+    stringBuffer.append(TEXT_1455);
+    stringBuffer.append(importManager.getImportedName(nextFeatureToSet.getGenPackage().getQualifiedPackageInterfaceName()));
+    stringBuffer.append(TEXT_1456);
+    stringBuffer.append(nextFeatureToSet.getFeatureAccessorName());
+    stringBuffer.append(TEXT_1457);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.lite.services.ParserUtil"));
+    stringBuffer.append(TEXT_1458);
+    stringBuffer.append(i);
+    stringBuffer.append(TEXT_1459);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.command.UnexecutableCommand"));
+    stringBuffer.append(TEXT_1460);
+    
+		if (nextEcoreFeature.isMany()) {
+
+    stringBuffer.append(TEXT_1461);
+    if (!haveDeclaredValues) { haveDeclaredValues = true;
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.util.EList"));
+    stringBuffer.append(TEXT_1462);
+    }
+    stringBuffer.append(TEXT_1463);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.util.BasicEList"));
+    stringBuffer.append(TEXT_1464);
+    stringBuffer.append(nextFeatureToSet.getAccessorName());
+    stringBuffer.append(TEXT_1465);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.edit.command.RemoveCommand"));
+    stringBuffer.append(TEXT_1466);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.edit.command.AddCommand"));
+    stringBuffer.append(TEXT_1467);
+    
+		} else {
+
+    stringBuffer.append(TEXT_1468);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.edit.command.SetCommand"));
+    stringBuffer.append(TEXT_1469);
+    
+		}
+
+    
+	}
+
+    stringBuffer.append(TEXT_1470);
+    
+}
+
+    stringBuffer.append(TEXT_1471);
+    
+}
+
+    stringBuffer.append(TEXT_1472);
+    
+if (myHelper.getPrimaryLabel() != null) {
+
+    stringBuffer.append(TEXT_1473);
+    stringBuffer.append(TEXT_1474);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.lite.services.TreeDirectEditManager"));
+    stringBuffer.append(TEXT_1475);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.Request"));
+    stringBuffer.append(TEXT_1476);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.RequestConstants"));
+    stringBuffer.append(TEXT_1477);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.lite.services.TreeDirectEditManager"));
+    stringBuffer.append(TEXT_1478);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.lite.services.TreeDirectEditManager"));
+    stringBuffer.append(TEXT_1479);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.jface.viewers.TextCellEditor"));
+    stringBuffer.append(TEXT_1480);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.tools.CellEditorLocator"));
+    stringBuffer.append(TEXT_1481);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.jface.viewers.CellEditor"));
+    stringBuffer.append(TEXT_1482);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.swt.widgets.TreeItem"));
+    stringBuffer.append(TEXT_1483);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.swt.widgets.TreeItem"));
+    stringBuffer.append(TEXT_1484);
+    stringBuffer.append(importManager.getImportedName(myHelper.getPrimaryLabel().getEditPartQualifiedClassName()));
+    stringBuffer.append(TEXT_1485);
+    
+}
+
+    stringBuffer.append(TEXT_1486);
+    stringBuffer.append(TEXT_1487);
+    stringBuffer.append(TEXT_1488);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.lite.edit.parts.update.RefreshAdapter"));
+    stringBuffer.append(TEXT_1489);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.lite.edit.parts.update.RefreshAdapter"));
+    stringBuffer.append(TEXT_1490);
+    
+if (myHelper.getPrimaryLabel() != null) {
+
+    stringBuffer.append(TEXT_1491);
+    stringBuffer.append(importManager.getImportedName(myHelper.getPrimaryLabel().getEditPartQualifiedClassName()));
+    stringBuffer.append(TEXT_1492);
+    stringBuffer.append(importManager.getImportedName(myHelper.getPrimaryLabel().getEditPartQualifiedClassName()));
+    stringBuffer.append(TEXT_1493);
+    stringBuffer.append(importManager.getImportedName("java.util.Iterator"));
+    stringBuffer.append(TEXT_1494);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.View"));
+    stringBuffer.append(TEXT_1495);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.View"));
+    stringBuffer.append(TEXT_1496);
+    stringBuffer.append(importManager.getImportedName(genDiagram.getVisualIDRegistryQualifiedClassName()));
+    stringBuffer.append(TEXT_1497);
+    stringBuffer.append(importManager.getImportedName(myHelper.getPrimaryLabel().getEditPartQualifiedClassName()));
+    stringBuffer.append(TEXT_1498);
+    stringBuffer.append(importManager.getImportedName(myHelper.getPrimaryLabel().getEditPartQualifiedClassName()));
+    stringBuffer.append(TEXT_1499);
+    stringBuffer.append(genNode.getEditPartClassName());
+    stringBuffer.append(TEXT_1500);
+    
+}
+
+    stringBuffer.append(TEXT_1501);
+    
+if (myHelper.getPrimaryLabel() != null) {
+	LabelModelFacet labelModelFacet = myHelper.getPrimaryLabel().getModelFacet();
+	if (labelModelFacet instanceof FeatureLabelModelFacet) {
+		GenFeature feature = ((FeatureLabelModelFacet)labelModelFacet).getMetaFeature();
+
+    stringBuffer.append(TEXT_1502);
+    stringBuffer.append(importManager.getImportedName(feature.getGenPackage().getQualifiedPackageInterfaceName()));
+    stringBuffer.append(TEXT_1503);
+    stringBuffer.append(feature.getFeatureAccessorName());
+    stringBuffer.append(TEXT_1504);
+    
+	} else if (labelModelFacet instanceof CompositeFeatureLabelModelFacet) {
+		CompositeFeatureLabelModelFacet compositeFeatureLabelModelFacet = (CompositeFeatureLabelModelFacet) labelModelFacet;
+		for(Iterator it = compositeFeatureLabelModelFacet.getMetaFeatures().iterator(); it.hasNext(); ) {
+			GenFeature next = (GenFeature) it.next();
+
+    stringBuffer.append(TEXT_1505);
+    stringBuffer.append(importManager.getImportedName(next.getGenPackage().getQualifiedPackageInterfaceName()));
+    stringBuffer.append(TEXT_1506);
+    stringBuffer.append(next.getFeatureAccessorName());
+    stringBuffer.append(TEXT_1507);
+    
+		}
+	}
+} else {
+	GenClass metaClass = genNode.getDomainMetaClass();
+	if (metaClass != null) {
+		List labelNotifyFeatures = metaClass.getLabelNotifyFeatures();
+		for(Iterator it = labelNotifyFeatures.iterator(); it.hasNext(); ) {
+			GenFeature next = (GenFeature) it.next();
+
+    stringBuffer.append(TEXT_1508);
+    stringBuffer.append(importManager.getImportedName(next.getGenPackage().getQualifiedPackageInterfaceName()));
+    stringBuffer.append(TEXT_1509);
+    stringBuffer.append(next.getFeatureAccessorName());
+    stringBuffer.append(TEXT_1510);
+    
+		}
+	}
+
+    
+}
+
+    stringBuffer.append(TEXT_1511);
+    stringBuffer.append(importManager.getImportedName("java.util.List"));
+    stringBuffer.append(TEXT_1512);
+    stringBuffer.append(importManager.getImportedName("java.util.List"));
+    stringBuffer.append(TEXT_1513);
+    stringBuffer.append(importManager.getImportedName("java.util.ArrayList"));
+    stringBuffer.append(TEXT_1514);
+    stringBuffer.append(importManager.getImportedName("java.util.Iterator"));
+    stringBuffer.append(TEXT_1515);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.View"));
+    stringBuffer.append(TEXT_1516);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.View"));
+    stringBuffer.append(TEXT_1517);
+    stringBuffer.append(importManager.getImportedName(genDiagram.getVisualIDRegistryQualifiedClassName()));
+    stringBuffer.append(TEXT_1518);
+    
+	for(Iterator it = genNode.getChildNodes().iterator(); it.hasNext(); ) {
+		GenChildNode next = (GenChildNode)it.next();
+
+    stringBuffer.append(TEXT_1519);
+    stringBuffer.append(importManager.getImportedName(next.getEditPartQualifiedClassName()));
+    stringBuffer.append(TEXT_1520);
+    
+}
+
+    
+		for (Iterator compartments = genNode.getCompartments().iterator(); compartments.hasNext();){
+			GenCompartment next = (GenCompartment) compartments.next();
+
+    stringBuffer.append(TEXT_1521);
+    stringBuffer.append(importManager.getImportedName(next.getEditPartQualifiedClassName()));
+    stringBuffer.append(TEXT_1522);
+    
+}
+
+    stringBuffer.append(TEXT_1523);
     importManager.emitSortedImports();
-    stringBuffer.append(TEXT_1344);
+    stringBuffer.append(TEXT_1524);
     return stringBuffer.toString();
   }
 }
Index: src-templates/org/eclipse/gmf/codegen/templates/lite/parts/DiagramEditPartGenerator.java
===================================================================
RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.codegen.lite/src-templates/org/eclipse/gmf/codegen/templates/lite/parts/DiagramEditPartGenerator.java,v
retrieving revision 1.11
diff -u -r1.11 DiagramEditPartGenerator.java
--- src-templates/org/eclipse/gmf/codegen/templates/lite/parts/DiagramEditPartGenerator.java	6 Sep 2006 20:09:23 -0000	1.11
+++ src-templates/org/eclipse/gmf/codegen/templates/lite/parts/DiagramEditPartGenerator.java	11 Sep 2006 10:18:30 -0000
@@ -97,388 +97,398 @@
   protected final String TEXT_78 = NL + "\t\tinstallLinkNotationModelRefresher();";
   protected final String TEXT_79 = NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected IFigure createFigure() {" + NL + "\t\tIFigure f = new FreeformLayer();" + NL + "\t\tf.setBorder(new MarginBorder(5));" + NL + "\t\tf.setLayoutManager(new FreeformLayout());" + NL + "\t\treturn f;" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic Object getAdapter(Class key) {" + NL + "\t\tif (";
   protected final String TEXT_80 = ".class == key) {" + NL + "\t\t\treturn new ";
-  protected final String TEXT_81 = "(this);" + NL + "\t\t}";
-  protected final String TEXT_82 = NL + "\t\treturn super.getAdapter(key);" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected List getModelChildren() {" + NL + "\t\treturn getDiagram().getVisibleChildren();" + NL + "\t}" + NL;
-  protected final String TEXT_83 = NL;
-  protected final String TEXT_84 = "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate ";
-  protected final String TEXT_85 = "static ";
-  protected final String TEXT_86 = "class Create";
-  protected final String TEXT_87 = "NotationCommand extends ";
-  protected final String TEXT_88 = " {" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tprivate Create";
-  protected final String TEXT_89 = "NotationCommand(";
-  protected final String TEXT_90 = " parent, " + NL + "\t\t\t\t";
-  protected final String TEXT_91 = " domainElement";
-  protected final String TEXT_92 = ", ";
-  protected final String TEXT_93 = " constraint";
-  protected final String TEXT_94 = ") {" + NL + "\t\t\tsuper(parent);" + NL + "\t\t\tNode createdNode = ";
-  protected final String TEXT_95 = ".eINSTANCE.createNode();" + NL + "\t\t\tsetCreatedView(createdNode);" + NL + "\t\t\tcreatedNode.setElement(domainElement);" + NL + "\t\t\t";
-  protected final String TEXT_96 = ".decorateView(createdNode);";
-  protected final String TEXT_97 = NL + "\t\t\t";
-  protected final String TEXT_98 = " bounds = ";
-  protected final String TEXT_99 = ".eINSTANCE.createBounds();" + NL + "\t\t\tcreatedNode.setLayoutConstraint(bounds);" + NL + "\t\t\tbounds.setX(constraint.x);" + NL + "\t\t\tbounds.setY(constraint.y);";
-  protected final String TEXT_100 = NL + "\t\t\tbounds.setWidth(Math.max(constraint.width, ";
-  protected final String TEXT_101 = "));" + NL + "\t\t\tbounds.setHeight(Math.max(constraint.height, ";
-  protected final String TEXT_102 = "));";
-  protected final String TEXT_103 = NL + "\t\t}" + NL + "\t}" + NL;
-  protected final String TEXT_104 = NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate ";
-  protected final String TEXT_105 = "static ";
-  protected final String TEXT_106 = "class Create";
-  protected final String TEXT_107 = "Command extends ";
-  protected final String TEXT_108 = " {" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tprivate final Create";
-  protected final String TEXT_109 = "NotationCommand notationAddCommand;" + NL + "" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tpublic Create";
-  protected final String TEXT_110 = "Command(";
-  protected final String TEXT_111 = " parent, ";
-  protected final String TEXT_112 = " request";
-  protected final String TEXT_113 = ", ";
-  protected final String TEXT_114 = " constraint";
-  protected final String TEXT_115 = ") {" + NL + "\t\t\t";
-  protected final String TEXT_116 = " domainModelEditDomain = ";
-  protected final String TEXT_117 = ".getEditingDomain(parent.getDiagram().getElement());";
-  protected final String TEXT_118 = NL + "\t\t\t";
-  protected final String TEXT_119 = " createdDomainElement = ";
-  protected final String TEXT_120 = ".eINSTANCE.create(" + NL + "\t\t\t\t";
-  protected final String TEXT_121 = ".eINSTANCE.get";
-  protected final String TEXT_122 = "());";
-  protected final String TEXT_123 = NL + "\t\t\t";
-  protected final String TEXT_124 = " createdDomainElement = ";
-  protected final String TEXT_125 = ".eINSTANCE.create";
-  protected final String TEXT_126 = "();";
-  protected final String TEXT_127 = NL + "\t\t\t";
+  protected final String TEXT_81 = "(this);" + NL + "\t\t}" + NL + "\t\tif (";
+  protected final String TEXT_82 = ".class == key) {" + NL + "\t\t\treturn getTreeEditPartAdapter();" + NL + "\t\t}";
+  protected final String TEXT_83 = NL + "\t\treturn super.getAdapter(key);" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate TreeEditPartAdapter myTreeEditPartAdapter;" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate TreeEditPartAdapter getTreeEditPartAdapter() {" + NL + "\t\tif (myTreeEditPartAdapter == null) {" + NL + "\t\t\tmyTreeEditPartAdapter = new TreeEditPartAdapter();" + NL + "\t\t}" + NL + "\t\treturn myTreeEditPartAdapter;" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected List getModelChildren() {" + NL + "\t\treturn getDiagram().getVisibleChildren();" + NL + "\t}" + NL;
+  protected final String TEXT_84 = NL;
+  protected final String TEXT_85 = "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate ";
+  protected final String TEXT_86 = "static ";
+  protected final String TEXT_87 = "class Create";
+  protected final String TEXT_88 = "NotationCommand extends ";
+  protected final String TEXT_89 = " {" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tprivate Create";
+  protected final String TEXT_90 = "NotationCommand(";
+  protected final String TEXT_91 = " parent, " + NL + "\t\t\t\t";
+  protected final String TEXT_92 = " domainElement";
+  protected final String TEXT_93 = ", ";
+  protected final String TEXT_94 = " constraint";
+  protected final String TEXT_95 = ") {" + NL + "\t\t\tsuper(parent);" + NL + "\t\t\tNode createdNode = ";
+  protected final String TEXT_96 = ".eINSTANCE.createNode();" + NL + "\t\t\tsetCreatedView(createdNode);" + NL + "\t\t\tcreatedNode.setElement(domainElement);" + NL + "\t\t\t";
+  protected final String TEXT_97 = ".decorateView(createdNode);";
+  protected final String TEXT_98 = NL + "\t\t\t";
+  protected final String TEXT_99 = " bounds = ";
+  protected final String TEXT_100 = ".eINSTANCE.createBounds();" + NL + "\t\t\tcreatedNode.setLayoutConstraint(bounds);" + NL + "\t\t\tbounds.setX(constraint.x);" + NL + "\t\t\tbounds.setY(constraint.y);";
+  protected final String TEXT_101 = NL + "\t\t\tbounds.setWidth(Math.max(constraint.width, ";
+  protected final String TEXT_102 = "));" + NL + "\t\t\tbounds.setHeight(Math.max(constraint.height, ";
+  protected final String TEXT_103 = "));";
+  protected final String TEXT_104 = NL + "\t\t}" + NL + "\t}" + NL;
+  protected final String TEXT_105 = NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate ";
+  protected final String TEXT_106 = "static ";
+  protected final String TEXT_107 = "class Create";
+  protected final String TEXT_108 = "Command extends ";
+  protected final String TEXT_109 = " {" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tprivate final Create";
+  protected final String TEXT_110 = "NotationCommand notationAddCommand;" + NL + "" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tpublic Create";
+  protected final String TEXT_111 = "Command(";
+  protected final String TEXT_112 = " parent, ";
+  protected final String TEXT_113 = " request";
+  protected final String TEXT_114 = ", ";
+  protected final String TEXT_115 = " constraint";
+  protected final String TEXT_116 = ") {" + NL + "\t\t\t";
+  protected final String TEXT_117 = " domainModelEditDomain = ";
+  protected final String TEXT_118 = ".getEditingDomain(parent.getDiagram().getElement());";
+  protected final String TEXT_119 = NL + "\t\t\t";
+  protected final String TEXT_120 = " createdDomainElement = ";
+  protected final String TEXT_121 = ".eINSTANCE.create(" + NL + "\t\t\t\t";
+  protected final String TEXT_122 = ".eINSTANCE.get";
+  protected final String TEXT_123 = "());";
+  protected final String TEXT_124 = NL + "\t\t\t";
+  protected final String TEXT_125 = " createdDomainElement = ";
+  protected final String TEXT_126 = ".eINSTANCE.create";
+  protected final String TEXT_127 = "();";
   protected final String TEXT_128 = NL + "\t\t\t";
-  protected final String TEXT_129 = ".";
-  protected final String TEXT_130 = ".initializeElement(";
-  protected final String TEXT_131 = "(";
-  protected final String TEXT_132 = ") ";
-  protected final String TEXT_133 = "createdDomainElement);";
-  protected final String TEXT_134 = NL + "\t\t\t";
-  protected final String TEXT_135 = " compoundCommand = new ";
-  protected final String TEXT_136 = "();" + NL + "\t\t\tcompoundCommand.append(";
-  protected final String TEXT_137 = ".create(domainModelEditDomain, ";
-  protected final String TEXT_138 = ", " + NL + "\t\t\t\t";
-  protected final String TEXT_139 = ".eINSTANCE.get";
-  protected final String TEXT_140 = "(), createdDomainElement));" + NL + "\t\t\tcompoundCommand.append(";
-  protected final String TEXT_141 = ".create(domainModelEditDomain, ";
-  protected final String TEXT_142 = ", " + NL + "\t\t\t\t";
-  protected final String TEXT_143 = ".eINSTANCE.get";
-  protected final String TEXT_144 = "(), createdDomainElement));" + NL + "\t\t\tthis.domainModelAddCommand = compoundCommand;";
-  protected final String TEXT_145 = NL + "\t\t\tthis.domainModelAddCommand = ";
-  protected final String TEXT_146 = ".create(domainModelEditDomain, ";
-  protected final String TEXT_147 = ", " + NL + "\t\t\t\t";
-  protected final String TEXT_148 = ".eINSTANCE.get";
-  protected final String TEXT_149 = "(), createdDomainElement);";
-  protected final String TEXT_150 = NL + "\t\t\tthis.notationAddCommand = new Create";
-  protected final String TEXT_151 = "NotationCommand(parent, ";
-  protected final String TEXT_152 = "(";
-  protected final String TEXT_153 = ") ";
-  protected final String TEXT_154 = "createdDomainElement";
-  protected final String TEXT_155 = ", constraint";
-  protected final String TEXT_156 = ");" + NL + "\t\t\trequest.setCreatedObject(notationAddCommand.getCreatedView());" + NL + "\t\t}" + NL + "" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tprivate final org.eclipse.emf.common.command.Command domainModelAddCommand;" + NL + "" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tpublic boolean canExecute() {" + NL + "\t\t\treturn domainModelAddCommand != null" + NL + "\t\t\t\t\t&& domainModelAddCommand.canExecute() && notationAddCommand != null && notationAddCommand.canExecute();" + NL + "\t\t}" + NL + "" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tpublic boolean canUndo() {" + NL + "\t\t\treturn domainModelAddCommand != null" + NL + "\t\t\t\t\t&& domainModelAddCommand.canUndo() && notationAddCommand != null && notationAddCommand.canUndo();" + NL + "\t\t}" + NL + "" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tpublic void execute() {" + NL + "\t\t\tdomainModelAddCommand.execute();" + NL + "\t\t\tnotationAddCommand.execute();" + NL + "\t\t}" + NL + "" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tpublic void undo() {" + NL + "\t\t\tnotationAddCommand.undo();" + NL + "\t\t\tdomainModelAddCommand.undo();" + NL + "\t\t}" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tpublic void redo() {" + NL + "\t\t\texecute();" + NL + "\t\t}" + NL + "\t}";
-  protected final String TEXT_157 = NL;
+  protected final String TEXT_129 = NL + "\t\t\t";
+  protected final String TEXT_130 = ".";
+  protected final String TEXT_131 = ".initializeElement(";
+  protected final String TEXT_132 = "(";
+  protected final String TEXT_133 = ") ";
+  protected final String TEXT_134 = "createdDomainElement);";
+  protected final String TEXT_135 = NL + "\t\t\t";
+  protected final String TEXT_136 = " compoundCommand = new ";
+  protected final String TEXT_137 = "();" + NL + "\t\t\tcompoundCommand.append(";
+  protected final String TEXT_138 = ".create(domainModelEditDomain, ";
+  protected final String TEXT_139 = ", " + NL + "\t\t\t\t";
+  protected final String TEXT_140 = ".eINSTANCE.get";
+  protected final String TEXT_141 = "(), createdDomainElement));" + NL + "\t\t\tcompoundCommand.append(";
+  protected final String TEXT_142 = ".create(domainModelEditDomain, ";
+  protected final String TEXT_143 = ", " + NL + "\t\t\t\t";
+  protected final String TEXT_144 = ".eINSTANCE.get";
+  protected final String TEXT_145 = "(), createdDomainElement));" + NL + "\t\t\tthis.domainModelAddCommand = compoundCommand;";
+  protected final String TEXT_146 = NL + "\t\t\tthis.domainModelAddCommand = ";
+  protected final String TEXT_147 = ".create(domainModelEditDomain, ";
+  protected final String TEXT_148 = ", " + NL + "\t\t\t\t";
+  protected final String TEXT_149 = ".eINSTANCE.get";
+  protected final String TEXT_150 = "(), createdDomainElement);";
+  protected final String TEXT_151 = NL + "\t\t\tthis.notationAddCommand = new Create";
+  protected final String TEXT_152 = "NotationCommand(parent, ";
+  protected final String TEXT_153 = "(";
+  protected final String TEXT_154 = ") ";
+  protected final String TEXT_155 = "createdDomainElement";
+  protected final String TEXT_156 = ", constraint";
+  protected final String TEXT_157 = ");" + NL + "\t\t\trequest.setCreatedObject(notationAddCommand.getCreatedView());" + NL + "\t\t}" + NL + "" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tprivate final org.eclipse.emf.common.command.Command domainModelAddCommand;" + NL + "" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tpublic boolean canExecute() {" + NL + "\t\t\treturn domainModelAddCommand != null" + NL + "\t\t\t\t\t&& domainModelAddCommand.canExecute() && notationAddCommand != null && notationAddCommand.canExecute();" + NL + "\t\t}" + NL + "" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tpublic boolean canUndo() {" + NL + "\t\t\treturn domainModelAddCommand != null" + NL + "\t\t\t\t\t&& domainModelAddCommand.canUndo() && notationAddCommand != null && notationAddCommand.canUndo();" + NL + "\t\t}" + NL + "" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tpublic void execute() {" + NL + "\t\t\tdomainModelAddCommand.execute();" + NL + "\t\t\tnotationAddCommand.execute();" + NL + "\t\t}" + NL + "" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tpublic void undo() {" + NL + "\t\t\tnotationAddCommand.undo();" + NL + "\t\t\tdomainModelAddCommand.undo();" + NL + "\t\t}" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tpublic void redo() {" + NL + "\t\t\texecute();" + NL + "\t\t}" + NL + "\t}";
   protected final String TEXT_158 = NL;
-  protected final String TEXT_159 = "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate ";
-  protected final String TEXT_160 = " structuralFeatures2Refresher;" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic Refresher getRefresher(";
-  protected final String TEXT_161 = " feature, ";
-  protected final String TEXT_162 = " msg) {" + NL + "\t\tif (structuralFeatures2Refresher == null) {" + NL + "\t\t\tcreateRefreshers();" + NL + "\t\t}" + NL + "\t\treturn (Refresher) structuralFeatures2Refresher.get(feature);" + NL + "\t}" + NL + "" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate void createRefreshers() {" + NL + "\t\tstructuralFeatures2Refresher = new HashMap();";
-  protected final String TEXT_163 = NL;
-  protected final String TEXT_164 = "\t\tRefresher childrenRefresher = new Refresher() {" + NL + "\t\t\tpublic void refresh() {" + NL + "\t\t\t\trefreshChildren();" + NL + "\t\t\t}" + NL + "\t\t};" + NL + "\t\tstructuralFeatures2Refresher.put(";
-  protected final String TEXT_165 = ".eINSTANCE.getView_PersistedChildren(), childrenRefresher);" + NL + "\t\tstructuralFeatures2Refresher.put(";
-  protected final String TEXT_166 = ".eINSTANCE.getView_TransientChildren(), childrenRefresher);" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic void activate() {" + NL + "\t\tsuper.activate();" + NL + "\t\tif (!getDiagram().eAdapters().contains(getUpdateManager())) {" + NL + "\t\t\tgetDiagram().eAdapters().add(getUpdateManager());" + NL + "\t\t}" + NL + "\t\tif (!getDiagram().getElement().eAdapters().contains(domainModelRefresher)) {" + NL + "\t\t\tgetDiagram().getElement().eAdapters().add(domainModelRefresher);" + NL + "\t\t}" + NL + "\t\tinstallNotationModelRefresher();";
-  protected final String TEXT_167 = NL + "\t\tinstallLinkNotationModelRefresher();";
-  protected final String TEXT_168 = NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic void deactivate() {";
-  protected final String TEXT_169 = NL + "\t\tuninstallLinkNotationModelRefresher();";
-  protected final String TEXT_170 = NL + "\t\tuninstallNotationModelRefresher();" + NL + "\t\tgetDiagram().getElement().eAdapters().remove(domainModelRefresher);" + NL + "\t\tgetDiagram().eAdapters().remove(getUpdateManager());" + NL + "\t\tsuper.deactivate();" + NL + "\t}" + NL;
-  protected final String TEXT_171 = NL;
-  protected final String TEXT_172 = "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate void installNotationModelRefresher() {" + NL + "\t\t";
-  protected final String TEXT_173 = " refresher = getNotationModelRefresher();" + NL + "\t\tif (refresher.isInstalled()) {" + NL + "\t\t\treturn;" + NL + "\t\t}" + NL + "\t\t";
-  protected final String TEXT_174 = " domainModelEditDomain = ";
-  protected final String TEXT_175 = ".getEditingDomain(";
-  protected final String TEXT_176 = ".getElement());" + NL + "\t\trefresher.install(domainModelEditDomain);" + NL + "\t\trefreshNotationModel();" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate void uninstallNotationModelRefresher() {" + NL + "\t\tgetNotationModelRefresher().uninstall();" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate ";
-  protected final String TEXT_177 = " notationModelRefresher;" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate ";
-  protected final String TEXT_178 = " getNotationModelRefresher() {" + NL + "\t\tif (notationModelRefresher == null) {" + NL + "\t\t\tnotationModelRefresher = new NotationModelRefresher();" + NL + "\t\t}" + NL + "\t\treturn notationModelRefresher;" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate class NotationModelRefresher extends ";
-  protected final String TEXT_179 = " {";
-  protected final String TEXT_180 = NL + NL + "\t\t/**" + NL + "\t\t * NB: Children of this element are selected based on constraint declared in ";
-  protected final String TEXT_181 = ". " + NL + "\t\t * Since no assumptions may be made concerning the runtime behavior of the constraint, <b>any</b> non-touch notification may result in " + NL + "\t\t * notational model having to be updated." + NL + "\t\t * <p/>User is encouraged to change implementation of this method to provide an optimization if it is safe to assume that not all notifications" + NL + "\t\t * result in such an update." + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tprivate ";
-  protected final String TEXT_182 = " getConstrainedChildrenFilter() {" + NL + "\t\t\treturn ";
-  protected final String TEXT_183 = ".NOT_TOUCH;" + NL + "\t\t}";
-  protected final String TEXT_184 = NL + NL + "\t\t/**" + NL + "\t\t * Creates a notification filter which filters notifications that may possibly affect the notational model" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tprotected ";
-  protected final String TEXT_185 = " createFilter() {";
-  protected final String TEXT_186 = NL + "\t\t\t";
-  protected final String TEXT_187 = " filter = ";
-  protected final String TEXT_188 = ".createFeatureFilter(";
-  protected final String TEXT_189 = ".eINSTANCE.get";
-  protected final String TEXT_190 = "());";
-  protected final String TEXT_191 = NL + "\t\t\tfilter = filter.or(";
-  protected final String TEXT_192 = ".createFeatureFilter(";
-  protected final String TEXT_193 = ".eINSTANCE.get";
-  protected final String TEXT_194 = "()));";
-  protected final String TEXT_195 = NL + "\t\t\tfilter = filter.and(";
-  protected final String TEXT_196 = ".createNotifierFilter(";
-  protected final String TEXT_197 = ".getElement()));";
-  protected final String TEXT_198 = NL + "\t\t\t";
-  protected final String TEXT_199 = " filter = ";
-  protected final String TEXT_200 = ".createNotifierFilter(";
-  protected final String TEXT_201 = ".getElement());";
-  protected final String TEXT_202 = NL + "\t\t\tfilter = getConstrainedChildrenFilter().or(filter);";
-  protected final String TEXT_203 = NL + "\t\t\t";
-  protected final String TEXT_204 = " filter = getConstrainedChildrenFilter();";
-  protected final String TEXT_205 = NL + "\t\t\t";
-  protected final String TEXT_206 = " filter = ";
-  protected final String TEXT_207 = ".NOT_TOUCH;";
-  protected final String TEXT_208 = NL + "\t\t\treturn filter;";
-  protected final String TEXT_209 = NL + "\t\t}" + NL + "" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tprotected ";
-  protected final String TEXT_210 = " getCreateNotationalElementCommand(";
-  protected final String TEXT_211 = " descriptor) {" + NL + "\t\t\t";
-  protected final String TEXT_212 = " domainElement = descriptor.getElement();" + NL + "\t\t\tint nodeVisualID = descriptor.getVisualID();" + NL + "\t\t\tswitch (nodeVisualID) {";
-  protected final String TEXT_213 = NL + "\t\t\tcase ";
-  protected final String TEXT_214 = ".VISUAL_ID:" + NL + "\t\t\t\tif (domainElement instanceof ";
-  protected final String TEXT_215 = ") {" + NL + "\t\t\t\t\treturn new Create";
-  protected final String TEXT_216 = "NotationCommand(getHost(), domainElement";
-  protected final String TEXT_217 = ", new Rectangle(0, 0, 0, 0)";
-  protected final String TEXT_218 = ");" + NL + "\t\t\t\t}" + NL + "\t\t\t\treturn null;";
-  protected final String TEXT_219 = NL + "\t\t\tdefault:" + NL + "\t\t\t\treturn null;" + NL + "\t\t\t}" + NL + "\t\t}" + NL + "" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tprotected ";
-  protected final String TEXT_220 = " getSemanticChildNodes() {";
-  protected final String TEXT_221 = NL;
-  protected final String TEXT_222 = NL + "\treturn ";
-  protected final String TEXT_223 = ".EMPTY_LIST;";
-  protected final String TEXT_224 = NL + "\t";
-  protected final String TEXT_225 = " result = new ";
-  protected final String TEXT_226 = "();";
-  protected final String TEXT_227 = NL + "\t";
-  protected final String TEXT_228 = " viewObject = ";
-  protected final String TEXT_229 = ";" + NL + "\t";
-  protected final String TEXT_230 = " modelObject = viewObject.getElement();" + NL + "\t";
-  protected final String TEXT_231 = " nextValue;" + NL + "\tint nodeVID;";
-  protected final String TEXT_232 = NL + "\tfor(";
-  protected final String TEXT_233 = " it = ";
-  protected final String TEXT_234 = ".iterator(); it.hasNext(); ) {" + NL + "\t\tnextValue = (";
-  protected final String TEXT_235 = ") it.next();";
-  protected final String TEXT_236 = NL + "\tnextValue = (";
-  protected final String TEXT_237 = ")";
-  protected final String TEXT_238 = ";";
-  protected final String TEXT_239 = NL + "\tnodeVID = ";
-  protected final String TEXT_240 = ".INSTANCE.getNodeVisualID(viewObject, nextValue);";
-  protected final String TEXT_241 = NL + "\tswitch (nodeVID) {";
-  protected final String TEXT_242 = NL + "\tcase ";
-  protected final String TEXT_243 = ".VISUAL_ID: {";
-  protected final String TEXT_244 = NL + "\tif (";
-  protected final String TEXT_245 = ".VISUAL_ID == nodeVID) {";
-  protected final String TEXT_246 = NL + "\t\tresult.add(new ";
-  protected final String TEXT_247 = "(nextValue, nodeVID));";
-  protected final String TEXT_248 = NL + "\t\tbreak;" + NL + "\t\t}";
-  protected final String TEXT_249 = NL + "\t\t}";
-  protected final String TEXT_250 = NL + "\t}";
+  protected final String TEXT_159 = NL;
+  protected final String TEXT_160 = "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate ";
+  protected final String TEXT_161 = " structuralFeatures2Refresher;" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic Refresher getRefresher(";
+  protected final String TEXT_162 = " feature, ";
+  protected final String TEXT_163 = " msg) {" + NL + "\t\tif (structuralFeatures2Refresher == null) {" + NL + "\t\t\tcreateRefreshers();" + NL + "\t\t}" + NL + "\t\treturn (Refresher) structuralFeatures2Refresher.get(feature);" + NL + "\t}" + NL + "" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate void createRefreshers() {" + NL + "\t\tstructuralFeatures2Refresher = new HashMap();";
+  protected final String TEXT_164 = NL;
+  protected final String TEXT_165 = "\t\tRefresher childrenRefresher = new Refresher() {" + NL + "\t\t\tpublic void refresh() {" + NL + "\t\t\t\trefreshChildren();" + NL + "\t\t\t}" + NL + "\t\t};" + NL + "\t\tstructuralFeatures2Refresher.put(";
+  protected final String TEXT_166 = ".eINSTANCE.getView_PersistedChildren(), childrenRefresher);" + NL + "\t\tstructuralFeatures2Refresher.put(";
+  protected final String TEXT_167 = ".eINSTANCE.getView_TransientChildren(), childrenRefresher);" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic void activate() {" + NL + "\t\tsuper.activate();" + NL + "\t\tif (!getDiagram().eAdapters().contains(getUpdateManager())) {" + NL + "\t\t\tgetDiagram().eAdapters().add(getUpdateManager());" + NL + "\t\t}" + NL + "\t\tif (!getDiagram().getElement().eAdapters().contains(domainModelRefresher)) {" + NL + "\t\t\tgetDiagram().getElement().eAdapters().add(domainModelRefresher);" + NL + "\t\t}" + NL + "\t\tinstallNotationModelRefresher();";
+  protected final String TEXT_168 = NL + "\t\tinstallLinkNotationModelRefresher();";
+  protected final String TEXT_169 = NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic void deactivate() {";
+  protected final String TEXT_170 = NL + "\t\tuninstallLinkNotationModelRefresher();";
+  protected final String TEXT_171 = NL + "\t\tuninstallNotationModelRefresher();" + NL + "\t\tgetDiagram().getElement().eAdapters().remove(domainModelRefresher);" + NL + "\t\tgetDiagram().eAdapters().remove(getUpdateManager());" + NL + "\t\tsuper.deactivate();" + NL + "\t}" + NL;
+  protected final String TEXT_172 = NL;
+  protected final String TEXT_173 = "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate void installNotationModelRefresher() {" + NL + "\t\t";
+  protected final String TEXT_174 = " refresher = getNotationModelRefresher();" + NL + "\t\tif (refresher.isInstalled()) {" + NL + "\t\t\treturn;" + NL + "\t\t}" + NL + "\t\t";
+  protected final String TEXT_175 = " domainModelEditDomain = ";
+  protected final String TEXT_176 = ".getEditingDomain(";
+  protected final String TEXT_177 = ".getElement());" + NL + "\t\trefresher.install(domainModelEditDomain);" + NL + "\t\trefreshNotationModel();" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate void uninstallNotationModelRefresher() {" + NL + "\t\tgetNotationModelRefresher().uninstall();" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate ";
+  protected final String TEXT_178 = " notationModelRefresher;" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate ";
+  protected final String TEXT_179 = " getNotationModelRefresher() {" + NL + "\t\tif (notationModelRefresher == null) {" + NL + "\t\t\tnotationModelRefresher = new NotationModelRefresher();" + NL + "\t\t}" + NL + "\t\treturn notationModelRefresher;" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate class NotationModelRefresher extends ";
+  protected final String TEXT_180 = " {";
+  protected final String TEXT_181 = NL + NL + "\t\t/**" + NL + "\t\t * NB: Children of this element are selected based on constraint declared in ";
+  protected final String TEXT_182 = ". " + NL + "\t\t * Since no assumptions may be made concerning the runtime behavior of the constraint, <b>any</b> non-touch notification may result in " + NL + "\t\t * notational model having to be updated." + NL + "\t\t * <p/>User is encouraged to change implementation of this method to provide an optimization if it is safe to assume that not all notifications" + NL + "\t\t * result in such an update." + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tprivate ";
+  protected final String TEXT_183 = " getConstrainedChildrenFilter() {" + NL + "\t\t\treturn ";
+  protected final String TEXT_184 = ".NOT_TOUCH;" + NL + "\t\t}";
+  protected final String TEXT_185 = NL + NL + "\t\t/**" + NL + "\t\t * Creates a notification filter which filters notifications that may possibly affect the notational model" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tprotected ";
+  protected final String TEXT_186 = " createFilter() {";
+  protected final String TEXT_187 = NL + "\t\t\t";
+  protected final String TEXT_188 = " filter = ";
+  protected final String TEXT_189 = ".createFeatureFilter(";
+  protected final String TEXT_190 = ".eINSTANCE.get";
+  protected final String TEXT_191 = "());";
+  protected final String TEXT_192 = NL + "\t\t\tfilter = filter.or(";
+  protected final String TEXT_193 = ".createFeatureFilter(";
+  protected final String TEXT_194 = ".eINSTANCE.get";
+  protected final String TEXT_195 = "()));";
+  protected final String TEXT_196 = NL + "\t\t\tfilter = filter.and(";
+  protected final String TEXT_197 = ".createNotifierFilter(";
+  protected final String TEXT_198 = ".getElement()));";
+  protected final String TEXT_199 = NL + "\t\t\t";
+  protected final String TEXT_200 = " filter = ";
+  protected final String TEXT_201 = ".createNotifierFilter(";
+  protected final String TEXT_202 = ".getElement());";
+  protected final String TEXT_203 = NL + "\t\t\tfilter = getConstrainedChildrenFilter().or(filter);";
+  protected final String TEXT_204 = NL + "\t\t\t";
+  protected final String TEXT_205 = " filter = getConstrainedChildrenFilter();";
+  protected final String TEXT_206 = NL + "\t\t\t";
+  protected final String TEXT_207 = " filter = ";
+  protected final String TEXT_208 = ".NOT_TOUCH;";
+  protected final String TEXT_209 = NL + "\t\t\treturn filter;";
+  protected final String TEXT_210 = NL + "\t\t}" + NL + "" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tprotected ";
+  protected final String TEXT_211 = " getCreateNotationalElementCommand(";
+  protected final String TEXT_212 = " descriptor) {" + NL + "\t\t\t";
+  protected final String TEXT_213 = " domainElement = descriptor.getElement();" + NL + "\t\t\tint nodeVisualID = descriptor.getVisualID();" + NL + "\t\t\tswitch (nodeVisualID) {";
+  protected final String TEXT_214 = NL + "\t\t\tcase ";
+  protected final String TEXT_215 = ".VISUAL_ID:" + NL + "\t\t\t\tif (domainElement instanceof ";
+  protected final String TEXT_216 = ") {" + NL + "\t\t\t\t\treturn new Create";
+  protected final String TEXT_217 = "NotationCommand(getHost(), domainElement";
+  protected final String TEXT_218 = ", new Rectangle(0, 0, 0, 0)";
+  protected final String TEXT_219 = ");" + NL + "\t\t\t\t}" + NL + "\t\t\t\treturn null;";
+  protected final String TEXT_220 = NL + "\t\t\tdefault:" + NL + "\t\t\t\treturn null;" + NL + "\t\t\t}" + NL + "\t\t}" + NL + "" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tprotected ";
+  protected final String TEXT_221 = " getSemanticChildNodes() {";
+  protected final String TEXT_222 = NL;
+  protected final String TEXT_223 = NL + "\treturn ";
+  protected final String TEXT_224 = ".EMPTY_LIST;";
+  protected final String TEXT_225 = NL + "\t";
+  protected final String TEXT_226 = " result = new ";
+  protected final String TEXT_227 = "();";
+  protected final String TEXT_228 = NL + "\t";
+  protected final String TEXT_229 = " viewObject = ";
+  protected final String TEXT_230 = ";" + NL + "\t";
+  protected final String TEXT_231 = " modelObject = viewObject.getElement();" + NL + "\t";
+  protected final String TEXT_232 = " nextValue;" + NL + "\tint nodeVID;";
+  protected final String TEXT_233 = NL + "\tfor(";
+  protected final String TEXT_234 = " it = ";
+  protected final String TEXT_235 = ".iterator(); it.hasNext(); ) {" + NL + "\t\tnextValue = (";
+  protected final String TEXT_236 = ") it.next();";
+  protected final String TEXT_237 = NL + "\tnextValue = (";
+  protected final String TEXT_238 = ")";
+  protected final String TEXT_239 = ";";
+  protected final String TEXT_240 = NL + "\tnodeVID = ";
+  protected final String TEXT_241 = ".INSTANCE.getNodeVisualID(viewObject, nextValue);";
+  protected final String TEXT_242 = NL + "\tswitch (nodeVID) {";
+  protected final String TEXT_243 = NL + "\tcase ";
+  protected final String TEXT_244 = ".VISUAL_ID: {";
+  protected final String TEXT_245 = NL + "\tif (";
+  protected final String TEXT_246 = ".VISUAL_ID == nodeVID) {";
+  protected final String TEXT_247 = NL + "\t\tresult.add(new ";
+  protected final String TEXT_248 = "(nextValue, nodeVID));";
+  protected final String TEXT_249 = NL + "\t\tbreak;" + NL + "\t\t}";
+  protected final String TEXT_250 = NL + "\t\t}";
   protected final String TEXT_251 = NL + "\t}";
-  protected final String TEXT_252 = NL + "\treturn result;";
-  protected final String TEXT_253 = NL + "\t\t}" + NL + "" + NL + "\t\t/**" + NL + "\t\t * Returns whether a notational element should be created for the given domain element. " + NL + "\t\t * The generated code always returns ";
-  protected final String TEXT_254 = ". " + NL + "\t\t * User can change implementation of this method to handle a more sophisticated logic." + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tprotected boolean shouldCreateView(";
-  protected final String TEXT_255 = " descriptor) {" + NL + "\t\t\treturn ";
-  protected final String TEXT_256 = ";" + NL + "\t\t}" + NL + "" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tprotected ";
-  protected final String TEXT_257 = " getHost() {" + NL + "\t\t\treturn ";
-  protected final String TEXT_258 = ";" + NL + "\t\t}" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected void refreshNotationModel() {" + NL + "\t\t";
-  protected final String TEXT_259 = " childRefresher = getNotationModelRefresher();" + NL + "\t\tif (!childRefresher.isInstalled()) {" + NL + "\t\t\treturn;" + NL + "\t\t}" + NL + "\t\t";
-  protected final String TEXT_260 = " command = childRefresher.buildRefreshNotationModelCommand();" + NL + "\t\tif (command == null) {" + NL + "\t\t\treturn;" + NL + "\t\t}" + NL + "\t\t";
-  protected final String TEXT_261 = " domainModelEditDomain = ";
-  protected final String TEXT_262 = ".getEditingDomain(";
-  protected final String TEXT_263 = ".getElement());" + NL + "\t\tgetViewer().getEditDomain().getCommandStack().execute(new ";
-  protected final String TEXT_264 = "(domainModelEditDomain, command));" + NL + "\t}" + NL + NL;
-  protected final String TEXT_265 = NL;
-  protected final String TEXT_266 = NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate void installLinkNotationModelRefresher() {" + NL + "\t\tLinkNotationModelRefresher refresher = getLinkNotationModelRefresher();" + NL + "\t\tif (refresher.isInstalled()) {" + NL + "\t\t\treturn;" + NL + "\t\t}" + NL + "\t\t";
-  protected final String TEXT_267 = " domainModelEditDomain = ";
-  protected final String TEXT_268 = ".getEditingDomain(";
-  protected final String TEXT_269 = ".getElement());" + NL + "\t\trefresher.install(domainModelEditDomain);" + NL + "\t\trefreshLinkNotationModel();" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate void uninstallLinkNotationModelRefresher() {" + NL + "\t\tgetLinkNotationModelRefresher().uninstall();" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate LinkNotationModelRefresher linkNotationModelRefresher;" + NL + "" + NL + "\t/**" + NL + "\t * Service to find a notational element that corresponds to the given underlying domain element. " + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate ";
-  protected final String TEXT_270 = " viewService;" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate ";
-  protected final String TEXT_271 = " getViewService() {" + NL + "\t\tif (viewService == null) {" + NL + "\t\t\tviewService = new ";
-  protected final String TEXT_272 = "(getViewer());" + NL + "\t\t}" + NL + "\t\treturn viewService;" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate LinkNotationModelRefresher getLinkNotationModelRefresher() {" + NL + "\t\tif (linkNotationModelRefresher == null) {" + NL + "\t\t\tlinkNotationModelRefresher = new LinkNotationModelRefresher(getViewService());" + NL + "\t\t}" + NL + "\t\treturn linkNotationModelRefresher;" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate class LinkNotationModelRefresher extends ";
-  protected final String TEXT_273 = " {" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tpublic LinkNotationModelRefresher(";
-  protected final String TEXT_274 = " viewService) {" + NL + "\t\t\tsuper(viewService);" + NL + "\t\t}";
-  protected final String TEXT_275 = NL + NL + "\t\t/**" + NL + "\t\t * NB: Child links of this element are selected based on constraint declared in ";
-  protected final String TEXT_276 = ". " + NL + "\t\t * Since no assumptions may be made concerning the runtime behavior of the constraint, <b>any</b> non-touch notification may result in " + NL + "\t\t * notational model having to be updated." + NL + "\t\t * <p/>User is encouraged to change implementation of this method to provide an optimization if it is safe to assume that not all notifications" + NL + "\t\t * result in such an update." + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tprivate ";
-  protected final String TEXT_277 = " getConstrainedChildLinksFilter() {" + NL + "\t\t\treturn ";
-  protected final String TEXT_278 = ".NOT_TOUCH;" + NL + "\t\t}";
-  protected final String TEXT_279 = NL + "\t\t/**" + NL + "\t\t * Creates a notification filter which filters notifications that may possibly result in uncontained links. " + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tprivate ";
-  protected final String TEXT_280 = " createUncontainedLinksFilter() {" + NL + "\t\t\treturn ";
-  protected final String TEXT_281 = ".createEventTypeFilter(";
-  protected final String TEXT_282 = ".SET).or(" + NL + "\t\t\t\t";
-  protected final String TEXT_283 = ".createEventTypeFilter(";
-  protected final String TEXT_284 = ".UNSET).or(" + NL + "\t\t\t\t";
-  protected final String TEXT_285 = ".createEventTypeFilter(";
-  protected final String TEXT_286 = ".REMOVE).or(" + NL + "\t\t\t\t";
-  protected final String TEXT_287 = ".createEventTypeFilter(";
-  protected final String TEXT_288 = ".REMOVE_MANY)" + NL + "\t\t\t)));" + NL + "\t\t}";
-  protected final String TEXT_289 = NL + "\t\t/**" + NL + "\t\t * Creates a notification filter which filters notifications that may possibly affect the notational model" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tprotected ";
-  protected final String TEXT_290 = " createFilter() {";
-  protected final String TEXT_291 = NL;
-  protected final String TEXT_292 = NL + "\t\t\t";
-  protected final String TEXT_293 = " filter = ";
-  protected final String TEXT_294 = ".createFeatureFilter(";
-  protected final String TEXT_295 = ".eINSTANCE.get";
-  protected final String TEXT_296 = "());";
-  protected final String TEXT_297 = NL + "\t\t\tfilter = filter.or(";
-  protected final String TEXT_298 = ".createFeatureFilter(";
-  protected final String TEXT_299 = ".eINSTANCE.get";
-  protected final String TEXT_300 = "()));";
-  protected final String TEXT_301 = NL;
-  protected final String TEXT_302 = NL + "\t\t\t";
-  protected final String TEXT_303 = " filter = ";
-  protected final String TEXT_304 = ".createFeatureFilter(";
-  protected final String TEXT_305 = ".eINSTANCE.get";
-  protected final String TEXT_306 = "());";
-  protected final String TEXT_307 = NL + "\t\t\tfilter = filter.or(";
-  protected final String TEXT_308 = ".createFeatureFilter(";
-  protected final String TEXT_309 = ".eINSTANCE.get";
-  protected final String TEXT_310 = "()));";
-  protected final String TEXT_311 = NL;
-  protected final String TEXT_312 = NL + "\t\t\t";
-  protected final String TEXT_313 = " filter = ";
-  protected final String TEXT_314 = ".createFeatureFilter(";
-  protected final String TEXT_315 = ".eINSTANCE.get";
-  protected final String TEXT_316 = "());";
-  protected final String TEXT_317 = NL + "\t\t\tfilter = filter.or(";
-  protected final String TEXT_318 = ".createFeatureFilter(";
-  protected final String TEXT_319 = ".eINSTANCE.get";
-  protected final String TEXT_320 = "()));";
-  protected final String TEXT_321 = NL;
-  protected final String TEXT_322 = NL + "\t\t\t";
-  protected final String TEXT_323 = " filter = ";
-  protected final String TEXT_324 = ".createFeatureFilter(";
-  protected final String TEXT_325 = ".eINSTANCE.get";
-  protected final String TEXT_326 = "());";
-  protected final String TEXT_327 = NL + "\t\t\tfilter = filter.or(";
-  protected final String TEXT_328 = ".createFeatureFilter(";
-  protected final String TEXT_329 = ".eINSTANCE.get";
-  protected final String TEXT_330 = "()));";
-  protected final String TEXT_331 = NL + "\t\t\tfilter = getConstrainedChildLinksFilter().or(filter);";
-  protected final String TEXT_332 = NL + "\t\t\t";
-  protected final String TEXT_333 = " filter = getConstrainedChildLinksFilter();";
-  protected final String TEXT_334 = NL + "\t\t\tfilter = filter.or(createUncontainedLinksFilter());";
-  protected final String TEXT_335 = NL + "\t\t\t";
-  protected final String TEXT_336 = " filter = createUncontainedLinksFilter();";
-  protected final String TEXT_337 = NL + "\t\t\t";
-  protected final String TEXT_338 = " filter = ";
-  protected final String TEXT_339 = ".NOT_TOUCH;";
-  protected final String TEXT_340 = NL + "\t\t\treturn filter;" + NL + "\t\t}" + NL + "" + NL + "\t\t/**" + NL + "\t \t * @generated" + NL + "\t \t */" + NL + "\t\tprotected ";
-  protected final String TEXT_341 = " getCreateNotationalElementCommand(";
-  protected final String TEXT_342 = " descriptor) {" + NL + "\t\t\t";
-  protected final String TEXT_343 = " linkDescriptor = (";
-  protected final String TEXT_344 = ") descriptor;" + NL + "\t\t\t";
-  protected final String TEXT_345 = " sourceView = getViewService().findView(linkDescriptor.getSource());" + NL + "\t\t\t";
-  protected final String TEXT_346 = " targetView = getViewService().findView(linkDescriptor.getDestination());" + NL + "\t\t\tif (sourceView == null || targetView == null) {" + NL + "\t\t\t\treturn null;" + NL + "\t\t\t}" + NL + "\t\t\t";
-  protected final String TEXT_347 = " createdEdge = ";
-  protected final String TEXT_348 = ".eINSTANCE.createEdge();" + NL + "\t\t\tswitch (linkDescriptor.getVisualID()) {";
-  protected final String TEXT_349 = NL + "\t\t\tcase ";
-  protected final String TEXT_350 = ".VISUAL_ID:" + NL + "\t\t\t\tif (linkDescriptor.getElement() instanceof ";
-  protected final String TEXT_351 = ") {" + NL + "\t\t\t\t\tcreatedEdge.setElement(linkDescriptor.getElement());" + NL + "\t\t\t\t\t";
-  protected final String TEXT_352 = ".decorateView(createdEdge);" + NL + "\t\t\t\t}" + NL + "\t\t\t\tbreak;";
-  protected final String TEXT_353 = NL + "\t\t\tcase ";
-  protected final String TEXT_354 = ".VISUAL_ID:" + NL + "\t\t\t\tif (linkDescriptor.getElement() == null) {" + NL + "\t\t\t\t\tcreatedEdge.setElement(null);" + NL + "\t\t\t\t\t";
-  protected final String TEXT_355 = ".decorateView(createdEdge);" + NL + "\t\t\t\t}" + NL + "\t\t\t\tbreak;";
-  protected final String TEXT_356 = NL + "\t\t\t}" + NL + "\t\t\tif (createdEdge.getType() == null) {" + NL + "\t\t\t\treturn null;" + NL + "\t\t\t}" + NL + "\t\t\treturn new ";
-  protected final String TEXT_357 = "(getHost().getDiagram(), createdEdge, sourceView, targetView);" + NL + "\t\t}" + NL + "" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tprotected ";
-  protected final String TEXT_358 = " getSemanticChildLinks() {";
-  protected final String TEXT_359 = NL;
-  protected final String TEXT_360 = "\t";
-  protected final String TEXT_361 = " result = new ";
-  protected final String TEXT_362 = "();";
-  protected final String TEXT_363 = NL + "\t";
-  protected final String TEXT_364 = " modelObject = ";
-  protected final String TEXT_365 = ".getElement();" + NL + "\t";
-  protected final String TEXT_366 = " nextValue;";
-  protected final String TEXT_367 = NL + "\tint linkVID;";
-  protected final String TEXT_368 = NL + "\tfor(";
-  protected final String TEXT_369 = " it = ";
-  protected final String TEXT_370 = ".iterator(); it.hasNext(); ) {" + NL + "\t\tnextValue = (";
-  protected final String TEXT_371 = ") it.next();";
-  protected final String TEXT_372 = NL + "\tnextValue = (";
-  protected final String TEXT_373 = ")";
-  protected final String TEXT_374 = ";";
-  protected final String TEXT_375 = NL + "\tlinkVID = ";
-  protected final String TEXT_376 = ".INSTANCE.getLinkWithClassVisualID(nextValue);";
-  protected final String TEXT_377 = NL + "\tswitch (linkVID) {";
-  protected final String TEXT_378 = NL + "\tcase ";
-  protected final String TEXT_379 = ".VISUAL_ID: {";
-  protected final String TEXT_380 = NL + "\tif (";
-  protected final String TEXT_381 = ".VISUAL_ID == linkVID) {";
-  protected final String TEXT_382 = NL + "\t\t";
-  protected final String TEXT_383 = " source = (";
-  protected final String TEXT_384 = ")";
-  protected final String TEXT_385 = ";";
-  protected final String TEXT_386 = NL + "\t\t";
-  protected final String TEXT_387 = " source = ";
-  protected final String TEXT_388 = ".getElement();";
-  protected final String TEXT_389 = NL + "\t\t";
-  protected final String TEXT_390 = " target = (";
-  protected final String TEXT_391 = ")";
-  protected final String TEXT_392 = ";";
-  protected final String TEXT_393 = NL + "\t\t";
-  protected final String TEXT_394 = " target = ";
-  protected final String TEXT_395 = ".getElement();";
-  protected final String TEXT_396 = NL + "\t\tif (source != null && target != null) {" + NL + "\t\t\tresult.add(new ";
-  protected final String TEXT_397 = "(source, target, nextValue, linkVID));" + NL + "\t\t}";
-  protected final String TEXT_398 = NL + "\t\tbreak;" + NL + "\t}";
-  protected final String TEXT_399 = NL + "\t}";
+  protected final String TEXT_252 = NL + "\t}";
+  protected final String TEXT_253 = NL + "\treturn result;";
+  protected final String TEXT_254 = NL + "\t\t}" + NL + "" + NL + "\t\t/**" + NL + "\t\t * Returns whether a notational element should be created for the given domain element. " + NL + "\t\t * The generated code always returns ";
+  protected final String TEXT_255 = ". " + NL + "\t\t * User can change implementation of this method to handle a more sophisticated logic." + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tprotected boolean shouldCreateView(";
+  protected final String TEXT_256 = " descriptor) {" + NL + "\t\t\treturn ";
+  protected final String TEXT_257 = ";" + NL + "\t\t}" + NL + "" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tprotected ";
+  protected final String TEXT_258 = " getHost() {" + NL + "\t\t\treturn ";
+  protected final String TEXT_259 = ";" + NL + "\t\t}" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected void refreshNotationModel() {" + NL + "\t\t";
+  protected final String TEXT_260 = " childRefresher = getNotationModelRefresher();" + NL + "\t\tif (!childRefresher.isInstalled()) {" + NL + "\t\t\treturn;" + NL + "\t\t}" + NL + "\t\t";
+  protected final String TEXT_261 = " command = childRefresher.buildRefreshNotationModelCommand();" + NL + "\t\tif (command == null) {" + NL + "\t\t\treturn;" + NL + "\t\t}" + NL + "\t\t";
+  protected final String TEXT_262 = " domainModelEditDomain = ";
+  protected final String TEXT_263 = ".getEditingDomain(";
+  protected final String TEXT_264 = ".getElement());" + NL + "\t\tgetViewer().getEditDomain().getCommandStack().execute(new ";
+  protected final String TEXT_265 = "(domainModelEditDomain, command));" + NL + "\t}" + NL + NL;
+  protected final String TEXT_266 = NL;
+  protected final String TEXT_267 = NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate void installLinkNotationModelRefresher() {" + NL + "\t\tLinkNotationModelRefresher refresher = getLinkNotationModelRefresher();" + NL + "\t\tif (refresher.isInstalled()) {" + NL + "\t\t\treturn;" + NL + "\t\t}" + NL + "\t\t";
+  protected final String TEXT_268 = " domainModelEditDomain = ";
+  protected final String TEXT_269 = ".getEditingDomain(";
+  protected final String TEXT_270 = ".getElement());" + NL + "\t\trefresher.install(domainModelEditDomain);" + NL + "\t\trefreshLinkNotationModel();" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate void uninstallLinkNotationModelRefresher() {" + NL + "\t\tgetLinkNotationModelRefresher().uninstall();" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate LinkNotationModelRefresher linkNotationModelRefresher;" + NL + "" + NL + "\t/**" + NL + "\t * Service to find a notational element that corresponds to the given underlying domain element. " + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate ";
+  protected final String TEXT_271 = " viewService;" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate ";
+  protected final String TEXT_272 = " getViewService() {" + NL + "\t\tif (viewService == null) {" + NL + "\t\t\tviewService = new ";
+  protected final String TEXT_273 = "(getViewer());" + NL + "\t\t}" + NL + "\t\treturn viewService;" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate LinkNotationModelRefresher getLinkNotationModelRefresher() {" + NL + "\t\tif (linkNotationModelRefresher == null) {" + NL + "\t\t\tlinkNotationModelRefresher = new LinkNotationModelRefresher(getViewService());" + NL + "\t\t}" + NL + "\t\treturn linkNotationModelRefresher;" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate class LinkNotationModelRefresher extends ";
+  protected final String TEXT_274 = " {" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tpublic LinkNotationModelRefresher(";
+  protected final String TEXT_275 = " viewService) {" + NL + "\t\t\tsuper(viewService);" + NL + "\t\t}";
+  protected final String TEXT_276 = NL + NL + "\t\t/**" + NL + "\t\t * NB: Child links of this element are selected based on constraint declared in ";
+  protected final String TEXT_277 = ". " + NL + "\t\t * Since no assumptions may be made concerning the runtime behavior of the constraint, <b>any</b> non-touch notification may result in " + NL + "\t\t * notational model having to be updated." + NL + "\t\t * <p/>User is encouraged to change implementation of this method to provide an optimization if it is safe to assume that not all notifications" + NL + "\t\t * result in such an update." + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tprivate ";
+  protected final String TEXT_278 = " getConstrainedChildLinksFilter() {" + NL + "\t\t\treturn ";
+  protected final String TEXT_279 = ".NOT_TOUCH;" + NL + "\t\t}";
+  protected final String TEXT_280 = NL + "\t\t/**" + NL + "\t\t * Creates a notification filter which filters notifications that may possibly result in uncontained links. " + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tprivate ";
+  protected final String TEXT_281 = " createUncontainedLinksFilter() {" + NL + "\t\t\treturn ";
+  protected final String TEXT_282 = ".createEventTypeFilter(";
+  protected final String TEXT_283 = ".SET).or(" + NL + "\t\t\t\t";
+  protected final String TEXT_284 = ".createEventTypeFilter(";
+  protected final String TEXT_285 = ".UNSET).or(" + NL + "\t\t\t\t";
+  protected final String TEXT_286 = ".createEventTypeFilter(";
+  protected final String TEXT_287 = ".REMOVE).or(" + NL + "\t\t\t\t";
+  protected final String TEXT_288 = ".createEventTypeFilter(";
+  protected final String TEXT_289 = ".REMOVE_MANY)" + NL + "\t\t\t)));" + NL + "\t\t}";
+  protected final String TEXT_290 = NL + "\t\t/**" + NL + "\t\t * Creates a notification filter which filters notifications that may possibly affect the notational model" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tprotected ";
+  protected final String TEXT_291 = " createFilter() {";
+  protected final String TEXT_292 = NL;
+  protected final String TEXT_293 = NL + "\t\t\t";
+  protected final String TEXT_294 = " filter = ";
+  protected final String TEXT_295 = ".createFeatureFilter(";
+  protected final String TEXT_296 = ".eINSTANCE.get";
+  protected final String TEXT_297 = "());";
+  protected final String TEXT_298 = NL + "\t\t\tfilter = filter.or(";
+  protected final String TEXT_299 = ".createFeatureFilter(";
+  protected final String TEXT_300 = ".eINSTANCE.get";
+  protected final String TEXT_301 = "()));";
+  protected final String TEXT_302 = NL;
+  protected final String TEXT_303 = NL + "\t\t\t";
+  protected final String TEXT_304 = " filter = ";
+  protected final String TEXT_305 = ".createFeatureFilter(";
+  protected final String TEXT_306 = ".eINSTANCE.get";
+  protected final String TEXT_307 = "());";
+  protected final String TEXT_308 = NL + "\t\t\tfilter = filter.or(";
+  protected final String TEXT_309 = ".createFeatureFilter(";
+  protected final String TEXT_310 = ".eINSTANCE.get";
+  protected final String TEXT_311 = "()));";
+  protected final String TEXT_312 = NL;
+  protected final String TEXT_313 = NL + "\t\t\t";
+  protected final String TEXT_314 = " filter = ";
+  protected final String TEXT_315 = ".createFeatureFilter(";
+  protected final String TEXT_316 = ".eINSTANCE.get";
+  protected final String TEXT_317 = "());";
+  protected final String TEXT_318 = NL + "\t\t\tfilter = filter.or(";
+  protected final String TEXT_319 = ".createFeatureFilter(";
+  protected final String TEXT_320 = ".eINSTANCE.get";
+  protected final String TEXT_321 = "()));";
+  protected final String TEXT_322 = NL;
+  protected final String TEXT_323 = NL + "\t\t\t";
+  protected final String TEXT_324 = " filter = ";
+  protected final String TEXT_325 = ".createFeatureFilter(";
+  protected final String TEXT_326 = ".eINSTANCE.get";
+  protected final String TEXT_327 = "());";
+  protected final String TEXT_328 = NL + "\t\t\tfilter = filter.or(";
+  protected final String TEXT_329 = ".createFeatureFilter(";
+  protected final String TEXT_330 = ".eINSTANCE.get";
+  protected final String TEXT_331 = "()));";
+  protected final String TEXT_332 = NL + "\t\t\tfilter = getConstrainedChildLinksFilter().or(filter);";
+  protected final String TEXT_333 = NL + "\t\t\t";
+  protected final String TEXT_334 = " filter = getConstrainedChildLinksFilter();";
+  protected final String TEXT_335 = NL + "\t\t\tfilter = filter.or(createUncontainedLinksFilter());";
+  protected final String TEXT_336 = NL + "\t\t\t";
+  protected final String TEXT_337 = " filter = createUncontainedLinksFilter();";
+  protected final String TEXT_338 = NL + "\t\t\t";
+  protected final String TEXT_339 = " filter = ";
+  protected final String TEXT_340 = ".NOT_TOUCH;";
+  protected final String TEXT_341 = NL + "\t\t\treturn filter;" + NL + "\t\t}" + NL + "" + NL + "\t\t/**" + NL + "\t \t * @generated" + NL + "\t \t */" + NL + "\t\tprotected ";
+  protected final String TEXT_342 = " getCreateNotationalElementCommand(";
+  protected final String TEXT_343 = " descriptor) {" + NL + "\t\t\t";
+  protected final String TEXT_344 = " linkDescriptor = (";
+  protected final String TEXT_345 = ") descriptor;" + NL + "\t\t\t";
+  protected final String TEXT_346 = " sourceView = getViewService().findView(linkDescriptor.getSource());" + NL + "\t\t\t";
+  protected final String TEXT_347 = " targetView = getViewService().findView(linkDescriptor.getDestination());" + NL + "\t\t\tif (sourceView == null || targetView == null) {" + NL + "\t\t\t\treturn null;" + NL + "\t\t\t}" + NL + "\t\t\t";
+  protected final String TEXT_348 = " createdEdge = ";
+  protected final String TEXT_349 = ".eINSTANCE.createEdge();" + NL + "\t\t\tswitch (linkDescriptor.getVisualID()) {";
+  protected final String TEXT_350 = NL + "\t\t\tcase ";
+  protected final String TEXT_351 = ".VISUAL_ID:" + NL + "\t\t\t\tif (linkDescriptor.getElement() instanceof ";
+  protected final String TEXT_352 = ") {" + NL + "\t\t\t\t\tcreatedEdge.setElement(linkDescriptor.getElement());" + NL + "\t\t\t\t\t";
+  protected final String TEXT_353 = ".decorateView(createdEdge);" + NL + "\t\t\t\t}" + NL + "\t\t\t\tbreak;";
+  protected final String TEXT_354 = NL + "\t\t\tcase ";
+  protected final String TEXT_355 = ".VISUAL_ID:" + NL + "\t\t\t\tif (linkDescriptor.getElement() == null) {" + NL + "\t\t\t\t\tcreatedEdge.setElement(null);" + NL + "\t\t\t\t\t";
+  protected final String TEXT_356 = ".decorateView(createdEdge);" + NL + "\t\t\t\t}" + NL + "\t\t\t\tbreak;";
+  protected final String TEXT_357 = NL + "\t\t\t}" + NL + "\t\t\tif (createdEdge.getType() == null) {" + NL + "\t\t\t\treturn null;" + NL + "\t\t\t}" + NL + "\t\t\treturn new ";
+  protected final String TEXT_358 = "(getHost().getDiagram(), createdEdge, sourceView, targetView);" + NL + "\t\t}" + NL + "" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tprotected ";
+  protected final String TEXT_359 = " getSemanticChildLinks() {";
+  protected final String TEXT_360 = NL;
+  protected final String TEXT_361 = "\t";
+  protected final String TEXT_362 = " result = new ";
+  protected final String TEXT_363 = "();";
+  protected final String TEXT_364 = NL + "\t";
+  protected final String TEXT_365 = " modelObject = ";
+  protected final String TEXT_366 = ".getElement();" + NL + "\t";
+  protected final String TEXT_367 = " nextValue;";
+  protected final String TEXT_368 = NL + "\tint linkVID;";
+  protected final String TEXT_369 = NL + "\tfor(";
+  protected final String TEXT_370 = " it = ";
+  protected final String TEXT_371 = ".iterator(); it.hasNext(); ) {" + NL + "\t\tnextValue = (";
+  protected final String TEXT_372 = ") it.next();";
+  protected final String TEXT_373 = NL + "\tnextValue = (";
+  protected final String TEXT_374 = ")";
+  protected final String TEXT_375 = ";";
+  protected final String TEXT_376 = NL + "\tlinkVID = ";
+  protected final String TEXT_377 = ".INSTANCE.getLinkWithClassVisualID(nextValue);";
+  protected final String TEXT_378 = NL + "\tswitch (linkVID) {";
+  protected final String TEXT_379 = NL + "\tcase ";
+  protected final String TEXT_380 = ".VISUAL_ID: {";
+  protected final String TEXT_381 = NL + "\tif (";
+  protected final String TEXT_382 = ".VISUAL_ID == linkVID) {";
+  protected final String TEXT_383 = NL + "\t\t";
+  protected final String TEXT_384 = " source = (";
+  protected final String TEXT_385 = ")";
+  protected final String TEXT_386 = ";";
+  protected final String TEXT_387 = NL + "\t\t";
+  protected final String TEXT_388 = " source = ";
+  protected final String TEXT_389 = ".getElement();";
+  protected final String TEXT_390 = NL + "\t\t";
+  protected final String TEXT_391 = " target = (";
+  protected final String TEXT_392 = ")";
+  protected final String TEXT_393 = ";";
+  protected final String TEXT_394 = NL + "\t\t";
+  protected final String TEXT_395 = " target = ";
+  protected final String TEXT_396 = ".getElement();";
+  protected final String TEXT_397 = NL + "\t\tif (source != null && target != null) {" + NL + "\t\t\tresult.add(new ";
+  protected final String TEXT_398 = "(source, target, nextValue, linkVID));" + NL + "\t\t}";
+  protected final String TEXT_399 = NL + "\t\tbreak;" + NL + "\t}";
   protected final String TEXT_400 = NL + "\t}";
   protected final String TEXT_401 = NL + "\t}";
-  protected final String TEXT_402 = NL + "\tfor(";
-  protected final String TEXT_403 = " it = ";
-  protected final String TEXT_404 = ".iterator(); it.hasNext(); ) {" + NL + "\t\tnextValue = (";
-  protected final String TEXT_405 = ") it.next();";
-  protected final String TEXT_406 = NL + "\tnextValue = (";
-  protected final String TEXT_407 = ")";
-  protected final String TEXT_408 = ";";
-  protected final String TEXT_409 = NL + "\tif (nextValue != null) {";
-  protected final String TEXT_410 = NL + "\t\tresult.add(new ";
-  protected final String TEXT_411 = "(modelObject, nextValue, null, ";
-  protected final String TEXT_412 = ".VISUAL_ID));";
-  protected final String TEXT_413 = NL + "\t}";
+  protected final String TEXT_402 = NL + "\t}";
+  protected final String TEXT_403 = NL + "\tfor(";
+  protected final String TEXT_404 = " it = ";
+  protected final String TEXT_405 = ".iterator(); it.hasNext(); ) {" + NL + "\t\tnextValue = (";
+  protected final String TEXT_406 = ") it.next();";
+  protected final String TEXT_407 = NL + "\tnextValue = (";
+  protected final String TEXT_408 = ")";
+  protected final String TEXT_409 = ";";
+  protected final String TEXT_410 = NL + "\tif (nextValue != null) {";
+  protected final String TEXT_411 = NL + "\t\tresult.add(new ";
+  protected final String TEXT_412 = "(modelObject, nextValue, null, ";
+  protected final String TEXT_413 = ".VISUAL_ID));";
   protected final String TEXT_414 = NL + "\t}";
-  protected final String TEXT_415 = NL + "\treturn result;" + NL + "\t\t}" + NL + "" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tprotected ";
-  protected final String TEXT_416 = " getNotationalChildLinks() {" + NL + "\t\t\t";
-  protected final String TEXT_417 = " result = new ";
-  protected final String TEXT_418 = "();" + NL + "\t\t\t";
-  protected final String TEXT_419 = " allLinks = ";
-  protected final String TEXT_420 = ".getEdges();" + NL + "\t\t\tfor(";
-  protected final String TEXT_421 = " it = allLinks.iterator(); it.hasNext(); ) {" + NL + "\t\t\t\t";
-  protected final String TEXT_422 = " next = (";
-  protected final String TEXT_423 = ") it.next();";
-  protected final String TEXT_424 = NL + "\t\t\t\tif (next.isSetElement() && next.getElement() != null && next.getElement().eResource() == null) {" + NL + "\t\t\t\t\tresult.add(next);" + NL + "\t\t\t\t\tcontinue;" + NL + "\t\t\t\t}" + NL + "\t\t\t\t";
-  protected final String TEXT_425 = " source = next.getSource();" + NL + "\t\t\t\tif (source == null || (source.isSetElement() && source.getElement() != null && source.getElement().eResource() == null)) {" + NL + "\t\t\t\t\tresult.add(next);" + NL + "\t\t\t\t\tcontinue;" + NL + "\t\t\t\t}" + NL + "\t\t\t\t";
-  protected final String TEXT_426 = " target = next.getTarget();" + NL + "\t\t\t\tif (target == null || (target.isSetElement() && target.getElement() != null && target.getElement().eResource() == null)) {" + NL + "\t\t\t\t\tresult.add(next);" + NL + "\t\t\t\t\tcontinue;" + NL + "\t\t\t\t}";
-  protected final String TEXT_427 = NL + "\t\t\t\tif (!next.isSetElement() || next.getElement() == null) {" + NL + "\t\t\t\t\tif (next.getSource() == ";
-  protected final String TEXT_428 = ") {" + NL + "\t\t\t\t\t\tint linkVID = ";
-  protected final String TEXT_429 = ".getVisualID(next);" + NL + "\t\t\t\t\t\tswitch (linkVID) {";
-  protected final String TEXT_430 = NL + "\t\t\t\t\t\tcase ";
-  protected final String TEXT_431 = ".VISUAL_ID:";
-  protected final String TEXT_432 = NL + "\t\t\t\t\t\t\tresult.add(next);" + NL + "\t\t\t\t\t\t\tbreak;" + NL + "\t\t\t\t\t\t}" + NL + "\t\t\t\t\t}";
-  protected final String TEXT_433 = NL + "\t\t\t\t} else {";
-  protected final String TEXT_434 = NL + "\t\t\t\t}";
-  protected final String TEXT_435 = NL + "\t\t\t\tif (next.isSetElement() && next.getElement() != null) {";
-  protected final String TEXT_436 = NL + "\t\t\t\t\tif (next.getElement().eContainer() == ";
-  protected final String TEXT_437 = ".getElement()) {" + NL + "\t\t\t\t\t\tint linkVID = ";
-  protected final String TEXT_438 = ".getVisualID(next);" + NL + "\t\t\t\t\t\tswitch (linkVID) {";
-  protected final String TEXT_439 = NL + "\t\t\t\t\t\tcase ";
-  protected final String TEXT_440 = ".VISUAL_ID:";
-  protected final String TEXT_441 = NL + "\t\t\t\t\t\t\tresult.add(next);" + NL + "\t\t\t\t\t\t\tbreak;" + NL + "\t\t\t\t\t\t}" + NL + "\t\t\t\t\t}" + NL + "\t\t\t\t}";
-  protected final String TEXT_442 = NL + "\t\t\t}" + NL + "\t\t\treturn result;" + NL + "\t\t}" + NL + "" + NL + "\t\t/**" + NL + "\t\t * Returns whether a notational edge should be created for the given domain element. " + NL + "\t\t * The generated code always returns ";
-  protected final String TEXT_443 = ". " + NL + "\t\t * User can change implementation of this method to handle a more sophisticated logic." + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tprotected boolean shouldCreateView(";
-  protected final String TEXT_444 = " descriptor) {" + NL + "\t\t\treturn ";
-  protected final String TEXT_445 = ";" + NL + "\t\t}" + NL + "" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tprotected ";
-  protected final String TEXT_446 = " getHost() {" + NL + "\t\t\treturn ";
-  protected final String TEXT_447 = ";" + NL + "\t\t}" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected void refreshLinkNotationModel() {" + NL + "\t\t";
-  protected final String TEXT_448 = " linkRefresher = getLinkNotationModelRefresher();" + NL + "\t\tif (!linkRefresher.isInstalled()) {" + NL + "\t\t\treturn;" + NL + "\t\t}" + NL + "\t\t";
-  protected final String TEXT_449 = " command = linkRefresher.buildRefreshNotationModelCommand();" + NL + "\t\tif (command == null) {" + NL + "\t\t\treturn;" + NL + "\t\t}" + NL + "\t\t";
-  protected final String TEXT_450 = " domainModelEditDomain = ";
-  protected final String TEXT_451 = ".getEditingDomain(";
-  protected final String TEXT_452 = ".getElement());" + NL + "\t\tgetViewer().getEditDomain().getCommandStack().execute(new ";
-  protected final String TEXT_453 = "(domainModelEditDomain, command));" + NL + "\t}";
-  protected final String TEXT_454 = NL;
+  protected final String TEXT_415 = NL + "\t}";
+  protected final String TEXT_416 = NL + "\treturn result;" + NL + "\t\t}" + NL + "" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tprotected ";
+  protected final String TEXT_417 = " getNotationalChildLinks() {" + NL + "\t\t\t";
+  protected final String TEXT_418 = " result = new ";
+  protected final String TEXT_419 = "();" + NL + "\t\t\t";
+  protected final String TEXT_420 = " allLinks = ";
+  protected final String TEXT_421 = ".getEdges();" + NL + "\t\t\tfor(";
+  protected final String TEXT_422 = " it = allLinks.iterator(); it.hasNext(); ) {" + NL + "\t\t\t\t";
+  protected final String TEXT_423 = " next = (";
+  protected final String TEXT_424 = ") it.next();";
+  protected final String TEXT_425 = NL + "\t\t\t\tif (next.isSetElement() && next.getElement() != null && next.getElement().eResource() == null) {" + NL + "\t\t\t\t\tresult.add(next);" + NL + "\t\t\t\t\tcontinue;" + NL + "\t\t\t\t}" + NL + "\t\t\t\t";
+  protected final String TEXT_426 = " source = next.getSource();" + NL + "\t\t\t\tif (source == null || (source.isSetElement() && source.getElement() != null && source.getElement().eResource() == null)) {" + NL + "\t\t\t\t\tresult.add(next);" + NL + "\t\t\t\t\tcontinue;" + NL + "\t\t\t\t}" + NL + "\t\t\t\t";
+  protected final String TEXT_427 = " target = next.getTarget();" + NL + "\t\t\t\tif (target == null || (target.isSetElement() && target.getElement() != null && target.getElement().eResource() == null)) {" + NL + "\t\t\t\t\tresult.add(next);" + NL + "\t\t\t\t\tcontinue;" + NL + "\t\t\t\t}";
+  protected final String TEXT_428 = NL + "\t\t\t\tif (!next.isSetElement() || next.getElement() == null) {" + NL + "\t\t\t\t\tif (next.getSource() == ";
+  protected final String TEXT_429 = ") {" + NL + "\t\t\t\t\t\tint linkVID = ";
+  protected final String TEXT_430 = ".getVisualID(next);" + NL + "\t\t\t\t\t\tswitch (linkVID) {";
+  protected final String TEXT_431 = NL + "\t\t\t\t\t\tcase ";
+  protected final String TEXT_432 = ".VISUAL_ID:";
+  protected final String TEXT_433 = NL + "\t\t\t\t\t\t\tresult.add(next);" + NL + "\t\t\t\t\t\t\tbreak;" + NL + "\t\t\t\t\t\t}" + NL + "\t\t\t\t\t}";
+  protected final String TEXT_434 = NL + "\t\t\t\t} else {";
+  protected final String TEXT_435 = NL + "\t\t\t\t}";
+  protected final String TEXT_436 = NL + "\t\t\t\tif (next.isSetElement() && next.getElement() != null) {";
+  protected final String TEXT_437 = NL + "\t\t\t\t\tif (next.getElement().eContainer() == ";
+  protected final String TEXT_438 = ".getElement()) {" + NL + "\t\t\t\t\t\tint linkVID = ";
+  protected final String TEXT_439 = ".getVisualID(next);" + NL + "\t\t\t\t\t\tswitch (linkVID) {";
+  protected final String TEXT_440 = NL + "\t\t\t\t\t\tcase ";
+  protected final String TEXT_441 = ".VISUAL_ID:";
+  protected final String TEXT_442 = NL + "\t\t\t\t\t\t\tresult.add(next);" + NL + "\t\t\t\t\t\t\tbreak;" + NL + "\t\t\t\t\t\t}" + NL + "\t\t\t\t\t}" + NL + "\t\t\t\t}";
+  protected final String TEXT_443 = NL + "\t\t\t}" + NL + "\t\t\treturn result;" + NL + "\t\t}" + NL + "" + NL + "\t\t/**" + NL + "\t\t * Returns whether a notational edge should be created for the given domain element. " + NL + "\t\t * The generated code always returns ";
+  protected final String TEXT_444 = ". " + NL + "\t\t * User can change implementation of this method to handle a more sophisticated logic." + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tprotected boolean shouldCreateView(";
+  protected final String TEXT_445 = " descriptor) {" + NL + "\t\t\treturn ";
+  protected final String TEXT_446 = ";" + NL + "\t\t}" + NL + "" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tprotected ";
+  protected final String TEXT_447 = " getHost() {" + NL + "\t\t\treturn ";
+  protected final String TEXT_448 = ";" + NL + "\t\t}" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected void refreshLinkNotationModel() {" + NL + "\t\t";
+  protected final String TEXT_449 = " linkRefresher = getLinkNotationModelRefresher();" + NL + "\t\tif (!linkRefresher.isInstalled()) {" + NL + "\t\t\treturn;" + NL + "\t\t}" + NL + "\t\t";
+  protected final String TEXT_450 = " command = linkRefresher.buildRefreshNotationModelCommand();" + NL + "\t\tif (command == null) {" + NL + "\t\t\treturn;" + NL + "\t\t}" + NL + "\t\t";
+  protected final String TEXT_451 = " domainModelEditDomain = ";
+  protected final String TEXT_452 = ".getEditingDomain(";
+  protected final String TEXT_453 = ".getElement());" + NL + "\t\tgetViewer().getEditDomain().getCommandStack().execute(new ";
+  protected final String TEXT_454 = "(domainModelEditDomain, command));" + NL + "\t}";
   protected final String TEXT_455 = NL;
-  protected final String TEXT_456 = "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate ";
-  protected final String TEXT_457 = " domainModelRefresher = new ";
-  protected final String TEXT_458 = "(this);" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate ";
-  protected final String TEXT_459 = " updateManager;" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate ";
-  protected final String TEXT_460 = " getUpdateManager() {" + NL + "\t\tif (updateManager == null) {" + NL + "\t\t\tupdateManager = new ";
-  protected final String TEXT_461 = "(getViewer());" + NL + "\t\t}" + NL + "\t\treturn updateManager;" + NL + "\t}" + NL + "}";
-  protected final String TEXT_462 = NL;
+  protected final String TEXT_456 = NL;
+  protected final String TEXT_457 = "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate ";
+  protected final String TEXT_458 = " domainModelRefresher = new ";
+  protected final String TEXT_459 = "(this);" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate ";
+  protected final String TEXT_460 = " updateManager;" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate ";
+  protected final String TEXT_461 = " getUpdateManager() {" + NL + "\t\tif (updateManager == null) {" + NL + "\t\t\tupdateManager = new ";
+  protected final String TEXT_462 = "(getViewer());" + NL + "\t\t}" + NL + "\t\treturn updateManager;" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate class TreeEditPartAdapter extends ";
+  protected final String TEXT_463 = " {" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tpublic TreeEditPartAdapter() {" + NL + "\t\t\tsuper(getDiagram(), ";
+  protected final String TEXT_464 = ".getInstance().getItemProvidersAdapterFactory());" + NL + "\t\t}" + NL + "" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tprotected void createEditPolicies() {" + NL + "\t\t\tinstallEditPolicy(EditPolicy.COMPONENT_ROLE, new RootComponentEditPolicy());" + NL + "\t\t}" + NL + "" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tpublic void activate() {" + NL + "\t\t\tsuper.activate();" + NL + "\t\t\tif (!getDiagram().eAdapters().contains(getTreeUpdateManager())) {" + NL + "\t\t\t\tgetDiagram().eAdapters().add(getTreeUpdateManager());" + NL + "\t\t\t}" + NL + "\t\t\tif (!getDiagram().getElement().eAdapters().contains(domainModelRefresher)) {" + NL + "\t\t\t\tgetDiagram().getElement().eAdapters().add(domainModelRefresher);" + NL + "\t\t\t}" + NL + "\t\t}" + NL + "" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tpublic void deactivate() {" + NL + "\t\t\tgetDiagram().getElement().eAdapters().remove(domainModelRefresher);" + NL + "\t\t\tgetDiagram().eAdapters().remove(getTreeUpdateManager());" + NL + "\t\t\tsuper.deactivate();" + NL + "\t\t}" + NL;
+  protected final String TEXT_465 = NL;
+  protected final String TEXT_466 = "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate ";
+  protected final String TEXT_467 = " domainModelRefresher = new ";
+  protected final String TEXT_468 = "(this);" + NL + "" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tprivate ";
+  protected final String TEXT_469 = " treeUpdateManager;" + NL + "" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tprivate ";
+  protected final String TEXT_470 = " getTreeUpdateManager() {" + NL + "\t\t\tif (treeUpdateManager == null) {" + NL + "\t\t\t\ttreeUpdateManager = new ";
+  protected final String TEXT_471 = "(getViewer());" + NL + "\t\t\t}" + NL + "\t\t\treturn treeUpdateManager;" + NL + "\t\t}" + NL + "\t}" + NL + "}";
+  protected final String TEXT_472 = NL;
 
   public String generate(Object argument)
   {
@@ -488,6 +498,7 @@
 final ImportAssistant importManager = (ImportAssistant) ((Object[]) argument)[1];
 importManager.registerInnerClass("NotationModelRefresher");	//from notationModelRefresher.jetinc
 importManager.registerInnerClass("LinkNotationModelRefresher");	//from linkNotationModelRefresher.jetinc
+importManager.registerInnerClass("TreeEditPartAdapter");
 List childNodes = genDiagram.getTopLevelNodes();
 
     stringBuffer.append(TEXT_1);
@@ -784,8 +795,10 @@
     stringBuffer.append(TEXT_80);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gef.SnapToGrid"));
     stringBuffer.append(TEXT_81);
-    /*@ include file="adapters/propertySource.javajetinc"*/
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.TreeEditPart"));
     stringBuffer.append(TEXT_82);
+    /*@ include file="adapters/propertySource.javajetinc"*/
+    stringBuffer.append(TEXT_83);
     
 for(Iterator it = childNodes.iterator(); it.hasNext(); ) {
 	GenTopLevelNode next = (GenTopLevelNode)it.next();
@@ -793,42 +806,42 @@
 	boolean isListLayout = false;
 	String resolvedSemanticElement = "parent.getElement()";
 
-    stringBuffer.append(TEXT_83);
     stringBuffer.append(TEXT_84);
-    if (isStatic) {
     stringBuffer.append(TEXT_85);
-    }
+    if (isStatic) {
     stringBuffer.append(TEXT_86);
+    }
+    stringBuffer.append(TEXT_87);
     stringBuffer.append(next.getDomainMetaClass().getName());
     stringBuffer.append(next.getVisualID());
-    stringBuffer.append(TEXT_87);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.lite.commands.CreateNotationalNodeCommand"));
     stringBuffer.append(TEXT_88);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.lite.commands.CreateNotationalNodeCommand"));
+    stringBuffer.append(TEXT_89);
     stringBuffer.append(next.getDomainMetaClass().getName());
     stringBuffer.append(next.getVisualID());
-    stringBuffer.append(TEXT_89);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.View"));
     stringBuffer.append(TEXT_90);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EObject"));
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.View"));
     stringBuffer.append(TEXT_91);
-    if (!isListLayout) {
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EObject"));
     stringBuffer.append(TEXT_92);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.geometry.Rectangle"));
+    if (!isListLayout) {
     stringBuffer.append(TEXT_93);
-    }
+    stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.geometry.Rectangle"));
     stringBuffer.append(TEXT_94);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.NotationFactory"));
+    }
     stringBuffer.append(TEXT_95);
-    stringBuffer.append(importManager.getImportedName(next.getNotationViewFactoryQualifiedClassName()));
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.NotationFactory"));
     stringBuffer.append(TEXT_96);
+    stringBuffer.append(importManager.getImportedName(next.getNotationViewFactoryQualifiedClassName()));
+    stringBuffer.append(TEXT_97);
     
 	if (!isListLayout) {
 
-    stringBuffer.append(TEXT_97);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.Bounds"));
     stringBuffer.append(TEXT_98);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.NotationFactory"));
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.Bounds"));
     stringBuffer.append(TEXT_99);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.NotationFactory"));
+    stringBuffer.append(TEXT_100);
     
 		int defaultWidth = 40;
 		int defaultHeight = 40;
@@ -838,182 +851,182 @@
 			defaultHeight = defSizeAttrs.getHeight();
 		}
 
-    stringBuffer.append(TEXT_100);
-    stringBuffer.append(defaultWidth);
     stringBuffer.append(TEXT_101);
-    stringBuffer.append(defaultHeight);
+    stringBuffer.append(defaultWidth);
     stringBuffer.append(TEXT_102);
+    stringBuffer.append(defaultHeight);
+    stringBuffer.append(TEXT_103);
     
 	}
 
-    stringBuffer.append(TEXT_103);
+    stringBuffer.append(TEXT_104);
     
 if (genDiagram.getPalette() != null) {
 
-    stringBuffer.append(TEXT_104);
-    if (isStatic) {
     stringBuffer.append(TEXT_105);
-    }
+    if (isStatic) {
     stringBuffer.append(TEXT_106);
-    stringBuffer.append(next.getDomainMetaClass().getName());
-    stringBuffer.append(next.getVisualID());
+    }
     stringBuffer.append(TEXT_107);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.command.AbstractCommand"));
-    stringBuffer.append(TEXT_108);
     stringBuffer.append(next.getDomainMetaClass().getName());
     stringBuffer.append(next.getVisualID());
+    stringBuffer.append(TEXT_108);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.command.AbstractCommand"));
     stringBuffer.append(TEXT_109);
     stringBuffer.append(next.getDomainMetaClass().getName());
     stringBuffer.append(next.getVisualID());
     stringBuffer.append(TEXT_110);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.View"));
+    stringBuffer.append(next.getDomainMetaClass().getName());
+    stringBuffer.append(next.getVisualID());
     stringBuffer.append(TEXT_111);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.lite.requests.CreateRequestEx"));
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.View"));
     stringBuffer.append(TEXT_112);
-    if (!isListLayout) {
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.lite.requests.CreateRequestEx"));
     stringBuffer.append(TEXT_113);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.geometry.Rectangle"));
+    if (!isListLayout) {
     stringBuffer.append(TEXT_114);
-    }
+    stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.geometry.Rectangle"));
     stringBuffer.append(TEXT_115);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.TransactionalEditingDomain"));
+    }
     stringBuffer.append(TEXT_116);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.util.TransactionUtil"));
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.TransactionalEditingDomain"));
     stringBuffer.append(TEXT_117);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.util.TransactionUtil"));
+    stringBuffer.append(TEXT_118);
     
 	if (next.getDomainMetaClass().isMapEntry()) {
 	/*Workaround for Ecore example: map entries cannot be created using factory, only using reflective EFactory.create() method*/
 
-    stringBuffer.append(TEXT_118);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EObject"));
     stringBuffer.append(TEXT_119);
-    stringBuffer.append(importManager.getImportedName(next.getDomainMetaClass().getGenPackage().getQualifiedFactoryInterfaceName()));
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EObject"));
     stringBuffer.append(TEXT_120);
-    stringBuffer.append(importManager.getImportedName(next.getDomainMetaClass().getGenPackage().getQualifiedPackageInterfaceName()));
+    stringBuffer.append(importManager.getImportedName(next.getDomainMetaClass().getGenPackage().getQualifiedFactoryInterfaceName()));
     stringBuffer.append(TEXT_121);
-    stringBuffer.append(next.getDomainMetaClass().getClassifierAccessorName());
+    stringBuffer.append(importManager.getImportedName(next.getDomainMetaClass().getGenPackage().getQualifiedPackageInterfaceName()));
     stringBuffer.append(TEXT_122);
+    stringBuffer.append(next.getDomainMetaClass().getClassifierAccessorName());
+    stringBuffer.append(TEXT_123);
     
 	} else {
 
-    stringBuffer.append(TEXT_123);
-    stringBuffer.append(importManager.getImportedName(next.getDomainMetaClass().getQualifiedInterfaceName()));
     stringBuffer.append(TEXT_124);
-    stringBuffer.append(importManager.getImportedName(next.getDomainMetaClass().getGenPackage().getQualifiedFactoryInterfaceName()));
+    stringBuffer.append(importManager.getImportedName(next.getDomainMetaClass().getQualifiedInterfaceName()));
     stringBuffer.append(TEXT_125);
-    stringBuffer.append(next.getDomainMetaClass().getClassifierAccessorName());
+    stringBuffer.append(importManager.getImportedName(next.getDomainMetaClass().getGenPackage().getQualifiedFactoryInterfaceName()));
     stringBuffer.append(TEXT_126);
+    stringBuffer.append(next.getDomainMetaClass().getClassifierAccessorName());
+    stringBuffer.append(TEXT_127);
     
 	}
 
-    stringBuffer.append(TEXT_127);
-    /*XXX: Class name DomainElementInitializer should be user-customizable*/
     stringBuffer.append(TEXT_128);
-    stringBuffer.append(importManager.getImportedName(genDiagram.getNotationViewFactoriesPackageName() + ".DomainElementInitializer"));
+    /*XXX: Class name DomainElementInitializer should be user-customizable*/
     stringBuffer.append(TEXT_129);
-    stringBuffer.append(next.getUniqueIdentifier());
+    stringBuffer.append(importManager.getImportedName(genDiagram.getNotationViewFactoriesPackageName() + ".DomainElementInitializer"));
     stringBuffer.append(TEXT_130);
-    if (next.getDomainMetaClass().isExternalInterface()) {
+    stringBuffer.append(next.getUniqueIdentifier());
     stringBuffer.append(TEXT_131);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EObject"));
+    if (next.getDomainMetaClass().isExternalInterface()) {
     stringBuffer.append(TEXT_132);
-    }
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EObject"));
     stringBuffer.append(TEXT_133);
+    }
+    stringBuffer.append(TEXT_134);
     
 	TypeModelFacet facet = next.getModelFacet();
 	GenFeature childFeature = facet.getChildMetaFeature();
 	GenFeature containmentFeature = facet.getContainmentMetaFeature();
 	if (childFeature != null && childFeature != containmentFeature && !childFeature.isDerived()) {
 
-    stringBuffer.append(TEXT_134);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.command.CompoundCommand"));
     stringBuffer.append(TEXT_135);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.command.CompoundCommand"));
     stringBuffer.append(TEXT_136);
-    stringBuffer.append(importManager.getImportedName(containmentFeature.getEcoreFeature().isMany() ? "org.eclipse.emf.edit.command.AddCommand" : "org.eclipse.emf.edit.command.SetCommand"));
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.command.CompoundCommand"));
     stringBuffer.append(TEXT_137);
-    stringBuffer.append(resolvedSemanticElement);
+    stringBuffer.append(importManager.getImportedName(containmentFeature.getEcoreFeature().isMany() ? "org.eclipse.emf.edit.command.AddCommand" : "org.eclipse.emf.edit.command.SetCommand"));
     stringBuffer.append(TEXT_138);
-    stringBuffer.append(importManager.getImportedName(containmentFeature.getGenPackage().getQualifiedPackageInterfaceName()));
+    stringBuffer.append(resolvedSemanticElement);
     stringBuffer.append(TEXT_139);
-    stringBuffer.append(containmentFeature.getFeatureAccessorName());
+    stringBuffer.append(importManager.getImportedName(containmentFeature.getGenPackage().getQualifiedPackageInterfaceName()));
     stringBuffer.append(TEXT_140);
-    stringBuffer.append(importManager.getImportedName(childFeature.getEcoreFeature().isMany() ? "org.eclipse.emf.edit.command.AddCommand" : "org.eclipse.emf.edit.command.SetCommand"));
+    stringBuffer.append(containmentFeature.getFeatureAccessorName());
     stringBuffer.append(TEXT_141);
-    stringBuffer.append(resolvedSemanticElement);
+    stringBuffer.append(importManager.getImportedName(childFeature.getEcoreFeature().isMany() ? "org.eclipse.emf.edit.command.AddCommand" : "org.eclipse.emf.edit.command.SetCommand"));
     stringBuffer.append(TEXT_142);
-    stringBuffer.append(importManager.getImportedName(childFeature.getGenPackage().getQualifiedPackageInterfaceName()));
+    stringBuffer.append(resolvedSemanticElement);
     stringBuffer.append(TEXT_143);
-    stringBuffer.append(childFeature.getFeatureAccessorName());
+    stringBuffer.append(importManager.getImportedName(childFeature.getGenPackage().getQualifiedPackageInterfaceName()));
     stringBuffer.append(TEXT_144);
+    stringBuffer.append(childFeature.getFeatureAccessorName());
+    stringBuffer.append(TEXT_145);
     
 	} else {
 
-    stringBuffer.append(TEXT_145);
-    stringBuffer.append(importManager.getImportedName(containmentFeature.getEcoreFeature().isMany() ? "org.eclipse.emf.edit.command.AddCommand" : "org.eclipse.emf.edit.command.SetCommand"));
     stringBuffer.append(TEXT_146);
-    stringBuffer.append(resolvedSemanticElement);
+    stringBuffer.append(importManager.getImportedName(containmentFeature.getEcoreFeature().isMany() ? "org.eclipse.emf.edit.command.AddCommand" : "org.eclipse.emf.edit.command.SetCommand"));
     stringBuffer.append(TEXT_147);
-    stringBuffer.append(importManager.getImportedName(containmentFeature.getGenPackage().getQualifiedPackageInterfaceName()));
+    stringBuffer.append(resolvedSemanticElement);
     stringBuffer.append(TEXT_148);
-    stringBuffer.append(containmentFeature.getFeatureAccessorName());
+    stringBuffer.append(importManager.getImportedName(containmentFeature.getGenPackage().getQualifiedPackageInterfaceName()));
     stringBuffer.append(TEXT_149);
+    stringBuffer.append(containmentFeature.getFeatureAccessorName());
+    stringBuffer.append(TEXT_150);
     
 	}
 
-    stringBuffer.append(TEXT_150);
+    stringBuffer.append(TEXT_151);
     stringBuffer.append(next.getDomainMetaClass().getName());
     stringBuffer.append(next.getVisualID());
-    stringBuffer.append(TEXT_151);
-    if (next.getDomainMetaClass().isExternalInterface()) {
     stringBuffer.append(TEXT_152);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EObject"));
+    if (next.getDomainMetaClass().isExternalInterface()) {
     stringBuffer.append(TEXT_153);
-    }
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EObject"));
     stringBuffer.append(TEXT_154);
-    if(!isListLayout) {
-    stringBuffer.append(TEXT_155);
     }
+    stringBuffer.append(TEXT_155);
+    if(!isListLayout) {
     stringBuffer.append(TEXT_156);
+    }
+    stringBuffer.append(TEXT_157);
     
 }
 
     
 }
 
-    stringBuffer.append(TEXT_157);
     stringBuffer.append(TEXT_158);
     stringBuffer.append(TEXT_159);
-    stringBuffer.append(importManager.getImportedName("java.util.HashMap"));
     stringBuffer.append(TEXT_160);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EStructuralFeature"));
+    stringBuffer.append(importManager.getImportedName("java.util.HashMap"));
     stringBuffer.append(TEXT_161);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.notify.Notification"));
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EStructuralFeature"));
     stringBuffer.append(TEXT_162);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.notify.Notification"));
     stringBuffer.append(TEXT_163);
     stringBuffer.append(TEXT_164);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.NotationPackage"));
     stringBuffer.append(TEXT_165);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.NotationPackage"));
     stringBuffer.append(TEXT_166);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.NotationPackage"));
+    stringBuffer.append(TEXT_167);
     
 //link notation model refresher should always be installed for the diagram edit part, because it tracks the uncontained links
 //if (myHelper.containsLinks()) {
 
-    stringBuffer.append(TEXT_167);
+    stringBuffer.append(TEXT_168);
     
 //}
 
-    stringBuffer.append(TEXT_168);
+    stringBuffer.append(TEXT_169);
     
 //link notation model refresher should always be installed/uninstalled for the diagram edit part, because it tracks the uncontained links
 //if (myHelper.containsLinks()) {
 
-    stringBuffer.append(TEXT_169);
+    stringBuffer.append(TEXT_170);
     
 //}
 
-    stringBuffer.append(TEXT_170);
+    stringBuffer.append(TEXT_171);
     
 {
 String _getDiagramCode = "getDiagram()";
@@ -1021,22 +1034,22 @@
 boolean isListLayout = false;
 final boolean _includeUncontainedLinks = true;
 
-    stringBuffer.append(TEXT_171);
     stringBuffer.append(TEXT_172);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.lite.edit.parts.update.canonical.ChildNotationModelRefresher"));
     stringBuffer.append(TEXT_173);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.TransactionalEditingDomain"));
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.lite.edit.parts.update.canonical.ChildNotationModelRefresher"));
     stringBuffer.append(TEXT_174);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.util.TransactionUtil"));
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.TransactionalEditingDomain"));
     stringBuffer.append(TEXT_175);
-    stringBuffer.append(_getDiagramCode);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.util.TransactionUtil"));
     stringBuffer.append(TEXT_176);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.lite.edit.parts.update.canonical.ChildNotationModelRefresher"));
+    stringBuffer.append(_getDiagramCode);
     stringBuffer.append(TEXT_177);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.lite.edit.parts.update.canonical.ChildNotationModelRefresher"));
     stringBuffer.append(TEXT_178);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.lite.edit.parts.update.canonical.ChildNotationModelRefresher"));
     stringBuffer.append(TEXT_179);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.lite.edit.parts.update.canonical.ChildNotationModelRefresher"));
+    stringBuffer.append(TEXT_180);
     
 boolean hasConstraintsInChildren = false;
 for (Iterator it = childNodes.iterator(); it.hasNext(); ) {
@@ -1051,19 +1064,19 @@
     
 if (hasConstraintsInChildren) {
 
-    stringBuffer.append(TEXT_180);
-    stringBuffer.append(genDiagram.getVisualIDRegistryQualifiedClassName());
     stringBuffer.append(TEXT_181);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.NotificationFilter"));
+    stringBuffer.append(genDiagram.getVisualIDRegistryQualifiedClassName());
     stringBuffer.append(TEXT_182);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.NotificationFilter"));
     stringBuffer.append(TEXT_183);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.NotificationFilter"));
+    stringBuffer.append(TEXT_184);
     
 }
 
-    stringBuffer.append(TEXT_184);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.NotificationFilter"));
     stringBuffer.append(TEXT_185);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.NotificationFilter"));
+    stringBuffer.append(TEXT_186);
     
 {
 	boolean hasDeclaredFilter = false;
@@ -1082,25 +1095,25 @@
 		if (!hasDeclaredFilter) {
 			hasDeclaredFilter = true;
 
-    stringBuffer.append(TEXT_186);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.NotificationFilter"));
     stringBuffer.append(TEXT_187);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.NotificationFilter"));
     stringBuffer.append(TEXT_188);
-    stringBuffer.append(importManager.getImportedName(childMetaFeature.getGenPackage().getQualifiedPackageInterfaceName()));
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.NotificationFilter"));
     stringBuffer.append(TEXT_189);
-    stringBuffer.append(childMetaFeature.getFeatureAccessorName());
+    stringBuffer.append(importManager.getImportedName(childMetaFeature.getGenPackage().getQualifiedPackageInterfaceName()));
     stringBuffer.append(TEXT_190);
+    stringBuffer.append(childMetaFeature.getFeatureAccessorName());
+    stringBuffer.append(TEXT_191);
     
 		} else {
 
-    stringBuffer.append(TEXT_191);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.NotificationFilter"));
     stringBuffer.append(TEXT_192);
-    stringBuffer.append(importManager.getImportedName(childMetaFeature.getGenPackage().getQualifiedPackageInterfaceName()));
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.NotificationFilter"));
     stringBuffer.append(TEXT_193);
-    stringBuffer.append(childMetaFeature.getFeatureAccessorName());
+    stringBuffer.append(importManager.getImportedName(childMetaFeature.getGenPackage().getQualifiedPackageInterfaceName()));
     stringBuffer.append(TEXT_194);
+    stringBuffer.append(childMetaFeature.getFeatureAccessorName());
+    stringBuffer.append(TEXT_195);
     
 		}
 	}	//for
@@ -1108,22 +1121,22 @@
     
 	if (hasDeclaredFilter) {
 
-    stringBuffer.append(TEXT_195);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.NotificationFilter"));
     stringBuffer.append(TEXT_196);
-    stringBuffer.append(_getViewCode);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.NotificationFilter"));
     stringBuffer.append(TEXT_197);
+    stringBuffer.append(_getViewCode);
+    stringBuffer.append(TEXT_198);
     
 	} else {
 		hasDeclaredFilter = true;
 
-    stringBuffer.append(TEXT_198);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.NotificationFilter"));
     stringBuffer.append(TEXT_199);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.NotificationFilter"));
     stringBuffer.append(TEXT_200);
-    stringBuffer.append(_getViewCode);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.NotificationFilter"));
     stringBuffer.append(TEXT_201);
+    stringBuffer.append(_getViewCode);
+    stringBuffer.append(TEXT_202);
     
 	}
 
@@ -1132,37 +1145,37 @@
 		if (hasDeclaredFilter) {
 			hasDeclaredFilter = true;
 
-    stringBuffer.append(TEXT_202);
+    stringBuffer.append(TEXT_203);
     
 		} else {
 
-    stringBuffer.append(TEXT_203);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.NotificationFilter"));
     stringBuffer.append(TEXT_204);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.NotificationFilter"));
+    stringBuffer.append(TEXT_205);
     
 		}
 	}
 	if (!hasDeclaredFilter) {
 
-    stringBuffer.append(TEXT_205);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.NotificationFilter"));
     stringBuffer.append(TEXT_206);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.NotificationFilter"));
     stringBuffer.append(TEXT_207);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.NotificationFilter"));
+    stringBuffer.append(TEXT_208);
     
 	}
 
-    stringBuffer.append(TEXT_208);
+    stringBuffer.append(TEXT_209);
     
 }	//local declaration of hasDeclaredFilter
 
-    stringBuffer.append(TEXT_209);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.lite.commands.CreateNotationalElementCommand"));
     stringBuffer.append(TEXT_210);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.lite.edit.parts.update.canonical.ElementDescriptor"));
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.lite.commands.CreateNotationalElementCommand"));
     stringBuffer.append(TEXT_211);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EObject"));
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.lite.edit.parts.update.canonical.ElementDescriptor"));
     stringBuffer.append(TEXT_212);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EObject"));
+    stringBuffer.append(TEXT_213);
     
 for (Iterator it = childNodes.iterator(); it.hasNext(); ) {
 	GenNode nextNode = (GenNode) it.next();
@@ -1172,39 +1185,39 @@
 	}
 	String childNodeInterfaceName = importManager.getImportedName(nextNode.getDomainMetaClass().getQualifiedInterfaceName());
 
-    stringBuffer.append(TEXT_213);
-    stringBuffer.append(importManager.getImportedName(nextNode.getEditPartQualifiedClassName()));
     stringBuffer.append(TEXT_214);
-    stringBuffer.append(childNodeInterfaceName);
+    stringBuffer.append(importManager.getImportedName(nextNode.getEditPartQualifiedClassName()));
     stringBuffer.append(TEXT_215);
+    stringBuffer.append(childNodeInterfaceName);
+    stringBuffer.append(TEXT_216);
     stringBuffer.append(nextNode.getDomainMetaClass().getName());
     stringBuffer.append(nextNode.getVisualID());
-    stringBuffer.append(TEXT_216);
-    if (!isListLayout) {
     stringBuffer.append(TEXT_217);
-    }
+    if (!isListLayout) {
     stringBuffer.append(TEXT_218);
+    }
+    stringBuffer.append(TEXT_219);
     
 }
 
-    stringBuffer.append(TEXT_219);
-    stringBuffer.append(importManager.getImportedName("java.util.List"));
     stringBuffer.append(TEXT_220);
+    stringBuffer.append(importManager.getImportedName("java.util.List"));
     stringBuffer.append(TEXT_221);
+    stringBuffer.append(TEXT_222);
     
 if (childNodes.size() == 0) {
 
-    stringBuffer.append(TEXT_222);
-    stringBuffer.append(importManager.getImportedName("java.util.Collections"));
     stringBuffer.append(TEXT_223);
+    stringBuffer.append(importManager.getImportedName("java.util.Collections"));
+    stringBuffer.append(TEXT_224);
     
 } else {
 
-    stringBuffer.append(TEXT_224);
-    stringBuffer.append(importManager.getImportedName("java.util.List"));
     stringBuffer.append(TEXT_225);
-    stringBuffer.append(importManager.getImportedName("java.util.LinkedList"));
+    stringBuffer.append(importManager.getImportedName("java.util.List"));
     stringBuffer.append(TEXT_226);
+    stringBuffer.append(importManager.getImportedName("java.util.LinkedList"));
+    stringBuffer.append(TEXT_227);
     
 	Map genFeature2genNodeMap = new LinkedHashMap();
 	for (int nodeIndex = 0; nodeIndex < childNodes.size(); nodeIndex++) {
@@ -1222,15 +1235,15 @@
 	Set entrySet = genFeature2genNodeMap.entrySet();
 	if (entrySet.size() > 0) {
 
-    stringBuffer.append(TEXT_227);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.View"));
     stringBuffer.append(TEXT_228);
-    stringBuffer.append(_getViewCode);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.View"));
     stringBuffer.append(TEXT_229);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EObject"));
+    stringBuffer.append(_getViewCode);
     stringBuffer.append(TEXT_230);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EObject"));
     stringBuffer.append(TEXT_231);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EObject"));
+    stringBuffer.append(TEXT_232);
     
 	}
 	for (Iterator entries = entrySet.iterator(); entries.hasNext();) {
@@ -1239,124 +1252,124 @@
 		Collection genNodesCollection = (Collection) nextEntry.getValue();
 		if (childMetaFeature.isListType()) {
 
-    stringBuffer.append(TEXT_232);
-    stringBuffer.append(importManager.getImportedName("java.util.Iterator"));
     stringBuffer.append(TEXT_233);
-    myFeatureGetAccessorHelper.appendFeatureValueGetter("modelObject", childMetaFeature, null, true);
+    stringBuffer.append(importManager.getImportedName("java.util.Iterator"));
     stringBuffer.append(TEXT_234);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EObject"));
+    myFeatureGetAccessorHelper.appendFeatureValueGetter("modelObject", childMetaFeature, null, true);
     stringBuffer.append(TEXT_235);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EObject"));
+    stringBuffer.append(TEXT_236);
     
 		} else {
 
-    stringBuffer.append(TEXT_236);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EObject"));
     stringBuffer.append(TEXT_237);
-    myFeatureGetAccessorHelper.appendFeatureValueGetter("modelObject", childMetaFeature, null, false);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EObject"));
     stringBuffer.append(TEXT_238);
+    myFeatureGetAccessorHelper.appendFeatureValueGetter("modelObject", childMetaFeature, null, false);
+    stringBuffer.append(TEXT_239);
     
 	}
 
-    stringBuffer.append(TEXT_239);
-    stringBuffer.append(importManager.getImportedName(genDiagram.getVisualIDRegistryQualifiedClassName()));
     stringBuffer.append(TEXT_240);
+    stringBuffer.append(importManager.getImportedName(genDiagram.getVisualIDRegistryQualifiedClassName()));
+    stringBuffer.append(TEXT_241);
     
 	boolean generateSwitch = genNodesCollection.size() != 1;
 	if (generateSwitch) {
 
-    stringBuffer.append(TEXT_241);
+    stringBuffer.append(TEXT_242);
     
 	}
 	for (Iterator genNodesIterator = genNodesCollection.iterator(); genNodesIterator.hasNext();) {
 		GenNode nextNode = (GenNode) genNodesIterator.next();
 		if (generateSwitch) {
 
-    stringBuffer.append(TEXT_242);
-    stringBuffer.append(importManager.getImportedName(nextNode.getEditPartQualifiedClassName()));
     stringBuffer.append(TEXT_243);
+    stringBuffer.append(importManager.getImportedName(nextNode.getEditPartQualifiedClassName()));
+    stringBuffer.append(TEXT_244);
     
 		} else {
 
-    stringBuffer.append(TEXT_244);
-    stringBuffer.append(importManager.getImportedName(nextNode.getEditPartQualifiedClassName()));
     stringBuffer.append(TEXT_245);
+    stringBuffer.append(importManager.getImportedName(nextNode.getEditPartQualifiedClassName()));
+    stringBuffer.append(TEXT_246);
     
 		}
 
-    stringBuffer.append(TEXT_246);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.lite.edit.parts.update.canonical.ElementDescriptor"));
     stringBuffer.append(TEXT_247);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.lite.edit.parts.update.canonical.ElementDescriptor"));
+    stringBuffer.append(TEXT_248);
     
 		if (generateSwitch) {
 
-    stringBuffer.append(TEXT_248);
+    stringBuffer.append(TEXT_249);
     
 		} else {
 
-    stringBuffer.append(TEXT_249);
+    stringBuffer.append(TEXT_250);
     
 		}
 	}
 	if (generateSwitch) {
 
-    stringBuffer.append(TEXT_250);
+    stringBuffer.append(TEXT_251);
     
 	}
 	if (childMetaFeature.isListType()) {
 
-    stringBuffer.append(TEXT_251);
+    stringBuffer.append(TEXT_252);
     
 	}
 }
 
-    stringBuffer.append(TEXT_252);
+    stringBuffer.append(TEXT_253);
     
 }
 
-    stringBuffer.append(TEXT_253);
-    stringBuffer.append(genDiagram.isSynchronized());
     stringBuffer.append(TEXT_254);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.lite.edit.parts.update.canonical.ElementDescriptor"));
-    stringBuffer.append(TEXT_255);
     stringBuffer.append(genDiagram.isSynchronized());
+    stringBuffer.append(TEXT_255);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.lite.edit.parts.update.canonical.ElementDescriptor"));
     stringBuffer.append(TEXT_256);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.View"));
+    stringBuffer.append(genDiagram.isSynchronized());
     stringBuffer.append(TEXT_257);
-    stringBuffer.append(_getViewCode);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.View"));
     stringBuffer.append(TEXT_258);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.lite.edit.parts.update.canonical.AbstractNotationModelRefresher"));
+    stringBuffer.append(_getViewCode);
     stringBuffer.append(TEXT_259);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.command.Command"));
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.lite.edit.parts.update.canonical.AbstractNotationModelRefresher"));
     stringBuffer.append(TEXT_260);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.TransactionalEditingDomain"));
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.command.Command"));
     stringBuffer.append(TEXT_261);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.util.TransactionUtil"));
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.TransactionalEditingDomain"));
     stringBuffer.append(TEXT_262);
-    stringBuffer.append(_getDiagramCode);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.util.TransactionUtil"));
     stringBuffer.append(TEXT_263);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.lite.commands.WrappingCommand"));
+    stringBuffer.append(_getDiagramCode);
     stringBuffer.append(TEXT_264);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.lite.commands.WrappingCommand"));
     stringBuffer.append(TEXT_265);
+    stringBuffer.append(TEXT_266);
     
 if (myHelper.containsLinks() || _includeUncontainedLinks) {
 
-    stringBuffer.append(TEXT_266);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.TransactionalEditingDomain"));
     stringBuffer.append(TEXT_267);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.util.TransactionUtil"));
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.TransactionalEditingDomain"));
     stringBuffer.append(TEXT_268);
-    stringBuffer.append(_getDiagramCode);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.util.TransactionUtil"));
     stringBuffer.append(TEXT_269);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.lite.edit.parts.update.canonical.IViewService"));
+    stringBuffer.append(_getDiagramCode);
     stringBuffer.append(TEXT_270);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.lite.edit.parts.update.canonical.IViewService"));
     stringBuffer.append(TEXT_271);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.lite.edit.parts.update.canonical.EditPartRegistryBasedViewService"));
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.lite.edit.parts.update.canonical.IViewService"));
     stringBuffer.append(TEXT_272);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.lite.edit.parts.update.canonical.OwnedLinksNotationModelRefresher"));
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.lite.edit.parts.update.canonical.EditPartRegistryBasedViewService"));
     stringBuffer.append(TEXT_273);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.lite.edit.parts.update.canonical.IViewService"));
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.lite.edit.parts.update.canonical.OwnedLinksNotationModelRefresher"));
     stringBuffer.append(TEXT_274);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.lite.edit.parts.update.canonical.IViewService"));
+    stringBuffer.append(TEXT_275);
     
 	boolean hasConstraintsInContainedLinks = false;
 	for (Iterator it = myHelper.getContainedTypeModelFacetLinks(); it.hasNext(); ) {
@@ -1369,42 +1382,42 @@
 	}
 	if (hasConstraintsInContainedLinks) {
 
-    stringBuffer.append(TEXT_275);
-    stringBuffer.append(genDiagram.getVisualIDRegistryQualifiedClassName());
     stringBuffer.append(TEXT_276);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.NotificationFilter"));
+    stringBuffer.append(genDiagram.getVisualIDRegistryQualifiedClassName());
     stringBuffer.append(TEXT_277);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.NotificationFilter"));
     stringBuffer.append(TEXT_278);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.NotificationFilter"));
+    stringBuffer.append(TEXT_279);
     
 	}
 	if (_includeUncontainedLinks) {
 
-    stringBuffer.append(TEXT_279);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.NotificationFilter"));
     stringBuffer.append(TEXT_280);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.NotificationFilter"));
     stringBuffer.append(TEXT_281);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.notify.Notification"));
-    stringBuffer.append(TEXT_282);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.NotificationFilter"));
-    stringBuffer.append(TEXT_283);
+    stringBuffer.append(TEXT_282);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.notify.Notification"));
-    stringBuffer.append(TEXT_284);
+    stringBuffer.append(TEXT_283);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.NotificationFilter"));
-    stringBuffer.append(TEXT_285);
+    stringBuffer.append(TEXT_284);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.notify.Notification"));
-    stringBuffer.append(TEXT_286);
+    stringBuffer.append(TEXT_285);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.NotificationFilter"));
-    stringBuffer.append(TEXT_287);
+    stringBuffer.append(TEXT_286);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.notify.Notification"));
+    stringBuffer.append(TEXT_287);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.NotificationFilter"));
     stringBuffer.append(TEXT_288);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.notify.Notification"));
+    stringBuffer.append(TEXT_289);
     
 	}
 
-    stringBuffer.append(TEXT_289);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.NotificationFilter"));
     stringBuffer.append(TEXT_290);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.NotificationFilter"));
+    stringBuffer.append(TEXT_291);
     
 	{
 		boolean hasDeclaredFilter = false;
@@ -1417,7 +1430,7 @@
 			}
 			GenFeature _feature = modelFacet.getChildMetaFeature();
 
-    stringBuffer.append(TEXT_291);
+    stringBuffer.append(TEXT_292);
     
 	/*
 	 * input: 
@@ -1431,32 +1444,32 @@
 	if (!hasDeclaredFilter) {
 		hasDeclaredFilter = true;
 
-    stringBuffer.append(TEXT_292);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.NotificationFilter"));
     stringBuffer.append(TEXT_293);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.NotificationFilter"));
     stringBuffer.append(TEXT_294);
-    stringBuffer.append(importManager.getImportedName(_feature.getGenPackage().getQualifiedPackageInterfaceName()));
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.NotificationFilter"));
     stringBuffer.append(TEXT_295);
-    stringBuffer.append(_feature.getFeatureAccessorName());
+    stringBuffer.append(importManager.getImportedName(_feature.getGenPackage().getQualifiedPackageInterfaceName()));
     stringBuffer.append(TEXT_296);
+    stringBuffer.append(_feature.getFeatureAccessorName());
+    stringBuffer.append(TEXT_297);
     
 	} else {
 
-    stringBuffer.append(TEXT_297);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.NotificationFilter"));
     stringBuffer.append(TEXT_298);
-    stringBuffer.append(importManager.getImportedName(_feature.getGenPackage().getQualifiedPackageInterfaceName()));
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.NotificationFilter"));
     stringBuffer.append(TEXT_299);
-    stringBuffer.append(_feature.getFeatureAccessorName());
+    stringBuffer.append(importManager.getImportedName(_feature.getGenPackage().getQualifiedPackageInterfaceName()));
     stringBuffer.append(TEXT_300);
+    stringBuffer.append(_feature.getFeatureAccessorName());
+    stringBuffer.append(TEXT_301);
     
 	}
 
     
 			_feature = modelFacet.getSourceMetaFeature();
 
-    stringBuffer.append(TEXT_301);
+    stringBuffer.append(TEXT_302);
     
 	/*
 	 * input: 
@@ -1470,32 +1483,32 @@
 	if (!hasDeclaredFilter) {
 		hasDeclaredFilter = true;
 
-    stringBuffer.append(TEXT_302);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.NotificationFilter"));
     stringBuffer.append(TEXT_303);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.NotificationFilter"));
     stringBuffer.append(TEXT_304);
-    stringBuffer.append(importManager.getImportedName(_feature.getGenPackage().getQualifiedPackageInterfaceName()));
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.NotificationFilter"));
     stringBuffer.append(TEXT_305);
-    stringBuffer.append(_feature.getFeatureAccessorName());
+    stringBuffer.append(importManager.getImportedName(_feature.getGenPackage().getQualifiedPackageInterfaceName()));
     stringBuffer.append(TEXT_306);
+    stringBuffer.append(_feature.getFeatureAccessorName());
+    stringBuffer.append(TEXT_307);
     
 	} else {
 
-    stringBuffer.append(TEXT_307);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.NotificationFilter"));
     stringBuffer.append(TEXT_308);
-    stringBuffer.append(importManager.getImportedName(_feature.getGenPackage().getQualifiedPackageInterfaceName()));
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.NotificationFilter"));
     stringBuffer.append(TEXT_309);
-    stringBuffer.append(_feature.getFeatureAccessorName());
+    stringBuffer.append(importManager.getImportedName(_feature.getGenPackage().getQualifiedPackageInterfaceName()));
     stringBuffer.append(TEXT_310);
+    stringBuffer.append(_feature.getFeatureAccessorName());
+    stringBuffer.append(TEXT_311);
     
 	}
 
     
 			_feature = modelFacet.getTargetMetaFeature();
 
-    stringBuffer.append(TEXT_311);
+    stringBuffer.append(TEXT_312);
     
 	/*
 	 * input: 
@@ -1509,25 +1522,25 @@
 	if (!hasDeclaredFilter) {
 		hasDeclaredFilter = true;
 
-    stringBuffer.append(TEXT_312);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.NotificationFilter"));
     stringBuffer.append(TEXT_313);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.NotificationFilter"));
     stringBuffer.append(TEXT_314);
-    stringBuffer.append(importManager.getImportedName(_feature.getGenPackage().getQualifiedPackageInterfaceName()));
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.NotificationFilter"));
     stringBuffer.append(TEXT_315);
-    stringBuffer.append(_feature.getFeatureAccessorName());
+    stringBuffer.append(importManager.getImportedName(_feature.getGenPackage().getQualifiedPackageInterfaceName()));
     stringBuffer.append(TEXT_316);
+    stringBuffer.append(_feature.getFeatureAccessorName());
+    stringBuffer.append(TEXT_317);
     
 	} else {
 
-    stringBuffer.append(TEXT_317);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.NotificationFilter"));
     stringBuffer.append(TEXT_318);
-    stringBuffer.append(importManager.getImportedName(_feature.getGenPackage().getQualifiedPackageInterfaceName()));
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.NotificationFilter"));
     stringBuffer.append(TEXT_319);
-    stringBuffer.append(_feature.getFeatureAccessorName());
+    stringBuffer.append(importManager.getImportedName(_feature.getGenPackage().getQualifiedPackageInterfaceName()));
     stringBuffer.append(TEXT_320);
+    stringBuffer.append(_feature.getFeatureAccessorName());
+    stringBuffer.append(TEXT_321);
     
 	}
 
@@ -1537,7 +1550,7 @@
 			GenLink nextLink = (GenLink) it.next();
 			GenFeature _feature = ((FeatureModelFacet) nextLink.getModelFacet()).getMetaFeature();
 
-    stringBuffer.append(TEXT_321);
+    stringBuffer.append(TEXT_322);
     
 	/*
 	 * input: 
@@ -1551,25 +1564,25 @@
 	if (!hasDeclaredFilter) {
 		hasDeclaredFilter = true;
 
-    stringBuffer.append(TEXT_322);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.NotificationFilter"));
     stringBuffer.append(TEXT_323);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.NotificationFilter"));
     stringBuffer.append(TEXT_324);
-    stringBuffer.append(importManager.getImportedName(_feature.getGenPackage().getQualifiedPackageInterfaceName()));
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.NotificationFilter"));
     stringBuffer.append(TEXT_325);
-    stringBuffer.append(_feature.getFeatureAccessorName());
+    stringBuffer.append(importManager.getImportedName(_feature.getGenPackage().getQualifiedPackageInterfaceName()));
     stringBuffer.append(TEXT_326);
+    stringBuffer.append(_feature.getFeatureAccessorName());
+    stringBuffer.append(TEXT_327);
     
 	} else {
 
-    stringBuffer.append(TEXT_327);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.NotificationFilter"));
     stringBuffer.append(TEXT_328);
-    stringBuffer.append(importManager.getImportedName(_feature.getGenPackage().getQualifiedPackageInterfaceName()));
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.NotificationFilter"));
     stringBuffer.append(TEXT_329);
-    stringBuffer.append(_feature.getFeatureAccessorName());
+    stringBuffer.append(importManager.getImportedName(_feature.getGenPackage().getQualifiedPackageInterfaceName()));
     stringBuffer.append(TEXT_330);
+    stringBuffer.append(_feature.getFeatureAccessorName());
+    stringBuffer.append(TEXT_331);
     
 	}
 
@@ -1578,59 +1591,59 @@
 		if (hasConstraintsInContainedLinks) {
 			if (hasDeclaredFilter) {
 
-    stringBuffer.append(TEXT_331);
+    stringBuffer.append(TEXT_332);
     
 			} else {
 				hasDeclaredFilter = true;
 
-    stringBuffer.append(TEXT_332);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.NotificationFilter"));
     stringBuffer.append(TEXT_333);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.NotificationFilter"));
+    stringBuffer.append(TEXT_334);
     
 			}
 		}
 		if (_includeUncontainedLinks) {
 			if (hasDeclaredFilter) {
 
-    stringBuffer.append(TEXT_334);
+    stringBuffer.append(TEXT_335);
     
 			} else {
 				hasDeclaredFilter = true;
 
-    stringBuffer.append(TEXT_335);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.NotificationFilter"));
     stringBuffer.append(TEXT_336);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.NotificationFilter"));
+    stringBuffer.append(TEXT_337);
     
 			}
 		}
 		if (!hasDeclaredFilter) {
 
-    stringBuffer.append(TEXT_337);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.NotificationFilter"));
     stringBuffer.append(TEXT_338);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.NotificationFilter"));
     stringBuffer.append(TEXT_339);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.NotificationFilter"));
+    stringBuffer.append(TEXT_340);
     
 		}
 	}	//local declaration of hasDeclaredFilter
 
-    stringBuffer.append(TEXT_340);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.lite.commands.CreateNotationalElementCommand"));
     stringBuffer.append(TEXT_341);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.lite.edit.parts.update.canonical.ElementDescriptor"));
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.lite.commands.CreateNotationalElementCommand"));
     stringBuffer.append(TEXT_342);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.lite.edit.parts.update.canonical.LinkDescriptor"));
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.lite.edit.parts.update.canonical.ElementDescriptor"));
     stringBuffer.append(TEXT_343);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.lite.edit.parts.update.canonical.LinkDescriptor"));
     stringBuffer.append(TEXT_344);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.View"));
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.lite.edit.parts.update.canonical.LinkDescriptor"));
     stringBuffer.append(TEXT_345);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.View"));
     stringBuffer.append(TEXT_346);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.Edge"));
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.View"));
     stringBuffer.append(TEXT_347);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.NotationFactory"));
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.Edge"));
     stringBuffer.append(TEXT_348);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.NotationFactory"));
+    stringBuffer.append(TEXT_349);
     
 	for(Iterator it = myHelper.getContainedTypeModelFacetLinks(); it.hasNext(); ) {
 		GenLink nextLink = (GenLink) it.next();
@@ -1639,37 +1652,37 @@
 			continue;
 		}
 
-    stringBuffer.append(TEXT_349);
-    stringBuffer.append(importManager.getImportedName(nextLink.getEditPartQualifiedClassName()));
     stringBuffer.append(TEXT_350);
-    stringBuffer.append(importManager.getImportedName(modelFacet.getMetaClass().getQualifiedInterfaceName()));
+    stringBuffer.append(importManager.getImportedName(nextLink.getEditPartQualifiedClassName()));
     stringBuffer.append(TEXT_351);
-    stringBuffer.append(importManager.getImportedName(nextLink.getNotationViewFactoryQualifiedClassName()));
+    stringBuffer.append(importManager.getImportedName(modelFacet.getMetaClass().getQualifiedInterfaceName()));
     stringBuffer.append(TEXT_352);
+    stringBuffer.append(importManager.getImportedName(nextLink.getNotationViewFactoryQualifiedClassName()));
+    stringBuffer.append(TEXT_353);
     
 	}
 	for(Iterator it = myHelper.getContainedFeatureModelFacetLinks(); it.hasNext(); ) {
 		GenLink nextLink = (GenLink) it.next();
 
-    stringBuffer.append(TEXT_353);
-    stringBuffer.append(importManager.getImportedName(nextLink.getEditPartQualifiedClassName()));
     stringBuffer.append(TEXT_354);
-    stringBuffer.append(importManager.getImportedName(nextLink.getNotationViewFactoryQualifiedClassName()));
+    stringBuffer.append(importManager.getImportedName(nextLink.getEditPartQualifiedClassName()));
     stringBuffer.append(TEXT_355);
+    stringBuffer.append(importManager.getImportedName(nextLink.getNotationViewFactoryQualifiedClassName()));
+    stringBuffer.append(TEXT_356);
     
 	}
 
-    stringBuffer.append(TEXT_356);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.lite.commands.CreateNotationalEdgeCommand"));
     stringBuffer.append(TEXT_357);
-    stringBuffer.append(importManager.getImportedName("java.util.List"));
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.lite.commands.CreateNotationalEdgeCommand"));
     stringBuffer.append(TEXT_358);
+    stringBuffer.append(importManager.getImportedName("java.util.List"));
     stringBuffer.append(TEXT_359);
     stringBuffer.append(TEXT_360);
-    stringBuffer.append(importManager.getImportedName("java.util.List"));
     stringBuffer.append(TEXT_361);
-    stringBuffer.append(importManager.getImportedName("java.util.LinkedList"));
+    stringBuffer.append(importManager.getImportedName("java.util.List"));
     stringBuffer.append(TEXT_362);
+    stringBuffer.append(importManager.getImportedName("java.util.LinkedList"));
+    stringBuffer.append(TEXT_363);
     
 Map genFeature2genLinkMap = new LinkedHashMap();
 for(Iterator it = myHelper.getContainedTypeModelFacetLinks(); it.hasNext(); ) {
@@ -1692,18 +1705,18 @@
 }
 if (!genFeature2genLinkMap.isEmpty() || !genFeature2featureGenLinkMap.isEmpty()) {
 
-    stringBuffer.append(TEXT_363);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EObject"));
     stringBuffer.append(TEXT_364);
-    stringBuffer.append(_getViewCode);
-    stringBuffer.append(TEXT_365);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EObject"));
+    stringBuffer.append(TEXT_365);
+    stringBuffer.append(_getViewCode);
     stringBuffer.append(TEXT_366);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EObject"));
+    stringBuffer.append(TEXT_367);
     
 }
 if (!genFeature2genLinkMap.isEmpty()) {
 
-    stringBuffer.append(TEXT_367);
+    stringBuffer.append(TEXT_368);
     
 }
 for (Iterator entries = genFeature2genLinkMap.entrySet().iterator(); entries.hasNext();) {
@@ -1712,32 +1725,32 @@
 	Collection genLinksCollection = (Collection) nextEntry.getValue();
 	if (metaFeature.isListType()) {
 
-    stringBuffer.append(TEXT_368);
-    stringBuffer.append(importManager.getImportedName("java.util.Iterator"));
     stringBuffer.append(TEXT_369);
-    myFeatureGetAccessorHelper.appendFeatureValueGetter("modelObject", metaFeature, null, true);
+    stringBuffer.append(importManager.getImportedName("java.util.Iterator"));
     stringBuffer.append(TEXT_370);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EObject"));
+    myFeatureGetAccessorHelper.appendFeatureValueGetter("modelObject", metaFeature, null, true);
     stringBuffer.append(TEXT_371);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EObject"));
+    stringBuffer.append(TEXT_372);
     
 	} else {
 
-    stringBuffer.append(TEXT_372);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EObject"));
     stringBuffer.append(TEXT_373);
-    myFeatureGetAccessorHelper.appendFeatureValueGetter("modelObject", metaFeature, null, false);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EObject"));
     stringBuffer.append(TEXT_374);
+    myFeatureGetAccessorHelper.appendFeatureValueGetter("modelObject", metaFeature, null, false);
+    stringBuffer.append(TEXT_375);
     
 	}
 
-    stringBuffer.append(TEXT_375);
-    stringBuffer.append(importManager.getImportedName(genDiagram.getVisualIDRegistryQualifiedClassName()));
     stringBuffer.append(TEXT_376);
+    stringBuffer.append(importManager.getImportedName(genDiagram.getVisualIDRegistryQualifiedClassName()));
+    stringBuffer.append(TEXT_377);
     
 	boolean generateSwitch = genLinksCollection.size() != 1;
 	if (generateSwitch) {
 
-    stringBuffer.append(TEXT_377);
+    stringBuffer.append(TEXT_378);
     
 	}
 	for (Iterator genLinksIterator = genLinksCollection.iterator(); genLinksIterator.hasNext(); ) {
@@ -1745,67 +1758,67 @@
 		TypeLinkModelFacet modelFacet = (TypeLinkModelFacet) nextLink.getModelFacet();
 		if (generateSwitch) {
 
-    stringBuffer.append(TEXT_378);
-    stringBuffer.append(importManager.getImportedName(nextLink.getEditPartQualifiedClassName()));
     stringBuffer.append(TEXT_379);
+    stringBuffer.append(importManager.getImportedName(nextLink.getEditPartQualifiedClassName()));
+    stringBuffer.append(TEXT_380);
     
 		} else {
 
-    stringBuffer.append(TEXT_380);
-    stringBuffer.append(importManager.getImportedName(nextLink.getEditPartQualifiedClassName()));
     stringBuffer.append(TEXT_381);
+    stringBuffer.append(importManager.getImportedName(nextLink.getEditPartQualifiedClassName()));
+    stringBuffer.append(TEXT_382);
     
 		}
 		if (modelFacet.getSourceMetaFeature() != null) {
 
-    stringBuffer.append(TEXT_382);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EObject"));
     stringBuffer.append(TEXT_383);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EObject"));
     stringBuffer.append(TEXT_384);
-    myFeatureGetAccessorHelper.appendFeatureValueGetter("nextValue", modelFacet.getSourceMetaFeature(), null, false);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EObject"));
     stringBuffer.append(TEXT_385);
+    myFeatureGetAccessorHelper.appendFeatureValueGetter("nextValue", modelFacet.getSourceMetaFeature(), null, false);
+    stringBuffer.append(TEXT_386);
     
 		} else {
 
-    stringBuffer.append(TEXT_386);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EObject"));
     stringBuffer.append(TEXT_387);
-    stringBuffer.append(_getViewCode);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EObject"));
     stringBuffer.append(TEXT_388);
+    stringBuffer.append(_getViewCode);
+    stringBuffer.append(TEXT_389);
     
 		}
 		if (modelFacet.getTargetMetaFeature() != null) {
 
-    stringBuffer.append(TEXT_389);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EObject"));
     stringBuffer.append(TEXT_390);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EObject"));
     stringBuffer.append(TEXT_391);
-    myFeatureGetAccessorHelper.appendFeatureValueGetter("nextValue", modelFacet.getTargetMetaFeature(), null, false);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EObject"));
     stringBuffer.append(TEXT_392);
+    myFeatureGetAccessorHelper.appendFeatureValueGetter("nextValue", modelFacet.getTargetMetaFeature(), null, false);
+    stringBuffer.append(TEXT_393);
     
 		} else {
 
-    stringBuffer.append(TEXT_393);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EObject"));
     stringBuffer.append(TEXT_394);
-    stringBuffer.append(_getViewCode);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EObject"));
     stringBuffer.append(TEXT_395);
+    stringBuffer.append(_getViewCode);
+    stringBuffer.append(TEXT_396);
     
 		}
 
-    stringBuffer.append(TEXT_396);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.lite.edit.parts.update.canonical.LinkDescriptor"));
     stringBuffer.append(TEXT_397);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.lite.edit.parts.update.canonical.LinkDescriptor"));
+    stringBuffer.append(TEXT_398);
     
 		if (generateSwitch) {
 
-    stringBuffer.append(TEXT_398);
+    stringBuffer.append(TEXT_399);
     
 		} else {
 
-    stringBuffer.append(TEXT_399);
+    stringBuffer.append(TEXT_400);
     
 		}
 
@@ -1813,12 +1826,12 @@
 	}	//iterate over genLinksCollection
 	if (generateSwitch) {
 
-    stringBuffer.append(TEXT_400);
+    stringBuffer.append(TEXT_401);
     
 	}
 	if (metaFeature.isListType()) {
 
-    stringBuffer.append(TEXT_401);
+    stringBuffer.append(TEXT_402);
     
 	}
 }
@@ -1828,172 +1841,188 @@
 	Collection genLinksCollection = (Collection) nextEntry.getValue();
 	if (metaFeature.isListType()) {
 
-    stringBuffer.append(TEXT_402);
-    stringBuffer.append(importManager.getImportedName("java.util.Iterator"));
     stringBuffer.append(TEXT_403);
-    myFeatureGetAccessorHelper.appendFeatureValueGetter("modelObject", metaFeature, null, true);
+    stringBuffer.append(importManager.getImportedName("java.util.Iterator"));
     stringBuffer.append(TEXT_404);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EObject"));
+    myFeatureGetAccessorHelper.appendFeatureValueGetter("modelObject", metaFeature, null, true);
     stringBuffer.append(TEXT_405);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EObject"));
+    stringBuffer.append(TEXT_406);
     
 	} else {
 
-    stringBuffer.append(TEXT_406);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EObject"));
     stringBuffer.append(TEXT_407);
-    myFeatureGetAccessorHelper.appendFeatureValueGetter("modelObject", metaFeature, null, false);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EObject"));
     stringBuffer.append(TEXT_408);
+    myFeatureGetAccessorHelper.appendFeatureValueGetter("modelObject", metaFeature, null, false);
+    stringBuffer.append(TEXT_409);
     
 	}
 
-    stringBuffer.append(TEXT_409);
+    stringBuffer.append(TEXT_410);
     
 	for (Iterator genLinksIterator = genLinksCollection.iterator(); genLinksIterator.hasNext(); ) {
 		GenLink nextLink = (GenLink) genLinksIterator.next();
 
-    stringBuffer.append(TEXT_410);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.lite.edit.parts.update.canonical.LinkDescriptor"));
     stringBuffer.append(TEXT_411);
-    stringBuffer.append(importManager.getImportedName(nextLink.getEditPartQualifiedClassName()));
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.lite.edit.parts.update.canonical.LinkDescriptor"));
     stringBuffer.append(TEXT_412);
+    stringBuffer.append(importManager.getImportedName(nextLink.getEditPartQualifiedClassName()));
+    stringBuffer.append(TEXT_413);
     
 	}
 
-    stringBuffer.append(TEXT_413);
+    stringBuffer.append(TEXT_414);
     
 	if (metaFeature.isListType()) {
 
-    stringBuffer.append(TEXT_414);
+    stringBuffer.append(TEXT_415);
     
 	}
 }
 
-    stringBuffer.append(TEXT_415);
-    stringBuffer.append(importManager.getImportedName("java.util.List"));
     stringBuffer.append(TEXT_416);
     stringBuffer.append(importManager.getImportedName("java.util.List"));
     stringBuffer.append(TEXT_417);
-    stringBuffer.append(importManager.getImportedName("java.util.LinkedList"));
-    stringBuffer.append(TEXT_418);
     stringBuffer.append(importManager.getImportedName("java.util.List"));
+    stringBuffer.append(TEXT_418);
+    stringBuffer.append(importManager.getImportedName("java.util.LinkedList"));
     stringBuffer.append(TEXT_419);
-    stringBuffer.append(_getDiagramCode);
+    stringBuffer.append(importManager.getImportedName("java.util.List"));
     stringBuffer.append(TEXT_420);
-    stringBuffer.append(importManager.getImportedName("java.util.Iterator"));
+    stringBuffer.append(_getDiagramCode);
     stringBuffer.append(TEXT_421);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.Edge"));
+    stringBuffer.append(importManager.getImportedName("java.util.Iterator"));
     stringBuffer.append(TEXT_422);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.Edge"));
     stringBuffer.append(TEXT_423);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.Edge"));
+    stringBuffer.append(TEXT_424);
     
 	if (_includeUncontainedLinks) {
 
-    stringBuffer.append(TEXT_424);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.View"));
     stringBuffer.append(TEXT_425);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.View"));
     stringBuffer.append(TEXT_426);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.View"));
+    stringBuffer.append(TEXT_427);
     
 	}
 	if (myHelper.containsFeatureModelFacetLinks()) {
 
-    stringBuffer.append(TEXT_427);
-    stringBuffer.append(_getViewCode);
     stringBuffer.append(TEXT_428);
-    stringBuffer.append(importManager.getImportedName(genDiagram.getVisualIDRegistryQualifiedClassName()));
+    stringBuffer.append(_getViewCode);
     stringBuffer.append(TEXT_429);
+    stringBuffer.append(importManager.getImportedName(genDiagram.getVisualIDRegistryQualifiedClassName()));
+    stringBuffer.append(TEXT_430);
     
 		for(Iterator it = myHelper.getContainedFeatureModelFacetLinks(); it.hasNext(); ) {
 			GenLink nextLink = (GenLink) it.next();
 
-    stringBuffer.append(TEXT_430);
-    stringBuffer.append(importManager.getImportedName(nextLink.getEditPartQualifiedClassName()));
     stringBuffer.append(TEXT_431);
+    stringBuffer.append(importManager.getImportedName(nextLink.getEditPartQualifiedClassName()));
+    stringBuffer.append(TEXT_432);
     
 		}
 
-    stringBuffer.append(TEXT_432);
+    stringBuffer.append(TEXT_433);
     
 		if (myHelper.containsTypeModelFacetLinks()) {
 
-    stringBuffer.append(TEXT_433);
+    stringBuffer.append(TEXT_434);
     
 		} else {
 
-    stringBuffer.append(TEXT_434);
+    stringBuffer.append(TEXT_435);
     
 		}
 	}
 	if (myHelper.containsTypeModelFacetLinks()) {
 		if (!myHelper.containsFeatureModelFacetLinks()) {
 
-    stringBuffer.append(TEXT_435);
+    stringBuffer.append(TEXT_436);
     
 		}
 
-    stringBuffer.append(TEXT_436);
-    stringBuffer.append(_getViewCode);
     stringBuffer.append(TEXT_437);
-    stringBuffer.append(importManager.getImportedName(genDiagram.getVisualIDRegistryQualifiedClassName()));
+    stringBuffer.append(_getViewCode);
     stringBuffer.append(TEXT_438);
+    stringBuffer.append(importManager.getImportedName(genDiagram.getVisualIDRegistryQualifiedClassName()));
+    stringBuffer.append(TEXT_439);
     
 		for(Iterator it = myHelper.getContainedTypeModelFacetLinks(); it.hasNext(); ) {
 			GenLink nextLink = (GenLink) it.next();
 
-    stringBuffer.append(TEXT_439);
-    stringBuffer.append(importManager.getImportedName(nextLink.getEditPartQualifiedClassName()));
     stringBuffer.append(TEXT_440);
+    stringBuffer.append(importManager.getImportedName(nextLink.getEditPartQualifiedClassName()));
+    stringBuffer.append(TEXT_441);
     
 		}
 
-    stringBuffer.append(TEXT_441);
+    stringBuffer.append(TEXT_442);
     
 	}
 
-    stringBuffer.append(TEXT_442);
-    stringBuffer.append(genDiagram.isSynchronized());
     stringBuffer.append(TEXT_443);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.lite.edit.parts.update.canonical.ElementDescriptor"));
-    stringBuffer.append(TEXT_444);
     stringBuffer.append(genDiagram.isSynchronized());
+    stringBuffer.append(TEXT_444);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.lite.edit.parts.update.canonical.ElementDescriptor"));
     stringBuffer.append(TEXT_445);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.View"));
+    stringBuffer.append(genDiagram.isSynchronized());
     stringBuffer.append(TEXT_446);
-    stringBuffer.append(_getViewCode);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.View"));
     stringBuffer.append(TEXT_447);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.lite.edit.parts.update.canonical.AbstractNotationModelRefresher"));
+    stringBuffer.append(_getViewCode);
     stringBuffer.append(TEXT_448);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.command.Command"));
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.lite.edit.parts.update.canonical.AbstractNotationModelRefresher"));
     stringBuffer.append(TEXT_449);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.TransactionalEditingDomain"));
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.command.Command"));
     stringBuffer.append(TEXT_450);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.util.TransactionUtil"));
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.TransactionalEditingDomain"));
     stringBuffer.append(TEXT_451);
-    stringBuffer.append(_getDiagramCode);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.util.TransactionUtil"));
     stringBuffer.append(TEXT_452);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.lite.commands.WrappingCommand"));
+    stringBuffer.append(_getDiagramCode);
     stringBuffer.append(TEXT_453);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.lite.commands.WrappingCommand"));
+    stringBuffer.append(TEXT_454);
     
 }
 
     
 }
 
-    stringBuffer.append(TEXT_454);
     stringBuffer.append(TEXT_455);
     stringBuffer.append(TEXT_456);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.lite.edit.parts.update.RefreshAdapter"));
     stringBuffer.append(TEXT_457);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.lite.edit.parts.update.RefreshAdapter"));
     stringBuffer.append(TEXT_458);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.lite.edit.parts.update.UpdateManager"));
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.lite.edit.parts.update.RefreshAdapter"));
     stringBuffer.append(TEXT_459);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.lite.edit.parts.update.UpdateManager"));
     stringBuffer.append(TEXT_460);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.lite.edit.parts.update.UpdateManager"));
     stringBuffer.append(TEXT_461);
-    importManager.emitSortedImports();
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.lite.edit.parts.update.UpdateManager"));
     stringBuffer.append(TEXT_462);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.lite.edit.parts.tree.BaseTreeEditPart"));
+    stringBuffer.append(TEXT_463);
+    stringBuffer.append(importManager.getImportedName(genDiagram.getEditorGen().getPlugin().getActivatorQualifiedClassName()));
+    stringBuffer.append(TEXT_464);
+    stringBuffer.append(TEXT_465);
+    stringBuffer.append(TEXT_466);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.lite.edit.parts.update.RefreshAdapter"));
+    stringBuffer.append(TEXT_467);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.lite.edit.parts.update.RefreshAdapter"));
+    stringBuffer.append(TEXT_468);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.lite.edit.parts.update.UpdateManager"));
+    stringBuffer.append(TEXT_469);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.lite.edit.parts.update.UpdateManager"));
+    stringBuffer.append(TEXT_470);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.lite.edit.parts.update.UpdateManager"));
+    stringBuffer.append(TEXT_471);
+    importManager.emitSortedImports();
+    stringBuffer.append(TEXT_472);
     return stringBuffer.toString();
   }
 }
Index: src-templates/org/eclipse/gmf/codegen/templates/lite/parts/ChildNodeEditPartGenerator.java
===================================================================
RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.codegen.lite/src-templates/org/eclipse/gmf/codegen/templates/lite/parts/ChildNodeEditPartGenerator.java,v
retrieving revision 1.10
diff -u -r1.10 ChildNodeEditPartGenerator.java
--- src-templates/org/eclipse/gmf/codegen/templates/lite/parts/ChildNodeEditPartGenerator.java	1 Sep 2006 16:14:08 -0000	1.10
+++ src-templates/org/eclipse/gmf/codegen/templates/lite/parts/ChildNodeEditPartGenerator.java	11 Sep 2006 10:18:30 -0000
@@ -58,260 +58,411 @@
   protected final String TEXT_38 = " view = (";
   protected final String TEXT_39 = ") getModel();" + NL + "\t\tif (view != null && view.isSetElement() && view.getElement() != null) {" + NL + "\t\t\tgetViewer().getEditPartRegistry().put(view.getElement(), this);\t" + NL + "\t\t}" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected void unregisterModel() {" + NL + "\t\tsuper.unregisterModel();" + NL + "\t\t";
   protected final String TEXT_40 = " view = (";
-  protected final String TEXT_41 = ") getModel();" + NL + "\t\tif (view != null && view.isSetElement() && view.getElement() != null && getViewer().getEditPartRegistry().get(view.getElement()) == this) {" + NL + "\t\t\tgetViewer().getEditPartRegistry().remove(view.getElement());" + NL + "\t\t}" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected void createEditPolicies() {" + NL + "\t\t//XXX: install correct edit policies!";
+  protected final String TEXT_41 = ") getModel();" + NL + "\t\tif (view != null && view.isSetElement() && view.getElement() != null && getViewer().getEditPartRegistry().get(view.getElement()) == this) {" + NL + "\t\t\tgetViewer().getEditPartRegistry().remove(view.getElement());" + NL + "\t\t}" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected void createEditPolicies() {";
   protected final String TEXT_42 = NL;
   protected final String TEXT_43 = "\t\tinstallEditPolicy(";
   protected final String TEXT_44 = ".DIRECT_EDIT_ROLE," + NL + "\t\t\t\tnew ";
   protected final String TEXT_45 = "() {" + NL + "\t\t\t\t\tprotected void showCurrentEditValue(";
-  protected final String TEXT_46 = " request) {" + NL + "\t\t\t\t\t\tString value = (String) request.getCellEditor().getValue();" + NL + "\t\t\t\t\t\tgetLabel().setText(value);" + NL + "\t\t\t\t\t}" + NL + "\t\t\t\t\tprotected ";
-  protected final String TEXT_47 = " getDirectEditCommand(";
-  protected final String TEXT_48 = " request) {" + NL + "\t\t\t\t\t\tString value = (String) request.getCellEditor().getValue();" + NL + "\t\t\t\t\t\tif (value == null) {" + NL + "\t\t\t\t\t\t\t//Invalid value is transformed into a null by the validator." + NL + "\t\t\t\t\t\t\t//XXX: implement validator" + NL + "\t\t\t\t\t\t\treturn ";
-  protected final String TEXT_49 = ".INSTANCE;" + NL + "\t\t\t\t\t\t}" + NL + "\t\t\t\t\t\tfinal Object[] parseResult;" + NL + "\t\t\t\t\t\ttry {" + NL + "\t\t\t\t\t\t\tparseResult = new ";
-  protected final String TEXT_50 = "(EDIT_PATTERN).parse(value);" + NL + "\t\t\t\t\t\t} catch (IllegalArgumentException e) {" + NL + "\t\t\t\t\t\t\treturn ";
-  protected final String TEXT_51 = ".INSTANCE;" + NL + "\t\t\t\t\t\t} catch (";
-  protected final String TEXT_52 = " e) {" + NL + "\t\t\t\t\t\t\treturn ";
-  protected final String TEXT_53 = ".INSTANCE;" + NL + "\t\t\t\t\t\t}" + NL + "\t\t\t\t\t\t";
-  protected final String TEXT_54 = " editingDomain = ";
-  protected final String TEXT_55 = ".getEditingDomain(";
-  protected final String TEXT_56 = ".getDiagram().getElement());";
-  protected final String TEXT_57 = NL + "\t\t\t\t\t\tif (parseResult.length != 1) {" + NL + "\t\t\t\t\t\t\treturn ";
-  protected final String TEXT_58 = ".INSTANCE;" + NL + "\t\t\t\t\t\t}" + NL + "\t\t\t\t\t\t";
-  protected final String TEXT_59 = " domainModelCommand = createDomainModelCommand(editingDomain, parseResult[0]);" + NL + "\t\t\t\t\t\treturn new ";
-  protected final String TEXT_60 = "(editingDomain, domainModelCommand);" + NL + "\t\t\t\t\t}" + NL + "\t\t\t\t\t";
-  protected final String TEXT_61 = " createDomainModelCommand(";
-  protected final String TEXT_62 = " editingDomain, Object value) {" + NL + "\t\t\t\t\t\t";
-  protected final String TEXT_63 = " element = ";
-  protected final String TEXT_64 = ";" + NL + "\t\t\t\t\t\t";
-  protected final String TEXT_65 = " feature = (";
-  protected final String TEXT_66 = ") ";
-  protected final String TEXT_67 = ".eINSTANCE.get";
-  protected final String TEXT_68 = "();" + NL + "\t\t\t\t\t\tObject valueToSet;" + NL + "\t\t\t\t\t\ttry {" + NL + "\t\t\t\t\t\t\tvalueToSet = ";
-  protected final String TEXT_69 = ".parseValue(feature, value);" + NL + "\t\t\t\t\t\t} catch (IllegalArgumentException e) {" + NL + "\t\t\t\t\t\t\treturn ";
-  protected final String TEXT_70 = ".INSTANCE;" + NL + "\t\t\t\t\t\t}";
-  protected final String TEXT_71 = NL + "\t\t\t\t\t\t";
-  protected final String TEXT_72 = " result = new ";
-  protected final String TEXT_73 = "();" + NL + "\t\t\t\t\t\t";
-  protected final String TEXT_74 = " values = new ";
-  protected final String TEXT_75 = "();" + NL + "\t\t\t\t\t\tvalues.addAll(element.get";
-  protected final String TEXT_76 = "());" + NL + "\t\t\t\t\t\tresult.append(";
-  protected final String TEXT_77 = ".create(editingDomain, element, feature, values));" + NL + "\t\t\t\t\t\tresult.append(";
-  protected final String TEXT_78 = ".create(editingDomain, element, feature, valueToSet));" + NL + "\t\t\t\t\t\treturn result;";
-  protected final String TEXT_79 = NL + "\t\t\t\t\t\treturn ";
-  protected final String TEXT_80 = ".create(editingDomain, element, feature, valueToSet);";
-  protected final String TEXT_81 = NL + "\t\t\t\t\t}";
-  protected final String TEXT_82 = NL + "\t\t\t\t\t\tif (parseResult.length != ";
-  protected final String TEXT_83 = ") {" + NL + "\t\t\t\t\t\t\treturn ";
-  protected final String TEXT_84 = ".INSTANCE;" + NL + "\t\t\t\t\t\t}" + NL + "\t\t\t\t\t\t";
-  protected final String TEXT_85 = " domainModelCommand = createDomainModelCommand(editingDomain, parseResult);" + NL + "\t\t\t\t\t\treturn new ";
-  protected final String TEXT_86 = "(editingDomain, domainModelCommand);" + NL + "\t\t\t\t\t}" + NL + "\t\t\t\t\t";
-  protected final String TEXT_87 = " createDomainModelCommand(";
-  protected final String TEXT_88 = " editingDomain, Object[] values) {" + NL + "\t\t\t\t\t\t";
-  protected final String TEXT_89 = " element = ";
-  protected final String TEXT_90 = ";" + NL + "\t\t\t\t\t\t";
-  protected final String TEXT_91 = " result = new ";
-  protected final String TEXT_92 = "();" + NL + "\t\t\t\t\t\tObject valueToSet;";
-  protected final String TEXT_93 = NL + "\t\t\t\t\t\t";
-  protected final String TEXT_94 = " ";
-  protected final String TEXT_95 = "feature = (";
-  protected final String TEXT_96 = ") ";
-  protected final String TEXT_97 = ".eINSTANCE.get";
-  protected final String TEXT_98 = "();" + NL + "\t\t\t\t\t\ttry {" + NL + "\t\t\t\t\t\t\tvalueToSet = ";
-  protected final String TEXT_99 = ".parseValue(feature, values[";
-  protected final String TEXT_100 = "]);" + NL + "\t\t\t\t\t\t} catch (IllegalArgumentException e) {" + NL + "\t\t\t\t\t\t\treturn ";
-  protected final String TEXT_101 = ".INSTANCE;" + NL + "\t\t\t\t\t\t}";
-  protected final String TEXT_102 = NL + "\t\t\t\t\t\t";
-  protected final String TEXT_103 = " ";
-  protected final String TEXT_104 = "values = new ";
-  protected final String TEXT_105 = "();" + NL + "\t\t\t\t\t\tvalues.addAll(element.get";
-  protected final String TEXT_106 = "());" + NL + "\t\t\t\t\t\tresult.append(";
-  protected final String TEXT_107 = ".create(editingDomain, element, feature, values));" + NL + "\t\t\t\t\t\tresult.append(";
-  protected final String TEXT_108 = ".create(editingDomain, element, feature, valueToSet));";
-  protected final String TEXT_109 = NL + "\t\t\t\t\t\tresult.append(";
-  protected final String TEXT_110 = ".create(editingDomain, element, feature, valueToSet));";
-  protected final String TEXT_111 = NL + "\t\t\t\t\t\treturn result;" + NL + "\t\t\t\t\t}";
-  protected final String TEXT_112 = NL + "\t\t\t\t});";
-  protected final String TEXT_113 = NL;
-  protected final String TEXT_114 = "\t\tinstallEditPolicy(";
-  protected final String TEXT_115 = ".COMPONENT_ROLE, new ";
-  protected final String TEXT_116 = "() {" + NL + "\t\t\tprotected ";
-  protected final String TEXT_117 = " createDeleteCommand(";
-  protected final String TEXT_118 = " deleteRequest) {" + NL + "\t\t\t\t";
-  protected final String TEXT_119 = " editingDomain = ";
-  protected final String TEXT_120 = ".getEditingDomain(getDiagramNode().getDiagram().getElement());" + NL + "\t\t\t\t";
-  protected final String TEXT_121 = " cc = new ";
-  protected final String TEXT_122 = "();" + NL + "\t\t\t\tcc.append(getDomainModelRemoveCommand(editingDomain));" + NL + "\t\t\t\tcc.append(";
-  protected final String TEXT_123 = ".create(editingDomain, getDiagramNode()));" + NL + "\t\t\t\treturn new ";
-  protected final String TEXT_124 = "(editingDomain, cc);" + NL + "\t\t\t}" + NL + "" + NL + "\t\t\tprivate org.eclipse.emf.common.command.Command getDomainModelRemoveCommand(";
-  protected final String TEXT_125 = " editingDomain) {";
-  protected final String TEXT_126 = NL + "\t\t\t\t";
-  protected final String TEXT_127 = " result = new ";
-  protected final String TEXT_128 = "();";
-  protected final String TEXT_129 = NL + "\t\t\t\tresult.append(";
-  protected final String TEXT_130 = ".create(" + NL + "\t\t\t\t\teditingDomain, " + NL + "\t\t\t\t\tgetDiagramNode().getElement().eContainer(), ";
-  protected final String TEXT_131 = ".eINSTANCE.get";
-  protected final String TEXT_132 = "()," + NL + "\t\t\t\t\tgetDiagramNode().getElement()));";
-  protected final String TEXT_133 = NL + "\t\t\t\tresult.append(";
-  protected final String TEXT_134 = ".create(" + NL + "\t\t\t\t\teditingDomain, " + NL + "\t\t\t\t\tgetDiagramNode().getElement().eContainer(), ";
-  protected final String TEXT_135 = ".eINSTANCE.get";
-  protected final String TEXT_136 = "()," + NL + "\t\t\t\t\t";
-  protected final String TEXT_137 = ".UNSET_VALUE));";
-  protected final String TEXT_138 = NL + "\t\t\t\tresult.append(";
-  protected final String TEXT_139 = ".create(" + NL + "\t\t\t\t\teditingDomain, " + NL + "\t\t\t\t\tgetDiagramNode().getElement().eContainer(), ";
-  protected final String TEXT_140 = ".eINSTANCE.get";
-  protected final String TEXT_141 = "()," + NL + "\t\t\t\t\tgetDiagramNode().getElement()));";
-  protected final String TEXT_142 = NL + "\t\t\t\tresult.append(";
-  protected final String TEXT_143 = ".create(" + NL + "\t\t\t\t\teditingDomain, " + NL + "\t\t\t\t\tgetDiagramNode().getElement().eContainer(), ";
-  protected final String TEXT_144 = ".eINSTANCE.get";
-  protected final String TEXT_145 = "()," + NL + "\t\t\t\t\t";
-  protected final String TEXT_146 = ".UNSET_VALUE));";
-  protected final String TEXT_147 = NL + "\t\t\t\treturn result;";
-  protected final String TEXT_148 = NL + "\t\t\t\treturn ";
-  protected final String TEXT_149 = ".create(" + NL + "\t\t\t\t\teditingDomain, " + NL + "\t\t\t\t\tgetDiagramNode().getElement().eContainer(), ";
-  protected final String TEXT_150 = ".eINSTANCE.get";
-  protected final String TEXT_151 = "()," + NL + "\t\t\t\t\tgetDiagramNode().getElement());";
-  protected final String TEXT_152 = NL + "\t\t\t\treturn ";
-  protected final String TEXT_153 = ".create(" + NL + "\t\t\t\t\teditingDomain, " + NL + "\t\t\t\t\tgetDiagramNode().getElement().eContainer(), ";
-  protected final String TEXT_154 = ".eINSTANCE.get";
-  protected final String TEXT_155 = "()," + NL + "\t\t\t\t\t";
-  protected final String TEXT_156 = ".UNSET_VALUE);";
-  protected final String TEXT_157 = NL + "\t\t\t}" + NL + "\t\t});";
-  protected final String TEXT_158 = NL + "\t}" + NL;
-  protected final String TEXT_159 = NL;
-  protected final String TEXT_160 = "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic void performRequest(";
-  protected final String TEXT_161 = " req) {" + NL + "\t\tif (";
-  protected final String TEXT_162 = ".REQ_DIRECT_EDIT == req.getType()) {" + NL + "\t\t\tperformDirectEdit();" + NL + "\t\t} else {" + NL + "\t\t\tsuper.performRequest(req);" + NL + "\t\t}" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected ";
-  protected final String TEXT_163 = " getManager() {" + NL + "\t\tif (manager == null) {" + NL + "\t\t\tmanager = new ";
-  protected final String TEXT_164 = "(this, ";
-  protected final String TEXT_165 = ".class, new ";
-  protected final String TEXT_166 = "() {" + NL + "\t\t\t\tpublic void relocate(";
-  protected final String TEXT_167 = " celleditor) {" + NL + "\t\t\t\t\t";
-  protected final String TEXT_168 = " rect = getLabel().getTextBounds();" + NL + "\t\t\t\t\tgetLabel().translateToAbsolute(rect);" + NL + "\t\t\t\t\tcelleditor.getControl().setBounds(rect.x, rect.y, rect.width, rect.height);" + NL + "\t\t\t\t}" + NL + "\t\t\t}) {" + NL + "\t\t\t\tprotected void initCellEditor() {" + NL + "\t\t\t\t\tgetCellEditor().setValue(getLabelEditText());" + NL + "\t\t\t\t}" + NL + "\t\t\t};" + NL + "\t\t}" + NL + "\t\treturn manager;" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected void performDirectEdit() {" + NL + "\t\tgetManager().show();" + NL + "\t}" + NL;
-  protected final String TEXT_169 = NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected List getModelChildren() {" + NL + "\t\treturn ((View)getModel()).getVisibleChildren();" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected List getModelSourceConnections() {" + NL + "\t\treturn ((View)getModel()).getSourceEdges();" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected List getModelTargetConnections() {" + NL + "\t\treturn ((View)getModel()).getTargetEdges();" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected void refreshVisuals() {" + NL + "\t\tsuper.refreshVisuals();" + NL + "\t\trefreshLabel();" + NL + "\t\trefreshFont();" + NL + "\t\trefreshFontColor();" + NL + "\t\trefreshVisibility();" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected void refreshLabel() {" + NL + "\t\tgetLabel().setText(getLabelText());" + NL + "\t\tgetLabel().setIcon(getLabelIcon());" + NL + "\t}";
-  protected final String TEXT_170 = NL;
-  protected final String TEXT_171 = NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate static final String VIEW_PATTERN = \"";
-  protected final String TEXT_172 = "\";" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate static final String EDIT_PATTERN = \"";
-  protected final String TEXT_173 = "\";" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected String getLabelText() {" + NL + "\t\t";
-  protected final String TEXT_174 = " element = ";
-  protected final String TEXT_175 = ";" + NL + "\t\tif (element == null) {" + NL + "\t\t\treturn defaultText;" + NL + "\t\t}" + NL + "\t\treturn buildTextByPattern(element, VIEW_PATTERN);" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected String getLabelEditText() {" + NL + "\t\t";
-  protected final String TEXT_176 = " element = ";
-  protected final String TEXT_177 = ";" + NL + "\t\tif (element == null) {" + NL + "\t\t\treturn defaultText;" + NL + "\t\t}" + NL + "\t\treturn buildTextByPattern(element, EDIT_PATTERN);" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected String buildTextByPattern(";
-  protected final String TEXT_178 = " element, String pattern) {";
-  protected final String TEXT_179 = NL + "\t\tif (";
-  protected final String TEXT_180 = " == null) {" + NL + "\t\t\treturn defaultText;" + NL + "\t\t}";
-  protected final String TEXT_181 = NL + "\t\treturn ";
-  protected final String TEXT_182 = ".format(pattern, new Object[] {";
-  protected final String TEXT_183 = NL + "\t\t\tnew ";
-  protected final String TEXT_184 = "(";
-  protected final String TEXT_185 = ")";
-  protected final String TEXT_186 = NL + "\t\t});";
-  protected final String TEXT_187 = NL + "\t\treturn ";
-  protected final String TEXT_188 = ".format(pattern, new Object[] {";
-  protected final String TEXT_189 = NL + "\t\t\tnew ";
-  protected final String TEXT_190 = "(";
-  protected final String TEXT_191 = ")";
-  protected final String TEXT_192 = ",";
-  protected final String TEXT_193 = NL + "\t\t});";
-  protected final String TEXT_194 = NL + "\t\t//XXX: unexpected model facet." + NL + "\t\treturn defaultText;";
-  protected final String TEXT_195 = NL + "\t}";
-  protected final String TEXT_196 = NL;
-  protected final String TEXT_197 = NL + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected void refreshFont() {";
-  protected final String TEXT_198 = NL + "\t\t";
-  protected final String TEXT_199 = " style =" + NL + "\t\t\t(";
-  protected final String TEXT_200 = ") ";
-  protected final String TEXT_201 = ".getStyle(" + NL + "\t\t\t\t";
-  protected final String TEXT_202 = ".eINSTANCE.getFontStyle());" + NL + "\t\t";
-  protected final String TEXT_203 = " toDispose = createdFont;" + NL + "\t\tif (style != null) {" + NL + "\t\t\tString fontName = style.getFontName();" + NL + "\t\t\tint fontHeight = style.getFontHeight();" + NL + "\t\t\tint fontStyle = ";
-  protected final String TEXT_204 = ".NORMAL;" + NL + "\t\t\tif (style.isBold()) {" + NL + "\t\t\t\tfontStyle |= ";
-  protected final String TEXT_205 = ".BOLD;" + NL + "\t\t\t}" + NL + "\t\t\tif (style.isItalic()) {" + NL + "\t\t\t\tfontStyle |= ";
-  protected final String TEXT_206 = ".ITALIC;" + NL + "\t\t\t}" + NL + "\t\t\t";
-  protected final String TEXT_207 = " currentFont = getFigure().getFont();" + NL + "\t\t\tif (currentFont != null) {" + NL + "\t\t\t\t";
-  protected final String TEXT_208 = " currentFontData = currentFont.getFontData()[0];" + NL + "\t\t\t\tif (currentFontData.getName().equals(fontName) && currentFontData.getHeight() == fontHeight && currentFontData.getStyle() == fontStyle) {" + NL + "\t\t\t\t\treturn;" + NL + "\t\t\t\t}" + NL + "\t\t\t}" + NL + "\t\t\tcreatedFont = new ";
-  protected final String TEXT_209 = "(null, fontName, fontHeight, fontStyle);" + NL + "\t\t\tgetFigure().setFont(createdFont);" + NL + "\t\t} else {" + NL + "\t\t\t//revert to the default font" + NL + "\t\t\tgetFigure().setFont(getViewer().getControl().getFont());" + NL + "\t\t\tcreatedFont = null;" + NL + "\t\t}" + NL + "\t\tif (toDispose != null) {" + NL + "\t\t\ttoDispose.dispose();" + NL + "\t\t}";
-  protected final String TEXT_210 = "\t" + NL + "\t}";
-  protected final String TEXT_211 = NL + NL + "\t/**" + NL + "\t * The font (created by {@link #refreshFont()}) currently assigned to the label (unless the default font is assigned)." + NL + "\t * Whenever another non-default font is assigned to it, it is safe to dispose the previous one." + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate ";
-  protected final String TEXT_212 = " createdFont;";
-  protected final String TEXT_213 = "\t";
-  protected final String TEXT_214 = NL;
-  protected final String TEXT_215 = "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected void refreshFontColor() {" + NL + "\t\t";
-  protected final String TEXT_216 = " style = (";
-  protected final String TEXT_217 = ")  ";
-  protected final String TEXT_218 = ".getStyle(";
-  protected final String TEXT_219 = ".eINSTANCE.getFontStyle());" + NL + "\t\t";
-  protected final String TEXT_220 = " toDispose = createdFontColor;" + NL + "\t\tif (style != null) {" + NL + "\t\t\tint fontColor = style.getFontColor();" + NL + "\t\t\tint red = fontColor & 0x000000FF;" + NL + "\t\t\tint green = (fontColor & 0x0000FF00) >> 8;" + NL + "\t\t\tint blue = (fontColor & 0x00FF0000) >> 16;" + NL + "\t\t\t";
-  protected final String TEXT_221 = " currentColor = getLabel().getForegroundColor();" + NL + "\t\t\tif (currentColor != null && currentColor.getRed() == red && currentColor.getGreen() == green && currentColor.getBlue() == blue) {" + NL + "\t\t\t\treturn;" + NL + "\t\t\t}" + NL + "\t\t\tcreatedFontColor = new ";
-  protected final String TEXT_222 = "(null, red, green, blue);" + NL + "\t\t\tgetFigure().setForegroundColor(createdFontColor);" + NL + "\t\t} else {" + NL + "\t\t\tgetFigure().setForegroundColor(getViewer().getControl().getForeground());" + NL + "\t\t\tcreatedFontColor = null;" + NL + "\t\t}" + NL + "\t\tif (toDispose != null) {" + NL + "\t\t\ttoDispose.dispose();" + NL + "\t\t}" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * The color (created by {@link #refreshFontColor()}) currently assigned to the label." + NL + "\t * Whenever another color is assigned to it, it is safe to dispose the previous one." + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate ";
-  protected final String TEXT_223 = " createdFontColor;" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected ";
-  protected final String TEXT_224 = " getLabelIcon() {";
-  protected final String TEXT_225 = NL + "\t\t";
-  protected final String TEXT_226 = " imageDescriptor = ";
-  protected final String TEXT_227 = ".getInstance().getItemImageDescriptor(getDiagramNode().getElement());" + NL + "\t\tif (imageDescriptor != null) {" + NL + "\t\t\treturn imageDescriptor.createImage();" + NL + "\t\t}";
-  protected final String TEXT_228 = NL + "\t\treturn null;" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected void refreshVisibility() {" + NL + "\t\tboolean isVisible = getDiagramNode().isVisible();" + NL + "\t\tboolean wasVisible = getFigure().isVisible();" + NL + "\t\tif (isVisible == wasVisible) {" + NL + "\t\t\treturn;" + NL + "\t\t}" + NL + "\t\tif (!isVisible && (getSelected() != SELECTED_NONE)) {" + NL + "\t\t\tgetViewer().deselect(this);" + NL + "\t\t}" + NL + "" + NL + "\t\tgetFigure().setVisible(isVisible);" + NL + "\t\tgetFigure().revalidate();" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic Object getAdapter(Class key) {";
-  protected final String TEXT_229 = NL + "\t\treturn super.getAdapter(key);" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic void activate() {" + NL + "\t\tsuper.activate();" + NL + "\t\tgetDiagramNode().getElement().eAdapters().add(domainModelRefresher);" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic void deactivate() {" + NL + "\t\tgetDiagramNode().getElement().eAdapters().remove(domainModelRefresher);" + NL + "\t\tsuper.deactivate();" + NL + "\t}" + NL;
-  protected final String TEXT_230 = NL;
-  protected final String TEXT_231 = "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate ";
-  protected final String TEXT_232 = " domainModelRefresher = new ";
-  protected final String TEXT_233 = "(this);" + NL;
+  protected final String TEXT_46 = " request) {" + NL + "\t\t\t\t\t\tString value = (String) request.getCellEditor().getValue();" + NL + "\t\t\t\t\t\tgetLabel().setText(value);" + NL + "\t\t\t\t\t}";
+  protected final String TEXT_47 = NL;
+  protected final String TEXT_48 = "\t\t\t\t\tprotected ";
+  protected final String TEXT_49 = " getDirectEditCommand(";
+  protected final String TEXT_50 = " request) {" + NL + "\t\t\t\t\t\tString value = (String) request.getCellEditor().getValue();" + NL + "\t\t\t\t\t\tif (value == null) {" + NL + "\t\t\t\t\t\t\t//Invalid value is transformed into a null by the validator." + NL + "\t\t\t\t\t\t\t//XXX: implement validator" + NL + "\t\t\t\t\t\t\treturn ";
+  protected final String TEXT_51 = ".INSTANCE;" + NL + "\t\t\t\t\t\t}" + NL + "\t\t\t\t\t\tfinal Object[] parseResult;" + NL + "\t\t\t\t\t\ttry {" + NL + "\t\t\t\t\t\t\tparseResult = new ";
+  protected final String TEXT_52 = "(";
+  protected final String TEXT_53 = ").parse(value);" + NL + "\t\t\t\t\t\t} catch (IllegalArgumentException e) {" + NL + "\t\t\t\t\t\t\treturn ";
+  protected final String TEXT_54 = ".INSTANCE;" + NL + "\t\t\t\t\t\t} catch (";
+  protected final String TEXT_55 = " e) {" + NL + "\t\t\t\t\t\t\treturn ";
+  protected final String TEXT_56 = ".INSTANCE;" + NL + "\t\t\t\t\t\t}" + NL + "\t\t\t\t\t\t";
+  protected final String TEXT_57 = " editingDomain = ";
+  protected final String TEXT_58 = ".getEditingDomain(";
+  protected final String TEXT_59 = ".getDiagram().getElement());";
+  protected final String TEXT_60 = NL + "\t\t\t\t\t\tif (parseResult.length != 1) {" + NL + "\t\t\t\t\t\t\treturn ";
+  protected final String TEXT_61 = ".INSTANCE;" + NL + "\t\t\t\t\t\t}" + NL + "\t\t\t\t\t\t";
+  protected final String TEXT_62 = " domainModelCommand = createDomainModelCommand(editingDomain, parseResult[0]);" + NL + "\t\t\t\t\t\treturn new ";
+  protected final String TEXT_63 = "(editingDomain, domainModelCommand);" + NL + "\t\t\t\t\t}" + NL + "\t\t\t\t\t";
+  protected final String TEXT_64 = " createDomainModelCommand(";
+  protected final String TEXT_65 = " editingDomain, Object value) {" + NL + "\t\t\t\t\t\t";
+  protected final String TEXT_66 = " element = ";
+  protected final String TEXT_67 = ";" + NL + "\t\t\t\t\t\t";
+  protected final String TEXT_68 = " feature = (";
+  protected final String TEXT_69 = ") ";
+  protected final String TEXT_70 = ".eINSTANCE.get";
+  protected final String TEXT_71 = "();" + NL + "\t\t\t\t\t\tObject valueToSet;" + NL + "\t\t\t\t\t\ttry {" + NL + "\t\t\t\t\t\t\tvalueToSet = ";
+  protected final String TEXT_72 = ".parseValue(feature, value);" + NL + "\t\t\t\t\t\t} catch (IllegalArgumentException e) {" + NL + "\t\t\t\t\t\t\treturn ";
+  protected final String TEXT_73 = ".INSTANCE;" + NL + "\t\t\t\t\t\t}";
+  protected final String TEXT_74 = NL + "\t\t\t\t\t\t";
+  protected final String TEXT_75 = " result = new ";
+  protected final String TEXT_76 = "();" + NL + "\t\t\t\t\t\t";
+  protected final String TEXT_77 = " values = new ";
+  protected final String TEXT_78 = "();" + NL + "\t\t\t\t\t\tvalues.addAll(element.get";
+  protected final String TEXT_79 = "());" + NL + "\t\t\t\t\t\tresult.append(";
+  protected final String TEXT_80 = ".create(editingDomain, element, feature, values));" + NL + "\t\t\t\t\t\tresult.append(";
+  protected final String TEXT_81 = ".create(editingDomain, element, feature, valueToSet));" + NL + "\t\t\t\t\t\treturn result;";
+  protected final String TEXT_82 = NL + "\t\t\t\t\t\treturn ";
+  protected final String TEXT_83 = ".create(editingDomain, element, feature, valueToSet);";
+  protected final String TEXT_84 = NL + "\t\t\t\t\t}";
+  protected final String TEXT_85 = NL + "\t\t\t\t\t\tif (parseResult.length != ";
+  protected final String TEXT_86 = ") {" + NL + "\t\t\t\t\t\t\treturn ";
+  protected final String TEXT_87 = ".INSTANCE;" + NL + "\t\t\t\t\t\t}" + NL + "\t\t\t\t\t\t";
+  protected final String TEXT_88 = " domainModelCommand = createDomainModelCommand(editingDomain, parseResult);" + NL + "\t\t\t\t\t\treturn new ";
+  protected final String TEXT_89 = "(editingDomain, domainModelCommand);" + NL + "\t\t\t\t\t}" + NL + "\t\t\t\t\t";
+  protected final String TEXT_90 = " createDomainModelCommand(";
+  protected final String TEXT_91 = " editingDomain, Object[] values) {" + NL + "\t\t\t\t\t\t";
+  protected final String TEXT_92 = " element = ";
+  protected final String TEXT_93 = ";" + NL + "\t\t\t\t\t\t";
+  protected final String TEXT_94 = " result = new ";
+  protected final String TEXT_95 = "();" + NL + "\t\t\t\t\t\tObject valueToSet;";
+  protected final String TEXT_96 = NL + "\t\t\t\t\t\t";
+  protected final String TEXT_97 = " ";
+  protected final String TEXT_98 = "feature = (";
+  protected final String TEXT_99 = ") ";
+  protected final String TEXT_100 = ".eINSTANCE.get";
+  protected final String TEXT_101 = "();" + NL + "\t\t\t\t\t\ttry {" + NL + "\t\t\t\t\t\t\tvalueToSet = ";
+  protected final String TEXT_102 = ".parseValue(feature, values[";
+  protected final String TEXT_103 = "]);" + NL + "\t\t\t\t\t\t} catch (IllegalArgumentException e) {" + NL + "\t\t\t\t\t\t\treturn ";
+  protected final String TEXT_104 = ".INSTANCE;" + NL + "\t\t\t\t\t\t}";
+  protected final String TEXT_105 = NL + "\t\t\t\t\t\t";
+  protected final String TEXT_106 = " ";
+  protected final String TEXT_107 = "values = new ";
+  protected final String TEXT_108 = "();" + NL + "\t\t\t\t\t\tvalues.addAll(element.get";
+  protected final String TEXT_109 = "());" + NL + "\t\t\t\t\t\tresult.append(";
+  protected final String TEXT_110 = ".create(editingDomain, element, feature, values));" + NL + "\t\t\t\t\t\tresult.append(";
+  protected final String TEXT_111 = ".create(editingDomain, element, feature, valueToSet));";
+  protected final String TEXT_112 = NL + "\t\t\t\t\t\tresult.append(";
+  protected final String TEXT_113 = ".create(editingDomain, element, feature, valueToSet));";
+  protected final String TEXT_114 = NL + "\t\t\t\t\t\treturn result;" + NL + "\t\t\t\t\t}";
+  protected final String TEXT_115 = NL + "\t\t\t\t});";
+  protected final String TEXT_116 = NL;
+  protected final String TEXT_117 = "\t\tinstallEditPolicy(";
+  protected final String TEXT_118 = ".COMPONENT_ROLE, new ";
+  protected final String TEXT_119 = "() {" + NL + "\t\t\tprotected ";
+  protected final String TEXT_120 = " createDeleteCommand(";
+  protected final String TEXT_121 = " deleteRequest) {" + NL + "\t\t\t\t";
+  protected final String TEXT_122 = " editingDomain = ";
+  protected final String TEXT_123 = ".getEditingDomain(getDiagramNode().getDiagram().getElement());" + NL + "\t\t\t\t";
+  protected final String TEXT_124 = " cc = new ";
+  protected final String TEXT_125 = "();" + NL + "\t\t\t\tcc.append(getDomainModelRemoveCommand(editingDomain));" + NL + "\t\t\t\tcc.append(";
+  protected final String TEXT_126 = ".create(editingDomain, getDiagramNode()));" + NL + "\t\t\t\treturn new ";
+  protected final String TEXT_127 = "(editingDomain, cc);" + NL + "\t\t\t}" + NL + "" + NL + "\t\t\tprivate org.eclipse.emf.common.command.Command getDomainModelRemoveCommand(";
+  protected final String TEXT_128 = " editingDomain) {";
+  protected final String TEXT_129 = NL + "\t\t\t\t";
+  protected final String TEXT_130 = " result = new ";
+  protected final String TEXT_131 = "();";
+  protected final String TEXT_132 = NL + "\t\t\t\tresult.append(";
+  protected final String TEXT_133 = ".create(" + NL + "\t\t\t\t\teditingDomain, " + NL + "\t\t\t\t\tgetDiagramNode().getElement().eContainer(), ";
+  protected final String TEXT_134 = ".eINSTANCE.get";
+  protected final String TEXT_135 = "()," + NL + "\t\t\t\t\tgetDiagramNode().getElement()));";
+  protected final String TEXT_136 = NL + "\t\t\t\tresult.append(";
+  protected final String TEXT_137 = ".create(" + NL + "\t\t\t\t\teditingDomain, " + NL + "\t\t\t\t\tgetDiagramNode().getElement().eContainer(), ";
+  protected final String TEXT_138 = ".eINSTANCE.get";
+  protected final String TEXT_139 = "()," + NL + "\t\t\t\t\t";
+  protected final String TEXT_140 = ".UNSET_VALUE));";
+  protected final String TEXT_141 = NL + "\t\t\t\tresult.append(";
+  protected final String TEXT_142 = ".create(" + NL + "\t\t\t\t\teditingDomain, " + NL + "\t\t\t\t\tgetDiagramNode().getElement().eContainer(), ";
+  protected final String TEXT_143 = ".eINSTANCE.get";
+  protected final String TEXT_144 = "()," + NL + "\t\t\t\t\tgetDiagramNode().getElement()));";
+  protected final String TEXT_145 = NL + "\t\t\t\tresult.append(";
+  protected final String TEXT_146 = ".create(" + NL + "\t\t\t\t\teditingDomain, " + NL + "\t\t\t\t\tgetDiagramNode().getElement().eContainer(), ";
+  protected final String TEXT_147 = ".eINSTANCE.get";
+  protected final String TEXT_148 = "()," + NL + "\t\t\t\t\t";
+  protected final String TEXT_149 = ".UNSET_VALUE));";
+  protected final String TEXT_150 = NL + "\t\t\t\treturn result;";
+  protected final String TEXT_151 = NL + "\t\t\t\treturn ";
+  protected final String TEXT_152 = ".create(" + NL + "\t\t\t\t\teditingDomain, " + NL + "\t\t\t\t\tgetDiagramNode().getElement().eContainer(), ";
+  protected final String TEXT_153 = ".eINSTANCE.get";
+  protected final String TEXT_154 = "()," + NL + "\t\t\t\t\tgetDiagramNode().getElement());";
+  protected final String TEXT_155 = NL + "\t\t\t\treturn ";
+  protected final String TEXT_156 = ".create(" + NL + "\t\t\t\t\teditingDomain, " + NL + "\t\t\t\t\tgetDiagramNode().getElement().eContainer(), ";
+  protected final String TEXT_157 = ".eINSTANCE.get";
+  protected final String TEXT_158 = "()," + NL + "\t\t\t\t\t";
+  protected final String TEXT_159 = ".UNSET_VALUE);";
+  protected final String TEXT_160 = NL + "\t\t\t}" + NL + "\t\t});";
+  protected final String TEXT_161 = NL + "\t}" + NL;
+  protected final String TEXT_162 = NL;
+  protected final String TEXT_163 = "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic void performRequest(";
+  protected final String TEXT_164 = " req) {" + NL + "\t\tif (";
+  protected final String TEXT_165 = ".REQ_DIRECT_EDIT == req.getType()) {" + NL + "\t\t\tperformDirectEdit();" + NL + "\t\t} else {" + NL + "\t\t\tsuper.performRequest(req);" + NL + "\t\t}" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected ";
+  protected final String TEXT_166 = " getManager() {" + NL + "\t\tif (manager == null) {" + NL + "\t\t\tmanager = new ";
+  protected final String TEXT_167 = "(this, ";
+  protected final String TEXT_168 = ".class, new ";
+  protected final String TEXT_169 = "() {" + NL + "\t\t\t\tpublic void relocate(";
+  protected final String TEXT_170 = " celleditor) {" + NL + "\t\t\t\t\t";
+  protected final String TEXT_171 = " rect = getLabel().getTextBounds();" + NL + "\t\t\t\t\tgetLabel().translateToAbsolute(rect);" + NL + "\t\t\t\t\tcelleditor.getControl().setBounds(rect.x, rect.y, rect.width, rect.height);" + NL + "\t\t\t\t}" + NL + "\t\t\t}) {" + NL + "\t\t\t\tprotected void initCellEditor() {" + NL + "\t\t\t\t\tgetCellEditor().setValue(getLabelEditText());" + NL + "\t\t\t\t}" + NL + "\t\t\t};" + NL + "\t\t}" + NL + "\t\treturn manager;" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected void performDirectEdit() {" + NL + "\t\tgetManager().show();" + NL + "\t}" + NL;
+  protected final String TEXT_172 = NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected List getModelChildren() {" + NL + "\t\treturn ((View)getModel()).getVisibleChildren();" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected List getModelSourceConnections() {" + NL + "\t\treturn ((View)getModel()).getSourceEdges();" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected List getModelTargetConnections() {" + NL + "\t\treturn ((View)getModel()).getTargetEdges();" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected void refreshVisuals() {" + NL + "\t\tsuper.refreshVisuals();" + NL + "\t\trefreshLabel();" + NL + "\t\trefreshFont();" + NL + "\t\trefreshFontColor();" + NL + "\t\trefreshVisibility();" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected void refreshLabel() {" + NL + "\t\tgetLabel().setText(getLabelText());" + NL + "\t\tgetLabel().setIcon(getLabelIcon());" + NL + "\t}";
+  protected final String TEXT_173 = NL;
+  protected final String TEXT_174 = NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate static final String VIEW_PATTERN = \"";
+  protected final String TEXT_175 = "\";" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic static final String EDIT_PATTERN = \"";
+  protected final String TEXT_176 = "\";" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected String getLabelText() {" + NL + "\t\t";
+  protected final String TEXT_177 = " element = ";
+  protected final String TEXT_178 = ";" + NL + "\t\tif (element == null) {" + NL + "\t\t\treturn defaultText;" + NL + "\t\t}" + NL + "\t\treturn buildTextByPattern(element, VIEW_PATTERN);" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected String getLabelEditText() {" + NL + "\t\t";
+  protected final String TEXT_179 = " element = ";
+  protected final String TEXT_180 = ";" + NL + "\t\tif (element == null) {" + NL + "\t\t\treturn defaultText;" + NL + "\t\t}" + NL + "\t\treturn buildTextByPattern(element, EDIT_PATTERN);" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected String buildTextByPattern(";
+  protected final String TEXT_181 = " element, String pattern) {";
+  protected final String TEXT_182 = NL + "\t\tif (";
+  protected final String TEXT_183 = " == null) {" + NL + "\t\t\treturn defaultText;" + NL + "\t\t}";
+  protected final String TEXT_184 = NL + "\t\treturn ";
+  protected final String TEXT_185 = ".format(pattern, new Object[] {";
+  protected final String TEXT_186 = NL + "\t\t\tnew ";
+  protected final String TEXT_187 = "(";
+  protected final String TEXT_188 = ")";
+  protected final String TEXT_189 = NL + "\t\t});";
+  protected final String TEXT_190 = NL + "\t\treturn ";
+  protected final String TEXT_191 = ".format(pattern, new Object[] {";
+  protected final String TEXT_192 = NL + "\t\t\tnew ";
+  protected final String TEXT_193 = "(";
+  protected final String TEXT_194 = ")";
+  protected final String TEXT_195 = ",";
+  protected final String TEXT_196 = NL + "\t\t});";
+  protected final String TEXT_197 = NL + "\t\t//XXX: unexpected model facet." + NL + "\t\treturn defaultText;";
+  protected final String TEXT_198 = NL + "\t}";
+  protected final String TEXT_199 = NL;
+  protected final String TEXT_200 = NL + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected void refreshFont() {";
+  protected final String TEXT_201 = NL + "\t\t";
+  protected final String TEXT_202 = " style =" + NL + "\t\t\t(";
+  protected final String TEXT_203 = ") ";
+  protected final String TEXT_204 = ".getStyle(" + NL + "\t\t\t\t";
+  protected final String TEXT_205 = ".eINSTANCE.getFontStyle());" + NL + "\t\t";
+  protected final String TEXT_206 = " toDispose = createdFont;" + NL + "\t\tif (style != null) {" + NL + "\t\t\tString fontName = style.getFontName();" + NL + "\t\t\tint fontHeight = style.getFontHeight();" + NL + "\t\t\tint fontStyle = ";
+  protected final String TEXT_207 = ".NORMAL;" + NL + "\t\t\tif (style.isBold()) {" + NL + "\t\t\t\tfontStyle |= ";
+  protected final String TEXT_208 = ".BOLD;" + NL + "\t\t\t}" + NL + "\t\t\tif (style.isItalic()) {" + NL + "\t\t\t\tfontStyle |= ";
+  protected final String TEXT_209 = ".ITALIC;" + NL + "\t\t\t}" + NL + "\t\t\t";
+  protected final String TEXT_210 = " currentFont = getFigure().getFont();" + NL + "\t\t\tif (currentFont != null) {" + NL + "\t\t\t\t";
+  protected final String TEXT_211 = " currentFontData = currentFont.getFontData()[0];" + NL + "\t\t\t\tif (currentFontData.getName().equals(fontName) && currentFontData.getHeight() == fontHeight && currentFontData.getStyle() == fontStyle) {" + NL + "\t\t\t\t\treturn;" + NL + "\t\t\t\t}" + NL + "\t\t\t}" + NL + "\t\t\tcreatedFont = new ";
+  protected final String TEXT_212 = "(null, fontName, fontHeight, fontStyle);" + NL + "\t\t\tgetFigure().setFont(createdFont);" + NL + "\t\t} else {" + NL + "\t\t\t//revert to the default font" + NL + "\t\t\tgetFigure().setFont(getViewer().getControl().getFont());" + NL + "\t\t\tcreatedFont = null;" + NL + "\t\t}" + NL + "\t\tif (toDispose != null) {" + NL + "\t\t\ttoDispose.dispose();" + NL + "\t\t}";
+  protected final String TEXT_213 = "\t" + NL + "\t}";
+  protected final String TEXT_214 = NL + NL + "\t/**" + NL + "\t * The font (created by {@link #refreshFont()}) currently assigned to the label (unless the default font is assigned)." + NL + "\t * Whenever another non-default font is assigned to it, it is safe to dispose the previous one." + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate ";
+  protected final String TEXT_215 = " createdFont;";
+  protected final String TEXT_216 = "\t";
+  protected final String TEXT_217 = NL;
+  protected final String TEXT_218 = "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected void refreshFontColor() {" + NL + "\t\t";
+  protected final String TEXT_219 = " style = (";
+  protected final String TEXT_220 = ")  ";
+  protected final String TEXT_221 = ".getStyle(";
+  protected final String TEXT_222 = ".eINSTANCE.getFontStyle());" + NL + "\t\t";
+  protected final String TEXT_223 = " toDispose = createdFontColor;" + NL + "\t\tif (style != null) {" + NL + "\t\t\tint fontColor = style.getFontColor();" + NL + "\t\t\tint red = fontColor & 0x000000FF;" + NL + "\t\t\tint green = (fontColor & 0x0000FF00) >> 8;" + NL + "\t\t\tint blue = (fontColor & 0x00FF0000) >> 16;" + NL + "\t\t\t";
+  protected final String TEXT_224 = " currentColor = getLabel().getForegroundColor();" + NL + "\t\t\tif (currentColor != null && currentColor.getRed() == red && currentColor.getGreen() == green && currentColor.getBlue() == blue) {" + NL + "\t\t\t\treturn;" + NL + "\t\t\t}" + NL + "\t\t\tcreatedFontColor = new ";
+  protected final String TEXT_225 = "(null, red, green, blue);" + NL + "\t\t\tgetFigure().setForegroundColor(createdFontColor);" + NL + "\t\t} else {" + NL + "\t\t\tgetFigure().setForegroundColor(getViewer().getControl().getForeground());" + NL + "\t\t\tcreatedFontColor = null;" + NL + "\t\t}" + NL + "\t\tif (toDispose != null) {" + NL + "\t\t\ttoDispose.dispose();" + NL + "\t\t}" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * The color (created by {@link #refreshFontColor()}) currently assigned to the label." + NL + "\t * Whenever another color is assigned to it, it is safe to dispose the previous one." + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate ";
+  protected final String TEXT_226 = " createdFontColor;" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected ";
+  protected final String TEXT_227 = " getLabelIcon() {";
+  protected final String TEXT_228 = NL + "\t\t";
+  protected final String TEXT_229 = " imageDescriptor = ";
+  protected final String TEXT_230 = ".getInstance().getItemImageDescriptor(getDiagramNode().getElement());" + NL + "\t\tif (imageDescriptor != null) {" + NL + "\t\t\treturn imageDescriptor.createImage();" + NL + "\t\t}";
+  protected final String TEXT_231 = NL + "\t\treturn null;" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected void refreshVisibility() {" + NL + "\t\tboolean isVisible = getDiagramNode().isVisible();" + NL + "\t\tboolean wasVisible = getFigure().isVisible();" + NL + "\t\tif (isVisible == wasVisible) {" + NL + "\t\t\treturn;" + NL + "\t\t}" + NL + "\t\tif (!isVisible && (getSelected() != SELECTED_NONE)) {" + NL + "\t\t\tgetViewer().deselect(this);" + NL + "\t\t}" + NL + "" + NL + "\t\tgetFigure().setVisible(isVisible);" + NL + "\t\tgetFigure().revalidate();" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic Object getAdapter(Class key) {" + NL + "\t\tif (";
+  protected final String TEXT_232 = ".class == key) {" + NL + "\t\t\treturn getTreeEditPartAdapter();" + NL + "\t\t}";
+  protected final String TEXT_233 = NL + "\t\treturn super.getAdapter(key);" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate TreeEditPartAdapter myTreeEditPartAdapter;" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate TreeEditPartAdapter getTreeEditPartAdapter() {" + NL + "\t\tif (myTreeEditPartAdapter == null) {" + NL + "\t\t\tmyTreeEditPartAdapter = new TreeEditPartAdapter();" + NL + "\t\t}" + NL + "\t\treturn myTreeEditPartAdapter;" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic void activate() {" + NL + "\t\tsuper.activate();" + NL + "\t\tgetDiagramNode().getElement().eAdapters().add(domainModelRefresher);" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic void deactivate() {" + NL + "\t\tgetDiagramNode().getElement().eAdapters().remove(domainModelRefresher);" + NL + "\t\tsuper.deactivate();" + NL + "\t}" + NL;
   protected final String TEXT_234 = NL;
   protected final String TEXT_235 = "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate ";
-  protected final String TEXT_236 = " structuralFeatures2Refresher;" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic Refresher getRefresher(";
-  protected final String TEXT_237 = " feature, ";
-  protected final String TEXT_238 = " msg) {" + NL + "\t\tif (structuralFeatures2Refresher == null) {" + NL + "\t\t\tcreateRefreshers();" + NL + "\t\t}" + NL + "\t\treturn (Refresher) structuralFeatures2Refresher.get(feature);" + NL + "\t}" + NL + "" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate void createRefreshers() {" + NL + "\t\tstructuralFeatures2Refresher = new HashMap();";
-  protected final String TEXT_239 = NL;
-  protected final String TEXT_240 = "\t\tRefresher childrenRefresher = new Refresher() {" + NL + "\t\t\tpublic void refresh() {" + NL + "\t\t\t\trefreshChildren();" + NL + "\t\t\t}" + NL + "\t\t};" + NL + "\t\tstructuralFeatures2Refresher.put(";
-  protected final String TEXT_241 = ".eINSTANCE.getView_PersistedChildren(), childrenRefresher);" + NL + "\t\tstructuralFeatures2Refresher.put(";
-  protected final String TEXT_242 = ".eINSTANCE.getView_TransientChildren(), childrenRefresher);";
+  protected final String TEXT_236 = " domainModelRefresher = new ";
+  protected final String TEXT_237 = "(this);" + NL;
+  protected final String TEXT_238 = NL;
+  protected final String TEXT_239 = "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate ";
+  protected final String TEXT_240 = " structuralFeatures2Refresher;" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic Refresher getRefresher(";
+  protected final String TEXT_241 = " feature, ";
+  protected final String TEXT_242 = " msg) {" + NL + "\t\tif (structuralFeatures2Refresher == null) {" + NL + "\t\t\tcreateRefreshers();" + NL + "\t\t}" + NL + "\t\treturn (Refresher) structuralFeatures2Refresher.get(feature);" + NL + "\t}" + NL + "" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate void createRefreshers() {" + NL + "\t\tstructuralFeatures2Refresher = new HashMap();";
   protected final String TEXT_243 = NL;
-  protected final String TEXT_244 = "\t\tRefresher visibilityRefresher = new Refresher() {" + NL + "\t\t\tpublic void refresh() {" + NL + "\t\t\t\trefreshVisibility();" + NL + "\t\t\t}" + NL + "\t\t};" + NL + "\t\tstructuralFeatures2Refresher.put(";
-  protected final String TEXT_245 = ".eINSTANCE.getView_Visible(), visibilityRefresher);" + NL + "\t\tRefresher labelRefresher = new Refresher() {" + NL + "\t\t\tpublic void refresh() {" + NL + "\t\t\t\trefreshLabel();" + NL + "\t\t\t}" + NL + "\t\t};";
-  protected final String TEXT_246 = NL + "\t\t\tstructuralFeatures2Refresher.put(";
-  protected final String TEXT_247 = ".eINSTANCE.get";
-  protected final String TEXT_248 = "(), labelRefresher);";
-  protected final String TEXT_249 = NL + "\t\t\tstructuralFeatures2Refresher.put(";
-  protected final String TEXT_250 = ".eINSTANCE.get";
-  protected final String TEXT_251 = "(), labelRefresher);";
-  protected final String TEXT_252 = NL;
-  protected final String TEXT_253 = "\t\tRefresher fontRefresher = new Refresher() {" + NL + "\t\t\tpublic void refresh() {" + NL + "\t\t\t\trefreshFont();" + NL + "\t\t\t}" + NL + "\t\t};" + NL + "\t\tstructuralFeatures2Refresher.put(";
-  protected final String TEXT_254 = ".eINSTANCE.getFontStyle_FontHeight(), fontRefresher);" + NL + "\t\tstructuralFeatures2Refresher.put(";
-  protected final String TEXT_255 = ".eINSTANCE.getFontStyle_FontName(), fontRefresher);" + NL + "\t\tstructuralFeatures2Refresher.put(";
-  protected final String TEXT_256 = ".eINSTANCE.getFontStyle_Bold(), fontRefresher);" + NL + "\t\tstructuralFeatures2Refresher.put(";
-  protected final String TEXT_257 = ".eINSTANCE.getFontStyle_Italic(), fontRefresher);" + NL + "\t\t";
-  protected final String TEXT_258 = NL;
-  protected final String TEXT_259 = "\t\tRefresher fontColorRefresher = new Refresher() {" + NL + "\t\t\tpublic void refresh() {" + NL + "\t\t\t\trefreshFontColor();" + NL + "\t\t\t}" + NL + "\t\t};" + NL + "\t\tstructuralFeatures2Refresher.put(";
-  protected final String TEXT_260 = ".eINSTANCE.getFontStyle_FontColor(), fontColorRefresher);" + NL + "\t}" + NL;
-  protected final String TEXT_261 = NL;
-  protected final String TEXT_262 = NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected ";
-  protected final String TEXT_263 = " createFigure() {" + NL + "\t\t// Parent should assign one using ";
-  protected final String TEXT_264 = " method" + NL + "\t\treturn null;" + NL + "\t}";
-  protected final String TEXT_265 = NL + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected ";
-  protected final String TEXT_266 = " createLabel() {";
-  protected final String TEXT_267 = NL + "\t\treturn new ";
-  protected final String TEXT_268 = "();";
-  protected final String TEXT_269 = NL + "\t\treturn ";
-  protected final String TEXT_270 = ";";
+  protected final String TEXT_244 = "\t\tRefresher childrenRefresher = new Refresher() {" + NL + "\t\t\tpublic void refresh() {" + NL + "\t\t\t\trefreshChildren();" + NL + "\t\t\t}" + NL + "\t\t};" + NL + "\t\tstructuralFeatures2Refresher.put(";
+  protected final String TEXT_245 = ".eINSTANCE.getView_PersistedChildren(), childrenRefresher);" + NL + "\t\tstructuralFeatures2Refresher.put(";
+  protected final String TEXT_246 = ".eINSTANCE.getView_TransientChildren(), childrenRefresher);";
+  protected final String TEXT_247 = NL;
+  protected final String TEXT_248 = "\t\tRefresher visibilityRefresher = new Refresher() {" + NL + "\t\t\tpublic void refresh() {" + NL + "\t\t\t\trefreshVisibility();" + NL + "\t\t\t}" + NL + "\t\t};" + NL + "\t\tstructuralFeatures2Refresher.put(";
+  protected final String TEXT_249 = ".eINSTANCE.getView_Visible(), visibilityRefresher);" + NL + "\t\tRefresher labelRefresher = new Refresher() {" + NL + "\t\t\tpublic void refresh() {" + NL + "\t\t\t\trefreshLabel();" + NL + "\t\t\t}" + NL + "\t\t};";
+  protected final String TEXT_250 = NL + "\t\t\tstructuralFeatures2Refresher.put(";
+  protected final String TEXT_251 = ".eINSTANCE.get";
+  protected final String TEXT_252 = "(), labelRefresher);";
+  protected final String TEXT_253 = NL + "\t\t\tstructuralFeatures2Refresher.put(";
+  protected final String TEXT_254 = ".eINSTANCE.get";
+  protected final String TEXT_255 = "(), labelRefresher);";
+  protected final String TEXT_256 = NL;
+  protected final String TEXT_257 = "\t\tRefresher fontRefresher = new Refresher() {" + NL + "\t\t\tpublic void refresh() {" + NL + "\t\t\t\trefreshFont();" + NL + "\t\t\t}" + NL + "\t\t};" + NL + "\t\tstructuralFeatures2Refresher.put(";
+  protected final String TEXT_258 = ".eINSTANCE.getFontStyle_FontHeight(), fontRefresher);" + NL + "\t\tstructuralFeatures2Refresher.put(";
+  protected final String TEXT_259 = ".eINSTANCE.getFontStyle_FontName(), fontRefresher);" + NL + "\t\tstructuralFeatures2Refresher.put(";
+  protected final String TEXT_260 = ".eINSTANCE.getFontStyle_Bold(), fontRefresher);" + NL + "\t\tstructuralFeatures2Refresher.put(";
+  protected final String TEXT_261 = ".eINSTANCE.getFontStyle_Italic(), fontRefresher);" + NL + "\t\t";
+  protected final String TEXT_262 = NL;
+  protected final String TEXT_263 = "\t\tRefresher fontColorRefresher = new Refresher() {" + NL + "\t\t\tpublic void refresh() {" + NL + "\t\t\t\trefreshFontColor();" + NL + "\t\t\t}" + NL + "\t\t};" + NL + "\t\tstructuralFeatures2Refresher.put(";
+  protected final String TEXT_264 = ".eINSTANCE.getFontStyle_FontColor(), fontColorRefresher);" + NL + "\t}" + NL;
+  protected final String TEXT_265 = NL;
+  protected final String TEXT_266 = NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected ";
+  protected final String TEXT_267 = " createFigure() {" + NL + "\t\t// Parent should assign one using ";
+  protected final String TEXT_268 = " method" + NL + "\t\treturn null;" + NL + "\t}";
+  protected final String TEXT_269 = NL + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected ";
+  protected final String TEXT_270 = " createLabel() {";
   protected final String TEXT_271 = NL + "\t\treturn new ";
   protected final String TEXT_272 = "();";
-  protected final String TEXT_273 = NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected ";
-  protected final String TEXT_274 = " createFigure() {" + NL + "\t\t";
-  protected final String TEXT_275 = " label = createLabel();";
-  protected final String TEXT_276 = NL + "\t\tdefaultText = label.getText();";
-  protected final String TEXT_277 = NL + "\t\tdefaultText = \"\";\t//$NON-NLS-1$";
-  protected final String TEXT_278 = NL + "\t\treturn label;" + NL + "\t}";
-  protected final String TEXT_279 = NL + NL + "\t/**";
-  protected final String TEXT_280 = NL + "\t * TODO: reimplement, since the figure used by this editpart is not a Label.";
-  protected final String TEXT_281 = NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic ";
-  protected final String TEXT_282 = " getLabel() {" + NL + "\t\treturn (";
-  protected final String TEXT_283 = ") getFigure();" + NL + "\t}" + NL;
-  protected final String TEXT_284 = NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic void ";
-  protected final String TEXT_285 = "(";
-  protected final String TEXT_286 = " figure) {" + NL + "\t\tunregisterVisuals();" + NL + "\t\tsetFigure(figure);";
-  protected final String TEXT_287 = NL + "\t\tdefaultText = figure.getText();";
-  protected final String TEXT_288 = NL + "\t\tdefaultText = \"\";\t//$NON-NLS-1$";
-  protected final String TEXT_289 = NL + "\t\tregisterVisuals();" + NL + "\t\trefreshVisuals();" + NL + "\t}" + NL;
-  protected final String TEXT_290 = NL;
-  protected final String TEXT_291 = NL;
-  protected final String TEXT_292 = NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate static class MapModeWorkaround {" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tpublic int DPtoLP(int dp) {" + NL + "\t\t\treturn dp;" + NL + "\t\t}" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tpublic static MapModeWorkaround INSTANCE = new MapModeWorkaround();" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate MapModeWorkaround getMapMode() {" + NL + "\t\treturn MapModeWorkaround.INSTANCE;" + NL + "\t}";
-  protected final String TEXT_293 = NL + "}";
+  protected final String TEXT_273 = NL + "\t\treturn ";
+  protected final String TEXT_274 = ";";
+  protected final String TEXT_275 = NL + "\t\treturn new ";
+  protected final String TEXT_276 = "();";
+  protected final String TEXT_277 = NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected ";
+  protected final String TEXT_278 = " createFigure() {" + NL + "\t\t";
+  protected final String TEXT_279 = " label = createLabel();";
+  protected final String TEXT_280 = NL + "\t\tdefaultText = label.getText();";
+  protected final String TEXT_281 = NL + "\t\tdefaultText = \"\";\t//$NON-NLS-1$";
+  protected final String TEXT_282 = NL + "\t\treturn label;" + NL + "\t}";
+  protected final String TEXT_283 = NL + NL + "\t/**";
+  protected final String TEXT_284 = NL + "\t * TODO: reimplement, since the figure used by this editpart is not a Label.";
+  protected final String TEXT_285 = NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic ";
+  protected final String TEXT_286 = " getLabel() {" + NL + "\t\treturn (";
+  protected final String TEXT_287 = ") getFigure();" + NL + "\t}" + NL;
+  protected final String TEXT_288 = NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic void ";
+  protected final String TEXT_289 = "(";
+  protected final String TEXT_290 = " figure) {" + NL + "\t\tunregisterVisuals();" + NL + "\t\tsetFigure(figure);";
+  protected final String TEXT_291 = NL + "\t\tdefaultText = figure.getText();";
+  protected final String TEXT_292 = NL + "\t\tdefaultText = \"\";\t//$NON-NLS-1$";
+  protected final String TEXT_293 = NL + "\t\tregisterVisuals();" + NL + "\t\trefreshVisuals();" + NL + "\t}" + NL;
   protected final String TEXT_294 = NL;
+  protected final String TEXT_295 = NL;
+  protected final String TEXT_296 = NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate static class MapModeWorkaround {" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tpublic int DPtoLP(int dp) {" + NL + "\t\t\treturn dp;" + NL + "\t\t}" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tpublic static MapModeWorkaround INSTANCE = new MapModeWorkaround();" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate MapModeWorkaround getMapMode() {" + NL + "\t\treturn MapModeWorkaround.INSTANCE;" + NL + "\t}";
+  protected final String TEXT_297 = NL + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate class TreeEditPartAdapter extends ";
+  protected final String TEXT_298 = " {" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tpublic TreeEditPartAdapter() {" + NL + "\t\t\tsuper(getDiagramNode(), ";
+  protected final String TEXT_299 = ".getInstance().getItemProvidersAdapterFactory());" + NL + "\t\t}" + NL + "" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tprotected void createEditPolicies() {";
+  protected final String TEXT_300 = NL;
+  protected final String TEXT_301 = "\t\tinstallEditPolicy(";
+  protected final String TEXT_302 = ".COMPONENT_ROLE, new ";
+  protected final String TEXT_303 = "() {" + NL + "\t\t\tprotected ";
+  protected final String TEXT_304 = " createDeleteCommand(";
+  protected final String TEXT_305 = " deleteRequest) {" + NL + "\t\t\t\t";
+  protected final String TEXT_306 = " editingDomain = ";
+  protected final String TEXT_307 = ".getEditingDomain(getDiagramNode().getDiagram().getElement());" + NL + "\t\t\t\t";
+  protected final String TEXT_308 = " cc = new ";
+  protected final String TEXT_309 = "();" + NL + "\t\t\t\tcc.append(getDomainModelRemoveCommand(editingDomain));" + NL + "\t\t\t\tcc.append(";
+  protected final String TEXT_310 = ".create(editingDomain, getDiagramNode()));" + NL + "\t\t\t\treturn new ";
+  protected final String TEXT_311 = "(editingDomain, cc);" + NL + "\t\t\t}" + NL + "" + NL + "\t\t\tprivate org.eclipse.emf.common.command.Command getDomainModelRemoveCommand(";
+  protected final String TEXT_312 = " editingDomain) {";
+  protected final String TEXT_313 = NL + "\t\t\t\t";
+  protected final String TEXT_314 = " result = new ";
+  protected final String TEXT_315 = "();";
+  protected final String TEXT_316 = NL + "\t\t\t\tresult.append(";
+  protected final String TEXT_317 = ".create(" + NL + "\t\t\t\t\teditingDomain, " + NL + "\t\t\t\t\tgetDiagramNode().getElement().eContainer(), ";
+  protected final String TEXT_318 = ".eINSTANCE.get";
+  protected final String TEXT_319 = "()," + NL + "\t\t\t\t\tgetDiagramNode().getElement()));";
+  protected final String TEXT_320 = NL + "\t\t\t\tresult.append(";
+  protected final String TEXT_321 = ".create(" + NL + "\t\t\t\t\teditingDomain, " + NL + "\t\t\t\t\tgetDiagramNode().getElement().eContainer(), ";
+  protected final String TEXT_322 = ".eINSTANCE.get";
+  protected final String TEXT_323 = "()," + NL + "\t\t\t\t\t";
+  protected final String TEXT_324 = ".UNSET_VALUE));";
+  protected final String TEXT_325 = NL + "\t\t\t\tresult.append(";
+  protected final String TEXT_326 = ".create(" + NL + "\t\t\t\t\teditingDomain, " + NL + "\t\t\t\t\tgetDiagramNode().getElement().eContainer(), ";
+  protected final String TEXT_327 = ".eINSTANCE.get";
+  protected final String TEXT_328 = "()," + NL + "\t\t\t\t\tgetDiagramNode().getElement()));";
+  protected final String TEXT_329 = NL + "\t\t\t\tresult.append(";
+  protected final String TEXT_330 = ".create(" + NL + "\t\t\t\t\teditingDomain, " + NL + "\t\t\t\t\tgetDiagramNode().getElement().eContainer(), ";
+  protected final String TEXT_331 = ".eINSTANCE.get";
+  protected final String TEXT_332 = "()," + NL + "\t\t\t\t\t";
+  protected final String TEXT_333 = ".UNSET_VALUE));";
+  protected final String TEXT_334 = NL + "\t\t\t\treturn result;";
+  protected final String TEXT_335 = NL + "\t\t\t\treturn ";
+  protected final String TEXT_336 = ".create(" + NL + "\t\t\t\t\teditingDomain, " + NL + "\t\t\t\t\tgetDiagramNode().getElement().eContainer(), ";
+  protected final String TEXT_337 = ".eINSTANCE.get";
+  protected final String TEXT_338 = "()," + NL + "\t\t\t\t\tgetDiagramNode().getElement());";
+  protected final String TEXT_339 = NL + "\t\t\t\treturn ";
+  protected final String TEXT_340 = ".create(" + NL + "\t\t\t\t\teditingDomain, " + NL + "\t\t\t\t\tgetDiagramNode().getElement().eContainer(), ";
+  protected final String TEXT_341 = ".eINSTANCE.get";
+  protected final String TEXT_342 = "()," + NL + "\t\t\t\t\t";
+  protected final String TEXT_343 = ".UNSET_VALUE);";
+  protected final String TEXT_344 = NL + "\t\t\t}" + NL + "\t\t});";
+  protected final String TEXT_345 = NL;
+  protected final String TEXT_346 = "\t\tinstallEditPolicy(";
+  protected final String TEXT_347 = ".DIRECT_EDIT_ROLE," + NL + "\t\t\t\tnew ";
+  protected final String TEXT_348 = "() {" + NL + "\t\t\t\t\tprotected void showCurrentEditValue(";
+  protected final String TEXT_349 = " request) {" + NL + "\t\t\t\t\t\tString value = (String) request.getCellEditor().getValue();" + NL + "\t\t\t\t\t\tsetWidgetText(value);" + NL + "\t\t\t\t\t}";
+  protected final String TEXT_350 = NL;
+  protected final String TEXT_351 = "\t\t\t\t\tprotected ";
+  protected final String TEXT_352 = " getDirectEditCommand(";
+  protected final String TEXT_353 = " request) {" + NL + "\t\t\t\t\t\tString value = (String) request.getCellEditor().getValue();" + NL + "\t\t\t\t\t\tif (value == null) {" + NL + "\t\t\t\t\t\t\t//Invalid value is transformed into a null by the validator." + NL + "\t\t\t\t\t\t\t//XXX: implement validator" + NL + "\t\t\t\t\t\t\treturn ";
+  protected final String TEXT_354 = ".INSTANCE;" + NL + "\t\t\t\t\t\t}" + NL + "\t\t\t\t\t\tfinal Object[] parseResult;" + NL + "\t\t\t\t\t\ttry {" + NL + "\t\t\t\t\t\t\tparseResult = new ";
+  protected final String TEXT_355 = "(";
+  protected final String TEXT_356 = ").parse(value);" + NL + "\t\t\t\t\t\t} catch (IllegalArgumentException e) {" + NL + "\t\t\t\t\t\t\treturn ";
+  protected final String TEXT_357 = ".INSTANCE;" + NL + "\t\t\t\t\t\t} catch (";
+  protected final String TEXT_358 = " e) {" + NL + "\t\t\t\t\t\t\treturn ";
+  protected final String TEXT_359 = ".INSTANCE;" + NL + "\t\t\t\t\t\t}" + NL + "\t\t\t\t\t\t";
+  protected final String TEXT_360 = " editingDomain = ";
+  protected final String TEXT_361 = ".getEditingDomain(";
+  protected final String TEXT_362 = ".getDiagram().getElement());";
+  protected final String TEXT_363 = NL + "\t\t\t\t\t\tif (parseResult.length != 1) {" + NL + "\t\t\t\t\t\t\treturn ";
+  protected final String TEXT_364 = ".INSTANCE;" + NL + "\t\t\t\t\t\t}" + NL + "\t\t\t\t\t\t";
+  protected final String TEXT_365 = " domainModelCommand = createDomainModelCommand(editingDomain, parseResult[0]);" + NL + "\t\t\t\t\t\treturn new ";
+  protected final String TEXT_366 = "(editingDomain, domainModelCommand);" + NL + "\t\t\t\t\t}" + NL + "\t\t\t\t\t";
+  protected final String TEXT_367 = " createDomainModelCommand(";
+  protected final String TEXT_368 = " editingDomain, Object value) {" + NL + "\t\t\t\t\t\t";
+  protected final String TEXT_369 = " element = ";
+  protected final String TEXT_370 = ";" + NL + "\t\t\t\t\t\t";
+  protected final String TEXT_371 = " feature = (";
+  protected final String TEXT_372 = ") ";
+  protected final String TEXT_373 = ".eINSTANCE.get";
+  protected final String TEXT_374 = "();" + NL + "\t\t\t\t\t\tObject valueToSet;" + NL + "\t\t\t\t\t\ttry {" + NL + "\t\t\t\t\t\t\tvalueToSet = ";
+  protected final String TEXT_375 = ".parseValue(feature, value);" + NL + "\t\t\t\t\t\t} catch (IllegalArgumentException e) {" + NL + "\t\t\t\t\t\t\treturn ";
+  protected final String TEXT_376 = ".INSTANCE;" + NL + "\t\t\t\t\t\t}";
+  protected final String TEXT_377 = NL + "\t\t\t\t\t\t";
+  protected final String TEXT_378 = " result = new ";
+  protected final String TEXT_379 = "();" + NL + "\t\t\t\t\t\t";
+  protected final String TEXT_380 = " values = new ";
+  protected final String TEXT_381 = "();" + NL + "\t\t\t\t\t\tvalues.addAll(element.get";
+  protected final String TEXT_382 = "());" + NL + "\t\t\t\t\t\tresult.append(";
+  protected final String TEXT_383 = ".create(editingDomain, element, feature, values));" + NL + "\t\t\t\t\t\tresult.append(";
+  protected final String TEXT_384 = ".create(editingDomain, element, feature, valueToSet));" + NL + "\t\t\t\t\t\treturn result;";
+  protected final String TEXT_385 = NL + "\t\t\t\t\t\treturn ";
+  protected final String TEXT_386 = ".create(editingDomain, element, feature, valueToSet);";
+  protected final String TEXT_387 = NL + "\t\t\t\t\t}";
+  protected final String TEXT_388 = NL + "\t\t\t\t\t\tif (parseResult.length != ";
+  protected final String TEXT_389 = ") {" + NL + "\t\t\t\t\t\t\treturn ";
+  protected final String TEXT_390 = ".INSTANCE;" + NL + "\t\t\t\t\t\t}" + NL + "\t\t\t\t\t\t";
+  protected final String TEXT_391 = " domainModelCommand = createDomainModelCommand(editingDomain, parseResult);" + NL + "\t\t\t\t\t\treturn new ";
+  protected final String TEXT_392 = "(editingDomain, domainModelCommand);" + NL + "\t\t\t\t\t}" + NL + "\t\t\t\t\t";
+  protected final String TEXT_393 = " createDomainModelCommand(";
+  protected final String TEXT_394 = " editingDomain, Object[] values) {" + NL + "\t\t\t\t\t\t";
+  protected final String TEXT_395 = " element = ";
+  protected final String TEXT_396 = ";" + NL + "\t\t\t\t\t\t";
+  protected final String TEXT_397 = " result = new ";
+  protected final String TEXT_398 = "();" + NL + "\t\t\t\t\t\tObject valueToSet;";
+  protected final String TEXT_399 = NL + "\t\t\t\t\t\t";
+  protected final String TEXT_400 = " ";
+  protected final String TEXT_401 = "feature = (";
+  protected final String TEXT_402 = ") ";
+  protected final String TEXT_403 = ".eINSTANCE.get";
+  protected final String TEXT_404 = "();" + NL + "\t\t\t\t\t\ttry {" + NL + "\t\t\t\t\t\t\tvalueToSet = ";
+  protected final String TEXT_405 = ".parseValue(feature, values[";
+  protected final String TEXT_406 = "]);" + NL + "\t\t\t\t\t\t} catch (IllegalArgumentException e) {" + NL + "\t\t\t\t\t\t\treturn ";
+  protected final String TEXT_407 = ".INSTANCE;" + NL + "\t\t\t\t\t\t}";
+  protected final String TEXT_408 = NL + "\t\t\t\t\t\t";
+  protected final String TEXT_409 = " ";
+  protected final String TEXT_410 = "values = new ";
+  protected final String TEXT_411 = "();" + NL + "\t\t\t\t\t\tvalues.addAll(element.get";
+  protected final String TEXT_412 = "());" + NL + "\t\t\t\t\t\tresult.append(";
+  protected final String TEXT_413 = ".create(editingDomain, element, feature, values));" + NL + "\t\t\t\t\t\tresult.append(";
+  protected final String TEXT_414 = ".create(editingDomain, element, feature, valueToSet));";
+  protected final String TEXT_415 = NL + "\t\t\t\t\t\tresult.append(";
+  protected final String TEXT_416 = ".create(editingDomain, element, feature, valueToSet));";
+  protected final String TEXT_417 = NL + "\t\t\t\t\t\treturn result;" + NL + "\t\t\t\t\t}";
+  protected final String TEXT_418 = NL + "\t\t\t\t});";
+  protected final String TEXT_419 = NL + "\t\t}" + NL;
+  protected final String TEXT_420 = NL;
+  protected final String TEXT_421 = "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate ";
+  protected final String TEXT_422 = " manager;" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic void performRequest(";
+  protected final String TEXT_423 = " req) {" + NL + "\t\tif (";
+  protected final String TEXT_424 = ".REQ_DIRECT_EDIT == req.getType()) {" + NL + "\t\t\tperformDirectEdit();" + NL + "\t\t} else {" + NL + "\t\t\tsuper.performRequest(req);" + NL + "\t\t}" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected ";
+  protected final String TEXT_425 = " getManager() {" + NL + "\t\tif (manager == null) {" + NL + "\t\t\tmanager = new ";
+  protected final String TEXT_426 = "(this, ";
+  protected final String TEXT_427 = ".class, new ";
+  protected final String TEXT_428 = "() {" + NL + "\t\t\t\tpublic void relocate(";
+  protected final String TEXT_429 = " celleditor) {" + NL + "\t\t\t\t\tif (checkTreeItem()) {" + NL + "\t\t\t\t\t\tcelleditor.getControl().setFont(((";
+  protected final String TEXT_430 = ") getWidget()).getFont());" + NL + "\t\t\t\t\t\tcelleditor.getControl().setBounds(((";
+  protected final String TEXT_431 = ") getWidget()).getBounds());" + NL + "\t\t\t\t\t}" + NL + "\t\t\t\t}" + NL + "\t\t\t}) {" + NL + "\t\t\t\tprotected void initCellEditor() {" + NL + "\t\t\t\t\tgetCellEditor().setValue(getEditText());" + NL + "\t\t\t\t}" + NL + "\t\t\t};" + NL + "\t\t}" + NL + "\t\treturn manager;" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected void performDirectEdit() {" + NL + "\t\tgetManager().show();" + NL + "\t}" + NL + "" + NL + "" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tprotected String getEditText() {" + NL + "\t\t\treturn getLabelEditText();" + NL + "\t\t}" + NL + "" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tpublic void activate() {" + NL + "\t\t\tsuper.activate();" + NL + "\t\t\tgetDiagramNode().getElement().eAdapters().add(domainModelRefresher);" + NL + "\t\t}" + NL + "" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tpublic void deactivate() {" + NL + "\t\t\tgetDiagramNode().getElement().eAdapters().remove(domainModelRefresher);" + NL + "\t\t\tsuper.deactivate();" + NL + "\t\t}" + NL;
+  protected final String TEXT_432 = NL;
+  protected final String TEXT_433 = "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate ";
+  protected final String TEXT_434 = " domainModelRefresher = new ";
+  protected final String TEXT_435 = "(this);" + NL + "" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tprotected void createRefreshers() {" + NL + "\t\t\tsuper.createRefreshers();" + NL + "\t\t\tRefresher labelRefresher = new Refresher() {" + NL + "\t\t\t\tpublic void refresh() {" + NL + "\t\t\t\t\trefreshVisuals();" + NL + "\t\t\t\t}" + NL + "\t\t\t};";
+  protected final String TEXT_436 = NL + "\t\t\tregisterRefresher(";
+  protected final String TEXT_437 = ".eINSTANCE.get";
+  protected final String TEXT_438 = "(), labelRefresher);";
+  protected final String TEXT_439 = NL + "\t\t\tregisterRefresher(";
+  protected final String TEXT_440 = ".eINSTANCE.get";
+  protected final String TEXT_441 = "(), labelRefresher);";
+  protected final String TEXT_442 = NL + "\t\t}" + NL + "" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tprotected String getText() {" + NL + "\t\t\treturn getLabelText();" + NL + "\t\t}" + NL + "" + NL + "\t\t/**" + NL + "\t\t * Since compartments and labels are not selectable edit parts, they are filtered from the overview as well." + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tprotected ";
+  protected final String TEXT_443 = " getModelChildren() {" + NL + "\t\t\treturn ";
+  protected final String TEXT_444 = ".EMPTY_LIST;" + NL + "\t\t}" + NL + "\t}" + NL + "}";
+  protected final String TEXT_445 = NL;
 
   public String generate(Object argument)
   {
@@ -412,6 +563,7 @@
 
     stringBuffer.append(TEXT_20);
     importManager.emitPackageStatement(stringBuffer);
+importManager.registerInnerClass("TreeEditPartAdapter");
 
 importManager.addImport("org.eclipse.gef.EditPolicy");
 importManager.addImport("org.eclipse.gef.Request");
@@ -469,6 +621,7 @@
 
     
 if (!isReadOnly) {
+		String editPatternCode = "EDIT_PATTERN";	//declared in labelText.javajetinc, used in directEditCommand.jetinc.
 
     stringBuffer.append(TEXT_42);
     stringBuffer.append(TEXT_43);
@@ -478,197 +631,201 @@
     stringBuffer.append(TEXT_45);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gef.requests.DirectEditRequest"));
     stringBuffer.append(TEXT_46);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.commands.Command"));
     stringBuffer.append(TEXT_47);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.requests.DirectEditRequest"));
     stringBuffer.append(TEXT_48);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.commands.UnexecutableCommand"));
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.commands.Command"));
     stringBuffer.append(TEXT_49);
-    stringBuffer.append(importManager.getImportedName("java.text.MessageFormat"));
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.requests.DirectEditRequest"));
     stringBuffer.append(TEXT_50);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gef.commands.UnexecutableCommand"));
     stringBuffer.append(TEXT_51);
-    stringBuffer.append(importManager.getImportedName("java.text.ParseException"));
+    stringBuffer.append(importManager.getImportedName("java.text.MessageFormat"));
     stringBuffer.append(TEXT_52);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.commands.UnexecutableCommand"));
+    stringBuffer.append(editPatternCode);
     stringBuffer.append(TEXT_53);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.TransactionalEditingDomain"));
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.commands.UnexecutableCommand"));
     stringBuffer.append(TEXT_54);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.util.TransactionUtil"));
+    stringBuffer.append(importManager.getImportedName("java.text.ParseException"));
     stringBuffer.append(TEXT_55);
-    stringBuffer.append(primaryView);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.commands.UnexecutableCommand"));
     stringBuffer.append(TEXT_56);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.TransactionalEditingDomain"));
+    stringBuffer.append(TEXT_57);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.util.TransactionUtil"));
+    stringBuffer.append(TEXT_58);
+    stringBuffer.append(primaryView);
+    stringBuffer.append(TEXT_59);
     
 if (labelModelFacet instanceof FeatureLabelModelFacet) {
 	GenFeature featureToSet = ((FeatureLabelModelFacet)labelModelFacet).getMetaFeature();
 	EStructuralFeature ecoreFeature = featureToSet.getEcoreFeature();
 
-    stringBuffer.append(TEXT_57);
+    stringBuffer.append(TEXT_60);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gef.commands.UnexecutableCommand"));
-    stringBuffer.append(TEXT_58);
+    stringBuffer.append(TEXT_61);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.command.Command"));
-    stringBuffer.append(TEXT_59);
+    stringBuffer.append(TEXT_62);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.lite.commands.WrappingCommand"));
-    stringBuffer.append(TEXT_60);
+    stringBuffer.append(TEXT_63);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.command.Command"));
-    stringBuffer.append(TEXT_61);
+    stringBuffer.append(TEXT_64);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.TransactionalEditingDomain"));
-    stringBuffer.append(TEXT_62);
+    stringBuffer.append(TEXT_65);
     stringBuffer.append(importManager.getImportedName(underlyingMetaClass.getQualifiedInterfaceName()));
-    stringBuffer.append(TEXT_63);
+    stringBuffer.append(TEXT_66);
     stringBuffer.append(resolvedSemanticElement);
-    stringBuffer.append(TEXT_64);
+    stringBuffer.append(TEXT_67);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EAttribute"));
-    stringBuffer.append(TEXT_65);
+    stringBuffer.append(TEXT_68);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EAttribute"));
-    stringBuffer.append(TEXT_66);
+    stringBuffer.append(TEXT_69);
     stringBuffer.append(importManager.getImportedName(featureToSet.getGenPackage().getQualifiedPackageInterfaceName()));
-    stringBuffer.append(TEXT_67);
+    stringBuffer.append(TEXT_70);
     stringBuffer.append(featureToSet.getFeatureAccessorName());
-    stringBuffer.append(TEXT_68);
+    stringBuffer.append(TEXT_71);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.lite.services.ParserUtil"));
-    stringBuffer.append(TEXT_69);
+    stringBuffer.append(TEXT_72);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.command.UnexecutableCommand"));
-    stringBuffer.append(TEXT_70);
+    stringBuffer.append(TEXT_73);
     
 	if (ecoreFeature.isMany()) {
 
-    stringBuffer.append(TEXT_71);
+    stringBuffer.append(TEXT_74);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.command.CompoundCommand"));
-    stringBuffer.append(TEXT_72);
+    stringBuffer.append(TEXT_75);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.command.CompoundCommand"));
-    stringBuffer.append(TEXT_73);
+    stringBuffer.append(TEXT_76);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.util.EList"));
-    stringBuffer.append(TEXT_74);
+    stringBuffer.append(TEXT_77);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.util.BasicEList"));
-    stringBuffer.append(TEXT_75);
+    stringBuffer.append(TEXT_78);
     stringBuffer.append(featureToSet.getAccessorName());
-    stringBuffer.append(TEXT_76);
+    stringBuffer.append(TEXT_79);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.edit.command.RemoveCommand"));
-    stringBuffer.append(TEXT_77);
+    stringBuffer.append(TEXT_80);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.edit.command.AddCommand"));
-    stringBuffer.append(TEXT_78);
+    stringBuffer.append(TEXT_81);
     
 	} else {
 
-    stringBuffer.append(TEXT_79);
+    stringBuffer.append(TEXT_82);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.edit.command.SetCommand"));
-    stringBuffer.append(TEXT_80);
+    stringBuffer.append(TEXT_83);
     
 	}
 
-    stringBuffer.append(TEXT_81);
+    stringBuffer.append(TEXT_84);
     
 } else if (labelModelFacet instanceof CompositeFeatureLabelModelFacet) {
 	CompositeFeatureLabelModelFacet compositeFeatureLabelModelFacet = (CompositeFeatureLabelModelFacet) labelModelFacet;
 	List metaFeatures = compositeFeatureLabelModelFacet.getMetaFeatures();
 
-    stringBuffer.append(TEXT_82);
+    stringBuffer.append(TEXT_85);
     stringBuffer.append(metaFeatures.size());
-    stringBuffer.append(TEXT_83);
+    stringBuffer.append(TEXT_86);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gef.commands.UnexecutableCommand"));
-    stringBuffer.append(TEXT_84);
+    stringBuffer.append(TEXT_87);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.command.Command"));
-    stringBuffer.append(TEXT_85);
+    stringBuffer.append(TEXT_88);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.lite.commands.WrappingCommand"));
-    stringBuffer.append(TEXT_86);
+    stringBuffer.append(TEXT_89);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.command.Command"));
-    stringBuffer.append(TEXT_87);
+    stringBuffer.append(TEXT_90);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.TransactionalEditingDomain"));
-    stringBuffer.append(TEXT_88);
+    stringBuffer.append(TEXT_91);
     stringBuffer.append(importManager.getImportedName(underlyingMetaClass.getQualifiedInterfaceName()));
-    stringBuffer.append(TEXT_89);
+    stringBuffer.append(TEXT_92);
     stringBuffer.append(resolvedSemanticElement);
-    stringBuffer.append(TEXT_90);
+    stringBuffer.append(TEXT_93);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.command.CompoundCommand"));
-    stringBuffer.append(TEXT_91);
+    stringBuffer.append(TEXT_94);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.command.CompoundCommand"));
-    stringBuffer.append(TEXT_92);
+    stringBuffer.append(TEXT_95);
     
 	boolean haveDeclaredValues = false;
 	for(int i = 0; i < metaFeatures.size(); i++) {
 		GenFeature nextFeatureToSet = (GenFeature) metaFeatures.get(i);
 		EStructuralFeature nextEcoreFeature = nextFeatureToSet.getEcoreFeature();
 
-    stringBuffer.append(TEXT_93);
+    stringBuffer.append(TEXT_96);
     if (i == 0) {
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EAttribute"));
-    stringBuffer.append(TEXT_94);
+    stringBuffer.append(TEXT_97);
     }
-    stringBuffer.append(TEXT_95);
+    stringBuffer.append(TEXT_98);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EAttribute"));
-    stringBuffer.append(TEXT_96);
+    stringBuffer.append(TEXT_99);
     stringBuffer.append(importManager.getImportedName(nextFeatureToSet.getGenPackage().getQualifiedPackageInterfaceName()));
-    stringBuffer.append(TEXT_97);
+    stringBuffer.append(TEXT_100);
     stringBuffer.append(nextFeatureToSet.getFeatureAccessorName());
-    stringBuffer.append(TEXT_98);
+    stringBuffer.append(TEXT_101);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.lite.services.ParserUtil"));
-    stringBuffer.append(TEXT_99);
+    stringBuffer.append(TEXT_102);
     stringBuffer.append(i);
-    stringBuffer.append(TEXT_100);
+    stringBuffer.append(TEXT_103);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.command.UnexecutableCommand"));
-    stringBuffer.append(TEXT_101);
+    stringBuffer.append(TEXT_104);
     
 		if (nextEcoreFeature.isMany()) {
 
-    stringBuffer.append(TEXT_102);
+    stringBuffer.append(TEXT_105);
     if (!haveDeclaredValues) { haveDeclaredValues = true;
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.util.EList"));
-    stringBuffer.append(TEXT_103);
+    stringBuffer.append(TEXT_106);
     }
-    stringBuffer.append(TEXT_104);
+    stringBuffer.append(TEXT_107);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.util.BasicEList"));
-    stringBuffer.append(TEXT_105);
+    stringBuffer.append(TEXT_108);
     stringBuffer.append(nextFeatureToSet.getAccessorName());
-    stringBuffer.append(TEXT_106);
+    stringBuffer.append(TEXT_109);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.edit.command.RemoveCommand"));
-    stringBuffer.append(TEXT_107);
+    stringBuffer.append(TEXT_110);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.edit.command.AddCommand"));
-    stringBuffer.append(TEXT_108);
+    stringBuffer.append(TEXT_111);
     
 		} else {
 
-    stringBuffer.append(TEXT_109);
+    stringBuffer.append(TEXT_112);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.edit.command.SetCommand"));
-    stringBuffer.append(TEXT_110);
+    stringBuffer.append(TEXT_113);
     
 		}
 
     
 	}
 
-    stringBuffer.append(TEXT_111);
+    stringBuffer.append(TEXT_114);
     
 }
 
-    stringBuffer.append(TEXT_112);
+    stringBuffer.append(TEXT_115);
     
 }
 
-    stringBuffer.append(TEXT_113);
-    stringBuffer.append(TEXT_114);
+    stringBuffer.append(TEXT_116);
+    stringBuffer.append(TEXT_117);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gef.EditPolicy"));
-    stringBuffer.append(TEXT_115);
+    stringBuffer.append(TEXT_118);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gef.editpolicies.ComponentEditPolicy"));
-    stringBuffer.append(TEXT_116);
+    stringBuffer.append(TEXT_119);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gef.commands.Command"));
-    stringBuffer.append(TEXT_117);
+    stringBuffer.append(TEXT_120);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gef.requests.GroupRequest"));
-    stringBuffer.append(TEXT_118);
+    stringBuffer.append(TEXT_121);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.TransactionalEditingDomain"));
-    stringBuffer.append(TEXT_119);
+    stringBuffer.append(TEXT_122);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.util.TransactionUtil"));
-    stringBuffer.append(TEXT_120);
+    stringBuffer.append(TEXT_123);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.command.CompoundCommand"));
-    stringBuffer.append(TEXT_121);
+    stringBuffer.append(TEXT_124);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.command.CompoundCommand"));
-    stringBuffer.append(TEXT_122);
+    stringBuffer.append(TEXT_125);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.edit.command.RemoveCommand"));
-    stringBuffer.append(TEXT_123);
+    stringBuffer.append(TEXT_126);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.lite.commands.WrappingCommand"));
-    stringBuffer.append(TEXT_124);
+    stringBuffer.append(TEXT_127);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.TransactionalEditingDomain"));
-    stringBuffer.append(TEXT_125);
+    stringBuffer.append(TEXT_128);
     
 {
 TypeModelFacet facet = genNode.getModelFacet();
@@ -676,120 +833,120 @@
 GenFeature containmentFeature = facet.getContainmentMetaFeature();
 if (childFeature != null && childFeature != containmentFeature && !childFeature.isDerived()) {
 
-    stringBuffer.append(TEXT_126);
+    stringBuffer.append(TEXT_129);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.command.CompoundCommand"));
-    stringBuffer.append(TEXT_127);
+    stringBuffer.append(TEXT_130);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.command.CompoundCommand"));
-    stringBuffer.append(TEXT_128);
+    stringBuffer.append(TEXT_131);
     
 	if (containmentFeature.getEcoreFeature().isMany()) {
 
-    stringBuffer.append(TEXT_129);
+    stringBuffer.append(TEXT_132);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.edit.command.RemoveCommand"));
-    stringBuffer.append(TEXT_130);
+    stringBuffer.append(TEXT_133);
     stringBuffer.append(importManager.getImportedName(containmentFeature.getGenPackage().getQualifiedPackageInterfaceName()));
-    stringBuffer.append(TEXT_131);
+    stringBuffer.append(TEXT_134);
     stringBuffer.append(containmentFeature.getFeatureAccessorName());
-    stringBuffer.append(TEXT_132);
+    stringBuffer.append(TEXT_135);
     
 	} else {
 
-    stringBuffer.append(TEXT_133);
+    stringBuffer.append(TEXT_136);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.edit.command.SetCommand"));
-    stringBuffer.append(TEXT_134);
+    stringBuffer.append(TEXT_137);
     stringBuffer.append(importManager.getImportedName(containmentFeature.getGenPackage().getQualifiedPackageInterfaceName()));
-    stringBuffer.append(TEXT_135);
+    stringBuffer.append(TEXT_138);
     stringBuffer.append(containmentFeature.getFeatureAccessorName());
-    stringBuffer.append(TEXT_136);
+    stringBuffer.append(TEXT_139);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.edit.command.SetCommand"));
-    stringBuffer.append(TEXT_137);
+    stringBuffer.append(TEXT_140);
     
 	}
 
     
 	if (childFeature.getEcoreFeature().isMany()) {
 
-    stringBuffer.append(TEXT_138);
+    stringBuffer.append(TEXT_141);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.edit.command.RemoveCommand"));
-    stringBuffer.append(TEXT_139);
+    stringBuffer.append(TEXT_142);
     stringBuffer.append(importManager.getImportedName(childFeature.getGenPackage().getQualifiedPackageInterfaceName()));
-    stringBuffer.append(TEXT_140);
+    stringBuffer.append(TEXT_143);
     stringBuffer.append(childFeature.getFeatureAccessorName());
-    stringBuffer.append(TEXT_141);
+    stringBuffer.append(TEXT_144);
     
 	} else {
 
-    stringBuffer.append(TEXT_142);
+    stringBuffer.append(TEXT_145);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.edit.command.SetCommand"));
-    stringBuffer.append(TEXT_143);
+    stringBuffer.append(TEXT_146);
     stringBuffer.append(importManager.getImportedName(childFeature.getGenPackage().getQualifiedPackageInterfaceName()));
-    stringBuffer.append(TEXT_144);
+    stringBuffer.append(TEXT_147);
     stringBuffer.append(childFeature.getFeatureAccessorName());
-    stringBuffer.append(TEXT_145);
+    stringBuffer.append(TEXT_148);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.edit.command.SetCommand"));
-    stringBuffer.append(TEXT_146);
+    stringBuffer.append(TEXT_149);
     
 	}
 
-    stringBuffer.append(TEXT_147);
+    stringBuffer.append(TEXT_150);
     
 } else {
 	if (containmentFeature.getEcoreFeature().isMany()) {
 
-    stringBuffer.append(TEXT_148);
+    stringBuffer.append(TEXT_151);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.edit.command.RemoveCommand"));
-    stringBuffer.append(TEXT_149);
+    stringBuffer.append(TEXT_152);
     stringBuffer.append(importManager.getImportedName(containmentFeature.getGenPackage().getQualifiedPackageInterfaceName()));
-    stringBuffer.append(TEXT_150);
+    stringBuffer.append(TEXT_153);
     stringBuffer.append(containmentFeature.getFeatureAccessorName());
-    stringBuffer.append(TEXT_151);
+    stringBuffer.append(TEXT_154);
     
 	} else {
 
-    stringBuffer.append(TEXT_152);
+    stringBuffer.append(TEXT_155);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.edit.command.SetCommand"));
-    stringBuffer.append(TEXT_153);
+    stringBuffer.append(TEXT_156);
     stringBuffer.append(importManager.getImportedName(containmentFeature.getGenPackage().getQualifiedPackageInterfaceName()));
-    stringBuffer.append(TEXT_154);
+    stringBuffer.append(TEXT_157);
     stringBuffer.append(containmentFeature.getFeatureAccessorName());
-    stringBuffer.append(TEXT_155);
+    stringBuffer.append(TEXT_158);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.edit.command.SetCommand"));
-    stringBuffer.append(TEXT_156);
+    stringBuffer.append(TEXT_159);
     
 	}
 }
 
-    stringBuffer.append(TEXT_157);
+    stringBuffer.append(TEXT_160);
     
 }	/*restrict local vars used in component edit policy*/
 
-    stringBuffer.append(TEXT_158);
+    stringBuffer.append(TEXT_161);
     
 if (!isReadOnly) {
 
-    stringBuffer.append(TEXT_159);
-    stringBuffer.append(TEXT_160);
+    stringBuffer.append(TEXT_162);
+    stringBuffer.append(TEXT_163);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gef.Request"));
-    stringBuffer.append(TEXT_161);
+    stringBuffer.append(TEXT_164);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gef.RequestConstants"));
-    stringBuffer.append(TEXT_162);
+    stringBuffer.append(TEXT_165);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gef.tools.DirectEditManager"));
-    stringBuffer.append(TEXT_163);
+    stringBuffer.append(TEXT_166);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gef.tools.DirectEditManager"));
-    stringBuffer.append(TEXT_164);
+    stringBuffer.append(TEXT_167);
     stringBuffer.append(importManager.getImportedName("org.eclipse.jface.viewers.TextCellEditor"));
-    stringBuffer.append(TEXT_165);
+    stringBuffer.append(TEXT_168);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gef.tools.CellEditorLocator"));
-    stringBuffer.append(TEXT_166);
+    stringBuffer.append(TEXT_169);
     stringBuffer.append(importManager.getImportedName("org.eclipse.jface.viewers.CellEditor"));
-    stringBuffer.append(TEXT_167);
+    stringBuffer.append(TEXT_170);
     stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.geometry.Rectangle"));
-    stringBuffer.append(TEXT_168);
+    stringBuffer.append(TEXT_171);
     
 }
 
-    stringBuffer.append(TEXT_169);
-    stringBuffer.append(TEXT_170);
+    stringBuffer.append(TEXT_172);
+    stringBuffer.append(TEXT_173);
     
 /*genFeature.getObjectType() throws NPE on primitive types. This is a workaround. */
 HashMap primitiveTypeToWrapperClassName = new HashMap();
@@ -833,91 +990,91 @@
 	}
 }
 
-    stringBuffer.append(TEXT_171);
+    stringBuffer.append(TEXT_174);
     stringBuffer.append(viewPattern);
-    stringBuffer.append(TEXT_172);
+    stringBuffer.append(TEXT_175);
     stringBuffer.append(editPattern);
-    stringBuffer.append(TEXT_173);
+    stringBuffer.append(TEXT_176);
     stringBuffer.append(importManager.getImportedName(underlyingMetaClass.getQualifiedInterfaceName()));
-    stringBuffer.append(TEXT_174);
+    stringBuffer.append(TEXT_177);
     stringBuffer.append(resolvedSemanticElement);
-    stringBuffer.append(TEXT_175);
+    stringBuffer.append(TEXT_178);
     stringBuffer.append(importManager.getImportedName(underlyingMetaClass.getQualifiedInterfaceName()));
-    stringBuffer.append(TEXT_176);
+    stringBuffer.append(TEXT_179);
     stringBuffer.append(resolvedSemanticElement);
-    stringBuffer.append(TEXT_177);
+    stringBuffer.append(TEXT_180);
     stringBuffer.append(importManager.getImportedName(underlyingMetaClass.getQualifiedInterfaceName()));
-    stringBuffer.append(TEXT_178);
+    stringBuffer.append(TEXT_181);
     
 if (labelModelFacet instanceof FeatureLabelModelFacet) {
 	FeatureLabelModelFacet featureLabelModelFacet = (FeatureLabelModelFacet) labelModelFacet;
 	GenFeature feature = featureLabelModelFacet.getMetaFeature();
 	if (!feature.isPrimitiveType()) {
 
-    stringBuffer.append(TEXT_179);
+    stringBuffer.append(TEXT_182);
     myFeatureGetAccessorHelper.appendFeatureValueGetter("element", feature, underlyingMetaClass, false);
-    stringBuffer.append(TEXT_180);
+    stringBuffer.append(TEXT_183);
     
 	}
 
-    stringBuffer.append(TEXT_181);
+    stringBuffer.append(TEXT_184);
     stringBuffer.append(importManager.getImportedName("java.text.MessageFormat"));
-    stringBuffer.append(TEXT_182);
+    stringBuffer.append(TEXT_185);
     
 		if (feature.isPrimitiveType()) {
 
-    stringBuffer.append(TEXT_183);
+    stringBuffer.append(TEXT_186);
     stringBuffer.append(primitiveTypeToWrapperClassName.get(feature.getTypeGenClassifier().getEcoreClassifier().getInstanceClass()));
-    stringBuffer.append(TEXT_184);
+    stringBuffer.append(TEXT_187);
     
 		}
 		myFeatureGetAccessorHelper.appendFeatureValueGetter("element", feature, underlyingMetaClass, false);
 		if (feature.isPrimitiveType()) {
 
-    stringBuffer.append(TEXT_185);
+    stringBuffer.append(TEXT_188);
     
 		}
 
-    stringBuffer.append(TEXT_186);
+    stringBuffer.append(TEXT_189);
     
 } else if (labelModelFacet instanceof CompositeFeatureLabelModelFacet) {
 	CompositeFeatureLabelModelFacet compositeFeatureLabelModelFacet = (CompositeFeatureLabelModelFacet) labelModelFacet;
 
-    stringBuffer.append(TEXT_187);
+    stringBuffer.append(TEXT_190);
     stringBuffer.append(importManager.getImportedName("java.text.MessageFormat"));
-    stringBuffer.append(TEXT_188);
+    stringBuffer.append(TEXT_191);
     
 	for(Iterator it = compositeFeatureLabelModelFacet.getMetaFeatures().iterator(); it.hasNext(); ) {
 		GenFeature next = (GenFeature) it.next();
 		if (next.isPrimitiveType()) {
 
-    stringBuffer.append(TEXT_189);
+    stringBuffer.append(TEXT_192);
     stringBuffer.append(primitiveTypeToWrapperClassName.get(next.getTypeGenClassifier().getEcoreClassifier().getInstanceClass()));
-    stringBuffer.append(TEXT_190);
+    stringBuffer.append(TEXT_193);
     
 		}
 		myFeatureGetAccessorHelper.appendFeatureValueGetter("element", next, underlyingMetaClass, false);
 		if (next.isPrimitiveType()) {
 
-    stringBuffer.append(TEXT_191);
+    stringBuffer.append(TEXT_194);
     
 		}
 		if (it.hasNext()) {
-    stringBuffer.append(TEXT_192);
+    stringBuffer.append(TEXT_195);
     }
     
 	}
 
-    stringBuffer.append(TEXT_193);
+    stringBuffer.append(TEXT_196);
     
 } else {
 
-    stringBuffer.append(TEXT_194);
+    stringBuffer.append(TEXT_197);
     
 }
 
-    stringBuffer.append(TEXT_195);
-    stringBuffer.append(TEXT_196);
+    stringBuffer.append(TEXT_198);
+    stringBuffer.append(TEXT_199);
     
 boolean isFixedFontSetInFigure;
 {
@@ -925,147 +1082,149 @@
 	isFixedFontSetInFigure = styleAttributes != null && styleAttributes.isFixedFont();
 }
 
-    stringBuffer.append(TEXT_197);
+    stringBuffer.append(TEXT_200);
     
 if (!isFixedFontSetInFigure) {
 
-    stringBuffer.append(TEXT_198);
+    stringBuffer.append(TEXT_201);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.FontStyle"));
-    stringBuffer.append(TEXT_199);
+    stringBuffer.append(TEXT_202);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.FontStyle"));
-    stringBuffer.append(TEXT_200);
+    stringBuffer.append(TEXT_203);
     stringBuffer.append(primaryView);
-    stringBuffer.append(TEXT_201);
+    stringBuffer.append(TEXT_204);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.NotationPackage"));
-    stringBuffer.append(TEXT_202);
+    stringBuffer.append(TEXT_205);
     stringBuffer.append(importManager.getImportedName("org.eclipse.swt.graphics.Font"));
-    stringBuffer.append(TEXT_203);
+    stringBuffer.append(TEXT_206);
     stringBuffer.append(importManager.getImportedName("org.eclipse.swt.SWT"));
-    stringBuffer.append(TEXT_204);
+    stringBuffer.append(TEXT_207);
     stringBuffer.append(importManager.getImportedName("org.eclipse.swt.SWT"));
-    stringBuffer.append(TEXT_205);
+    stringBuffer.append(TEXT_208);
     stringBuffer.append(importManager.getImportedName("org.eclipse.swt.SWT"));
-    stringBuffer.append(TEXT_206);
+    stringBuffer.append(TEXT_209);
     stringBuffer.append(importManager.getImportedName("org.eclipse.swt.graphics.Font"));
-    stringBuffer.append(TEXT_207);
+    stringBuffer.append(TEXT_210);
     stringBuffer.append(importManager.getImportedName("org.eclipse.swt.graphics.FontData"));
-    stringBuffer.append(TEXT_208);
+    stringBuffer.append(TEXT_211);
     stringBuffer.append(importManager.getImportedName("org.eclipse.swt.graphics.Font"));
-    stringBuffer.append(TEXT_209);
+    stringBuffer.append(TEXT_212);
     
 }
 
-    stringBuffer.append(TEXT_210);
+    stringBuffer.append(TEXT_213);
     
 if (!isFixedFontSetInFigure) {
 
-    stringBuffer.append(TEXT_211);
+    stringBuffer.append(TEXT_214);
     stringBuffer.append(importManager.getImportedName("org.eclipse.swt.graphics.Font"));
-    stringBuffer.append(TEXT_212);
+    stringBuffer.append(TEXT_215);
     
 }
 
-    stringBuffer.append(TEXT_213);
-    stringBuffer.append(TEXT_214);
-    stringBuffer.append(TEXT_215);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.FontStyle"));
     stringBuffer.append(TEXT_216);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.FontStyle"));
     stringBuffer.append(TEXT_217);
-    stringBuffer.append(primaryView);
     stringBuffer.append(TEXT_218);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.NotationPackage"));
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.FontStyle"));
     stringBuffer.append(TEXT_219);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.swt.graphics.Color"));
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.FontStyle"));
     stringBuffer.append(TEXT_220);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.swt.graphics.Color"));
+    stringBuffer.append(primaryView);
     stringBuffer.append(TEXT_221);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.swt.graphics.Color"));
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.NotationPackage"));
     stringBuffer.append(TEXT_222);
     stringBuffer.append(importManager.getImportedName("org.eclipse.swt.graphics.Color"));
     stringBuffer.append(TEXT_223);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.swt.graphics.Image"));
+    stringBuffer.append(importManager.getImportedName("org.eclipse.swt.graphics.Color"));
     stringBuffer.append(TEXT_224);
-    
-if (genChildNode.isLabelElementIcon()) {
-
+    stringBuffer.append(importManager.getImportedName("org.eclipse.swt.graphics.Color"));
     stringBuffer.append(TEXT_225);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.jface.resource.ImageDescriptor"));
+    stringBuffer.append(importManager.getImportedName("org.eclipse.swt.graphics.Color"));
     stringBuffer.append(TEXT_226);
-    stringBuffer.append(importManager.getImportedName(genDiagram.getEditorGen().getPlugin().getActivatorQualifiedClassName()));
+    stringBuffer.append(importManager.getImportedName("org.eclipse.swt.graphics.Image"));
     stringBuffer.append(TEXT_227);
     
-}
+if (genChildNode.isLabelElementIcon()) {
 
     stringBuffer.append(TEXT_228);
-    /*@ include file="adapters/propertySource.javajetinc"*/
+    stringBuffer.append(importManager.getImportedName("org.eclipse.jface.resource.ImageDescriptor"));
     stringBuffer.append(TEXT_229);
+    stringBuffer.append(importManager.getImportedName(genDiagram.getEditorGen().getPlugin().getActivatorQualifiedClassName()));
     stringBuffer.append(TEXT_230);
+    
+}
+
     stringBuffer.append(TEXT_231);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.lite.edit.parts.update.RefreshAdapter"));
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.TreeEditPart"));
     stringBuffer.append(TEXT_232);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.lite.edit.parts.update.RefreshAdapter"));
+    /*@ include file="adapters/propertySource.javajetinc"*/
     stringBuffer.append(TEXT_233);
     stringBuffer.append(TEXT_234);
     stringBuffer.append(TEXT_235);
-    stringBuffer.append(importManager.getImportedName("java.util.HashMap"));
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.lite.edit.parts.update.RefreshAdapter"));
     stringBuffer.append(TEXT_236);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EStructuralFeature"));
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.lite.edit.parts.update.RefreshAdapter"));
     stringBuffer.append(TEXT_237);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.notify.Notification"));
     stringBuffer.append(TEXT_238);
     stringBuffer.append(TEXT_239);
+    stringBuffer.append(importManager.getImportedName("java.util.HashMap"));
     stringBuffer.append(TEXT_240);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.NotationPackage"));
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EStructuralFeature"));
     stringBuffer.append(TEXT_241);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.NotationPackage"));
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.notify.Notification"));
     stringBuffer.append(TEXT_242);
     stringBuffer.append(TEXT_243);
     stringBuffer.append(TEXT_244);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.NotationPackage"));
     stringBuffer.append(TEXT_245);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.NotationPackage"));
+    stringBuffer.append(TEXT_246);
+    stringBuffer.append(TEXT_247);
+    stringBuffer.append(TEXT_248);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.NotationPackage"));
+    stringBuffer.append(TEXT_249);
     
 if (labelModelFacet instanceof FeatureLabelModelFacet) {
 	GenFeature feature = ((FeatureLabelModelFacet)labelModelFacet).getMetaFeature();
 
-    stringBuffer.append(TEXT_246);
+    stringBuffer.append(TEXT_250);
     stringBuffer.append(importManager.getImportedName(feature.getGenPackage().getQualifiedPackageInterfaceName()));
-    stringBuffer.append(TEXT_247);
+    stringBuffer.append(TEXT_251);
     stringBuffer.append(feature.getFeatureAccessorName());
-    stringBuffer.append(TEXT_248);
+    stringBuffer.append(TEXT_252);
     
 } else if (labelModelFacet instanceof CompositeFeatureLabelModelFacet) {
 	CompositeFeatureLabelModelFacet compositeFeatureLabelModelFacet = (CompositeFeatureLabelModelFacet) labelModelFacet;
 	for(Iterator it = compositeFeatureLabelModelFacet.getMetaFeatures().iterator(); it.hasNext(); ) {
 		GenFeature next = (GenFeature) it.next();
 
-    stringBuffer.append(TEXT_249);
+    stringBuffer.append(TEXT_253);
     stringBuffer.append(importManager.getImportedName(next.getGenPackage().getQualifiedPackageInterfaceName()));
-    stringBuffer.append(TEXT_250);
+    stringBuffer.append(TEXT_254);
     stringBuffer.append(next.getFeatureAccessorName());
-    stringBuffer.append(TEXT_251);
+    stringBuffer.append(TEXT_255);
     
 	}
 }
 
-    stringBuffer.append(TEXT_252);
-    stringBuffer.append(TEXT_253);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.NotationPackage"));
-    stringBuffer.append(TEXT_254);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.NotationPackage"));
-    stringBuffer.append(TEXT_255);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.NotationPackage"));
     stringBuffer.append(TEXT_256);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.NotationPackage"));
     stringBuffer.append(TEXT_257);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.NotationPackage"));
     stringBuffer.append(TEXT_258);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.NotationPackage"));
     stringBuffer.append(TEXT_259);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.NotationPackage"));
     stringBuffer.append(TEXT_260);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.NotationPackage"));
+    stringBuffer.append(TEXT_261);
+    stringBuffer.append(TEXT_262);
+    stringBuffer.append(TEXT_263);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.NotationPackage"));
+    stringBuffer.append(TEXT_264);
     
 final Viewmap viewmap = genChildNode.getViewmap();
 
-    stringBuffer.append(TEXT_261);
+    stringBuffer.append(TEXT_265);
     
 final String figureQualifiedClassName;
 if (viewmap instanceof ParentAssignedViewmap) {
@@ -1094,64 +1253,64 @@
 if (viewmap instanceof ParentAssignedViewmap) {
 	final ParentAssignedViewmap parentAssignedViewmap = (ParentAssignedViewmap) viewmap;
 
-    stringBuffer.append(TEXT_262);
+    stringBuffer.append(TEXT_266);
     stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.IFigure"));
-    stringBuffer.append(TEXT_263);
+    stringBuffer.append(TEXT_267);
     stringBuffer.append((parentAssignedViewmap.getSetterName() == null ? "setLabel" : parentAssignedViewmap.getSetterName()));
-    stringBuffer.append(TEXT_264);
+    stringBuffer.append(TEXT_268);
     } else { 
-    stringBuffer.append(TEXT_265);
+    stringBuffer.append(TEXT_269);
     stringBuffer.append(figureImportedName);
-    stringBuffer.append(TEXT_266);
+    stringBuffer.append(TEXT_270);
     
 if (viewmap instanceof FigureViewmap) {
 
-    stringBuffer.append(TEXT_267);
+    stringBuffer.append(TEXT_271);
     stringBuffer.append(figureImportedName);
-    stringBuffer.append(TEXT_268);
+    stringBuffer.append(TEXT_272);
     } // instanceof FigureViewmap
  else if (viewmap instanceof SnippetViewmap) {
-    stringBuffer.append(TEXT_269);
+    stringBuffer.append(TEXT_273);
     stringBuffer.append(((SnippetViewmap) viewmap).getBody());
-    stringBuffer.append(TEXT_270);
+    stringBuffer.append(TEXT_274);
     } // instanceof SnippetViewmap; FIXME : obtain figure class name to generate getter
  else if (viewmap instanceof InnerClassViewmap) {
 
-    stringBuffer.append(TEXT_271);
+    stringBuffer.append(TEXT_275);
     stringBuffer.append(figureImportedName);
-    stringBuffer.append(TEXT_272);
+    stringBuffer.append(TEXT_276);
     }
-    stringBuffer.append(TEXT_273);
+    stringBuffer.append(TEXT_277);
     stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.IFigure"));
-    stringBuffer.append(TEXT_274);
+    stringBuffer.append(TEXT_278);
     stringBuffer.append(figureImportedName);
-    stringBuffer.append(TEXT_275);
+    stringBuffer.append(TEXT_279);
     
 if ("org.eclipse.draw2d.Label".equals(figureQualifiedClassName) || viewmap instanceof InnerClassViewmap) {
 
-    stringBuffer.append(TEXT_276);
+    stringBuffer.append(TEXT_280);
     
 } else {
 
-    stringBuffer.append(TEXT_277);
+    stringBuffer.append(TEXT_281);
     
 }
 
-    stringBuffer.append(TEXT_278);
+    stringBuffer.append(TEXT_282);
     }	/*not parent-assigned*/
-    stringBuffer.append(TEXT_279);
+    stringBuffer.append(TEXT_283);
     
 if (!"org.eclipse.draw2d.Label".equals(figureQualifiedClassName) && viewmap instanceof InnerClassViewmap==false) {
 
-    stringBuffer.append(TEXT_280);
+    stringBuffer.append(TEXT_284);
     
 }
 
-    stringBuffer.append(TEXT_281);
+    stringBuffer.append(TEXT_285);
     stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.Label"));
-    stringBuffer.append(TEXT_282);
+    stringBuffer.append(TEXT_286);
     stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.Label"));
-    stringBuffer.append(TEXT_283);
+    stringBuffer.append(TEXT_287);
     
 String labelSetterName = "setLabel"; // same assumption in NodeEditPart
 String labelFigureClassName = "org.eclipse.draw2d.IFigure";
@@ -1165,43 +1324,406 @@
 	}
 } // FIXME perhaps, there's no sense to have setLabel for any other viewmap than ParentAssigned?
 
-    stringBuffer.append(TEXT_284);
+    stringBuffer.append(TEXT_288);
     stringBuffer.append(labelSetterName);
-    stringBuffer.append(TEXT_285);
+    stringBuffer.append(TEXT_289);
     stringBuffer.append(importManager.getImportedName(labelFigureClassName));
-    stringBuffer.append(TEXT_286);
+    stringBuffer.append(TEXT_290);
     
 if ("org.eclipse.draw2d.Label".equals(labelFigureClassName)) {
 
-    stringBuffer.append(TEXT_287);
+    stringBuffer.append(TEXT_291);
     
 } else {
 
-    stringBuffer.append(TEXT_288);
+    stringBuffer.append(TEXT_292);
     
 }
 
-    stringBuffer.append(TEXT_289);
+    stringBuffer.append(TEXT_293);
     
 if (viewmap instanceof InnerClassViewmap) {
 	String classBody = ((InnerClassViewmap) viewmap).getClassBody();
 
-    stringBuffer.append(TEXT_290);
+    stringBuffer.append(TEXT_294);
     stringBuffer.append(classBody);
-    stringBuffer.append(TEXT_291);
+    stringBuffer.append(TEXT_295);
     
 if (classBody.indexOf("DPtoLP") != -1) {
 
-    stringBuffer.append(TEXT_292);
+    stringBuffer.append(TEXT_296);
     
 }
 
     
 }
 
-    stringBuffer.append(TEXT_293);
+    stringBuffer.append(TEXT_297);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.lite.edit.parts.tree.BaseTreeEditPart"));
+    stringBuffer.append(TEXT_298);
+    stringBuffer.append(importManager.getImportedName(genDiagram.getEditorGen().getPlugin().getActivatorQualifiedClassName()));
+    stringBuffer.append(TEXT_299);
+    stringBuffer.append(TEXT_300);
+    stringBuffer.append(TEXT_301);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.EditPolicy"));
+    stringBuffer.append(TEXT_302);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.editpolicies.ComponentEditPolicy"));
+    stringBuffer.append(TEXT_303);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.commands.Command"));
+    stringBuffer.append(TEXT_304);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.requests.GroupRequest"));
+    stringBuffer.append(TEXT_305);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.TransactionalEditingDomain"));
+    stringBuffer.append(TEXT_306);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.util.TransactionUtil"));
+    stringBuffer.append(TEXT_307);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.command.CompoundCommand"));
+    stringBuffer.append(TEXT_308);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.command.CompoundCommand"));
+    stringBuffer.append(TEXT_309);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.edit.command.RemoveCommand"));
+    stringBuffer.append(TEXT_310);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.lite.commands.WrappingCommand"));
+    stringBuffer.append(TEXT_311);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.TransactionalEditingDomain"));
+    stringBuffer.append(TEXT_312);
+    
+{
+TypeModelFacet facet = genNode.getModelFacet();
+GenFeature childFeature = facet.getChildMetaFeature();
+GenFeature containmentFeature = facet.getContainmentMetaFeature();
+if (childFeature != null && childFeature != containmentFeature && !childFeature.isDerived()) {
+
+    stringBuffer.append(TEXT_313);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.command.CompoundCommand"));
+    stringBuffer.append(TEXT_314);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.command.CompoundCommand"));
+    stringBuffer.append(TEXT_315);
+    
+	if (containmentFeature.getEcoreFeature().isMany()) {
+
+    stringBuffer.append(TEXT_316);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.edit.command.RemoveCommand"));
+    stringBuffer.append(TEXT_317);
+    stringBuffer.append(importManager.getImportedName(containmentFeature.getGenPackage().getQualifiedPackageInterfaceName()));
+    stringBuffer.append(TEXT_318);
+    stringBuffer.append(containmentFeature.getFeatureAccessorName());
+    stringBuffer.append(TEXT_319);
+    
+	} else {
+
+    stringBuffer.append(TEXT_320);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.edit.command.SetCommand"));
+    stringBuffer.append(TEXT_321);
+    stringBuffer.append(importManager.getImportedName(containmentFeature.getGenPackage().getQualifiedPackageInterfaceName()));
+    stringBuffer.append(TEXT_322);
+    stringBuffer.append(containmentFeature.getFeatureAccessorName());
+    stringBuffer.append(TEXT_323);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.edit.command.SetCommand"));
+    stringBuffer.append(TEXT_324);
+    
+	}
+
+    
+	if (childFeature.getEcoreFeature().isMany()) {
+
+    stringBuffer.append(TEXT_325);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.edit.command.RemoveCommand"));
+    stringBuffer.append(TEXT_326);
+    stringBuffer.append(importManager.getImportedName(childFeature.getGenPackage().getQualifiedPackageInterfaceName()));
+    stringBuffer.append(TEXT_327);
+    stringBuffer.append(childFeature.getFeatureAccessorName());
+    stringBuffer.append(TEXT_328);
+    
+	} else {
+
+    stringBuffer.append(TEXT_329);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.edit.command.SetCommand"));
+    stringBuffer.append(TEXT_330);
+    stringBuffer.append(importManager.getImportedName(childFeature.getGenPackage().getQualifiedPackageInterfaceName()));
+    stringBuffer.append(TEXT_331);
+    stringBuffer.append(childFeature.getFeatureAccessorName());
+    stringBuffer.append(TEXT_332);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.edit.command.SetCommand"));
+    stringBuffer.append(TEXT_333);
+    
+	}
+
+    stringBuffer.append(TEXT_334);
+    
+} else {
+	if (containmentFeature.getEcoreFeature().isMany()) {
+
+    stringBuffer.append(TEXT_335);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.edit.command.RemoveCommand"));
+    stringBuffer.append(TEXT_336);
+    stringBuffer.append(importManager.getImportedName(containmentFeature.getGenPackage().getQualifiedPackageInterfaceName()));
+    stringBuffer.append(TEXT_337);
+    stringBuffer.append(containmentFeature.getFeatureAccessorName());
+    stringBuffer.append(TEXT_338);
+    
+	} else {
+
+    stringBuffer.append(TEXT_339);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.edit.command.SetCommand"));
+    stringBuffer.append(TEXT_340);
+    stringBuffer.append(importManager.getImportedName(containmentFeature.getGenPackage().getQualifiedPackageInterfaceName()));
+    stringBuffer.append(TEXT_341);
+    stringBuffer.append(containmentFeature.getFeatureAccessorName());
+    stringBuffer.append(TEXT_342);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.edit.command.SetCommand"));
+    stringBuffer.append(TEXT_343);
+    
+	}
+}
+
+    stringBuffer.append(TEXT_344);
+    
+}	/*restrict local vars used in component edit policy*/
+
+    
+if (!isReadOnly) {
+		String editPatternCode = "EDIT_PATTERN";	//declared in labelText.javajetinc, used in directEditCommand.jetinc.
+
+    stringBuffer.append(TEXT_345);
+    stringBuffer.append(TEXT_346);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.EditPolicy"));
+    stringBuffer.append(TEXT_347);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.editpolicies.DirectEditPolicy"));
+    stringBuffer.append(TEXT_348);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.requests.DirectEditRequest"));
+    stringBuffer.append(TEXT_349);
+    stringBuffer.append(TEXT_350);
+    stringBuffer.append(TEXT_351);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.commands.Command"));
+    stringBuffer.append(TEXT_352);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.requests.DirectEditRequest"));
+    stringBuffer.append(TEXT_353);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.commands.UnexecutableCommand"));
+    stringBuffer.append(TEXT_354);
+    stringBuffer.append(importManager.getImportedName("java.text.MessageFormat"));
+    stringBuffer.append(TEXT_355);
+    stringBuffer.append(editPatternCode);
+    stringBuffer.append(TEXT_356);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.commands.UnexecutableCommand"));
+    stringBuffer.append(TEXT_357);
+    stringBuffer.append(importManager.getImportedName("java.text.ParseException"));
+    stringBuffer.append(TEXT_358);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.commands.UnexecutableCommand"));
+    stringBuffer.append(TEXT_359);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.TransactionalEditingDomain"));
+    stringBuffer.append(TEXT_360);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.util.TransactionUtil"));
+    stringBuffer.append(TEXT_361);
+    stringBuffer.append(primaryView);
+    stringBuffer.append(TEXT_362);
+    
+if (labelModelFacet instanceof FeatureLabelModelFacet) {
+	GenFeature featureToSet = ((FeatureLabelModelFacet)labelModelFacet).getMetaFeature();
+	EStructuralFeature ecoreFeature = featureToSet.getEcoreFeature();
+
+    stringBuffer.append(TEXT_363);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.commands.UnexecutableCommand"));
+    stringBuffer.append(TEXT_364);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.command.Command"));
+    stringBuffer.append(TEXT_365);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.lite.commands.WrappingCommand"));
+    stringBuffer.append(TEXT_366);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.command.Command"));
+    stringBuffer.append(TEXT_367);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.TransactionalEditingDomain"));
+    stringBuffer.append(TEXT_368);
+    stringBuffer.append(importManager.getImportedName(underlyingMetaClass.getQualifiedInterfaceName()));
+    stringBuffer.append(TEXT_369);
+    stringBuffer.append(resolvedSemanticElement);
+    stringBuffer.append(TEXT_370);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EAttribute"));
+    stringBuffer.append(TEXT_371);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EAttribute"));
+    stringBuffer.append(TEXT_372);
+    stringBuffer.append(importManager.getImportedName(featureToSet.getGenPackage().getQualifiedPackageInterfaceName()));
+    stringBuffer.append(TEXT_373);
+    stringBuffer.append(featureToSet.getFeatureAccessorName());
+    stringBuffer.append(TEXT_374);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.lite.services.ParserUtil"));
+    stringBuffer.append(TEXT_375);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.command.UnexecutableCommand"));
+    stringBuffer.append(TEXT_376);
+    
+	if (ecoreFeature.isMany()) {
+
+    stringBuffer.append(TEXT_377);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.command.CompoundCommand"));
+    stringBuffer.append(TEXT_378);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.command.CompoundCommand"));
+    stringBuffer.append(TEXT_379);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.util.EList"));
+    stringBuffer.append(TEXT_380);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.util.BasicEList"));
+    stringBuffer.append(TEXT_381);
+    stringBuffer.append(featureToSet.getAccessorName());
+    stringBuffer.append(TEXT_382);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.edit.command.RemoveCommand"));
+    stringBuffer.append(TEXT_383);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.edit.command.AddCommand"));
+    stringBuffer.append(TEXT_384);
+    
+	} else {
+
+    stringBuffer.append(TEXT_385);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.edit.command.SetCommand"));
+    stringBuffer.append(TEXT_386);
+    
+	}
+
+    stringBuffer.append(TEXT_387);
+    
+} else if (labelModelFacet instanceof CompositeFeatureLabelModelFacet) {
+	CompositeFeatureLabelModelFacet compositeFeatureLabelModelFacet = (CompositeFeatureLabelModelFacet) labelModelFacet;
+	List metaFeatures = compositeFeatureLabelModelFacet.getMetaFeatures();
+
+    stringBuffer.append(TEXT_388);
+    stringBuffer.append(metaFeatures.size());
+    stringBuffer.append(TEXT_389);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.commands.UnexecutableCommand"));
+    stringBuffer.append(TEXT_390);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.command.Command"));
+    stringBuffer.append(TEXT_391);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.lite.commands.WrappingCommand"));
+    stringBuffer.append(TEXT_392);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.command.Command"));
+    stringBuffer.append(TEXT_393);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.TransactionalEditingDomain"));
+    stringBuffer.append(TEXT_394);
+    stringBuffer.append(importManager.getImportedName(underlyingMetaClass.getQualifiedInterfaceName()));
+    stringBuffer.append(TEXT_395);
+    stringBuffer.append(resolvedSemanticElement);
+    stringBuffer.append(TEXT_396);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.command.CompoundCommand"));
+    stringBuffer.append(TEXT_397);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.command.CompoundCommand"));
+    stringBuffer.append(TEXT_398);
+    
+	boolean haveDeclaredValues = false;
+	for(int i = 0; i < metaFeatures.size(); i++) {
+		GenFeature nextFeatureToSet = (GenFeature) metaFeatures.get(i);
+		EStructuralFeature nextEcoreFeature = nextFeatureToSet.getEcoreFeature();
+
+    stringBuffer.append(TEXT_399);
+    if (i == 0) {
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EAttribute"));
+    stringBuffer.append(TEXT_400);
+    }
+    stringBuffer.append(TEXT_401);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EAttribute"));
+    stringBuffer.append(TEXT_402);
+    stringBuffer.append(importManager.getImportedName(nextFeatureToSet.getGenPackage().getQualifiedPackageInterfaceName()));
+    stringBuffer.append(TEXT_403);
+    stringBuffer.append(nextFeatureToSet.getFeatureAccessorName());
+    stringBuffer.append(TEXT_404);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.lite.services.ParserUtil"));
+    stringBuffer.append(TEXT_405);
+    stringBuffer.append(i);
+    stringBuffer.append(TEXT_406);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.command.UnexecutableCommand"));
+    stringBuffer.append(TEXT_407);
+    
+		if (nextEcoreFeature.isMany()) {
+
+    stringBuffer.append(TEXT_408);
+    if (!haveDeclaredValues) { haveDeclaredValues = true;
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.util.EList"));
+    stringBuffer.append(TEXT_409);
+    }
+    stringBuffer.append(TEXT_410);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.util.BasicEList"));
+    stringBuffer.append(TEXT_411);
+    stringBuffer.append(nextFeatureToSet.getAccessorName());
+    stringBuffer.append(TEXT_412);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.edit.command.RemoveCommand"));
+    stringBuffer.append(TEXT_413);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.edit.command.AddCommand"));
+    stringBuffer.append(TEXT_414);
+    
+		} else {
+
+    stringBuffer.append(TEXT_415);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.edit.command.SetCommand"));
+    stringBuffer.append(TEXT_416);
+    
+		}
+
+    
+	}
+
+    stringBuffer.append(TEXT_417);
+    
+}
+
+    stringBuffer.append(TEXT_418);
+    
+}
+
+    stringBuffer.append(TEXT_419);
+    stringBuffer.append(TEXT_420);
+    stringBuffer.append(TEXT_421);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.lite.services.TreeDirectEditManager"));
+    stringBuffer.append(TEXT_422);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.Request"));
+    stringBuffer.append(TEXT_423);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.RequestConstants"));
+    stringBuffer.append(TEXT_424);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.lite.services.TreeDirectEditManager"));
+    stringBuffer.append(TEXT_425);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.lite.services.TreeDirectEditManager"));
+    stringBuffer.append(TEXT_426);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.jface.viewers.TextCellEditor"));
+    stringBuffer.append(TEXT_427);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.tools.CellEditorLocator"));
+    stringBuffer.append(TEXT_428);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.jface.viewers.CellEditor"));
+    stringBuffer.append(TEXT_429);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.swt.widgets.TreeItem"));
+    stringBuffer.append(TEXT_430);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.swt.widgets.TreeItem"));
+    stringBuffer.append(TEXT_431);
+    stringBuffer.append(TEXT_432);
+    stringBuffer.append(TEXT_433);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.lite.edit.parts.update.RefreshAdapter"));
+    stringBuffer.append(TEXT_434);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.lite.edit.parts.update.RefreshAdapter"));
+    stringBuffer.append(TEXT_435);
+    
+if (labelModelFacet instanceof FeatureLabelModelFacet) {
+	GenFeature feature = ((FeatureLabelModelFacet)labelModelFacet).getMetaFeature();
+
+    stringBuffer.append(TEXT_436);
+    stringBuffer.append(importManager.getImportedName(feature.getGenPackage().getQualifiedPackageInterfaceName()));
+    stringBuffer.append(TEXT_437);
+    stringBuffer.append(feature.getFeatureAccessorName());
+    stringBuffer.append(TEXT_438);
+    
+} else if (labelModelFacet instanceof CompositeFeatureLabelModelFacet) {
+	CompositeFeatureLabelModelFacet compositeFeatureLabelModelFacet = (CompositeFeatureLabelModelFacet) labelModelFacet;
+	for(Iterator it = compositeFeatureLabelModelFacet.getMetaFeatures().iterator(); it.hasNext(); ) {
+		GenFeature next = (GenFeature) it.next();
+
+    stringBuffer.append(TEXT_439);
+    stringBuffer.append(importManager.getImportedName(next.getGenPackage().getQualifiedPackageInterfaceName()));
+    stringBuffer.append(TEXT_440);
+    stringBuffer.append(next.getFeatureAccessorName());
+    stringBuffer.append(TEXT_441);
+    
+	}
+}
+
+    stringBuffer.append(TEXT_442);
+    stringBuffer.append(importManager.getImportedName("java.util.List"));
+    stringBuffer.append(TEXT_443);
+    stringBuffer.append(importManager.getImportedName("java.util.Collections"));
+    stringBuffer.append(TEXT_444);
     importManager.emitSortedImports();
-    stringBuffer.append(TEXT_294);
+    stringBuffer.append(TEXT_445);
     return stringBuffer.toString();
   }
 }
Index: src-templates/org/eclipse/gmf/codegen/templates/lite/editor/EditorGenerator.java
===================================================================
RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.codegen.lite/src-templates/org/eclipse/gmf/codegen/templates/lite/editor/EditorGenerator.java,v
retrieving revision 1.8
diff -u -r1.8 EditorGenerator.java
--- src-templates/org/eclipse/gmf/codegen/templates/lite/editor/EditorGenerator.java	1 Sep 2006 16:14:08 -0000	1.8
+++ src-templates/org/eclipse/gmf/codegen/templates/lite/editor/EditorGenerator.java	11 Sep 2006 10:18:30 -0000
@@ -69,157 +69,158 @@
   protected final String TEXT_50 = " zoomIn = new ";
   protected final String TEXT_51 = "(getZoomManager());" + NL + "\t\t";
   protected final String TEXT_52 = " zoomOut = new ";
-  protected final String TEXT_53 = "(getZoomManager());" + NL + "\t\taddAction(zoomIn);" + NL + "\t\taddAction(zoomOut);" + NL + "\t\tgetSite().getKeyBindingService().registerAction(zoomIn);" + NL + "\t\tgetSite().getKeyBindingService().registerAction(zoomOut);" + NL + "\t}" + NL;
-  protected final String TEXT_54 = NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tvoid closeEditor() {" + NL + "\t\tgetSite().getShell().getDisplay().syncExec(new Runnable() {" + NL + "\t\t\tpublic void run() {" + NL + "\t\t\t\tgetSite().getPage().closeEditor(";
-  protected final String TEXT_55 = ".this, false);" + NL + "\t\t\t}" + NL + "\t\t});" + NL + "\t}";
-  protected final String TEXT_56 = NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic void dispose() {" + NL + "\t\t// important: always call super implementation of dispose" + NL + "\t\tsuper.dispose();" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic void doSave(";
-  protected final String TEXT_57 = " monitor) {" + NL + "\t\ttry {" + NL + "\t\t\tsave(monitor);" + NL + "\t\t\tgetCommandStack().markSaveLocation();" + NL + "\t\t} catch (";
-  protected final String TEXT_58 = " e) {" + NL + "\t\t\t";
-  protected final String TEXT_59 = ".openError(getSite().getShell(), \"Error During Save\", \"The current ";
-  protected final String TEXT_60 = " model could not be saved.\", e.getStatus());" + NL + "\t\t}" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected void configurePalette(";
-  protected final String TEXT_61 = " paletteRoot) {";
-  protected final String TEXT_62 = NL + "\t\tnew ";
-  protected final String TEXT_63 = "(getDomainAdapterFactory()).contributeToPalette(paletteRoot);";
-  protected final String TEXT_64 = NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic ";
-  protected final String TEXT_65 = " getDiagramRoot() {" + NL + "\t\treturn diagramRoot;" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic ";
-  protected final String TEXT_66 = " getDiagram() {" + NL + "\t\treturn diagram;" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic void init(";
-  protected final String TEXT_67 = " site, ";
-  protected final String TEXT_68 = " input) throws ";
-  protected final String TEXT_69 = " {" + NL + "\t\t";
-  protected final String TEXT_70 = " file = getURIFromInput(input);" + NL + "\t\tif (file == null) {" + NL + "\t\t\tthrow new ";
-  protected final String TEXT_71 = "(\"The specified input is not valid.\");" + NL + "\t\t}" + NL + "\t\tsuper.init(site, input);" + NL + "\t\t// validate" + NL + "\t\tif (getDiagramRoot() == null) {" + NL + "\t\t\tthrow new ";
-  protected final String TEXT_72 = "(\"The specified input is not valid.\");" + NL + "\t\t}" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected void setInput(";
-  protected final String TEXT_73 = " input)  {";
-  protected final String TEXT_74 = NL + "\t\tif (getEditorInput() instanceof ";
-  protected final String TEXT_75 = ") {" + NL + "\t\t\t";
-  protected final String TEXT_76 = " resource = ((";
-  protected final String TEXT_77 = ") getEditorInput()).getFile();" + NL + "\t\t\tresource.getWorkspace().removeResourceChangeListener(getResourceTracker());" + NL + "\t\t}";
-  protected final String TEXT_78 = NL + "\t\t";
-  protected final String TEXT_79 = " file = getURIFromInput(input);" + NL + "\t\tload(file);" + NL + "\t\tsetPartName(file.lastSegment());" + NL + "\t\tsuper.setInput(input);";
-  protected final String TEXT_80 = NL + "\t\tif (getEditorInput() instanceof ";
-  protected final String TEXT_81 = ") {" + NL + "\t\t\t";
-  protected final String TEXT_82 = " resource = ((";
-  protected final String TEXT_83 = ") getEditorInput()).getFile();" + NL + "\t\t\tresource.getWorkspace().addResourceChangeListener(getResourceTracker());" + NL + "\t\t}";
-  protected final String TEXT_84 = NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate ";
-  protected final String TEXT_85 = " getURIFromInput(";
-  protected final String TEXT_86 = " input) {";
-  protected final String TEXT_87 = NL + "\t\tif (input instanceof ";
-  protected final String TEXT_88 = ") {" + NL + "\t\t\treturn ((";
-  protected final String TEXT_89 = ") input).getURI();" + NL + "\t\t}" + NL + "\t\tif (input instanceof ";
-  protected final String TEXT_90 = ") {" + NL + "\t\t\treturn ";
-  protected final String TEXT_91 = ".createFileURI(((IPathEditorInput)input).getPath().toOSString());" + NL + "\t\t}";
-  protected final String TEXT_92 = NL + "\t\tif (input instanceof ";
-  protected final String TEXT_93 = ") {" + NL + "\t\t\treturn ";
-  protected final String TEXT_94 = ".createPlatformResourceURI(((IFileEditorInput)input).getFile().getFullPath().toString());" + NL + "\t\t}";
-  protected final String TEXT_95 = NL + "\t\treturn null;" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected ";
-  protected final String TEXT_96 = " getDomainAdapterFactory() {" + NL + "\t\tif (domainAdapterFactory == null) {" + NL + "\t\t\t";
-  protected final String TEXT_97 = " factories = new ";
-  protected final String TEXT_98 = "();" + NL + "\t\t\tfactories.add(new ";
-  protected final String TEXT_99 = "());";
-  protected final String TEXT_100 = NL + "\t\t\tfactories.add(new ";
-  protected final String TEXT_101 = "());";
-  protected final String TEXT_102 = NL + "\t\t\tfactories.add(new ";
-  protected final String TEXT_103 = "());" + NL + "\t\t\tfactories.add(new ";
-  protected final String TEXT_104 = "());" + NL + "\t\t\tdomainAdapterFactory = new ";
-  protected final String TEXT_105 = "(factories);" + NL + "\t\t}" + NL + "\t\treturn domainAdapterFactory;" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate void load(";
-  protected final String TEXT_106 = " diagramFile) {" + NL + "\t\tdiagramRoot = null;" + NL + "\t\tdiagram = null;" + NL + "\t\tif (diagramFile == null) {" + NL + "\t\t\treturn;" + NL + "\t\t}" + NL + "\t\t";
-  protected final String TEXT_107 = " editingDomain = getEditingDomain();" + NL + "\t\t";
-  protected final String TEXT_108 = " resourceSet = editingDomain.getResourceSet();" + NL + "\t\t";
-  protected final String TEXT_109 = " diagramResource = resourceSet.getResource(diagramFile, true);" + NL + "\t\tif (diagramResource == null) {" + NL + "\t\t\tdiagramResource = resourceSet.createResource(diagramFile);" + NL + "\t\t}" + NL + "\t\tdiagram = (";
-  protected final String TEXT_110 = ") findInResource(diagramResource, ";
-  protected final String TEXT_111 = ".class);" + NL + "\t\tif (diagram == null) {" + NL + "\t\t\tdiagram = ";
-  protected final String TEXT_112 = ".eINSTANCE.createDiagram();" + NL + "\t\t\tdiagramResource.getContents().add(0, diagram);" + NL + "\t\t\t//Auxiliary creation should not be undoable." + NL + "\t\t\ttry {" + NL + "\t\t\t\tdiagramResource.save(";
-  protected final String TEXT_113 = ".EMPTY_MAP);" + NL + "\t\t\t} catch (";
-  protected final String TEXT_114 = " e) {" + NL + "\t\t\t\tdiagram = null;" + NL + "\t\t\t\tdiagramRoot = null;" + NL + "\t\t\t\treturn;" + NL + "\t\t\t}" + NL + "\t\t}" + NL + "\t\tdiagramRoot = (";
-  protected final String TEXT_115 = ") diagram.getElement();" + NL + "\t\tif (diagramRoot == null) {";
-  protected final String TEXT_116 = NL + "\t\t\t";
-  protected final String TEXT_117 = " modelFile = ";
-  protected final String TEXT_118 = ".getModelFileURI(diagramFile);" + NL + "\t\t\t";
-  protected final String TEXT_119 = " modelResource = resourceSet.getResource(modelFile, true);" + NL + "\t\t\tif (modelResource == null) {" + NL + "\t\t\t\tmodelResource = resourceSet.createResource(modelFile);" + NL + "\t\t\t}";
-  protected final String TEXT_120 = NL + "\t\t\tdiagramRoot = (";
-  protected final String TEXT_121 = ") findInResource(";
-  protected final String TEXT_122 = ", ";
-  protected final String TEXT_123 = ".class);" + NL + "\t\t\tif (diagramRoot == null) {" + NL + "\t\t\t\tdiagramRoot = ";
-  protected final String TEXT_124 = ".eINSTANCE.create";
-  protected final String TEXT_125 = "();" + NL + "\t\t\t\t";
-  protected final String TEXT_126 = ".getContents().add(0, diagramRoot);" + NL + "\t\t\t\t//We don't want this auxiliary creation to be undoable." + NL + "\t\t\t\ttry {" + NL + "\t\t\t\t\t";
-  protected final String TEXT_127 = ".save(";
-  protected final String TEXT_128 = ".EMPTY_MAP);" + NL + "\t\t\t\t} catch (";
-  protected final String TEXT_129 = " e) {" + NL + "\t\t\t\t\tdiagram = null;" + NL + "\t\t\t\t\tdiagramRoot = null;" + NL + "\t\t\t\t\treturn;" + NL + "\t\t\t\t}" + NL + "\t\t\t}" + NL + "\t\t\tif (!diagram.isSetElement()) {" + NL + "\t\t\t\tdiagram.setElement(";
-  protected final String TEXT_130 = "(";
-  protected final String TEXT_131 = ") ";
-  protected final String TEXT_132 = "diagramRoot);" + NL + "\t\t\t}" + NL + "\t\t}" + NL + "\t}";
-  protected final String TEXT_133 = NL + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate Object findInResource(";
-  protected final String TEXT_134 = " resource, Class expectedClass) {" + NL + "\t\tfor(";
-  protected final String TEXT_135 = " it = resource.getContents().iterator(); it.hasNext(); ) {" + NL + "\t\t\tObject next = it.next();" + NL + "\t\t\tif (expectedClass.isInstance(next)) {" + NL + "\t\t\t\treturn next;" + NL + "\t\t\t}" + NL + "\t\t}" + NL + "\t\treturn null;" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected void createGraphicalViewer(";
-  protected final String TEXT_136 = " parent) {" + NL + "\t\tsuper.createGraphicalViewer(parent);" + NL + "\t\t// initialize the viewer with input" + NL + "\t\t";
-  protected final String TEXT_137 = " root = new ";
-  protected final String TEXT_138 = "();" + NL + "\t\tgetGraphicalViewer().setRootEditPart(root);" + NL + "\t\tgetGraphicalViewer().setEditPartFactory(new ";
-  protected final String TEXT_139 = "());" + NL + "" + NL + "\t\t";
-  protected final String TEXT_140 = " printableLayers = (";
-  protected final String TEXT_141 = ") root.getLayer(";
-  protected final String TEXT_142 = ".PRINTABLE_LAYERS);" + NL + "\t\t";
-  protected final String TEXT_143 = " extLabelsLayer = new ";
-  protected final String TEXT_144 = "();" + NL + "\t\textLabelsLayer.setLayoutManager(new ";
-  protected final String TEXT_145 = "());" + NL + "\t\tprintableLayers.addLayerAfter(extLabelsLayer, ";
-  protected final String TEXT_146 = ".EXTERNAL_NODE_LABELS_LAYER, ";
-  protected final String TEXT_147 = ".PRIMARY_LAYER);" + NL + "\t\tgetGraphicalViewer().setContents(getDiagram());" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected void configureGraphicalViewer() {" + NL + "\t\tsuper.configureGraphicalViewer();" + NL + "\t\t";
-  protected final String TEXT_148 = " viewer = getGraphicalViewer();" + NL + "\t\t// configure the context menu" + NL + "\t\t";
-  protected final String TEXT_149 = " provider = new ";
-  protected final String TEXT_150 = "ContextMenuProvider(viewer);" + NL + "\t\tviewer.setContextMenu(provider);" + NL + "\t\tgetSite().registerContextMenu(";
-  protected final String TEXT_151 = ".ID + \".editor.contextmenu\", provider, getSite().getSelectionProvider()); //$NON-NLS-1$" + NL + "" + NL + "\t\t";
-  protected final String TEXT_152 = " keyHandler = new ";
-  protected final String TEXT_153 = "(viewer);" + NL + "\t\tkeyHandler.put(";
-  protected final String TEXT_154 = ".getPressed(";
-  protected final String TEXT_155 = ".DEL, 127, 0), getActionRegistry().getAction(";
-  protected final String TEXT_156 = ".DELETE.getId()));" + NL + "\t\tkeyHandler.put(";
-  protected final String TEXT_157 = ".getPressed(";
-  protected final String TEXT_158 = ".F2, 0), getActionRegistry().getAction(";
-  protected final String TEXT_159 = ".DIRECT_EDIT));" + NL + "\t\tviewer.setKeyHandler(keyHandler);" + NL + "" + NL + "\t\tviewer.setProperty(";
-  protected final String TEXT_160 = ".KeyGenerator.getKey(";
-  protected final String TEXT_161 = ".CTRL), ";
-  protected final String TEXT_162 = ".SINGLETON);" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate class ";
-  protected final String TEXT_163 = "ContextMenuProvider extends ";
-  protected final String TEXT_164 = " {" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tpublic ";
-  protected final String TEXT_165 = "ContextMenuProvider(";
-  protected final String TEXT_166 = " viewer) {" + NL + "\t\t\tsuper(viewer);" + NL + "\t\t}" + NL + "" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t    public void buildContextMenu(";
-  protected final String TEXT_167 = " menuManager) {" + NL + "\t        ";
-  protected final String TEXT_168 = ".addStandardActionGroups(menuManager);" + NL + "\t\t\tappendActionToMenu(menuManager, ";
-  protected final String TEXT_169 = ".UNDO.getId(), ";
-  protected final String TEXT_170 = ".GROUP_UNDO);" + NL + "\t\t\tappendActionToMenu(menuManager, ";
-  protected final String TEXT_171 = ".REDO.getId(), ";
-  protected final String TEXT_172 = ".GROUP_UNDO);" + NL + "\t" + NL + "\t\t\tappendActionToMenu(menuManager, ";
-  protected final String TEXT_173 = ".COPY.getId(), ";
-  protected final String TEXT_174 = ".GROUP_EDIT);" + NL + "\t\t\tappendActionToMenu(menuManager, ";
-  protected final String TEXT_175 = ".PASTE.getId(), ";
-  protected final String TEXT_176 = ".GROUP_EDIT);" + NL + "\t\t\tappendActionToMenu(menuManager, ";
-  protected final String TEXT_177 = ".DELETE.getId(), ";
-  protected final String TEXT_178 = ".GROUP_EDIT);" + NL + "\t\t\tappendActionToMenu(menuManager, ";
-  protected final String TEXT_179 = ".DIRECT_EDIT, ";
-  protected final String TEXT_180 = ".GROUP_EDIT);" + NL + "" + NL + "\t\t\tappendActionToMenu(menuManager, ";
-  protected final String TEXT_181 = ".SAVE.getId(), ";
-  protected final String TEXT_182 = ".GROUP_SAVE);" + NL + "" + NL + "\t\t\tappendAlignmentSubmenu(menuManager);" + NL + "\t    }" + NL + "" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tprivate void appendAlignmentSubmenu(";
-  protected final String TEXT_183 = " menuManager) {" + NL + "\t\t\t// Alignment Actions" + NL + "\t\t\t";
-  protected final String TEXT_184 = " submenu = new ";
-  protected final String TEXT_185 = "(\"Align\");" + NL + "\t\t\tsubmenu.add(new ";
-  protected final String TEXT_186 = "(";
-  protected final String TEXT_187 = ".MB_ADDITIONS));" + NL + "\t" + NL + "\t\t\tappendActionToMenu(submenu, ";
-  protected final String TEXT_188 = ".ALIGN_LEFT, ";
-  protected final String TEXT_189 = ".MB_ADDITIONS);" + NL + "\t\t\tappendActionToMenu(submenu, ";
-  protected final String TEXT_190 = ".ALIGN_CENTER, ";
-  protected final String TEXT_191 = ".MB_ADDITIONS);" + NL + "\t\t\tappendActionToMenu(submenu, ";
-  protected final String TEXT_192 = ".ALIGN_RIGHT, ";
-  protected final String TEXT_193 = ".MB_ADDITIONS);" + NL + "\t\t\tappendActionToMenu(submenu, ";
-  protected final String TEXT_194 = ".ALIGN_TOP, ";
-  protected final String TEXT_195 = ".MB_ADDITIONS);" + NL + "\t\t\tappendActionToMenu(submenu, ";
-  protected final String TEXT_196 = ".ALIGN_MIDDLE, ";
-  protected final String TEXT_197 = ".MB_ADDITIONS);" + NL + "\t\t\tappendActionToMenu(submenu, ";
-  protected final String TEXT_198 = ".ALIGN_BOTTOM, ";
-  protected final String TEXT_199 = ".MB_ADDITIONS);" + NL + "\t" + NL + "\t\t\tif (!submenu.isEmpty()) {" + NL + "\t\t\t\tmenuManager.appendToGroup(";
-  protected final String TEXT_200 = ".GROUP_REST, submenu);" + NL + "\t\t\t}" + NL + "\t\t}" + NL + "" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tprivate void appendActionToMenu(";
-  protected final String TEXT_201 = " menu, String actionId, String menuGroup) {" + NL + "\t\t\t";
-  protected final String TEXT_202 = " action = getActionRegistry().getAction(actionId);" + NL + "\t\t\tif (action != null && action.isEnabled()) {" + NL + "\t\t\t\tmenu.appendToGroup(menuGroup, action);" + NL + "\t\t\t}" + NL + "\t\t}" + NL + "\t}" + NL + "}";
-  protected final String TEXT_203 = NL;
+  protected final String TEXT_53 = "(getZoomManager());" + NL + "\t\taddAction(zoomIn);" + NL + "\t\taddAction(zoomOut);" + NL + "\t\tgetSite().getKeyBindingService().registerAction(zoomIn);" + NL + "\t\tgetSite().getKeyBindingService().registerAction(zoomOut);" + NL + "\t\t";
+  protected final String TEXT_54 = " keyHandler = getGraphicalViewer().getKeyHandler();" + NL + "\t\tkeyHandler.put(";
+  protected final String TEXT_55 = ".getPressed(";
+  protected final String TEXT_56 = ".DEL, 127, 0), getActionRegistry().getAction(";
+  protected final String TEXT_57 = ".DELETE.getId()));" + NL + "\t\tkeyHandler.put(";
+  protected final String TEXT_58 = ".getPressed(";
+  protected final String TEXT_59 = ".F2, 0), getActionRegistry().getAction(";
+  protected final String TEXT_60 = ".DIRECT_EDIT));" + NL + "\t}" + NL;
+  protected final String TEXT_61 = NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tvoid closeEditor() {" + NL + "\t\tgetSite().getShell().getDisplay().syncExec(new Runnable() {" + NL + "\t\t\tpublic void run() {" + NL + "\t\t\t\tgetSite().getPage().closeEditor(";
+  protected final String TEXT_62 = ".this, false);" + NL + "\t\t\t}" + NL + "\t\t});" + NL + "\t}";
+  protected final String TEXT_63 = NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic void dispose() {" + NL + "\t\t// important: always call super implementation of dispose" + NL + "\t\tsuper.dispose();" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic void doSave(";
+  protected final String TEXT_64 = " monitor) {" + NL + "\t\ttry {" + NL + "\t\t\tsave(monitor);" + NL + "\t\t\tgetCommandStack().markSaveLocation();" + NL + "\t\t} catch (";
+  protected final String TEXT_65 = " e) {" + NL + "\t\t\t";
+  protected final String TEXT_66 = ".openError(getSite().getShell(), \"Error During Save\", \"The current ";
+  protected final String TEXT_67 = " model could not be saved.\", e.getStatus());" + NL + "\t\t}" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected void configurePalette(";
+  protected final String TEXT_68 = " paletteRoot) {";
+  protected final String TEXT_69 = NL + "\t\tnew ";
+  protected final String TEXT_70 = "(getDomainAdapterFactory()).contributeToPalette(paletteRoot);";
+  protected final String TEXT_71 = NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic ";
+  protected final String TEXT_72 = " getDiagramRoot() {" + NL + "\t\treturn diagramRoot;" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic ";
+  protected final String TEXT_73 = " getDiagram() {" + NL + "\t\treturn diagram;" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic void init(";
+  protected final String TEXT_74 = " site, ";
+  protected final String TEXT_75 = " input) throws ";
+  protected final String TEXT_76 = " {" + NL + "\t\t";
+  protected final String TEXT_77 = " file = getURIFromInput(input);" + NL + "\t\tif (file == null) {" + NL + "\t\t\tthrow new ";
+  protected final String TEXT_78 = "(\"The specified input is not valid.\");" + NL + "\t\t}" + NL + "\t\tsuper.init(site, input);" + NL + "\t\t// validate" + NL + "\t\tif (getDiagramRoot() == null) {" + NL + "\t\t\tthrow new ";
+  protected final String TEXT_79 = "(\"The specified input is not valid.\");" + NL + "\t\t}" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected void setInput(";
+  protected final String TEXT_80 = " input)  {";
+  protected final String TEXT_81 = NL + "\t\tif (getEditorInput() instanceof ";
+  protected final String TEXT_82 = ") {" + NL + "\t\t\t";
+  protected final String TEXT_83 = " resource = ((";
+  protected final String TEXT_84 = ") getEditorInput()).getFile();" + NL + "\t\t\tresource.getWorkspace().removeResourceChangeListener(getResourceTracker());" + NL + "\t\t}";
+  protected final String TEXT_85 = NL + "\t\t";
+  protected final String TEXT_86 = " file = getURIFromInput(input);" + NL + "\t\tload(file);" + NL + "\t\tsetPartName(file.lastSegment());" + NL + "\t\tsuper.setInput(input);";
+  protected final String TEXT_87 = NL + "\t\tif (getEditorInput() instanceof ";
+  protected final String TEXT_88 = ") {" + NL + "\t\t\t";
+  protected final String TEXT_89 = " resource = ((";
+  protected final String TEXT_90 = ") getEditorInput()).getFile();" + NL + "\t\t\tresource.getWorkspace().addResourceChangeListener(getResourceTracker());" + NL + "\t\t}";
+  protected final String TEXT_91 = NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate ";
+  protected final String TEXT_92 = " getURIFromInput(";
+  protected final String TEXT_93 = " input) {";
+  protected final String TEXT_94 = NL + "\t\tif (input instanceof ";
+  protected final String TEXT_95 = ") {" + NL + "\t\t\treturn ((";
+  protected final String TEXT_96 = ") input).getURI();" + NL + "\t\t}" + NL + "\t\tif (input instanceof ";
+  protected final String TEXT_97 = ") {" + NL + "\t\t\treturn ";
+  protected final String TEXT_98 = ".createFileURI(((IPathEditorInput)input).getPath().toOSString());" + NL + "\t\t}";
+  protected final String TEXT_99 = NL + "\t\tif (input instanceof ";
+  protected final String TEXT_100 = ") {" + NL + "\t\t\treturn ";
+  protected final String TEXT_101 = ".createPlatformResourceURI(((IFileEditorInput)input).getFile().getFullPath().toString());" + NL + "\t\t}";
+  protected final String TEXT_102 = NL + "\t\treturn null;" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected ";
+  protected final String TEXT_103 = " getDomainAdapterFactory() {" + NL + "\t\tif (domainAdapterFactory == null) {" + NL + "\t\t\t";
+  protected final String TEXT_104 = " factories = new ";
+  protected final String TEXT_105 = "();" + NL + "\t\t\tfactories.add(new ";
+  protected final String TEXT_106 = "());";
+  protected final String TEXT_107 = NL + "\t\t\tfactories.add(new ";
+  protected final String TEXT_108 = "());";
+  protected final String TEXT_109 = NL + "\t\t\tfactories.add(new ";
+  protected final String TEXT_110 = "());" + NL + "\t\t\tfactories.add(new ";
+  protected final String TEXT_111 = "());" + NL + "\t\t\tdomainAdapterFactory = new ";
+  protected final String TEXT_112 = "(factories);" + NL + "\t\t}" + NL + "\t\treturn domainAdapterFactory;" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate void load(";
+  protected final String TEXT_113 = " diagramFile) {" + NL + "\t\tdiagramRoot = null;" + NL + "\t\tdiagram = null;" + NL + "\t\tif (diagramFile == null) {" + NL + "\t\t\treturn;" + NL + "\t\t}" + NL + "\t\t";
+  protected final String TEXT_114 = " editingDomain = getEditingDomain();" + NL + "\t\t";
+  protected final String TEXT_115 = " resourceSet = editingDomain.getResourceSet();" + NL + "\t\t";
+  protected final String TEXT_116 = " diagramResource = resourceSet.getResource(diagramFile, true);" + NL + "\t\tif (diagramResource == null) {" + NL + "\t\t\tdiagramResource = resourceSet.createResource(diagramFile);" + NL + "\t\t}" + NL + "\t\tdiagram = (";
+  protected final String TEXT_117 = ") findInResource(diagramResource, ";
+  protected final String TEXT_118 = ".class);" + NL + "\t\tif (diagram == null) {" + NL + "\t\t\tdiagram = ";
+  protected final String TEXT_119 = ".eINSTANCE.createDiagram();" + NL + "\t\t\tdiagramResource.getContents().add(0, diagram);" + NL + "\t\t\t//Auxiliary creation should not be undoable." + NL + "\t\t\ttry {" + NL + "\t\t\t\tdiagramResource.save(";
+  protected final String TEXT_120 = ".EMPTY_MAP);" + NL + "\t\t\t} catch (";
+  protected final String TEXT_121 = " e) {" + NL + "\t\t\t\tdiagram = null;" + NL + "\t\t\t\tdiagramRoot = null;" + NL + "\t\t\t\treturn;" + NL + "\t\t\t}" + NL + "\t\t}" + NL + "\t\tdiagramRoot = (";
+  protected final String TEXT_122 = ") diagram.getElement();" + NL + "\t\tif (diagramRoot == null) {";
+  protected final String TEXT_123 = NL + "\t\t\t";
+  protected final String TEXT_124 = " modelFile = ";
+  protected final String TEXT_125 = ".getModelFileURI(diagramFile);" + NL + "\t\t\t";
+  protected final String TEXT_126 = " modelResource = resourceSet.getResource(modelFile, true);" + NL + "\t\t\tif (modelResource == null) {" + NL + "\t\t\t\tmodelResource = resourceSet.createResource(modelFile);" + NL + "\t\t\t}";
+  protected final String TEXT_127 = NL + "\t\t\tdiagramRoot = (";
+  protected final String TEXT_128 = ") findInResource(";
+  protected final String TEXT_129 = ", ";
+  protected final String TEXT_130 = ".class);" + NL + "\t\t\tif (diagramRoot == null) {" + NL + "\t\t\t\tdiagramRoot = ";
+  protected final String TEXT_131 = ".eINSTANCE.create";
+  protected final String TEXT_132 = "();" + NL + "\t\t\t\t";
+  protected final String TEXT_133 = ".getContents().add(0, diagramRoot);" + NL + "\t\t\t\t//We don't want this auxiliary creation to be undoable." + NL + "\t\t\t\ttry {" + NL + "\t\t\t\t\t";
+  protected final String TEXT_134 = ".save(";
+  protected final String TEXT_135 = ".EMPTY_MAP);" + NL + "\t\t\t\t} catch (";
+  protected final String TEXT_136 = " e) {" + NL + "\t\t\t\t\tdiagram = null;" + NL + "\t\t\t\t\tdiagramRoot = null;" + NL + "\t\t\t\t\treturn;" + NL + "\t\t\t\t}" + NL + "\t\t\t}" + NL + "\t\t\tif (!diagram.isSetElement()) {" + NL + "\t\t\t\tdiagram.setElement(";
+  protected final String TEXT_137 = "(";
+  protected final String TEXT_138 = ") ";
+  protected final String TEXT_139 = "diagramRoot);" + NL + "\t\t\t}" + NL + "\t\t}" + NL + "\t}";
+  protected final String TEXT_140 = NL + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate Object findInResource(";
+  protected final String TEXT_141 = " resource, Class expectedClass) {" + NL + "\t\tfor(";
+  protected final String TEXT_142 = " it = resource.getContents().iterator(); it.hasNext(); ) {" + NL + "\t\t\tObject next = it.next();" + NL + "\t\t\tif (expectedClass.isInstance(next)) {" + NL + "\t\t\t\treturn next;" + NL + "\t\t\t}" + NL + "\t\t}" + NL + "\t\treturn null;" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected void createGraphicalViewer(";
+  protected final String TEXT_143 = " parent) {" + NL + "\t\tsuper.createGraphicalViewer(parent);" + NL + "\t\t// initialize the viewer with input" + NL + "\t\t";
+  protected final String TEXT_144 = " root = new ";
+  protected final String TEXT_145 = "();" + NL + "\t\tgetGraphicalViewer().setRootEditPart(root);" + NL + "\t\tgetGraphicalViewer().setEditPartFactory(new ";
+  protected final String TEXT_146 = "());" + NL + "" + NL + "\t\t";
+  protected final String TEXT_147 = " printableLayers = (";
+  protected final String TEXT_148 = ") root.getLayer(";
+  protected final String TEXT_149 = ".PRINTABLE_LAYERS);" + NL + "\t\t";
+  protected final String TEXT_150 = " extLabelsLayer = new ";
+  protected final String TEXT_151 = "();" + NL + "\t\textLabelsLayer.setLayoutManager(new ";
+  protected final String TEXT_152 = "());" + NL + "\t\tprintableLayers.addLayerAfter(extLabelsLayer, ";
+  protected final String TEXT_153 = ".EXTERNAL_NODE_LABELS_LAYER, ";
+  protected final String TEXT_154 = ".PRIMARY_LAYER);" + NL + "\t\tgetGraphicalViewer().setContents(getDiagram());" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected void configureGraphicalViewer() {" + NL + "\t\tsuper.configureGraphicalViewer();" + NL + "\t\t";
+  protected final String TEXT_155 = " viewer = getGraphicalViewer();" + NL + "\t\t// configure the context menu" + NL + "\t\t";
+  protected final String TEXT_156 = " provider = new ";
+  protected final String TEXT_157 = "ContextMenuProvider(viewer);" + NL + "\t\tviewer.setContextMenu(provider);" + NL + "\t\tgetSite().registerContextMenu(";
+  protected final String TEXT_158 = ".ID + \".editor.contextmenu\", provider, getSite().getSelectionProvider()); //$NON-NLS-1$" + NL + "" + NL + "\t\t";
+  protected final String TEXT_159 = " keyHandler = new ";
+  protected final String TEXT_160 = "(viewer);" + NL + "\t\tviewer.setKeyHandler(keyHandler);" + NL + "" + NL + "\t\tviewer.setProperty(";
+  protected final String TEXT_161 = ".KeyGenerator.getKey(";
+  protected final String TEXT_162 = ".CTRL), ";
+  protected final String TEXT_163 = ".SINGLETON);" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate class ";
+  protected final String TEXT_164 = "ContextMenuProvider extends ";
+  protected final String TEXT_165 = " {" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tpublic ";
+  protected final String TEXT_166 = "ContextMenuProvider(";
+  protected final String TEXT_167 = " viewer) {" + NL + "\t\t\tsuper(viewer);" + NL + "\t\t}" + NL + "" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t    public void buildContextMenu(";
+  protected final String TEXT_168 = " menuManager) {" + NL + "\t        ";
+  protected final String TEXT_169 = ".addStandardActionGroups(menuManager);" + NL + "\t\t\tappendActionToMenu(menuManager, ";
+  protected final String TEXT_170 = ".UNDO.getId(), ";
+  protected final String TEXT_171 = ".GROUP_UNDO);" + NL + "\t\t\tappendActionToMenu(menuManager, ";
+  protected final String TEXT_172 = ".REDO.getId(), ";
+  protected final String TEXT_173 = ".GROUP_UNDO);" + NL + "\t" + NL + "\t\t\tappendActionToMenu(menuManager, ";
+  protected final String TEXT_174 = ".COPY.getId(), ";
+  protected final String TEXT_175 = ".GROUP_EDIT);" + NL + "\t\t\tappendActionToMenu(menuManager, ";
+  protected final String TEXT_176 = ".PASTE.getId(), ";
+  protected final String TEXT_177 = ".GROUP_EDIT);" + NL + "\t\t\tappendActionToMenu(menuManager, ";
+  protected final String TEXT_178 = ".DELETE.getId(), ";
+  protected final String TEXT_179 = ".GROUP_EDIT);" + NL + "\t\t\tappendActionToMenu(menuManager, ";
+  protected final String TEXT_180 = ".DIRECT_EDIT, ";
+  protected final String TEXT_181 = ".GROUP_EDIT);" + NL + "" + NL + "\t\t\tappendActionToMenu(menuManager, ";
+  protected final String TEXT_182 = ".SAVE.getId(), ";
+  protected final String TEXT_183 = ".GROUP_SAVE);" + NL + "" + NL + "\t\t\tappendAlignmentSubmenu(menuManager);" + NL + "\t    }" + NL + "" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tprivate void appendAlignmentSubmenu(";
+  protected final String TEXT_184 = " menuManager) {" + NL + "\t\t\t// Alignment Actions" + NL + "\t\t\t";
+  protected final String TEXT_185 = " submenu = new ";
+  protected final String TEXT_186 = "(\"Align\");" + NL + "\t\t\tsubmenu.add(new ";
+  protected final String TEXT_187 = "(";
+  protected final String TEXT_188 = ".MB_ADDITIONS));" + NL + "\t" + NL + "\t\t\tappendActionToMenu(submenu, ";
+  protected final String TEXT_189 = ".ALIGN_LEFT, ";
+  protected final String TEXT_190 = ".MB_ADDITIONS);" + NL + "\t\t\tappendActionToMenu(submenu, ";
+  protected final String TEXT_191 = ".ALIGN_CENTER, ";
+  protected final String TEXT_192 = ".MB_ADDITIONS);" + NL + "\t\t\tappendActionToMenu(submenu, ";
+  protected final String TEXT_193 = ".ALIGN_RIGHT, ";
+  protected final String TEXT_194 = ".MB_ADDITIONS);" + NL + "\t\t\tappendActionToMenu(submenu, ";
+  protected final String TEXT_195 = ".ALIGN_TOP, ";
+  protected final String TEXT_196 = ".MB_ADDITIONS);" + NL + "\t\t\tappendActionToMenu(submenu, ";
+  protected final String TEXT_197 = ".ALIGN_MIDDLE, ";
+  protected final String TEXT_198 = ".MB_ADDITIONS);" + NL + "\t\t\tappendActionToMenu(submenu, ";
+  protected final String TEXT_199 = ".ALIGN_BOTTOM, ";
+  protected final String TEXT_200 = ".MB_ADDITIONS);" + NL + "\t" + NL + "\t\t\tif (!submenu.isEmpty()) {" + NL + "\t\t\t\tmenuManager.appendToGroup(";
+  protected final String TEXT_201 = ".GROUP_REST, submenu);" + NL + "\t\t\t}" + NL + "\t\t}" + NL + "" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tprivate void appendActionToMenu(";
+  protected final String TEXT_202 = " menu, String actionId, String menuGroup) {" + NL + "\t\t\t";
+  protected final String TEXT_203 = " action = getActionRegistry().getAction(actionId);" + NL + "\t\t\tif (action != null && action.isEnabled()) {" + NL + "\t\t\t\tmenu.appendToGroup(menuGroup, action);" + NL + "\t\t\t}" + NL + "\t\t}" + NL + "\t}" + NL + "}";
+  protected final String TEXT_204 = NL;
 
   public String generate(Object argument)
   {
@@ -346,153 +347,167 @@
     stringBuffer.append(TEXT_52);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gef.ui.actions.ZoomOutAction"));
     stringBuffer.append(TEXT_53);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.KeyHandler"));
+    stringBuffer.append(TEXT_54);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.KeyStroke"));
+    stringBuffer.append(TEXT_55);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.swt.SWT"));
+    stringBuffer.append(TEXT_56);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.ui.actions.ActionFactory"));
+    stringBuffer.append(TEXT_57);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.KeyStroke"));
+    stringBuffer.append(TEXT_58);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.swt.SWT"));
+    stringBuffer.append(TEXT_59);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.ui.actions.GEFActionConstants"));
+    stringBuffer.append(TEXT_60);
     
 if (!isRichClientPlatform) {
 
-    stringBuffer.append(TEXT_54);
+    stringBuffer.append(TEXT_61);
     stringBuffer.append(genEditor.getClassName());
-    stringBuffer.append(TEXT_55);
+    stringBuffer.append(TEXT_62);
     
 }
 
-    stringBuffer.append(TEXT_56);
+    stringBuffer.append(TEXT_63);
     stringBuffer.append(importManager.getImportedName("org.eclipse.core.runtime.IProgressMonitor"));
-    stringBuffer.append(TEXT_57);
+    stringBuffer.append(TEXT_64);
     stringBuffer.append(importManager.getImportedName("org.eclipse.core.runtime.CoreException"));
-    stringBuffer.append(TEXT_58);
+    stringBuffer.append(TEXT_65);
     stringBuffer.append(importManager.getImportedName("org.eclipse.jface.dialogs.ErrorDialog"));
-    stringBuffer.append(TEXT_59);
+    stringBuffer.append(TEXT_66);
     stringBuffer.append(genDiagram.getEditorGen().getDomainGenModel().getModelName());
-    stringBuffer.append(TEXT_60);
+    stringBuffer.append(TEXT_67);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gef.palette.PaletteRoot"));
-    stringBuffer.append(TEXT_61);
+    stringBuffer.append(TEXT_68);
     
 {
 	final Palette palette = genDiagram.getPalette();
 	if (palette != null) {
 
-    stringBuffer.append(TEXT_62);
+    stringBuffer.append(TEXT_69);
     stringBuffer.append(importManager.getImportedName(palette.getFactoryQualifiedClassName()));
-    stringBuffer.append(TEXT_63);
+    stringBuffer.append(TEXT_70);
     
 	}
 }
 
-    stringBuffer.append(TEXT_64);
+    stringBuffer.append(TEXT_71);
     stringBuffer.append(importManager.getImportedName(genDiagram.getDomainDiagramElement().getQualifiedInterfaceName()));
-    stringBuffer.append(TEXT_65);
+    stringBuffer.append(TEXT_72);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.Diagram"));
-    stringBuffer.append(TEXT_66);
+    stringBuffer.append(TEXT_73);
     stringBuffer.append(importManager.getImportedName("org.eclipse.ui.IEditorSite"));
-    stringBuffer.append(TEXT_67);
+    stringBuffer.append(TEXT_74);
     stringBuffer.append(importManager.getImportedName("org.eclipse.ui.IEditorInput"));
-    stringBuffer.append(TEXT_68);
+    stringBuffer.append(TEXT_75);
     stringBuffer.append(importManager.getImportedName("org.eclipse.ui.PartInitException"));
-    stringBuffer.append(TEXT_69);
+    stringBuffer.append(TEXT_76);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.util.URI"));
-    stringBuffer.append(TEXT_70);
+    stringBuffer.append(TEXT_77);
     stringBuffer.append(importManager.getImportedName("org.eclipse.ui.PartInitException"));
-    stringBuffer.append(TEXT_71);
+    stringBuffer.append(TEXT_78);
     stringBuffer.append(importManager.getImportedName("org.eclipse.ui.PartInitException"));
-    stringBuffer.append(TEXT_72);
+    stringBuffer.append(TEXT_79);
     stringBuffer.append(importManager.getImportedName("org.eclipse.ui.IEditorInput"));
-    stringBuffer.append(TEXT_73);
+    stringBuffer.append(TEXT_80);
     
 if (!isRichClientPlatform) {
 
-    stringBuffer.append(TEXT_74);
+    stringBuffer.append(TEXT_81);
     stringBuffer.append(importManager.getImportedName("org.eclipse.ui.IFileEditorInput"));
-    stringBuffer.append(TEXT_75);
+    stringBuffer.append(TEXT_82);
     stringBuffer.append(importManager.getImportedName("org.eclipse.core.resources.IFile"));
-    stringBuffer.append(TEXT_76);
+    stringBuffer.append(TEXT_83);
     stringBuffer.append(importManager.getImportedName("org.eclipse.ui.IFileEditorInput"));
-    stringBuffer.append(TEXT_77);
+    stringBuffer.append(TEXT_84);
     
 }
 
-    stringBuffer.append(TEXT_78);
+    stringBuffer.append(TEXT_85);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.util.URI"));
-    stringBuffer.append(TEXT_79);
+    stringBuffer.append(TEXT_86);
     
 if (!isRichClientPlatform) {
 
-    stringBuffer.append(TEXT_80);
+    stringBuffer.append(TEXT_87);
     stringBuffer.append(importManager.getImportedName("org.eclipse.ui.IFileEditorInput"));
-    stringBuffer.append(TEXT_81);
+    stringBuffer.append(TEXT_88);
     stringBuffer.append(importManager.getImportedName("org.eclipse.core.resources.IFile"));
-    stringBuffer.append(TEXT_82);
+    stringBuffer.append(TEXT_89);
     stringBuffer.append(importManager.getImportedName("org.eclipse.ui.IFileEditorInput"));
-    stringBuffer.append(TEXT_83);
+    stringBuffer.append(TEXT_90);
     
 }
 
-    stringBuffer.append(TEXT_84);
+    stringBuffer.append(TEXT_91);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.util.URI"));
-    stringBuffer.append(TEXT_85);
+    stringBuffer.append(TEXT_92);
     stringBuffer.append(importManager.getImportedName("org.eclipse.ui.IEditorInput"));
-    stringBuffer.append(TEXT_86);
+    stringBuffer.append(TEXT_93);
     if (isRichClientPlatform) {
-    stringBuffer.append(TEXT_87);
+    stringBuffer.append(TEXT_94);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.ui.URIEditorInput"));
-    stringBuffer.append(TEXT_88);
+    stringBuffer.append(TEXT_95);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.ui.URIEditorInput"));
-    stringBuffer.append(TEXT_89);
+    stringBuffer.append(TEXT_96);
     stringBuffer.append(importManager.getImportedName("org.eclipse.ui.IPathEditorInput"));
-    stringBuffer.append(TEXT_90);
+    stringBuffer.append(TEXT_97);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.util.URI"));
-    stringBuffer.append(TEXT_91);
+    stringBuffer.append(TEXT_98);
     } else {
-    stringBuffer.append(TEXT_92);
+    stringBuffer.append(TEXT_99);
     stringBuffer.append(importManager.getImportedName("org.eclipse.ui.IFileEditorInput"));
-    stringBuffer.append(TEXT_93);
+    stringBuffer.append(TEXT_100);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.util.URI"));
-    stringBuffer.append(TEXT_94);
+    stringBuffer.append(TEXT_101);
     }
-    stringBuffer.append(TEXT_95);
+    stringBuffer.append(TEXT_102);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.notify.AdapterFactory"));
-    stringBuffer.append(TEXT_96);
+    stringBuffer.append(TEXT_103);
     stringBuffer.append(importManager.getImportedName("java.util.List"));
-    stringBuffer.append(TEXT_97);
+    stringBuffer.append(TEXT_104);
     stringBuffer.append(importManager.getImportedName("java.util.ArrayList"));
-    stringBuffer.append(TEXT_98);
+    stringBuffer.append(TEXT_105);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.edit.provider.resource.ResourceItemProviderAdapterFactory"));
-    stringBuffer.append(TEXT_99);
+    stringBuffer.append(TEXT_106);
     
 final EList genPackages = genDiagram.getEditorGen().getAllDomainGenPackages(true);
 for (int i = 0; i < genPackages.size(); i++) {
 	GenPackage genPackage = (GenPackage) genPackages.get(i);
 
-    stringBuffer.append(TEXT_100);
+    stringBuffer.append(TEXT_107);
     stringBuffer.append(importManager.getImportedName(genPackage.getQualifiedItemProviderAdapterFactoryClassName()));
-    stringBuffer.append(TEXT_101);
+    stringBuffer.append(TEXT_108);
     }
-    stringBuffer.append(TEXT_102);
+    stringBuffer.append(TEXT_109);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.edit.provider.ReflectiveItemProviderAdapterFactory"));
-    stringBuffer.append(TEXT_103);
+    stringBuffer.append(TEXT_110);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.provider.NotationItemProviderAdapterFactory"));
-    stringBuffer.append(TEXT_104);
+    stringBuffer.append(TEXT_111);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.edit.provider.ComposedAdapterFactory"));
-    stringBuffer.append(TEXT_105);
+    stringBuffer.append(TEXT_112);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.util.URI"));
-    stringBuffer.append(TEXT_106);
+    stringBuffer.append(TEXT_113);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.TransactionalEditingDomain"));
-    stringBuffer.append(TEXT_107);
+    stringBuffer.append(TEXT_114);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.resource.ResourceSet"));
-    stringBuffer.append(TEXT_108);
+    stringBuffer.append(TEXT_115);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.resource.Resource"));
-    stringBuffer.append(TEXT_109);
+    stringBuffer.append(TEXT_116);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.Diagram"));
-    stringBuffer.append(TEXT_110);
+    stringBuffer.append(TEXT_117);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.Diagram"));
-    stringBuffer.append(TEXT_111);
+    stringBuffer.append(TEXT_118);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.NotationFactory"));
-    stringBuffer.append(TEXT_112);
+    stringBuffer.append(TEXT_119);
     stringBuffer.append(importManager.getImportedName("java.util.Collections"));
-    stringBuffer.append(TEXT_113);
+    stringBuffer.append(TEXT_120);
     stringBuffer.append(importManager.getImportedName("java.io.IOException"));
-    stringBuffer.append(TEXT_114);
+    stringBuffer.append(TEXT_121);
     stringBuffer.append(importManager.getImportedName(genDiagram.getDomainDiagramElement().getQualifiedInterfaceName()));
-    stringBuffer.append(TEXT_115);
+    stringBuffer.append(TEXT_122);
     
 {
 
@@ -501,155 +516,141 @@
 	String resourceToUse;
 	if (!sameFile) {
 
-    stringBuffer.append(TEXT_116);
+    stringBuffer.append(TEXT_123);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.util.URI"));
-    stringBuffer.append(TEXT_117);
+    stringBuffer.append(TEXT_124);
     stringBuffer.append(genDiagram.getDiagramEditorUtilClassName());
-    stringBuffer.append(TEXT_118);
+    stringBuffer.append(TEXT_125);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.resource.Resource"));
-    stringBuffer.append(TEXT_119);
+    stringBuffer.append(TEXT_126);
     
 		resourceToUse = "modelResource";
 	} else {
 		resourceToUse = "diagramResource";
 	}
 
-    stringBuffer.append(TEXT_120);
+    stringBuffer.append(TEXT_127);
     stringBuffer.append(importManager.getImportedName(genDiagram.getDomainDiagramElement().getQualifiedInterfaceName()));
-    stringBuffer.append(TEXT_121);
+    stringBuffer.append(TEXT_128);
     stringBuffer.append(resourceToUse);
-    stringBuffer.append(TEXT_122);
+    stringBuffer.append(TEXT_129);
     stringBuffer.append(importManager.getImportedName(genDiagram.getDomainDiagramElement().getQualifiedInterfaceName()));
-    stringBuffer.append(TEXT_123);
+    stringBuffer.append(TEXT_130);
     stringBuffer.append(importManager.getImportedName(genDiagram.getDomainDiagramElement().getGenPackage().getQualifiedFactoryClassName()));
-    stringBuffer.append(TEXT_124);
+    stringBuffer.append(TEXT_131);
     stringBuffer.append(genDiagram.getDomainDiagramElement().getClassifierAccessorName());
-    stringBuffer.append(TEXT_125);
+    stringBuffer.append(TEXT_132);
     stringBuffer.append(resourceToUse);
-    stringBuffer.append(TEXT_126);
+    stringBuffer.append(TEXT_133);
     stringBuffer.append(resourceToUse);
-    stringBuffer.append(TEXT_127);
+    stringBuffer.append(TEXT_134);
     stringBuffer.append(importManager.getImportedName("java.util.Collections"));
-    stringBuffer.append(TEXT_128);
+    stringBuffer.append(TEXT_135);
     stringBuffer.append(importManager.getImportedName("java.io.IOException"));
-    stringBuffer.append(TEXT_129);
+    stringBuffer.append(TEXT_136);
     if (genDiagram.getDomainDiagramElement().isExternalInterface()) {
-    stringBuffer.append(TEXT_130);
+    stringBuffer.append(TEXT_137);
     stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EObject"));
-    stringBuffer.append(TEXT_131);
+    stringBuffer.append(TEXT_138);
     }
-    stringBuffer.append(TEXT_132);
+    stringBuffer.append(TEXT_139);
     
 }
 
-    stringBuffer.append(TEXT_133);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.resource.Resource"));
-    stringBuffer.append(TEXT_134);
-    stringBuffer.append(importManager.getImportedName("java.util.Iterator"));
-    stringBuffer.append(TEXT_135);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.swt.widgets.Composite"));
-    stringBuffer.append(TEXT_136);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.editparts.ScalableFreeformRootEditPart"));
-    stringBuffer.append(TEXT_137);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.editparts.ScalableFreeformRootEditPart"));
-    stringBuffer.append(TEXT_138);
-    stringBuffer.append(importManager.getImportedName(genDiagram.getEditPartFactoryQualifiedClassName()));
-    stringBuffer.append(TEXT_139);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.LayeredPane"));
     stringBuffer.append(TEXT_140);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.LayeredPane"));
+    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.resource.Resource"));
     stringBuffer.append(TEXT_141);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.LayerConstants"));
+    stringBuffer.append(importManager.getImportedName("java.util.Iterator"));
     stringBuffer.append(TEXT_142);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.FreeformLayer"));
+    stringBuffer.append(importManager.getImportedName("org.eclipse.swt.widgets.Composite"));
     stringBuffer.append(TEXT_143);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.FreeformLayer"));
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.editparts.ScalableFreeformRootEditPart"));
     stringBuffer.append(TEXT_144);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.DelegatingLayout"));
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.editparts.ScalableFreeformRootEditPart"));
     stringBuffer.append(TEXT_145);
     stringBuffer.append(importManager.getImportedName(genDiagram.getEditPartFactoryQualifiedClassName()));
     stringBuffer.append(TEXT_146);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.LayerConstants"));
+    stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.LayeredPane"));
     stringBuffer.append(TEXT_147);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.GraphicalViewer"));
+    stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.LayeredPane"));
     stringBuffer.append(TEXT_148);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.ContextMenuProvider"));
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.LayerConstants"));
     stringBuffer.append(TEXT_149);
-    stringBuffer.append(genEditor.getClassName());
+    stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.FreeformLayer"));
     stringBuffer.append(TEXT_150);
-    stringBuffer.append(importManager.getImportedName(genDiagram.getEditorGen().getPlugin().getActivatorQualifiedClassName()));
+    stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.FreeformLayer"));
     stringBuffer.append(TEXT_151);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.KeyHandler"));
+    stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.DelegatingLayout"));
     stringBuffer.append(TEXT_152);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.ui.parts.GraphicalViewerKeyHandler"));
+    stringBuffer.append(importManager.getImportedName(genDiagram.getEditPartFactoryQualifiedClassName()));
     stringBuffer.append(TEXT_153);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.KeyStroke"));
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.LayerConstants"));
     stringBuffer.append(TEXT_154);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.swt.SWT"));
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.GraphicalViewer"));
     stringBuffer.append(TEXT_155);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.ui.actions.ActionFactory"));
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.ContextMenuProvider"));
     stringBuffer.append(TEXT_156);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.KeyStroke"));
+    stringBuffer.append(genEditor.getClassName());
     stringBuffer.append(TEXT_157);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.swt.SWT"));
+    stringBuffer.append(importManager.getImportedName(genDiagram.getEditorGen().getPlugin().getActivatorQualifiedClassName()));
     stringBuffer.append(TEXT_158);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.ui.actions.GEFActionConstants"));
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.KeyHandler"));
     stringBuffer.append(TEXT_159);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.MouseWheelHandler"));
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.ui.parts.GraphicalViewerKeyHandler"));
     stringBuffer.append(TEXT_160);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.swt.SWT"));
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.MouseWheelHandler"));
     stringBuffer.append(TEXT_161);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.MouseWheelZoomHandler"));
+    stringBuffer.append(importManager.getImportedName("org.eclipse.swt.SWT"));
     stringBuffer.append(TEXT_162);
-    stringBuffer.append(genEditor.getClassName());
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.MouseWheelZoomHandler"));
     stringBuffer.append(TEXT_163);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.ContextMenuProvider"));
-    stringBuffer.append(TEXT_164);
     stringBuffer.append(genEditor.getClassName());
+    stringBuffer.append(TEXT_164);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.ContextMenuProvider"));
     stringBuffer.append(TEXT_165);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.EditPartViewer"));
+    stringBuffer.append(genEditor.getClassName());
     stringBuffer.append(TEXT_166);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.jface.action.IMenuManager"));
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.EditPartViewer"));
     stringBuffer.append(TEXT_167);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.ui.actions.GEFActionConstants"));
+    stringBuffer.append(importManager.getImportedName("org.eclipse.jface.action.IMenuManager"));
     stringBuffer.append(TEXT_168);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.ui.actions.ActionFactory"));
-    stringBuffer.append(TEXT_169);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gef.ui.actions.GEFActionConstants"));
-    stringBuffer.append(TEXT_170);
+    stringBuffer.append(TEXT_169);
     stringBuffer.append(importManager.getImportedName("org.eclipse.ui.actions.ActionFactory"));
-    stringBuffer.append(TEXT_171);
+    stringBuffer.append(TEXT_170);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gef.ui.actions.GEFActionConstants"));
-    stringBuffer.append(TEXT_172);
+    stringBuffer.append(TEXT_171);
     stringBuffer.append(importManager.getImportedName("org.eclipse.ui.actions.ActionFactory"));
-    stringBuffer.append(TEXT_173);
+    stringBuffer.append(TEXT_172);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gef.ui.actions.GEFActionConstants"));
-    stringBuffer.append(TEXT_174);
+    stringBuffer.append(TEXT_173);
     stringBuffer.append(importManager.getImportedName("org.eclipse.ui.actions.ActionFactory"));
-    stringBuffer.append(TEXT_175);
+    stringBuffer.append(TEXT_174);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gef.ui.actions.GEFActionConstants"));
-    stringBuffer.append(TEXT_176);
+    stringBuffer.append(TEXT_175);
     stringBuffer.append(importManager.getImportedName("org.eclipse.ui.actions.ActionFactory"));
-    stringBuffer.append(TEXT_177);
+    stringBuffer.append(TEXT_176);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gef.ui.actions.GEFActionConstants"));
+    stringBuffer.append(TEXT_177);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.ui.actions.ActionFactory"));
     stringBuffer.append(TEXT_178);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gef.ui.actions.GEFActionConstants"));
     stringBuffer.append(TEXT_179);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gef.ui.actions.GEFActionConstants"));
     stringBuffer.append(TEXT_180);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.ui.actions.ActionFactory"));
-    stringBuffer.append(TEXT_181);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gef.ui.actions.GEFActionConstants"));
+    stringBuffer.append(TEXT_181);
+    stringBuffer.append(importManager.getImportedName("org.eclipse.ui.actions.ActionFactory"));
     stringBuffer.append(TEXT_182);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.jface.action.IMenuManager"));
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.ui.actions.GEFActionConstants"));
     stringBuffer.append(TEXT_183);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.jface.action.MenuManager"));
+    stringBuffer.append(importManager.getImportedName("org.eclipse.jface.action.IMenuManager"));
     stringBuffer.append(TEXT_184);
     stringBuffer.append(importManager.getImportedName("org.eclipse.jface.action.MenuManager"));
     stringBuffer.append(TEXT_185);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.jface.action.Separator"));
+    stringBuffer.append(importManager.getImportedName("org.eclipse.jface.action.MenuManager"));
     stringBuffer.append(TEXT_186);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.ui.actions.GEFActionConstants"));
+    stringBuffer.append(importManager.getImportedName("org.eclipse.jface.action.Separator"));
     stringBuffer.append(TEXT_187);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gef.ui.actions.GEFActionConstants"));
     stringBuffer.append(TEXT_188);
@@ -677,12 +678,14 @@
     stringBuffer.append(TEXT_199);
     stringBuffer.append(importManager.getImportedName("org.eclipse.gef.ui.actions.GEFActionConstants"));
     stringBuffer.append(TEXT_200);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.jface.action.IMenuManager"));
+    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.ui.actions.GEFActionConstants"));
     stringBuffer.append(TEXT_201);
-    stringBuffer.append(importManager.getImportedName("org.eclipse.jface.action.IAction"));
+    stringBuffer.append(importManager.getImportedName("org.eclipse.jface.action.IMenuManager"));
     stringBuffer.append(TEXT_202);
-    importManager.emitSortedImports();
+    stringBuffer.append(importManager.getImportedName("org.eclipse.jface.action.IAction"));
     stringBuffer.append(TEXT_203);
+    importManager.emitSortedImports();
+    stringBuffer.append(TEXT_204);
     return stringBuffer.toString();
   }
 }
Index: templates/parts/directEditCommand.jetinc
===================================================================
RCS file: templates/parts/directEditCommand.jetinc
diff -N templates/parts/directEditCommand.jetinc
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ templates/parts/directEditCommand.jetinc	1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,102 @@
+					protected <%=importManager.getImportedName("org.eclipse.gef.commands.Command")%> getDirectEditCommand(<%=importManager.getImportedName("org.eclipse.gef.requests.DirectEditRequest")%> request) {
+						String value = (String) request.getCellEditor().getValue();
+						if (value == null) {
+							//Invalid value is transformed into a null by the validator.
+							//XXX: implement validator
+							return <%=importManager.getImportedName("org.eclipse.gef.commands.UnexecutableCommand")%>.INSTANCE;
+						}
+						final Object[] parseResult;
+						try {
+							parseResult = new <%=importManager.getImportedName("java.text.MessageFormat")%>(<%=editPatternCode%>).parse(value);
+						} catch (IllegalArgumentException e) {
+							return <%=importManager.getImportedName("org.eclipse.gef.commands.UnexecutableCommand")%>.INSTANCE;
+						} catch (<%=importManager.getImportedName("java.text.ParseException")%> e) {
+							return <%=importManager.getImportedName("org.eclipse.gef.commands.UnexecutableCommand")%>.INSTANCE;
+						}
+						<%=importManager.getImportedName("org.eclipse.emf.transaction.TransactionalEditingDomain")%> editingDomain = <%=importManager.getImportedName("org.eclipse.emf.transaction.util.TransactionUtil")%>.getEditingDomain(<%=primaryView%>.getDiagram().getElement());
+<%
+if (labelModelFacet instanceof FeatureLabelModelFacet) {
+	GenFeature featureToSet = ((FeatureLabelModelFacet)labelModelFacet).getMetaFeature();
+	EStructuralFeature ecoreFeature = featureToSet.getEcoreFeature();
+%>
+						if (parseResult.length != 1) {
+							return <%=importManager.getImportedName("org.eclipse.gef.commands.UnexecutableCommand")%>.INSTANCE;
+						}
+						<%=importManager.getImportedName("org.eclipse.emf.common.command.Command")%> domainModelCommand = createDomainModelCommand(editingDomain, parseResult[0]);
+						return new <%=importManager.getImportedName("org.eclipse.gmf.runtime.lite.commands.WrappingCommand")%>(editingDomain, domainModelCommand);
+					}
+					<%=importManager.getImportedName("org.eclipse.emf.common.command.Command")%> createDomainModelCommand(<%=importManager.getImportedName("org.eclipse.emf.transaction.TransactionalEditingDomain")%> editingDomain, Object value) {
+						<%=importManager.getImportedName(underlyingMetaClass.getQualifiedInterfaceName())%> element = <%=resolvedSemanticElement%>;
+						<%=importManager.getImportedName("org.eclipse.emf.ecore.EAttribute")%> feature = (<%=importManager.getImportedName("org.eclipse.emf.ecore.EAttribute")%>) <%=importManager.getImportedName(featureToSet.getGenPackage().getQualifiedPackageInterfaceName())%>.eINSTANCE.get<%=featureToSet.getFeatureAccessorName()%>();
+						Object valueToSet;
+						try {
+							valueToSet = <%=importManager.getImportedName("org.eclipse.gmf.runtime.lite.services.ParserUtil")%>.parseValue(feature, value);
+						} catch (IllegalArgumentException e) {
+							return <%=importManager.getImportedName("org.eclipse.emf.common.command.UnexecutableCommand")%>.INSTANCE;
+						}
+<%
+	if (ecoreFeature.isMany()) {
+%>
+						<%=importManager.getImportedName("org.eclipse.emf.common.command.CompoundCommand")%> result = new <%=importManager.getImportedName("org.eclipse.emf.common.command.CompoundCommand")%>();
+						<%=importManager.getImportedName("org.eclipse.emf.common.util.EList")%> values = new <%=importManager.getImportedName("org.eclipse.emf.common.util.BasicEList")%>();
+						values.addAll(element.get<%=featureToSet.getAccessorName()%>());
+						result.append(<%=importManager.getImportedName("org.eclipse.emf.edit.command.RemoveCommand")%>.create(editingDomain, element, feature, values));
+						result.append(<%=importManager.getImportedName("org.eclipse.emf.edit.command.AddCommand")%>.create(editingDomain, element, feature, valueToSet));
+						return result;
+<%
+	} else {
+%>
+						return <%=importManager.getImportedName("org.eclipse.emf.edit.command.SetCommand")%>.create(editingDomain, element, feature, valueToSet);
+<%
+	}
+%>
+					}
+<%
+} else if (labelModelFacet instanceof CompositeFeatureLabelModelFacet) {
+	CompositeFeatureLabelModelFacet compositeFeatureLabelModelFacet = (CompositeFeatureLabelModelFacet) labelModelFacet;
+	List metaFeatures = compositeFeatureLabelModelFacet.getMetaFeatures();
+%>
+						if (parseResult.length != <%=metaFeatures.size()%>) {
+							return <%=importManager.getImportedName("org.eclipse.gef.commands.UnexecutableCommand")%>.INSTANCE;
+						}
+						<%=importManager.getImportedName("org.eclipse.emf.common.command.Command")%> domainModelCommand = createDomainModelCommand(editingDomain, parseResult);
+						return new <%=importManager.getImportedName("org.eclipse.gmf.runtime.lite.commands.WrappingCommand")%>(editingDomain, domainModelCommand);
+					}
+					<%=importManager.getImportedName("org.eclipse.emf.common.command.Command")%> createDomainModelCommand(<%=importManager.getImportedName("org.eclipse.emf.transaction.TransactionalEditingDomain")%> editingDomain, Object[] values) {
+						<%=importManager.getImportedName(underlyingMetaClass.getQualifiedInterfaceName())%> element = <%=resolvedSemanticElement%>;
+						<%=importManager.getImportedName("org.eclipse.emf.common.command.CompoundCommand")%> result = new <%=importManager.getImportedName("org.eclipse.emf.common.command.CompoundCommand")%>();
+						Object valueToSet;
+<%
+	boolean haveDeclaredValues = false;
+	for(int i = 0; i < metaFeatures.size(); i++) {
+		GenFeature nextFeatureToSet = (GenFeature) metaFeatures.get(i);
+		EStructuralFeature nextEcoreFeature = nextFeatureToSet.getEcoreFeature();
+%>
+						<%if (i == 0) {%><%=importManager.getImportedName("org.eclipse.emf.ecore.EAttribute")%> <%}%>feature = (<%=importManager.getImportedName("org.eclipse.emf.ecore.EAttribute")%>) <%=importManager.getImportedName(nextFeatureToSet.getGenPackage().getQualifiedPackageInterfaceName())%>.eINSTANCE.get<%=nextFeatureToSet.getFeatureAccessorName()%>();
+						try {
+							valueToSet = <%=importManager.getImportedName("org.eclipse.gmf.runtime.lite.services.ParserUtil")%>.parseValue(feature, values[<%=i%>]);
+						} catch (IllegalArgumentException e) {
+							return <%=importManager.getImportedName("org.eclipse.emf.common.command.UnexecutableCommand")%>.INSTANCE;
+						}
+<%
+		if (nextEcoreFeature.isMany()) {
+%>
+						<%if (!haveDeclaredValues) { haveDeclaredValues = true;%><%=importManager.getImportedName("org.eclipse.emf.common.util.EList")%> <%}%>values = new <%=importManager.getImportedName("org.eclipse.emf.common.util.BasicEList")%>();
+						values.addAll(element.get<%=nextFeatureToSet.getAccessorName()%>());
+						result.append(<%=importManager.getImportedName("org.eclipse.emf.edit.command.RemoveCommand")%>.create(editingDomain, element, feature, values));
+						result.append(<%=importManager.getImportedName("org.eclipse.emf.edit.command.AddCommand")%>.create(editingDomain, element, feature, valueToSet));
+<%
+		} else {
+%>
+						result.append(<%=importManager.getImportedName("org.eclipse.emf.edit.command.SetCommand")%>.create(editingDomain, element, feature, valueToSet));
+<%
+		}
+%>
+<%
+	}
+%>
+						return result;
+					}
+<%
+}
+%>
Index: templates/parts/treeDirectEditPolicy.jetinc
===================================================================
RCS file: templates/parts/treeDirectEditPolicy.jetinc
diff -N templates/parts/treeDirectEditPolicy.jetinc
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ templates/parts/treeDirectEditPolicy.jetinc	1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,8 @@
+		installEditPolicy(<%=importManager.getImportedName("org.eclipse.gef.EditPolicy")%>.DIRECT_EDIT_ROLE,
+				new <%=importManager.getImportedName("org.eclipse.gef.editpolicies.DirectEditPolicy")%>() {
+					protected void showCurrentEditValue(<%=importManager.getImportedName("org.eclipse.gef.requests.DirectEditRequest")%> request) {
+						String value = (String) request.getCellEditor().getValue();
+						setWidgetText(value);
+					}
+<%@ include file="directEditCommand.jetinc" %>
+				});
Index: templates/parts/treeDirectEdit.jetinc
===================================================================
RCS file: templates/parts/treeDirectEdit.jetinc
diff -N templates/parts/treeDirectEdit.jetinc
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ templates/parts/treeDirectEdit.jetinc	1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,44 @@
+	/**
+	 * @generated
+	 */
+	private <%=importManager.getImportedName("org.eclipse.gmf.runtime.lite.services.TreeDirectEditManager")%> manager;
+
+	/**
+	 * @generated
+	 */
+	public void performRequest(<%=importManager.getImportedName("org.eclipse.gef.Request")%> req) {
+		if (<%=importManager.getImportedName("org.eclipse.gef.RequestConstants")%>.REQ_DIRECT_EDIT == req.getType()) {
+			performDirectEdit();
+		} else {
+			super.performRequest(req);
+		}
+	}
+
+	/**
+	 * @generated
+	 */
+	protected <%=importManager.getImportedName("org.eclipse.gmf.runtime.lite.services.TreeDirectEditManager")%> getManager() {
+		if (manager == null) {
+			manager = new <%=importManager.getImportedName("org.eclipse.gmf.runtime.lite.services.TreeDirectEditManager")%>(this, <%=importManager.getImportedName("org.eclipse.jface.viewers.TextCellEditor")%>.class, new <%=importManager.getImportedName("org.eclipse.gef.tools.CellEditorLocator")%>() {
+				public void relocate(<%=importManager.getImportedName("org.eclipse.jface.viewers.CellEditor")%> celleditor) {
+					if (checkTreeItem()) {
+						celleditor.getControl().setFont(((<%=importManager.getImportedName("org.eclipse.swt.widgets.TreeItem")%>) getWidget()).getFont());
+						celleditor.getControl().setBounds(((<%=importManager.getImportedName("org.eclipse.swt.widgets.TreeItem")%>) getWidget()).getBounds());
+					}
+				}
+			}) {
+				protected void initCellEditor() {
+					getCellEditor().setValue(getEditText());
+				}
+			};
+		}
+		return manager;
+	}
+
+	/**
+	 * @generated
+	 */
+	protected void performDirectEdit() {
+		getManager().show();
+	}
+
#P org.eclipse.gmf.tests.lite
Index: models/library/library.genmodel
===================================================================
RCS file: /cvsroot/technology/org.eclipse.gmf/tests/org.eclipse.gmf.tests.lite/models/library/library.genmodel,v
retrieving revision 1.2
diff -u -r1.2 library.genmodel
--- models/library/library.genmodel	6 Sep 2006 20:09:18 -0000	1.2
+++ models/library/library.genmodel	11 Sep 2006 10:18:38 -0000
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <genmodel:GenModel xmi:version="2.0"
     xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
-    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/library/src"
-    modelPluginID="library" modelName="Library" importerID="org.eclipse.emf.importer.ecore">
+    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/library_constrained/src"
+    editDirectory="/library_constrained.edit/src" editorDirectory="/library_constrained.editor/src"
+    modelPluginID="library_constrained" modelName="Library" importerID="org.eclipse.emf.importer.ecore">
   <foreignModel>library.ecore</foreignModel>
   <genPackages prefix="Library" basePackage="org.eclipse.example" disposableProviderFactory="true"
       ecorePackage="library.ecore#/">
#P org.eclipse.gmf.runtime.lite
Index: META-INF/MANIFEST.MF
===================================================================
RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.runtime.lite/META-INF/MANIFEST.MF,v
retrieving revision 1.2
diff -u -r1.2 MANIFEST.MF
--- META-INF/MANIFEST.MF	1 Sep 2006 17:47:46 -0000	1.2
+++ META-INF/MANIFEST.MF	11 Sep 2006 10:18:39 -0000
@@ -19,6 +19,7 @@
 Eclipse-LazyStart: true
 Bundle-Vendor: %providerName
 Export-Package: org.eclipse.gmf.runtime.lite.commands,
+ org.eclipse.gmf.runtime.lite.edit.parts.tree,
  org.eclipse.gmf.runtime.lite.edit.parts.update,
  org.eclipse.gmf.runtime.lite.edit.parts.update.canonical,
  org.eclipse.gmf.runtime.lite.edit.policies,
Index: src/org/eclipse/gmf/runtime/lite/parts/DiagramEditor.java
===================================================================
RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.runtime.lite/src/org/eclipse/gmf/runtime/lite/parts/DiagramEditor.java,v
retrieving revision 1.1
diff -u -r1.1 DiagramEditor.java
--- src/org/eclipse/gmf/runtime/lite/parts/DiagramEditor.java	1 Sep 2006 16:14:12 -0000	1.1
+++ src/org/eclipse/gmf/runtime/lite/parts/DiagramEditor.java	11 Sep 2006 10:18:39 -0000
@@ -29,23 +29,31 @@
 import org.eclipse.emf.workspace.WorkspaceEditingDomainFactory;
 import org.eclipse.gef.DefaultEditDomain;
 import org.eclipse.gef.GraphicalViewer;
+import org.eclipse.gef.KeyHandler;
+import org.eclipse.gef.KeyStroke;
 import org.eclipse.gef.RootEditPart;
 import org.eclipse.gef.commands.CommandStack;
 import org.eclipse.gef.commands.CommandStackListener;
+import org.eclipse.gef.editparts.RootTreeEditPart;
 import org.eclipse.gef.editparts.ScalableFreeformRootEditPart;
 import org.eclipse.gef.editparts.ScalableRootEditPart;
 import org.eclipse.gef.editparts.ZoomManager;
 import org.eclipse.gef.palette.PaletteRoot;
+import org.eclipse.gef.ui.actions.GEFActionConstants;
 import org.eclipse.gef.ui.actions.SelectionAction;
 import org.eclipse.gef.ui.actions.StackAction;
 import org.eclipse.gef.ui.actions.UpdateAction;
 import org.eclipse.gef.ui.actions.WorkbenchPartAction;
+import org.eclipse.gef.ui.parts.ContentOutlinePage;
 import org.eclipse.gef.ui.parts.GraphicalEditorWithFlyoutPalette;
+import org.eclipse.gef.ui.parts.TreeViewer;
 import org.eclipse.gmf.internal.runtime.lite.Activator;
+import org.eclipse.gmf.runtime.lite.edit.parts.tree.DiagramTreeEditPartFactory;
 import org.eclipse.gmf.runtime.lite.properties.PropertySourceProvider;
 import org.eclipse.gmf.runtime.lite.properties.UndoablePropertySheetEntry;
 import org.eclipse.jface.action.IAction;
 import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.ui.IEditorInput;
 import org.eclipse.ui.IEditorPart;
@@ -53,6 +61,7 @@
 import org.eclipse.ui.ISelectionListener;
 import org.eclipse.ui.IWorkbenchPart;
 import org.eclipse.ui.PartInitException;
+import org.eclipse.ui.actions.ActionFactory;
 import org.eclipse.ui.views.contentoutline.IContentOutlinePage;
 import org.eclipse.ui.views.properties.IPropertySheetPage;
 import org.eclipse.ui.views.properties.PropertySheetPage;
@@ -200,7 +209,7 @@
 		try {
 			for(Iterator it = getEditingDomain().getResourceSet().getResources().iterator(); it.hasNext(); ) {
 				Resource next = (Resource)it.next();
-				if (next.isLoaded() && next.isModified()) {
+				if (next.isLoaded() && (next.isModified() || !next.isTrackingModification())) {
 					next.save(Collections.EMPTY_MAP);
 				}
 				progressMonitor.worked(1);
@@ -264,8 +273,27 @@
 	}
 
 	protected IContentOutlinePage getOutlinePage() {
-		//TODO: outline page missing
-		return null;
+		final TreeViewer treeViewer = new TreeViewer();
+		treeViewer.setRootEditPart(new RootTreeEditPart());
+		treeViewer.setEditDomain(getEditDomain());
+		treeViewer.setEditPartFactory(new DiagramTreeEditPartFactory(getGraphicalViewer()));
+		getSelectionSynchronizer().addViewer(treeViewer);
+		configureTreeViewer(treeViewer);
+		return new ContentOutlinePage(treeViewer) {
+			public void createControl(Composite parent) {
+				super.createControl(parent);
+				treeViewer.setContents(getGraphicalViewer().getContents().getModel());
+			}
+		};
+	}
+
+	protected void configureTreeViewer(TreeViewer treeViewer) {
+		KeyHandler keyHandler = new KeyHandler();
+		keyHandler.put(KeyStroke.getPressed(SWT.DEL, 127, 0),
+				getActionRegistry().getAction(ActionFactory.DELETE.getId()));
+		keyHandler.put(KeyStroke.getPressed(SWT.F2, 0), getActionRegistry()
+				.getAction(GEFActionConstants.DIRECT_EDIT));
+		treeViewer.setKeyHandler(keyHandler);
 	}
 
 	protected PropertySheetPage getPropertySheetPage() {
Index: src/org/eclipse/gmf/runtime/lite/edit/parts/update/UpdateManager.java
===================================================================
RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.runtime.lite/src/org/eclipse/gmf/runtime/lite/edit/parts/update/UpdateManager.java,v
retrieving revision 1.1
diff -u -r1.1 UpdateManager.java
--- src/org/eclipse/gmf/runtime/lite/edit/parts/update/UpdateManager.java	1 Sep 2006 16:14:11 -0000	1.1
+++ src/org/eclipse/gmf/runtime/lite/edit/parts/update/UpdateManager.java	11 Sep 2006 10:18:39 -0000
@@ -60,9 +60,13 @@
 	}
 
 	private View getView(EObject offspring) {
-		while (offspring != null && offspring instanceof View == false) {
+		while (offspring != null && offspring instanceof View == false || isFiltered((View) offspring)) {
 			offspring = offspring.eContainer();
 		}
 		return (View) offspring;
 	}
+
+	protected boolean isFiltered(View view) {
+		return myViewer.getEditPartRegistry().get(view) == null;
+	}
 }
Index: src/org/eclipse/gmf/runtime/lite/edit/parts/tree/DiagramTreeEditPartFactory.java
===================================================================
RCS file: src/org/eclipse/gmf/runtime/lite/edit/parts/tree/DiagramTreeEditPartFactory.java
diff -N src/org/eclipse/gmf/runtime/lite/edit/parts/tree/DiagramTreeEditPartFactory.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ src/org/eclipse/gmf/runtime/lite/edit/parts/tree/DiagramTreeEditPartFactory.java	1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,41 @@
+/**
+ * Copyright (c) 2006 Eclipse.org
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    bblajer - initial API and implementation
+ */
+package org.eclipse.gmf.runtime.lite.edit.parts.tree;
+
+import org.eclipse.gef.EditPart;
+import org.eclipse.gef.EditPartFactory;
+import org.eclipse.gef.EditPartViewer;
+import org.eclipse.gef.TreeEditPart;
+import org.eclipse.gmf.runtime.notation.View;
+
+/**
+ * Edit part factory to be used for content outline page.
+ */
+public class DiagramTreeEditPartFactory implements EditPartFactory {
+	private final EditPartViewer myGraphicalViewer;
+
+	public DiagramTreeEditPartFactory(EditPartViewer graphicalViewer) {
+		myGraphicalViewer = graphicalViewer;
+	}
+
+	public EditPart createEditPart(EditPart context, Object model) {
+		if (model instanceof View) {
+			EditPart graphicalEditPart = (EditPart) myGraphicalViewer.getEditPartRegistry().get(model);
+			if (graphicalEditPart == null) {
+				return null;
+			}
+			return (EditPart) graphicalEditPart.getAdapter(TreeEditPart.class);
+		}
+		return null;
+	}
+
+}
Index: src/org/eclipse/gmf/runtime/lite/edit/parts/tree/BaseTreeEditPart.java
===================================================================
RCS file: src/org/eclipse/gmf/runtime/lite/edit/parts/tree/BaseTreeEditPart.java
diff -N src/org/eclipse/gmf/runtime/lite/edit/parts/tree/BaseTreeEditPart.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ src/org/eclipse/gmf/runtime/lite/edit/parts/tree/BaseTreeEditPart.java	1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,151 @@
+/**
+ * Copyright (c) 2006 Eclipse.org
+ * 
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    bblajer - initial API and implementation
+ */
+package org.eclipse.gmf.runtime.lite.edit.parts.tree;
+
+import java.util.HashMap;
+import java.util.List;
+
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.edit.provider.IItemLabelProvider;
+import org.eclipse.emf.edit.ui.provider.ExtendedImageRegistry;
+import org.eclipse.gef.editparts.AbstractTreeEditPart;
+import org.eclipse.gmf.runtime.lite.edit.parts.update.IUpdatableEditPart;
+import org.eclipse.gmf.runtime.notation.NotationPackage;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.swt.graphics.Image;
+
+/**
+ * Base implementation for {@link org.eclipse.gef.TreeEditPart} used by the generated editors. 
+ */
+public class BaseTreeEditPart extends AbstractTreeEditPart implements IUpdatableEditPart {
+	private Image myImage;
+	private ImageDescriptor myImageDescriptor;
+
+	private AdapterFactory myAdapterFactory;
+
+	public BaseTreeEditPart(View view, AdapterFactory adapterFactory) {
+		setModel(view);
+		myAdapterFactory = adapterFactory;
+	}
+
+	public View getNotationView() {
+		return (View) getModel();
+	}
+
+	public EObject getElement() {
+		return getNotationView().getElement();
+	}
+
+	protected List getModelChildren() {
+		return getNotationView().getChildren();
+	}
+
+	protected Image getImage() {
+		ImageDescriptor descriptor = getImageDescriptor();
+		if (descriptor == null) {
+			disposeImage();
+			myImageDescriptor = null;
+			return null;
+		}
+		if (myImageDescriptor != descriptor) {
+			disposeImage();
+			myImageDescriptor = descriptor;
+			return createImage();
+		}
+		if (myImage == null || myImage.isDisposed()) {
+			return createImage();
+		}
+		return myImage;
+	}
+
+	private Image createImage() {
+		disposeImage();
+		myImage = myImageDescriptor.createImage();
+		return myImage;
+	}
+
+	private void disposeImage() {
+		if (myImage != null && !myImage.isDisposed()) {
+			myImage.dispose();
+		}
+		myImage = null;
+	}
+
+	/**
+	 * Returns the image descriptor provided by the given adapter factory.
+	 * Subclasses may override.
+	 */
+	protected ImageDescriptor getImageDescriptor() {
+		if (getElement() == null) {
+			return null;
+		}
+		IItemLabelProvider labelProvider = (IItemLabelProvider) myAdapterFactory.adapt(getElement(), IItemLabelProvider.class);
+		if (labelProvider != null) {
+			return ExtendedImageRegistry.getInstance().getImageDescriptor(labelProvider.getImage(getElement()));
+		}
+		return null;
+	}
+
+	/**
+	 * Returns the text provided by the given adapter factory.
+	 * Subclasses may override.
+	 */
+	protected String getText() {
+		if (getElement() == null) {
+			return "";
+		}
+		IItemLabelProvider labelProvider = (IItemLabelProvider) myAdapterFactory.adapt(getElement(), IItemLabelProvider.class);
+		if (labelProvider != null) {
+			return labelProvider.getText(getElement());
+		}
+		return "";
+	}
+
+	private HashMap structuralFeatures2Refresher;
+
+	public Refresher getRefresher(EStructuralFeature feature, Notification msg) {
+		if (structuralFeatures2Refresher == null) {
+			createRefreshers();
+		}
+		return (Refresher) structuralFeatures2Refresher.get(feature);
+	}
+
+	protected void createRefreshers() {
+		structuralFeatures2Refresher = new HashMap();
+		Refresher childrenRefresher = new Refresher() {
+			public void refresh() {
+				refreshChildren();
+			}
+		};
+		registerRefresher(NotationPackage.eINSTANCE.getView_PersistedChildren(), childrenRefresher);
+		registerRefresher(NotationPackage.eINSTANCE.getView_TransientChildren(), childrenRefresher);
+		registerRefresher(NotationPackage.eINSTANCE.getView_Visible(), childrenRefresher);
+		//Source edges are shown as children
+		registerRefresher(NotationPackage.eINSTANCE.getView_SourceEdges(), childrenRefresher);
+	}
+
+	protected final void registerRefresher(EStructuralFeature feature, Refresher refresher) {
+		Refresher oldRefresher = (Refresher) structuralFeatures2Refresher.get(feature);
+		if (oldRefresher == null) {
+			structuralFeatures2Refresher.put(feature, refresher);
+		} else {
+			CompositeRefresher compositeRefresher = new CompositeRefresher();
+			compositeRefresher.addRefresher(oldRefresher);
+			compositeRefresher.addRefresher(refresher);
+			structuralFeatures2Refresher.put(feature, compositeRefresher);
+		}
+	}
+}
Index: src/org/eclipse/gmf/runtime/lite/services/TreeDirectEditManager.java
===================================================================
RCS file: src/org/eclipse/gmf/runtime/lite/services/TreeDirectEditManager.java
diff -N src/org/eclipse/gmf/runtime/lite/services/TreeDirectEditManager.java
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ src/org/eclipse/gmf/runtime/lite/services/TreeDirectEditManager.java	1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,363 @@
+package org.eclipse.gmf.runtime.lite.services;
+
+import java.lang.reflect.Constructor;
+
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.ControlAdapter;
+import org.eclipse.swt.events.ControlEvent;
+import org.eclipse.swt.events.ControlListener;
+import org.eclipse.swt.events.VerifyListener;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Event;
+import org.eclipse.swt.widgets.Listener;
+
+import org.eclipse.jface.viewers.CellEditor;
+import org.eclipse.jface.viewers.ICellEditorListener;
+
+import org.eclipse.gef.EditPart;
+import org.eclipse.gef.EditPartListener;
+import org.eclipse.gef.commands.CommandStack;
+import org.eclipse.gef.requests.DirectEditRequest;
+import org.eclipse.gef.tools.CellEditorLocator;
+
+/**
+ * Manages the direct edit operation by creating and maintaining the 
+ * {@link org.eclipse.jface.viewers.CellEditor} and executing the resulting command if 
+ * the cell editor value has changed.
+ */
+public abstract class TreeDirectEditManager {
+
+private EditPartListener editPartListener;
+private ControlListener controlListener;
+private ICellEditorListener cellEditorListener;
+private boolean showingFeedback;
+private boolean dirty;
+private DirectEditRequest request;
+private CellEditorLocator locator;
+private EditPart source;
+private CellEditor ce;
+private Class editorType;
+private boolean committing = false;
+private Object feature;
+private Listener scrollListener;
+
+/**
+ * Constructs a new DirectEditManager for the given source edit part. The cell editor 
+ * will be created by instantiating the type <i>editorType</i>. The cell editor will be 
+ * placed using the given CellEditorLocator.
+ * 
+ * @param source the source edit part
+ * @param editorType the cell editor type
+ * @param locator the locator
+ */
+public TreeDirectEditManager(EditPart source, Class editorType, 
+		CellEditorLocator locator) {
+	this.source = source;
+	this.locator = locator;
+	this.editorType = editorType;
+}
+
+/**
+ * Constructs a new DirectEditManager for the given source edit part. The cell editor 
+ * will be created by instantiating the type <i>editorType</i>. The cell editor will be 
+ * placed using the given CellEditorLocator.
+ * 
+ * @param source the source edit part
+ * @param editorType the cell editor type
+ * @param locator the locator
+ * @param feature If the EditPart supports direct editing of multiple features, this parameter can be
+ * used to discriminate among them.
+ * @since 3.2
+ */
+public TreeDirectEditManager(EditPart source, Class editorType, 
+		CellEditorLocator locator, Object feature) {
+	this(source, editorType, locator );
+	this.feature = feature;
+}
+
+/**
+ * Cleanup is done here.  Any feedback is erased and listeners unhooked.  If the cell
+ * editor is not <code>null</code>, it will be {@link CellEditor#deactivate() deativated},
+ * {@link CellEditor#dispose() disposed}, and set to <code>null</code>.
+ */
+protected void bringDown() {
+	eraseFeedback();
+	unhookListeners();
+	if (getCellEditor() != null) {
+		getCellEditor().deactivate();
+		getCellEditor().dispose();
+		setCellEditor(null);
+	}
+	request = null;
+	dirty = false;
+}
+
+/**
+ * Commits the current value of the cell editor by getting a {@link Command} from the 
+ * source edit part and executing it via the {@link CommandStack}.  Finally, 
+ * {@link #bringDown()} is called to perform and necessary cleanup.
+ */
+protected void commit() {
+	if (committing)
+		return;
+	committing = true;
+	try {
+		eraseFeedback();
+		if (isDirty()) {
+			CommandStack stack = 
+					getEditPart().getViewer().getEditDomain().getCommandStack();
+			stack.execute(getEditPart().getCommand(getDirectEditRequest()));
+		}
+	} finally {
+		bringDown();
+		committing = false;
+	}
+}
+
+/**
+ * Creates the cell editor on the given composite.  The cell editor is created by 
+ * instantiating the cell editor type passed into this DirectEditManager's constuctor.
+ * @param composite the composite to create the cell editor on
+ * @return the newly created cell editor
+ */
+protected CellEditor createCellEditorOn(Composite composite) {
+	try {
+		Constructor constructor = editorType.getConstructor(new Class[]{Composite.class});
+		return (CellEditor)constructor.newInstance(new Object[]{composite});
+	} catch (Exception e) {
+		return null;
+	}
+}
+
+/**
+ * Creates and returns the DirectEditRequest.
+ * @return the direct edit request
+ */
+protected DirectEditRequest createDirectEditRequest() {
+	DirectEditRequest req = new DirectEditRequest();
+	req.setCellEditor(getCellEditor());
+	req.setDirectEditFeature(getDirectEditFeature());
+	return req;
+}
+
+/**
+ * Asks the source edit part to erase source feedback.
+ */
+protected void eraseFeedback() {
+	if (showingFeedback) {
+		getEditPart().eraseSourceFeedback(getDirectEditRequest());
+		showingFeedback = false;
+	}
+}
+
+/**
+ * Returns the cell editor.
+ * @return the cell editor
+ */
+protected CellEditor getCellEditor() {
+	return ce;
+}
+
+private Control getControl() {
+	return ce.getControl();
+}
+
+/**
+ * @return <code>Object</code> that can be used if the EditPart supports direct editing of multiple 
+ * features, this parameter can be used to discriminate among them.
+ * @since 3.2
+ */
+protected Object getDirectEditFeature() {
+	return feature;
+}
+
+/**
+ * Returns the direct edit request, creating it if needed.
+ * @return the direct edit request
+ */
+protected DirectEditRequest getDirectEditRequest() {
+	if (request == null)
+		request = createDirectEditRequest();
+	return request;
+}
+
+/**
+ * Returns the source edit part.
+ * @return the source edit part
+ */
+protected EditPart getEditPart() {
+	return source;
+}
+
+private CellEditorLocator getLocator() {
+	return locator;
+}
+
+private void handleValueChanged() {
+	setDirty(true);
+	showFeedback();
+	placeCellEditor();
+}
+
+private void hookListeners() {
+	Composite control = (Composite) getEditPart().getViewer().getControl();
+
+	controlListener = new ControlAdapter() {
+		public void controlMoved(ControlEvent e) {
+			// This must be handled async because during scrolling, the CellEditor moves 
+			// first, but then afterwards the viewport Scrolls, which would cause the 
+			// shadow to move twice
+			Display.getCurrent().asyncExec(new Runnable() {
+				public void run() {
+					placeCellEditor();
+				}
+			});
+		}
+		public void controlResized(ControlEvent e) {
+			placeCellEditor();
+		}
+	};
+	control.addControlListener(controlListener);
+
+	scrollListener = new Listener() {
+		public void handleEvent(Event e) {
+			placeCellEditor();
+		}
+	};			
+	if (control.getHorizontalBar() != null) {
+		control.getHorizontalBar().addListener(SWT.Selection, scrollListener);
+	}
+	if (control.getVerticalBar() != null) {
+		control.getVerticalBar().addListener(SWT.Selection, scrollListener);
+	}
+	cellEditorListener = new ICellEditorListener() {
+		public void applyEditorValue() {
+			commit();
+		}
+		public void cancelEditor() {
+			bringDown();
+		}
+		public void editorValueChanged(boolean old, boolean newState) {
+			handleValueChanged();
+		}
+	};
+	getCellEditor().addListener(cellEditorListener);
+	
+	editPartListener = new EditPartListener.Stub () {
+		public void partDeactivated(EditPart editpart) {
+			bringDown();
+		}
+	};
+	getEditPart().addEditPartListener(editPartListener);
+}
+
+/**
+ * Initializes the cell editor.  Subclasses should implement this to set the initial text 
+ * and add things such as {@link VerifyListener VerifyListeners}, if needed.
+ */
+protected abstract void initCellEditor();
+
+/**
+ * Returns <code>true</code> if the cell editor's value has been changed.
+ * @return <code>true</code> if the cell editor is dirty
+ */
+protected boolean isDirty() {
+	return dirty;
+}
+
+private void placeCellEditor() {
+	getLocator().relocate(getCellEditor());
+}
+
+/**
+ * Sets the cell editor to the given editor.
+ * @param editor the cell editor
+ */
+protected void setCellEditor(CellEditor editor) {
+	ce = editor;
+	if (ce == null)
+		return;
+	hookListeners();
+}
+
+/**
+ * Sets the dirty property.
+ * @param value the dirty property
+ */
+protected void setDirty(boolean value) {
+	dirty = value;
+}
+
+/**
+ * Sets the source edit part.
+ * @param source the source edit part
+ */
+protected void setEditPart(EditPart source) {
+	this.source = source;
+//	source.addEditPartListener();
+}
+
+/**
+ * Sets the CellEditorLocator used to place the cell editor in the correct location.
+ * @param locator the locator
+ */
+public void setLocator(CellEditorLocator locator) {
+	this.locator = locator;
+}
+
+/**
+ * Shows the cell editor when direct edit is started.  Calls {@link #initCellEditor()},
+ * {@link CellEditor#activate()}, and {@link #showFeedback()}.
+ */
+public void show() {
+	if (getCellEditor() != null)
+		return;
+	Composite composite = (Composite)source.getViewer().getControl();
+	setCellEditor(createCellEditorOn(composite));
+	if (getCellEditor() == null)
+		return;
+	initCellEditor();
+	getCellEditor().activate();
+	placeCellEditor();
+	getControl().setVisible(true);
+	getCellEditor().setFocus();
+	showFeedback();
+}
+
+/**
+ * Asks the source edit part to show source feedback.
+ */
+public void showFeedback() {
+	showingFeedback = true;
+	getEditPart().showSourceFeedback(getDirectEditRequest());
+}
+
+/**
+ * Unhooks listeners.  Called from {@link #bringDown()}.
+ * TODO: hookListeners() and unhookListeners() should have the same visibility.
+ */
+protected void unhookListeners() {
+	getEditPart().removeEditPartListener(editPartListener);
+	editPartListener = null;
+	
+	if (getCellEditor() == null)
+		return;
+	getCellEditor().removeListener(cellEditorListener);
+	cellEditorListener = null;
+
+	Composite control = (Composite) getEditPart().getViewer().getControl(); 	
+	if (control == null || control.isDisposed())
+		return;
+	control.removeControlListener(controlListener);
+	controlListener = null;
+
+	if (control.getHorizontalBar() != null) {
+		control.getHorizontalBar().removeListener(SWT.Selection, scrollListener);
+	}
+	if (control.getVerticalBar() != null) {
+		control.getVerticalBar().removeListener(SWT.Selection, scrollListener);
+	}
+}
+}