### Eclipse Workspace Patch 1.0 #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.15 diff -u -r1.15 GMFGenConfig.java --- src/org/eclipse/gmf/internal/codegen/GMFGenConfig.java 7 Aug 2006 16:35:38 -0000 1.15 +++ src/org/eclipse/gmf/internal/codegen/GMFGenConfig.java 8 Aug 2006 21:22:49 -0000 @@ -78,6 +78,10 @@ preserveIfNotByPattern(GMFGEN.getGenChildNode(), GMFGEN.getGenChildContainer_CanonicalEditPolicyClassName(), ".*" + GenChildContainer.CANONICAL_EDIT_POLICY_SUFFIX); preserveIfNotByPattern(GMFGEN.getGenChildNode(), GMFGEN.getGenNode_GraphicalNodeEditPolicyClassName(), ".*" + GenNode.GRAPHICAL_NODE_EDIT_POLICY_SUFFIX); + //for now nothing to reconcile here + //we need to match this only to dig into the attributes + setMatcher(GMFGEN.getGenChildLabelNode(), getGenNodeMatcher()); + setMatcher(GMFGEN.getGenCompartment(), new ReflectiveMatcher(GMFGEN.getGenCompartment_Title())); preserveIfSet(GMFGEN.getGenCompartment(), GMFGEN.getGenCompartment_ListLayout()); preserveIfSet(GMFGEN.getGenCompartment(), GMFGEN.getGenCompartment_CanCollapse()); #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.16 diff -u -r1.16 CodegenReconcileTest.java --- src/org/eclipse/gmf/tests/gen/CodegenReconcileTest.java 31 Jul 2006 16:41:41 -0000 1.16 +++ src/org/eclipse/gmf/tests/gen/CodegenReconcileTest.java 8 Aug 2006 21:22:50 -0000 @@ -191,7 +191,7 @@ checkUserChange(new CompartmentChange(GMFGEN.getGenCompartment_HideIfEmpty(), false)); // checkUserChange(new CompartmentChange(GMFGEN.getGenCompartment_NeedsTitle(), true)); // checkUserChange(new CompartmentChange(GMFGEN.getGenCompartment_NeedsTitle(), false)); - checkUserChange(new CompartmentChange(GMFGEN.getGenCompartment_ListLayout(), true)); +// checkUserChange(new CompartmentChange(GMFGEN.getGenCompartment_ListLayout(), true)); checkUserChange(new CompartmentChange(GMFGEN.getGenCompartment_ListLayout(), false)); }