Move Save Comparison Model Handler from RCP UI to IDE UI Plugin

-Delete dependency to org.eclipse.compare in RCP UI Plugin
-Delete dependency to org.eclipse.core.expressions in RCP UI Plugin
-Add dependency to org.eclipse.core.expressions in IDE UI Plugin

Change-Id: I5ef8432d1cfa3fcbcc60053da48ba75e7abcc8a3

10 files changed, 84 insertions, 95 deletions

diff --git a/plugins/org.eclipse.emf.compare.ide.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.compare.ide.ui/META-INF/MANIFEST.MF
index 3567d4c7c..a5ad21800 100644
--- a/plugins/org.eclipse.emf.compare.ide.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.compare.ide.ui/META-INF/MANIFEST.MF
@@ -6,6 +6,7 @@ Bundle-Version: 3.0.0.qualifier
 Bundle-Activator: org.eclipse.emf.compare.ide.ui.internal.EMFCompareIDEUIPlugin
 Bundle-Vendor: %providerName
 Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.core.expressions,
  org.eclipse.core.resources;bundle-version="3.5.0",
  org.eclipse.compare;bundle-version="3.5.0",
  org.eclipse.emf.edit.ui;bundle-version="2.5.0",
diff --git a/plugins/org.eclipse.emf.compare.rcp.ui/icons/full/toolb16/saveas_edit.gif b/plugins/org.eclipse.emf.compare.ide.ui/icons/full/toolb16/saveas_edit.gif
index 466bfb112..466bfb112 100644
--- a/plugins/org.eclipse.emf.compare.rcp.ui/icons/full/toolb16/saveas_edit.gif
+++ b/plugins/org.eclipse.emf.compare.ide.ui/icons/full/toolb16/saveas_edit.gif
diff --git a/plugins/org.eclipse.emf.compare.ide.ui/plugin.properties b/plugins/org.eclipse.emf.compare.ide.ui/plugin.properties
index 6d7f64259..c87ce892d 100644
--- a/plugins/org.eclipse.emf.compare.ide.ui/plugin.properties
+++ b/plugins/org.eclipse.emf.compare.ide.ui/plugin.properties
@@ -1,5 +1,5 @@
 ################################################################################
-# Copyright (c) 2006, 2012 Obeo.
+# Copyright (c) 2006, 2013 Obeo.
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License v1.0
 # which accompanies this distribution, and is available at
@@ -11,3 +11,6 @@
 pluginName = EMF Compare IDE UI
 providerName = Eclipse Modeling Project
 
+save.model.label = Save Comparison Model
+save.model.tooltip = Save Comparison Model
+save.model.command.name = EMF Compare Save Comparison Model
diff --git a/plugins/org.eclipse.emf.compare.ide.ui/plugin.xml b/plugins/org.eclipse.emf.compare.ide.ui/plugin.xml
index 606cd29ab..0d9988c9e 100644
--- a/plugins/org.eclipse.emf.compare.ide.ui/plugin.xml
+++ b/plugins/org.eclipse.emf.compare.ide.ui/plugin.xml
@@ -68,6 +68,51 @@
             uri="http://www.eclipse.org/emf/compare">
       </factory>
    </extension>
+      <extension
+         point="org.eclipse.ui.menus">
+      <menuContribution
+            allPopups="true"
+            locationURI="popup:compareWithMenu?after=compareWithGroup">
+         <command
+               commandId="org.eclipse.emf.compare.ide.ui.compareInDialog"
+               label="Each Other &lt;EObject&gt; (in Dialog)"
+               style="push">
+            <visibleWhen
+                  checkEnabled="true">
+            </visibleWhen>
+         </command>
+         <command
+               commandId="org.eclipse.emf.compare.ide.ui.compareInEditor"
+               label="Each Other &lt;EObject&gt; (in Editor)"
+               style="push">
+            <visibleWhen
+                  checkEnabled="true">
+            </visibleWhen>
+         </command>
+      </menuContribution>
+      <menuContribution
+            allPopups="false"
+            locationURI="popup:org.eclipse.ui.popup.any">
+         <menu
+               id="compareWithMenu"
+               label="Compare With">
+            <separator
+                  name="compareWithGroup">
+            </separator>
+         </menu>
+      </menuContribution>
+      <menuContribution
+            allPopups="false"
+            locationURI="toolbar:org.eclipse.emf.compare.structuremergeviewer.toolbar">
+         <command
+               commandId="org.eclipse.emf.compare.ide.ui.saveComparisonModel"
+               icon="icons/full/toolb16/saveas_edit.gif"
+               label="%save.model.name"
+               style="push"
+               tooltip="%save.model.tooltip">
+         </command>
+      </menuContribution>
+   </extension>
    <extension
          point="org.eclipse.ui.commands">
       <command
