Attachment #45707 for bug #149484




		FeatureLinkModelFacet featureLinkModelFacet = (FeatureLinkModelFacet) getGenModel().getLinkD().getModelFacet();
		EStructuralFeature metaFeature = createdNodeA.getElement().eClass().getEStructuralFeature(featureLinkModelFacet.getMetaFeature().getName());
		assertSame("Domain source of the link does not point at the element its notation points at", createdNodeB.getElement(), createdNodeA.getElement().eGet(metaFeature));
		assertNull("Link's element is incorrect", link.getElement());

		Node createdNodeA1 = createNode(getGenModel().getNodeA(), getCanvasInstance().getCanvas());
		assertNotNull("Node not created", createdNodeA1);

		assertSame("Notation model not updated on reconnecting source", createdNodeA1, link.getSource());
		assertNull("Old source still references target after reconnecting source", createdNodeA.getElement().eGet(metaFeature));
		assertSame("New source does not reference target after reconnecting source", createdNodeB.getElement(), createdNodeA1.getElement().eGet(metaFeature));
		assertNull("Link's element is incorrect after reconnecting source", link.getElement());

		getCommandStack().undo();
		assertSame("Notation model inconsistent after undo", createdNodeA, link.getSource());
		assertSame("Old source does not reference target after undo", createdNodeB.getElement(), createdNodeA.getElement().eGet(metaFeature));
		assertNull("New source references target after undo", createdNodeA1.getElement().eGet(metaFeature));
		assertNull("Link's element is incorrect", link.getElement());

		Node createdNodeB1 = createNode(getGenModel().getNodeB(), getCanvasInstance().getCanvas());
		assertNotNull("Node not created", createdNodeB1);

		reconnectLink(linkEp, b1Ep, false);
		assertSame("Notation model not updated on reconnecting target", createdNodeB1, link.getTarget());
		assertSame("Source does not reference new target after reconnecting target", createdNodeB1.getElement(), createdNodeA.getElement().eGet(metaFeature));
		assertNull("Link's element is incorrect", link.getElement());

		getCommandStack().undo();
		assertSame("Notation model inconsistent after undo", createdNodeA, link.getSource());
		assertSame("source does not reference old target after undo", createdNodeB.getElement(), createdNodeA.getElement().eGet(metaFeature));
		assertNull("Link's element is incorrect", link.getElement());
	}

	protected void reconnectLink(ConnectionEditPart linkEP, EditPart elementToReconnectTo, boolean isSourceNotTarget) {

Lines 39-44 Link Here

(-)templates/providers/PropertySourceProvider.javajet (+4 lines)
39	}	39	}
40	//XXX: compose with view properties	40	//XXX: compose with view properties
41	<%=importManager.getImportedName("org.eclipse.emf.ecore.EObject")%> domainElement = view.getElement();	41	<%=importManager.getImportedName("org.eclipse.emf.ecore.EObject")%> domainElement = view.getElement();
		42	if (domainElement == null && view instanceof <%=importManager.getImportedName("org.eclipse.gmf.runtime.notation.Edge")%>) {
		43	<%=importManager.getImportedName("org.eclipse.gmf.runtime.notation.Edge")%> edge = (<%=importManager.getImportedName("org.eclipse.gmf.runtime.notation.Edge")%>) view;
		44	domainElement = edge.getTarget().getElement();
		45	}
