### Eclipse Workspace Patch 1.0
#P org.eclipse.gmf.tests
Index: src/org/eclipse/gmf/tests/migration/MigrationPatchesTest.java
===================================================================
RCS file: /cvsroot/modeling/org.eclipse.gmf/tests/org.eclipse.gmf.tests/src/org/eclipse/gmf/tests/migration/MigrationPatchesTest.java,v
retrieving revision 1.18
diff -u -r1.18 MigrationPatchesTest.java
--- src/org/eclipse/gmf/tests/migration/MigrationPatchesTest.java	29 May 2007 13:41:34 -0000	1.18
+++ src/org/eclipse/gmf/tests/migration/MigrationPatchesTest.java	4 Jun 2007 16:45:33 -0000
@@ -22,6 +22,7 @@
 import org.eclipse.core.runtime.Path;
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.emf.ecore.resource.ResourceSet;
@@ -36,15 +37,20 @@
 import org.eclipse.gmf.gmfgraph.Canvas;
 import org.eclipse.gmf.gmfgraph.Compartment;
 import org.eclipse.gmf.gmfgraph.Connection;
+import org.eclipse.gmf.gmfgraph.CustomFigure;
 import org.eclipse.gmf.gmfgraph.DiagramLabel;
 import org.eclipse.gmf.gmfgraph.Figure;
 import org.eclipse.gmf.gmfgraph.FigureDescriptor;
 import org.eclipse.gmf.gmfgraph.FigureGallery;
 import org.eclipse.gmf.gmfgraph.FlowLayout;
+import org.eclipse.gmf.gmfgraph.GMFGraphPackage;
 import org.eclipse.gmf.gmfgraph.Label;
 import org.eclipse.gmf.gmfgraph.LabeledContainer;
+import org.eclipse.gmf.gmfgraph.LineKind;
 import org.eclipse.gmf.gmfgraph.Node;
 import org.eclipse.gmf.gmfgraph.PolylineConnection;
+import org.eclipse.gmf.gmfgraph.PolylineDecoration;
+import org.eclipse.gmf.gmfgraph.RealFigure;
 import org.eclipse.gmf.gmfgraph.Rectangle;
 import org.eclipse.gmf.internal.common.ToolingResourceFactory;
 import org.eclipse.gmf.internal.common.migrate.MigrationResource;
@@ -459,7 +465,7 @@
 		URI newUri = temporarySaveMigratedModel(gmfgraphFileName, "basic", "gmfgraph");
 		changeNsUriToOldOne(newUri, "gmfgraph", "http://www.eclipse.org/gmf/2005/GraphicalDefinition");
 		
-		//assertOnLoadModelMigrationDidNothing(newUri);
+		assertOnLoadModelMigrationDidNothing(newUri);
 		checkAllFigureReferences(newUri);
 	}
 
@@ -479,9 +485,16 @@
 		
 		FigureGallery fg = canvas.getFigures().get(0);
 		assertEquals("GenericDiagramFigures", fg.getName());
-		assertTrue(fg.getFigures().isEmpty());
+		assertFalse(fg.getFigures().isEmpty());
+		assertEquals(1, fg.getFigures().size());
+
+		Figure figure0 = fg.getFigures().get(0);
+		assertTrue(figure0 instanceof PolylineDecoration);
+		PolylineDecoration linked = (PolylineDecoration) figure0;
+		assertEquals("ArrowDecoration", linked.getName());
+		
 		assertFalse(fg.getDescriptors().isEmpty());
-		assertEquals(5, fg.getDescriptors().size());
+		assertEquals(6, fg.getDescriptors().size());
 		
 		FigureDescriptor fg1 = fg.getDescriptors().get(0);
 		assertTrue(fg1.getAccessors().isEmpty());
@@ -545,6 +558,16 @@
 		assertEquals(1, nnr.getDescriptor().getAccessors().size());
 		assertEquals(nnrLabel, nnr.getDescriptor().getAccessors().get(0).getFigure());
 
+		Figure figure6 = fg.getDescriptors().get(5).getActualFigure();
+		assertTrue(figure6 instanceof PolylineConnection);
+		PolylineConnection fcf = (PolylineConnection) figure6;
+		assertEquals("FigureConnectionFigure", fcf.getName());
+		assertEquals(LineKind.LINE_DASHDOT_LITERAL, fcf.getLineKind());
+		assertNotNull(fcf.getTargetDecoration());
+		assertEquals(linked, fcf.getTargetDecoration());
+		assertNotNull(fcf.getDescriptor());
+		assertEquals(fcf, fcf.getDescriptor().getActualFigure());
+
 		assertNotNull(canvas.getNodes());
 		assertFalse(canvas.getNodes().isEmpty());
 		assertEquals(2, canvas.getNodes().size());
@@ -583,4 +606,129 @@
 		assertEquals("LabelWOIcon", l3.getName());
 	}
 
+	public void testCustomFigures() throws Exception {
+		assertTrue(((EClass)GMFGraphPackage.eINSTANCE.getFigureAccessor_TypedFigure().getEType()).isAbstract());
+		
+		URI gmfgraphFileName = createURI("customFigures.gmfgraph"); //$NON-NLS-1$
+		
+		Exception caughtGenException = assertOrdinaryLoadModelProblems(gmfgraphFileName);
+		assertTrue("expected diagnostic exception", caughtGenException != null); //$NON-NLS-1$				
+
+		assertOnLoadModelMigrationSuccess(gmfgraphFileName);
+		checkCustomFiguresContent(gmfgraphFileName);
+
+		URI newUri = temporarySaveMigratedModel(gmfgraphFileName, "customFigures", "gmfgraph");
+		changeNsUriToOldOne(newUri, "gmfgraph", "http://www.eclipse.org/gmf/2005/GraphicalDefinition");
+		
+		assertOnLoadModelMigrationDidNothing(newUri);
+		checkCustomFiguresContent(newUri);
+	}
+
+	private void checkCustomFiguresContent(URI modelUri) {
+		ModelLoadHelper loadHelper = new ModelLoadHelper(new ResourceSetImpl(), modelUri);
+		Resource resource = loadHelper.getLoadedResource();
+		
+		assertEquals(1, resource.getContents().size());
+		Object first = resource.getContents().get(0);
+		assertTrue(first instanceof Canvas);
+		Canvas canvas = (Canvas) first;
+		assertEquals(7, canvas.eContents().size());
+		
+		assertNotNull(canvas.getFigures());
+		assertEquals(1, canvas.getFigures().size());
+		FigureGallery fg = canvas.getFigures().get(0);
+		
+		assertNotNull(fg.getFigures());
+		assertEquals(3, fg.getFigures().size());
+		
+		Figure figure1 = fg.getFigures().get(0);
+		assertTrue(figure1 instanceof CustomFigure);
+		assertEquals("org.eclipse.draw2d.ScalableFigure", ((CustomFigure)figure1).getQualifiedClassName());
+		
+		assertNotNull(fg.getDescriptors());
+		assertEquals(4, fg.getDescriptors().size());
+		
+		Figure node1figure = fg.getDescriptors().get(0).getActualFigure();
+		assertNotNull(node1figure);
+		assertTrue(node1figure instanceof CustomFigure);
+		assertEquals(1, ((CustomFigure) node1figure).getCustomChildren().size());
+		RealFigure compartment2figure = ((CustomFigure) node1figure).getCustomChildren().get(0).getTypedFigure();
+		assertNotNull(compartment2figure);
+		assertTrue(compartment2figure instanceof CustomFigure);
+		assertEquals("org.eclipse.draw2d.IFigure", ((CustomFigure)compartment2figure).getQualifiedClassName());
+		
+		Figure node2figure = fg.getDescriptors().get(1).getActualFigure();
+		assertNotNull(node2figure);
+		assertTrue(node2figure instanceof CustomFigure);
+		assertEquals(1, ((CustomFigure) node2figure).getCustomChildren().size());
+		RealFigure compartment1figure = ((CustomFigure) node2figure).getCustomChildren().get(0).getTypedFigure();
+		assertNotNull(compartment1figure);
+		
+		Figure node3figure = fg.getDescriptors().get(2).getActualFigure();
+		assertNotNull(node3figure);
+		assertTrue(node3figure instanceof CustomFigure);
+		assertEquals(1, ((CustomFigure) node3figure).getCustomChildren().size());
+		RealFigure compartment4figure = ((CustomFigure) node3figure).getCustomChildren().get(0).getTypedFigure();
+		assertNotNull(compartment4figure);
+		assertTrue(compartment4figure instanceof CustomFigure);
+		assertEquals("org.eclipse.draw2d.ScalableFigure", ((CustomFigure)compartment4figure).getQualifiedClassName());
+		assertNotNull(node3figure);
+		
+		Figure compartment3figure = fg.getDescriptors().get(3).getActualFigure();
+		assertNotNull(compartment3figure);
+		
+		assertNotNull(canvas.getNodes());
+		assertEquals(2, canvas.getNodes().size());
+		
+		Node node1 = canvas.getNodes().get(0);
+		assertEquals("LocalPreconditionNode", node1.getName());
+		assertNotNull(node1.getFigure());
+		assertEquals(node1figure, node1.getFigure().getActualFigure());
+		
+		Node node2 = canvas.getNodes().get(1);
+		assertEquals("LocalPostconditionNode", node2.getName());
+		assertNotNull(node2.getFigure());
+		assertEquals(node2figure, node2.getFigure().getActualFigure());
+		
+		assertNotNull(canvas.getCompartments());
+		assertEquals(4, canvas.getCompartments().size());
+		
+		Compartment compartment1 = canvas.getCompartments().get(0);
+		assertEquals("postcondition", compartment1.getName());
+		assertNotNull(compartment1.getFigure());
+		assertNotNull(compartment1.getAccessor());
+		assertEquals(compartment1figure, compartment1.getAccessor().getFigure());
+		
+		Compartment compartment2 = canvas.getCompartments().get(1);
+		assertEquals("precondition", compartment2.getName());
+		assertNotNull(compartment2.getFigure());
+		assertNotNull(compartment2.getAccessor());
+		assertEquals(compartment2figure, compartment2.getAccessor().getFigure());
+		
+		Compartment compartment3 = canvas.getCompartments().get(2);
+		assertEquals("anotherPostcondition", compartment3.getName());
+		assertNotNull(compartment3.getFigure());
+		assertNull(compartment3.getAccessor());
+		
+		Compartment compartment4 = canvas.getCompartments().get(3);
+		assertEquals("TargetCustomDecorCompartment", compartment4.getName());
+		assertNotNull(compartment4.getFigure());
+		assertNotNull(compartment4.getAccessor());
+		assertEquals(compartment4figure, compartment4.getAccessor().getFigure());
+	}
+	
+	public void testMultifiles() throws Exception {
+		URI gmfgraphFileName = createURI("multifile_main.gmfgraph"); //$NON-NLS-1$
+		
+		Exception caughtGenException = assertOrdinaryLoadModelProblems(gmfgraphFileName);
+		assertTrue("expected diagnostic exception", caughtGenException != null); //$NON-NLS-1$				
+
+		assertOnLoadModelMigrationSuccess(gmfgraphFileName);
+
+		URI newUri = temporarySaveMigratedModel(gmfgraphFileName, "multifile_main", "gmfgraph");
+		changeNsUriToOldOne(newUri, "gmfgraph", "http://www.eclipse.org/gmf/2005/GraphicalDefinition");
+		
+		assertOnLoadModelMigrationDidNothing(newUri);
+	}
+
 }
