### Eclipse Workspace Patch 1.0 #P org.eclipse.gmf.map Index: src/org/eclipse/gmf/mappings/impl/GMFMapPackageImpl.java =================================================================== RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.map/src/org/eclipse/gmf/mappings/impl/GMFMapPackageImpl.java,v retrieving revision 1.42 diff -u -r1.42 GMFMapPackageImpl.java --- src/org/eclipse/gmf/mappings/impl/GMFMapPackageImpl.java 25 Aug 2006 18:32:47 -0000 1.42 +++ src/org/eclipse/gmf/mappings/impl/GMFMapPackageImpl.java 7 Sep 2006 12:16:14 -0000 @@ -2066,14 +2066,14 @@ (childReferenceEClass, source, new String[] { - "ocl", "let child:NodeMapping=(if ownedChild.oclIsUndefined() then referencedChild else ownedChild endif) in (((child.labelMappings->size() = 1) and child.labelMappings->forAll( soleLabel: LabelMapping | soleLabel.diagramLabel = child.diagramNode)) implies (child.diagramNode.affixedParentSide = gmfgraph::Direction::NSEW))", + "ocl", "let child:NodeMapping=(if ownedChild.oclIsUndefined() then referencedChild else ownedChild endif) in (((child.labelMappings->size() = 1) and child.labelMappings->forAll( soleLabel: LabelMapping | soleLabel.diagramLabel = child.diagramNode)) implies (child.diagramNode.affixedParentSide = gmfgraph::Direction::NONE))", "description", "Side-affixed children can not be pure labels" }); addAnnotation (childReferenceEClass, source, new String[] { - "ocl", "let child:NodeMapping=(if ownedChild.oclIsUndefined() then referencedChild else ownedChild endif) in ((not compartment.oclIsUndefined()) implies (child.diagramNode.affixedParentSide = gmfgraph::Direction::NSEW))", + "ocl", "let child:NodeMapping=(if ownedChild.oclIsUndefined() then referencedChild else ownedChild endif) in ((not compartment.oclIsUndefined()) implies (child.diagramNode.affixedParentSide = gmfgraph::Direction::NONE))", "description", "Side-affixed children can not be placed in compartments" }); addAnnotation Index: models/gmfmap.ecore =================================================================== RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.map/models/gmfmap.ecore,v retrieving revision 1.44 diff -u -r1.44 gmfmap.ecore --- models/gmfmap.ecore 25 Aug 2006 18:32:47 -0000 1.44 +++ models/gmfmap.ecore 7 Sep 2006 12:16:13 -0000 @@ -108,11 +108,11 @@
-
+
-
+