42	return adapterFactoryContentProvider.getPropertySource(domainElement);	46	return adapterFactoryContentProvider.getPropertySource(domainElement);
43	}	47	}
44		48




  protected final String TEXT_124 = "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate ";
  protected final String TEXT_125 = " structuralFeatures2Refresher;" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic Refresher getRefresher(";
  protected final String TEXT_126 = " feature, ";
  protected final String TEXT_127 = " 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_128 = 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_129 = NL;
  protected final String TEXT_130 = "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate DomainModelRefresher domainModelRefresher = new DomainModelRefresher();" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate class DomainModelRefresher extends ";
  protected final String TEXT_131 = " {" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tpublic void notifyChanged(";
  protected final String TEXT_132 = " msg) {" + NL + "\t\t\tsuper.notifyChanged(msg);" + NL + "\t\t\tif (msg.isTouch()) {" + NL + "\t\t\t\treturn;" + NL + "\t\t\t}" + NL + "\t\t\tRefresher refresher = getRefresher((";
  protected final String TEXT_133 = ") msg.getFeature(), msg);" + NL + "\t\t\tif (refresher != null) {" + NL + "\t\t\t\trefresher.refresh();" + NL + "\t\t\t}" + NL + "\t\t}" + NL + "\t}" + NL;
  protected final String TEXT_134 = NL;
  protected final String TEXT_135 = "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic void addRefresher(";
  protected final String TEXT_136 = " 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_137 = " 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_138 = " 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_139 = NL;
  protected final String TEXT_140 = "\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_141 = ".eINSTANCE.getView_PersistedChildren(), childrenRefresher);" + NL + "\t\tstructuralFeatures2Refresher.put(";
  protected final String TEXT_142 = ".eINSTANCE.getView_TransientChildren(), childrenRefresher);";
  protected final String TEXT_143 = NL;
  protected final String TEXT_144 = "\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_145 = ".eINSTANCE.getView_Visible(), visibilityRefresher);";
  protected final String TEXT_146 = NL;
  protected final String TEXT_147 = "\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_148 = ".eINSTANCE.getEdge_Bendpoints(), bendpointsRefresher);" + NL + "\t\tstructuralFeatures2Refresher.put(";
  protected final String TEXT_149 = ".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_150 = " bendpoints = (";
  protected final String TEXT_151 = ") getDiagramEdge().getBendpoints();" + NL + "\t\tif (bendpoints == null) {" + NL + "\t\t\tgetConnectionFigure().setRoutingConstraint(";
  protected final String TEXT_152 = ".EMPTY_LIST);" + NL + "\t\t\treturn;" + NL + "\t\t}" + NL + "\t\t";
  protected final String TEXT_153 = " modelConstraint = bendpoints.getPoints();" + NL + "\t\t";
  protected final String TEXT_154 = " figureConstraint = new ";
  protected final String TEXT_155 = "();" + NL + "\t\tfor (int i = 0; i < modelConstraint.size(); i++) {" + NL + "\t\t\t";
  protected final String TEXT_156 = " wbp = (";
  protected final String TEXT_157 = ") modelConstraint.get(i);" + NL + "\t\t\t";
  protected final String TEXT_158 = " rbp = new ";
  protected final String TEXT_159 = "(getConnectionFigure());" + NL + "\t\t\trbp.setRelativeDimensions(new ";
  protected final String TEXT_160 = "(wbp.getSourceX(), wbp.getSourceY()), new ";
  protected final String TEXT_161 = "(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_162 = "());" + 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_163 = " createFigure() {";
  protected final String TEXT_164 = NL + "\t\treturn new ";
  protected final String TEXT_165 = "();";
  protected final String TEXT_166 = NL + "\t\treturn ";
  protected final String TEXT_167 = ";";
  protected final String TEXT_168 = NL + " \t\treturn new ";
  protected final String TEXT_169 = "();";
  protected final String TEXT_170 = NL + "\t}" + NL;
  protected final String TEXT_171 = NL;
  protected final String TEXT_172 = NL;
  protected final String TEXT_173 = 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_174 = NL + "}";
  protected final String TEXT_175 = NL;

  public String generate(Object argument)
  {

    stringBuffer.append(TEXT_126);
    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.notify.Notification"));
    stringBuffer.append(TEXT_127);
    
if (genLink.getModelFacet() instanceof TypeLinkModelFacet) {
	//Otherwise, there's no element associated with the element

    stringBuffer.append(TEXT_128);
    stringBuffer.append(TEXT_129);
    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.notify.impl.AdapterImpl"));
    stringBuffer.append(TEXT_130);
    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.notify.impl.AdapterImpl"));
    stringBuffer.append(TEXT_131);
    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.notify.Notification"));
    stringBuffer.append(TEXT_132);
    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EStructuralFeature"));
    stringBuffer.append(TEXT_133);
    
}

    stringBuffer.append(TEXT_134);
    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EStructuralFeature"));
    stringBuffer.append(TEXT_135);
    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EStructuralFeature"));
    stringBuffer.append(TEXT_136);
    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EStructuralFeature"));
    stringBuffer.append(TEXT_137);
    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EStructuralFeature"));
    stringBuffer.append(TEXT_138);
    stringBuffer.append(TEXT_139);
    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.NotationPackage"));
    stringBuffer.append(TEXT_140);
    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.NotationPackage"));
    stringBuffer.append(TEXT_141);
    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.NotationPackage"));
    stringBuffer.append(TEXT_142);
    stringBuffer.append(TEXT_143);
    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.NotationPackage"));
    stringBuffer.append(TEXT_144);
    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.NotationPackage"));
    stringBuffer.append(TEXT_145);
    stringBuffer.append(TEXT_146);
    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.NotationPackage"));
    stringBuffer.append(TEXT_147);
    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.NotationPackage"));
    stringBuffer.append(TEXT_148);
    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.NotationPackage"));
    stringBuffer.append(TEXT_149);
    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.RelativeBendpoints"));
    stringBuffer.append(TEXT_150);
    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.RelativeBendpoints"));
    stringBuffer.append(TEXT_151);
    stringBuffer.append(importManager.getImportedName("java.util.Collections"));
    stringBuffer.append(TEXT_152);
    stringBuffer.append(importManager.getImportedName("java.util.List"));
    stringBuffer.append(TEXT_153);
    stringBuffer.append(importManager.getImportedName("java.util.List"));
    stringBuffer.append(TEXT_154);
    stringBuffer.append(importManager.getImportedName("java.util.ArrayList"));
    stringBuffer.append(TEXT_155);
    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.datatype.RelativeBendpoint"));
    stringBuffer.append(TEXT_156);
    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.datatype.RelativeBendpoint"));
    stringBuffer.append(TEXT_157);
    stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.RelativeBendpoint"));
    stringBuffer.append(TEXT_158);
    stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.RelativeBendpoint"));
    stringBuffer.append(TEXT_159);
    stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.geometry.Dimension"));
    stringBuffer.append(TEXT_160);
    stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.geometry.Dimension"));
    stringBuffer.append(TEXT_161);
    stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.BendpointConnectionRouter"));
    stringBuffer.append(TEXT_162);
    stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.IFigure"));
    stringBuffer.append(TEXT_163);
    
Viewmap viewmap = genLink.getViewmap();
if (viewmap instanceof FigureViewmap) {

		figureQualifiedClassName = "org.eclipse.gmf.runtime.draw2d.PolylineConnection";
	}

    stringBuffer.append(TEXT_163);
    stringBuffer.append(importManager.getImportedName(figureQualifiedClassName));
    stringBuffer.append(TEXT_164);
    stringBuffer.append(importManager.getImportedName(figureQualifiedClassName));
    stringBuffer.append(TEXT_165);
    } // instanceof FigureViewmap
	else if (viewmap instanceof SnippetViewmap) {
    stringBuffer.append(TEXT_165);
    stringBuffer.append(((SnippetViewmap) viewmap).getBody());
    stringBuffer.append(TEXT_166);
    stringBuffer.append(((SnippetViewmap) viewmap).getBody());
    stringBuffer.append(TEXT_167);
    } // instanceof SnippetViewmap 
	else if (viewmap instanceof InnerClassViewmap) {
    stringBuffer.append(TEXT_167);
    stringBuffer.append(((InnerClassViewmap) viewmap).getClassName());
    stringBuffer.append(TEXT_168);
    stringBuffer.append(((InnerClassViewmap) viewmap).getClassName());
    stringBuffer.append(TEXT_169);
    }
    stringBuffer.append(TEXT_170);
    
if (genLink.getViewmap() instanceof InnerClassViewmap) {
	String classBody = ((InnerClassViewmap) genLink.getViewmap()).getClassBody();

    stringBuffer.append(TEXT_170);
    stringBuffer.append(classBody);
    stringBuffer.append(TEXT_171);
    stringBuffer.append(classBody);
    stringBuffer.append(TEXT_172);
    
if (classBody.indexOf("DPtoLP") != -1) {

    stringBuffer.append(TEXT_173);
    
}

    
}

    stringBuffer.append(TEXT_173);
    importManager.emitSortedImports();
    stringBuffer.append(TEXT_174);
    importManager.emitSortedImports();
    stringBuffer.append(TEXT_175);
    return stringBuffer.toString();
  }
}




  protected final String TEXT_721 = ".create(" + NL + "\t\t\t\teditingDomain," + NL + "\t\t\t\tedge.getSource().getElement(), ";
  protected final String TEXT_722 = ".eINSTANCE.get";
  protected final String TEXT_723 = "(), newTarget.getElement()));";
  protected final String TEXT_724 = NL + "\t\t\treturn result;" + NL + "\t\t}";
  protected final String TEXT_725 = NL;
  protected final String TEXT_726 = NL + "\t\t\tprivate ";
  protected final String TEXT_727 = " createDomainModelRemoveCommand(";
  protected final String TEXT_728 = " editingDomain) {";
  protected final String TEXT_729 = NL + "\t\t\t\t";
  protected final String TEXT_730 = " result = new ";
  protected final String TEXT_731 = "();";
  protected final String TEXT_732 = NL + "\t\t\t\tresult.append(";
  protected final String TEXT_733 = ".create(" + NL + "\t\t\t\t\teditingDomain," + NL + "\t\t\t\t\t";
  protected final String TEXT_734 = ".getElement().eContainer(), ";
  protected final String TEXT_735 = ".getElement().eContainmentFeature(), ";
  protected final String TEXT_736 = ".getElement()));";
  protected final String TEXT_737 = NL + "\t\t\t\tresult.append(";
  protected final String TEXT_738 = ".create(" + NL + "\t\t\t\t\teditingDomain," + NL + "\t\t\t\t\t";
  protected final String TEXT_739 = ".getElement().eContainer(), ";
  protected final String TEXT_740 = ".getElement().eContainmentFeature(), ";
  protected final String TEXT_741 = ".UNSET_VALUE));";
  protected final String TEXT_742 = NL + "\t\t\t\treturn ";
  protected final String TEXT_743 = ".INSTANCE;";
  protected final String TEXT_744 = NL + "\t\t\t\tresult.append(";
  protected final String TEXT_745 = ".create(" + NL + "\t\t\t\t\teditingDomain," + NL + "\t\t\t\t\t";
  protected final String TEXT_746 = ".getElement().eContainer(), ";
  protected final String TEXT_747 = ".eINSTANCE.get";
  protected final String TEXT_748 = "()," + NL + "\t\t\t\t\t";
  protected final String TEXT_749 = ".getElement()));";
  protected final String TEXT_750 = NL + "\t\t\t\tresult.append(";
  protected final String TEXT_751 = ".create(" + NL + "\t\t\t\t\teditingDomain," + NL + "\t\t\t\t\t";
  protected final String TEXT_752 = ".getElement().eContainer(), ";
  protected final String TEXT_753 = ".eINSTANCE.get";
  protected final String TEXT_754 = "()," + NL + "\t\t\t\t\t";
  protected final String TEXT_755 = ".UNSET_VALUE));";
  protected final String TEXT_756 = NL + "\t\t\t\tresult.append(";
  protected final String TEXT_757 = ".create(" + NL + "\t\t\t\t\teditingDomain," + NL + "\t\t\t\t\t";
  protected final String TEXT_758 = ".getElement(), ";
  protected final String TEXT_759 = ".eINSTANCE.get";
  protected final String TEXT_760 = "(), ";
  protected final String TEXT_761 = ".getSource().getElement()));";
  protected final String TEXT_762 = NL + "\t\t\t\tresult.append(";
  protected final String TEXT_763 = ".create(" + NL + "\t\t\t\t\teditingDomain," + NL + "\t\t\t\t\t";
  protected final String TEXT_764 = ".getElement(), ";
  protected final String TEXT_765 = ".eINSTANCE.get";
  protected final String TEXT_766 = "(), ";
  protected final String TEXT_767 = ".UNSET_VALUE));";
  protected final String TEXT_768 = NL + "\t\t\t\tresult.append(";
  protected final String TEXT_769 = ".create(" + NL + "\t\t\t\t\teditingDomain," + NL + "\t\t\t\t\t";
  protected final String TEXT_770 = ".getElement(), ";
  protected final String TEXT_771 = ".eINSTANCE.get";
  protected final String TEXT_772 = "(), ";
  protected final String TEXT_773 = ".getTarget().getElement()));";
  protected final String TEXT_774 = NL + "\t\t\t\tresult.append(";
  protected final String TEXT_775 = ".create(" + NL + "\t\t\t\t\teditingDomain," + NL + "\t\t\t\t\t";
  protected final String TEXT_776 = ".getElement(), ";
  protected final String TEXT_777 = ".eINSTANCE.get";
  protected final String TEXT_778 = "(), ";
  protected final String TEXT_779 = ".UNSET_VALUE));";
  protected final String TEXT_780 = NL + "\t\t\t\treturn result;";
  protected final String TEXT_781 = NL + "\t\t\t\treturn ";
  protected final String TEXT_782 = ".create(" + NL + "\t\t\t\t\teditingDomain," + NL + "\t\t\t\t\t";
  protected final String TEXT_783 = ".getSource().getElement(), ";
  protected final String TEXT_784 = ".eINSTANCE.get";
  protected final String TEXT_785 = "(), ";
  protected final String TEXT_786 = ".getTarget().getElement());";
  protected final String TEXT_787 = NL + "\t\t\t\treturn ";
  protected final String TEXT_788 = ".create(" + NL + "\t\t\t\t\teditingDomain," + NL + "\t\t\t\t\t";
  protected final String TEXT_789 = ".getSource().getElement(), ";
  protected final String TEXT_790 = ".eINSTANCE.get";
  protected final String TEXT_791 = "(), ";
  protected final String TEXT_792 = ".UNSET_VALUE);";
  protected final String TEXT_793 = NL + "\t\t\t}";
  protected final String TEXT_794 = NL + "\t}" + NL;
  protected final String TEXT_795 = NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate static 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 ";
  protected final String TEXT_798 = " source;" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tprivate final ";
  protected final String TEXT_799 = " target;" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tprivate final ";
  protected final String TEXT_800 = " 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_801 = "Command(";
  protected final String TEXT_802 = ".CreateConnectionRequestEx requestEx) {" + NL + "\t\t\tif (requestEx.getSourceEditPart().getModel() instanceof ";
  protected final String TEXT_803 = ") {" + NL + "\t\t\t\tsource = (";
  protected final String TEXT_804 = ")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_805 = ") {" + NL + "\t\t\t\ttarget = (";
  protected final String TEXT_806 = ")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_807 = ".INSTANCE;" + NL + "\t\t\t\treturn;" + NL + "\t\t\t}" + NL + "\t\t\tcreatedEdge = ";
  protected final String TEXT_808 = ".eINSTANCE.createEdge();";
  protected final String TEXT_809 = NL + "\t\t\t";
  protected final String TEXT_810 = " createdDomainElement = ";
  protected final String TEXT_811 = ".eINSTANCE.create";
  protected final String TEXT_812 = "();" + NL + "\t\t\tcreatedEdge.setElement(createdDomainElement);" + NL + "\t\t\t";
  protected final String TEXT_813 = NL + "\t\t\t";
  protected final String TEXT_814 = ".";
  protected final String TEXT_815 = ".initializeElement(createdDomainElement);";
  protected final String TEXT_816 = NL + "\t\t\tcreatedEdge.setElement(null);";
  protected final String TEXT_817 = NL + "\t\t\t";
  protected final String TEXT_818 = ".decorateView(createdEdge);" + NL + "\t\t\t";
  protected final String TEXT_819 = " domainModelEditDomain = ";
  protected final String TEXT_820 = ".getEditingDomain(source.getDiagram().getElement());";
  protected final String TEXT_821 = NL + "\t\t\torg.eclipse.emf.common.command.CompoundCommand addLinkEndsCommand = new org.eclipse.emf.common.command.CompoundCommand();";
  protected final String TEXT_822 = NL + "\t\t\t";
  protected final String TEXT_823 = " container = getRelationshipContainer(source.getElement(), ";
  protected final String TEXT_824 = ".eINSTANCE.get";
  protected final String TEXT_825 = "());" + 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_826 = ".create(domainModelEditDomain, " + NL + "\t\t\t\tcontainer, ";
  protected final String TEXT_827 = ".eINSTANCE.get";
  protected final String TEXT_828 = "(), createdDomainElement));";
  protected final String TEXT_829 = NL + "\t\t\taddLinkEndsCommand.append(";
  protected final String TEXT_830 = ".create(domainModelEditDomain," + NL + "\t\t\t\tcontainer, ";
  protected final String TEXT_831 = ".eINSTANCE.get";
  protected final String TEXT_832 = "(), createdDomainElement));";
  protected final String TEXT_833 = NL;
  protected final String TEXT_834 = NL + "\t\tif (";
  protected final String TEXT_835 = ".";
  protected final String TEXT_836 = "() != null) {" + NL + "\t\t\t";
  protected final String TEXT_837 = NL + "\t\t}";
  protected final String TEXT_838 = NL + "\t\tif (";
  protected final String TEXT_839 = ".";
  protected final String TEXT_840 = "().size() >= ";
  protected final String TEXT_841 = ".eINSTANCE.get";
  protected final String TEXT_842 = ".getUpperBound()) {" + NL + "\t\t\t";
  protected final String TEXT_843 = NL + "\t\t}";
  protected final String TEXT_844 = NL + "\t\t\taddLinkEndsCommand.append(";
  protected final String TEXT_845 = ".create(domainModelEditDomain, " + NL + "\t\t\t\tcreatedDomainElement, ";
  protected final String TEXT_846 = ".eINSTANCE.get";
  protected final String TEXT_847 = "(), source.getElement()));";
  protected final String TEXT_848 = NL;
  protected final String TEXT_849 = NL + "\t\tif (";
  protected final String TEXT_850 = ".";
  protected final String TEXT_851 = "() != null) {" + NL + "\t\t\t";
  protected final String TEXT_852 = NL + "\t\t}";
  protected final String TEXT_853 = NL + "\t\tif (";
  protected final String TEXT_854 = ".";
  protected final String TEXT_855 = "().size() >= ";
  protected final String TEXT_856 = ".eINSTANCE.get";
  protected final String TEXT_857 = ".getUpperBound()) {" + NL + "\t\t\t";
  protected final String TEXT_858 = NL + "\t\t}";
  protected final String TEXT_859 = NL + "\t\t\taddLinkEndsCommand.append(";
  protected final String TEXT_860 = ".create(domainModelEditDomain, " + NL + "\t\t\t\tcreatedDomainElement, ";
  protected final String TEXT_861 = ".eINSTANCE.get";
  protected final String TEXT_862 = "(), target.getElement()));";
  protected final String TEXT_863 = NL + "\t\tdomainModelAddCommand = addLinkEndsCommand;";
  protected final String TEXT_864 = NL + "\t\t\tdomainModelAddCommand = ";
  protected final String TEXT_865 = ".create(domainModelEditDomain, source.getElement(), " + NL + "\t\t\t\t";
  protected final String TEXT_866 = ".eINSTANCE.get";
  protected final String TEXT_867 = "(), target.getElement());";
  protected final String TEXT_868 = NL + "\t\t}" + NL;
  protected final String TEXT_869 = NL;
  protected final String TEXT_870 = 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_871 = " getRelationshipContainer(";
  protected final String TEXT_872 = " element, ";
  protected final String TEXT_873 = " 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_874 = 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_875 = NL;
  protected final String TEXT_876 = NL + "\t\t\tif(!";
  protected final String TEXT_877 = ".canCreateLink(";
  protected final String TEXT_878 = ", ";
  protected final String TEXT_879 = ", false)) {" + NL + "\t\t\t\treturn false;" + NL + "\t\t\t}";
  protected final String TEXT_880 = 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_881 = NL;
  protected final String TEXT_882 = NL;
  protected final String TEXT_883 = 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_884 = NL + "}";
  protected final String TEXT_885 = NL;
  protected final String TEXT_886 = 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_887 = NL + "}";
  protected final String TEXT_888 = NL;

  public String generate(Object argument)
  {

    stringBuffer.append(TEXT_723);
    
			}

    stringBuffer.append(TEXT_724);
    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.edit.command.SetCommand"));
    stringBuffer.append(TEXT_725);
    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.NotationPackage"));
    stringBuffer.append(TEXT_726);
    
		}

    stringBuffer.append(TEXT_724);
    
	if (linkConstraints != null) {
		String _edge = "edge";

    stringBuffer.append(TEXT_725);
    
	//input: _edge : String

    stringBuffer.append(TEXT_726);
    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.command.Command"));
    stringBuffer.append(TEXT_727);
    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.TransactionalEditingDomain"));
    stringBuffer.append(TEXT_728);
    
	if (genLink.getModelFacet() instanceof TypeLinkModelFacet) {
		TypeLinkModelFacet modelFacet = (TypeLinkModelFacet) genLink.getModelFacet();

				}
			}

    stringBuffer.append(TEXT_729);
    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.command.CompoundCommand"));
    stringBuffer.append(TEXT_730);
    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.command.CompoundCommand"));
    stringBuffer.append(TEXT_731);
    
			if (containmentFeature.getEcoreFeature().isMany()) {

    stringBuffer.append(TEXT_732);
    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.edit.command.RemoveCommand"));
    stringBuffer.append(TEXT_733);
    stringBuffer.append(_edge);
    stringBuffer.append(TEXT_734);
    stringBuffer.append(_edge);
    stringBuffer.append(TEXT_735);
    stringBuffer.append(_edge);
    stringBuffer.append(TEXT_736);
    
			} else {

    stringBuffer.append(TEXT_737);
    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.edit.command.SetCommand"));
    stringBuffer.append(TEXT_738);
    stringBuffer.append(_edge);
    stringBuffer.append(TEXT_739);
    stringBuffer.append(_edge);
    stringBuffer.append(TEXT_740);
    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.edit.command.SetCommand"));
    stringBuffer.append(TEXT_741);
    
			}
		} else {

    stringBuffer.append(TEXT_742);
    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.command.UnexecutableCommand"));
    stringBuffer.append(TEXT_743);
    
		}
		if (removeChild) {
			if (childFeature.getEcoreFeature().isMany()) {

    stringBuffer.append(TEXT_744);
    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.edit.command.RemoveCommand"));
    stringBuffer.append(TEXT_745);
    stringBuffer.append(_edge);
    stringBuffer.append(TEXT_746);
    stringBuffer.append(importManager.getImportedName(childFeature.getGenPackage().getQualifiedPackageInterfaceName()));
    stringBuffer.append(TEXT_747);
    stringBuffer.append(childFeature.getFeatureAccessorName());
    stringBuffer.append(TEXT_748);
    stringBuffer.append(_edge);
    stringBuffer.append(TEXT_749);
    
			} else {

    stringBuffer.append(TEXT_750);
    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.edit.command.SetCommand"));
    stringBuffer.append(TEXT_751);
    stringBuffer.append(_edge);
    stringBuffer.append(TEXT_752);
    stringBuffer.append(importManager.getImportedName(childFeature.getGenPackage().getQualifiedPackageInterfaceName()));
    stringBuffer.append(TEXT_753);
    stringBuffer.append(childFeature.getFeatureAccessorName());
    stringBuffer.append(TEXT_754);
    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.edit.command.SetCommand"));
    stringBuffer.append(TEXT_755);
    
			}
		}
		if (removeSource) {
			if (sourceFeature.getEcoreFeature().isMany()) {

    stringBuffer.append(TEXT_756);
    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.edit.command.RemoveCommand"));
    stringBuffer.append(TEXT_757);
    stringBuffer.append(_edge);
    stringBuffer.append(TEXT_758);
    stringBuffer.append(importManager.getImportedName(sourceFeature.getGenPackage().getQualifiedPackageInterfaceName()));
    stringBuffer.append(TEXT_759);
    stringBuffer.append(sourceFeature.getFeatureAccessorName());
    stringBuffer.append(TEXT_760);
    stringBuffer.append(_edge);
    stringBuffer.append(TEXT_761);
    
			} else {

    stringBuffer.append(TEXT_762);
    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.edit.command.SetCommand"));
    stringBuffer.append(TEXT_763);
    stringBuffer.append(_edge);
    stringBuffer.append(TEXT_764);
    stringBuffer.append(importManager.getImportedName(sourceFeature.getGenPackage().getQualifiedPackageInterfaceName()));
    stringBuffer.append(TEXT_765);
    stringBuffer.append(sourceFeature.getFeatureAccessorName());
    stringBuffer.append(TEXT_766);
    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.edit.command.SetCommand"));
    stringBuffer.append(TEXT_767);
    
			}
		}
		if (removeTarget) {
			if (targetFeature.getEcoreFeature().isMany()) {

    stringBuffer.append(TEXT_768);
    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.edit.command.RemoveCommand"));
    stringBuffer.append(TEXT_769);
    stringBuffer.append(_edge);
    stringBuffer.append(TEXT_770);
    stringBuffer.append(importManager.getImportedName(targetFeature.getGenPackage().getQualifiedPackageInterfaceName()));
    stringBuffer.append(TEXT_771);
    stringBuffer.append(targetFeature.getFeatureAccessorName());
    stringBuffer.append(TEXT_772);
    stringBuffer.append(_edge);
    stringBuffer.append(TEXT_773);
    
			} else {

    stringBuffer.append(TEXT_774);
    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.edit.command.SetCommand"));
    stringBuffer.append(TEXT_775);
    stringBuffer.append(_edge);
    stringBuffer.append(TEXT_776);
    stringBuffer.append(importManager.getImportedName(targetFeature.getGenPackage().getQualifiedPackageInterfaceName()));
    stringBuffer.append(TEXT_777);
    stringBuffer.append(targetFeature.getFeatureAccessorName());
    stringBuffer.append(TEXT_778);
    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.edit.command.SetCommand"));
    stringBuffer.append(TEXT_779);
    
			}
		}

    stringBuffer.append(TEXT_780);
    
	} else if (genLink.getModelFacet() instanceof FeatureModelFacet) {
		GenFeature metaFeature = ((FeatureModelFacet) genLink.getModelFacet()).getMetaFeature();
		if (metaFeature.getEcoreFeature().isMany()) {

    stringBuffer.append(TEXT_781);
    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.edit.command.RemoveCommand"));
    stringBuffer.append(TEXT_782);
    stringBuffer.append(_edge);
    stringBuffer.append(TEXT_783);
    stringBuffer.append(importManager.getImportedName(metaFeature.getGenPackage().getQualifiedPackageInterfaceName()));
    stringBuffer.append(TEXT_784);
    stringBuffer.append(metaFeature.getFeatureAccessorName());
    stringBuffer.append(TEXT_785);
    stringBuffer.append(_edge);
    stringBuffer.append(TEXT_786);
    
		} else {

    stringBuffer.append(TEXT_787);
    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.edit.command.SetCommand"));
    stringBuffer.append(TEXT_788);
    stringBuffer.append(_edge);
    stringBuffer.append(TEXT_789);
    stringBuffer.append(importManager.getImportedName(metaFeature.getGenPackage().getQualifiedPackageInterfaceName()));
    stringBuffer.append(TEXT_790);
    stringBuffer.append(metaFeature.getFeatureAccessorName());
    stringBuffer.append(TEXT_791);
    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.edit.command.SetCommand"));
    stringBuffer.append(TEXT_792);
    
		}

    
	}

    stringBuffer.append(TEXT_793);
    
	}

    stringBuffer.append(TEXT_794);
    
	if (palette != null) {

    stringBuffer.append(TEXT_795);
    stringBuffer.append(createCommandNameInfix);
    stringBuffer.append(genLink.getVisualID());
    stringBuffer.append(TEXT_796);
    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.command.AbstractCommand"));
    stringBuffer.append(TEXT_797);
    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.View"));
    stringBuffer.append(TEXT_798);
    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.View"));
    stringBuffer.append(TEXT_799);
    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.Edge"));
    stringBuffer.append(TEXT_800);
    stringBuffer.append(createCommandNameInfix);
    stringBuffer.append(genLink.getVisualID());
    stringBuffer.append(TEXT_801);
    stringBuffer.append(importManager.getImportedName(palette.getFactoryQualifiedClassName()));
    stringBuffer.append(TEXT_802);
    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.View"));
    stringBuffer.append(TEXT_803);
    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.View"));
    stringBuffer.append(TEXT_804);
    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.View"));
    stringBuffer.append(TEXT_805);
    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.View"));
    stringBuffer.append(TEXT_806);
    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.command.UnexecutableCommand"));
    stringBuffer.append(TEXT_807);
    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.NotationFactory"));
    stringBuffer.append(TEXT_808);
    
		if (genLink.getModelFacet() instanceof TypeLinkModelFacet) {
			TypeLinkModelFacet modelFacet = (TypeLinkModelFacet) genLink.getModelFacet();
			GenClass linkClass = modelFacet.getMetaClass();

    stringBuffer.append(TEXT_809);
    stringBuffer.append(importManager.getImportedName(importManager.getImportedName(linkClass.getQualifiedInterfaceName())));
    stringBuffer.append(TEXT_810);
    stringBuffer.append(importManager.getImportedName(linkClass.getGenPackage().getQualifiedFactoryInterfaceName()));
    stringBuffer.append(TEXT_811);
    stringBuffer.append(linkClass.getClassifierAccessorName());
    stringBuffer.append(TEXT_812);
    /*XXX: Class name DomainElementInitializer should be user-customizable*/
    stringBuffer.append(TEXT_813);
    stringBuffer.append(importManager.getImportedName(genDiagram.getNotationViewFactoriesPackageName() + ".DomainElementInitializer"));
    stringBuffer.append(TEXT_814);
    stringBuffer.append(genLink.getUniqueIdentifier());
    stringBuffer.append(TEXT_815);
    
		} else if (genLink.getModelFacet() instanceof FeatureModelFacet) {

    stringBuffer.append(TEXT_816);
    
		}

    stringBuffer.append(TEXT_817);
    stringBuffer.append(importManager.getImportedName(genLink.getNotationViewFactoryQualifiedClassName()));
    stringBuffer.append(TEXT_818);
    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.TransactionalEditingDomain"));
    stringBuffer.append(TEXT_819);
    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.transaction.util.TransactionUtil"));
    stringBuffer.append(TEXT_820);
    
		if (genLink.getModelFacet() instanceof TypeLinkModelFacet) {

    stringBuffer.append(TEXT_821);
    
			TypeLinkModelFacet modelFacet = (TypeLinkModelFacet) genLink.getModelFacet();
			GenFeature sourceFeature = modelFacet.getSourceMetaFeature();

					}
				}

    stringBuffer.append(TEXT_822);
    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EObject"));
    stringBuffer.append(TEXT_823);
    stringBuffer.append(importManager.getImportedName(containmentFeature.getGenClass().getGenPackage().getQualifiedPackageInterfaceName()));
    stringBuffer.append(TEXT_824);
    stringBuffer.append(containmentFeature.getGenClass().getClassifierAccessorName());
    stringBuffer.append(TEXT_825);
    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(importManager.getImportedName(containmentFeature.getGenPackage().getQualifiedPackageInterfaceName()));
    stringBuffer.append(TEXT_827);
    stringBuffer.append(containmentFeature.getFeatureAccessorName());
    stringBuffer.append(TEXT_828);
    
			}
			if (addChild) {

    stringBuffer.append(TEXT_829);
    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(importManager.getImportedName(childFeature.getGenPackage().getQualifiedPackageInterfaceName()));
    stringBuffer.append(TEXT_831);
    stringBuffer.append(childFeature.getFeatureAccessorName());
    stringBuffer.append(TEXT_832);
    
			}
			if (addSource) {

					String _ownerInstance = "createdDomainElement";
					String _exceedsUpperBound = "domainModelAddCommand = null;\nreturn;";

    stringBuffer.append(TEXT_833);
    
int upperBound = _feature.getEcoreFeature().getUpperBound();
if (upperBound > 0) {
	if (upperBound == 1) {

    stringBuffer.append(TEXT_834);
    stringBuffer.append(_ownerInstance);
    stringBuffer.append(TEXT_835);
    stringBuffer.append(_feature.getGetAccessor());
    stringBuffer.append(TEXT_836);
    stringBuffer.append(_exceedsUpperBound);
    stringBuffer.append(TEXT_837);
    
	} else {

    stringBuffer.append(TEXT_838);
    stringBuffer.append(_ownerInstance);
    stringBuffer.append(TEXT_839);
    stringBuffer.append(_feature.getGetAccessor());
    stringBuffer.append(TEXT_840);
    stringBuffer.append(importManager.getImportedName(_feature.getGenPackage().getQualifiedPackageInterfaceName()));
    stringBuffer.append(TEXT_841);
    stringBuffer.append(_feature.getFeatureAccessorName());
    stringBuffer.append(TEXT_842);
    stringBuffer.append(_exceedsUpperBound);
    stringBuffer.append(TEXT_843);
    
	}
}

    
				}

    stringBuffer.append(TEXT_844);
    stringBuffer.append(importManager.getImportedName(sourceFeature.getEcoreFeature().isMany() ? "org.eclipse.emf.edit.command.AddCommand" : "org.eclipse.emf.edit.command.SetCommand"));
    stringBuffer.append(TEXT_845);
    stringBuffer.append(importManager.getImportedName(sourceFeature.getGenPackage().getQualifiedPackageInterfaceName()));
    stringBuffer.append(TEXT_846);
    stringBuffer.append(sourceFeature.getFeatureAccessorName());
    stringBuffer.append(TEXT_847);
    
			}
			if (addTarget) {

					String _ownerInstance = "createdDomainElement";
					String _exceedsUpperBound = "domainModelAddCommand = null;\nreturn;";

    stringBuffer.append(TEXT_848);
    
int upperBound = _feature.getEcoreFeature().getUpperBound();
if (upperBound > 0) {
	if (upperBound == 1) {

    stringBuffer.append(TEXT_849);
    stringBuffer.append(_ownerInstance);
    stringBuffer.append(TEXT_850);
    stringBuffer.append(_feature.getGetAccessor());
    stringBuffer.append(TEXT_851);
    stringBuffer.append(_exceedsUpperBound);
    stringBuffer.append(TEXT_852);
    
	} else {

    stringBuffer.append(TEXT_853);
    stringBuffer.append(_ownerInstance);
    stringBuffer.append(TEXT_854);
    stringBuffer.append(_feature.getGetAccessor());
    stringBuffer.append(TEXT_855);
    stringBuffer.append(importManager.getImportedName(_feature.getGenPackage().getQualifiedPackageInterfaceName()));
    stringBuffer.append(TEXT_856);
    stringBuffer.append(_feature.getFeatureAccessorName());
    stringBuffer.append(TEXT_857);
    stringBuffer.append(_exceedsUpperBound);
    stringBuffer.append(TEXT_858);
    
	}
}

    
				}

    stringBuffer.append(TEXT_859);
    stringBuffer.append(importManager.getImportedName(targetFeature.getEcoreFeature().isMany() ? "org.eclipse.emf.edit.command.AddCommand" : "org.eclipse.emf.edit.command.SetCommand"));
    stringBuffer.append(TEXT_860);
    stringBuffer.append(importManager.getImportedName(targetFeature.getGenPackage().getQualifiedPackageInterfaceName()));
    stringBuffer.append(TEXT_861);
    stringBuffer.append(targetFeature.getFeatureAccessorName());
    stringBuffer.append(TEXT_862);
    
			}

    stringBuffer.append(TEXT_863);
    
		} else if (genLink.getModelFacet() instanceof FeatureModelFacet) {
			GenFeature metaFeature = ((FeatureModelFacet) genLink.getModelFacet()).getMetaFeature();

    stringBuffer.append(TEXT_864);
    stringBuffer.append(importManager.getImportedName(metaFeature.getEcoreFeature().isMany()? "org.eclipse.emf.edit.command.AddCommand" : "org.eclipse.emf.edit.command.SetCommand"));
    stringBuffer.append(TEXT_865);
    stringBuffer.append(importManager.getImportedName(metaFeature.getGenPackage().getQualifiedPackageInterfaceName()));
    stringBuffer.append(TEXT_866);
    stringBuffer.append(metaFeature.getFeatureAccessorName());
    stringBuffer.append(TEXT_867);
    
		}

    stringBuffer.append(TEXT_868);
    stringBuffer.append(TEXT_869);
    
		if (genLink.getModelFacet() instanceof TypeLinkModelFacet) {

    stringBuffer.append(TEXT_870);
    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EObject"));
    stringBuffer.append(TEXT_871);
    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EObject"));
    stringBuffer.append(TEXT_872);
    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EClass"));
    stringBuffer.append(TEXT_873);
    
		}

    stringBuffer.append(TEXT_874);
    
