move every classes from ide.ui bundle into x-internal packages

15 files changed, 19 insertions, 21 deletions

diff --git a/plugins/org.eclipse.emf.compare.ide.ui.tests/src/org/eclipse/emf/compare/ide/ui/tests/unit/EMFCompareSyncAdapterTest.java b/plugins/org.eclipse.emf.compare.ide.ui.tests/src/org/eclipse/emf/compare/ide/ui/tests/unit/EMFCompareSyncAdapterTest.java
index 18c534efb..2d9d24261 100644
--- a/plugins/org.eclipse.emf.compare.ide.ui.tests/src/org/eclipse/emf/compare/ide/ui/tests/unit/EMFCompareSyncAdapterTest.java
+++ b/plugins/org.eclipse.emf.compare.ide.ui.tests/src/org/eclipse/emf/compare/ide/ui/tests/unit/EMFCompareSyncAdapterTest.java
@@ -24,7 +24,7 @@ import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.NullProgressMonitor;

 import org.eclipse.emf.compare.ide.tests.mock.MockRemoteResourceMappingContext;

 import org.eclipse.emf.compare.ide.tests.mock.MockSynchronizationContext;

-import org.eclipse.emf.compare.ide.ui.logical.sync.EMFCompareSynchronizationAdapter;

+import org.eclipse.emf.compare.ide.ui.internal.logical.sync.EMFCompareSynchronizationAdapter;

 import org.eclipse.emf.compare.ide.ui.tests.utils.TestUtils;

 import org.eclipse.team.core.mapping.ISynchronizationContext;

 import org.eclipse.team.ui.mapping.ISynchronizationCompareAdapter;

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 f9c8f25bb..845d9dcd4 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
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName

 Bundle-SymbolicName: org.eclipse.emf.compare.ide.ui;singleton:=true

 Bundle-Version: 2.0.0.qualifier

-Bundle-Activator: org.eclipse.emf.compare.ide.ui.EMFCompareIDEUIPlugin

+Bundle-Activator: org.eclipse.emf.compare.ide.ui.internal.EMFCompareIDEUIPlugin

 Bundle-Vendor: %providerName

 Require-Bundle: org.eclipse.core.runtime,

  org.eclipse.team.ui,

@@ -17,8 +17,7 @@ Require-Bundle: org.eclipse.core.runtime,
 Bundle-RequiredExecutionEnvironment: J2SE-1.5

 Bundle-ActivationPolicy: lazy

 Bundle-Localization: plugin

-Export-Package: org.eclipse.emf.compare.ide.ui,

- org.eclipse.emf.compare.ide.ui.internal;x-internal:=true,

+Export-Package: org.eclipse.emf.compare.ide.ui.internal;x-internal:=true,

  org.eclipse.emf.compare.ide.ui.internal.actions.filter;x-internal:=true,

  org.eclipse.emf.compare.ide.ui.internal.actions.group;x-internal:=true,

  org.eclipse.emf.compare.ide.ui.internal.actions.mergeway;x-internal:=true,

@@ -27,10 +26,10 @@ Export-Package: org.eclipse.emf.compare.ide.ui,
  org.eclipse.emf.compare.ide.ui.internal.contentmergeviewer.table;x-internal:=true,

  org.eclipse.emf.compare.ide.ui.internal.contentmergeviewer.tree;x-internal:=true,

  org.eclipse.emf.compare.ide.ui.internal.contentmergeviewer.util;x-internal:=true,

+ org.eclipse.emf.compare.ide.ui.internal.logical.adapter;x-internal:=true,

+ org.eclipse.emf.compare.ide.ui.internal.logical.sync;x-internal:=true,

  org.eclipse.emf.compare.ide.ui.internal.structuremergeviewer;x-internal:=true,

- org.eclipse.emf.compare.ide.ui.internal.structuremergeviewer.provider;x-internal:=true,

- org.eclipse.emf.compare.ide.ui.logical.adapter,

- org.eclipse.emf.compare.ide.ui.logical.sync

+ org.eclipse.emf.compare.ide.ui.internal.structuremergeviewer.provider;x-internal:=true

 Import-Package: com.google.common.base;version="2.0.0",

  com.google.common.cache;version="10.0.0",

  com.google.common.collect;version="2.0.0"

diff --git a/plugins/org.eclipse.emf.compare.ide.ui/plugin.xml b/plugins/org.eclipse.emf.compare.ide.ui/plugin.xml
index 21a77cbbc..071006c01 100644
--- a/plugins/org.eclipse.emf.compare.ide.ui/plugin.xml
+++ b/plugins/org.eclipse.emf.compare.ide.ui/plugin.xml
@@ -49,7 +49,7 @@
          point="org.eclipse.core.runtime.adapters">

       <factory

             adaptableType="org.eclipse.emf.compare.ide.logical.EMFModelProvider"

-            class="org.eclipse.emf.compare.ide.ui.logical.adapter.EMFCompareAdapterFactory">

