Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2009-01-10 08:57:47 -0500
committerEike Stepper2009-01-10 08:57:47 -0500
commitbdb21731b278575bfa2c1ef14432970e478fa49c (patch)
tree7005fc5aa73036d12706f44638245968cdc76db2
parent970b89f2065e24b4c3d95dcebff78460f633f9fe (diff)
downloadcdo-bdb21731b278575bfa2c1ef14432970e478fa49c.tar.gz
cdo-bdb21731b278575bfa2c1ef14432970e478fa49c.tar.xz
cdo-bdb21731b278575bfa2c1ef14432970e478fa49c.zip
*** empty log message ***
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/OpenTransactionAction.java5
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOStateMachine.java3
2 files changed, 3 insertions, 5 deletions
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/OpenTransactionAction.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/OpenTransactionAction.java
index 618583c3d2..88d55bef22 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/OpenTransactionAction.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/actions/OpenTransactionAction.java
@@ -12,7 +12,6 @@ package org.eclipse.emf.cdo.internal.ui.actions;
import org.eclipse.emf.cdo.internal.ui.SharedIcons;
import org.eclipse.emf.cdo.session.CDOSession;
-import org.eclipse.emf.cdo.transaction.CDOTransaction;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.ui.IWorkbenchPage;
@@ -34,7 +33,9 @@ public final class OpenTransactionAction extends AbstractOpenViewAction
@Override
protected void doRun(IProgressMonitor progressMonitor) throws Exception
{
- CDOTransaction transaction = getSession().openTransaction();
+ getSession().openTransaction();
+
+ // CDOTransaction transaction = getSession().openTransaction();
// transaction.options().getConflictResolvers().add(new
// AbstractObjectConflictResolver.MergeLocalChangesPerFeature());
}
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOStateMachine.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOStateMachine.java
index dc1ebb9f0d..2f99829aca 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOStateMachine.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOStateMachine.java
@@ -526,11 +526,8 @@ public final class CDOStateMachine extends FiniteStateMachine<CDOState, CDOEvent
final private class CommitTransition implements
ITransition<CDOState, CDOEvent, InternalCDOObject, CommitTransactionResult>
{
- private boolean useDeltas = false;
-
public CommitTransition(boolean useDeltas)
{
- this.useDeltas = useDeltas;
}
public void execute(InternalCDOObject object, CDOState state, CDOEvent event, CommitTransactionResult data)

Back to the top