@@ -84,6 +129,10 @@
             id="org.eclipse.team.ui.compareWithEachOther"
             name="Each Other">
       </command>
+      <command
+            id="org.eclipse.emf.compare.ide.ui.saveComparisonModel"
+            name="%save.model.command.name">
+      </command>
    </extension>
    <extension
          point="org.eclipse.ui.handlers">
@@ -165,40 +214,19 @@
             </with>
          </activeWhen>
       </handler>
-   </extension>
-   <extension
-         point="org.eclipse.ui.menus">
-      <menuContribution
-            allPopups="true"
-            locationURI="popup:compareWithMenu?after=compareWithGroup">
-         <command
-               commandId="org.eclipse.emf.compare.ide.ui.compareInDialog"
-               label="Each Other &lt;EObject&gt; (in Dialog)"
-               style="push">
-            <visibleWhen
-                  checkEnabled="true">
-            </visibleWhen>
-         </command>
-         <command
-               commandId="org.eclipse.emf.compare.ide.ui.compareInEditor"
-               label="Each Other &lt;EObject&gt; (in Editor)"
-               style="push">
-            <visibleWhen
-                  checkEnabled="true">
-            </visibleWhen>
-         </command>
-      </menuContribution>
-      <menuContribution
-            allPopups="false"
-            locationURI="popup:org.eclipse.ui.popup.any">
-         <menu
-               id="compareWithMenu"
-               label="Compare With">
-            <separator
-                  name="compareWithGroup">
-            </separator>
-         </menu>
-      </menuContribution>
+      <handler
+            class="org.eclipse.emf.compare.ide.ui.internal.structuremergeviewer.handler.SaveComparisonModel"
+            commandId="org.eclipse.emf.compare.ide.ui.saveComparisonModel">
+         <enabledWhen>
+            <with
+                  variable="activeEditor">
+               <test
+                     property="emfcompare.isSaveable">
+               </test>
+            </with>
+         
+         </enabledWhen>
+      </handler>
    </extension>
    <extension
          id="org.eclipse.emf.compare.model.provider"
@@ -227,4 +255,14 @@
          </and>
       </enablement>
    </extension>
+   <extension
+         point="org.eclipse.core.expressions.propertyTesters">
+      <propertyTester
+            class="org.eclipse.emf.compare.ide.ui.internal.structuremergeviewer.handler.ModelSaveablePropertyTester"
+            id="org.eclipse.emf.compare.ide.ui.modelSaveable"
+            namespace="emfcompare"
+            properties="isSaveable"
+            type="java.lang.Object">
+      </propertyTester>
+   </extension>
 </plugin>
diff --git a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/EMFCompareStructureMergeViewer.java b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/EMFCompareStructureMergeViewer.java
index e9cfa8716..da2150c67 100644
--- a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/EMFCompareStructureMergeViewer.java
+++ b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/EMFCompareStructureMergeViewer.java
@@ -53,6 +53,7 @@ import org.eclipse.emf.compare.Match;
 import org.eclipse.emf.compare.command.ICompareCopyCommand;
 import org.eclipse.emf.compare.domain.ICompareEditingDomain;
 import org.eclipse.emf.compare.domain.impl.EMFCompareEditingDomain;
