Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMikaël Barbero2013-10-13 14:18:26 -0400
committerMikaël Barbero2013-10-18 15:29:56 -0400
commit8753b3076c819a1bb63365d7305228ea1eb0a72c (patch)
tree6a31a2c951b7c736710c80025af1a107f890e411 /plugins/org.eclipse.emf.compare.ide.ui/src
parentc4757059ed4ff555de23c980bdb1e31f597f2c78 (diff)
downloadorg.eclipse.emf.compare-8753b3076c819a1bb63365d7305228ea1eb0a72c.tar.gz
org.eclipse.emf.compare-8753b3076c819a1bb63365d7305228ea1eb0a72c.tar.xz
org.eclipse.emf.compare-8753b3076c819a1bb63365d7305228ea1eb0a72c.zip
Use IEMFCompareConfiguration where possible
Diffstat (limited to 'plugins/org.eclipse.emf.compare.ide.ui/src')
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/actions/DropDownMergeMenuAction.java10
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/actions/SaveComparisonModelAction.java6
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/actions/SelectNextDiffAction.java6
-rw-r--r--plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/actions/SelectPreviousDiffAction.java6
4 files changed, 14 insertions, 14 deletions
diff --git a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/actions/DropDownMergeMenuAction.java b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/actions/DropDownMergeMenuAction.java
index e36a927a9..8179d1838 100644
--- a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/actions/DropDownMergeMenuAction.java
+++ b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/actions/DropDownMergeMenuAction.java
@@ -19,8 +19,8 @@ import java.util.List;
import org.eclipse.emf.compare.ide.ui.internal.EMFCompareIDEUIMessages;
import org.eclipse.emf.compare.ide.ui.internal.EMFCompareIDEUIPlugin;
-import org.eclipse.emf.compare.ide.ui.internal.configuration.EMFCompareConfiguration;
import org.eclipse.emf.compare.internal.merge.MergeMode;
+import org.eclipse.emf.compare.rcp.ui.internal.configuration.IEMFCompareConfiguration;
import org.eclipse.emf.compare.rcp.ui.internal.configuration.IMergePreviewModeChange;
import org.eclipse.jface.action.Action;
import org.eclipse.jface.action.ActionContributionItem;
@@ -39,7 +39,7 @@ import org.eclipse.ui.plugin.AbstractUIPlugin;
public class DropDownMergeMenuAction extends Action implements IMenuCreator {
/** The compare configuration object used to get the compare model. */
- private final EMFCompareConfiguration configuration;
+ private final IEMFCompareConfiguration configuration;
/** The menu associated with this action. */
private Menu fMenu;
@@ -53,7 +53,7 @@ public class DropDownMergeMenuAction extends Action implements IMenuCreator {
* @param configuration
* The compare configuration object.
*/
- public DropDownMergeMenuAction(EMFCompareConfiguration configuration, EnumSet<MergeMode> previewModes) {
+ public DropDownMergeMenuAction(IEMFCompareConfiguration configuration, EnumSet<MergeMode> previewModes) {
this.configuration = configuration;
actions = newArrayList();
@@ -164,7 +164,7 @@ public class DropDownMergeMenuAction extends Action implements IMenuCreator {
private static class DropDownAction extends Action {
/** The compare configuration object used to get the compare model. */
- private final EMFCompareConfiguration configuration;
+ private final IEMFCompareConfiguration configuration;
private final MergeMode mergeMode;
@@ -174,7 +174,7 @@ public class DropDownMergeMenuAction extends Action implements IMenuCreator {
* @param configuration
* The compare configuration object.
*/
- public DropDownAction(EMFCompareConfiguration configuration, MergeMode mergeMode) {
+ public DropDownAction(IEMFCompareConfiguration configuration, MergeMode mergeMode) {
this.configuration = configuration;
this.mergeMode = mergeMode;
setToolTipTextAndImage(this, mergeMode);
diff --git a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/actions/SaveComparisonModelAction.java b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/actions/SaveComparisonModelAction.java
index 0e7400326..100a33ea8 100644
--- a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/actions/SaveComparisonModelAction.java
+++ b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/actions/SaveComparisonModelAction.java
@@ -24,7 +24,7 @@ import org.eclipse.emf.common.util.URI;
import org.eclipse.emf.compare.Comparison;
import org.eclipse.emf.compare.ide.ui.internal.EMFCompareIDEUIMessages;
import org.eclipse.emf.compare.ide.ui.internal.EMFCompareIDEUIPlugin;
-import org.eclipse.emf.compare.ide.ui.internal.configuration.EMFCompareConfiguration;
+import org.eclipse.emf.compare.rcp.ui.internal.configuration.IEMFCompareConfiguration;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.resource.Resource;
import org.eclipse.emf.ecore.util.EcoreUtil.Copier;
@@ -51,7 +51,7 @@ public class SaveComparisonModelAction extends Action {
private static final ImmutableList<String> DIALOG_BUTTON_LABELS = ImmutableList.of("Replace", "Cancel");
/** The compare configuration object used to get the compare model. */
- private EMFCompareConfiguration configuration;
+ private IEMFCompareConfiguration configuration;
/**
* Constructor.
@@ -59,7 +59,7 @@ public class SaveComparisonModelAction extends Action {
* @param configuration
* The compare configuration object.
*/
- public SaveComparisonModelAction(EMFCompareConfiguration configuration) {
+ public SaveComparisonModelAction(IEMFCompareConfiguration configuration) {
this.configuration = configuration;
setToolTipText(EMFCompareIDEUIMessages.getString("save.model.tooltip")); //$NON-NLS-1$
setImageDescriptor(AbstractUIPlugin.imageDescriptorFromPlugin(EMFCompareIDEUIPlugin.PLUGIN_ID,
diff --git a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/actions/SelectNextDiffAction.java b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/actions/SelectNextDiffAction.java
index 46dfea92d..27e8e47b5 100644
--- a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/actions/SelectNextDiffAction.java
+++ b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/actions/SelectNextDiffAction.java
@@ -10,9 +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.ide.ui.internal.configuration.EMFCompareConfiguration;
import org.eclipse.emf.compare.ide.ui.internal.structuremergeviewer.actions.util.EMFCompareUIActionUtil;
import org.eclipse.jface.action.Action;
import org.eclipse.ui.plugin.AbstractUIPlugin;
@@ -26,7 +26,7 @@ import org.eclipse.ui.plugin.AbstractUIPlugin;
public class SelectNextDiffAction extends Action {
/** The compare configuration object used to get the compare model. */
- private CompareConfiguration configuration;
+ private EMFCompareConfiguration configuration;
/**
* Constructor.
@@ -34,7 +34,7 @@ public class SelectNextDiffAction extends Action {
* @param configuration
* The compare configuration object.
*/
- public SelectNextDiffAction(CompareConfiguration configuration) {
+ public SelectNextDiffAction(EMFCompareConfiguration configuration) {
this.configuration = configuration;
setToolTipText(EMFCompareIDEUIMessages.getString("next.diff.tooltip")); //$NON-NLS-1$
setImageDescriptor(AbstractUIPlugin.imageDescriptorFromPlugin(EMFCompareIDEUIPlugin.PLUGIN_ID,
diff --git a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/actions/SelectPreviousDiffAction.java b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/actions/SelectPreviousDiffAction.java
index d1d7f6654..856b81c99 100644
--- a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/actions/SelectPreviousDiffAction.java
+++ b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/actions/SelectPreviousDiffAction.java
@@ -10,9 +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.ide.ui.internal.configuration.EMFCompareConfiguration;
import org.eclipse.emf.compare.ide.ui.internal.structuremergeviewer.actions.util.EMFCompareUIActionUtil;
import org.eclipse.jface.action.Action;
import org.eclipse.ui.plugin.AbstractUIPlugin;
@@ -26,7 +26,7 @@ import org.eclipse.ui.plugin.AbstractUIPlugin;
public class SelectPreviousDiffAction extends Action {
/** The compare configuration object used to get the compare model. */
- private CompareConfiguration configuration;
+ private EMFCompareConfiguration configuration;
/**
* Constructor.
@@ -34,7 +34,7 @@ public class SelectPreviousDiffAction extends Action {
* @param configuration
* The compare configuration object.
*/
- public SelectPreviousDiffAction(CompareConfiguration configuration) {
+ public SelectPreviousDiffAction(EMFCompareConfiguration configuration) {
this.configuration = configuration;
setToolTipText(EMFCompareIDEUIMessages.getString("previous.diff.tooltip")); //$NON-NLS-1$
setImageDescriptor(AbstractUIPlugin.imageDescriptorFromPlugin(EMFCompareIDEUIPlugin.PLUGIN_ID,

Back to the top