Index: src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/ide/document/StorageDiagramDocumentProvider.java
===================================================================
RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/ide/document/StorageDiagramDocumentProvider.java,v
retrieving revision 1.5
diff -u -r1.5 StorageDiagramDocumentProvider.java
--- src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/ide/document/StorageDiagramDocumentProvider.java	14 Nov 2005 16:52:32 -0000	1.5
+++ src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/ide/document/StorageDiagramDocumentProvider.java	13 Dec 2005 20:56:26 -0000
@@ -13,18 +13,16 @@
 
 import org.eclipse.core.resources.IStorage;
 import org.eclipse.core.runtime.CoreException;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IStorageEditorInput;
-
 import org.eclipse.gmf.runtime.diagram.ui.resources.editor.document.DiagramDocument;
 import org.eclipse.gmf.runtime.diagram.ui.resources.editor.document.DiagramModificationListener;
 import org.eclipse.gmf.runtime.diagram.ui.resources.editor.document.IDiagramDocument;
 import org.eclipse.gmf.runtime.diagram.ui.resources.editor.document.IDiagramDocumentProvider;
 import org.eclipse.gmf.runtime.diagram.ui.resources.editor.document.IDocument;
-import org.eclipse.gmf.runtime.diagram.ui.resources.editor.document.PathEditorInputProxy;
 import org.eclipse.gmf.runtime.diagram.ui.resources.editor.internal.util.DiagramIOUtil;
 import org.eclipse.gmf.runtime.emf.core.edit.MEditingDomain;
 import org.eclipse.gmf.runtime.notation.Diagram;
+import org.eclipse.ui.IEditorInput;
+import org.eclipse.ui.IStorageEditorInput;
 
 
 /**
@@ -96,8 +94,8 @@
 
 	protected boolean setDocumentContent(IDocument document, IEditorInput editorInput)
 		throws CoreException {
-		if(editorInput instanceof PathEditorInputProxy) {
-			PathEditorInputProxy diagramElement = (PathEditorInputProxy)editorInput;
+		if(editorInput instanceof StorageEditorInputProxy) {
+			StorageEditorInputProxy diagramElement = (StorageEditorInputProxy)editorInput;
 
 			((IDiagramDocument)document).setEditingDomain(diagramElement.getEditingDomain());
 			boolean docContentSet = super.setDocumentContent(document, editorInput);
Index: src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/ide/document/StorageEditorInputProxy.java
===================================================================
RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/ide/document/StorageEditorInputProxy.java,v
retrieving revision 1.2
diff -u -r1.2 StorageEditorInputProxy.java
--- src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/ide/document/StorageEditorInputProxy.java	12 Sep 2005 21:24:50 -0000	1.2
+++ src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/ide/document/StorageEditorInputProxy.java	13 Dec 2005 20:56:26 -0000
@@ -13,32 +13,26 @@
 
 import org.eclipse.core.resources.IStorage;
 import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.ui.IPersistableElement;
-import org.eclipse.ui.IStorageEditorInput;
-
 import org.eclipse.gmf.runtime.common.core.util.HashUtil;
+import org.eclipse.gmf.runtime.diagram.ui.resources.editor.document.EditorInputProxy;
 import org.eclipse.gmf.runtime.diagram.ui.resources.editor.document.MEditingDomainElement;
 import org.eclipse.gmf.runtime.emf.core.edit.MEditingDomain;
+import org.eclipse.ui.IStorageEditorInput;
 
 
 /**
  * @author mgoyal
  *
  */
-public class StorageEditorInputProxy
+public class StorageEditorInputProxy extends EditorInputProxy
 	implements IStorageEditorInput, MEditingDomainElement {
 
-	IStorageEditorInput fProxied = null;
-	MEditingDomain editingDomain = null;
-	
 	/**
 	 * @param input IEditorInput
 	 * @param domain EditingDomain
 	 */
 	public StorageEditorInputProxy(IStorageEditorInput input, MEditingDomain domain) {
-		fProxied = input;
-		editingDomain = domain;
+		super(input, domain);
 	}
 	
 	/* (non-Javadoc)
@@ -46,62 +40,13 @@
 	 */
 	public IStorage getStorage()
 		throws CoreException {
-		if(fProxied != null)
-			return fProxied.getStorage();
+		if(fProxied != null && fProxied instanceof IStorageEditorInput)
+			return ((IStorageEditorInput)fProxied).getStorage();
 		assert false;
 		return null;
 	}
 
 	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IEditorInput#exists()
-	 */
-	public boolean exists() {
-		return fProxied.exists();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IEditorInput#getImageDescriptor()
-	 */
-	public ImageDescriptor getImageDescriptor() {
-		return fProxied.getImageDescriptor();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IEditorInput#getName()
-	 */
-	public String getName() {
-		return fProxied.getName();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IEditorInput#getPersistable()
-	 */
-	public IPersistableElement getPersistable() {
-		return fProxied.getPersistable();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IEditorInput#getToolTipText()
-	 */
-	public String getToolTipText() {
-		return fProxied.getToolTipText();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class)
-	 */
-	public Object getAdapter(Class adapter) {
-		return fProxied.getAdapter(adapter);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.resources.editor.document.MEditingDomainElement#getEditingDomain()
-	 */
-	public MEditingDomain getEditingDomain() {
-		return editingDomain;
-	}
-	
-	/* (non-Javadoc)
 	 * @see java.lang.Object#equals(java.lang.Object)
 	 */
 	public boolean equals(Object arg0) {
Index: src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/ide/editor/IDEDiagramDocumentEditor.java
===================================================================
RCS file: /cvsroot/technology/org.eclipse.gmf/plugins/org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide/src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/ide/editor/IDEDiagramDocumentEditor.java,v
retrieving revision 1.2
diff -u -r1.2 IDEDiagramDocumentEditor.java
--- src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/ide/editor/IDEDiagramDocumentEditor.java	25 Nov 2005 19:37:50 -0000	1.2
+++ src/org/eclipse/gmf/runtime/diagram/ui/resources/editor/ide/editor/IDEDiagramDocumentEditor.java	13 Dec 2005 20:56:26 -0000
@@ -98,13 +98,10 @@
 			}
 		}
 		
-		
-		
 		boolean success= false;		
 		try {
-
 			provider.aboutToChange(newInput);
-			getDocumentProvider().saveDocument(progressMonitor, newInput, getDocumentProvider().getDocument(getEditorInput()), true);
+			getDocumentProvider(newInput).saveDocument(progressMonitor, newInput, getDocumentProvider().getDocument(getEditorInput()), true);
 			success= true;
 
 		} catch (CoreException x) {