diff options
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) |