diff options
Diffstat (limited to 'plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/actions/DropDownRightToLeftAction.java')
| -rw-r--r-- | plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/actions/DropDownRightToLeftAction.java | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/actions/DropDownRightToLeftAction.java b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/actions/DropDownRightToLeftAction.java index 34c26d8f0..0ea3b7196 100644 --- a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/actions/DropDownRightToLeftAction.java +++ b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/actions/DropDownRightToLeftAction.java @@ -10,10 +10,9 @@ *******************************************************************************/
package org.eclipse.emf.compare.ide.ui.internal.structuremergeviewer.actions;
-import org.eclipse.compare.CompareConfiguration;
import org.eclipse.emf.compare.ide.ui.internal.EMFCompareIDEUIMessages;
import org.eclipse.emf.compare.ide.ui.internal.EMFCompareIDEUIPlugin;
-import org.eclipse.emf.compare.rcp.ui.internal.EMFCompareConstants;
+import org.eclipse.emf.compare.ide.ui.internal.configuration.EMFCompareConfiguration;
import org.eclipse.jface.action.Action;
import org.eclipse.ui.plugin.AbstractUIPlugin;
@@ -27,7 +26,7 @@ import org.eclipse.ui.plugin.AbstractUIPlugin; public class DropDownRightToLeftAction extends Action {
/** The compare configuration object used to get the compare model. */
- private CompareConfiguration configuration;
+ private EMFCompareConfiguration configuration;
/**
* Constructor.
@@ -35,7 +34,7 @@ public class DropDownRightToLeftAction extends Action { * @param configuration
* The compare configuration object.
*/
- public DropDownRightToLeftAction(CompareConfiguration configuration) {
+ public DropDownRightToLeftAction(EMFCompareConfiguration configuration) {
this.configuration = configuration;
setText(EMFCompareIDEUIMessages.getString("dropdown.right.to.left.tooltip")); //$NON-NLS-1$
setImageDescriptor(AbstractUIPlugin.imageDescriptorFromPlugin(EMFCompareIDEUIPlugin.PLUGIN_ID,
@@ -49,6 +48,6 @@ public class DropDownRightToLeftAction extends Action { */
@Override
public void run() {
- configuration.setProperty(EMFCompareConstants.MERGE_WAY, new Boolean(false));
+ configuration.setPreviewMergeMode(false);
}
}
|