Bug 386118 - [EMF Facet] Papyrus should progressively support EMF Facet

0.2
impact of package renaming

17 files changed, 102 insertions, 102 deletions

diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.catalog/.checkstyle b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.catalog/.checkstyle
index 0c5acfea9be..0bd8d65aa47 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.catalog/.checkstyle
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.catalog/.checkstyle
@@ -10,7 +10,7 @@ Contributors:
     Nicolas Guyomar (Mia-Software) - initial API and implementation
 -->
 <fileset-config file-format-version="1.2.0" simple-config="true" sync-formatter="false">
-  <local-check-config name="EmfFacet" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet.checkstyle" type="project" description=""/>
+  <local-check-config name="EmfFacet" location="../org.eclipse.papyrus.emf.facet.archi.tech.rules/checkstyle/EmfFacet.checkstyle" type="project" description=""/>
   <fileset name="all" enabled="true" check-config-name="EmfFacet" local="true">
     <file-match-pattern match-pattern="." include-pattern="true"/>
     <file-match-pattern match-pattern="Messages.java" include-pattern="false"/>

diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.catalog/META-INF/MANIFEST.MF b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.catalog/META-INF/MANIFEST.MF
index c33af885fe8..6ea510774ae 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.catalog/META-INF/MANIFEST.MF
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.catalog/META-INF/MANIFEST.MF
@@ -12,5 +12,5 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.papyrus.emf.facet.efacet,
  org.eclipse.papyrus.emf.facet.efacet.metamodel;bundle-version="0.2.0"
 Bundle-ActivationPolicy: lazy
-Bundle-Activator: org.eclipse.emf.facet.efacet.catalog.plugin.Activator
-Export-Package: org.eclipse.emf.facet.efacet.catalog.efacetcatalog
+Bundle-Activator: org.eclipse.papyrus.emf.facet.efacet.catalog.plugin.Activator
+Export-Package: org.eclipse.papyrus.emf.facet.efacet.catalog.efacetcatalog
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.catalog/OSGI-INF/l10n/bundle.properties b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.catalog/OSGI-INF/l10n/bundle.properties
index 4c0e9ee0d96..e44968679e6 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.catalog/OSGI-INF/l10n/bundle.properties
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.catalog/OSGI-INF/l10n/bundle.properties
@@ -8,6 +8,6 @@
 # Contributors:

 #     Nicolas Guyomar (Mia-Software) - Bug 333553 - The user has not to deal with two files to create a facet

 ###############################################################################

-#Properties file for org.eclipse.emf.facet.efacet.core

+#Properties file for org.eclipse.papyrus.emf.facet.efacet.core

 Bundle-Vendor = Eclipse Modeling Project

 Bundle-Name = EMF Facet eFacet catalog (Deprecated) (Incubation)
\ No newline at end of file
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.catalog/model/efacetcatalog.ecore b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.catalog/model/efacetcatalog.ecore
index 1a64fe197bd..1e5e74d9389 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.catalog/model/efacetcatalog.ecore
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.catalog/model/efacetcatalog.ecore
@@ -3,12 +3,12 @@
     xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

     xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="efacetcatalog"

     nsURI="http://www.eclipse.org/emf/facet/eFacetCatalog/0.1.incubation" nsPrefix="efacetcatalog">

-  <eClassifiers xsi:type="ecore:EClass" name="QuerySetCatalog" eSuperTypes="platform:/plugin/org.eclipse.emf.facet.util.emf.catalog/model/catalog.ecore#//Catalog">

+  <eClassifiers xsi:type="ecore:EClass" name="QuerySetCatalog" eSuperTypes="platform:/plugin/org.eclipse.papyrus.emf.facet.util.emf.catalog/model/catalog.ecore#//Catalog">

     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

       <details key="documentation" value="A QuerySetCatalog aims at referencing EMF Facet QuerySet."/>

     </eAnnotations>

     <eStructuralFeatures xsi:type="ecore:EReference" name="installedQuerySets" upperBound="-1"

-        eType="ecore:EClass platform:/plugin/org.eclipse.emf.facet.efacet/model/efacet.ecore#//QuerySet"

+        eType="ecore:EClass platform:/plugin/org.eclipse.papyrus.emf.facet.efacet/model/efacet.ecore#//QuerySet"

         volatile="true" transient="true" derived="true">

       <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore">

         <details key="validationDelegates" value="self.installedQuerySets = self.installedEntries"/>

@@ -18,12 +18,12 @@
       </eAnnotations>

     </eStructuralFeatures>

   </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="FacetSetCatalog" eSuperTypes="platform:/plugin/org.eclipse.emf.facet.util.emf.catalog/model/catalog.ecore#//Catalog">

+  <eClassifiers xsi:type="ecore:EClass" name="FacetSetCatalog" eSuperTypes="platform:/plugin/org.eclipse.papyrus.emf.facet.util.emf.catalog/model/catalog.ecore#//Catalog">

     <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">

       <details key="documentation" value="A FacetSetCatalog aims at referencing EMF Facet FacetSet."/>

     </eAnnotations>

     <eStructuralFeatures xsi:type="ecore:EReference" name="installedFacetSets" upperBound="-1"

-        eType="ecore:EClass platform:/plugin/org.eclipse.emf.facet.efacet/model/efacet.ecore#//FacetSet"

+        eType="ecore:EClass platform:/plugin/org.eclipse.papyrus.emf.facet.efacet/model/efacet.ecore#//FacetSet"

         volatile="true" transient="true" derived="true">

       <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore">

         <details key="validationDelegates" value="self.installedFacetSets = self.installedEntries"/>

diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.catalog/model/efacetcatalog.genmodel b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.catalog/model/efacetcatalog.genmodel
index 1d74cd4a58e..e39aeafc4c2 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.catalog/model/efacetcatalog.genmodel
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.catalog/model/efacetcatalog.genmodel
@@ -2,14 +2,14 @@
 <genmodel:GenModel xmi:version="2.0"

     xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"

     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText=" Copyright (c) 2011 Mia-Software.&#xD;&#xA; &#xD;&#xA; All rights reserved. This program and the accompanying materials&#xD;&#xA; are made available under the terms of the Eclipse Public License v1.0&#xD;&#xA; which accompanies this distribution, and is available at&#xD;&#xA; http://www.eclipse.org/legal/epl-v10.html&#xD;&#xA; &#xD;&#xA; Contributors:&#xD;&#xA;&#x9;Gregoire Dupe (Mia-Software) - Design&#xD;&#xA;&#x9;Nicolas Guyomar (Mia-Software) - Implementation&#xD;&#xA; "

