### Eclipse Workspace Patch 1.0
#P org.eclipse.gmf.codegen
Index: src/org/eclipse/gmf/codegen/gmfgen/impl/ElementTypeImpl.java
===================================================================
RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/gmfgen/impl/ElementTypeImpl.java,v
retrieving revision 1.4
diff -u -r1.4 ElementTypeImpl.java
--- src/org/eclipse/gmf/codegen/gmfgen/impl/ElementTypeImpl.java	20 Jul 2006 17:40:06 -0000	1.4
+++ src/org/eclipse/gmf/codegen/gmfgen/impl/ElementTypeImpl.java	25 Aug 2006 19:59:59 -0000
@@ -200,7 +200,7 @@
 	}
 
 	public String getDisplayName() {
-		if (GenCommonBaseImpl.isEmpty(getDisplayNameGen())) {
+		if (!GenCommonBaseImpl.isEmpty(getDisplayNameGen())) {
 			return getDisplayNameGen();
 		}
 		// Let element type label be the name of the corresponding creation tool.
#P org.eclipse.gmf.tests
Index: src/org/eclipse/gmf/tests/gen/CodegenReconcileTest.java
===================================================================
RCS file: /cvsroot/technology/org.eclipse.gmf/tests/org.eclipse.gmf.tests/src/org/eclipse/gmf/tests/gen/CodegenReconcileTest.java,v
retrieving revision 1.18
diff -u -r1.18 CodegenReconcileTest.java
--- src/org/eclipse/gmf/tests/gen/CodegenReconcileTest.java	18 Aug 2006 16:29:43 -0000	1.18
+++ src/org/eclipse/gmf/tests/gen/CodegenReconcileTest.java	25 Aug 2006 20:00:00 -0000
@@ -13,7 +13,9 @@
 
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collection;
 import java.util.Iterator;
+import java.util.LinkedList;
 import java.util.List;
 
 import junit.framework.Assert;
@@ -27,8 +29,10 @@
 import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.gmf.codegen.gmfgen.Attributes;
 import org.eclipse.gmf.codegen.gmfgen.DefaultSizeAttributes;
+import org.eclipse.gmf.codegen.gmfgen.ElementType;
 import org.eclipse.gmf.codegen.gmfgen.GMFGenFactory;
 import org.eclipse.gmf.codegen.gmfgen.GMFGenPackage;
+import org.eclipse.gmf.codegen.gmfgen.GenCommonBase;
 import org.eclipse.gmf.codegen.gmfgen.GenCompartment;
 import org.eclipse.gmf.codegen.gmfgen.GenDiagram;
 import org.eclipse.gmf.codegen.gmfgen.GenEditorGenerator;
@@ -56,7 +60,7 @@
 		return (GenEditorGenerator) EcoreUtil.copy(getOriginal());
 	}
 
-	public void testLoadGMFGen() throws Exception {
+	public void _testLoadGMFGen() throws Exception {
 		GenEditorGenerator original = getOriginal();
 		assertNotNull(original);
 		GenEditorGenerator copy = createCopy();
@@ -75,7 +79,7 @@
 		assertFalse(copy.getCopyrightText().equals(original.getCopyrightText()));
 	}
 
-	public void testReconcileDeepElementWithAlwaysMatcher() throws Exception {
+	public void _testReconcileDeepElementWithAlwaysMatcher() throws Exception {
 		class GenPluginChange extends Assert implements UserChange {
 			private final String NEW_PROVIDER = "NewProviderValue";
 			private final String NEW_VERSION = "NewVersionValue";
@@ -121,7 +125,7 @@
 		checkUserChange(new GenPluginChange());
 	}
 	
-	public void testReconcileCompartmentIsListLayout(){
+	public void _testReconcileCompartmentIsListLayout(){
 		class CompartmentChange extends Assert implements UserChange {
 			private int myCompartmentsTotalCount;
 			private final EStructuralFeature myGenCompartmentFeature;
@@ -195,7 +199,7 @@
 		checkUserChange(new CompartmentChange(GMFGEN.getGenCompartment_ListLayout(), false));
 	}
 	
-	public void testReconcileGenNodes() throws Exception {			
+	public void _testReconcileGenNodes() throws Exception {			
 		class ListLayoutChange extends Assert implements UserChange {
 			private final String NEW_CANONICAL_EP = "MyCanonicalPolicy";
 			private final String NEW_GRAPHICAL_EP = "MyGraphicalPolicy";
@@ -238,7 +242,7 @@
 		checkUserChange(new ListLayoutChange());
 	}
 	
-	public void testReconcileGenDiagram(){
+	public void _testReconcileGenDiagram(){
 		final class DiagramChange extends SingleChange {
 			public DiagramChange(EAttribute attribute, String valueToSet) {
 				super(attribute, valueToSet);
@@ -248,7 +252,7 @@
 				super(attribute, valueToSet);
 			}
 
-			protected EObject findChangeSubjet(GenEditorGenerator root) {
+			protected EObject findChangeSubject(GenEditorGenerator root) {
 				return root.getDiagram();
 			}
 		}
@@ -269,7 +273,7 @@
 		checkUserChange(new DiagramChange(GMF.getEditorCandies_CreationWizardCategoryID(), "com.myCompany.TheBestCategory"));
 	}
 
-	public void testReconcileGenDiagram_Shortcuts(){
+	public void _testReconcileGenDiagram_Shortcuts(){
 		final String[] PROVIDED_FOR = {"ModelA", "ModelB", "ModelC"}; 
 		final String[] CONTAINS_TO = {"txt", "mdm", "taipan"};
 		final String[] EMPTY = new String[0];
@@ -315,7 +319,7 @@
 		checkUserChange(emptyChange);
 	}
 
-	public void testReconcileGenEditorGenerator_LimitedConfig() throws Exception {
+	public void _testReconcileGenEditorGenerator_LimitedConfig() throws Exception {
 		class UserChangeImpl extends Assert implements UserChange {
 			private boolean mySameFile;
 			private final boolean myExpectingCopyrightPreserved;
@@ -363,7 +367,7 @@
 		
 	}
 	
-	public void testReconcileGenEditorGenerator(){
+	public void _testReconcileGenEditorGenerator(){
 		class GenEditorGeneratorChange extends SingleChange {
 			public GenEditorGeneratorChange(EAttribute attribute, boolean expectedValue) {
 				super(attribute, expectedValue);
@@ -373,7 +377,7 @@
 				super(attribute, expectedValue);
 			}
 
-			protected final EObject findChangeSubjet(GenEditorGenerator root) {
+			protected final EObject findChangeSubject(GenEditorGenerator root) {
 				return root;
 			}
 		}
@@ -413,13 +417,13 @@
 		checkUserChange(new GenEditorGeneratorChange(GMFGenPackage.eINSTANCE.getGenEditorGenerator_DomainFileExtension(), "xxx"));
 	}
 	
-	public void testReconcileGenEditorView(){
+	public void _testReconcileGenEditorView(){
 		final class EditorChange extends SingleChange {
 			public EditorChange(EAttribute attribute, String valueToSet) {
 				super(attribute, valueToSet);
 			}
 
-			protected EObject findChangeSubjet(GenEditorGenerator root) {
+			protected EObject findChangeSubject(GenEditorGenerator root) {
 				return root.getEditor();
 			}
 		}
@@ -440,7 +444,7 @@
 		checkUserChange(new EditorChange(GMF.getGenEditorView_ID(), "my.editor.id"));
 	}
 	
-	public void testReconcileViewmapAttributes(){
+	public void _testReconcileViewmapAttributes(){
 		abstract class AbstractAttributesChange implements UserChange {
 			private int myAffectedViewmapsCount;
 			
@@ -511,6 +515,92 @@
 		checkUserChange(new DefaultSizeChange());
 	}
 	
+	public void testReconcileMetamodelType(){
+		abstract class ElementTypeChange implements UserChange {
+			protected abstract void applyChange(ElementType elementType);
+			protected abstract void assertChange(ElementType elementType);
+			
+			protected Collection collectSubjects(GenEditorGenerator editorGenerator){
+				LinkedList allWithType = new LinkedList();
+				GenDiagram diagram = editorGenerator.getDiagram();
+				allWithType.add(diagram);
+				allWithType.addAll(diagram.getAllChildContainers());
+				//XXX: we do not know how to match links yet 
+				//allWithType.addAll(diagram.getLinks());
+				return allWithType;
+			}
+			
+			public final void applyChanges(GenEditorGenerator old) {
+				for (Iterator all = collectSubjects(old).iterator(); all.hasNext();){
+					GenCommonBase next = (GenCommonBase)all.next();
+					ElementType nextElementType = next.getElementType();
+					if (nextElementType == null){
+						continue;
+					}
+					applyChange(nextElementType);
+				}
+			}
+			
+			public final void assertChangesPreserved(GenEditorGenerator current) {
+				for (Iterator all = collectSubjects(current).iterator(); all.hasNext();){
+					GenCommonBase next = (GenCommonBase)all.next();
+					ElementType nextElementType = next.getElementType();
+					if (nextElementType == null){
+						continue;
+					}
+					assertChange(nextElementType);
+				}
+			}
+			
+			public final ReconcilerConfigBase getReconcilerConfig() {
+				return new GMFGenConfig();
+			}
+
+			protected String toString(ElementType elementType) {
+				return String.valueOf(elementType)/* + " for :" + String.valueOf(elementType.getDiagramElement())*/;
+			}
+		
+		}
+		
+		class DisplayNameChange extends ElementTypeChange {
+			private final String myValue;
+
+			public DisplayNameChange(String value){
+				myValue = value;
+			}
+			
+			protected void applyChange(ElementType elementType) {
+				elementType.setDisplayName(myValue);
+			}
+			
+			protected void assertChange(ElementType elementType) {
+				assertEquals(toString(elementType), myValue, elementType.getDisplayName());
+			}
+		}
+		
+		class DefinedExternallyChange extends ElementTypeChange {
+			private boolean myValue;
+			
+			public DefinedExternallyChange(boolean value){
+				myValue = value;
+			}
+			
+			protected void applyChange(ElementType elementType) {
+				elementType.setDefinedExternally(myValue);
+			}
+			
+			protected void assertChange(ElementType elementType) {
+				assertEquals(toString(elementType), myValue, elementType.isDefinedExternally());
+			}
+
+		}
+		
+		checkUserChange(new DisplayNameChange("ABCD"));
+		//XXX: does not work: checkUserChange(new DisplayNameChange(""));
+		checkUserChange(new DefinedExternallyChange(true));
+		checkUserChange(new DefinedExternallyChange(false));
+	}
+	
 	private void checkUserChange(UserChange userChange){
 		GenEditorGenerator old = createCopy();
 		GenEditorGenerator current = createCopy();
@@ -563,17 +653,17 @@
 			myValueToSet = valueToSet;
 		}
 		
-		protected abstract EObject findChangeSubjet(GenEditorGenerator root);
+		protected abstract EObject findChangeSubject(GenEditorGenerator root);
 		
 		public void applyChanges(GenEditorGenerator old) {
-			EObject subject = findChangeSubjet(old);
+			EObject subject = findChangeSubject(old);
 			assertNotNull(subject);
 			subject.eSet(myAttribute, myValueToSet);
 			myExpectedValue = subject.eGet(myAttribute);
 		}
 		
 		public void assertChangesPreserved(GenEditorGenerator current) {
-			EObject subject = findChangeSubjet(current);
+			EObject subject = findChangeSubject(current);
 			assertNotNull(subject);
 			assertEquals(myExpectedValue, subject.eGet(myAttribute));
 		}
#P org.eclipse.gmf.codegen.ui
Index: src/org/eclipse/gmf/internal/codegen/GMFGenConfig.java
===================================================================
RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.codegen.ui/src/org/eclipse/gmf/internal/codegen/GMFGenConfig.java,v
retrieving revision 1.17
diff -u -r1.17 GMFGenConfig.java
--- src/org/eclipse/gmf/internal/codegen/GMFGenConfig.java	25 Aug 2006 18:32:42 -0000	1.17
+++ src/org/eclipse/gmf/internal/codegen/GMFGenConfig.java	25 Aug 2006 20:00:02 -0000
@@ -108,6 +108,15 @@
 		addDecisionMaker(GMFGEN.getGenLinkLabel(), new DecisionMaker.ALWAYS_OLD(GMFGEN.getGenCommonBase_CustomBehaviour()));
 		addDecisionMaker(GMFGEN.getGenNodeLabel(), new DecisionMaker.ALWAYS_OLD(GMFGEN.getGenCommonBase_CustomBehaviour()));
 		addDecisionMaker(GMFGEN.getGenExternalNodeLabel(), new DecisionMaker.ALWAYS_OLD(GMFGEN.getGenCommonBase_CustomBehaviour()));
+		
+		setMatcher(GMFGEN.getMetamodelType(), ALWAYS_MATCH);
+		preserveIfSet(GMFGEN.getMetamodelType(), GMFGEN.getElementType_DisplayName());
+		preserveIfSet(GMFGEN.getMetamodelType(), GMFGEN.getElementType_DefinedExternally());
+
+		setMatcher(GMFGEN.getSpecializationType(), ALWAYS_MATCH);
+		preserveIfSet(GMFGEN.getSpecializationType(), GMFGEN.getElementType_DisplayName());
+		preserveIfSet(GMFGEN.getSpecializationType(), GMFGEN.getElementType_DefinedExternally());
+	
 	}
 
 	private Matcher getGenNodeMatcher(){