383776: [UML Compare] the plugin oep.uml.compare.merger should be renamed into oep.uml.compare.diff

https://bugs.eclipse.org/bugs/show_bug.cgi?id=383776

11 files changed, 16 insertions, 16 deletions

diff --git a/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger/.project b/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger/.project
index 95abdd04718..1dd2406e99c 100644
--- a/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger/.project
+++ b/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <projectDescription>

-	<name>org.eclipse.papyrus.uml.compare.merger</name>

+	<name>org.eclipse.papyrus.uml.compare.diff</name>

 	<comment></comment>

 	<projects>

 	</projects>

diff --git a/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger/META-INF/MANIFEST.MF b/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger/META-INF/MANIFEST.MF
index 4315c03bb61..6b303a69a98 100644
--- a/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger/META-INF/MANIFEST.MF
+++ b/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger/META-INF/MANIFEST.MF
@@ -1,9 +1,9 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.papyrus.uml.compare.merger;singleton:=true
+Bundle-SymbolicName: org.eclipse.papyrus.uml.compare.diff;singleton:=true
 Bundle-Version: 0.9.0.qualifier
-Bundle-Activator: org.eclipse.papyrus.uml.compare.merger.Activator
+Bundle-Activator: org.eclipse.papyrus.uml.compare.diff.Activator
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
  org.eclipse.emf.compare.diff;bundle-version="1.3.1",
@@ -24,6 +24,6 @@ Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Export-Package: 
- org.eclipse.papyrus.uml.compare.merger.services.nested,
- org.eclipse.papyrus.uml.compare.merger.services.standalone
+ org.eclipse.papyrus.uml.compare.diff.services.nested,
+ org.eclipse.papyrus.uml.compare.diff.services.standalone
 
diff --git a/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger/src/org/eclipse/papyrus/uml/compare/merger/Activator.java b/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger/src/org/eclipse/papyrus/uml/compare/diff/Activator.java
index 03bc171246e..0438a809b76 100644
--- a/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger/src/org/eclipse/papyrus/uml/compare/merger/Activator.java
+++ b/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger/src/org/eclipse/papyrus/uml/compare/diff/Activator.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) Vincent.Lorenzo@cea.fr - Initial API and implementation

  *

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

-package org.eclipse.papyrus.uml.compare.merger;

+package org.eclipse.papyrus.uml.compare.diff;

 

 import org.eclipse.papyrus.infra.core.log.LogHelper;

 import org.eclipse.ui.plugin.AbstractUIPlugin;

@@ -23,7 +23,7 @@ import org.osgi.framework.BundleContext;
 public class Activator extends AbstractUIPlugin {

 

 	// The plug-in ID

-	public static final String PLUGIN_ID = "org.eclipse.papyrus.uml.compare.merger"; //$NON-NLS-1$

+	public static final String PLUGIN_ID = "org.eclipse.papyrus.uml.compare.diff"; //$NON-NLS-1$

 

 	// The shared instance

 	private static Activator plugin;

diff --git a/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger/src/org/eclipse/papyrus/uml/compare/merger/internal/utils/MergerUtils.java b/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger/src/org/eclipse/papyrus/uml/compare/diff/internal/utils/MergerUtils.java
index 76aa0ee33d8..f11065e9439 100644
--- a/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger/src/org/eclipse/papyrus/uml/compare/merger/internal/utils/MergerUtils.java
+++ b/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger/src/org/eclipse/papyrus/uml/compare/diff/internal/utils/MergerUtils.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) Vincent.Lorenzo@cea.fr - Initial API and implementation

  *

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

-package org.eclipse.papyrus.uml.compare.merger.internal.utils;

+package org.eclipse.papyrus.uml.compare.diff.internal.utils;

 

 import org.eclipse.emf.edit.domain.IEditingDomainProvider;

 import org.eclipse.emf.transaction.TransactionalEditingDomain;

diff --git a/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger/src/org/eclipse/papyrus/uml/compare/merger/services/nested/NestedMatchService.java b/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger/src/org/eclipse/papyrus/uml/compare/diff/services/nested/NestedMatchService.java
index c8d9f0e9e86..f222e7dd4e6 100644
--- a/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger/src/org/eclipse/papyrus/uml/compare/merger/services/nested/NestedMatchService.java
+++ b/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger/src/org/eclipse/papyrus/uml/compare/diff/services/nested/NestedMatchService.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.uml.compare.merger.services.nested;

+package org.eclipse.papyrus.uml.compare.diff.services.nested;

 

 import java.util.Map;

 

diff --git a/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger/src/org/eclipse/papyrus/uml/compare/merger/services/nested/NestedMergeUtils.java b/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger/src/org/eclipse/papyrus/uml/compare/diff/services/nested/NestedMergeUtils.java
index 8fe34c02a20..62c08971992 100644
--- a/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger/src/org/eclipse/papyrus/uml/compare/merger/services/nested/NestedMergeUtils.java
+++ b/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger/src/org/eclipse/papyrus/uml/compare/diff/services/nested/NestedMergeUtils.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) Vincent.Lorenzo@cea.fr - Initial API and implementation

  *

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

