Attachment 58872 Details for Bug 174005 – fix TypeModelFacetImpl.isPhantomElement()

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

fix TypeModelFacetImpl.isPhantomElement()

174005_toBugzilla.txt (text/plain), 21.86 KB, created by Yury Chernikov

on 2007-02-13 13:26:59 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Yury Chernikov

Created: 2007-02-13 13:26:59 EST

Size: 21.86 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.gmf.codegen
>Index: templates/xpt/Externalizer.xpt
>===================================================================
>RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.codegen/templates/xpt/Externalizer.xpt,v
>retrieving revision 1.1
>diff -u -r1.1 Externalizer.xpt
>--- templates/xpt/Externalizer.xpt	27 Dec 2006 13:40:49 -0000	1.1
>+++ templates/xpt/Externalizer.xpt	13 Feb 2007 18:17:37 -0000
>@@ -18,12 +18,21 @@
> «DEFINE Access FOR gmfgen::GenEditorGenerator»
> package «this.getAccessorQualifier()»;
> 
>+/**
>+ * @generated
>+ */
> public class «this.getAccessorName()» extends org.eclipse.osgi.util.NLS {
> 
>+	/**
>+ 	* @generated
>+ 	*/
> 	static {
> 		org.eclipse.osgi.util.NLS.initializeMessages("«this.getAccessorName().toLowerCase()»", «this.getAccessorName()».class); //$NON-NLS-1$
> 	}
> 
>+	/**
>+	 * @generated
>+	 */
> 	private «this.getAccessorName()»() {
> 	}
> 
>Index: src/org/eclipse/gmf/codegen/gmfgen/Viewmap.java
>===================================================================
>RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/gmfgen/Viewmap.java,v
>retrieving revision 1.5
>diff -u -r1.5 Viewmap.java
>--- src/org/eclipse/gmf/codegen/gmfgen/Viewmap.java	17 May 2006 12:39:15 -0000	1.5
>+++ src/org/eclipse/gmf/codegen/gmfgen/Viewmap.java	13 Feb 2007 18:16:28 -0000
>@@ -7,6 +7,7 @@
> package org.eclipse.gmf.codegen.gmfgen;
> 
> import org.eclipse.emf.common.util.EList;
>+import org.eclipse.emf.ecore.EClass;
> import org.eclipse.emf.ecore.EObject;
> 
> /**
>@@ -101,4 +102,12 @@
> 	 */
> 	Attributes find(Class attributesClass);
> 
>+	/**
>+	 * 
>+	 * 
>+	 * @model
>+	 * @generated
>+	 */
>+	Attributes eFind(EClass attributeEClass);
>+
> } // Viewmap
>Index: src/org/eclipse/gmf/codegen/gmfgen/impl/TypeModelFacetImpl.java
>===================================================================
>RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/gmfgen/impl/TypeModelFacetImpl.java,v
>retrieving revision 1.8
>diff -u -r1.8 TypeModelFacetImpl.java
>--- src/org/eclipse/gmf/codegen/gmfgen/impl/TypeModelFacetImpl.java	5 Sep 2006 23:41:12 -0000	1.8
>+++ src/org/eclipse/gmf/codegen/gmfgen/impl/TypeModelFacetImpl.java	13 Feb 2007 18:17:12 -0000
>@@ -320,7 +320,7 @@
> 	 * @generated NOT
> 	 */
> 	public boolean isPhantomElement() {
>-		return eContainer() instanceof GenTopLevelNode && getContainmentMetaFeature() == null;
>+		return getContainmentMetaFeature() == null;
> 	}
> 
> 	/**
>Index: src/org/eclipse/gmf/codegen/gmfgen/impl/GMFGenPackageImpl.java
>===================================================================
>RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/gmfgen/impl/GMFGenPackageImpl.java,v
>retrieving revision 1.195
>diff -u -r1.195 GMFGenPackageImpl.java
>--- src/org/eclipse/gmf/codegen/gmfgen/impl/GMFGenPackageImpl.java	28 Dec 2006 19:45:51 -0000	1.195
>+++ src/org/eclipse/gmf/codegen/gmfgen/impl/GMFGenPackageImpl.java	13 Feb 2007 18:16:42 -0000
>@@ -6787,6 +6787,9 @@
> 		op = addEOperation(viewmapEClass, this.getAttributes(), "find", 0, 1);
> 		addEParameter(op, ecorePackage.getEJavaClass(), "attributesClass", 0, 1);
> 
>+		op = addEOperation(viewmapEClass, this.getAttributes(), "eFind", 0, 1);
>+		addEParameter(op, ecorePackage.getEClass(), "attributeEClass", 0, 1);
>+		
> 		initEClass(figureViewmapEClass, FigureViewmap.class, "FigureViewmap", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
> 		initEAttribute(getFigureViewmap_FigureQualifiedClassName(), ecorePackage.getEString(), "figureQualifiedClassName", null, 1, 1, FigureViewmap.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
> 
>Index: src/org/eclipse/gmf/codegen/gmfgen/impl/ViewmapImpl.java
>===================================================================
>RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/gmfgen/impl/ViewmapImpl.java,v
>retrieving revision 1.6
>diff -u -r1.6 ViewmapImpl.java
>--- src/org/eclipse/gmf/codegen/gmfgen/impl/ViewmapImpl.java	17 May 2006 12:39:15 -0000	1.6
>+++ src/org/eclipse/gmf/codegen/gmfgen/impl/ViewmapImpl.java	13 Feb 2007 18:17:12 -0000
>@@ -162,6 +162,21 @@
> 	/**
> 	 * 
> 	 * 
>+	 * @generated NOT
>+	 */
>+	public Attributes eFind(EClass attributeEClass) {
>+		for (Object next : getAttributes()){
>+			Attributes nextAttributes = (Attributes)next;
>+			if (attributeEClass.equals(nextAttributes.eClass())){
>+				return nextAttributes;
>+			}
>+		}
>+		return null;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
> 	 * @generated
> 	 */
> 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
>Index: templates/xpt/diagram/editparts/NodeEditPart.xpt
>===================================================================
>RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/editparts/NodeEditPart.xpt,v
>retrieving revision 1.7
>diff -u -r1.7 NodeEditPart.xpt
>--- templates/xpt/diagram/editparts/NodeEditPart.xpt	20 Dec 2006 02:08:34 -0000	1.7
>+++ templates/xpt/diagram/editparts/NodeEditPart.xpt	13 Feb 2007 18:17:38 -0000
>@@ -232,9 +232,7 @@
> 		«ENDFOREACH-»
> 		«FOREACH getSideAffixedChildren() AS child-»
> 		if (childEditPart instanceof «child.getEditPartQualifiedClassName()») {
>-			org.eclipse.gmf.runtime.diagram.ui.figures.BorderItemLocator locator =
>-				new org.eclipse.gmf.runtime.diagram.ui.figures.BorderItemLocator(
>-					getMainFigure(), org.eclipse.draw2d.PositionConstants.«child.preferredSideName»);
>+			«EXPAND createSideAffixedNodeLocator FOR child-»
> 			getBorderedFigure().getBorderItemContainer().add(
> 				((«child.getEditPartQualifiedClassName()») childEditPart).getFigure(), locator);
> 			return true;
>@@ -252,7 +250,6 @@
> 			«LET (gmfgen::ParentAssignedViewmap) compartment.viewmap AS childViewmap-»
> 		if (childEditPart instanceof «compartment.getEditPartQualifiedClassName()») {
> 			org.eclipse.draw2d.IFigure pane = getPrimaryShape().«childViewmap.getterName»();
>-			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 
> 			pane.remove(((«compartment.getEditPartQualifiedClassName()») childEditPart).getFigure());
> 			return true;
> 		}	
>@@ -547,3 +544,9 @@
> 	}
> 	«ENDIF-»
> «ENDDEFINE»
>+
>+«DEFINE createSideAffixedNodeLocator FOR gmfgen::GenChildSideAffixedNode»
>+	org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator locator =
>+		new org.eclipse.gmf.runtime.diagram.ui.figures.BorderItemLocator(
>+					getMainFigure(), org.eclipse.draw2d.PositionConstants.«preferredSideName»);
>+«ENDDEFINE»
>Index: src-templates/org/eclipse/gmf/codegen/templates/editor/NewDiagramFileWizardGenerator.java
>===================================================================
>RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.codegen/src-templates/org/eclipse/gmf/codegen/templates/editor/NewDiagramFileWizardGenerator.java,v
>retrieving revision 1.35
>diff -u -r1.35 NewDiagramFileWizardGenerator.java
>--- src-templates/org/eclipse/gmf/codegen/templates/editor/NewDiagramFileWizardGenerator.java	24 Nov 2006 22:25:21 -0000	1.35
>+++ src-templates/org/eclipse/gmf/codegen/templates/editor/NewDiagramFileWizardGenerator.java	13 Feb 2007 18:15:31 -0000
>@@ -594,6 +594,7 @@
> for (int nodeIndex = 0; nodeIndex < genNodes.size(); nodeIndex++) {
> 	GenNode nextNode = (GenNode) genNodes.get(nodeIndex);
> 	TypeModelFacet typeModelFacet = nextNode.getModelFacet();
>+
> 	if (typeModelFacet == null || typeModelFacet.isPhantomElement()) {
> 		// Skipping top-level phantoms
> 		continue;
>Index: templates/semanticSync.jetinc/collectSemanticChildren_header.jetinc
>===================================================================
>RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.codegen/templates/semanticSync.jetinc/collectSemanticChildren_header.jetinc,v
>retrieving revision 1.6
>diff -u -r1.6 collectSemanticChildren_header.jetinc
>--- templates/semanticSync.jetinc/collectSemanticChildren_header.jetinc	18 May 2006 14:03:44 -0000	1.6
>+++ templates/semanticSync.jetinc/collectSemanticChildren_header.jetinc	13 Feb 2007 18:17:36 -0000
>@@ -3,6 +3,7 @@
> for (int nodeIndex = 0; nodeIndex < genNodes.size(); nodeIndex++) {
> 	GenNode nextNode = (GenNode) genNodes.get(nodeIndex);
> 	TypeModelFacet typeModelFacet = nextNode.getModelFacet();
>+
> 	if (typeModelFacet == null || typeModelFacet.isPhantomElement()) {
> 		// Skipping top-level phantoms
> 		continue;
>Index: src-templates/org/eclipse/gmf/codegen/templates/policies/NodeItemSemanticEditPolicyGenerator.java
>===================================================================
>RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.codegen/src-templates/org/eclipse/gmf/codegen/templates/policies/Attic/NodeItemSemanticEditPolicyGenerator.java,v
>retrieving revision 1.59
>diff -u -r1.59 NodeItemSemanticEditPolicyGenerator.java
>--- src-templates/org/eclipse/gmf/codegen/templates/policies/NodeItemSemanticEditPolicyGenerator.java	11 Dec 2006 18:42:43 -0000	1.59
>+++ src-templates/org/eclipse/gmf/codegen/templates/policies/NodeItemSemanticEditPolicyGenerator.java	13 Feb 2007 18:15:46 -0000
>@@ -353,9 +353,11 @@
>   protected final String TEXT_334 = "(req.getSource()," + NL + "\t\t\t";
>   protected final String TEXT_335 = ".eINSTANCE.get";
>   protected final String TEXT_336 = "(), req.getTarget());" + NL + "\t\treturn getMSLWrapper(new ";
>-  protected final String TEXT_337 = "(setReq));" + NL + "\t}";
>-  protected final String TEXT_338 = NL + "}";
>-  protected final String TEXT_339 = NL;
>+  protected final String TEXT_337 = "(setReq)";
>+  protected final String TEXT_338 = "{" + NL + "\t\t\tprotected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {" + NL + "\t\t\t\torg.eclipse.gmf.runtime.emf.type.core.requests.SetRequest requestImpl = (org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest)getRequest();" + NL + "\t\t\t\torg.eclipse.emf.ecore.EObject requestTarget = (org.eclipse.emf.ecore.EObject)requestImpl.getValue();" + NL + "\t\t\t\tif (requestTarget.eResource() != null){" + NL + "\t\t\t\t\trequestTarget.eResource().getContents().remove(requestTarget);" + NL + "\t\t\t\t}" + NL + "\t\t\t\treturn super.doExecuteWithResult(monitor, info);" + NL + "\t\t\t}" + NL + "\t\t}";
>+  protected final String TEXT_339 = ");" + NL + "\t}";
>+  protected final String TEXT_340 = NL + "}";
>+  protected final String TEXT_341 = NL;
> 
> 	protected final String getFeatureValueGetter(String containerName, GenFeature feature, boolean isContainerEObject, ImportAssistant importManager) {
> 		StringBuffer result = new StringBuffer();
>@@ -1358,13 +1360,18 @@
>     stringBuffer.append(importManager.getImportedName("org.eclipse.gmf.runtime.emf.type.core.commands.SetValueCommand"));
>     stringBuffer.append(TEXT_337);
>     
>+if (genNode.getModelFacet() != null && genNode.getModelFacet().isPhantomElement()){
>+    stringBuffer.append(TEXT_338);
>+    }
>+    stringBuffer.append(TEXT_339);
>+    
> 		}
> 	}
> }
> 
>-    stringBuffer.append(TEXT_338);
>+    stringBuffer.append(TEXT_340);
>     importManager.emitSortedImports();
>-    stringBuffer.append(TEXT_339);
>+    stringBuffer.append(TEXT_341);
>     return stringBuffer.toString();
>   }
> }
>\ No newline at end of file
>Index: src-templates/org/eclipse/gmf/codegen/templates/policies/ChildContainerCanonicalEditPolicyGenerator.java
>===================================================================
>RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.codegen/src-templates/org/eclipse/gmf/codegen/templates/policies/ChildContainerCanonicalEditPolicyGenerator.java,v
>retrieving revision 1.41
>diff -u -r1.41 ChildContainerCanonicalEditPolicyGenerator.java
>--- src-templates/org/eclipse/gmf/codegen/templates/policies/ChildContainerCanonicalEditPolicyGenerator.java	24 Nov 2006 22:25:21 -0000	1.41
>+++ src-templates/org/eclipse/gmf/codegen/templates/policies/ChildContainerCanonicalEditPolicyGenerator.java	13 Feb 2007 18:15:38 -0000
>@@ -289,6 +289,7 @@
> for (int nodeIndex = 0; nodeIndex < genNodes.size(); nodeIndex++) {
> 	GenNode nextNode = (GenNode) genNodes.get(nodeIndex);
> 	TypeModelFacet typeModelFacet = nextNode.getModelFacet();
>+
> 	if (typeModelFacet == null || typeModelFacet.isPhantomElement()) {
> 		// Skipping top-level phantoms
> 		continue;
>Index: src-templates/org/eclipse/gmf/codegen/templates/policies/DiagramCanonicalEditPolicyGenerator.java
>===================================================================
>RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.codegen/src-templates/org/eclipse/gmf/codegen/templates/policies/DiagramCanonicalEditPolicyGenerator.java,v
>retrieving revision 1.51
>diff -u -r1.51 DiagramCanonicalEditPolicyGenerator.java
>--- src-templates/org/eclipse/gmf/codegen/templates/policies/DiagramCanonicalEditPolicyGenerator.java	24 Nov 2006 22:25:21 -0000	1.51
>+++ src-templates/org/eclipse/gmf/codegen/templates/policies/DiagramCanonicalEditPolicyGenerator.java	13 Feb 2007 18:15:40 -0000
>@@ -474,6 +474,7 @@
> for (int nodeIndex = 0; nodeIndex < genNodes.size(); nodeIndex++) {
> 	GenNode nextNode = (GenNode) genNodes.get(nodeIndex);
> 	TypeModelFacet typeModelFacet = nextNode.getModelFacet();
>+
> 	if (typeModelFacet == null || typeModelFacet.isPhantomElement()) {
> 		// Skipping top-level phantoms
> 		continue;
>Index: templates/policies/NodeItemSemanticEditPolicy.javajet
>===================================================================
>RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.codegen/templates/policies/Attic/NodeItemSemanticEditPolicy.javajet,v
>retrieving revision 1.45
>diff -u -r1.45 NodeItemSemanticEditPolicy.javajet
>--- templates/policies/NodeItemSemanticEditPolicy.javajet	11 Dec 2006 18:42:43 -0000	1.45
>+++ templates/policies/NodeItemSemanticEditPolicy.javajet	13 Feb 2007 18:17:30 -0000
>@@ -415,7 +415,18 @@
> <% // create semantic command %>
> 		<%=importManager.getImportedName("org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest")%> setReq = new <%=importManager.getImportedName("org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest")%>(req.getSource(),
> 			<%=importManager.getImportedName(metaFeature.getGenPackage().getQualifiedPackageInterfaceName())%>.eINSTANCE.get<%=metaFeature.getFeatureAccessorName()%>(), req.getTarget());
>-		return getMSLWrapper(new <%=importManager.getImportedName("org.eclipse.gmf.runtime.emf.type.core.commands.SetValueCommand")%>(setReq));
>+		return getMSLWrapper(new <%=importManager.getImportedName("org.eclipse.gmf.runtime.emf.type.core.commands.SetValueCommand")%>(setReq)<%
>+if (genNode.getModelFacet() != null && genNode.getModelFacet().isPhantomElement()){%>{
>+			protected CommandResult doExecuteWithResult(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
>+				org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest requestImpl = (org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest)getRequest();
>+				org.eclipse.emf.ecore.EObject requestTarget = (org.eclipse.emf.ecore.EObject)requestImpl.getValue();
>+				if (requestTarget.eResource() != null){
>+					requestTarget.eResource().getContents().remove(requestTarget);
>+				}
>+				return super.doExecuteWithResult(monitor, info);
>+			}
>+		}
>+<%}%>);
> 	}
> <%
> 		}
>Index: models/gmfgen.ecore
>===================================================================
>RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.codegen/models/gmfgen.ecore,v
>retrieving revision 1.192
>diff -u -r1.192 gmfgen.ecore
>--- models/gmfgen.ecore	28 Dec 2006 19:45:50 -0000	1.192
>+++ models/gmfgen.ecore	13 Feb 2007 18:15:21 -0000
>@@ -1001,6 +1001,9 @@
>       </eAnnotations>
>       <eParameters name="attributesClass" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaClass"/>
>     </eOperations>
>+    <eOperations name="eFind" eType="#//Attributes">
>+      <eParameters name="attributeEClass" eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EClass"/>
>+    </eOperations>
>     <eStructuralFeatures xsi:type="ecore:EReference" name="attributes" upperBound="-1"
>         eType="#//Attributes" containment="true"/>
>     <eStructuralFeatures xsi:type="ecore:EAttribute" name="requiredPluginIDs" upperBound="-1"
>Index: models/gmfgen.genmodel
>===================================================================
>RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.codegen/models/gmfgen.genmodel,v
>retrieving revision 1.175
>diff -u -r1.175 gmfgen.genmodel
>--- models/gmfgen.genmodel	28 Dec 2006 19:45:51 -0000	1.175
>+++ models/gmfgen.genmodel	13 Feb 2007 18:15:24 -0000
>@@ -533,6 +533,9 @@
>       <genOperations ecoreOperation="gmfgen.ecore#//Viewmap/find">
>         <genParameters ecoreParameter="gmfgen.ecore#//Viewmap/find/attributesClass"/>
>       </genOperations>
>+      <genOperations ecoreOperation="gmfgen.ecore#//Viewmap/eFind">
>+        <genParameters ecoreParameter="gmfgen.ecore#//Viewmap/eFind/attributeEClass"/>
>+      </genOperations>
>     </genClasses>
>     <genClasses ecoreClass="gmfgen.ecore#//FigureViewmap">
>       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute gmfgen.ecore#//FigureViewmap/figureQualifiedClassName"/>
>Index: src/org/eclipse/gmf/codegen/util/Generator.java
>===================================================================
>RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/util/Generator.java,v
>retrieving revision 1.154
>diff -u -r1.154 Generator.java
>--- src/org/eclipse/gmf/codegen/util/Generator.java	28 Dec 2006 19:45:50 -0000	1.154
>+++ src/org/eclipse/gmf/codegen/util/Generator.java	13 Feb 2007 18:17:21 -0000
>@@ -999,11 +999,11 @@
> 	}
> 
> 	private void generateBundleManifest() throws UnexpectedBehaviourException, InterruptedException {
>-		doGenerateFile(myEmitters.getBundleManifestEmitter(), new Path("META-INF/MANIFEST.MF"), new Object[] { myDiagram.getEditorGen().getPlugin() }); //$NON-NLS-1$
>+		//doGenerateFile(myEmitters.getBundleManifestEmitter(), new Path("META-INF/MANIFEST.MF"), new Object[] { myDiagram.getEditorGen().getPlugin() }); //$NON-NLS-1$
> 	}
> 
> 	private void generateBuildProperties() throws UnexpectedBehaviourException, InterruptedException {
>-		doGenerateFile(myEmitters.getBuildPropertiesEmitter(), new Path("build.properties"), new Object[] { myDiagram }); //$NON-NLS-1$
>+		//doGenerateFile(myEmitters.getBuildPropertiesEmitter(), new Path("build.properties"), new Object[] { myDiagram }); //$NON-NLS-1$
> 	}
> 	
> 	private void generateShortcutIcon() throws UnexpectedBehaviourException, InterruptedException {
>@@ -1134,4 +1134,4 @@
> 		c.registerFactor(GMFGenPackage.eINSTANCE.getBehaviour(), 1);
> 		setupProgressMonitor(null, c.getTotal(myEditorGen));
> 	}
>-}
>\ No newline at end of file
>+}
>Index: src/org/eclipse/gmf/codegen/util/CodegenEmitters.java
>===================================================================
>RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/util/CodegenEmitters.java,v
>retrieving revision 1.76
>diff -u -r1.76 CodegenEmitters.java
>--- src/org/eclipse/gmf/codegen/util/CodegenEmitters.java	28 Dec 2006 19:45:50 -0000	1.76
>+++ src/org/eclipse/gmf/codegen/util/CodegenEmitters.java	13 Feb 2007 18:17:20 -0000
>@@ -145,7 +145,8 @@
> 				"org.eclipse.emf.common", //$NON-NLS-1$
> 				"org.eclipse.emf.ecore", //$NON-NLS-1$
> 				"org.eclipse.gmf.common", //$NON-NLS-1$
>-				"org.eclipse.gmf.codegen" //$NON-NLS-1$
>+				"org.eclipse.gmf.codegen", //$NON-NLS-1$
>+				"org.eclipse.uml2.diagram.codegen", //$NON-NLS-1$
> 		};
> 		final URL baseURL = getTemplatesBundle().getEntry("/templates/"); //$NON-NLS-1$
> 		final URL dynamicURL = usePrecompiled ? null : getDynamicTemplatesURL(templateDirectory);
>Index: META-INF/MANIFEST.MF
>===================================================================
>RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.codegen/META-INF/MANIFEST.MF,v
>retrieving revision 1.22
>diff -u -r1.22 MANIFEST.MF
>--- META-INF/MANIFEST.MF	21 Dec 2006 21:01:01 -0000	1.22
>+++ META-INF/MANIFEST.MF	13 Feb 2007 18:15:17 -0000
>@@ -23,3 +23,4 @@
>  org.eclipse.gmf.xpand;bundle-version="[1.0.0,2.0.0)"
> Eclipse-LazyStart: true
> Bundle-RequiredExecutionEnvironment: J2SE-1.5
>+Eclipse-BuddyPolicy: registered
>Index: templates/xpt/diagram/providers/ElementTypes.xpt
>===================================================================
>RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.codegen/templates/xpt/diagram/providers/ElementTypes.xpt,v
>retrieving revision 1.2
>diff -u -r1.2 ElementTypes.xpt
>--- templates/xpt/diagram/providers/ElementTypes.xpt	20 Dec 2006 15:44:42 -0000	1.2
>+++ templates/xpt/diagram/providers/ElementTypes.xpt	13 Feb 2007 18:17:38 -0000
>@@ -62,7 +62,14 @@
> 	 */
> 	private static org.eclipse.jface.resource.ImageDescriptor getProvidedImageDescriptor(org.eclipse.emf.ecore.ENamedElement element) {
> 		if (element instanceof org.eclipse.emf.ecore.EStructuralFeature) {
>-			element = ((org.eclipse.emf.ecore.EStructuralFeature) element).getEContainingClass();
>+			org.eclipse.emf.ecore.EStructuralFeature feature = ((org.eclipse.emf.ecore.EStructuralFeature) element);
>+			org.eclipse.emf.ecore.EClass eContainingClass = feature.getEContainingClass();
>+			org.eclipse.emf.ecore.EClassifier eType = feature.getEType();
>+			if (eContainingClass != null && !eContainingClass.isAbstract()){
>+				element = eContainingClass;
>+			} else if (eType instanceof org.eclipse.emf.ecore.EClass && !((org.eclipse.emf.ecore.EClass)eType).isAbstract()){
>+				element = eType;
>+			}
> 		}
> 		if (element instanceof org.eclipse.emf.ecore.EClass) {
> 			org.eclipse.emf.ecore.EClass eClass = (org.eclipse.emf.ecore.EClass) element;

Flags:

borlander: iplog+
borlander: review+

Actions: View

Attachments on bug 174005: 58872