+import org.eclipse.emf.compare.ide.ui.internal.EMFCompareIDEUIPlugin;
 import org.eclipse.emf.compare.ide.ui.internal.actions.collapse.CollapseAllModelAction;
 import org.eclipse.emf.compare.ide.ui.internal.actions.expand.ExpandAllModelAction;
 import org.eclipse.emf.compare.ide.ui.internal.editor.ComparisonScopeInput;
@@ -60,7 +61,6 @@ import org.eclipse.emf.compare.ide.ui.internal.logical.EMFSynchronizationModel;
 import org.eclipse.emf.compare.ide.ui.internal.structuremergeviewer.provider.ComparisonNode;
 import org.eclipse.emf.compare.ide.ui.internal.util.SWTUtil;
 import org.eclipse.emf.compare.rcp.EMFCompareRCPPlugin;
-import org.eclipse.emf.compare.rcp.ui.EMFCompareRCPUIPlugin;
 import org.eclipse.emf.compare.rcp.ui.internal.EMFCompareConstants;
 import org.eclipse.emf.compare.rcp.ui.internal.structuremergeviewer.actions.FilterActionMenu;
 import org.eclipse.emf.compare.rcp.ui.internal.structuremergeviewer.actions.GroupActionMenu;
@@ -602,10 +602,10 @@ public class EMFCompareStructureMergeViewer extends DiffTreeViewer implements Co
 		if (uiWorkbenchBundle != null && uiWorkbenchBundle.getVersion().compareTo(junoStart) >= 0
 				&& uiWorkbenchBundle.getVersion().compareTo(keplerStart) < 0) {
 			IAction action = new CommandAction(PlatformUI.getWorkbench(),
-					"org.eclipse.emf.compare.rcp.ui.saveComparisonModel");
+					"org.eclipse.emf.compare.ide.ui.saveComparisonModel");
 			action.setToolTipText("Save Comparison model"); //$NON-NLS-1$
 			action.setImageDescriptor(AbstractUIPlugin.imageDescriptorFromPlugin(
-					EMFCompareRCPUIPlugin.PLUGIN_ID, "icons/full/toolb16/saveas_edit.gif"));
+					EMFCompareIDEUIPlugin.PLUGIN_ID, "icons/full/toolb16/saveas_edit.gif"));
 			toolbarManager.add(action);
 		}
 
diff --git a/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/structuremergeviewer/handler/ModelSaveablePropertyTester.java b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/handler/ModelSaveablePropertyTester.java
index ac766f585..3b409db57 100644
--- a/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/structuremergeviewer/handler/ModelSaveablePropertyTester.java
+++ b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/handler/ModelSaveablePropertyTester.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Obeo - initial API and implementation
  *******************************************************************************/
-package org.eclipse.emf.compare.rcp.ui.internal.structuremergeviewer.handler;
+package org.eclipse.emf.compare.ide.ui.internal.structuremergeviewer.handler;
 
 import org.eclipse.compare.CompareConfiguration;
 import org.eclipse.compare.CompareEditorInput;
diff --git a/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/structuremergeviewer/handler/SaveComparisonModel.java b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/handler/SaveComparisonModel.java
index a7045a22d..87c4bccb3 100644
--- a/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/structuremergeviewer/handler/SaveComparisonModel.java
+++ b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/handler/SaveComparisonModel.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Obeo - initial API and implementation
  *******************************************************************************/
-package org.eclipse.emf.compare.rcp.ui.internal.structuremergeviewer.handler;
+package org.eclipse.emf.compare.ide.ui.internal.structuremergeviewer.handler;
 
 import static com.google.common.collect.Maps.newHashMap;
 
diff --git a/plugins/org.eclipse.emf.compare.rcp.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.compare.rcp.ui/META-INF/MANIFEST.MF
index 4681d6e2c..9e042634f 100644
--- a/plugins/org.eclipse.emf.compare.rcp.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.compare.rcp.ui/META-INF/MANIFEST.MF
@@ -10,12 +10,10 @@ Bundle-ActivationPolicy: lazy
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.core.runtime;bundle-version="3.5.0",
  org.eclipse.emf.edit.ui;bundle-version="2.5.0",