-package org.eclipse.papyrus.uml.compare.merger.services.nested;

+package org.eclipse.papyrus.uml.compare.diff.services.nested;

 

 import java.util.Map;

 

diff --git a/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger/src/org/eclipse/papyrus/uml/compare/merger/services/nested/UMLDiffEngine.java b/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger/src/org/eclipse/papyrus/uml/compare/diff/services/nested/UMLDiffEngine.java
index d846a68d0d3..832742d6756 100644
--- a/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger/src/org/eclipse/papyrus/uml/compare/merger/services/nested/UMLDiffEngine.java
+++ b/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger/src/org/eclipse/papyrus/uml/compare/diff/services/nested/UMLDiffEngine.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) Vincent.Lorenzo@cea.fr - Initial API and implementation

  *

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

-package org.eclipse.papyrus.uml.compare.merger.services.nested;

+package org.eclipse.papyrus.uml.compare.diff.services.nested;

 

 import org.eclipse.emf.compare.diff.engine.GenericDiffEngine;

 import org.eclipse.emf.compare.diff.metamodel.DiffGroup;

diff --git a/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger/src/org/eclipse/papyrus/uml/compare/merger/services/nested/UMLDiffService.java b/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger/src/org/eclipse/papyrus/uml/compare/diff/services/nested/UMLDiffService.java
index be966f61948..3745213edae 100644
--- a/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger/src/org/eclipse/papyrus/uml/compare/merger/services/nested/UMLDiffService.java
+++ b/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger/src/org/eclipse/papyrus/uml/compare/diff/services/nested/UMLDiffService.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) Vincent.Lorenzo@cea.fr - Initial API and implementation

  *

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

-package org.eclipse.papyrus.uml.compare.merger.services.nested;

+package org.eclipse.papyrus.uml.compare.diff.services.nested;

 

 import java.lang.reflect.InvocationTargetException;

 import java.lang.reflect.Method;

@@ -31,7 +31,7 @@ import org.eclipse.emf.compare.match.metamodel.MatchModel;
 import org.eclipse.emf.ecore.EObject;

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

 import org.eclipse.papyrus.infra.tools.util.ReflectHelper;

-import org.eclipse.papyrus.uml.compare.merger.Activator;

+import org.eclipse.papyrus.uml.compare.diff.Activator;

 

 /**

  * 

diff --git a/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger/src/org/eclipse/papyrus/uml/compare/merger/services/nested/UMLMatchEngine.java b/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger/src/org/eclipse/papyrus/uml/compare/diff/services/nested/UMLMatchEngine.java
index d3da77efee9..cdd797f8c71 100644
--- a/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger/src/org/eclipse/papyrus/uml/compare/merger/services/nested/UMLMatchEngine.java
+++ b/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger/src/org/eclipse/papyrus/uml/compare/diff/services/nested/UMLMatchEngine.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) Vincent.Lorenzo@cea.fr - Initial API and implementation

  *

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

-package org.eclipse.papyrus.uml.compare.merger.services.nested;

+package org.eclipse.papyrus.uml.compare.diff.services.nested;

 

 import java.util.Map;

 

diff --git a/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger/src/org/eclipse/papyrus/uml/compare/merger/services/nested/UMLSimilarityChecker.java b/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger/src/org/eclipse/papyrus/uml/compare/diff/services/nested/UMLSimilarityChecker.java
index e6272c494c9..31c7934a96f 100644
--- a/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger/src/org/eclipse/papyrus/uml/compare/merger/services/nested/UMLSimilarityChecker.java
+++ b/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger/src/org/eclipse/papyrus/uml/compare/diff/services/nested/UMLSimilarityChecker.java
@@ -11,7 +11,7 @@
  *  Vincent Lorenzo (CEA LIST) Vincent.Lorenzo@cea.fr - Initial API and implementation

  *

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

-package org.eclipse.papyrus.uml.compare.merger.services.nested;

+package org.eclipse.papyrus.uml.compare.diff.services.nested;

 

 import org.eclipse.emf.compare.FactoryException;

 import org.eclipse.emf.compare.match.engine.internal.DistinctEcoreSimilarityChecker;

diff --git a/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger/src/org/eclipse/papyrus/uml/compare/merger/services/standalone/StandaloneMergeUtils.java b/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger/src/org/eclipse/papyrus/uml/compare/diff/services/standalone/StandaloneMergeUtils.java
index 701ddb1f942..2d9b63d5071 100644
--- a/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger/src/org/eclipse/papyrus/uml/compare/merger/services/standalone/StandaloneMergeUtils.java
+++ b/extraplugins/uml/compare/org.eclipse.papyrus.uml.compare.merger/src/org/eclipse/papyrus/uml/compare/diff/services/standalone/StandaloneMergeUtils.java
@@ -1,4 +1,4 @@
-package org.eclipse.papyrus.uml.compare.merger.services.standalone;

+package org.eclipse.papyrus.uml.compare.diff.services.standalone;

 

 import java.util.HashMap;

 import java.util.Map;