{
	String _source = "source.getElement()";
	String _target = "target.getElement()";

    stringBuffer.append(TEXT_875);
    
			if (linkConstraints != null) {

    stringBuffer.append(TEXT_876);
    stringBuffer.append(importManager.getImportedName(genDiagram.getNotationViewFactoriesPackageName() + ".DomainElementInitializer")+"."+genDiagram.getLinkCreationConstraintsClassName()+"."+linkConstraints.getConstraintsInstanceFieldName());
    stringBuffer.append(TEXT_877);
    stringBuffer.append(_source);
    stringBuffer.append(TEXT_878);
    stringBuffer.append(_target);
    stringBuffer.append(TEXT_879);
    
			}

    
}	//local declarations for linkConstraints.jetinc

    stringBuffer.append(TEXT_880);
    
	}


if (genNode.getViewmap() instanceof InnerClassViewmap) {
	String classBody = ((InnerClassViewmap) genNode.getViewmap()).getClassBody();

    stringBuffer.append(TEXT_881);
    stringBuffer.append(classBody);
    stringBuffer.append(TEXT_882);
    
if (classBody.indexOf("DPtoLP") != -1) {

    stringBuffer.append(TEXT_883);
    
}

    
}

    stringBuffer.append(TEXT_884);
    importManager.emitSortedImports();
    stringBuffer.append(TEXT_885);
    return stringBuffer.toString();
  }
}




				edge.getSource().getElement(), <%=importManager.getImportedName(metaFeature.getGenPackage().getQualifiedPackageInterfaceName())%>.eINSTANCE.get<%=metaFeature.getFeatureAccessorName()%>(), newTarget.getElement()));