-    modelDirectory="/org.eclipse.emf.facet.efacet.catalog/src" editDirectory="/org.eclipse.emf.facet.efacet.catalog.edit/src"

-    editorDirectory="/org.eclipse.emf.facet.efacet.catalog.editor/src" modelPluginID="org.eclipse.emf.facet.efacet.catalog"

+    modelDirectory="/org.eclipse.papyrus.emf.facet.efacet.catalog/src" editDirectory="/org.eclipse.papyrus.emf.facet.efacet.catalog.edit/src"

+    editorDirectory="/org.eclipse.papyrus.emf.facet.efacet.catalog.editor/src" modelPluginID="org.eclipse.papyrus.emf.facet.efacet.catalog"

     modelName="Efacetcatalog" nonNLSMarkers="true" importerID="org.eclipse.emf.importer.ecore"

-    complianceLevel="5.0" copyrightFields="false" editPluginID="org.eclipse.emf.facet.efacet.catalog.edit"

-    editorPluginID="org.eclipse.emf.facet.efacet.catalog.editor" runtimeVersion="2.6"

-    usedGenPackages="platform:/plugin/org.eclipse.emf.facet.util.emf.catalog/model/catalog.genmodel#//catalog platform:/plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore platform:/plugin/org.eclipse.emf.facet.efacet/model/efacet.genmodel#//efacet">

+    complianceLevel="5.0" copyrightFields="false" editPluginID="org.eclipse.papyrus.emf.facet.efacet.catalog.edit"

+    editorPluginID="org.eclipse.papyrus.emf.facet.efacet.catalog.editor" runtimeVersion="2.6"

+    usedGenPackages="platform:/plugin/org.eclipse.papyrus.emf.facet.util.emf.catalog/model/catalog.genmodel#//catalog platform:/plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore platform:/plugin/org.eclipse.papyrus.emf.facet.efacet/model/efacet.genmodel#//efacet">

   <foreignModel>efacetcatalog.ecore</foreignModel>

-  <genPackages prefix="Efacetcatalog" basePackage="org.eclipse.emf.facet.efacet.catalog"

+  <genPackages prefix="Efacetcatalog" basePackage="org.eclipse.papyrus.emf.facet.efacet.catalog"

       disposableProviderFactory="true" ecorePackage="efacetcatalog.ecore#/">

     <genClasses ecoreClass="efacetcatalog.ecore#//QuerySetCatalog">

       <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference efacetcatalog.ecore#//QuerySetCatalog/installedQuerySets"/>

diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.catalog/plugin.xml b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.catalog/plugin.xml
index 4ead0b974e3..793f9d12139 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.catalog/plugin.xml
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.catalog/plugin.xml
@@ -18,7 +18,7 @@
    <extension point="org.eclipse.emf.ecore.generated_package">

       <package

             uri="http://www.eclipse.org/emf/facet/eFacetCatalog/0.1.incubation"

-            class="org.eclipse.emf.facet.efacet.catalog.efacetcatalog.EfacetcatalogPackage"

+            class="org.eclipse.papyrus.emf.facet.efacet.catalog.efacetcatalog.EfacetcatalogPackage"

             genModel="model/efacetcatalog.genmodel"/>

    </extension>

 

diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.catalog/src/org/eclipse/papyrus/emf/facet/efacet/catalog/efacetcatalog/EfacetcatalogFactory.java b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.catalog/src/org/eclipse/papyrus/emf/facet/efacet/catalog/efacetcatalog/EfacetcatalogFactory.java
index 3daa6287f00..e81ac6b0bb8 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.catalog/src/org/eclipse/papyrus/emf/facet/efacet/catalog/efacetcatalog/EfacetcatalogFactory.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.catalog/src/org/eclipse/papyrus/emf/facet/efacet/catalog/efacetcatalog/EfacetcatalogFactory.java
@@ -11,7 +11,7 @@
  * 	Nicolas Guyomar (Mia-Software) - Implementation

  *  

  */

-package org.eclipse.emf.facet.efacet.catalog.efacetcatalog;

+package org.eclipse.papyrus.emf.facet.efacet.catalog.efacetcatalog;

 

 import org.eclipse.emf.ecore.EFactory;

 

@@ -19,7 +19,7 @@ import org.eclipse.emf.ecore.EFactory;
  * <!-- begin-user-doc --> The <b>Factory</b> for the model. It provides a create method for each

  * non-abstract class of the model. <!-- end-user-doc -->

  * 

- * @see org.eclipse.emf.facet.efacet.catalog.efacetcatalog.EfacetcatalogPackage

+ * @see org.eclipse.papyrus.emf.facet.efacet.catalog.efacetcatalog.EfacetcatalogPackage

  * @generated

  * @deprecated cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=373672

  */