+            class="org.eclipse.emf.compare.ide.ui.internal.logical.adapter.EMFCompareAdapterFactory">

          <adapter

                type="org.eclipse.team.ui.mapping.ISynchronizationCompareAdapter">

          </adapter>

diff --git a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/EMFCompareConstants.java b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/EMFCompareConstants.java
index 5f4f9780b..e9813b792 100644
--- a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/EMFCompareConstants.java
+++ b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/EMFCompareConstants.java
@@ -15,7 +15,6 @@ import com.google.common.base.Predicate;
 import org.eclipse.emf.compare.ConflictKind;

 import org.eclipse.emf.compare.Diff;

 import org.eclipse.emf.compare.DifferenceState;

-import org.eclipse.emf.compare.ide.ui.EMFCompareIDEUIPlugin;

 

 /**

  * @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/ide/ui/EMFCompareIDEUIPlugin.java b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/EMFCompareIDEUIPlugin.java
index 20e3c6325..eeb87a4ae 100644
--- a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/EMFCompareIDEUIPlugin.java
+++ b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/EMFCompareIDEUIPlugin.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Obeo - initial API and implementation
  *******************************************************************************/
-package org.eclipse.emf.compare.ide.ui;
+package org.eclipse.emf.compare.ide.ui.internal;
 
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jface.resource.JFaceResources;
diff --git a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/actions/filter/FilterActionMenu.java b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/actions/filter/FilterActionMenu.java
index 06ef37725..af289cf90 100644
--- a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/actions/filter/FilterActionMenu.java
+++ b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/actions/filter/FilterActionMenu.java
@@ -11,7 +11,7 @@
 package org.eclipse.emf.compare.ide.ui.internal.actions.filter;

 

 import org.eclipse.emf.compare.DifferenceKind;

-import org.eclipse.emf.compare.ide.ui.EMFCompareIDEUIPlugin;

+import org.eclipse.emf.compare.ide.ui.internal.EMFCompareIDEUIPlugin;

 import org.eclipse.jface.action.Action;

 import org.eclipse.jface.action.IAction;

 import org.eclipse.jface.action.IMenuCreator;

diff --git a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/actions/group/DifferenceGroupNode.java b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/actions/group/DifferenceGroupNode.java
index 3bdd73b13..8742b15f1 100644
--- a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/actions/group/DifferenceGroupNode.java
+++ b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/actions/group/DifferenceGroupNode.java
@@ -19,7 +19,7 @@ import org.eclipse.compare.structuremergeviewer.IDiffElement;
 import org.eclipse.emf.common.notify.AdapterFactory;

 import org.eclipse.emf.compare.Comparison;

 import org.eclipse.emf.compare.Diff;

-import org.eclipse.emf.compare.ide.ui.EMFCompareIDEUIPlugin;

+import org.eclipse.emf.compare.ide.ui.internal.EMFCompareIDEUIPlugin;

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

 import org.eclipse.swt.graphics.Image;

 

diff --git a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/actions/group/GroupActionMenu.java b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/actions/group/GroupActionMenu.java
index df037aa9c..f6330107c 100644
--- a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/actions/group/GroupActionMenu.java
+++ b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/actions/group/GroupActionMenu.java
@@ -10,7 +10,7 @@
  *******************************************************************************/

 package org.eclipse.emf.compare.ide.ui.internal.actions.group;

 

-import org.eclipse.emf.compare.ide.ui.EMFCompareIDEUIPlugin;

+import org.eclipse.emf.compare.ide.ui.internal.EMFCompareIDEUIPlugin;

 import org.eclipse.jface.action.Action;

 import org.eclipse.jface.action.IAction;

 import org.eclipse.jface.action.IMenuCreator;

diff --git a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/actions/mergeway/MergeWayAction.java b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/actions/mergeway/MergeWayAction.java
index 107fac4b9..3e8db09e8 100644
--- a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/actions/mergeway/MergeWayAction.java
+++ b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/actions/mergeway/MergeWayAction.java
@@ -11,8 +11,8 @@
 package org.eclipse.emf.compare.ide.ui.internal.actions.mergeway;

 

 import org.eclipse.compare.CompareConfiguration;

-import org.eclipse.emf.compare.ide.ui.EMFCompareIDEUIPlugin;

 import org.eclipse.emf.compare.ide.ui.internal.EMFCompareConstants;

+import org.eclipse.emf.compare.ide.ui.internal.EMFCompareIDEUIPlugin;

 import org.eclipse.emf.compare.ide.ui.internal.contentmergeviewer.util.CompareConfigurationExtension;

 import org.eclipse.jface.action.Action;

 import org.eclipse.jface.resource.ImageDescriptor;

diff --git a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/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 77efba282..98ef842d0 100644
--- a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/provider/EObjectNode.java
+++ b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/contentmergeviewer/provider/EObjectNode.java
@@ -25,7 +25,7 @@ import org.eclipse.core.runtime.Status;
 import org.eclipse.emf.common.notify.Adapter;

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

 import org.eclipse.emf.common.util.URI;

-import org.eclipse.emf.compare.ide.ui.EMFCompareIDEUIPlugin;

