diff options
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.explorer.ui')
2 files changed, 6 insertions, 21 deletions
diff --git a/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/checkouts/actions/MergeFromActionProvider.java b/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/checkouts/actions/MergeFromActionProvider.java index 9dd4b8cf4c..bfd6ef76fa 100644 --- a/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/checkouts/actions/MergeFromActionProvider.java +++ b/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/checkouts/actions/MergeFromActionProvider.java @@ -13,8 +13,10 @@ package org.eclipse.emf.cdo.explorer.ui.checkouts.actions; import org.eclipse.emf.cdo.common.branch.CDOBranchPoint; import org.eclipse.emf.cdo.explorer.checkouts.CDOCheckout; import org.eclipse.emf.cdo.explorer.repositories.CDORepository; +import org.eclipse.emf.cdo.transaction.CDOTransactionOpener; import org.eclipse.emf.cdo.ui.Support; import org.eclipse.emf.cdo.ui.compare.CDOCompareEditorUtil; +import org.eclipse.emf.cdo.ui.compare.CDOCompareEditorUtil.TransactionOpenerAndEditorCloser; /** * @author Eike Stepper @@ -68,10 +70,12 @@ public class MergeFromActionProvider extends AbstractBranchPointActionProvider { if (Support.COMPARE.isAvailable()) { - CDORepository repository = checkout.getRepository(); + final CDORepository repository = checkout.getRepository(); CDOBranchPoint left = branchPoint; CDOBranchPoint right = checkout.getBranchPoint(); - CDOCompareEditorUtil.openEditor(repository, repository, left, right, null, true); + + CDOTransactionOpener transactionOpener = new TransactionOpenerAndEditorCloser(repository, true); + CDOCompareEditorUtil.openEditor(repository, transactionOpener, left, right, null, true); } } } diff --git a/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/handlers/WorkspaceUpdateHandler.java b/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/handlers/WorkspaceUpdateHandler.java index d48152802e..acdda31adc 100644 --- a/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/handlers/WorkspaceUpdateHandler.java +++ b/plugins/org.eclipse.emf.cdo.explorer.ui/src/org/eclipse/emf/cdo/explorer/ui/handlers/WorkspaceUpdateHandler.java @@ -26,7 +26,6 @@ import org.eclipse.emf.cdo.view.CDOView; import org.eclipse.emf.cdo.workspace.CDOWorkspace; import org.eclipse.net4j.util.registry.IRegistry; -import org.eclipse.net4j.util.ui.UIUtil; import org.eclipse.net4j.util.ui.handlers.AbstractBaseHandler; import org.eclipse.emf.spi.cdo.DefaultCDOMerger; @@ -99,27 +98,9 @@ public class WorkspaceUpdateHandler extends AbstractBaseHandler<OfflineCDOChecko transaction.addTransactionHandler(new CDODefaultTransactionHandler2() { @Override - public void rolledBackTransaction(CDOTransaction transaction) - { - closeTransaction(transaction); - } - - @Override public void committedTransaction(CDOTransaction transaction, CDOCommitContext commitContext) { checkout.refresh(); - closeTransaction(transaction); - } - - private void closeTransaction(final CDOTransaction transaction) - { - UIUtil.getDisplay().asyncExec(new Runnable() - { - public void run() - { - transaction.close(); - } - }); } }); } |