| commit | e4ffd1c219f9d623cad4520d165d5c44a00b58a8 | [log] [tgz] |
|---|---|---|
| author | Johannes Faltermeier <jfaltermeier@eclipsesource.com> | Tue May 31 04:29:47 2016 -0400 |
| committer | Gerrit Code Review @ Eclipse.org <gerrit@eclipse.org> | Tue May 31 04:29:47 2016 -0400 |
| tree | cd059b14362696e8ec8e6cee65b536b79b678089 | |
| parent | e986c70f94ccfa6753f6c31b337455efe9d2f659 [diff] | |
| parent | 462cccbeb116e3a49e0ec28fdaa337995c6d081c [diff] |
Merge "TCI: ShareController should be cancellable" into develop
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();