[Bug 304584] - [Tooling] Implement Workbench-Model-Toolingv20100510-1130

* adding dirty lifecycle support

2 files changed, 28 insertions, 6 deletions

diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/XMIResourceFunction.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/XMIResourceFunction.java
index 201d7036..518468e1 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/XMIResourceFunction.java
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/XMIResourceFunction.java
@@ -2,19 +2,36 @@ package org.eclipse.e4.tools.emf.editor3x;
 
 import org.eclipse.e4.core.contexts.ContextFunction;
 import org.eclipse.e4.core.contexts.IEclipseContext;
+import org.eclipse.e4.tools.emf.editor3x.compat.E4CompatEditorPart;
 import org.eclipse.e4.tools.emf.editor3x.emf.EditUIUtil;
 import org.eclipse.e4.tools.emf.ui.common.XMIModelResource;
+import org.eclipse.e4.tools.emf.ui.common.IModelResource.ModelListener;
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.ui.IEditorInput;
+import org.eclipse.ui.part.EditorPart;
 
 public class XMIResourceFunction extends ContextFunction {
 
 	@Override
-	public Object compute(IEclipseContext context, Object[] arguments) {
+	public Object compute(final IEclipseContext context, Object[] arguments) {
 		final IEditorInput input = context.get(IEditorInput.class);
+		final E4CompatEditorPart part = (E4CompatEditorPart) context.get(EditorPart.class);
+		
 		if( input != null ) {
 			URI resourceURI = EditUIUtil.getURI(input);
-			return new XMIModelResource(resourceURI);
+			final XMIModelResource resource = new XMIModelResource(resourceURI);
+			resource.addModelListener(new ModelListener() {
+				
+				public void dirtyChanged() {
+					context.set(EditorPart.class.getName()+".dirty", resource.isDirty());
+					part.firePropertyChange(EditorPart.PROP_DIRTY);
+				}
+
+				public void commandStackChanged() {
+					
+				}
+			});
+			return resource;
 		}
 
 		return null;
diff --git a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/compat/E4CompatEditorPart.java b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/compat/E4CompatEditorPart.java
index 93688351..440d7d2a 100644
--- a/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/compat/E4CompatEditorPart.java
+++ b/bundles/org.eclipse.e4.tools.emf.editor3x/src/org/eclipse/e4/tools/emf/editor3x/compat/E4CompatEditorPart.java
@@ -37,8 +37,8 @@ public class E4CompatEditorPart extends EditorPart implements IExecutableExtensi
 	
 	@Override
 	public void doSave(IProgressMonitor monitor) {
-		// TODO Auto-generated method stub
-		
+		IContributionFactory factory = (IContributionFactory) context.get(IContributionFactory.class);
+		factory.call(instance, null, "doSave", context, null);
 	}
 
 	@Override
@@ -66,9 +66,14 @@ public class E4CompatEditorPart extends EditorPart implements IExecutableExtensi
 	}
 
 	@Override
+	public void firePropertyChange(int propertyId) {
+		super.firePropertyChange(propertyId);
+	}
+	
+	@Override
 	public boolean isDirty() {
-		// TODO Auto-generated method stub
-		return false;
+		Boolean b = (Boolean) context.get(EditorPart.class.getName()+".dirty");
+		return b != null && b;
 	}
 
 	@Override