diff options
| author | Eike Stepper | 2013-03-18 17:29:52 +0000 |
|---|---|---|
| committer | Eike Stepper | 2013-03-18 17:29:52 +0000 |
| commit | b2ce98845faf1b5cdb98aa30df6ae06241519c67 (patch) | |
| tree | 26b0eafd1df15d15dd377f0bbd2a74a1ca4e9159 /plugins/org.eclipse.emf.cdo.ui.compare | |
| parent | 82755bda9360b58cda1e14359a806035d3950e90 (diff) | |
| download | cdo-b2ce98845faf1b5cdb98aa30df6ae06241519c67.tar.gz cdo-b2ce98845faf1b5cdb98aa30df6ae06241519c67.tar.xz cdo-b2ce98845faf1b5cdb98aa30df6ae06241519c67.zip | |
[403661] [Legacy] Make legacy mode non-optional
https://bugs.eclipse.org/bugs/show_bug.cgi?id=403661
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.ui.compare')
| -rw-r--r-- | plugins/org.eclipse.emf.cdo.ui.compare/src/org/eclipse/emf/cdo/ui/internal/compare/MergeAction.java | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/plugins/org.eclipse.emf.cdo.ui.compare/src/org/eclipse/emf/cdo/ui/internal/compare/MergeAction.java b/plugins/org.eclipse.emf.cdo.ui.compare/src/org/eclipse/emf/cdo/ui/internal/compare/MergeAction.java index dcbc9be9a2..104761f195 100644 --- a/plugins/org.eclipse.emf.cdo.ui.compare/src/org/eclipse/emf/cdo/ui/internal/compare/MergeAction.java +++ b/plugins/org.eclipse.emf.cdo.ui.compare/src/org/eclipse/emf/cdo/ui/internal/compare/MergeAction.java @@ -11,12 +11,10 @@ package org.eclipse.emf.cdo.ui.internal.compare; import org.eclipse.emf.cdo.common.branch.CDOBranchPoint; -import org.eclipse.emf.cdo.internal.ui.LegacyModeRegistry; import org.eclipse.emf.cdo.internal.ui.dialogs.SelectBranchPointDialog; import org.eclipse.emf.cdo.session.CDOSession; import org.eclipse.emf.cdo.transaction.CDOTransaction; import org.eclipse.emf.cdo.ui.compare.CDOCompareEditorUtil; -import org.eclipse.emf.cdo.util.CDOUtil; import org.eclipse.emf.cdo.view.CDOView; import org.eclipse.net4j.util.lifecycle.LifecycleUtil; @@ -93,7 +91,6 @@ public abstract class MergeAction implements IObjectActionDelegate CDOSession session = leftView.getSession(); if (branchPoint.getTimeStamp() == CDOBranchPoint.UNSPECIFIED_DATE) { - CDOUtil.setLegacyModeDefault(LegacyModeRegistry.isLegacyEnabled(session)); return session.openTransaction(branchPoint.getBranch()); } |