<%
			}
%>
			result.append(<%=importManager.getImportedName("org.eclipse.emf.edit.command.SetCommand")%>.create(
				editingDomain,
				edge, <%=importManager.getImportedName("org.eclipse.gmf.runtime.notation.NotationPackage")%>.eINSTANCE.getView_Element(), newTarget.getElement()));
<%
		}
%>
			return result;

<%
		} else if (genLink.getModelFacet() instanceof FeatureModelFacet) {
%>
			createdEdge.setElement(null);
<%
		}
%>

Lines 130-135 Link Here

(-)templates/parts/LinkEditPart.javajet (+7 lines)
130		130
131	<%@ include file="refresher.javajetinc"%>	131	<%@ include file="refresher.javajetinc"%>
132		132
		133	<%
		134	if (genLink.getModelFacet() instanceof TypeLinkModelFacet) {
		135	//Otherwise, there's no element associated with the element
		136	%>
133	/**	137	/**
134	* @generated	138	* @generated
135	*/	139	*/
Lines 148-153 Link Here
148		152
149	<%@ include file="refreshers.javajetinc/domainModelRefresher.javajetinc"%>	153	<%@ include file="refreshers.javajetinc/domainModelRefresher.javajetinc"%>
150		154
		155	<%
		156	}
		157	%>