- org.eclipse.compare;bundle-version="3.5.0",
  org.eclipse.emf.compare;bundle-version="2.0.1",
  org.eclipse.emf.compare.edit;bundle-version="2.0.1",
  org.eclipse.emf.ecore.xmi;bundle-version="2.5.0",
- org.eclipse.emf.compare.rcp;bundle-version="2.1.0",
- org.eclipse.core.expressions
+ org.eclipse.emf.compare.rcp;bundle-version="2.1.0"
 Export-Package: org.eclipse.emf.compare.rcp.ui,
  org.eclipse.emf.compare.rcp.ui.internal;x-friends:="org.eclipse.emf.compare.diagram.ide.ui",
  org.eclipse.emf.compare.rcp.ui.internal.contentmergeviewer.accessor;x-friends:="org.eclipse.emf.compare.ide.ui",
diff --git a/plugins/org.eclipse.emf.compare.rcp.ui/plugin.properties b/plugins/org.eclipse.emf.compare.rcp.ui/plugin.properties
index f29dc9cca..d488822c2 100644
--- a/plugins/org.eclipse.emf.compare.rcp.ui/plugin.properties
+++ b/plugins/org.eclipse.emf.compare.rcp.ui/plugin.properties
@@ -1,5 +1,5 @@
 ################################################################################
-# Copyright (c) 2012 Obeo.
+# Copyright (c) 2012, 2013 Obeo.
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License v1.0
 # which accompanies this distribution, and is available at
@@ -10,7 +10,3 @@
 ################################################################################
 pluginName = EMF Compare RCP UI
 providerName = Eclipse Modeling Project
-
-save.model.label = Save Comparison Model
-save.model.tooltip = Save Comparison Model
-save.model.command.name = EMF Compare Save Comparison Model
\ No newline at end of file
diff --git a/plugins/org.eclipse.emf.compare.rcp.ui/plugin.xml b/plugins/org.eclipse.emf.compare.rcp.ui/plugin.xml
index 015ea8072..7ff17a8dd 100644
--- a/plugins/org.eclipse.emf.compare.rcp.ui/plugin.xml
+++ b/plugins/org.eclipse.emf.compare.rcp.ui/plugin.xml
@@ -83,51 +83,4 @@
             ranking="15">
       </factory>
    </extension>
-   <extension
-         point="org.eclipse.ui.menus">
-      <menuContribution
-            allPopups="false"
-            locationURI="toolbar:org.eclipse.emf.compare.structuremergeviewer.toolbar">
-         <command
-               commandId="org.eclipse.emf.compare.rcp.ui.saveComparisonModel"
-               icon="icons/full/toolb16/saveas_edit.gif"
-               label="%save.model.name"
-               style="push"
-               tooltip="%save.model.tooltip">
-         </command>
-      </menuContribution>
-   </extension>
-   <extension
-         point="org.eclipse.ui.commands">
-      <command
-            id="org.eclipse.emf.compare.rcp.ui.saveComparisonModel"
-            name="%save.model.command.name">
-      </command>
-   </extension>
-   <extension
-         point="org.eclipse.ui.handlers">
-      <handler
-            class="org.eclipse.emf.compare.rcp.ui.internal.structuremergeviewer.handler.SaveComparisonModel"
-            commandId="org.eclipse.emf.compare.rcp.ui.saveComparisonModel">
-         <enabledWhen>
-            <with
-                  variable="activeEditor">
-               <test
-                     property="emfcompare.isSaveable">
-               </test>
-            </with>
-         
-         </enabledWhen>
-      </handler>
-   </extension>
-   <extension
-         point="org.eclipse.core.expressions.propertyTesters">
-      <propertyTester
-            class="org.eclipse.emf.compare.rcp.ui.internal.structuremergeviewer.handler.ModelSaveablePropertyTester"
-            id="org.eclipse.emf.compare.rcp.ui.modelSaveable"
-            namespace="emfcompare"
-            properties="isSaveable"
-            type="java.lang.Object">
-      </propertyTester>
-   </extension>
 </plugin>