@@ -31,7 +31,7 @@ public interface EfacetcatalogFactory extends EFactory {
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

-	EfacetcatalogFactory eINSTANCE = org.eclipse.emf.facet.efacet.catalog.efacetcatalog.impl.EfacetcatalogFactoryImpl.init();

+	EfacetcatalogFactory eINSTANCE = org.eclipse.papyrus.emf.facet.efacet.catalog.efacetcatalog.impl.EfacetcatalogFactoryImpl.init();

 

 	/**

 	 * Returns a new object of class '<em>Query Set Catalog</em>'.

diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.catalog/src/org/eclipse/papyrus/emf/facet/efacet/catalog/efacetcatalog/EfacetcatalogPackage.java b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.catalog/src/org/eclipse/papyrus/emf/facet/efacet/catalog/efacetcatalog/EfacetcatalogPackage.java
index 32c357fe603..a8fa639755b 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.catalog/src/org/eclipse/papyrus/emf/facet/efacet/catalog/efacetcatalog/EfacetcatalogPackage.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.catalog/src/org/eclipse/papyrus/emf/facet/efacet/catalog/efacetcatalog/EfacetcatalogPackage.java
@@ -11,12 +11,12 @@
  * 	Nicolas Guyomar (Mia-Software) - Implementation

  *  

  */

-package org.eclipse.emf.facet.efacet.catalog.efacetcatalog;

+package org.eclipse.papyrus.emf.facet.efacet.catalog.efacetcatalog;

 

 import org.eclipse.emf.ecore.EClass;

 import org.eclipse.emf.ecore.EPackage;

 import org.eclipse.emf.ecore.EReference;

-import org.eclipse.emf.facet.util.emf.catalog.CatalogPackage;

+import org.eclipse.papyrus.emf.facet.util.emf.catalog.CatalogPackage;

 

 /**

  * <!-- begin-user-doc --> The <b>Package</b> for the model. It contains accessors for the meta

@@ -29,7 +29,7 @@ import org.eclipse.emf.facet.util.emf.catalog.CatalogPackage;
  * </ul>

  * <!-- end-user-doc -->

  * 

- * @see org.eclipse.emf.facet.efacet.catalog.efacetcatalog.EfacetcatalogFactory

+ * @see org.eclipse.papyrus.emf.facet.efacet.catalog.efacetcatalog.EfacetcatalogFactory

  * @model kind="package"

  * @generated

  * @deprecated cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=373672

@@ -66,14 +66,14 @@ public interface EfacetcatalogPackage extends EPackage {
 	 * <!-- end-user-doc -->

 	 * @generated

 	 */

-	EfacetcatalogPackage eINSTANCE = org.eclipse.emf.facet.efacet.catalog.efacetcatalog.impl.EfacetcatalogPackageImpl.init();

+	EfacetcatalogPackage eINSTANCE = org.eclipse.papyrus.emf.facet.efacet.catalog.efacetcatalog.impl.EfacetcatalogPackageImpl.init();

 

 	/**

-	 * The meta object id for the '{@link org.eclipse.emf.facet.efacet.catalog.efacetcatalog.impl.QuerySetCatalogImpl <em>Query Set Catalog</em>}' class.

+	 * The meta object id for the '{@link org.eclipse.papyrus.emf.facet.efacet.catalog.efacetcatalog.impl.QuerySetCatalogImpl <em>Query Set Catalog</em>}' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * @see org.eclipse.emf.facet.efacet.catalog.efacetcatalog.impl.QuerySetCatalogImpl

-	 * @see org.eclipse.emf.facet.efacet.catalog.efacetcatalog.impl.EfacetcatalogPackageImpl#getQuerySetCatalog()

+	 * @see org.eclipse.papyrus.emf.facet.efacet.catalog.efacetcatalog.impl.QuerySetCatalogImpl

+	 * @see org.eclipse.papyrus.emf.facet.efacet.catalog.efacetcatalog.impl.EfacetcatalogPackageImpl#getQuerySetCatalog()

 	 * @generated

 	 */

 	int QUERY_SET_CATALOG = 0;

@@ -115,11 +115,11 @@ public interface EfacetcatalogPackage extends EPackage {
 	int QUERY_SET_CATALOG_FEATURE_COUNT = CatalogPackage.CATALOG_FEATURE_COUNT + 1;

 

 	/**

-	 * The meta object id for the '{@link org.eclipse.emf.facet.efacet.catalog.efacetcatalog.impl.FacetSetCatalogImpl <em>Facet Set Catalog</em>}' class.

+	 * The meta object id for the '{@link org.eclipse.papyrus.emf.facet.efacet.catalog.efacetcatalog.impl.FacetSetCatalogImpl <em>Facet Set Catalog</em>}' class.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

-	 * @see org.eclipse.emf.facet.efacet.catalog.efacetcatalog.impl.FacetSetCatalogImpl

-	 * @see org.eclipse.emf.facet.efacet.catalog.efacetcatalog.impl.EfacetcatalogPackageImpl#getFacetSetCatalog()

+	 * @see org.eclipse.papyrus.emf.facet.efacet.catalog.efacetcatalog.impl.FacetSetCatalogImpl

+	 * @see org.eclipse.papyrus.emf.facet.efacet.catalog.efacetcatalog.impl.EfacetcatalogPackageImpl#getFacetSetCatalog()

 	 * @generated

 	 */

 	int FACET_SET_CATALOG = 1;

@@ -162,42 +162,42 @@ public interface EfacetcatalogPackage extends EPackage {
 

 

 	/**

-	 * Returns the meta object for class '{@link org.eclipse.emf.facet.efacet.catalog.efacetcatalog.QuerySetCatalog <em>Query Set Catalog</em>}'.

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.emf.facet.efacet.catalog.efacetcatalog.QuerySetCatalog <em>Query Set Catalog</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * @return the meta object for class '<em>Query Set Catalog</em>'.

-	 * @see org.eclipse.emf.facet.efacet.catalog.efacetcatalog.QuerySetCatalog

+	 * @see org.eclipse.papyrus.emf.facet.efacet.catalog.efacetcatalog.QuerySetCatalog

 	 * @generated

 	 */

 	EClass getQuerySetCatalog();

 

 	/**

-	 * Returns the meta object for the reference list '{@link org.eclipse.emf.facet.efacet.catalog.efacetcatalog.QuerySetCatalog#getInstalledQuerySets <em>Installed Query Sets</em>}'.

+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.emf.facet.efacet.catalog.efacetcatalog.QuerySetCatalog#getInstalledQuerySets <em>Installed Query Sets</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * @return the meta object for the reference list '<em>Installed Query Sets</em>'.

-	 * @see org.eclipse.emf.facet.efacet.catalog.efacetcatalog.QuerySetCatalog#getInstalledQuerySets()

+	 * @see org.eclipse.papyrus.emf.facet.efacet.catalog.efacetcatalog.QuerySetCatalog#getInstalledQuerySets()

 	 * @see #getQuerySetCatalog()

 	 * @generated

 	 */

 	EReference getQuerySetCatalog_InstalledQuerySets();

 

 	/**

-	 * Returns the meta object for class '{@link org.eclipse.emf.facet.efacet.catalog.efacetcatalog.FacetSetCatalog <em>Facet Set Catalog</em>}'.

+	 * Returns the meta object for class '{@link org.eclipse.papyrus.emf.facet.efacet.catalog.efacetcatalog.FacetSetCatalog <em>Facet Set Catalog</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * @return the meta object for class '<em>Facet Set Catalog</em>'.

-	 * @see org.eclipse.emf.facet.efacet.catalog.efacetcatalog.FacetSetCatalog

+	 * @see org.eclipse.papyrus.emf.facet.efacet.catalog.efacetcatalog.FacetSetCatalog

 	 * @generated

 	 */

 	EClass getFacetSetCatalog();

 

 	/**

-	 * Returns the meta object for the reference list '{@link org.eclipse.emf.facet.efacet.catalog.efacetcatalog.FacetSetCatalog#getInstalledFacetSets <em>Installed Facet Sets</em>}'.

+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.emf.facet.efacet.catalog.efacetcatalog.FacetSetCatalog#getInstalledFacetSets <em>Installed Facet Sets</em>}'.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * @return the meta object for the reference list '<em>Installed Facet Sets</em>'.

-	 * @see org.eclipse.emf.facet.efacet.catalog.efacetcatalog.FacetSetCatalog#getInstalledFacetSets()

+	 * @see org.eclipse.papyrus.emf.facet.efacet.catalog.efacetcatalog.FacetSetCatalog#getInstalledFacetSets()

 	 * @see #getFacetSetCatalog()

 	 * @generated

 	 */

@@ -226,11 +226,11 @@ public interface EfacetcatalogPackage extends EPackage {
 	 */

 	interface Literals {

 		/**

-		 * The meta object literal for the '{@link org.eclipse.emf.facet.efacet.catalog.efacetcatalog.impl.QuerySetCatalogImpl <em>Query Set Catalog</em>}' class.

+		 * The meta object literal for the '{@link org.eclipse.papyrus.emf.facet.efacet.catalog.efacetcatalog.impl.QuerySetCatalogImpl <em>Query Set Catalog</em>}' class.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * @see org.eclipse.emf.facet.efacet.catalog.efacetcatalog.impl.QuerySetCatalogImpl

-		 * @see org.eclipse.emf.facet.efacet.catalog.efacetcatalog.impl.EfacetcatalogPackageImpl#getQuerySetCatalog()

+		 * @see org.eclipse.papyrus.emf.facet.efacet.catalog.efacetcatalog.impl.QuerySetCatalogImpl

+		 * @see org.eclipse.papyrus.emf.facet.efacet.catalog.efacetcatalog.impl.EfacetcatalogPackageImpl#getQuerySetCatalog()

 		 * @generated

 		 */

 		EClass QUERY_SET_CATALOG = eINSTANCE.getQuerySetCatalog();

@@ -244,11 +244,11 @@ public interface EfacetcatalogPackage extends EPackage {
 		EReference QUERY_SET_CATALOG__INSTALLED_QUERY_SETS = eINSTANCE.getQuerySetCatalog_InstalledQuerySets();

 

 		/**

-		 * The meta object literal for the '{@link org.eclipse.emf.facet.efacet.catalog.efacetcatalog.impl.FacetSetCatalogImpl <em>Facet Set Catalog</em>}' class.

+		 * The meta object literal for the '{@link org.eclipse.papyrus.emf.facet.efacet.catalog.efacetcatalog.impl.FacetSetCatalogImpl <em>Facet Set Catalog</em>}' class.

 		 * <!-- begin-user-doc -->

 		 * <!-- end-user-doc -->

-		 * @see org.eclipse.emf.facet.efacet.catalog.efacetcatalog.impl.FacetSetCatalogImpl

-		 * @see org.eclipse.emf.facet.efacet.catalog.efacetcatalog.impl.EfacetcatalogPackageImpl#getFacetSetCatalog()

+		 * @see org.eclipse.papyrus.emf.facet.efacet.catalog.efacetcatalog.impl.FacetSetCatalogImpl

+		 * @see org.eclipse.papyrus.emf.facet.efacet.catalog.efacetcatalog.impl.EfacetcatalogPackageImpl#getFacetSetCatalog()

 		 * @generated

 		 */

 		EClass FACET_SET_CATALOG = eINSTANCE.getFacetSetCatalog();

diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.catalog/src/org/eclipse/papyrus/emf/facet/efacet/catalog/efacetcatalog/FacetSetCatalog.java b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.catalog/src/org/eclipse/papyrus/emf/facet/efacet/catalog/efacetcatalog/FacetSetCatalog.java
index 9b395a804f5..1a9900205b9 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.catalog/src/org/eclipse/papyrus/emf/facet/efacet/catalog/efacetcatalog/FacetSetCatalog.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.catalog/src/org/eclipse/papyrus/emf/facet/efacet/catalog/efacetcatalog/FacetSetCatalog.java
@@ -11,11 +11,11 @@
  * 	Nicolas Guyomar (Mia-Software) - Implementation

  *  

  */

-package org.eclipse.emf.facet.efacet.catalog.efacetcatalog;

+package org.eclipse.papyrus.emf.facet.efacet.catalog.efacetcatalog;

 

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

-import org.eclipse.emf.facet.efacet.FacetSet;

-import org.eclipse.emf.facet.util.emf.catalog.Catalog;

+import org.eclipse.papyrus.emf.facet.efacet.FacetSet;

+import org.eclipse.papyrus.emf.facet.util.emf.catalog.Catalog;

 

 /**

  * <!-- begin-user-doc --> A representation of the model object '<em><b>Facet Set Catalog</b></em>'.

@@ -28,12 +28,12 @@ import org.eclipse.emf.facet.util.emf.catalog.Catalog;
  * The following features are supported:

  * <ul>

  * <li>

- * {@link org.eclipse.emf.facet.efacet.catalog.efacetcatalog.FacetSetCatalog#getInstalledFacetSets

+ * {@link org.eclipse.papyrus.emf.facet.efacet.catalog.efacetcatalog.FacetSetCatalog#getInstalledFacetSets

  * <em>Installed Facet Sets</em>}</li>

  * </ul>

  * </p>

  * 

- * @see org.eclipse.emf.facet.efacet.catalog.efacetcatalog.EfacetcatalogPackage#getFacetSetCatalog()

+ * @see org.eclipse.papyrus.emf.facet.efacet.catalog.efacetcatalog.EfacetcatalogPackage#getFacetSetCatalog()

  * @model

  * @generated

  * @deprecated cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=373672

@@ -42,14 +42,14 @@ import org.eclipse.emf.facet.util.emf.catalog.Catalog;
 public interface FacetSetCatalog extends Catalog {

 	/**

 	 * Returns the value of the '<em><b>Installed Facet Sets</b></em>' reference list.

-	 * The list contents are of type {@link org.eclipse.emf.facet.efacet.FacetSet}.

+	 * The list contents are of type {@link org.eclipse.papyrus.emf.facet.efacet.FacetSet}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * <!-- begin-model-doc -->

 	 * "installedFacetSets" derived link aims at providing a direct access to FacetSet objects in the catalog.

 	 * <!-- end-model-doc -->

 	 * @return the value of the '<em>Installed Facet Sets</em>' reference list.

-	 * @see org.eclipse.emf.facet.efacet.catalog.efacetcatalog.EfacetcatalogPackage#getFacetSetCatalog_InstalledFacetSets()

+	 * @see org.eclipse.papyrus.emf.facet.efacet.catalog.efacetcatalog.EfacetcatalogPackage#getFacetSetCatalog_InstalledFacetSets()

 	 * @model transient="true" volatile="true" derived="true"

 	 *        annotation="http://www.eclipse.org/emf/2002/Ecore validationDelegates='self.installedFacetSets = self.installedEntries'"

 	 * @generated

diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.catalog/src/org/eclipse/papyrus/emf/facet/efacet/catalog/efacetcatalog/QuerySetCatalog.java b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.catalog/src/org/eclipse/papyrus/emf/facet/efacet/catalog/efacetcatalog/QuerySetCatalog.java
index 674883a72a9..7c0fec44deb 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.catalog/src/org/eclipse/papyrus/emf/facet/efacet/catalog/efacetcatalog/QuerySetCatalog.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.catalog/src/org/eclipse/papyrus/emf/facet/efacet/catalog/efacetcatalog/QuerySetCatalog.java
@@ -11,11 +11,11 @@
  * 	Nicolas Guyomar (Mia-Software) - Implementation

  *  

  */

-package org.eclipse.emf.facet.efacet.catalog.efacetcatalog;

+package org.eclipse.papyrus.emf.facet.efacet.catalog.efacetcatalog;

 

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

-import org.eclipse.emf.facet.efacet.QuerySet;

-import org.eclipse.emf.facet.util.emf.catalog.Catalog;

+import org.eclipse.papyrus.emf.facet.efacet.QuerySet;

+import org.eclipse.papyrus.emf.facet.util.emf.catalog.Catalog;

 

 /**

  * <!-- begin-user-doc --> A representation of the model object '<em><b>Query Set Catalog</b></em>'.

@@ -28,12 +28,12 @@ import org.eclipse.emf.facet.util.emf.catalog.Catalog;
  * The following features are supported:

  * <ul>

  * <li>

- * {@link org.eclipse.emf.facet.efacet.catalog.efacetcatalog.QuerySetCatalog#getInstalledQuerySets

+ * {@link org.eclipse.papyrus.emf.facet.efacet.catalog.efacetcatalog.QuerySetCatalog#getInstalledQuerySets

  * <em>Installed Query Sets</em>}</li>

  * </ul>

  * </p>

  * 

- * @see org.eclipse.emf.facet.efacet.catalog.efacetcatalog.EfacetcatalogPackage#getQuerySetCatalog()

+ * @see org.eclipse.papyrus.emf.facet.efacet.catalog.efacetcatalog.EfacetcatalogPackage#getQuerySetCatalog()

  * @model

  * @generated

  * @deprecated cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=373672

@@ -42,14 +42,14 @@ import org.eclipse.emf.facet.util.emf.catalog.Catalog;
 public interface QuerySetCatalog extends Catalog {

 	/**

 	 * Returns the value of the '<em><b>Installed Query Sets</b></em>' reference list.

-	 * The list contents are of type {@link org.eclipse.emf.facet.efacet.QuerySet}.

+	 * The list contents are of type {@link org.eclipse.papyrus.emf.facet.efacet.QuerySet}.

 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * <!-- begin-model-doc -->

 	 * "installedQuerySets" derived link aims at providing a direct access to QuerySet objects in the catalog.

 	 * <!-- end-model-doc -->

 	 * @return the value of the '<em>Installed Query Sets</em>' reference list.

-	 * @see org.eclipse.emf.facet.efacet.catalog.efacetcatalog.EfacetcatalogPackage#getQuerySetCatalog_InstalledQuerySets()

+	 * @see org.eclipse.papyrus.emf.facet.efacet.catalog.efacetcatalog.EfacetcatalogPackage#getQuerySetCatalog_InstalledQuerySets()

 	 * @model transient="true" volatile="true" derived="true"

 	 *        annotation="http://www.eclipse.org/emf/2002/Ecore validationDelegates='self.installedQuerySets = self.installedEntries'"

 	 * @generated

diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.catalog/src/org/eclipse/papyrus/emf/facet/efacet/catalog/efacetcatalog/impl/EfacetcatalogFactoryImpl.java b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.catalog/src/org/eclipse/papyrus/emf/facet/efacet/catalog/efacetcatalog/impl/EfacetcatalogFactoryImpl.java
index 40bab2035b2..0125309dd6b 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.catalog/src/org/eclipse/papyrus/emf/facet/efacet/catalog/efacetcatalog/impl/EfacetcatalogFactoryImpl.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.catalog/src/org/eclipse/papyrus/emf/facet/efacet/catalog/efacetcatalog/impl/EfacetcatalogFactoryImpl.java
@@ -11,17 +11,17 @@
  * 	Nicolas Guyomar (Mia-Software) - Implementation

  *  

  */

-package org.eclipse.emf.facet.efacet.catalog.efacetcatalog.impl;

+package org.eclipse.papyrus.emf.facet.efacet.catalog.efacetcatalog.impl;

 

 import org.eclipse.emf.ecore.EClass;

 import org.eclipse.emf.ecore.EObject;

 import org.eclipse.emf.ecore.EPackage;

 import org.eclipse.emf.ecore.impl.EFactoryImpl;

 import org.eclipse.emf.ecore.plugin.EcorePlugin;

-import org.eclipse.emf.facet.efacet.catalog.efacetcatalog.EfacetcatalogFactory;

-import org.eclipse.emf.facet.efacet.catalog.efacetcatalog.EfacetcatalogPackage;

-import org.eclipse.emf.facet.efacet.catalog.efacetcatalog.FacetSetCatalog;

-import org.eclipse.emf.facet.efacet.catalog.efacetcatalog.QuerySetCatalog;

+import org.eclipse.papyrus.emf.facet.efacet.catalog.efacetcatalog.EfacetcatalogFactory;

+import org.eclipse.papyrus.emf.facet.efacet.catalog.efacetcatalog.EfacetcatalogPackage;

+import org.eclipse.papyrus.emf.facet.efacet.catalog.efacetcatalog.FacetSetCatalog;

+import org.eclipse.papyrus.emf.facet.efacet.catalog.efacetcatalog.QuerySetCatalog;

 

 /**

  * <!-- begin-user-doc --> An implementation of the model <b>Factory</b>. <!-- end-user-doc -->

diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.catalog/src/org/eclipse/papyrus/emf/facet/efacet/catalog/efacetcatalog/impl/EfacetcatalogPackageImpl.java b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.catalog/src/org/eclipse/papyrus/emf/facet/efacet/catalog/efacetcatalog/impl/EfacetcatalogPackageImpl.java
index a195260fcee..d2ed820c258 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.catalog/src/org/eclipse/papyrus/emf/facet/efacet/catalog/efacetcatalog/impl/EfacetcatalogPackageImpl.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.catalog/src/org/eclipse/papyrus/emf/facet/efacet/catalog/efacetcatalog/impl/EfacetcatalogPackageImpl.java
@@ -11,18 +11,18 @@
  * 	Nicolas Guyomar (Mia-Software) - Implementation

  *  

  */

-package org.eclipse.emf.facet.efacet.catalog.efacetcatalog.impl;

+package org.eclipse.papyrus.emf.facet.efacet.catalog.efacetcatalog.impl;

 

 import org.eclipse.emf.ecore.EClass;

 import org.eclipse.emf.ecore.EPackage;

 import org.eclipse.emf.ecore.EReference;

 import org.eclipse.emf.ecore.impl.EPackageImpl;

-import org.eclipse.emf.facet.efacet.EFacetPackage;

-import org.eclipse.emf.facet.efacet.catalog.efacetcatalog.EfacetcatalogFactory;

-import org.eclipse.emf.facet.efacet.catalog.efacetcatalog.EfacetcatalogPackage;

-import org.eclipse.emf.facet.efacet.catalog.efacetcatalog.FacetSetCatalog;

-import org.eclipse.emf.facet.efacet.catalog.efacetcatalog.QuerySetCatalog;

-import org.eclipse.emf.facet.util.emf.catalog.CatalogPackage;

+import org.eclipse.papyrus.emf.facet.efacet.EFacetPackage;

+import org.eclipse.papyrus.emf.facet.efacet.catalog.efacetcatalog.EfacetcatalogFactory;

+import org.eclipse.papyrus.emf.facet.efacet.catalog.efacetcatalog.EfacetcatalogPackage;

+import org.eclipse.papyrus.emf.facet.efacet.catalog.efacetcatalog.FacetSetCatalog;

+import org.eclipse.papyrus.emf.facet.efacet.catalog.efacetcatalog.QuerySetCatalog;

+import org.eclipse.papyrus.emf.facet.util.emf.catalog.CatalogPackage;

 

 /**

  * <!-- begin-user-doc --> An implementation of the model <b>Package</b>. <!-- end-user-doc -->

@@ -57,7 +57,7 @@ public class EfacetcatalogPackageImpl extends EPackageImpl implements Efacetcata
 	 * <!-- begin-user-doc -->

 	 * <!-- end-user-doc -->

 	 * @see org.eclipse.emf.ecore.EPackage.Registry

-	 * @see org.eclipse.emf.facet.efacet.catalog.efacetcatalog.EfacetcatalogPackage#eNS_URI

+	 * @see org.eclipse.papyrus.emf.facet.efacet.catalog.efacetcatalog.EfacetcatalogPackage#eNS_URI

 	 * @see #init()

 	 * @generated

 	 */

diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.catalog/src/org/eclipse/papyrus/emf/facet/efacet/catalog/efacetcatalog/impl/FacetSetCatalogImpl.java b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.catalog/src/org/eclipse/papyrus/emf/facet/efacet/catalog/efacetcatalog/impl/FacetSetCatalogImpl.java
index 498e2aedba5..268566016f4 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.catalog/src/org/eclipse/papyrus/emf/facet/efacet/catalog/efacetcatalog/impl/FacetSetCatalogImpl.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.catalog/src/org/eclipse/papyrus/emf/facet/efacet/catalog/efacetcatalog/impl/FacetSetCatalogImpl.java
@@ -11,7 +11,7 @@
  * 	Nicolas Guyomar (Mia-Software) - Implementation

  *  

  */

-package org.eclipse.emf.facet.efacet.catalog.efacetcatalog.impl;

+package org.eclipse.papyrus.emf.facet.efacet.catalog.efacetcatalog.impl;

 

 import java.util.Collection;

 

@@ -24,9 +24,9 @@ import org.eclipse.emf.ecore.impl.EObjectImpl;
 import org.eclipse.emf.ecore.util.EObjectEList;

 import org.eclipse.emf.ecore.util.EObjectEList.Unsettable;

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

-import org.eclipse.emf.facet.efacet.FacetSet;

-import org.eclipse.emf.facet.efacet.catalog.efacetcatalog.EfacetcatalogPackage;

-import org.eclipse.emf.facet.efacet.catalog.efacetcatalog.FacetSetCatalog;

+import org.eclipse.papyrus.emf.facet.efacet.FacetSet;

+import org.eclipse.papyrus.emf.facet.efacet.catalog.efacetcatalog.EfacetcatalogPackage;

+import org.eclipse.papyrus.emf.facet.efacet.catalog.efacetcatalog.FacetSetCatalog;

 

 /**

  * <!-- begin-user-doc --> An implementation of the model object '<em><b>Facet Set Catalog</b></em>

@@ -35,12 +35,12 @@ import org.eclipse.emf.facet.efacet.catalog.efacetcatalog.FacetSetCatalog;
  * The following features are implemented:

  * <ul>

  * <li>

- * {@link org.eclipse.emf.facet.efacet.catalog.efacetcatalog.impl.FacetSetCatalogImpl#getInstalledEntries

+ * {@link org.eclipse.papyrus.emf.facet.efacet.catalog.efacetcatalog.impl.FacetSetCatalogImpl#getInstalledEntries

  * <em>Installed Entries</em>}</li>

- * <li>{@link org.eclipse.emf.facet.efacet.catalog.efacetcatalog.impl.FacetSetCatalogImpl#getName

+ * <li>{@link org.eclipse.papyrus.emf.facet.efacet.catalog.efacetcatalog.impl.FacetSetCatalogImpl#getName

  * <em>Name</em>}</li>

  * <li>

- * {@link org.eclipse.emf.facet.efacet.catalog.efacetcatalog.impl.FacetSetCatalogImpl#getInstalledFacetSets

+ * {@link org.eclipse.papyrus.emf.facet.efacet.catalog.efacetcatalog.impl.FacetSetCatalogImpl#getInstalledFacetSets

  * <em>Installed Facet Sets</em>}</li>

  * </ul>

  * </p>

diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.catalog/src/org/eclipse/papyrus/emf/facet/efacet/catalog/efacetcatalog/impl/QuerySetCatalogImpl.java b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.catalog/src/org/eclipse/papyrus/emf/facet/efacet/catalog/efacetcatalog/impl/QuerySetCatalogImpl.java
index 9e50fabe58a..56716853ef4 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.catalog/src/org/eclipse/papyrus/emf/facet/efacet/catalog/efacetcatalog/impl/QuerySetCatalogImpl.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.catalog/src/org/eclipse/papyrus/emf/facet/efacet/catalog/efacetcatalog/impl/QuerySetCatalogImpl.java
@@ -11,7 +11,7 @@
  * 	Nicolas Guyomar (Mia-Software) - Implementation

  *  

  */

-package org.eclipse.emf.facet.efacet.catalog.efacetcatalog.impl;

+package org.eclipse.papyrus.emf.facet.efacet.catalog.efacetcatalog.impl;

 

 import java.util.Collection;

 

@@ -24,9 +24,9 @@ import org.eclipse.emf.ecore.impl.EObjectImpl;
 import org.eclipse.emf.ecore.util.EObjectEList;

 import org.eclipse.emf.ecore.util.EObjectEList.Unsettable;

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

-import org.eclipse.emf.facet.efacet.QuerySet;

-import org.eclipse.emf.facet.efacet.catalog.efacetcatalog.EfacetcatalogPackage;

-import org.eclipse.emf.facet.efacet.catalog.efacetcatalog.QuerySetCatalog;

+import org.eclipse.papyrus.emf.facet.efacet.QuerySet;

+import org.eclipse.papyrus.emf.facet.efacet.catalog.efacetcatalog.EfacetcatalogPackage;

+import org.eclipse.papyrus.emf.facet.efacet.catalog.efacetcatalog.QuerySetCatalog;

 

 /**

  * <!-- begin-user-doc --> An implementation of the model object '<em><b>Query Set Catalog</b></em>

@@ -35,12 +35,12 @@ import org.eclipse.emf.facet.efacet.catalog.efacetcatalog.QuerySetCatalog;
  * The following features are implemented:

  * <ul>

  * <li>

- * {@link org.eclipse.emf.facet.efacet.catalog.efacetcatalog.impl.QuerySetCatalogImpl#getInstalledEntries

+ * {@link org.eclipse.papyrus.emf.facet.efacet.catalog.efacetcatalog.impl.QuerySetCatalogImpl#getInstalledEntries

  * <em>Installed Entries</em>}</li>

- * <li>{@link org.eclipse.emf.facet.efacet.catalog.efacetcatalog.impl.QuerySetCatalogImpl#getName

+ * <li>{@link org.eclipse.papyrus.emf.facet.efacet.catalog.efacetcatalog.impl.QuerySetCatalogImpl#getName

  * <em>Name</em>}</li>

  * <li>

- * {@link org.eclipse.emf.facet.efacet.catalog.efacetcatalog.impl.QuerySetCatalogImpl#getInstalledQuerySets

+ * {@link org.eclipse.papyrus.emf.facet.efacet.catalog.efacetcatalog.impl.QuerySetCatalogImpl#getInstalledQuerySets

  * <em>Installed Query Sets</em>}</li>

  * </ul>

  * </p>

diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.catalog/src/org/eclipse/papyrus/emf/facet/efacet/catalog/efacetcatalog/util/EfacetcatalogAdapterFactory.java b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.catalog/src/org/eclipse/papyrus/emf/facet/efacet/catalog/efacetcatalog/util/EfacetcatalogAdapterFactory.java
index c677081027b..64d1399c3e0 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.catalog/src/org/eclipse/papyrus/emf/facet/efacet/catalog/efacetcatalog/util/EfacetcatalogAdapterFactory.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.catalog/src/org/eclipse/papyrus/emf/facet/efacet/catalog/efacetcatalog/util/EfacetcatalogAdapterFactory.java
@@ -11,22 +11,22 @@
  * 	Nicolas Guyomar (Mia-Software) - Implementation

  *  

  */

-package org.eclipse.emf.facet.efacet.catalog.efacetcatalog.util;

+package org.eclipse.papyrus.emf.facet.efacet.catalog.efacetcatalog.util;

 

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

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

 import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;

 import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.facet.efacet.catalog.efacetcatalog.EfacetcatalogPackage;

-import org.eclipse.emf.facet.efacet.catalog.efacetcatalog.FacetSetCatalog;

-import org.eclipse.emf.facet.efacet.catalog.efacetcatalog.QuerySetCatalog;

-import org.eclipse.emf.facet.util.emf.catalog.Catalog;

+import org.eclipse.papyrus.emf.facet.efacet.catalog.efacetcatalog.EfacetcatalogPackage;

+import org.eclipse.papyrus.emf.facet.efacet.catalog.efacetcatalog.FacetSetCatalog;

+import org.eclipse.papyrus.emf.facet.efacet.catalog.efacetcatalog.QuerySetCatalog;

+import org.eclipse.papyrus.emf.facet.util.emf.catalog.Catalog;

 

 /**

  * <!-- begin-user-doc --> The <b>Adapter Factory</b> for the model. It provides an adapter

  * <code>createXXX</code> method for each class of the model. <!-- end-user-doc -->

  * 

- * @see org.eclipse.emf.facet.efacet.catalog.efacetcatalog.EfacetcatalogPackage

+ * @see org.eclipse.papyrus.emf.facet.efacet.catalog.efacetcatalog.EfacetcatalogPackage

  * @generated

  * @deprecated cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=373672

  */

@@ -112,13 +112,13 @@ public class EfacetcatalogAdapterFactory extends AdapterFactoryImpl {
 

 

 	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.facet.efacet.catalog.efacetcatalog.QuerySetCatalog <em>Query Set Catalog</em>}'.

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.emf.facet.efacet.catalog.efacetcatalog.QuerySetCatalog <em>Query Set Catalog</em>}'.

 	 * <!-- begin-user-doc -->

 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

 	 * @return the new adapter.

-	 * @see org.eclipse.emf.facet.efacet.catalog.efacetcatalog.QuerySetCatalog

+	 * @see org.eclipse.papyrus.emf.facet.efacet.catalog.efacetcatalog.QuerySetCatalog

 	 * @generated

 	 */

 	public Adapter createQuerySetCatalogAdapter() {

@@ -126,13 +126,13 @@ public class EfacetcatalogAdapterFactory extends AdapterFactoryImpl {
 	}

 

 	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.facet.efacet.catalog.efacetcatalog.FacetSetCatalog <em>Facet Set Catalog</em>}'.

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.emf.facet.efacet.catalog.efacetcatalog.FacetSetCatalog <em>Facet Set Catalog</em>}'.

 	 * <!-- begin-user-doc -->

 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

 	 * @return the new adapter.

-	 * @see org.eclipse.emf.facet.efacet.catalog.efacetcatalog.FacetSetCatalog

+	 * @see org.eclipse.papyrus.emf.facet.efacet.catalog.efacetcatalog.FacetSetCatalog

 	 * @generated

 	 */

 	public Adapter createFacetSetCatalogAdapter() {

@@ -140,13 +140,13 @@ public class EfacetcatalogAdapterFactory extends AdapterFactoryImpl {
 	}

 

 	/**

-	 * Creates a new adapter for an object of class '{@link org.eclipse.emf.facet.util.emf.catalog.Catalog <em>Catalog</em>}'.

+	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.emf.facet.util.emf.catalog.Catalog <em>Catalog</em>}'.

 	 * <!-- begin-user-doc -->

 	 * This default implementation returns null so that we can easily ignore cases;

 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.

 	 * <!-- end-user-doc -->

 	 * @return the new adapter.

-	 * @see org.eclipse.emf.facet.util.emf.catalog.Catalog

+	 * @see org.eclipse.papyrus.emf.facet.util.emf.catalog.Catalog

 	 * @generated

 	 */

 	public Adapter createCatalogAdapter() {

diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.catalog/src/org/eclipse/papyrus/emf/facet/efacet/catalog/efacetcatalog/util/EfacetcatalogSwitch.java b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.catalog/src/org/eclipse/papyrus/emf/facet/efacet/catalog/efacetcatalog/util/EfacetcatalogSwitch.java
index d295757dd7c..8541cc4e5cb 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.catalog/src/org/eclipse/papyrus/emf/facet/efacet/catalog/efacetcatalog/util/EfacetcatalogSwitch.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.catalog/src/org/eclipse/papyrus/emf/facet/efacet/catalog/efacetcatalog/util/EfacetcatalogSwitch.java
@@ -11,16 +11,16 @@
  * 	Nicolas Guyomar (Mia-Software) - Implementation

  *  

  */

-package org.eclipse.emf.facet.efacet.catalog.efacetcatalog.util;

+package org.eclipse.papyrus.emf.facet.efacet.catalog.efacetcatalog.util;

 

 import java.util.List;

 

 import org.eclipse.emf.ecore.EClass;

 import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.facet.efacet.catalog.efacetcatalog.EfacetcatalogPackage;

-import org.eclipse.emf.facet.efacet.catalog.efacetcatalog.FacetSetCatalog;

-import org.eclipse.emf.facet.efacet.catalog.efacetcatalog.QuerySetCatalog;

-import org.eclipse.emf.facet.util.emf.catalog.Catalog;

+import org.eclipse.papyrus.emf.facet.efacet.catalog.efacetcatalog.EfacetcatalogPackage;

+import org.eclipse.papyrus.emf.facet.efacet.catalog.efacetcatalog.FacetSetCatalog;

+import org.eclipse.papyrus.emf.facet.efacet.catalog.efacetcatalog.QuerySetCatalog;

+import org.eclipse.papyrus.emf.facet.util.emf.catalog.Catalog;

 

 /**

  * <!-- begin-user-doc --> The <b>Switch</b> for the model's inheritance hierarchy. It supports the

@@ -29,7 +29,7 @@ import org.eclipse.emf.facet.util.emf.catalog.Catalog;
  * inheritance hierarchy until a non-null result is returned, which is the result of the switch.

  * <!-- end-user-doc -->

  * 

- * @see org.eclipse.emf.facet.efacet.catalog.efacetcatalog.EfacetcatalogPackage

+ * @see org.eclipse.papyrus.emf.facet.efacet.catalog.efacetcatalog.EfacetcatalogPackage

  * @generated

  * @deprecated cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=373672

  */

diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.catalog/src/org/eclipse/papyrus/emf/facet/efacet/catalog/plugin/Activator.java b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.catalog/src/org/eclipse/papyrus/emf/facet/efacet/catalog/plugin/Activator.java
index c72859b2b91..7a1a1c40fd1 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.catalog/src/org/eclipse/papyrus/emf/facet/efacet/catalog/plugin/Activator.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.catalog/src/org/eclipse/papyrus/emf/facet/efacet/catalog/plugin/Activator.java
@@ -9,7 +9,7 @@
  * Contributors:

  * 	Nicolas Guyomar (Mia-Software) - Bug 333553 - The user has not to deal with two files to create a facet

  */

-package org.eclipse.emf.facet.efacet.catalog.plugin;

+package org.eclipse.papyrus.emf.facet.efacet.catalog.plugin;

 

 import org.osgi.framework.BundleActivator;

 import org.osgi.framework.BundleContext;