151	<%@ include file="refreshers.javajetinc/externalRefreshers.javajetinc"%>	158	<%@ include file="refreshers.javajetinc/externalRefreshers.javajetinc"%>
152		159
153	/**	160	/**




  protected final String TEXT_12 = ") {" + NL + "\t\t\treturn (";
  protected final String TEXT_13 = ") object;" + NL + "\t\t}" + NL + "\t\t";
  protected final String TEXT_14 = " view = getNotationElement(object);" + NL + "\t\tif (view == null) {" + NL + "\t\t\treturn adapterFactoryContentProvider.getPropertySource(object);" + NL + "\t\t}" + NL + "\t\t//XXX: compose with view properties" + NL + "\t\t";
  protected final String TEXT_15 = " domainElement = view.getElement();" + NL + "\t\tif (domainElement == null && view instanceof ";
  protected final String TEXT_16 = ") {" + NL + "\t\t\t";
  protected final String TEXT_17 = " edge = (";
  protected final String TEXT_18 = ") view;" + NL + "\t\t\tdomainElement = edge.getTarget().getElement();" + NL + "\t\t}" + NL + "\t\treturn adapterFactoryContentProvider.getPropertySource(domainElement);" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected ";
  protected final String TEXT_19 = " getNotationElement(Object object) {" + NL + "\t\t";
  protected final String TEXT_20 = " view = null;" + NL + "\t\tif (object instanceof ";
  protected final String TEXT_21 = ") {" + NL + "\t\t\tview = (";
  protected final String TEXT_22 = ") object;" + NL + "\t\t} else if (object instanceof ";
  protected final String TEXT_23 = ") {" + NL + "\t\t\t";
  protected final String TEXT_24 = " editPart = (";
  protected final String TEXT_25 = ") object;" + NL + "\t\t\tif (editPart.getModel() instanceof ";
  protected final String TEXT_26 = ") {" + NL + "\t\t\t\tview = (";
  protected final String TEXT_27 = ") editPart.getModel();" + NL + "\t\t\t}" + NL + "\t\t}" + NL + "\t\tif (view != null && \"";
  protected final String TEXT_28 = "\".equals(";
  protected final String TEXT_29 = ".getModelID(view))) {" + NL + "\t\t\treturn view;" + NL + "\t\t}" + NL + "\t\treturn null;" + NL + "\t}" + NL + "}";
  protected final String TEXT_30 = NL;

  public String generate(Object argument)
  {

    stringBuffer.append(TEXT_14);
    stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EObject"));
    stringBuffer.append(TEXT_15);
    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.Edge"));
    stringBuffer.append(TEXT_16);
    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.Edge"));
    stringBuffer.append(TEXT_17);
    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.Edge"));
    stringBuffer.append(TEXT_18);
    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.View"));
    stringBuffer.append(TEXT_19);
    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.View"));
    stringBuffer.append(TEXT_20);
    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.View"));
    stringBuffer.append(TEXT_21);
    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.EditPart"));
    stringBuffer.append(TEXT_22);
    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.View"));
    stringBuffer.append(TEXT_22);
    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.EditPart"));
    stringBuffer.append(TEXT_23);
    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.EditPart"));
    stringBuffer.append(TEXT_24);
    stringBuffer.append(importManager.getImportedName("org.eclipse.gef.EditPart"));
    stringBuffer.append(TEXT_25);
    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.View"));
    stringBuffer.append(TEXT_26);
    stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.View"));
    stringBuffer.append(TEXT_27);
    stringBuffer.append(genDiagram.getEditorGen().getModelID());
    stringBuffer.append(TEXT_28);
    stringBuffer.append(importManager.getImportedName(genDiagram.getVisualIDRegistryQualifiedClassName()));
    stringBuffer.append(TEXT_29);
    importManager.emitSortedImports();
    stringBuffer.append(TEXT_30);
    return stringBuffer.toString();
  }
}

Return to bug 149484

Lines 144-197 Link Here

(-)src-templates/org/eclipse/gmf/codegen/templates/lite/parts/LinkEditPartGenerator.java (-75 / +84 lines)
144	protected final String TEXT_124 = "\t/*" + NL + "\t @generated" + NL + "\t */" + NL + "\tprivate ";	144	protected final String TEXT_124 = "\t/*" + NL + "\t @generated" + NL + "\t */" + NL + "\tprivate ";
145	protected final String TEXT_125 = " structuralFeatures2Refresher;" + NL + "" + NL + "\t/*" + NL + "\t @generated" + NL + "\t */" + NL + "\tpublic Refresher getRefresher(";	145	protected final String TEXT_125 = " structuralFeatures2Refresher;" + NL + "" + NL + "\t/*" + NL + "\t @generated" + NL + "\t */" + NL + "\tpublic Refresher getRefresher(";
146	protected final String TEXT_126 = " feature, ";	146	protected final String TEXT_126 = " feature, ";
147	protected final String TEXT_127 = " 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 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;	147	protected final String TEXT_127 = " msg) {" + NL + "\t\tif (structuralFeatures2Refresher == null) {" + NL + "\t\t\tcreateRefreshers();" + NL + "\t\t}" + NL + "\t\treturn (Refresher) structuralFeatures2Refresher.get(feature);" + NL + "\t}" + NL + NL;
148	protected final String TEXT_128 = NL;	148	protected final String TEXT_128 = 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;
149	protected final String TEXT_129 = "\t/*" + NL + "\t @generated" + NL + "\t /" + NL + "\tprivate DomainModelRefresher domainModelRefresher = new DomainModelRefresher();" + NL + "" + NL + "\t/" + NL + "\t @generated" + NL + "\t */" + NL + "\tprivate class DomainModelRefresher extends ";	149	protected final String TEXT_129 = NL;
150	protected final String TEXT_130 = " {" + NL + "\t\t/*" + NL + "\t\t @generated" + NL + "\t\t */" + NL + "\t\tpublic void notifyChanged(";	150	protected final String TEXT_130 = "\t/*" + NL + "\t @generated" + NL + "\t /" + NL + "\tprivate DomainModelRefresher domainModelRefresher = new DomainModelRefresher();" + NL + "" + NL + "\t/" + NL + "\t @generated" + NL + "\t */" + NL + "\tprivate class DomainModelRefresher extends ";
151	protected final String TEXT_131 = " msg) {" + NL + "\t\t\tsuper.notifyChanged(msg);" + NL + "\t\t\tif (msg.isTouch()) {" + NL + "\t\t\t\treturn;" + NL + "\t\t\t}" + NL + "\t\t\tRefresher refresher = getRefresher((";	151	protected final String TEXT_131 = " {" + NL + "\t\t/*" + NL + "\t\t @generated" + NL + "\t\t */" + NL + "\t\tpublic void notifyChanged(";
152	protected final String TEXT_132 = ") msg.getFeature(), msg);" + NL + "\t\t\tif (refresher != null) {" + NL + "\t\t\t\trefresher.refresh();" + NL + "\t\t\t}" + NL + "\t\t}" + NL + "\t}" + NL;	152	protected final String TEXT_132 = " msg) {" + NL + "\t\t\tsuper.notifyChanged(msg);" + NL + "\t\t\tif (msg.isTouch()) {" + NL + "\t\t\t\treturn;" + NL + "\t\t\t}" + NL + "\t\t\tRefresher refresher = getRefresher((";
153	protected final String TEXT_133 = NL;	153	protected final String TEXT_133 = ") msg.getFeature(), msg);" + NL + "\t\t\tif (refresher != null) {" + NL + "\t\t\t\trefresher.refresh();" + NL + "\t\t\t}" + NL + "\t\t}" + NL + "\t}" + NL;
154	protected final String TEXT_134 = "\t/*" + NL + "\t @generated" + NL + "\t */" + NL + "\tpublic void addRefresher(";	154	protected final String TEXT_134 = NL;
155	protected final String TEXT_135 = " 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(";	155	protected final String TEXT_135 = "\t/*" + NL + "\t @generated" + NL + "\t */" + NL + "\tpublic void addRefresher(";
156	protected final String TEXT_136 = " 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(";	156	protected final String TEXT_136 = " 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(";
157	protected final String TEXT_137 = " 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();";	157	protected final String TEXT_137 = " 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(";
158	protected final String TEXT_138 = NL;	158	protected final String TEXT_138 = " 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();";
159	protected final String TEXT_139 = "\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(";	159	protected final String TEXT_139 = NL;
160	protected final String TEXT_140 = ".eINSTANCE.getView_PersistedChildren(), childrenRefresher);" + NL + "\t\tstructuralFeatures2Refresher.put(";	160	protected final String TEXT_140 = "\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(";
161	protected final String TEXT_141 = ".eINSTANCE.getView_TransientChildren(), childrenRefresher);";	161	protected final String TEXT_141 = ".eINSTANCE.getView_PersistedChildren(), childrenRefresher);" + NL + "\t\tstructuralFeatures2Refresher.put(";
162	protected final String TEXT_142 = NL;	162	protected final String TEXT_142 = ".eINSTANCE.getView_TransientChildren(), childrenRefresher);";
163	protected final String TEXT_143 = "\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(";	163	protected final String TEXT_143 = NL;
164	protected final String TEXT_144 = ".eINSTANCE.getView_Visible(), visibilityRefresher);";	164	protected final String TEXT_144 = "\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(";
165	protected final String TEXT_145 = NL;	165	protected final String TEXT_145 = ".eINSTANCE.getView_Visible(), visibilityRefresher);";
166	protected final String TEXT_146 = "\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(";	166	protected final String TEXT_146 = NL;
167	protected final String TEXT_147 = ".eINSTANCE.getEdge_Bendpoints(), bendpointsRefresher);" + NL + "\t\tstructuralFeatures2Refresher.put(";	167	protected final String TEXT_147 = "\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(";
168	protected final String TEXT_148 = ".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";	168	protected final String TEXT_148 = ".eINSTANCE.getEdge_Bendpoints(), bendpointsRefresher);" + NL + "\t\tstructuralFeatures2Refresher.put(";
169	protected final String TEXT_149 = " bendpoints = (";	169	protected final String TEXT_149 = ".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";
170	protected final String TEXT_150 = ") getDiagramEdge().getBendpoints();" + NL + "\t\tif (bendpoints == null) {" + NL + "\t\t\tgetConnectionFigure().setRoutingConstraint(";	170	protected final String TEXT_150 = " bendpoints = (";
171	protected final String TEXT_151 = ".EMPTY_LIST);" + NL + "\t\t\treturn;" + NL + "\t\t}" + NL + "\t\t";	171	protected final String TEXT_151 = ") getDiagramEdge().getBendpoints();" + NL + "\t\tif (bendpoints == null) {" + NL + "\t\t\tgetConnectionFigure().setRoutingConstraint(";
172	protected final String TEXT_152 = " modelConstraint = bendpoints.getPoints();" + NL + "\t\t";	172	protected final String TEXT_152 = ".EMPTY_LIST);" + NL + "\t\t\treturn;" + NL + "\t\t}" + NL + "\t\t";
173	protected final String TEXT_153 = " figureConstraint = new ";	173	protected final String TEXT_153 = " modelConstraint = bendpoints.getPoints();" + NL + "\t\t";
174	protected final String TEXT_154 = "();" + NL + "\t\tfor (int i = 0; i < modelConstraint.size(); i++) {" + NL + "\t\t\t";	174	protected final String TEXT_154 = " figureConstraint = new ";
175	protected final String TEXT_155 = " wbp = (";	175	protected final String TEXT_155 = "();" + NL + "\t\tfor (int i = 0; i < modelConstraint.size(); i++) {" + NL + "\t\t\t";
176	protected final String TEXT_156 = ") modelConstraint.get(i);" + NL + "\t\t\t";	176	protected final String TEXT_156 = " wbp = (";
177	protected final String TEXT_157 = " rbp = new ";	177	protected final String TEXT_157 = ") modelConstraint.get(i);" + NL + "\t\t\t";
178	protected final String TEXT_158 = "(getConnectionFigure());" + NL + "\t\t\trbp.setRelativeDimensions(new ";	178	protected final String TEXT_158 = " rbp = new ";
179	protected final String TEXT_159 = "(wbp.getSourceX(), wbp.getSourceY()), new ";	179	protected final String TEXT_159 = "(getConnectionFigure());" + NL + "\t\t\trbp.setRelativeDimensions(new ";
180	protected final String TEXT_160 = "(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 ";	180	protected final String TEXT_160 = "(wbp.getSourceX(), wbp.getSourceY()), new ";
181	protected final String TEXT_161 = "());" + 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 ";	181	protected final String TEXT_161 = "(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 ";
182	protected final String TEXT_162 = " createFigure() {";	182	protected final String TEXT_162 = "());" + 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 ";
183	protected final String TEXT_163 = NL + "\t\treturn new ";	183	protected final String TEXT_163 = " createFigure() {";
184	protected final String TEXT_164 = "();";	184	protected final String TEXT_164 = NL + "\t\treturn new ";
185	protected final String TEXT_165 = NL + "\t\treturn ";	185	protected final String TEXT_165 = "();";
186	protected final String TEXT_166 = ";";	186	protected final String TEXT_166 = NL + "\t\treturn ";
187	protected final String TEXT_167 = NL + " \t\treturn new ";	187	protected final String TEXT_167 = ";";
188	protected final String TEXT_168 = "();";	188	protected final String TEXT_168 = NL + " \t\treturn new ";
189	protected final String TEXT_169 = NL + "\t}" + NL;	189	protected final String TEXT_169 = "();";
190	protected final String TEXT_170 = NL;	190	protected final String TEXT_170 = NL + "\t}" + NL;
191	protected final String TEXT_171 = NL;	191	protected final String TEXT_171 = NL;
192	protected final String TEXT_172 = 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}";	192	protected final String TEXT_172 = NL;
193	protected final String TEXT_173 = NL + "}";	193	protected final String TEXT_173 = 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}";
194	protected final String TEXT_174 = NL;	194	protected final String TEXT_174 = NL + "}";
		195	protected final String TEXT_175 = NL;
