### Eclipse Workspace Patch 1.0
#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.4
diff -u -r1.4 CodegenReconcileTest.java
--- src/org/eclipse/gmf/tests/gen/CodegenReconcileTest.java	30 Mar 2006 14:18:53 -0000	1.4
+++ src/org/eclipse/gmf/tests/gen/CodegenReconcileTest.java	30 Mar 2006 17:49:00 -0000
@@ -67,7 +67,9 @@
 
 	protected void setUp() throws Exception {
 		super.setUp();
-		myEditorGen = getSetup().getGenModel().getGenDiagram().getEditorGen(); 
+		MapDefSource mapDefSource = new MapSetup().init(new DiaDefSetup(null).init(), getSetup().getDomainModel(), new ToolDefSetup());
+		DiaGenSetup diaGenSetup = new DiaGenSetup().init(mapDefSource);
+		myEditorGen = diaGenSetup.getGenDiagram().getEditorGen();
 	}
 
 	protected final GenEditorGenerator getOriginal() {
@@ -101,23 +103,38 @@
 		class GenPluginChange extends Assert implements UserChange {
 			private final String NEW_PROVIDER = "NewProviderValue";
 			private final String NEW_VERSION = "NewVersionValue";
+			private final String NEW_ID = "NewPluginID";
+			private final String NEW_ACTIVATOR = "NewActivator";
+			private boolean myExpectedPrintingEnabled;
 
 			public void applyChanges(GenEditorGenerator old) {
 				GenPlugin genPlugin = old.getPlugin();
 				assertNotNull(genPlugin.getProvider());
 				assertNotNull(genPlugin.getVersion());
+				assertNotNull(genPlugin.getID());
+				assertNotNull(genPlugin.getActivatorClassName());
+				assertFalse(genPlugin.isPrintingEnabled());
+				
+				myExpectedPrintingEnabled = !genPlugin.isPrintingEnabled();
 
 				genPlugin.setProvider(NEW_PROVIDER);
 				genPlugin.setVersion(NEW_VERSION);
+				genPlugin.setID(NEW_ID);
+				genPlugin.setActivatorClassName(NEW_ACTIVATOR);
+				genPlugin.setPrintingEnabled(myExpectedPrintingEnabled);
 			}
 			
 			public void assertChangesPreserved(GenEditorGenerator current) {
-				assertEquals(NEW_PROVIDER, current.getPlugin().getProvider());
-				assertEquals(NEW_VERSION, current.getPlugin().getVersion());
+				GenPlugin genPlugin = current.getPlugin();
+				assertEquals(NEW_PROVIDER, genPlugin.getProvider());
+				assertEquals(NEW_VERSION, genPlugin.getVersion());
+				assertEquals(NEW_ID, genPlugin.getID());
+				assertEquals(NEW_ACTIVATOR, genPlugin.getActivatorClassName());
+				assertEquals(myExpectedPrintingEnabled, genPlugin.isPrintingEnabled());
 			}
 			
 			public ReconcilerConfigBase getReconcilerConfig() {
-				return new LimitedGMFGenConfig(true);
+				return new GMFGenConfig();
 			}
 		}
 		
#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.3
diff -u -r1.3 GMFGenConfig.java
--- src/org/eclipse/gmf/internal/codegen/GMFGenConfig.java	30 Mar 2006 14:18:51 -0000	1.3
+++ src/org/eclipse/gmf/internal/codegen/GMFGenConfig.java	30 Mar 2006 17:49:01 -0000
@@ -37,9 +37,11 @@
 		preserveIfSet(GMFGEN.getGenEditorGenerator(), GMFGEN.getGenEditorGenerator_SameFileForDiagramAndModel());
 		
 		setMatcher(GMFGEN.getGenPlugin(), ALWAYS_MATCH); //exactly one feature for ALWAYS_MATCH GenEditorGenerator
+		preserveIfSet(GMFGEN.getGenPlugin(), GMFGEN.getGenPlugin_ID());
 		preserveIfSet(GMFGEN.getGenPlugin(), GMFGEN.getGenPlugin_Provider());
 		preserveIfSet(GMFGEN.getGenPlugin(), GMFGEN.getGenPlugin_Version());
 		preserveIfSet(GMFGEN.getGenPlugin(), GMFGEN.getGenPlugin_ActivatorClassName());
+		preserveIfSet(GMFGEN.getGenPlugin(), GMFGEN.getGenPlugin_PrintingEnabled());
 		
 		setMatcher(GMFGEN.getGenDiagram(), ALWAYS_MATCH);