### Eclipse Workspace Patch 1.0
#P org.eclipse.gmf.codegen.lite
Index: templates/providers/PropertySourceProvider.javajet
===================================================================
RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.codegen.lite/templates/providers/PropertySourceProvider.javajet,v
retrieving revision 1.2
diff -u -r1.2 PropertySourceProvider.javajet
--- templates/providers/PropertySourceProvider.javajet 26 Apr 2006 11:58:49 -0000 1.2
+++ templates/providers/PropertySourceProvider.javajet 4 Jul 2006 14:29:24 -0000
@@ -39,6 +39,10 @@
}
//XXX: compose with view properties
<%=importManager.getImportedName("org.eclipse.emf.ecore.EObject")%> domainElement = view.getElement();
+ if (domainElement == null && view instanceof <%=importManager.getImportedName("org.eclipse.gmf.runtime.notation.Edge")%>) {
+ <%=importManager.getImportedName("org.eclipse.gmf.runtime.notation.Edge")%> edge = (<%=importManager.getImportedName("org.eclipse.gmf.runtime.notation.Edge")%>) view;
+ domainElement = edge.getTarget().getElement();
+ }
return adapterFactoryContentProvider.getPropertySource(domainElement);
}
Index: src-templates/org/eclipse/gmf/codegen/templates/lite/parts/LinkEditPartGenerator.java
===================================================================
RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.codegen.lite/src-templates/org/eclipse/gmf/codegen/templates/lite/parts/LinkEditPartGenerator.java,v
retrieving revision 1.7
diff -u -r1.7 LinkEditPartGenerator.java
--- src-templates/org/eclipse/gmf/codegen/templates/lite/parts/LinkEditPartGenerator.java 19 Jun 2006 19:14:13 -0000 1.7
+++ src-templates/org/eclipse/gmf/codegen/templates/lite/parts/LinkEditPartGenerator.java 4 Jul 2006 14:29:23 -0000
@@ -123,54 +123,56 @@
protected final String TEXT_103 = "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprivate ";
protected final String TEXT_104 = " structuralFeatures2Refresher;" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic Refresher getRefresher(";
protected final String TEXT_105 = " feature, ";
- protected final String TEXT_106 = " 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;
- protected final String TEXT_107 = NL;
- protected final String TEXT_108 = "\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_109 = " {" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tpublic void notifyChanged(";
- protected final String TEXT_110 = " 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_111 = ") 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_112 = NL;
- protected final String TEXT_113 = "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic void addRefresher(";
- protected final String TEXT_114 = " 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_115 = " 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_116 = " 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_117 = NL;
- protected final String TEXT_118 = "\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_119 = ".eINSTANCE.getView_PersistedChildren(), childrenRefresher);" + NL + "\t\tstructuralFeatures2Refresher.put(";
- protected final String TEXT_120 = ".eINSTANCE.getView_TransientChildren(), childrenRefresher);";
- protected final String TEXT_121 = NL;
- protected final String TEXT_122 = "\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_123 = ".eINSTANCE.getView_Visible(), visibilityRefresher);";
- protected final String TEXT_124 = NL;
- protected final String TEXT_125 = "\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_126 = ".eINSTANCE.getEdge_Bendpoints(), bendpointsRefresher);" + NL + "\t\tstructuralFeatures2Refresher.put(";
- protected final String TEXT_127 = ".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_128 = " bendpoints = (";
- protected final String TEXT_129 = ") getDiagramEdge().getBendpoints();" + NL + "\t\tif (bendpoints == null) {" + NL + "\t\t\tgetConnectionFigure().setRoutingConstraint(";
- protected final String TEXT_130 = ".EMPTY_LIST);" + NL + "\t\t\treturn;" + NL + "\t\t}" + NL + "\t\t";
- protected final String TEXT_131 = " modelConstraint = bendpoints.getPoints();" + NL + "\t\t";
- protected final String TEXT_132 = " figureConstraint = new ";
- protected final String TEXT_133 = "();" + NL + "\t\tfor (int i = 0; i < modelConstraint.size(); i++) {" + NL + "\t\t\t";
- protected final String TEXT_134 = " wbp = (";
- protected final String TEXT_135 = ") modelConstraint.get(i);" + NL + "\t\t\t";
- protected final String TEXT_136 = " rbp = new ";
- protected final String TEXT_137 = "(getConnectionFigure());" + NL + "\t\t\trbp.setRelativeDimensions(new ";
- protected final String TEXT_138 = "(wbp.getSourceX(), wbp.getSourceY()), new ";
- protected final String TEXT_139 = "(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_140 = "());" + 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 generated tag and modify it." + NL + "\t * " + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected ";
- protected final String TEXT_141 = " createFigure() {";
- protected final String TEXT_142 = NL + "\t\treturn new ";
- protected final String TEXT_143 = "();";
- protected final String TEXT_144 = NL + "\t\treturn ";
- protected final String TEXT_145 = ";";
- protected final String TEXT_146 = NL + " \t\treturn new ";
- protected final String TEXT_147 = "();";
- protected final String TEXT_148 = NL + "\t}" + NL;
- protected final String TEXT_149 = NL;
- protected final String TEXT_150 = NL;
- protected final String TEXT_151 = 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_152 = NL + "}";
- protected final String TEXT_153 = NL;
+ protected final String TEXT_106 = " 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_107 = 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_108 = NL;
+ protected final String TEXT_109 = "\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_110 = " {" + NL + "\t\t/**" + NL + "\t\t * @generated" + NL + "\t\t */" + NL + "\t\tpublic void notifyChanged(";
+ protected final String TEXT_111 = " 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_112 = ") msg.getFeature(), msg);" + NL + "\t\t\tif (refresher != null) {" + NL + "\t\t\t\trefresher.refresh();" + NL + "\t\t\t}" + NL + "\t\t}" + NL + "\t}";
+ protected final String TEXT_113 = NL;
+ protected final String TEXT_114 = NL;
+ protected final String TEXT_115 = "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tpublic void addRefresher(";
+ protected final String TEXT_116 = " 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_117 = " 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_118 = " 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_119 = NL;
+ protected final String TEXT_120 = "\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_121 = ".eINSTANCE.getView_PersistedChildren(), childrenRefresher);" + NL + "\t\tstructuralFeatures2Refresher.put(";
+ protected final String TEXT_122 = ".eINSTANCE.getView_TransientChildren(), childrenRefresher);";
+ protected final String TEXT_123 = NL;
+ protected final String TEXT_124 = "\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_125 = ".eINSTANCE.getView_Visible(), visibilityRefresher);";
+ protected final String TEXT_126 = NL;
+ protected final String TEXT_127 = "\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_128 = ".eINSTANCE.getEdge_Bendpoints(), bendpointsRefresher);" + NL + "\t\tstructuralFeatures2Refresher.put(";
+ protected final String TEXT_129 = ".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_130 = " bendpoints = (";
+ protected final String TEXT_131 = ") getDiagramEdge().getBendpoints();" + NL + "\t\tif (bendpoints == null) {" + NL + "\t\t\tgetConnectionFigure().setRoutingConstraint(";
+ protected final String TEXT_132 = ".EMPTY_LIST);" + NL + "\t\t\treturn;" + NL + "\t\t}" + NL + "\t\t";
+ protected final String TEXT_133 = " modelConstraint = bendpoints.getPoints();" + NL + "\t\t";
+ protected final String TEXT_134 = " figureConstraint = new ";
+ protected final String TEXT_135 = "();" + NL + "\t\tfor (int i = 0; i < modelConstraint.size(); i++) {" + NL + "\t\t\t";
+ protected final String TEXT_136 = " wbp = (";
+ protected final String TEXT_137 = ") modelConstraint.get(i);" + NL + "\t\t\t";
+ protected final String TEXT_138 = " rbp = new ";
+ protected final String TEXT_139 = "(getConnectionFigure());" + NL + "\t\t\trbp.setRelativeDimensions(new ";
+ protected final String TEXT_140 = "(wbp.getSourceX(), wbp.getSourceY()), new ";
+ protected final String TEXT_141 = "(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_142 = "());" + 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 generated tag and modify it." + NL + "\t * " + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected ";
+ protected final String TEXT_143 = " createFigure() {";
+ protected final String TEXT_144 = NL + "\t\treturn new ";
+ protected final String TEXT_145 = "();";
+ protected final String TEXT_146 = NL + "\t\treturn ";
+ protected final String TEXT_147 = ";";
+ protected final String TEXT_148 = NL + " \t\treturn new ";
+ protected final String TEXT_149 = "();";
+ protected final String TEXT_150 = NL + "\t}" + NL;
+ protected final String TEXT_151 = NL;
+ protected final String TEXT_152 = NL;
+ protected final String TEXT_153 = 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_154 = NL + "}";
+ protected final String TEXT_155 = NL;
public String generate(Object argument)
{
@@ -481,66 +483,75 @@
stringBuffer.append(TEXT_105);
stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.notify.Notification"));
stringBuffer.append(TEXT_106);
+
+if (genLink.getModelFacet() instanceof TypeLinkModelFacet) {
+ //Otherwise, there's no element associated with the element
+
stringBuffer.append(TEXT_107);
stringBuffer.append(TEXT_108);
- stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.notify.impl.AdapterImpl"));
stringBuffer.append(TEXT_109);
- stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.notify.Notification"));
+ stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.notify.impl.AdapterImpl"));
stringBuffer.append(TEXT_110);
- stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EStructuralFeature"));
+ stringBuffer.append(importManager.getImportedName("org.eclipse.emf.common.notify.Notification"));
stringBuffer.append(TEXT_111);
+ stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EStructuralFeature"));
stringBuffer.append(TEXT_112);
+
+}
+
stringBuffer.append(TEXT_113);
- stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EStructuralFeature"));
stringBuffer.append(TEXT_114);
- stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EStructuralFeature"));
stringBuffer.append(TEXT_115);
stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EStructuralFeature"));
stringBuffer.append(TEXT_116);
+ stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EStructuralFeature"));
stringBuffer.append(TEXT_117);
+ stringBuffer.append(importManager.getImportedName("org.eclipse.emf.ecore.EStructuralFeature"));
stringBuffer.append(TEXT_118);
- stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.NotationPackage"));
stringBuffer.append(TEXT_119);
- stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.NotationPackage"));
stringBuffer.append(TEXT_120);
+ stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.NotationPackage"));
stringBuffer.append(TEXT_121);
- stringBuffer.append(TEXT_122);
stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.NotationPackage"));
+ stringBuffer.append(TEXT_122);
stringBuffer.append(TEXT_123);
stringBuffer.append(TEXT_124);
- stringBuffer.append(TEXT_125);
stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.NotationPackage"));
+ stringBuffer.append(TEXT_125);
stringBuffer.append(TEXT_126);
- stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.NotationPackage"));
stringBuffer.append(TEXT_127);
- stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.RelativeBendpoints"));
+ stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.NotationPackage"));
stringBuffer.append(TEXT_128);
- stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.RelativeBendpoints"));
+ stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.NotationPackage"));
stringBuffer.append(TEXT_129);
- stringBuffer.append(importManager.getImportedName("java.util.Collections"));
+ stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.RelativeBendpoints"));
stringBuffer.append(TEXT_130);
- stringBuffer.append(importManager.getImportedName("java.util.List"));
+ stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.RelativeBendpoints"));
stringBuffer.append(TEXT_131);
- stringBuffer.append(importManager.getImportedName("java.util.List"));
+ stringBuffer.append(importManager.getImportedName("java.util.Collections"));
stringBuffer.append(TEXT_132);
- stringBuffer.append(importManager.getImportedName("java.util.ArrayList"));
+ stringBuffer.append(importManager.getImportedName("java.util.List"));
stringBuffer.append(TEXT_133);
- stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.datatype.RelativeBendpoint"));
+ stringBuffer.append(importManager.getImportedName("java.util.List"));
stringBuffer.append(TEXT_134);
- stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.datatype.RelativeBendpoint"));
+ stringBuffer.append(importManager.getImportedName("java.util.ArrayList"));
stringBuffer.append(TEXT_135);
- stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.RelativeBendpoint"));
+ stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.datatype.RelativeBendpoint"));
stringBuffer.append(TEXT_136);
- stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.RelativeBendpoint"));
+ stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.datatype.RelativeBendpoint"));
stringBuffer.append(TEXT_137);
- stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.geometry.Dimension"));
+ stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.RelativeBendpoint"));
stringBuffer.append(TEXT_138);
- stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.geometry.Dimension"));
+ stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.RelativeBendpoint"));
stringBuffer.append(TEXT_139);
- stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.BendpointConnectionRouter"));
+ stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.geometry.Dimension"));
stringBuffer.append(TEXT_140);
- stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.IFigure"));
+ stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.geometry.Dimension"));
stringBuffer.append(TEXT_141);
+ stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.BendpointConnectionRouter"));
+ stringBuffer.append(TEXT_142);
+ stringBuffer.append(importManager.getImportedName("org.eclipse.draw2d.IFigure"));
+ stringBuffer.append(TEXT_143);
Viewmap viewmap = genLink.getViewmap();
if (viewmap instanceof FigureViewmap) {
@@ -550,41 +561,41 @@
figureQualifiedClassName = "org.eclipse.gmf.runtime.draw2d.PolylineConnection";
}
- stringBuffer.append(TEXT_142);
+ stringBuffer.append(TEXT_144);
stringBuffer.append(importManager.getImportedName(figureQualifiedClassName));
- stringBuffer.append(TEXT_143);
+ stringBuffer.append(TEXT_145);
} // instanceof FigureViewmap
else if (viewmap instanceof SnippetViewmap) {
- stringBuffer.append(TEXT_144);
+ stringBuffer.append(TEXT_146);
stringBuffer.append(((SnippetViewmap) viewmap).getBody());
- stringBuffer.append(TEXT_145);
+ stringBuffer.append(TEXT_147);
} // instanceof SnippetViewmap
else if (viewmap instanceof InnerClassViewmap) {
- stringBuffer.append(TEXT_146);
+ stringBuffer.append(TEXT_148);
stringBuffer.append(((InnerClassViewmap) viewmap).getClassName());
- stringBuffer.append(TEXT_147);
+ stringBuffer.append(TEXT_149);
}
- stringBuffer.append(TEXT_148);
+ stringBuffer.append(TEXT_150);
if (genLink.getViewmap() instanceof InnerClassViewmap) {
String classBody = ((InnerClassViewmap) genLink.getViewmap()).getClassBody();
- stringBuffer.append(TEXT_149);
+ stringBuffer.append(TEXT_151);
stringBuffer.append(classBody);
- stringBuffer.append(TEXT_150);
+ stringBuffer.append(TEXT_152);
if (classBody.indexOf("DPtoLP") != -1) {
- stringBuffer.append(TEXT_151);
+ stringBuffer.append(TEXT_153);
}
}
- stringBuffer.append(TEXT_152);
+ stringBuffer.append(TEXT_154);
importManager.emitSortedImports();
- stringBuffer.append(TEXT_153);
+ stringBuffer.append(TEXT_155);
return stringBuffer.toString();
}
}
Index: src-templates/org/eclipse/gmf/codegen/templates/lite/parts/NodeEditPartGenerator.java
===================================================================
RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.codegen.lite/src-templates/org/eclipse/gmf/codegen/templates/lite/parts/NodeEditPartGenerator.java,v
retrieving revision 1.13
diff -u -r1.13 NodeEditPartGenerator.java
--- src-templates/org/eclipse/gmf/codegen/templates/lite/parts/NodeEditPartGenerator.java 25 Jun 2006 15:36:40 -0000 1.13
+++ src-templates/org/eclipse/gmf/codegen/templates/lite/parts/NodeEditPartGenerator.java 4 Jul 2006 14:29:24 -0000
@@ -450,7 +450,7 @@
protected final String TEXT_429 = NL + "\t\t\t";
protected final String TEXT_430 = ".";
protected final String TEXT_431 = ".initializeElement(createdDomainElement);";
- protected final String TEXT_432 = NL + "\t\t\tcreatedEdge.setElement(target.getElement());\t\t//XXX: is this correct?";
+ protected final String TEXT_432 = NL + "\t\t\tcreatedEdge.setElement(null);";
protected final String TEXT_433 = NL + "\t\t\t";
protected final String TEXT_434 = ".decorateView(createdEdge);" + NL + "\t\t\t";
protected final String TEXT_435 = " domainModelEditDomain = ";
Index: templates/parts/NodeEditPart.javajet
===================================================================
RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.codegen.lite/templates/parts/NodeEditPart.javajet,v
retrieving revision 1.12
diff -u -r1.12 NodeEditPart.javajet
--- templates/parts/NodeEditPart.javajet 25 Jun 2006 15:36:40 -0000 1.12
+++ templates/parts/NodeEditPart.javajet 4 Jul 2006 14:29:24 -0000
@@ -1029,7 +1029,7 @@
<%
} else if (genLink.getModelFacet() instanceof FeatureModelFacet) {
%>
- createdEdge.setElement(target.getElement()); //XXX: is this correct?
+ createdEdge.setElement(null);
<%
}
%>
Index: templates/parts/LinkEditPart.javajet
===================================================================
RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.codegen.lite/templates/parts/LinkEditPart.javajet,v
retrieving revision 1.5
diff -u -r1.5 LinkEditPart.javajet
--- templates/parts/LinkEditPart.javajet 5 Jun 2006 13:35:59 -0000 1.5
+++ templates/parts/LinkEditPart.javajet 4 Jul 2006 14:29:24 -0000
@@ -130,6 +130,10 @@
<%@ include file="refresher.javajetinc"%>
+<%
+if (genLink.getModelFacet() instanceof TypeLinkModelFacet) {
+ //Otherwise, there's no element associated with the element
+%>
/**
* @generated
*/
@@ -147,6 +151,9 @@
}
<%@ include file="refreshers.javajetinc/domainModelRefresher.javajetinc"%>
+<%
+}
+%>
<%@ include file="refreshers.javajetinc/externalRefreshers.javajetinc"%>
Index: src-templates/org/eclipse/gmf/codegen/templates/lite/providers/PropertySourceProviderGenerator.java
===================================================================
RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.codegen.lite/src-templates/org/eclipse/gmf/codegen/templates/lite/providers/PropertySourceProviderGenerator.java,v
retrieving revision 1.2
diff -u -r1.2 PropertySourceProviderGenerator.java
--- src-templates/org/eclipse/gmf/codegen/templates/lite/providers/PropertySourceProviderGenerator.java 26 Apr 2006 11:58:49 -0000 1.2
+++ src-templates/org/eclipse/gmf/codegen/templates/lite/providers/PropertySourceProviderGenerator.java 4 Jul 2006 14:29:24 -0000
@@ -29,19 +29,22 @@
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\treturn adapterFactoryContentProvider.getPropertySource(domainElement);" + NL + "\t}" + NL + "" + NL + "\t/**" + NL + "\t * @generated" + NL + "\t */" + NL + "\tprotected ";
- protected final String TEXT_16 = " getNotationElement(Object object) {" + NL + "\t\t";
- protected final String TEXT_17 = " view = null;" + NL + "\t\tif (object instanceof ";
- protected final String TEXT_18 = ") {" + NL + "\t\t\tview = (";
- protected final String TEXT_19 = ") object;" + NL + "\t\t} else if (object instanceof ";
- protected final String TEXT_20 = ") {" + NL + "\t\t\t";
- protected final String TEXT_21 = " editPart = (";
- protected final String TEXT_22 = ") object;" + NL + "\t\t\tif (editPart.getModel() instanceof ";
- protected final String TEXT_23 = ") {" + NL + "\t\t\t\tview = (";
- protected final String TEXT_24 = ") editPart.getModel();" + NL + "\t\t\t}" + NL + "\t\t}" + NL + "\t\tif (view != null && \"";
- protected final String TEXT_25 = "\".equals(";
- protected final String TEXT_26 = ".getModelID(view))) {" + NL + "\t\t\treturn view;" + NL + "\t\t}" + NL + "\t\treturn null;" + NL + "\t}" + NL + "}";
- protected final String TEXT_27 = NL;
+ 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)
{
@@ -86,30 +89,36 @@
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.View"));
+ stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.Edge"));
stringBuffer.append(TEXT_16);
- stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.View"));
+ stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.Edge"));
stringBuffer.append(TEXT_17);
- stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.View"));
+ 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.gef.EditPart"));
+ stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.View"));
stringBuffer.append(TEXT_20);
- stringBuffer.append(importManager.getImportedName("org.eclipse.gef.EditPart"));
+ 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.gmf.runtime.notation.View"));
+ stringBuffer.append(importManager.getImportedName("org.eclipse.gef.EditPart"));
stringBuffer.append(TEXT_24);
- stringBuffer.append(genDiagram.getEditorGen().getModelID());
+ stringBuffer.append(importManager.getImportedName("org.eclipse.gef.EditPart"));
stringBuffer.append(TEXT_25);
- stringBuffer.append(importManager.getImportedName(genDiagram.getVisualIDRegistryQualifiedClassName()));
+ stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.notation.View"));
stringBuffer.append(TEXT_26);
- importManager.emitSortedImports();
+ 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();
}
}
Index: META-INF/MANIFEST.MF
===================================================================
RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.codegen.lite/META-INF/MANIFEST.MF,v
retrieving revision 1.3
diff -u -r1.3 MANIFEST.MF
--- META-INF/MANIFEST.MF 22 May 2006 18:14:10 -0000 1.3
+++ META-INF/MANIFEST.MF 4 Jul 2006 14:29:23 -0000
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.gmf.codegen.lite
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 1.0.1.qualifier
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",