195		196
196	public String generate(Object argument)	197	public String generate(Object argument)
197	{	198	{
Lines 551-616 Link Here
551	stringBuffer.append(TEXT_126);	552	stringBuffer.append(TEXT_126);
552	stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.notify.Notification"));	553	stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.notify.Notification"));
553	stringBuffer.append(TEXT_127);	554	stringBuffer.append(TEXT_127);
		555
		556	if (genLink.getModelFacet() instanceof TypeLinkModelFacet) {
		557	//Otherwise, there's no element associated with the element
		558
554	stringBuffer.append(TEXT_128);	559	stringBuffer.append(TEXT_128);
555	stringBuffer.append(TEXT_129);	560	stringBuffer.append(TEXT_129);
556	stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.notify.impl.AdapterImpl"));
557	stringBuffer.append(TEXT_130);	561	stringBuffer.append(TEXT_130);
558	stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.notify.Notification"));	562	stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.notify.impl.AdapterImpl"));
559	stringBuffer.append(TEXT_131);	563	stringBuffer.append(TEXT_131);
560	stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EStructuralFeature"));	564	stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.notify.Notification"));
561	stringBuffer.append(TEXT_132);	565	stringBuffer.append(TEXT_132);
		566	stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EStructuralFeature"));
562	stringBuffer.append(TEXT_133);	567	stringBuffer.append(TEXT_133);
		568
		569	}
		570
563	stringBuffer.append(TEXT_134);	571	stringBuffer.append(TEXT_134);
564	stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EStructuralFeature"));
565	stringBuffer.append(TEXT_135);	572	stringBuffer.append(TEXT_135);
566	stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EStructuralFeature"));	573	stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EStructuralFeature"));
567	stringBuffer.append(TEXT_136);	574	stringBuffer.append(TEXT_136);
568	stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EStructuralFeature"));	575	stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EStructuralFeature"));
569	stringBuffer.append(TEXT_137);	576	stringBuffer.append(TEXT_137);
		577	stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EStructuralFeature"));
570	stringBuffer.append(TEXT_138);	578	stringBuffer.append(TEXT_138);
571	stringBuffer.append(TEXT_139);	579	stringBuffer.append(TEXT_139);
572	stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.NotationPackage"));
573	stringBuffer.append(TEXT_140);	580	stringBuffer.append(TEXT_140);
574	stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.NotationPackage"));	581	stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.NotationPackage"));
575	stringBuffer.append(TEXT_141);	582	stringBuffer.append(TEXT_141);
		583	stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.NotationPackage"));
576	stringBuffer.append(TEXT_142);	584	stringBuffer.append(TEXT_142);
577	stringBuffer.append(TEXT_143);	585	stringBuffer.append(TEXT_143);
578	stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.NotationPackage"));
579	stringBuffer.append(TEXT_144);	586	stringBuffer.append(TEXT_144);
		587	stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.NotationPackage"));