Index: src/org/eclipse/gmf/tests/migration/GenericMigrationTest.java
===================================================================
RCS file: /cvsroot/modeling/org.eclipse.gmf/tests/org.eclipse.gmf.tests/src/org/eclipse/gmf/tests/migration/GenericMigrationTest.java,v
retrieving revision 1.10
diff -u -r1.10 GenericMigrationTest.java
--- src/org/eclipse/gmf/tests/migration/GenericMigrationTest.java	24 May 2007 09:34:38 -0000	1.10
+++ src/org/eclipse/gmf/tests/migration/GenericMigrationTest.java	4 Jun 2007 16:45:33 -0000
@@ -484,8 +484,8 @@
 			}
 
 			@Override
-			public void postProcess() {
-				super.postProcess();
+			public void preResolve() {
+				super.preResolve();
 				for (EObject narrowed : myToBeChecked) {
 					if (!narrowed.eIsSet(myAttrNarrowChild)) {
 						EObject defaultTyped = narrowed.eClass().getEPackage().getEFactoryInstance().create((EClass) myWidenedRef1.getEType());
Index: src/org/eclipse/gmf/tests/migration/GMFGraphMigrationTest.java
===================================================================
RCS file: /cvsroot/modeling/org.eclipse.gmf/tests/org.eclipse.gmf.tests/src/org/eclipse/gmf/tests/migration/GMFGraphMigrationTest.java,v
retrieving revision 1.2
diff -u -r1.2 GMFGraphMigrationTest.java
--- src/org/eclipse/gmf/tests/migration/GMFGraphMigrationTest.java	28 May 2007 13:47:47 -0000	1.2
+++ src/org/eclipse/gmf/tests/migration/GMFGraphMigrationTest.java	4 Jun 2007 16:45:33 -0000
@@ -21,8 +21,8 @@
 
 import junit.framework.Test;
 import junit.framework.TestCase;
-import junit.framework.TestResult;
 
+import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Path;
 import org.eclipse.emf.common.util.EList;
@@ -56,37 +56,35 @@
 		}
 
 		public void testFile() throws Exception {
-			assertNoOrdinaryLoadModelProblems(myGMFGraphFileURI);
-			
-			//assertOrdinaryLoadModelProblems(gmfgraphFileURI);
+			assertPossibleProblemsOnOrdinaryLoad(myGMFGraphFileURI);
 
-			//assertOnLoadModelMigrationSuccess(gmfgraphFileURI);
+			assertSuccessOnMigrationLoad(myGMFGraphFileURI);
 
 			URI newGenUri = temporarySaveMigratedModel(myGMFGraphFileURI, myGMFGraphFileURI.trimFileExtension().lastSegment(), myGMFGraphFileURI.fileExtension());
 			changeNsUriToOldOne(newGenUri, "gmfgraph", "http://www.eclipse.org/gmf/2005/GraphicalDefinition"); //$NON-NLS-1$ //$NON-NLS-2$
 			
-			//assertOnLoadModelMigrationDidNothing(newGenUri);
-			
-			assertNoOrdinaryLoadModelProblems(newGenUri);
+			assertOnSecondLoadModelMigrationDidNothing(newGenUri);
 		}
 
-		static void assertOnLoadModelMigrationSuccess(URI uri) throws Exception {
+		static void assertSuccessOnMigrationLoad(URI uri) throws Exception {
 			ModelLoadHelper loadHelper = new ModelLoadHelper(new ResourceSetImpl(), uri);
 			
 			EList<Resource.Diagnostic> errors = loadHelper.getLoadedResource().getErrors();
 			assertTrue("Errors found after migration ("+uri+"): "+errors, errors.isEmpty()); //$NON-NLS-1$ //$NON-NLS-2$
 			
-			assertTrue("Migration warning load status expected for "+uri, loadHelper.getStatus().matches(IStatus.WARNING)); //$NON-NLS-1$
 			EList<Resource.Diagnostic> warnings = loadHelper.getLoadedResource().getWarnings();
-			assertEquals("Single Warning diagnostic expected for "+uri, 1, warnings.size()); //$NON-NLS-1$		
-			assertTrue("MigrationDiagnostic expected as warning for "+uri, warnings.get(0) instanceof MigrationResource.Diagnostic); //$NON-NLS-1$
+			if (!warnings.isEmpty()) {
+				assertTrue("Migration warning load status expected for "+uri, loadHelper.getStatus().matches(IStatus.WARNING)); //$NON-NLS-1$
+				assertEquals("Single Warning diagnostic expected for "+uri, 1, warnings.size()); //$NON-NLS-1$		
+				assertTrue("MigrationDiagnostic expected as warning for "+uri, warnings.get(0) instanceof MigrationResource.Diagnostic); //$NON-NLS-1$
+			}
 			
 			assertTrue(loadHelper.getLoadedResource() instanceof XMLResource);
 			XMLResource xmlResource = (XMLResource) loadHelper.getLoadedResource();
 			assertEquals("Unknown elements were recorded after migration of "+uri, 0, xmlResource.getEObjectToExtensionMap().size()); //$NON-NLS-1$
 		}
 
-		static void assertOnLoadModelMigrationDidNothing(URI uri) throws Exception {
+		static void assertOnSecondLoadModelMigrationDidNothing(URI uri) throws Exception {
 			ModelLoadHelper loadHelper = new ModelLoadHelper(new ResourceSetImpl(), uri);
 			
 			EList<Resource.Diagnostic> errors = loadHelper.getLoadedResource().getErrors();
@@ -117,7 +115,7 @@
 		}
 
 		
-		static Exception assertOrdinaryLoadModelProblems(URI uri) throws Exception {
+		static boolean assertPossibleProblemsOnOrdinaryLoad(URI uri) throws Exception {
 			Resource resource = new ToolingResourceFactory().createResource(uri);
 			ResourceSet rset = new ResourceSetImpl();
 			rset.getResources().add(resource);
@@ -128,9 +126,8 @@
 			} catch (RuntimeException e) {
 				caughtException = e;
 			}
-			assertTrue("Expected model loading problems for "+uri, //$NON-NLS-1$
-					caughtException != null || !resource.getErrors().isEmpty() || !resource.getWarnings().isEmpty());
-			return caughtException;
+			boolean hadProblems = caughtException != null || !resource.getErrors().isEmpty() || !resource.getWarnings().isEmpty();
+			return hadProblems;
 		}
 
 		private static URI temporarySaveMigratedModel(URI uri, String tempFilename, String tempFileExtension) throws IOException {
@@ -143,7 +140,7 @@
 			try {
 				resource.save(null);
 			} catch (IOException ex) {
-				fail(ex.toString());
+				fail("["+uri+"] Migrated resource save failed: "+ex.toString());
 			}
 			return newUri;
 		}
@@ -164,9 +161,6 @@
 	private static Collection<URI> collectAllGMFGraphFiles(String rootFolder) {
 		Collection<URI> result = new ArrayList<URI>();
 		File root = new File(rootFolder);
-		if (!root.isDirectory()) {
-			root = root.getParentFile();
-		}
 		collectFilesRecursive(root, result, new FilenameFilter() {
 			public boolean accept(File dir, String name) {
 				return name.endsWith(".gmfgraph"); //$NON-NLS-1$
@@ -190,7 +184,12 @@
 	
 	public static Collection<TestCase> createAllTests() {
 		Collection<TestCase> result = new ArrayList<TestCase>(100);
-		for (URI gmfgraphFileURI : collectAllGMFGraphFiles(File.listRoots()[0].getAbsolutePath())) { //$NON-NLS-1$
+		File workspaceRoot = ResourcesPlugin.getWorkspace().getRoot().getLocation().toFile();
+		String rootPath = workspaceRoot.getAbsolutePath();
+		if (workspaceRoot.getParentFile() != null) {
+			rootPath = workspaceRoot.getParentFile().getAbsolutePath();
+		}
+		for (URI gmfgraphFileURI : collectAllGMFGraphFiles(rootPath)) {
 			GMFGraphFileTest test = new GMFGraphFileTest(gmfgraphFileURI);
 			result.add(test);
 		}
Index: src/org/eclipse/gmf/tests/migration/AllMigrationTests.java
===================================================================
RCS file: /cvsroot/modeling/org.eclipse.gmf/tests/org.eclipse.gmf.tests/src/org/eclipse/gmf/tests/migration/AllMigrationTests.java,v
retrieving revision 1.3
diff -u -r1.3 AllMigrationTests.java
--- src/org/eclipse/gmf/tests/migration/AllMigrationTests.java	28 May 2007 13:43:42 -0000	1.3
+++ src/org/eclipse/gmf/tests/migration/AllMigrationTests.java	4 Jun 2007 16:45:33 -0000
@@ -22,7 +22,7 @@
 		suite.addTestSuite(GenericMigrationTest.class);
 		suite.addTestSuite(MigrationPatchesTest.class);
 		for (TestCase fileTest : GMFGraphMigrationTest.createAllTests()) {
-			//suite.addTest(fileTest);
+			suite.addTest(fileTest);
 		}
 		//$JUnit-END$
 		return suite;
Index: models/migration/basic.gmfgraph
===================================================================
RCS file: /cvsroot/modeling/org.eclipse.gmf/tests/org.eclipse.gmf.tests/models/migration/basic.gmfgraph,v
retrieving revision 1.1
diff -u -r1.1 basic.gmfgraph
--- models/migration/basic.gmfgraph	28 May 2007 13:43:42 -0000	1.1
+++ models/migration/basic.gmfgraph	4 Jun 2007 16:45:33 -0000
@@ -49,6 +49,23 @@
           referencingElements="NamedNode_Name"
           name="NamedNode_NameLabelFigure"/>
     </figures>
+    <figures
+        xsi:type="gmfgraph:PolylineConnection"
+        referencingElements="Link"
+        name="FigureConnectionFigure"
+        lineKind="LINE_DASHDOT"
+        targetDecoration="ArrowDecoration"/>
+    <figures
+        xsi:type="gmfgraph:PolylineDecoration"
+        name="ArrowDecoration">
+      <template
+          x="-1"
+          y="1"/>
+      <template/>
+      <template
+          x="-1"
+          y="-1"/>
+    </figures>
   </figures>
   <nodes
       name="Node"
Index: models/migration/multifile_main.gmfgraph
===================================================================
RCS file: models/migration/multifile_main.gmfgraph
diff -N models/migration/multifile_main.gmfgraph
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ models/migration/multifile_main.gmfgraph	1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<gmfgraph:Canvas xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:gmfgraph="http://www.eclipse.org/gmf/2005/GraphicalDefinition" name="EclipseCon">
+  <figures name="default">
+    <figures xsi:type="gmfgraph:Label" name="ResourceTag" text="&lt;&lt;Resource>>"/>
+    <figures xsi:type="gmfgraph:Rectangle" name="ThickFigure" lineWidth="3" referencingElements="ScheduleNode">
+      <children xsi:type="gmfgraph:Label" name="ThickFigureLabel" referencingElements="ScheduleName"/>
+    </figures>
+    <figures xsi:type="gmfgraph:PolylineConnection" name="SolidLineSquareDec" referencingElements="HandoutLink">
+      <sourceDecoration xsi:type="gmfgraph:PolygonDecoration" href="multifile_linked.gmfgraph#SquareDecoration"/>
+    </figures>
+    <figures xsi:type="gmfgraph:RoundedRectangle" name="SlotFigure" lineWidth="2" cornerWidth="20" cornerHeight="20" referencingElements="SlotNode">
+      <layout xsi:type="gmfgraph:FlowLayout" vertical="true" matchMinorSize="true" forceSingleLine="true" minorAlignment="CENTER"/>
+      <children xsi:type="gmfgraph:Label" name="LabelStart" referencingElements="SlotStart"/>
+      <children xsi:type="gmfgraph:Label" name="LabelEnd" text="" referencingElements="SlotEnd"/>
+      <foregroundColor xsi:type="gmfgraph:ConstantColor" value="cyan"/>
+    </figures>
+    <figures xsi:type="gmfgraph:Rectangle" name="ResourceFigure">
+      <children xsi:type="gmfgraph:Label" name="ResourceNameLabel"/>
+      <children xsi:type="gmfgraph:Label" name="ResourceLocationLabel"/>
+    </figures>
+    <figures xsi:type="gmfgraph:Rectangle" name="TutorialFigure">
+      <children xsi:type="gmfgraph:Label" name="Tag" text="&lt;&lt;Tutorial>>"/>
+      <children xsi:type="gmfgraph:Label" name="TitleLabel" text=""/>
+    </figures>
+  </figures>
+  <nodes name="ScheduleNode" figure="ThickFigure"/>
+  <nodes name="PresenterNode">
+    <figure xsi:type="gmfgraph:Rectangle" href="multifile_linked.gmfgraph#ActorFigure"/>
+  </nodes>
+  <nodes name="ResourceNode" figure="ResourceFigure"/>
+  <nodes name="TutorialNode" figure="TutorialFigure"/>
+  <nodes name="SlotNode" figure="SlotFigure"/>
+  <connections name="HandoutLink" figure="SolidLineSquareDec"/>
+  <connections name="AssignTimeLink">
+    <figure xsi:type="gmfgraph:PolylineConnection" href="multifile_linked.gmfgraph#DotLineNoDecorations"/>
+  </connections>
+  <connections name="PresenterLink">
+    <figure xsi:type="gmfgraph:PolylineConnection" href="multifile_linked.gmfgraph#DashLineNoDecorations"/>
+  </connections>
+  <labels name="PresenterName">
+    <figure xsi:type="gmfgraph:Label" href="multifile_linked.gmfgraph#Label"/>
+  </labels>
+  <labels name="ResourceName" figure="ResourceNameLabel"/>
+  <labels name="ResourceLocation" figure="ResourceLocationLabel"/>
+  <labels name="SlotStart" figure="LabelStart"/>
+  <labels name="SlotEnd" figure="LabelEnd"/>
+  <labels name="ScheduleName" figure="ThickFigureLabel"/>
+  <labels name="TutorialLabel" figure="TitleLabel"/>
+  <labels name="ResourceTagLabel" figure="ResourceTag"/>
+</gmfgraph:Canvas>
Index: models/migration/multifile_linked.gmfgraph
===================================================================
RCS file: models/migration/multifile_linked.gmfgraph
diff -N models/migration/multifile_linked.gmfgraph
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ models/migration/multifile_linked.gmfgraph	1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="ASCII"?>
+<gmfgraph:FigureGallery xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:gmfgraph="http://www.eclipse.org/gmf/2005/GraphicalDefinition" name="EclipseConFigures">
+  <figures xsi:type="gmfgraph:Rectangle" name="ActorFigure" fill="false" outline="false">
+    <layout xsi:type="gmfgraph:FlowLayout" vertical="true" forceSingleLine="true"/>
+    <children xsi:type="gmfgraph:Ellipse" name="Head" lineWidth="2">
+      <size x="50" y="50"/>
+    </children>
+    <children xsi:type="gmfgraph:Polygon" name="Body" fill="true">
+      <template x="30" y="50"/>
+      <template x="20" y="50"/>
+      <template x="10" y="10"/>
+    </children>
+    <children xsi:type="gmfgraph:Label" name="Label"/>
+  </figures>
+  <figures xsi:type="gmfgraph:PolygonDecoration" name="SquareDecoration" fill="true">
+   <foregroundColor xsi:type="gmfgraph:ConstantColor" value="black"/>
+    <template y="-1"/>
+    <template y="1"/>
+    <template x="-2" y="1"/>
+    <template x="-2" y="-1"/>
+  </figures>
+  <figures xsi:type="gmfgraph:PolylineConnection" name="DashLineNoDecorations" lineKind="LINE_DASH"/>
+  <figures xsi:type="gmfgraph:PolylineConnection" name="DotLineNoDecorations" lineKind="LINE_DOT"/>
+</gmfgraph:FigureGallery>
Index: models/migration/customFigures.gmfgraph
===================================================================
RCS file: models/migration/customFigures.gmfgraph
diff -N models/migration/customFigures.gmfgraph
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ models/migration/customFigures.gmfgraph	1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<gmfgraph:Canvas xmi:version="2.0"
+    xmlns:xmi="http://www.omg.org/XMI"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:gmfgraph="http://www.eclipse.org/gmf/2005/GraphicalDefinition">
+  <figures>
+    <figures
+        xsi:type="gmfgraph:CustomFigure"
+        referencingElements="LocalPreconditionNode"
+        name="LocalPreconditionFigure"
+        qualifiedClassName="org.eclipse.uml2.diagram.common.draw2d.ConstraintFigure"
+        bundleName="">
+      <attributes
+          name="FixedLabelText"
+          value="&quot;\u00ABlocalPrecondition\u00BB&quot;"/>
+      <customChildren
+          referencingElements="precondition"
+          accessor="getContentPane"/>
+    </figures>
+    <figures
+        xsi:type="gmfgraph:CustomFigure"
+        referencingElements="LocalPostconditionNode"
+        name="LocalPostconditionFigure"
+        qualifiedClassName="org.eclipse.uml2.diagram.common.draw2d.ConstraintFigure"
+        bundleName="">
+      <attributes
+          name="FixedLabelText"
+          value="&quot;\u00ABlocalPostcondition\u00BB&quot;"/>
+      <customChildren
+          referencingElements="postcondition"
+          accessor="getContentPane">
+        <typedFigure
+            href="PostconditionContentPane"/>
+      </customChildren>
+    </figures>
+    <figures
+        xsi:type="gmfgraph:CustomConnection"
+        name="CustomConnectFigure">
+      <customChildren
+          referencingElements="TargetCustomDecorCompartment"
+          accessor="getFigure2"
+          typedFigure="CustomFigure"/>
+    </figures>
+    <figures
+        xsi:type="gmfgraph:CustomFigure"
+        name="CustomFigure"
+        qualifiedClassName="org.eclipse.draw2d.ScalableFigure"
+        bundleName="some.bundle"/>
+    <figures
+        xsi:type="gmfgraph:CustomFigure"
+        name="AnotherPostconditionFigure"
+        qualifiedClassName="org.eclipse.uml2.diagram.common.draw2d.ConstraintFigure"
+        bundleName="">
+      <customChildren
+          accessor="getContentPane">
+        <typedFigure
+            href="AnotherPostconditionContentPane"/>
+      </customChildren>
+    </figures>
+    <figures
+        xsi:type="gmfgraph:Rectangle"
+        name="PostconditionContentPane"
+        outline="false"
+        fill="false"/>
+    <figures
+        xsi:type="gmfgraph:Rectangle"
+        name="AnotherPostconditionContentPane"
+        outline="false"
+        referencingElements="anotherPostcondition"
+        fill="false"/>
+  </figures>
+  <nodes
+      name="LocalPreconditionNode"
+      figure="LocalPreconditionFigure"/>
+  <nodes
+      name="LocalPostconditionNode"
+      figure="LocalPostconditionFigure"/>
+  <compartments
+      name="postcondition"
+      figure="//@figures.0/@figures.1/@customChildren.0"/>
+  <compartments
+      name="precondition"
+      figure="//@figures.0/@figures.0/@customChildren.0"/>
+  <compartments
+      name="anotherPostcondition"
+      figure="AnotherPostconditionContentPane"/>
+  <compartments
+      name="TargetCustomDecorCompartment"
+      figure="//@figures.0/@figures.2/@customChildren.0"/>
+</gmfgraph:Canvas>
#P org.eclipse.gmf.codegen
Index: src/org/eclipse/gmf/internal/codegen/util/MigrationDelegate.java
===================================================================
RCS file: /cvsroot/modeling/org.eclipse.gmf/plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/internal/codegen/util/MigrationDelegate.java,v
retrieving revision 1.6
diff -u -r1.6 MigrationDelegate.java
--- src/org/eclipse/gmf/internal/codegen/util/MigrationDelegate.java	24 May 2007 09:34:47 -0000	1.6
+++ src/org/eclipse/gmf/internal/codegen/util/MigrationDelegate.java	4 Jun 2007 16:45:35 -0000
@@ -180,7 +180,7 @@
 	}
 
 	@Override
-	public void postProcess() {
+	public void preResolve() {
 		if (getSavedRequiredPlugins() == null) {
 			return;
 		}
#P org.eclipse.gmf.graphdef
Index: src/org/eclipse/gmf/internal/graphdef/util/MigrationDelegate.java
===================================================================
RCS file: /cvsroot/modeling/org.eclipse.gmf/plugins/org.eclipse.gmf.graphdef/src/org/eclipse/gmf/internal/graphdef/util/MigrationDelegate.java,v
retrieving revision 1.2
diff -u -r1.2 MigrationDelegate.java
--- src/org/eclipse/gmf/internal/graphdef/util/MigrationDelegate.java	29 May 2007 13:41:35 -0000	1.2
+++ src/org/eclipse/gmf/internal/graphdef/util/MigrationDelegate.java	4 Jun 2007 16:45:37 -0000
@@ -10,31 +10,44 @@
  */
 package org.eclipse.gmf.internal.graphdef.util;
 
+import java.text.MessageFormat;
+import java.util.ArrayList;
+import java.util.Collection;
 import java.util.HashMap;
+import java.util.Iterator;
 import java.util.Map;
 
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EReference;
 import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.ecore.EcorePackage;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.emf.ecore.resource.impl.ResourceImpl;
+import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.gmf.gmfgraph.ChildAccess;
 import org.eclipse.gmf.gmfgraph.Compartment;
+import org.eclipse.gmf.gmfgraph.CustomFigure;
 import org.eclipse.gmf.gmfgraph.DiagramElement;
 import org.eclipse.gmf.gmfgraph.DiagramLabel;
 import org.eclipse.gmf.gmfgraph.Figure;
+import org.eclipse.gmf.gmfgraph.FigureAccessor;
 import org.eclipse.gmf.gmfgraph.FigureDescriptor;
 import org.eclipse.gmf.gmfgraph.FigureGallery;
 import org.eclipse.gmf.gmfgraph.GMFGraphFactory;
 import org.eclipse.gmf.gmfgraph.GMFGraphPackage;
-import org.eclipse.gmf.gmfgraph.Node;
 import org.eclipse.gmf.gmfgraph.RealFigure;
 import org.eclipse.gmf.internal.common.migrate.MigrationDelegateImpl;
 
 class MigrationDelegate extends MigrationDelegateImpl {
 	private EReference myFigure_RefElements;
+	private EReference myDiagramElement_RefFigure;
 	
-	//private FigureGallery myDefaultCreatedFigureGallery;
+	private Map<String, EObject> myId2EObject;
+	private Collection<EObject> myProxiesToResolve;
+	private Map<DiagramElement, String> myDiagramElementReferencedFigure;
+	
+	private Collection<EReference> myRemainedFigureReferences;
+	private Map<FigureAccessor, ChildAccess> myAccessNeedsToBeSpecifiedLater;
 	
 	MigrationDelegate() {
 	}
@@ -45,23 +58,108 @@
 		
 		registerDeletedAttributes(GMFGraphPackage.eINSTANCE.getCustomClass(), "bundleName"); //$NON-NLS-1$
 		
-		myFigure_RefElements = createNewReference("referencingElements", GMFGraphPackage.eINSTANCE.getDiagramElement(), false); //$NON-NLS-1$
-		registerRenamedParentAttribute(GMFGraphPackage.eINSTANCE.getFigure(), "referencingElements", myFigure_RefElements); //$NON-NLS-1$
+		myFigure_RefElements = createNewReference("referencingElementsFake", GMFGraphPackage.eINSTANCE.getDiagramElement(), false); //$NON-NLS-1$
+		registerTracedFeatureForHierarchy(GMFGraphPackage.eINSTANCE.getFigure(), "referencingElements", myFigure_RefElements); //$NON-NLS-1$
+		registerTracedFeatureForHierarchy(GMFGraphPackage.eINSTANCE.getFigureAccessor(), "referencingElements", myFigure_RefElements); //$NON-NLS-1$
+		
+		// look, we have replaced FigureDescriptor-typed reference with plain EString attribute to take full control on resolving it later in postLoad:
+		myDiagramElement_RefFigure = createNewReference("figure", EcorePackage.eINSTANCE.getEString(), false); //$NON-NLS-1$
+		registerTracedFeatureForHierarchy(GMFGraphPackage.eINSTANCE.getDiagramElement(), "figure", myDiagramElement_RefFigure); //$NON-NLS-1$
+		
+		registerRemainedReferenceToFigure(GMFGraphPackage.eINSTANCE.getFigureAccessor_TypedFigure());
+		registerRemainedReferenceToFigure(GMFGraphPackage.eINSTANCE.getPolylineConnection_SourceDecoration());
+		registerRemainedReferenceToFigure(GMFGraphPackage.eINSTANCE.getPolylineConnection_TargetDecoration());
+		
+		myId2EObject = null;
+		myProxiesToResolve = null;
+		myDiagramElementReferencedFigure = null;
+	}
+
+	private boolean isOneOfRemainedFigureReferences(EStructuralFeature feature) {
+		if (myRemainedFigureReferences == null) {
+			return false;
+		}
+		return myRemainedFigureReferences.contains(feature);
+	}
+
+	private void registerRemainedReferenceToFigure(EReference reference) {
+		if (myRemainedFigureReferences == null) {
+			myRemainedFigureReferences = new ArrayList<EReference>();
+		}
+		myRemainedFigureReferences.add(reference);
 	}
 
 	@Override
 	public boolean setValue(EObject object, EStructuralFeature feature, Object value, int position) {
-		if (myFigure_RefElements.equals(feature)) {
+		// during load
+		
+		if (object instanceof Figure && "name".equals(feature.getName())) {
+			// this feature used to be ID in old versions, so need to emulate this during processing to
+			// provide manual reference resolving later, in postLoad
+			String name = (String) value;
+			saveEObjectIdLocally(object, name);
+		}
+		if (isOneOfRemainedFigureReferences(feature) && value instanceof RealFigure) {
+			RealFigure figure = (RealFigure) value;
+			if (figure.eIsProxy()) {
+				// this could happen due to generating resource with references using an older style
+				// of hyperlink serialization, where it needs to be in separate element with
+				// "href" attribute (controlled by option XMIResource.OPTION_USE_ENCODED_ATTRIBUTE_STYLE)
+				saveReferenceToGetContainmentLater(figure);
+			}
+		}
+		if (myDiagramElement_RefFigure.equals(feature)) {
+			// we are going to resolve figure references in postprocessing, ourselves, see postLoad()
+			DiagramElement diagramElement = (DiagramElement) object;
+			String figureRef = (String) value;
+			saveDiagramElementReferencedFigure(diagramElement, figureRef);
+			return true;
+		}
+		
+		// after end of document (between preResolve and postLoad calls), handling forward references:
+		
+		if (isOneOfRemainedFigureReferences(feature) && value instanceof FigureDescriptor) {
+			// as in old version a name is used for id of referenced figure, and now we set this name
+			// for its figure descriptor, if the figure is directly nested into it, - we could receive 
+			// an instanceof descriptor resolved for this id value
+			FigureDescriptor descriptor = (FigureDescriptor) value;
+			Figure figure = descriptor.getActualFigure();
+			fireMigrationApplied(true);
+			// we call setValue again only for the case of handling containment reference, where we do not want
+			// it to be removed from original descriptor, but just to be copied instead 
+			if (!setValue(object, feature, figure, position)) {
+				object.eSet(feature, figure);
+				return true;
+			}
+		} 
+		if (GMFGraphPackage.eINSTANCE.getFigureAccessor_TypedFigure().equals(feature) && value instanceof CustomFigure) {
+			CustomFigure custom = (CustomFigure) value;
+			FigureAccessor accessor = (FigureAccessor) object;
+			EObject container = custom.eContainer();
+			if (!custom.eIsProxy() && container != null) {
+				CustomFigure copy = (CustomFigure) EcoreUtil.copy(custom);
+				accessor.setTypedFigure(copy);
+				fireMigrationApplied(true);
+				return true;
+			} 
+			// opposite case for proxy is going to be processed in preReserve(), here we let the proxy value to be set as always,
+			// as well as ordinary containment value (we can recognize the case by null container yet)
+		} 
+		if (myFigure_RefElements.equals(feature) && object instanceof Figure) {
+			DiagramElement node = (DiagramElement) resolveValue((EObject) value, object);
 			Figure figure = (Figure) object; // can be FigureRef as well
 			RealFigure topLevel = findTopLevelFigure(figure);
-			FigureDescriptor figureDescriptor = getOrCreateFigureDescriptorFor(topLevel);
-			if (figure instanceof RealFigure) { //XXX!!! think smth out!
-				replaceFigureIdWithDescriptorIdInResolve(figureDescriptor, ((RealFigure) figure).getName());
-			}
-			if (!figure.equals(topLevel)) {
-				ChildAccess access = getOrCreateChildAccessForNested(figure, figureDescriptor);
-				DiagramElement node = (DiagramElement) value;
-				setNestedFigureAccessFor(node, access);
+			setFigureToDiagramElement(node, figure, topLevel);
+			fireMigrationApplied(true);
+		} else if (myFigure_RefElements.equals(feature) && object instanceof FigureAccessor) {
+			DiagramElement node = (DiagramElement) resolveValue((EObject) value, object);
+			FigureAccessor accessor = (FigureAccessor) object;
+			Figure figure = accessor.getTypedFigure();
+			RealFigure topLevel = findTopLevelFigure((Figure) accessor.eContainer());
+			ChildAccess access = setFigureToDiagramElement(node, figure, topLevel);
+			if (figure == null) {
+				// it could happen that we have not processed our typedFigure reference yet!
+				saveAccessNeedsToBeSpecifiedLater(accessor, access);
 			}
 			fireMigrationApplied(true);
 		} else {
@@ -71,39 +169,235 @@
 		return true;
 	}
 
+	private void saveAccessNeedsToBeSpecifiedLater(FigureAccessor accessor, ChildAccess access) {
+		if (myAccessNeedsToBeSpecifiedLater == null) {
+			myAccessNeedsToBeSpecifiedLater = new HashMap<FigureAccessor, ChildAccess>();
+		}
+		myAccessNeedsToBeSpecifiedLater.put(accessor, access);
+	}
+
+	private EObject resolveValue(EObject value, EObject object) {
+		EObject result = value;
+		if (result.eIsProxy()) {
+			result = EcoreUtil.resolve(result, object);
+		}
+		return result;
+	}
+
+	private ChildAccess setFigureToDiagramElement(DiagramElement node, Figure figure, RealFigure topLevel) {
+		// figure can be null, in case of processing reference to FigureAccessor directly
+		FigureDescriptor figureDescriptor = topLevel.getDescriptor();
+		if (figureDescriptor == null) {
+			figureDescriptor = getOrCreateFigureDescriptorFor(topLevel);
+		}
+		node.setFigure(figureDescriptor);
+		if (!topLevel.equals(figure)) {
+			ChildAccess access = getOrCreateChildAccessForNested(figure, figureDescriptor);
+			setNestedFigureAccessFor(node, access);
+			return access;
+		}
+		return null;
+	}
+
+	private void saveDiagramElementReferencedFigure(DiagramElement diagramElement, String figureRef) {
+		if (myDiagramElementReferencedFigure == null) {
+			myDiagramElementReferencedFigure = new HashMap<DiagramElement, String>();
+		}
+		if (figureRef != null && figureRef.length() != 0) {
+			myDiagramElementReferencedFigure.put(diagramElement, figureRef);
+		}
+	}
+
+	@Override
+	public boolean setManyReference(EObject object, EStructuralFeature feature, Object[] values) {
+		return myFigure_RefElements.equals(feature);
+	}
+
+	@Override
+	public void preResolve() {
+		super.preResolve();
+		Resource resource = getResource();
+		// this is run BEFORE forward references handling 
+		if (myId2EObject != null && resource instanceof ResourceImpl) {
+			Map<String, EObject> idMappings = ((ResourceImpl)resource).getIntrinsicIDToEObjectMap();
+			if (idMappings == null) {
+				idMappings = new HashMap<String, EObject>();
+				((ResourceImpl)resource).setIntrinsicIDToEObjectMap(idMappings);
+			}
+			for (Iterator<Map.Entry<String, EObject>> it = myId2EObject.entrySet().iterator(); it.hasNext();) {
+				Map.Entry<String, EObject> next = it.next();
+				String id = next.getKey();
+				EObject found = resource.getEObject(id);
+				if (found == null) {
+					idMappings.put(id, next.getValue());
+				} else {
+					it.remove();//setValue(found);
+				}
+			}
+			
+		}
+		if (myProxiesToResolve != null) {
+			for (EObject proxy : myProxiesToResolve) {
+				// these proxies are expected just to be references, used to be non-containment in the past,
+				// and interpreted by loader as proxies because of having "href" attribute 
+				String last = EcoreUtil.getURI(proxy).lastSegment();
+				EObject saved = resource.getEObject(last);//myId2EObject.get(last);
+				if (proxy.eContainer() instanceof FigureAccessor) {
+					FigureAccessor accessor = (FigureAccessor) proxy.eContainer();
+					// saved could be FigureDescriptor for migrated resources with proxy customFigure references
+					if (saved instanceof RealFigure) {
+						RealFigure copyOfResolved = (RealFigure) EcoreUtil.copy(saved);
+						accessor.setTypedFigure(copyOfResolved);
+					} else if (saved instanceof FigureDescriptor) {
+						FigureDescriptor descriptor = (FigureDescriptor) saved;
+						RealFigure copyOfResolved = (RealFigure) EcoreUtil.copy(descriptor.getActualFigure());
+						accessor.setTypedFigure(copyOfResolved);
+					}
+				}
+			}
+			myProxiesToResolve.clear();
+		}
+	}
+	
+	@Override
+	public void postLoad() {
+		super.postLoad();
+		Resource resource = getResource();
+		if (myAccessNeedsToBeSpecifiedLater != null) {
+			for (FigureAccessor accessor : myAccessNeedsToBeSpecifiedLater.keySet()) {
+				ChildAccess access = myAccessNeedsToBeSpecifiedLater.get(accessor);
+				if (access != null && access.getFigure() == null) {
+					RealFigure figure = getOrCreateTypedFigure(accessor);
+					access.setFigure(figure);
+				}
+			}
+			myAccessNeedsToBeSpecifiedLater.clear();
+		}
+		if (myDiagramElementReferencedFigure != null) {
+			for (DiagramElement diagramElement : myDiagramElementReferencedFigure.keySet()) {
+				if (diagramElement.getFigure() != null) {
+					// this is the case of resolving this reference while processing forwardReference,
+					// that existed in the same file
+					continue;
+				}
+				// try to resolve this reference manually
+				String figureRef = myDiagramElementReferencedFigure.get(diagramElement);
+				// in the other case this reference either do not have a forward one (i.e. it
+				// is a new file, and the reference points to an existing descriptor),
+				// either it points to another old file, that should migrate and restructure
+				// itself at the moment it meets forward reference to our diagram element.
+				EObject referencedEObject = resource.getEObject(figureRef);
+				if (referencedEObject != null && referencedEObject.eIsProxy()) {
+					// this should LOAD all referenced resources, and migrate them if necessary
+					referencedEObject = EcoreUtil.resolve(referencedEObject, diagramElement);
+					Resource referencedResource = referencedEObject.eResource();
+					if (referencedResource != null && !referencedResource.equals(resource)) {
+						// our tests check for migration warning and error absence only on the created resource, 
+						// so temporarily collect them here:
+						resource.getWarnings().addAll(referencedResource.getWarnings());
+						resource.getErrors().addAll(referencedResource.getErrors());
+					}
+					if (diagramElement.getFigure() != null) {
+						// referenced file is migrated, we got value during 'referencedElements' processing
+						fireMigrationApplied(true);
+						continue;
+					}
+				}
+				if (referencedEObject instanceof FigureDescriptor) {
+					// this is newest properly structured metamodel reference
+					diagramElement.setFigure((FigureDescriptor) referencedEObject);
+				} else if (referencedEObject instanceof Figure) {
+					// this could be the case of nested figure, that came for its name
+					Figure figure = (Figure) referencedEObject;
+					if (figure.getDescriptor() == null) {
+						// Otherwise we have a reference to a figure that had no forward reference
+						// to ourselves!! That was possible prior to GMF 1.0 RC2_10.
+						// Should we initialize wrapping it with descriptor in such case?
+						// Fortunately, FigureAccessor (with no ID attribute!) is introduced afterwards,
+						// since GMF 1.0 I20060526_1200 build (prior to RC1_0, though).
+						setValue(figure, myFigure_RefElements, diagramElement, 0);
+						fireMigrationApplied(true);
+					}
+					FigureDescriptor descriptor = figure.getDescriptor();
+					if (descriptor != null) {
+						diagramElement.setFigure(descriptor);
+					} else {
+						// this message is going to be shown to the user, so there should be i18n
+						throw new IllegalArgumentException(MessageFormat.format("Reference to the figure {0} could not be resolved to its descriptor for diagram element {1}", figure, diagramElement));
+					}
+				} else {
+					// this message is going to be shown to the user, so there should be i18n
+					throw new IllegalArgumentException(MessageFormat.format("Figure reference to {0} could not be resolved for {1}", referencedEObject, diagramElement));
+				}
+			}
+			myDiagramElementReferencedFigure.clear();
+		}
+		Map<String, EObject> idMappings = ((ResourceImpl)resource).getIntrinsicIDToEObjectMap();
+		if (idMappings != null && myId2EObject != null) {
+			idMappings.keySet().removeAll(myId2EObject.keySet());
+			myId2EObject.clear();
+		}
+	}
+
+	private void saveEObjectIdLocally(EObject object, String id) {
+		if (myId2EObject == null) {
+			myId2EObject = new HashMap<String, EObject>();
+		}
+		if (myId2EObject.get(id) == null) {
+			myId2EObject.put(id, object);
+		} else {
+			// collision with figure name expected only in new versions, as old ones used this as id 
+		}
+	}
+
+	private void saveReferenceToGetContainmentLater(EObject proxy) {
+		if (myProxiesToResolve == null) {
+			myProxiesToResolve = new ArrayList<EObject>();
+		}
+		myProxiesToResolve.add(proxy);
+	}
+
+	private RealFigure getOrCreateTypedFigure(FigureAccessor accessor) {
+		RealFigure result = accessor.getTypedFigure();
+		if (result == null) {
+			CustomFigure custom = GMFGraphFactory.eINSTANCE.createCustomFigure();
+			// @see org.eclipse.gmf.codegen/templates/xpt/diagram/editparts/TextAware.xpt::labelSetterFigureClassName
+			custom.setQualifiedClassName("org.eclipse.draw2d.IFigure"); //$NON-NLS-1$
+			accessor.setTypedFigure(custom);
+			result = custom;
+		}
+		return result;
+	}
+
+	private CustomFigure findParentCustomFigure(FigureAccessor accessor) {
+		CustomFigure result = null;
+		if (accessor.eContainer() instanceof CustomFigure) {
+			result = (CustomFigure) accessor.eContainer();
+		}
+		return result;
+	}
+
 	private void setNestedFigureAccessFor(DiagramElement dElem, ChildAccess access) {
 		if (dElem instanceof DiagramLabel) {
 			DiagramLabel label = (DiagramLabel) dElem;
 			label.setAccessor(access);
-		} else if (dElem instanceof Node) {
-			Node node = (Node) dElem;
-			node.setContentPane(access);
 		} else if (dElem instanceof Compartment) {
 			Compartment bag = (Compartment) dElem;
 			bag.setAccessor(access);
 		}
 	}
 
-	private void replaceFigureIdWithDescriptorIdInResolve(EObject figure, String name) {
-		//XXX: there is still problem with references for figures, when not only
-		// figureDescriptors are needed. For ex., see PolylineConnection.targetDecoration
-		Resource resource = getResource();
-		if (resource instanceof ResourceImpl) {
-			ResourceImpl resourceImpl = (ResourceImpl) resource;
-			Map<String, EObject> idMap = resourceImpl.getIntrinsicIDToEObjectMap();
-			if (idMap == null) {
-				idMap = new HashMap<String, EObject>();
-				resourceImpl.setIntrinsicIDToEObjectMap(idMap);
-			}
-			idMap.put(name, figure);
-		}
-	}
-
 	private RealFigure findTopLevelFigure(Figure figure) {
-		RealFigure result = figure instanceof RealFigure ? (RealFigure) figure : null;
-		while (result.eContainer() instanceof RealFigure) {
-			result = (RealFigure) result.eContainer();
-		} // contained within FigureGallery of FigureDescriptor
+		RealFigure result =  figure instanceof RealFigure ? (RealFigure) figure : null;
+		Object container = result.eContainer();
+		while (container instanceof RealFigure || container instanceof FigureAccessor) {
+			if (container instanceof FigureAccessor) {
+				result = findParentCustomFigure((FigureAccessor) container);
+			} else {
+				result = (RealFigure) result.eContainer();
+			}
+			container = result.eContainer();
+		} // now it should be the one contained within FigureGallery or FigureDescriptor
 		return result;
 	}
 
@@ -135,17 +429,4 @@
 		}
 		return descriptor;
 	}
-	
-//	private FigureGallery getOrCreateFigureGalleryOnce(Figure figure) {
-//		if (myDefaultCreatedFigureGallery == null) {
-//			myDefaultCreatedFigureGallery = GMFGraphFactory.eINSTANCE.createFigureGallery();
-//			if (figure.eContainer() instanceof Canvas) {
-//				Canvas canvas = (Canvas) figure.eContainer();
-//				canvas.getFigures().add(myDefaultCreatedFigureGallery);
-//			} else {
-//				figure.eResource().getContents().add(myDefaultCreatedFigureGallery);
-//			}
-//		}
-//		return myDefaultCreatedFigureGallery;
-//	}
 }
#P org.eclipse.gmf.map
Index: src/org/eclipse/gmf/internal/map/util/MigrationDelegate.java
===================================================================
RCS file: /cvsroot/modeling/org.eclipse.gmf/plugins/org.eclipse.gmf.map/src/org/eclipse/gmf/internal/map/util/MigrationDelegate.java,v
retrieving revision 1.4
diff -u -r1.4 MigrationDelegate.java
--- src/org/eclipse/gmf/internal/map/util/MigrationDelegate.java	24 May 2007 09:34:40 -0000	1.4
+++ src/org/eclipse/gmf/internal/map/util/MigrationDelegate.java	4 Jun 2007 16:45:38 -0000
@@ -100,7 +100,7 @@
 	}
 
 	@Override
-	public void postProcess() {
+	public void preResolve() {
 		if (getSavedLabelMappingMigrations() == null) {
 			return;
 		}
#P org.eclipse.gmf.common
Index: src/org/eclipse/gmf/internal/common/migrate/MigrationDelegate.java
===================================================================
RCS file: /cvsroot/modeling/org.eclipse.gmf/plugins/org.eclipse.gmf.common/src/org/eclipse/gmf/internal/common/migrate/MigrationDelegate.java,v
retrieving revision 1.2
diff -u -r1.2 MigrationDelegate.java
--- src/org/eclipse/gmf/internal/common/migrate/MigrationDelegate.java	28 May 2007 13:43:40 -0000	1.2
+++ src/org/eclipse/gmf/internal/common/migrate/MigrationDelegate.java	4 Jun 2007 16:45:39 -0000
@@ -15,7 +15,7 @@
 import org.eclipse.emf.ecore.EFactory;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.xmi.XMLResource;
+import org.eclipse.emf.ecore.resource.Resource;
 
 public interface MigrationDelegate {
 	
@@ -27,13 +27,15 @@
 	
 	public EObject createObject(EFactory factory, EClassifier type);
 	
-	public void postProcess();
+	public void preResolve();
 
 	public void processObject(EObject result);
 
 	public boolean isMigrationApplied();
 
-	public String getID(EObject obj);
+	public void setResource(Resource resource);
 
-	public void setResource(XMLResource resource);
+	public boolean setManyReference(EObject object, EStructuralFeature feature, Object[] values);
+
+	public void postLoad();
 }
Index: src/org/eclipse/gmf/internal/common/migrate/MigrationHelper.java
===================================================================
RCS file: /cvsroot/modeling/org.eclipse.gmf/plugins/org.eclipse.gmf.common/src/org/eclipse/gmf/internal/common/migrate/MigrationHelper.java,v
retrieving revision 1.6
diff -u -r1.6 MigrationHelper.java
--- src/org/eclipse/gmf/internal/common/migrate/MigrationHelper.java	28 May 2007 13:43:40 -0000	1.6
+++ src/org/eclipse/gmf/internal/common/migrate/MigrationHelper.java	4 Jun 2007 16:45:39 -0000
@@ -10,11 +10,14 @@
  */
 package org.eclipse.gmf.internal.common.migrate;
 
+import java.util.List;
+
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EClassifier;
 import org.eclipse.emf.ecore.EFactory;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.ecore.xmi.XMIException;
 import org.eclipse.emf.ecore.xmi.XMLResource;
 import org.eclipse.emf.ecore.xmi.impl.XMIHelperImpl;
 
@@ -43,18 +46,14 @@
 	}
 
 	@Override
-	public String getID(EObject obj) {
-		String result = myDelegate.getID(obj);
-		if (result == null) {
-			result = super.getID(obj);
+	public List<XMIException> setManyReference(ManyReference reference, String location) {
+		List<XMIException> result = null;
+		if (!myDelegate.setManyReference(reference.getObject(), reference.getFeature(), reference.getValues())) {
+			result = super.setManyReference(reference, location);
 		}
 		return result;
 	}
 
-	public void setXMLMap(XMLResource.XMLMap map) {
-		//map.setIDAttributeName("");
-	}
-
 	@Override
 	public void setValue(EObject object, EStructuralFeature feature, Object value, int position) {
 		if (!myDelegate.setValue(object, feature, value, position)) {
@@ -83,7 +82,10 @@
 	@Override
 	public void popContext() {
 		super.popContext();
-		myDelegate.postProcess();
+		myDelegate.preResolve();
 	}
 
+	public void postLoad() {
+		myDelegate.postLoad();
+	}
 }
Index: src/org/eclipse/gmf/internal/common/migrate/MigrationResource.java
===================================================================
RCS file: /cvsroot/modeling/org.eclipse.gmf/plugins/org.eclipse.gmf.common/src/org/eclipse/gmf/internal/common/migrate/MigrationResource.java,v
retrieving revision 1.14
diff -u -r1.14 MigrationResource.java
--- src/org/eclipse/gmf/internal/common/migrate/MigrationResource.java	24 May 2007 09:34:42 -0000	1.14
+++ src/org/eclipse/gmf/internal/common/migrate/MigrationResource.java	4 Jun 2007 16:45:39 -0000
@@ -43,14 +43,22 @@
 	}
 
 	protected void handlePostLoadSuccess() {
-		if (myMigrationHelper != null && myMigrationHelper.isMigrationApplied()) {
+		if (myMigrationHelper == null) {
+			return;
+		}
+		myMigrationHelper.postLoad();
+		if (myMigrationHelper.isMigrationApplied()) {
 			Diagnostic diagnostic = MigrationResource.createMessageDiagnostic(this, Messages.oldModelVersionLoadedMigrationRequired);
 			getWarnings().add(0, diagnostic);
 		}
 	}
 
 	protected void handlePostLoadException(Exception e) {
-		if (myMigrationHelper != null && myMigrationHelper.isMigrationApplied()) {
+		if (myMigrationHelper == null) {
+			return;
+		}
+		myMigrationHelper.postLoad();
+		if (myMigrationHelper.isMigrationApplied()) {
 			Diagnostic diagnostic = MigrationResource.createMessageDiagnostic(this, Messages.oldModelVersionLoadErrorMigrationMayBeRequired);
 			getErrors().add(0, diagnostic);
 		}
Index: src/org/eclipse/gmf/internal/common/migrate/MigrationDelegateImpl.java
===================================================================
RCS file: /cvsroot/modeling/org.eclipse.gmf/plugins/org.eclipse.gmf.common/src/org/eclipse/gmf/internal/common/migrate/MigrationDelegateImpl.java,v
retrieving revision 1.2
diff -u -r1.2 MigrationDelegateImpl.java
--- src/org/eclipse/gmf/internal/common/migrate/MigrationDelegateImpl.java	28 May 2007 13:43:40 -0000	1.2
+++ src/org/eclipse/gmf/internal/common/migrate/MigrationDelegateImpl.java	4 Jun 2007 16:45:39 -0000
@@ -26,7 +26,7 @@
 import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.ecore.EcoreFactory;
 import org.eclipse.emf.ecore.EcorePackage;
-import org.eclipse.emf.ecore.xmi.XMLResource;
+import org.eclipse.emf.ecore.resource.Resource;
 
 public class MigrationDelegateImpl implements MigrationDelegate {
 	private final EStructuralFeature myDeletedAttribute = EcoreFactory.eINSTANCE.createEAttribute();
@@ -43,8 +43,8 @@
 	private Map<String, EClass> myNarrowedTypes = new HashMap<String, EClass>();
 	private Map<EClass, Map<String, EStructuralFeature>> myRenamedAttributes = new HashMap<EClass, Map<String, EStructuralFeature>>();
 	private Map<String, EClassifier> myRenamedTypes = new HashMap<String, EClassifier>();
-	private Map<EClass, Map<String, EStructuralFeature>> myRenamedParentAttributes = new HashMap<EClass, Map<String, EStructuralFeature>>();
-	private XMLResource myResource;
+	private Map<EClass, Map<String, EStructuralFeature>> myTracedHierarchyFeatures = new HashMap<EClass, Map<String, EStructuralFeature>>();
+	private Resource myResource;
 	
 	public void registerDeletedAttributes(EClassifier classifier, String... deletedAttrNames) {
 		assert !myDeletedAttributes.containsKey(classifier);
@@ -55,8 +55,12 @@
 		myRenamedAttributes.put(eClass, renamedAttributes);
 	}
 	
-	public void registerRenamedParentAttributes(EClass eClass, Map<String, EStructuralFeature> renamedAttributes) {
-		myRenamedParentAttributes.put(eClass, renamedAttributes);
+	/**
+	 * Traced feature is a feature you use through the hierarchy as a marker, catching it in setValue and notifying of
+	 * whether migration has happened or not
+	 */
+	public void registerTracedFeatureForHierarchy(EClass eClass, Map<String, EStructuralFeature> tracedFeature) {
+		myTracedHierarchyFeatures.put(eClass, tracedFeature);
 	}
 	
 	public void registerNarrowedAbstractType(String abstractTypeName, EClass narrowedType) {
@@ -76,13 +80,17 @@
 		registerRenamedAttributes(eClass, renamedAttributes);
 	}
 	
-	public void registerRenamedParentAttribute(EClass eClass, String oldName, EStructuralFeature newStructuralFeature) {
-		Map<String, EStructuralFeature> renamedAttributes = myRenamedParentAttributes.get(eClass);
-		if (renamedAttributes == null) {
-			renamedAttributes = new HashMap<String, EStructuralFeature>();
+	/**
+	 * Traced feature is a feature you use through the hierarchy as a marker, catching it in setValue and notifying of
+	 * whether migration has happened or not
+	 */
+	public void registerTracedFeatureForHierarchy(EClass eClass, String xmlName, EStructuralFeature tracerFeature) {
+		Map<String, EStructuralFeature> tracedFeatures = myTracedHierarchyFeatures.get(eClass);
+		if (tracedFeatures == null) {
+			tracedFeatures = new HashMap<String, EStructuralFeature>();
 		}
-		renamedAttributes.put(oldName, newStructuralFeature);
-		registerRenamedParentAttributes(eClass, renamedAttributes);
+		tracedFeatures.put(xmlName, tracerFeature);
+		registerTracedFeatureForHierarchy(eClass, tracedFeatures);
 	}
 	
 	public boolean isAttributeDeleted(EClass clazz, String name) {
@@ -104,16 +112,16 @@
 		return renamings != null ? renamings.get(name) : null;
 	}
 
-	public EStructuralFeature getRenamedParentFeatureFor(EClass clazz, String name) {
-	    Map<String, EStructuralFeature> renamings = myRenamedParentAttributes.get(clazz);
-	    EStructuralFeature result = renamings != null ? renamings.get(name) : null;
+	public EStructuralFeature getTracedParentFeatureFor(EClass clazz, String name) {
+	    Map<String, EStructuralFeature> tracings = myTracedHierarchyFeatures.get(clazz);
+	    EStructuralFeature result = tracings != null ? tracings.get(name) : null;
 		for (Iterator<EClass> it=clazz.getEAllSuperTypes().iterator(); result == null && it.hasNext();) {
 			EClass nextParent = it.next();
-			result = getRenamedParentFeatureFor(nextParent, name);
+			result = getTracedParentFeatureFor(nextParent, name);
 		}
 		return result;
 	}
-
+	
 	public EClassifier getRenamedType(String typeName) {
 		return myRenamedTypes.get(typeName);
 	}
@@ -128,12 +136,13 @@
 		if ((rename = getRenamedFeatureFor(eClass, name)) != null) {
 			result = rename;
 			fireMigrationApplied(true);
-		} else if ((rename = getRenamedParentFeatureFor(eClass, name)) != null) {
-			result = rename;
-			fireMigrationApplied(true);
 		} else if (isAttributeDeleted(eClass, name)) {
 			result = myDeletedAttribute;
 			fireMigrationApplied(true);
+		} else if ((rename = getTracedParentFeatureFor(eClass, name)) != null) {
+			result = rename;
+			// if somebody has provided a feature to trace, it is his own business to notify us of whether 
+			// a migration is required and has happened, cause it is not necessary that anything has been actually changed.
 		}
 		return result;
 	}
@@ -156,16 +165,16 @@
 		return null;
 	}
 	
-	public String getID(EObject obj) {
-		return null;
-	}
-	
-	public void postProcess() {
+	public void preResolve() {
 	}
 
 	public void processObject(EObject result) {
 	}
 
+	public boolean setManyReference(EObject object, EStructuralFeature feature, Object[] values) {
+		return false;
+	}
+	
 	public boolean isMigrationApplied() {
 		return isMigrationApplied;
 	}
@@ -174,11 +183,11 @@
 		isMigrationApplied = applied;
 	}
 	
-	protected static EReference createNewReference(String name, EClass eType, boolean isContainment) {
+	protected static EReference createNewReference(String name, EClassifier eType, boolean isContainment) {
 		return createNewReference(name, eType, isContainment, 0, -1);
 	}
 
-	protected static EReference createNewReference(String name, EClass eType, boolean isContainment, int lowerBound, int upperBound) {
+	protected static EReference createNewReference(String name, EClassifier eType, boolean isContainment, int lowerBound, int upperBound) {
 		EReference ref = EcoreFactory.eINSTANCE.createEReference();
 		ref.setName(name);
 		ref.setEType(eType);
@@ -201,11 +210,14 @@
 		return attr;
 	}
 
-	public void setResource(XMLResource resource) {
+	public void setResource(Resource resource) {
 		myResource = resource;
 	}
 	
-	protected XMLResource getResource() {
+	protected Resource getResource() {
 		return myResource;
 	}
+
+	public void postLoad(){
+	}
 }
\ No newline at end of file
#P org.eclipse.gmf.codegen.ui
Index: plugin.xml
===================================================================
RCS file: /cvsroot/modeling/org.eclipse.gmf/plugins/org.eclipse.gmf.codegen.ui/plugin.xml,v
retrieving revision 1.21
diff -u -r1.21 plugin.xml
--- plugin.xml	28 May 2007 11:49:49 -0000	1.21
+++ plugin.xml	4 Jun 2007 16:45:40 -0000
@@ -62,6 +62,19 @@
 		</action>
   		<filter name="extension" value="gmfmap"/>
 	</objectContribution>	
+	<objectContribution
+    		adaptable="true"
+	        id="gmf.codegen.ui.migrate.model.gmfgraph"
+    	    objectClass="org.eclipse.core.resources.IFile">
+		<action
+				label="%migrate.model.action"
+				class="org.eclipse.gmf.internal.codegen.popup.actions.MigrateModelAction"
+				menubarPath="additions"
+				enablesFor="1"
+				id="gmf.codegen.ui.migrateAction">
+		</action>
+  		<filter name="extension" value="gmfgraph"/>
+	</objectContribution>	
    </extension>
 
    <extension point="org.eclipse.jdt.ui.javaElementFilters">