wlu: new diagram export/import
diff --git a/plugins/org.eclipse.epf.export/src/org/eclipse/epf/export/services/DiagramHandler.java b/plugins/org.eclipse.epf.export/src/org/eclipse/epf/export/services/DiagramHandler.java
index 874fbf6..bec884f 100755
--- a/plugins/org.eclipse.epf.export/src/org/eclipse/epf/export/services/DiagramHandler.java
+++ b/plugins/org.eclipse.epf.export/src/org/eclipse/epf/export/services/DiagramHandler.java
@@ -56,6 +56,10 @@
 	}
 	
 	public void registerElement(MethodElement elem) {
+		registerElement(elem, false);
+	}
+	
+	public void registerElement(MethodElement elem, boolean processEntry) {
 		if (! needToProcess(elem)) {
 			return;
 		}
@@ -67,6 +71,19 @@
 		mapEntryValue.element = elem;
 		elementMap.put(elem.getGuid(), mapEntryValue);		
 		
+		if (processEntry) {
+			processEntry(elem, mapEntryValue);
+		}
+	}
+	
+	public void postRegisterElements() {
+		for (Iterator<MapEntryValue> it = elementMap.values().iterator(); it.hasNext();) {
+			MapEntryValue value = it.next();
+			processEntry(value.element, value);
+		}	
+	}
+
+	private void processEntry(MethodElement elem, MapEntryValue mapEntryValue) {
 		File[] files = getFiles(elem);
 		File sourceFile = files[0];
 		File targetFile = files[1];
diff --git a/plugins/org.eclipse.epf.import.xml/src/org/eclipse/epf/importing/xml/services/ImportXMLService.java b/plugins/org.eclipse.epf.import.xml/src/org/eclipse/epf/importing/xml/services/ImportXMLService.java
index 8ab677c..1ebb1ee 100755
--- a/plugins/org.eclipse.epf.import.xml/src/org/eclipse/epf/importing/xml/services/ImportXMLService.java
+++ b/plugins/org.eclipse.epf.import.xml/src/org/eclipse/epf/importing/xml/services/ImportXMLService.java
@@ -242,6 +242,8 @@
 
 			LibraryImportManager.handleNameReplace(renameElementMap);
 			
+			diagramHandler.postRegisterElements();
+			
 			// delete the un-needed elements
 			logger.logMessage("delete unneeded elements ..."); //$NON-NLS-1$
 			umaLib.deleteElements();
diff --git a/plugins/org.eclipse.epf.import/src/org/eclipse/epf/importing/services/LibraryImportManager.java b/plugins/org.eclipse.epf.import/src/org/eclipse/epf/importing/services/LibraryImportManager.java
index 1fe32c4..20a86a7 100755
--- a/plugins/org.eclipse.epf.import/src/org/eclipse/epf/importing/services/LibraryImportManager.java
+++ b/plugins/org.eclipse.epf.import/src/org/eclipse/epf/importing/services/LibraryImportManager.java
@@ -295,6 +295,8 @@
 		
 		handleNameReplace(renameElementMap);
 		
+		diagramHandler.postRegisterElements();
+		
 		// get all the modified resources and resource files
 		// check CM for file check-out
 		if ( debug ) {