580	stringBuffer.append(TEXT_145);	588	stringBuffer.append(TEXT_145);
581	stringBuffer.append(TEXT_146);	589	stringBuffer.append(TEXT_146);
582	stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.NotationPackage"));
583	stringBuffer.append(TEXT_147);	590	stringBuffer.append(TEXT_147);
584	stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.NotationPackage"));	591	stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.NotationPackage"));
585	stringBuffer.append(TEXT_148);	592	stringBuffer.append(TEXT_148);
586	stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.RelativeBendpoints"));	593	stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.NotationPackage"));
587	stringBuffer.append(TEXT_149);	594	stringBuffer.append(TEXT_149);
588	stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.RelativeBendpoints"));	595	stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.RelativeBendpoints"));
589	stringBuffer.append(TEXT_150);	596	stringBuffer.append(TEXT_150);
590	stringBuffer.append(importManager.getImportedName("java.util.Collections"));	597	stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.RelativeBendpoints"));
591	stringBuffer.append(TEXT_151);	598	stringBuffer.append(TEXT_151);
592	stringBuffer.append(importManager.getImportedName("java.util.List"));	599	stringBuffer.append(importManager.getImportedName("java.util.Collections"));
593	stringBuffer.append(TEXT_152);	600	stringBuffer.append(TEXT_152);
594	stringBuffer.append(importManager.getImportedName("java.util.List"));	601	stringBuffer.append(importManager.getImportedName("java.util.List"));
595	stringBuffer.append(TEXT_153);	602	stringBuffer.append(TEXT_153);
596	stringBuffer.append(importManager.getImportedName("java.util.ArrayList"));	603	stringBuffer.append(importManager.getImportedName("java.util.List"));
597	stringBuffer.append(TEXT_154);	604	stringBuffer.append(TEXT_154);
598	stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.datatype.RelativeBendpoint"));	605	stringBuffer.append(importManager.getImportedName("java.util.ArrayList"));
599	stringBuffer.append(TEXT_155);	606	stringBuffer.append(TEXT_155);
600	stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.datatype.RelativeBendpoint"));	607	stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.datatype.RelativeBendpoint"));
601	stringBuffer.append(TEXT_156);	608	stringBuffer.append(TEXT_156);
602	stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.RelativeBendpoint"));	609	stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.datatype.RelativeBendpoint"));
603	stringBuffer.append(TEXT_157);	610	stringBuffer.append(TEXT_157);
604	stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.RelativeBendpoint"));	611	stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.RelativeBendpoint"));
605	stringBuffer.append(TEXT_158);	612	stringBuffer.append(TEXT_158);
606	stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.geometry.Dimension"));	613	stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.RelativeBendpoint"));
607	stringBuffer.append(TEXT_159);	614	stringBuffer.append(TEXT_159);
608	stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.geometry.Dimension"));	615	stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.geometry.Dimension"));
609	stringBuffer.append(TEXT_160);	616	stringBuffer.append(TEXT_160);
610	stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.BendpointConnectionRouter"));	617	stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.geometry.Dimension"));
611	stringBuffer.append(TEXT_161);	618	stringBuffer.append(TEXT_161);
612	stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.IFigure"));	619	stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.BendpointConnectionRouter"));
613	stringBuffer.append(TEXT_162);	620	stringBuffer.append(TEXT_162);
		621	stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.IFigure"));
		622	stringBuffer.append(TEXT_163);
614		623
615	Viewmap viewmap = genLink.getViewmap();	624	Viewmap viewmap = genLink.getViewmap();
616	if (viewmap instanceof FigureViewmap) {	625	if (viewmap instanceof FigureViewmap) {
Lines 620-660 Link Here
620	figureQualifiedClassName = "org.eclipse.gmf.runtime.draw2d.PolylineConnection";	629	figureQualifiedClassName = "org.eclipse.gmf.runtime.draw2d.PolylineConnection";
621	}	630	}
622		631
623	stringBuffer.append(TEXT_163);
624	stringBuffer.append(importManager.getImportedName(figureQualifiedClassName));
625	stringBuffer.append(TEXT_164);	632	stringBuffer.append(TEXT_164);
		633	stringBuffer.append(importManager.getImportedName(figureQualifiedClassName));
		634	stringBuffer.append(TEXT_165);
626	} // instanceof FigureViewmap	635	} // instanceof FigureViewmap
627	else if (viewmap instanceof SnippetViewmap) {	636	else if (viewmap instanceof SnippetViewmap) {
628	stringBuffer.append(TEXT_165);
629	stringBuffer.append(((SnippetViewmap) viewmap).getBody());
630	stringBuffer.append(TEXT_166);	637	stringBuffer.append(TEXT_166);
		638	stringBuffer.append(((SnippetViewmap) viewmap).getBody());
		639	stringBuffer.append(TEXT_167);
631	} // instanceof SnippetViewmap	640	} // instanceof SnippetViewmap
632	else if (viewmap instanceof InnerClassViewmap) {	641	else if (viewmap instanceof InnerClassViewmap) {
633	stringBuffer.append(TEXT_167);
634	stringBuffer.append(((InnerClassViewmap) viewmap).getClassName());
635	stringBuffer.append(TEXT_168);	642	stringBuffer.append(TEXT_168);
636	}	643	stringBuffer.append(((InnerClassViewmap) viewmap).getClassName());
637	stringBuffer.append(TEXT_169);	644	stringBuffer.append(TEXT_169);
		645	}
		646	stringBuffer.append(TEXT_170);
638		647
639	if (genLink.getViewmap() instanceof InnerClassViewmap) {	648	if (genLink.getViewmap() instanceof InnerClassViewmap) {
640	String classBody = ((InnerClassViewmap) genLink.getViewmap()).getClassBody();	649	String classBody = ((InnerClassViewmap) genLink.getViewmap()).getClassBody();
641		650
642	stringBuffer.append(TEXT_170);
643	stringBuffer.append(classBody);
644	stringBuffer.append(TEXT_171);	651	stringBuffer.append(TEXT_171);
		652	stringBuffer.append(classBody);
		653	stringBuffer.append(TEXT_172);
645		654
646	if (classBody.indexOf("DPtoLP") != -1) {	655	if (classBody.indexOf("DPtoLP") != -1) {
647		656
648	stringBuffer.append(TEXT_172);	657	stringBuffer.append(TEXT_173);
649		658
650	}	659	}
651		660
652		661
653	}	662	}
654		663
655	stringBuffer.append(TEXT_173);
656	importManager.emitSortedImports();
657	stringBuffer.append(TEXT_174);	664	stringBuffer.append(TEXT_174);
		665	importManager.emitSortedImports();
		666	stringBuffer.append(TEXT_175);
658	return stringBuffer.toString();	667	return stringBuffer.toString();
659	}	668	}
660	}	669	}

Lines 1619-1629 Link Here

(-)templates/parts/NodeEditPart.javajet (-6 / +1 lines)
1619	edge.getSource().getElement(), <%=importManager.getImportedName(metaFeature.getGenPackage().getQualifiedPackageInterfaceName())%>.eINSTANCE.get<%=metaFeature.getFeatureAccessorName()%>(), newTarget.getElement()));	1619	edge.getSource().getElement(), <%=importManager.getImportedName(metaFeature.getGenPackage().getQualifiedPackageInterfaceName())%>.eINSTANCE.get<%=metaFeature.getFeatureAccessorName()%>(), newTarget.getElement()));
1620	<%	1620	<%
1621	}	1621	}
1622	%>
1623	result.append(<%=importManager.getImportedName("org.eclipse.emf.edit.command.SetCommand")%>.create(
1624	editingDomain,
1625	edge, <%=importManager.getImportedName("org.eclipse.gmf.runtime.notation.NotationPackage")%>.eINSTANCE.getView_Element(), newTarget.getElement()));
1626	<%
1627	}	1622	}
1628	%>	1623	%>
1629	return result;	1624	return result;
Lines 1693-1699 Link Here
1693	<%	1688	<%
1694	} else if (genLink.getModelFacet() instanceof FeatureModelFacet) {	1689	} else if (genLink.getModelFacet() instanceof FeatureModelFacet) {
1695	%>	1690	%>
1696	createdEdge.setElement(target.getElement()); //XXX: is this correct?	1691	createdEdge.setElement(null);
1697	<%	1692	<%
1698	}	1693	}
1699	%>	1694	%>

Lines 143-149 Link Here

