move internal package from org.eclipse.emf.compare to

org.eclipse.emf.compare.ide.ui

23 files changed, 55 insertions, 55 deletions

diff --git a/plugins/org.eclipse.emf.compare.ide.ui/plugin.xml b/plugins/org.eclipse.emf.compare.ide.ui/plugin.xml
index 2865a86ef..f89fcc2dd 100644
--- a/plugins/org.eclipse.emf.compare.ide.ui/plugin.xml
+++ b/plugins/org.eclipse.emf.compare.ide.ui/plugin.xml
@@ -4,26 +4,26 @@
    <extension
          point="org.eclipse.compare.structureMergeViewers">
       <viewer
-            class="org.eclipse.emf.compare.internal.ide.ui.structuremergeviewer.EMFCompareStructureMergeViewerCreator"
+            class="org.eclipse.emf.compare.ide.ui.internal.structuremergeviewer.EMFCompareStructureMergeViewerCreator"
             extensions="xmi"
-            id="org.eclipse.emf.compare.internal.ide.ui.structureMergeViewer"
+            id="org.eclipse.emf.compare.ide.ui.internal.structureMergeViewer"
             label="EMFCompare Structure Merge Viewer">
       </viewer>
       <contentTypeBinding
             contentTypeId="org.eclipse.emf.ecore.xmi"
-            structureMergeViewerId="org.eclipse.emf.compare.internal.ide.ui.structureMergeViewer">
+            structureMergeViewerId="org.eclipse.emf.compare.ide.ui.internal.structureMergeViewer">
       </contentTypeBinding>
    </extension>
    <extension
          point="org.eclipse.compare.contentMergeViewers">
       <viewer
-            class="org.eclipse.emf.compare.internal.ide.ui.contentmergeviewer.EObjectContentMergeViewerCreator"
+            class="org.eclipse.emf.compare.ide.ui.internal.contentmergeviewer.EObjectContentMergeViewerCreator"
             extensions="eobject"
-            id="org.eclipse.emf.compare.internal.ide.ui.EObjectContentMergeViewer"
+            id="org.eclipse.emf.compare.ide.ui.internal.EObjectContentMergeViewer"
             label="EMFCompare Content Merge Viewer">
       </viewer>
       <contentTypeBinding
-            contentMergeViewerId="org.eclipse.emf.compare.internal.ide.ui.EObjectContentMergeViewer"
+            contentMergeViewerId="org.eclipse.emf.compare.ide.ui.internal.EObjectContentMergeViewer"
             contentTypeId="org.eclipse.emf.ecore.xmi">
       </contentTypeBinding>
    </extension>

diff --git a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/internal/ide/ui/contentmergeviewer/EObjectContentMergeViewer.java b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/EObjectContentMergeViewer.java
index 4301b7368..f6f84fa5d 100644
--- a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/internal/ide/ui/contentmergeviewer/EObjectContentMergeViewer.java
+++ b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/EObjectContentMergeViewer.java
@@ -8,14 +8,14 @@
  * Contributors:
  *     Obeo - initial API and implementation
  *******************************************************************************/
-package org.eclipse.emf.compare.internal.ide.ui.contentmergeviewer;
+package org.eclipse.emf.compare.ide.ui.internal.contentmergeviewer;
 
 import java.util.ResourceBundle;
 
 import org.eclipse.compare.CompareConfiguration;
 import org.eclipse.compare.contentmergeviewer.ContentMergeViewer;
 import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.compare.internal.ide.ui.contentmergeviewer.provider.IEObjectAccessor;
+import org.eclipse.emf.compare.ide.ui.internal.contentmergeviewer.provider.IEObjectAccessor;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
 import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;
