bug 395174: Added support for moving files I20130103-2200I20130102-1000I20130101-2200I20121227-2200I20121226-1000I20121225-2200I20121220-2200I20121219-1000

https://bugs.eclipse.org/bugs/show_bug.cgi?id=395174

1 files changed, 11 insertions, 10 deletions

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/wbm/ApplicationModelEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/wbm/ApplicationModelEditor.java
index e05ca64d..1487f116 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/wbm/ApplicationModelEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/wbm/ApplicationModelEditor.java
@@ -22,6 +22,7 @@ import org.eclipse.core.resources.IResourceChangeEvent;
 import org.eclipse.core.resources.IResourceChangeListener;
 import org.eclipse.core.resources.IResourceDelta;
 import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.core.runtime.Path;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.e4.core.contexts.IEclipseContext;
@@ -150,17 +151,17 @@ public class ApplicationModelEditor extends ModelEditor {
 	 * Reload the model.
 	 */
 	protected void reloadModel() {
-		try {
-			resource.unload();
-			resource.load(null);
-			// must be done in ui thread because of databinding
-			sync.syncExec(new Runnable() {
-				public void run() {
+		getModelProvider().getRoot().getRealm().asyncExec(new Runnable() {
+			public void run() {
+				try {
+					resource.unload();
+					resource.load(null);
 					getModelProvider().replaceRoot(resource.getContents().get(0));
+					doSave(new NullProgressMonitor());
+				} catch (IOException e) {
+					statusDialog(e);
 				}
-			});
-		} catch (IOException e) {
-			statusDialog(e);
-		}
+			}
+		});
 	}
 }
\ No newline at end of file