(-)src/org/eclipse/gmf/tests/lite/gef/DiagramLinksTest.java (-5 / +5 lines)
143	FeatureLinkModelFacet featureLinkModelFacet = (FeatureLinkModelFacet) getGenModel().getLinkD().getModelFacet();	143	FeatureLinkModelFacet featureLinkModelFacet = (FeatureLinkModelFacet) getGenModel().getLinkD().getModelFacet();
144	EStructuralFeature metaFeature = createdNodeA.getElement().eClass().getEStructuralFeature(featureLinkModelFacet.getMetaFeature().getName());	144	EStructuralFeature metaFeature = createdNodeA.getElement().eClass().getEStructuralFeature(featureLinkModelFacet.getMetaFeature().getName());
145	assertSame("Domain source of the link does not point at the element its notation points at", createdNodeB.getElement(), createdNodeA.getElement().eGet(metaFeature));	145	assertSame("Domain source of the link does not point at the element its notation points at", createdNodeB.getElement(), createdNodeA.getElement().eGet(metaFeature));
146	assertSame("Link's element is incorrect", createdNodeB.getElement(), link.getElement());	146	assertNull("Link's element is incorrect", link.getElement());
147		147
148	Node createdNodeA1 = createNode(getGenModel().getNodeA(), getCanvasInstance().getCanvas());	148	Node createdNodeA1 = createNode(getGenModel().getNodeA(), getCanvasInstance().getCanvas());
149	assertNotNull("Node not created", createdNodeA1);	149	assertNotNull("Node not created", createdNodeA1);
Lines 153-165 Link Here
153	assertSame("Notation model not updated on reconnecting source", createdNodeA1, link.getSource());	153	assertSame("Notation model not updated on reconnecting source", createdNodeA1, link.getSource());
154	assertNull("Old source still references target after reconnecting source", createdNodeA.getElement().eGet(metaFeature));	154	assertNull("Old source still references target after reconnecting source", createdNodeA.getElement().eGet(metaFeature));
155	assertSame("New source does not reference target after reconnecting source", createdNodeB.getElement(), createdNodeA1.getElement().eGet(metaFeature));	155	assertSame("New source does not reference target after reconnecting source", createdNodeB.getElement(), createdNodeA1.getElement().eGet(metaFeature));
156	assertSame("Link's element is incorrect after reconnecting source", createdNodeB.getElement(), link.getElement());	156	assertNull("Link's element is incorrect after reconnecting source", link.getElement());
157		157
158	getCommandStack().undo();	158	getCommandStack().undo();
159	assertSame("Notation model inconsistent after undo", createdNodeA, link.getSource());	159	assertSame("Notation model inconsistent after undo", createdNodeA, link.getSource());
160	assertSame("Old source does not reference target after undo", createdNodeB.getElement(), createdNodeA.getElement().eGet(metaFeature));	160	assertSame("Old source does not reference target after undo", createdNodeB.getElement(), createdNodeA.getElement().eGet(metaFeature));
161	assertNull("New source references target after undo", createdNodeA1.getElement().eGet(metaFeature));	161	assertNull("New source references target after undo", createdNodeA1.getElement().eGet(metaFeature));
162	assertSame("Link's element is incorrect", createdNodeB.getElement(), link.getElement());	162	assertNull("Link's element is incorrect", link.getElement());
163		163
164	Node createdNodeB1 = createNode(getGenModel().getNodeB(), getCanvasInstance().getCanvas());	164	Node createdNodeB1 = createNode(getGenModel().getNodeB(), getCanvasInstance().getCanvas());
165	assertNotNull("Node not created", createdNodeB1);	165	assertNotNull("Node not created", createdNodeB1);
Lines 168-179 Link Here
168	reconnectLink(linkEp, b1Ep, false);	168	reconnectLink(linkEp, b1Ep, false);
169	assertSame("Notation model not updated on reconnecting target", createdNodeB1, link.getTarget());	169	assertSame("Notation model not updated on reconnecting target", createdNodeB1, link.getTarget());
170	assertSame("Source does not reference new target after reconnecting target", createdNodeB1.getElement(), createdNodeA.getElement().eGet(metaFeature));	170	assertSame("Source does not reference new target after reconnecting target", createdNodeB1.getElement(), createdNodeA.getElement().eGet(metaFeature));
171	assertSame("Link's element is incorrect", createdNodeB1.getElement(), link.getElement());	171	assertNull("Link's element is incorrect", link.getElement());
172		172
173	getCommandStack().undo();	173	getCommandStack().undo();
174	assertSame("Notation model inconsistent after undo", createdNodeA, link.getSource());	174	assertSame("Notation model inconsistent after undo", createdNodeA, link.getSource());
175	assertSame("source does not reference old target after undo", createdNodeB.getElement(), createdNodeA.getElement().eGet(metaFeature));	175	assertSame("source does not reference old target after undo", createdNodeB.getElement(), createdNodeA.getElement().eGet(metaFeature));
176	assertSame("Link's element is incorrect", createdNodeB.getElement(), link.getElement());	176	assertNull("Link's element is incorrect", link.getElement());
177	}	177	}
178		178
179	protected void reconnectLink(ConnectionEditPart linkEP, EditPart elementToReconnectTo, boolean isSourceNotTarget) {	179	protected void reconnectLink(ConnectionEditPart linkEP, EditPart elementToReconnectTo, boolean isSourceNotTarget) {

Lines 29-47 Link Here

(-)src-templates/org/eclipse/gmf/codegen/templates/lite/providers/PropertySourceProviderGenerator.java (-24 / +33 lines)
29	protected final String TEXT_12 = ") {" + NL + "\t\t\treturn (";	29	protected final String TEXT_12 = ") {" + NL + "\t\t\treturn (";
30	protected final String TEXT_13 = ") object;" + NL + "\t\t}" + NL + "\t\t";	30	protected final String TEXT_13 = ") object;" + NL + "\t\t}" + NL + "\t\t";
31	protected final String TEXT_14 = " view = getNotationElement(object);" + NL + "\t\tif (view == null) {" + NL + "\t\t\treturn adapterFactoryContentProvider.getPropertySource(object);" + NL + "\t\t}" + NL + "\t\t//XXX: compose with view properties" + NL + "\t\t";	31	protected final String TEXT_14 = " view = getNotationElement(object);" + NL + "\t\tif (view == null) {" + NL + "\t\t\treturn adapterFactoryContentProvider.getPropertySource(object);" + NL + "\t\t}" + NL + "\t\t//XXX: compose with view properties" + NL + "\t\t";
32	protected final String TEXT_15 = " domainElement = view.getElement();" + NL + "\t\treturn adapterFactoryContentProvider.getPropertySource(domainElement);" + NL + "\t}" + NL + "" + NL + "\t/*" + NL + "\t @generated" + NL + "\t */" + NL + "\tprotected ";	32	protected final String TEXT_15 = " domainElement = view.getElement();" + NL + "\t\tif (domainElement == null && view instanceof ";
33	protected final String TEXT_16 = " getNotationElement(Object object) {" + NL + "\t\t";	33	protected final String TEXT_16 = ") {" + NL + "\t\t\t";
34	protected final String TEXT_17 = " view = null;" + NL + "\t\tif (object instanceof ";	34	protected final String TEXT_17 = " edge = (";
35	protected final String TEXT_18 = ") {" + NL + "\t\t\tview = (";	35	protected final String TEXT_18 = ") view;" + NL + "\t\t\tdomainElement = edge.getTarget().getElement();" + NL + "\t\t}" + NL + "\t\treturn adapterFactoryContentProvider.getPropertySource(domainElement);" + NL + "\t}" + NL + "" + NL + "\t/*" + NL + "\t @generated" + NL + "\t */" + NL + "\tprotected ";
36	protected final String TEXT_19 = ") object;" + NL + "\t\t} else if (object instanceof ";	36	protected final String TEXT_19 = " getNotationElement(Object object) {" + NL + "\t\t";
37	protected final String TEXT_20 = ") {" + NL + "\t\t\t";	37	protected final String TEXT_20 = " view = null;" + NL + "\t\tif (object instanceof ";
38	protected final String TEXT_21 = " editPart = (";	38	protected final String TEXT_21 = ") {" + NL + "\t\t\tview = (";
39	protected final String TEXT_22 = ") object;" + NL + "\t\t\tif (editPart.getModel() instanceof ";	39	protected final String TEXT_22 = ") object;" + NL + "\t\t} else if (object instanceof ";
40	protected final String TEXT_23 = ") {" + NL + "\t\t\t\tview = (";	40	protected final String TEXT_23 = ") {" + NL + "\t\t\t";
41	protected final String TEXT_24 = ") editPart.getModel();" + NL + "\t\t\t}" + NL + "\t\t}" + NL + "\t\tif (view != null && \"";	41	protected final String TEXT_24 = " editPart = (";
42	protected final String TEXT_25 = "\".equals(";	42	protected final String TEXT_25 = ") object;" + NL + "\t\t\tif (editPart.getModel() instanceof ";
43	protected final String TEXT_26 = ".getModelID(view))) {" + NL + "\t\t\treturn view;" + NL + "\t\t}" + NL + "\t\treturn null;" + NL + "\t}" + NL + "}";	43	protected final String TEXT_26 = ") {" + NL + "\t\t\t\tview = (";
44	protected final String TEXT_27 = NL;	44	protected final String TEXT_27 = ") editPart.getModel();" + NL + "\t\t\t}" + NL + "\t\t}" + NL + "\t\tif (view != null && \"";
		45	protected final String TEXT_28 = "\".equals(";
		46	protected final String TEXT_29 = ".getModelID(view))) {" + NL + "\t\t\treturn view;" + NL + "\t\t}" + NL + "\t\treturn null;" + NL + "\t}" + NL + "}";
		47	protected final String TEXT_30 = NL;
45		48
46	public String generate(Object argument)	49	public String generate(Object argument)
47	{	50	{
Lines 86-115 Link Here
86	stringBuffer.append(TEXT_14);	89	stringBuffer.append(TEXT_14);
87	stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EObject"));	90	stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EObject"));
88	stringBuffer.append(TEXT_15);	91	stringBuffer.append(TEXT_15);
89	stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.View"));	92	stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.Edge"));
90	stringBuffer.append(TEXT_16);	93	stringBuffer.append(TEXT_16);
91	stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.View"));	94	stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.Edge"));
92	stringBuffer.append(TEXT_17);	95	stringBuffer.append(TEXT_17);
93	stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.View"));	96	stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.Edge"));
94	stringBuffer.append(TEXT_18);	97	stringBuffer.append(TEXT_18);
95	stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.View"));	98	stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.View"));
96	stringBuffer.append(TEXT_19);	99	stringBuffer.append(TEXT_19);
97	stringBuffer.append(importManager.getImportedName("org.eclipse.gef.EditPart"));	100	stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.View"));
98	stringBuffer.append(TEXT_20);	101	stringBuffer.append(TEXT_20);
99	stringBuffer.append(importManager.getImportedName("org.eclipse.gef.EditPart"));	102	stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.View"));
100	stringBuffer.append(TEXT_21);	103	stringBuffer.append(TEXT_21);
101	stringBuffer.append(importManager.getImportedName("org.eclipse.gef.EditPart"));
102	stringBuffer.append(TEXT_22);
103	stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.View"));	104	stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.View"));
		105	stringBuffer.append(TEXT_22);
		106	stringBuffer.append(importManager.getImportedName("org.eclipse.gef.EditPart"));
104	stringBuffer.append(TEXT_23);	107	stringBuffer.append(TEXT_23);
105	stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.View"));	108	stringBuffer.append(importManager.getImportedName("org.eclipse.gef.EditPart"));
106	stringBuffer.append(TEXT_24);	109	stringBuffer.append(TEXT_24);
107	stringBuffer.append(genDiagram.getEditorGen().getModelID());	110	stringBuffer.append(importManager.getImportedName("org.eclipse.gef.EditPart"));
108	stringBuffer.append(TEXT_25);	111	stringBuffer.append(TEXT_25);
109	stringBuffer.append(importManager.getImportedName(genDiagram.getVisualIDRegistryQualifiedClassName()));	112	stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.View"));
110	stringBuffer.append(TEXT_26);	113	stringBuffer.append(TEXT_26);
111	importManager.emitSortedImports();	114	stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.View"));
112	stringBuffer.append(TEXT_27);	115	stringBuffer.append(TEXT_27);
		116	stringBuffer.append(genDiagram.getEditorGen().getModelID());
		117	stringBuffer.append(TEXT_28);
		118	stringBuffer.append(importManager.getImportedName(genDiagram.getVisualIDRegistryQualifiedClassName()));
		119	stringBuffer.append(TEXT_29);
		120	importManager.emitSortedImports();
		121	stringBuffer.append(TEXT_30);
113	return stringBuffer.toString();	122	return stringBuffer.toString();
114	}	123	}
115	}	124	}