+import org.eclipse.emf.compare.ide.ui.internal.EMFCompareIDEUIPlugin;

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.emf.ecore.util.EcoreUtil;

 import org.eclipse.emf.ecore.xmi.impl.XMIResourceImpl;

diff --git a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/logical/adapter/EMFCompareAdapterFactory.java b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/logical/adapter/EMFCompareAdapterFactory.java
index 22c5f4188..6f3fbdf8b 100644
--- a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/logical/adapter/EMFCompareAdapterFactory.java
+++ b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/logical/adapter/EMFCompareAdapterFactory.java
@@ -8,7 +8,7 @@
  * Contributors:

  *     Obeo - initial API and implementation

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

-package org.eclipse.emf.compare.ide.ui.logical.adapter;

+package org.eclipse.emf.compare.ide.ui.internal.logical.adapter;

 

 import org.eclipse.core.resources.IFile;

 import org.eclipse.core.resources.IResource;

@@ -17,7 +17,7 @@ import org.eclipse.core.runtime.IAdapterFactory;
 import org.eclipse.emf.compare.ide.internal.utils.ResourceUtil;

 import org.eclipse.emf.compare.ide.logical.EMFModelProvider;

 import org.eclipse.emf.compare.ide.logical.EMFResourceMapping;

-import org.eclipse.emf.compare.ide.ui.logical.sync.EMFCompareSynchronizationAdapter;

+import org.eclipse.emf.compare.ide.ui.internal.logical.sync.EMFCompareSynchronizationAdapter;

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.emf.ecore.resource.Resource;

 import org.eclipse.emf.ecore.resource.ResourceSet;

diff --git a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/logical/sync/EMFCompareSynchronizationAdapter.java b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/logical/sync/EMFCompareSynchronizationAdapter.java
index 315672e73..f926c850f 100644
--- a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/logical/sync/EMFCompareSynchronizationAdapter.java
+++ b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/logical/sync/EMFCompareSynchronizationAdapter.java
@@ -8,7 +8,7 @@
  * Contributors:

  *     Obeo - initial API and implementation

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

-package org.eclipse.emf.compare.ide.ui.logical.sync;

+package org.eclipse.emf.compare.ide.ui.internal.logical.sync;

 

 import org.eclipse.compare.structuremergeviewer.ICompareInput;

 import org.eclipse.core.resources.IResource;

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 def743959..77921ec97 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
@@ -39,8 +39,8 @@ import org.eclipse.emf.compare.ComparePackage;
 import org.eclipse.emf.compare.Comparison;
 import org.eclipse.emf.compare.DifferenceState;
 import org.eclipse.emf.compare.EMFCompare;
-import org.eclipse.emf.compare.ide.ui.EMFCompareIDEUIPlugin;
 import org.eclipse.emf.compare.ide.ui.internal.EMFCompareConstants;
+import org.eclipse.emf.compare.ide.ui.internal.EMFCompareIDEUIPlugin;
 import org.eclipse.emf.compare.ide.ui.internal.actions.filter.DifferenceFilter;
 import org.eclipse.emf.compare.ide.ui.internal.actions.filter.FilterActionMenu;
 import org.eclipse.emf.compare.ide.ui.internal.actions.group.DifferenceGrouper;
diff --git a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/EMFCompareStructureMergeViewerLabelProvider.java b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/EMFCompareStructureMergeViewerLabelProvider.java
index e3ba5758a..95ce57a38 100644
--- a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/EMFCompareStructureMergeViewerLabelProvider.java
+++ b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/EMFCompareStructureMergeViewerLabelProvider.java
@@ -14,8 +14,8 @@ import org.eclipse.compare.structuremergeviewer.IDiffElement;
 import org.eclipse.emf.common.notify.AdapterFactory;

 import org.eclipse.emf.compare.Diff;

 import org.eclipse.emf.compare.Match;

-import org.eclipse.emf.compare.ide.ui.EMFCompareIDEUIPlugin;

 import org.eclipse.emf.compare.ide.ui.internal.EMFCompareConstants;

+import org.eclipse.emf.compare.ide.ui.internal.EMFCompareIDEUIPlugin;

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

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

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

diff --git a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/provider/ImageProvider.java b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/provider/ImageProvider.java
index 70534696b..5e179b171 100644
--- a/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/provider/ImageProvider.java
+++ b/plugins/org.eclipse.emf.compare.ide.ui/src/org/eclipse/emf/compare/ide/ui/internal/structuremergeviewer/provider/ImageProvider.java
@@ -24,7 +24,7 @@ import org.eclipse.emf.compare.DifferenceKind;
 import org.eclipse.emf.compare.DifferenceSource;

 import org.eclipse.emf.compare.DifferenceState;

 import org.eclipse.emf.compare.Match;

-import org.eclipse.emf.compare.ide.ui.EMFCompareIDEUIPlugin;

+import org.eclipse.emf.compare.ide.ui.internal.EMFCompareIDEUIPlugin;

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.jface.resource.ImageDescriptor;