| commit | 462cccbeb116e3a49e0ec28fdaa337995c6d081c | [log] [tgz] |
|---|---|---|
| author | Edgar Mueller <emueller@eclipsesource.com> | Fri May 27 17:44:56 2016 +0200 |
| committer | Edgar Mueller <emueller@eclipsesource.com> | Fri May 27 17:44:56 2016 +0200 |
| tree | e95c9c658743a6e47922f94ba77c6890803f7d94 | |
| parent | 3d72419a63d271669734c3079b36e64a8cf15fb2 [diff] |
TCI: ShareController should be cancellable Change-Id: Ief70cf3e5a62452ece75cad871a57553e3d7bd01
diff --git a/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/controller/ShareController.java b/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/controller/ShareController.java index 9b0c881..6e896df 100644 --- a/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/controller/ShareController.java +++ b/bundles/org.eclipse.emf.emfstore.client/src/org/eclipse/emf/emfstore/internal/client/model/controller/ShareController.java
@@ -80,7 +80,9 @@ getProjectSpace().save(); getProjectSpace().startChangeRecording(); getProgressMonitor().done(); + return null; } + getProgressMonitor().subTask(Messages.ShareController_Sharing_Project_With_Server); // make sure, current state of caches is written to resource @@ -115,6 +117,7 @@ getProgressMonitor().subTask(Messages.ShareController_Finalizing_Share); getProjectSpace().getLocalChangePackage().clear(); getProjectSpace().save(); + // TODO EM: do we really need to save 3 times in row?! getProjectSpace().updateDirtyState(); getProgressMonitor().done();