Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2015-02-15 17:11:37 +0000
committerEike Stepper2015-02-18 14:42:10 +0000
commit9571029fe52ddaed5d3bbdea5f576b6920552818 (patch)
tree9032dd386302ca924a97c1db2de2dab8284ff52d /plugins/org.eclipse.emf.cdo.ui
parentdeb00a3848447fd0cf9a86b2658da67e80558bb0 (diff)
downloadcdo-9571029fe52ddaed5d3bbdea5f576b6920552818.tar.gz
cdo-9571029fe52ddaed5d3bbdea5f576b6920552818.tar.xz
cdo-9571029fe52ddaed5d3bbdea5f576b6920552818.zip
[458349] Consolidate UI
Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=458349
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.ui')
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/TransactionalBackgroundAction.java14
1 files changed, 10 insertions, 4 deletions
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/TransactionalBackgroundAction.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/TransactionalBackgroundAction.java
index 4e3b5c483f..94ca9c1693 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/TransactionalBackgroundAction.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/TransactionalBackgroundAction.java
@@ -42,15 +42,20 @@ public abstract class TransactionalBackgroundAction extends LongRunningAction
return object;
}
- @Override
- protected final void doRun(IProgressMonitor progressMonitor) throws Exception
+ protected CDOTransaction openTransaction(CDOObject object)
{
- progressMonitor.beginTask(Messages.getString("TransactionalBackgroundAction_1"), 100); //$NON-NLS-1$
-
CDOView view = object.cdoView();
CDOTransaction transaction = view.getSession().openTransaction(view.getBranch());
OpenTransactionAction.configureTransaction(transaction);
+ return transaction;
+ }
+
+ @Override
+ protected final void doRun(IProgressMonitor progressMonitor) throws Exception
+ {
+ progressMonitor.beginTask(Messages.getString("TransactionalBackgroundAction_1"), 100); //$NON-NLS-1$
+ CDOTransaction transaction = openTransaction(object);
CDOObject transactionalObject = transaction.getObject(object);
progressMonitor.worked(5);
@@ -70,6 +75,7 @@ public abstract class TransactionalBackgroundAction extends LongRunningAction
if (commitInfo != null)
{
+ CDOView view = object.cdoView();
view.waitForUpdate(commitInfo.getTimeStamp(), 5000);
postRun(view, object);
}

Back to the top