@@ -35,7 +35,7 @@ public class EObjectContentMergeViewer extends ContentMergeViewer {
 	/**
 	 * Bundle name of the property file containing all displayed strings.
 	 */
-	private static final String BUNDLE_NAME = "org.eclipse.emf.compare.internal.ide.ui.contentmergeviewer.EObjectContentMergeViewer"; //$NON-NLS-1$
+	private static final String BUNDLE_NAME = "org.eclipse.emf.compare.ide.ui.internal.contentmergeviewer.EObjectContentMergeViewer"; //$NON-NLS-1$
 
 	/**
 	 * The {@link TreeViewer} for the ancestor part.
diff --git a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/internal/ide/ui/contentmergeviewer/EObjectContentMergeViewer.properties b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/EObjectContentMergeViewer.properties
index 1d0b53e28..1d0b53e28 100644
--- a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/internal/ide/ui/contentmergeviewer/EObjectContentMergeViewer.properties
+++ b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/EObjectContentMergeViewer.properties
diff --git a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/internal/ide/ui/contentmergeviewer/EObjectContentMergeViewerCreator.java b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/EObjectContentMergeViewerCreator.java
index 4639c4181..14503980e 100644
--- a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/internal/ide/ui/contentmergeviewer/EObjectContentMergeViewerCreator.java
+++ b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/EObjectContentMergeViewerCreator.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Obeo - initial API and implementation
  *******************************************************************************/
-package org.eclipse.emf.compare.internal.ide.ui.contentmergeviewer;
+package org.eclipse.emf.compare.ide.ui.internal.contentmergeviewer;
 
 import org.eclipse.compare.CompareConfiguration;
 import org.eclipse.compare.IViewerCreator;
@@ -25,7 +25,7 @@ public class EObjectContentMergeViewerCreator implements IViewerCreator {
 	/**
 	 * ID of the contribution to the org.eclipse.compare.contentMergeViewers extension point.
 	 */
-	public static final String EOBJECT_CONTENT_MERGE_VIEWER_ID = "org.eclipse.emf.compare.internal.ide.ui.EObjectContentMergeViewer"; //$NON-NLS-1$
+	public static final String EOBJECT_CONTENT_MERGE_VIEWER_ID = "org.eclipse.emf.compare.ide.ui.internal.EObjectContentMergeViewer"; //$NON-NLS-1$
 
 	/**
 	 * {@inheritDoc}
diff --git a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/internal/ide/ui/contentmergeviewer/EObjectMergeViewerContentProvider.java b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/EObjectMergeViewerContentProvider.java
index 716d70299..0a3402b7c 100644
--- a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/internal/ide/ui/contentmergeviewer/EObjectMergeViewerContentProvider.java
+++ b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/EObjectMergeViewerContentProvider.java
@@ -8,7 +8,7 @@
  * Contributors:

  *     Obeo - initial API and implementation

  *******************************************************************************/

-package org.eclipse.emf.compare.internal.ide.ui.contentmergeviewer;

+package org.eclipse.emf.compare.ide.ui.internal.contentmergeviewer;

 

 import org.eclipse.compare.CompareConfiguration;

 import org.eclipse.compare.IEditableContent;

diff --git a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/internal/ide/ui/contentmergeviewer/provider/EObjectNode.java b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/provider/EObjectNode.java
index 08750af90..bbd7ff153 100644
--- a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/internal/ide/ui/contentmergeviewer/provider/EObjectNode.java
+++ b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/provider/EObjectNode.java
@@ -8,7 +8,7 @@
  * Contributors:

  *     Obeo - initial API and implementation

  *******************************************************************************/

-package org.eclipse.emf.compare.internal.ide.ui.contentmergeviewer.provider;

+package org.eclipse.emf.compare.ide.ui.internal.contentmergeviewer.provider;

 

 import com.google.common.collect.Maps;

 

@@ -116,7 +116,7 @@ public class EObjectNode implements ITypedElement, IEObjectAccessor, IStreamCont
 	/**

 	 * {@inheritDoc}

 	 * 

-	 * @see org.eclipse.emf.compare.internal.ide.ui.contentmergeviewer.provider.IEObjectAccessor#getEObject()

+	 * @see org.eclipse.emf.compare.ide.ui.internal.contentmergeviewer.provider.IEObjectAccessor#getEObject()

 	 */

 	public EObject getEObject() {

 		return fEObject;

diff --git a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/internal/ide/ui/contentmergeviewer/provider/IEObjectAccessor.java b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/provider/IEObjectAccessor.java
index 5865c1d59..cf244b382 100644
--- a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/internal/ide/ui/contentmergeviewer/provider/IEObjectAccessor.java
+++ b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/provider/IEObjectAccessor.java
@@ -8,7 +8,7 @@
  * Contributors:

  *     Obeo - initial API and implementation

  *******************************************************************************/

-package org.eclipse.emf.compare.internal.ide.ui.contentmergeviewer.provider;

+package org.eclipse.emf.compare.ide.ui.internal.contentmergeviewer.provider;

 

 import org.eclipse.emf.ecore.EObject;

 

diff --git a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/internal/ide/ui/contentmergeviewer/provider/SingleAttributeChange.java b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/provider/SingleAttributeChange.java
index 563f5b4be..c7f8cdf30 100644
--- a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/internal/ide/ui/contentmergeviewer/provider/SingleAttributeChange.java
+++ b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/provider/SingleAttributeChange.java
@@ -8,7 +8,7 @@
  * Contributors:

  *     Obeo - initial API and implementation

  *******************************************************************************/

-package org.eclipse.emf.compare.internal.ide.ui.contentmergeviewer.provider;

+package org.eclipse.emf.compare.ide.ui.internal.contentmergeviewer.provider;

 

 import java.io.ByteArrayInputStream;

 import java.io.InputStream;

diff --git a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/internal/ide/ui/structuremergeviewer/AbstractEDiffContainer.java b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/AbstractEDiffContainer.java
index ea32c0ea4..52529f3de 100644
--- a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/internal/ide/ui/structuremergeviewer/AbstractEDiffContainer.java
+++ b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/AbstractEDiffContainer.java
@@ -8,7 +8,7 @@
  * Contributors:

  *     Obeo - initial API and implementation

  *******************************************************************************/

-package org.eclipse.emf.compare.internal.ide.ui.structuremergeviewer;

+package org.eclipse.emf.compare.ide.ui.internal.structuremergeviewer;

 

 import com.google.common.base.Function;

 import com.google.common.base.Predicate;

@@ -23,7 +23,7 @@ import org.eclipse.compare.structuremergeviewer.IDiffContainer;
 import org.eclipse.compare.structuremergeviewer.IDiffElement;

 import org.eclipse.emf.common.notify.Adapter;

 import org.eclipse.emf.common.notify.AdapterFactory;

-import org.eclipse.emf.compare.internal.ide.ui.structuremergeviewer.provider.MatchNode;

+import org.eclipse.emf.compare.ide.ui.internal.structuremergeviewer.provider.MatchNode;

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.emf.edit.provider.ITreeItemContentProvider;

 

diff --git a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/internal/ide/ui/structuremergeviewer/AbstractEDiffElement.java b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/AbstractEDiffElement.java
index 4ba3459b2..1f0b25844 100644
--- a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/internal/ide/ui/structuremergeviewer/AbstractEDiffElement.java
+++ b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/AbstractEDiffElement.java
@@ -8,7 +8,7 @@
  * Contributors:

  *     Obeo - initial API and implementation

  *******************************************************************************/

-package org.eclipse.emf.compare.internal.ide.ui.structuremergeviewer;

+package org.eclipse.emf.compare.ide.ui.internal.structuremergeviewer;

 

 import org.eclipse.compare.structuremergeviewer.Differencer;

 import org.eclipse.compare.structuremergeviewer.IDiffContainer;

diff --git a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/internal/ide/ui/structuremergeviewer/AbstractEDiffNode.java b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/AbstractEDiffNode.java
index 3c78d3896..70383ac6f 100644
--- a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/internal/ide/ui/structuremergeviewer/AbstractEDiffNode.java
+++ b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/AbstractEDiffNode.java
@@ -8,7 +8,7 @@
  * Contributors:

  *     Obeo - initial API and implementation

  *******************************************************************************/

-package org.eclipse.emf.compare.internal.ide.ui.structuremergeviewer;

+package org.eclipse.emf.compare.ide.ui.internal.structuremergeviewer;

 

 import org.eclipse.compare.ITypedElement;

 import org.eclipse.compare.structuremergeviewer.ICompareInput;

diff --git a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/internal/ide/ui/structuremergeviewer/EMFCompareStructureMergeViewer.java b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/EMFCompareStructureMergeViewer.java
index b3ad6e195..d37554a41 100644
--- a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/internal/ide/ui/structuremergeviewer/EMFCompareStructureMergeViewer.java
+++ b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/EMFCompareStructureMergeViewer.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Obeo - initial API and implementation
  *******************************************************************************/
-package org.eclipse.emf.compare.internal.ide.ui.structuremergeviewer;
+package org.eclipse.emf.compare.ide.ui.internal.structuremergeviewer;
 
 import java.lang.reflect.InvocationTargetException;
 
@@ -36,7 +36,7 @@ import org.eclipse.core.runtime.SubProgressMonitor;
 import org.eclipse.emf.compare.Comparison;
 import org.eclipse.emf.compare.EMFCompare;
 import org.eclipse.emf.compare.ide.ui.EMFCompareIDEUIPlugin;
-import org.eclipse.emf.compare.internal.ide.ui.structuremergeviewer.provider.CompareNodeAdapterFactory;
+import org.eclipse.emf.compare.ide.ui.internal.structuremergeviewer.provider.CompareNodeAdapterFactory;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.emf.ecore.resource.ResourceSet;
 import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
diff --git a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/internal/ide/ui/structuremergeviewer/EMFCompareStructureMergeViewerCreator.java b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/EMFCompareStructureMergeViewerCreator.java
index 06bb2f379..b9b13a0de 100644
--- a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/internal/ide/ui/structuremergeviewer/EMFCompareStructureMergeViewerCreator.java
+++ b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/EMFCompareStructureMergeViewerCreator.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Obeo - initial API and implementation
  *******************************************************************************/
-package org.eclipse.emf.compare.internal.ide.ui.structuremergeviewer;
+package org.eclipse.emf.compare.ide.ui.internal.structuremergeviewer;
 
 import org.eclipse.compare.CompareConfiguration;
 import org.eclipse.compare.IViewerCreator;
diff --git a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/internal/ide/ui/structuremergeviewer/provider/AttributeChangeNode.java b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/provider/AttributeChangeNode.java
index d581ec853..afdb14a15 100644
--- a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/internal/ide/ui/structuremergeviewer/provider/AttributeChangeNode.java
+++ b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/provider/AttributeChangeNode.java
@@ -8,12 +8,12 @@
  * Contributors:

  *     Obeo - initial API and implementation

  *******************************************************************************/

-package org.eclipse.emf.compare.internal.ide.ui.structuremergeviewer.provider;

+package org.eclipse.emf.compare.ide.ui.internal.structuremergeviewer.provider;

 

 import org.eclipse.compare.ITypedElement;

 import org.eclipse.emf.common.notify.AdapterFactory;

 import org.eclipse.emf.compare.AttributeChange;

-import org.eclipse.emf.compare.internal.ide.ui.contentmergeviewer.provider.SingleAttributeChange;

+import org.eclipse.emf.compare.ide.ui.internal.contentmergeviewer.provider.SingleAttributeChange;

 import org.eclipse.emf.ecore.EAttribute;

 import org.eclipse.emf.ecore.EObject;

 

@@ -32,7 +32,7 @@ public class AttributeChangeNode extends DiffNode {
 	/**

 	 * {@inheritDoc}

 	 * 

-	 * @see org.eclipse.emf.compare.internal.ide.ui.structuremergeviewer.provider.DiffNode#getTarget()

+	 * @see org.eclipse.emf.compare.ide.ui.internal.structuremergeviewer.provider.DiffNode#getTarget()

 	 */

 	@Override

 	public AttributeChange getTarget() {

@@ -42,7 +42,7 @@ public class AttributeChangeNode extends DiffNode {
 	/**

 	 * {@inheritDoc}

 	 * 

-	 * @see org.eclipse.emf.compare.internal.ide.ui.structuremergeviewer.AbstractEDiffElement#getType()

+	 * @see org.eclipse.emf.compare.ide.ui.internal.structuremergeviewer.AbstractEDiffElement#getType()

 	 */

 	@Override

 	public String getType() {

@@ -52,7 +52,7 @@ public class AttributeChangeNode extends DiffNode {
 	/**

 	 * {@inheritDoc}

 	 * 

-	 * @see org.eclipse.emf.compare.internal.ide.ui.structuremergeviewer.AbstractEDiffNode#getAncestor()

+	 * @see org.eclipse.emf.compare.ide.ui.internal.structuremergeviewer.AbstractEDiffNode#getAncestor()

 	 */

 	@Override

 	public ITypedElement getAncestor() {

@@ -72,7 +72,7 @@ public class AttributeChangeNode extends DiffNode {
 	/**

 	 * {@inheritDoc}

 	 * 

-	 * @see org.eclipse.emf.compare.internal.ide.ui.structuremergeviewer.AbstractEDiffNode#getLeft()

+	 * @see org.eclipse.emf.compare.ide.ui.internal.structuremergeviewer.AbstractEDiffNode#getLeft()

 	 */

 	@Override

 	public ITypedElement getLeft() {

@@ -92,7 +92,7 @@ public class AttributeChangeNode extends DiffNode {
 	/**

 	 * {@inheritDoc}

 	 * 

-	 * @see org.eclipse.emf.compare.internal.ide.ui.structuremergeviewer.AbstractEDiffNode#getRight()

+	 * @see org.eclipse.emf.compare.ide.ui.internal.structuremergeviewer.AbstractEDiffNode#getRight()

 	 */

 	@Override

 	public ITypedElement getRight() {

diff --git a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/internal/ide/ui/structuremergeviewer/provider/CompareNodeAdapterFactory.java b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/provider/CompareNodeAdapterFactory.java
index 191639fff..569eb460d 100644
--- a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/internal/ide/ui/structuremergeviewer/provider/CompareNodeAdapterFactory.java
+++ b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/provider/CompareNodeAdapterFactory.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Obeo - initial API and implementation
  *******************************************************************************/
-package org.eclipse.emf.compare.internal.ide.ui.structuremergeviewer.provider;
+package org.eclipse.emf.compare.ide.ui.internal.structuremergeviewer.provider;
 
 import java.util.ArrayList;
 import java.util.Collection;
diff --git a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/internal/ide/ui/structuremergeviewer/provider/ComparisonNode.java b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/provider/ComparisonNode.java
index d43e21922..d2f4e0bce 100644
--- a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/internal/ide/ui/structuremergeviewer/provider/ComparisonNode.java
+++ b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/provider/ComparisonNode.java
@@ -8,11 +8,11 @@
  * Contributors:

  *     Obeo - initial API and implementation

  *******************************************************************************/

-package org.eclipse.emf.compare.internal.ide.ui.structuremergeviewer.provider;

+package org.eclipse.emf.compare.ide.ui.internal.structuremergeviewer.provider;

 

 import org.eclipse.emf.common.notify.AdapterFactory;

 import org.eclipse.emf.compare.Comparison;

-import org.eclipse.emf.compare.internal.ide.ui.structuremergeviewer.AbstractEDiffNode;

+import org.eclipse.emf.compare.ide.ui.internal.structuremergeviewer.AbstractEDiffNode;

 

 /**

  * @author <a href="mailto:mikael.barbero@obeo.fr">Mikael Barbero</a>

diff --git a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/internal/ide/ui/structuremergeviewer/provider/ConflictNode.java b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/provider/ConflictNode.java
index 4f8d1e0e5..70657fcc5 100644
--- a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/internal/ide/ui/structuremergeviewer/provider/ConflictNode.java
+++ b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/provider/ConflictNode.java
@@ -8,12 +8,12 @@
  * Contributors:

  *     Obeo - initial API and implementation

  *******************************************************************************/

-package org.eclipse.emf.compare.internal.ide.ui.structuremergeviewer.provider;

+package org.eclipse.emf.compare.ide.ui.internal.structuremergeviewer.provider;

 

 import org.eclipse.compare.structuremergeviewer.Differencer;

 import org.eclipse.emf.common.notify.AdapterFactory;

 import org.eclipse.emf.compare.Conflict;

-import org.eclipse.emf.compare.internal.ide.ui.structuremergeviewer.AbstractEDiffNode;

+import org.eclipse.emf.compare.ide.ui.internal.structuremergeviewer.AbstractEDiffNode;

 

 /**

  * @author <a href="mailto:mikael.barbero@obeo.fr">Mikael Barbero</a>

@@ -40,7 +40,7 @@ public class ConflictNode extends AbstractEDiffNode {
 	/**

 	 * {@inheritDoc}

 	 * 

-	 * @see org.eclipse.emf.compare.internal.ide.ui.structuremergeviewer.AbstractEDiffElement#getKind()

+	 * @see org.eclipse.emf.compare.ide.ui.internal.structuremergeviewer.AbstractEDiffElement#getKind()

 	 */

 	@Override

 	public int getKind() {

diff --git a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/internal/ide/ui/structuremergeviewer/provider/DiffNode.java b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/provider/DiffNode.java
index ae005daa6..c79ab3a6e 100644
--- a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/internal/ide/ui/structuremergeviewer/provider/DiffNode.java
+++ b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/provider/DiffNode.java
@@ -8,14 +8,14 @@
  * Contributors:

  *     Obeo - initial API and implementation

  *******************************************************************************/

-package org.eclipse.emf.compare.internal.ide.ui.structuremergeviewer.provider;

+package org.eclipse.emf.compare.ide.ui.internal.structuremergeviewer.provider;

 

 import org.eclipse.compare.structuremergeviewer.Differencer;

 import org.eclipse.emf.common.notify.AdapterFactory;

 import org.eclipse.emf.compare.Comparison;

 import org.eclipse.emf.compare.Diff;

 import org.eclipse.emf.compare.DifferenceSource;

-import org.eclipse.emf.compare.internal.ide.ui.structuremergeviewer.AbstractEDiffNode;

+import org.eclipse.emf.compare.ide.ui.internal.structuremergeviewer.AbstractEDiffNode;

 

 /**

  * Specific {@link AbstractEDiffNode} for {@link Diff} objects.

@@ -47,7 +47,7 @@ public class DiffNode extends AbstractEDiffNode {
 	/**

 	 * {@inheritDoc}

 	 * 

-	 * @see org.eclipse.emf.compare.internal.ide.ui.structuremergeviewer.AbstractEDiffElement#getKind()

+	 * @see org.eclipse.emf.compare.ide.ui.internal.structuremergeviewer.AbstractEDiffElement#getKind()

 	 */

 	@Override

 	public int getKind() {

diff --git a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/internal/ide/ui/structuremergeviewer/provider/EquivalenceNode.java b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/provider/EquivalenceNode.java
index e3758cb8d..376501641 100644
--- a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/internal/ide/ui/structuremergeviewer/provider/EquivalenceNode.java
+++ b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/provider/EquivalenceNode.java
@@ -8,11 +8,11 @@
  * Contributors:

  *     Obeo - initial API and implementation

  *******************************************************************************/

-package org.eclipse.emf.compare.internal.ide.ui.structuremergeviewer.provider;

+package org.eclipse.emf.compare.ide.ui.internal.structuremergeviewer.provider;

 

 import org.eclipse.emf.common.notify.AdapterFactory;

 import org.eclipse.emf.compare.Equivalence;

-import org.eclipse.emf.compare.internal.ide.ui.structuremergeviewer.AbstractEDiffNode;

+import org.eclipse.emf.compare.ide.ui.internal.structuremergeviewer.AbstractEDiffNode;

 

 /**

  * @author <a href="mailto:mikael.barbero@obeo.fr">Mikael Barbero</a>

diff --git a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/internal/ide/ui/structuremergeviewer/provider/MatchNode.java b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/provider/MatchNode.java
index ec052b6bb..b9d39e7ee 100644
--- a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/internal/ide/ui/structuremergeviewer/provider/MatchNode.java
+++ b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/provider/MatchNode.java
@@ -8,14 +8,14 @@
  * Contributors:

  *     Obeo - initial API and implementation

  *******************************************************************************/

-package org.eclipse.emf.compare.internal.ide.ui.structuremergeviewer.provider;

+package org.eclipse.emf.compare.ide.ui.internal.structuremergeviewer.provider;

 

 import org.eclipse.compare.ITypedElement;

 import org.eclipse.compare.structuremergeviewer.Differencer;

 import org.eclipse.emf.common.notify.AdapterFactory;

 import org.eclipse.emf.compare.Match;

-import org.eclipse.emf.compare.internal.ide.ui.contentmergeviewer.provider.EObjectNode;

-import org.eclipse.emf.compare.internal.ide.ui.structuremergeviewer.AbstractEDiffNode;

+import org.eclipse.emf.compare.ide.ui.internal.contentmergeviewer.provider.EObjectNode;

+import org.eclipse.emf.compare.ide.ui.internal.structuremergeviewer.AbstractEDiffNode;

 import org.eclipse.emf.ecore.EObject;

 

 /**

@@ -43,7 +43,7 @@ public class MatchNode extends AbstractEDiffNode {
 	/**

 	 * {@inheritDoc}

 	 * 

-	 * @see org.eclipse.emf.compare.internal.ide.ui.structuremergeviewer.AbstractEDiffElement#getType()

+	 * @see org.eclipse.emf.compare.ide.ui.internal.structuremergeviewer.AbstractEDiffElement#getType()

 	 */

 	@Override

 	public String getType() {

@@ -53,7 +53,7 @@ public class MatchNode extends AbstractEDiffNode {
 	/**

 	 * {@inheritDoc}

 	 * 

-	 * @see org.eclipse.emf.compare.internal.ide.ui.structuremergeviewer.AbstractEDiffNode#getAncestor()

+	 * @see org.eclipse.emf.compare.ide.ui.internal.structuremergeviewer.AbstractEDiffNode#getAncestor()

 	 */

 	@Override

 	public ITypedElement getAncestor() {

@@ -67,7 +67,7 @@ public class MatchNode extends AbstractEDiffNode {
 	/**

 	 * {@inheritDoc}

 	 * 

-	 * @see org.eclipse.emf.compare.internal.ide.ui.structuremergeviewer.AbstractEDiffNode#getLeft()

+	 * @see org.eclipse.emf.compare.ide.ui.internal.structuremergeviewer.AbstractEDiffNode#getLeft()

 	 */

 	@Override

 	public ITypedElement getLeft() {

@@ -81,7 +81,7 @@ public class MatchNode extends AbstractEDiffNode {
 	/**

 	 * {@inheritDoc}

 	 * 

-	 * @see org.eclipse.emf.compare.internal.ide.ui.structuremergeviewer.AbstractEDiffNode#getRight()

+	 * @see org.eclipse.emf.compare.ide.ui.internal.structuremergeviewer.AbstractEDiffNode#getRight()

 	 */

 	@Override

 	public ITypedElement getRight() {

@@ -95,7 +95,7 @@ public class MatchNode extends AbstractEDiffNode {
 	/**

 	 * {@inheritDoc}

 	 * 

-	 * @see org.eclipse.emf.compare.internal.ide.ui.structuremergeviewer.AbstractEDiffElement#getKind()

+	 * @see org.eclipse.emf.compare.ide.ui.internal.structuremergeviewer.AbstractEDiffElement#getKind()

 	 */

 	@Override

 	public int getKind() {

diff --git a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/internal/ide/ui/structuremergeviewer/provider/MatchResourceNode.java b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/provider/MatchResourceNode.java
index d48c037f1..bb8e8b376 100644
--- a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/internal/ide/ui/structuremergeviewer/provider/MatchResourceNode.java
+++ b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/provider/MatchResourceNode.java
@@ -8,11 +8,11 @@
  * Contributors:

  *     Obeo - initial API and implementation

  *******************************************************************************/

-package org.eclipse.emf.compare.internal.ide.ui.structuremergeviewer.provider;

+package org.eclipse.emf.compare.ide.ui.internal.structuremergeviewer.provider;

 

 import org.eclipse.emf.common.notify.AdapterFactory;

 import org.eclipse.emf.compare.MatchResource;

-import org.eclipse.emf.compare.internal.ide.ui.structuremergeviewer.AbstractEDiffNode;

+import org.eclipse.emf.compare.ide.ui.internal.structuremergeviewer.AbstractEDiffNode;

 

 /**

  * @author <a href="mailto:mikael.barbero@obeo.fr">Mikael Barbero</a>

diff --git a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/internal/ide/ui/structuremergeviewer/provider/ReferenceChangeNode.java b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/provider/ReferenceChangeNode.java
index 0821a52d2..111ed7017 100644
--- a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/internal/ide/ui/structuremergeviewer/provider/ReferenceChangeNode.java
+++ b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/provider/ReferenceChangeNode.java
@@ -8,7 +8,7 @@
  * Contributors:

  *     Obeo - initial API and implementation

  *******************************************************************************/

-package org.eclipse.emf.compare.internal.ide.ui.structuremergeviewer.provider;

+package org.eclipse.emf.compare.ide.ui.internal.structuremergeviewer.provider;

 

 import org.eclipse.emf.common.notify.AdapterFactory;

 import org.eclipse.emf.compare.ReferenceChange;

@@ -28,7 +28,7 @@ public class ReferenceChangeNode extends DiffNode {
 	/**

 	 * {@inheritDoc}

 	 * 

-	 * @see org.eclipse.emf.compare.internal.ide.ui.structuremergeviewer.provider.DiffNode#getTarget()

+	 * @see org.eclipse.emf.compare.ide.ui.internal.structuremergeviewer.provider.DiffNode#getTarget()

 	 */

 	@Override

 	public ReferenceChange getTarget() {

diff --git a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/internal/ide/ui/structuremergeviewer/provider/ResourceAttachmentChangeNode.java b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/provider/ResourceAttachmentChangeNode.java
index 11ea6109d..82babdf7f 100644
--- a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/internal/ide/ui/structuremergeviewer/provider/ResourceAttachmentChangeNode.java
+++ b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/provider/ResourceAttachmentChangeNode.java
@@ -8,7 +8,7 @@
  * Contributors:

  *     Obeo - initial API and implementation

  *******************************************************************************/

-package org.eclipse.emf.compare.internal.ide.ui.structuremergeviewer.provider;

+package org.eclipse.emf.compare.ide.ui.internal.structuremergeviewer.provider;

 

 import org.eclipse.emf.common.notify.AdapterFactory;

 import org.eclipse.emf.compare.ResourceAttachmentChange;

@@ -28,7 +28,7 @@ public class ResourceAttachmentChangeNode extends DiffNode {
 	/**

 	 * {@inheritDoc}

 	 * 

-	 * @see org.eclipse.emf.compare.internal.ide.ui.structuremergeviewer.provider.DiffNode#getTarget()

+	 * @see org.eclipse.emf.compare.ide.ui.internal.structuremergeviewer.provider.DiffNode#getTarget()

 	 */

 	@Override

 	public ResourceAttachmentChange getTarget() {