From dd1153596674c4dadcfb57e2266720cf7442e23e Mon Sep 17 00:00:00 2001 From: ptessier Date: Mon, 24 Feb 2014 10:24:22 +0100 Subject: [EMF Facet] Papyrus should progressively support EMF Facet 0.2 --- .../facet/PaletteConfiguration.custom | 2 +- .../facet/PaletteConfiguration.facetset | 8 +-- .../mediawiki/user.html | 10 +-- .../mediawiki/user.mediawiki | 10 +-- .../javadoc/constant-values.html | 4 +- .../META-INF/MANIFEST.MF | 4 +- .../plugin.xml | 2 +- .../model/custom-0.2.0.ecore | 2 +- .../model/custom_primitive_types-0.2.0.ecore | 2 +- .../model/query-0.3.0.ecore | 4 +- .../model/treeproxy-0.2.0.ecore | 4 +- .../metamodel/v0_2_0/custom/CustomPackage.java | 2 +- .../v0_2_0/custom/impl/CustomFactoryImpl.java | 2 +- .../CustomizationcatalogPackage.java | 2 +- .../impl/CustomizationcatalogFactoryImpl.java | 2 +- .../metamodel/v0_2_0/custompt/CustomptPackage.java | 2 +- .../v0_2_0/custompt/impl/CustomptFactoryImpl.java | 2 +- .../internal/treeproxy/TreeproxyPackage.java | 2 +- .../treeproxy/impl/TreeproxyFactoryImpl.java | 2 +- .../metamodel/v0_3_0/query/QueryPackage.java | 2 +- .../v0_3_0/query/impl/QueryFactoryImpl.java | 2 +- .../plugin.xml | 4 +- ...apyrus.emf.facet.custom.sdk.ui.modelcelleditors | 2 +- .../resources/customproperties.efacet | 48 +++++++------- .../model/efacetcatalog.ecore | 2 +- .../plugin.xml | 2 +- .../efacetcatalog/EfacetcatalogPackage.java | 2 +- .../impl/EfacetcatalogFactoryImpl.java | 2 +- .../plugin.xml | 2 +- .../plugin.xml | 8 +-- .../model/efacet-0.2.0.ecore | 10 +-- .../model/efacetcatalog-0.2.0.ecore | 2 +- .../plugin.xml | 8 +-- .../metamodel/v0_2_0/efacet/EFacetPackage.java | 2 +- .../efacet/extensible/ExtensiblePackage.java | 2 +- .../extensible/impl/ExtensibleFactoryImpl.java | 2 +- .../v0_2_0/efacet/impl/EFacetFactoryImpl.java | 2 +- .../v0_2_0/efacet/query/QueryPackage.java | 2 +- .../v0_2_0/efacet/query/impl/QueryFactoryImpl.java | 2 +- .../v0_2_0/efacet/runtime/RuntimePackage.java | 2 +- .../efacet/runtime/impl/RuntimeFactoryImpl.java | 2 +- .../efacet/serialization/SerializationPackage.java | 2 +- .../impl/SerializationFactoryImpl.java | 2 +- .../v0_2_0/efacetcatalog/EfacetcatalogPackage.java | 2 +- .../impl/EfacetcatalogFactoryImpl.java | 2 +- .../model/efacet.ecore | 2 +- .../plugin.xml | 2 +- .../papyrus/emf/facet/efacet/EFacetPackage.java | 2 +- .../emf/facet/efacet/impl/EFacetFactoryImpl.java | 2 +- .../model/javaQuery-0.2.0.ecore | 2 +- .../plugin.xml | 4 +- .../v0_2_0/javaquery/JavaQueryPackage.java | 2 +- .../javaquery/impl/JavaQueryFactoryImpl.java | 2 +- .../model/javaQuery.ecore | 2 +- .../plugin.xml | 2 +- .../query/java/javaquery/JavaqueryPackage.java | 2 +- .../java/javaquery/impl/JavaqueryFactoryImpl.java | 2 +- .../model/oclQuery.ecore | 2 +- .../plugin.xml | 2 +- .../ocl/metamodel/oclquery/OclQueryPackage.java | 2 +- .../oclquery/impl/OclQueryFactoryImpl.java | 2 +- .../model/catalog.ecore | 2 +- .../emf/facet/util/emf/catalog/CatalogPackage.java | 2 +- .../util/emf/catalog/impl/CatalogFactoryImpl.java | 2 +- .../model/serialization.ecore | 2 +- .../model/serialization/SerializationPackage.java | 2 +- .../impl/SerializationFactoryImpl.java | 2 +- .../resources/PapyrusNotation.custom | 77 +++++++++++++++++----- .../META-INF/MANIFEST.MF | 3 +- .../handler/LoadBrowserCustomization.java | 31 ++------- 70 files changed, 189 insertions(+), 156 deletions(-) (limited to 'plugins') diff --git a/plugins/customization/org.eclipse.papyrus.customization.paletteconfiguration/facet/PaletteConfiguration.custom b/plugins/customization/org.eclipse.papyrus.customization.paletteconfiguration/facet/PaletteConfiguration.custom index d5c27d5173d..368e7261c8a 100644 --- a/plugins/customization/org.eclipse.papyrus.customization.paletteconfiguration/facet/PaletteConfiguration.custom +++ b/plugins/customization/org.eclipse.papyrus.customization.paletteconfiguration/facet/PaletteConfiguration.custom @@ -1,5 +1,5 @@ - + diff --git a/plugins/customization/org.eclipse.papyrus.customization.paletteconfiguration/facet/PaletteConfiguration.facetset b/plugins/customization/org.eclipse.papyrus.customization.paletteconfiguration/facet/PaletteConfiguration.facetset index be0f12298f0..b3bf2650f2c 100644 --- a/plugins/customization/org.eclipse.papyrus.customization.paletteconfiguration/facet/PaletteConfiguration.facetset +++ b/plugins/customization/org.eclipse.papyrus.customization.paletteconfiguration/facet/PaletteConfiguration.facetset @@ -1,10 +1,10 @@ diff --git a/plugins/facet/editor/org.eclipse.papyrus.emf.facet.custom.doc/mediawiki/user.html b/plugins/facet/editor/org.eclipse.papyrus.emf.facet.custom.doc/mediawiki/user.html index 1c01be0fed8..2a63f80ba83 100644 --- a/plugins/facet/editor/org.eclipse.papyrus.emf.facet.custom.doc/mediawiki/user.html +++ b/plugins/facet/editor/org.eclipse.papyrus.emf.facet.custom.doc/mediawiki/user.html @@ -284,14 +284,14 @@ xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns:custom="http://www.eclipse.org/emf/facet/custom/0.2.incubation/custom" + xmlns:custom="http://www.eclipse.org/papyrus/emf/facet/custom/0.2.incubation/custom" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" - xmlns:efacet="http://www.eclipse.org/emf/facet/efacet/0.2.incubation/efacet" - xmlns:javaQuery2="http://www.eclipse.org/emf/facet/query/java/0.2.incubation" + xmlns:efacet="http://www.eclipse.org/papyrus/emf/facet/efacet/0.2.incubation/efacet" + xmlns:javaQuery2="http://www.eclipse.org/papyrus/emf/facet/query/java/0.2.incubation" name="org.eclipse.emf.facet.efacet.examples.library.core.custom"> <eClassifiers xsi:type="custom:EClassCustomization"> - <extendedMetaclass href="http://www.eclipse.org/emf/facet/examples/library/0.2.incubation/library#//Writer"/> + <extendedMetaclass href="http://www.eclipse.org/papyrus/emf/facet/examples/library/0.2.incubation/library#//Writer"/> <extendedFacets href="platform:/plugin/org.eclipse.emf.facet.custom.ui/resources/customproperties.efacet#//CustomizedEObject"/> <facetOperations xsi:type="efacet:FacetOperation" name="label" lowerBound="1"> <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/> @@ -306,7 +306,7 @@ <eClassifiers xsi:type="custom:FacetCustomization"> <extendedFacets href="platform:/plugin/org.eclipse.emf.facet.efacet.examples.library.core/library.efacet#//writer/UnproductiveWriter"/> <facetOperations xsi:type="efacet:FacetOperation" name="bottomRightOverlay" lowerBound="1"> - <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/facet/custom/0.2.incubation/custom_primitive_types#//Image"/> + <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/papyrus/emf/facet/custom/0.2.incubation/custom_primitive_types#//Image"/> <query xsi:type="javaQuery2:JavaQuery" implementationClassName="org.eclipse.emf.facet.efacet.examples.library.core.internal.queries.UnproductiveWriterOverlay"/> <override xsi:type="efacet:FacetOperation" href="platform:/plugin/org.eclipse.emf.facet.custom.ui/resources/customproperties.efacet#//CustomizedEObject/bottomRightOverlay"/> <eParameters xsi:type="ecore:EParameter" name="eStructuralFeature"> diff --git a/plugins/facet/editor/org.eclipse.papyrus.emf.facet.custom.doc/mediawiki/user.mediawiki b/plugins/facet/editor/org.eclipse.papyrus.emf.facet.custom.doc/mediawiki/user.mediawiki index b4c7671d802..f988cf4a74f 100644 --- a/plugins/facet/editor/org.eclipse.papyrus.emf.facet.custom.doc/mediawiki/user.mediawiki +++ b/plugins/facet/editor/org.eclipse.papyrus.emf.facet.custom.doc/mediawiki/user.mediawiki @@ -95,14 +95,14 @@ Since there is no dedicated UI tooling as yet for editing customizations, you wi xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns:custom="http://www.eclipse.org/emf/facet/custom/0.2.incubation/custom" + xmlns:custom="http://www.eclipse.org/papyrus/emf/facet/custom/0.2.incubation/custom" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" - xmlns:efacet="http://www.eclipse.org/emf/facet/efacet/0.2.incubation/efacet" - xmlns:javaQuery2="http://www.eclipse.org/emf/facet/query/java/0.2.incubation" + xmlns:efacet="http://www.eclipse.org/papyrus/emf/facet/efacet/0.2.incubation/efacet" + xmlns:javaQuery2="http://www.eclipse.org/papyrus/emf/facet/query/java/0.2.incubation" name="org.eclipse.emf.facet.efacet.examples.library.core.custom"> - + @@ -117,7 +117,7 @@ Since there is no dedicated UI tooling as yet for editing customizations, you wi - + diff --git a/plugins/facet/editor/org.eclipse.papyrus.emf.facet.doc/javadoc/constant-values.html b/plugins/facet/editor/org.eclipse.papyrus.emf.facet.doc/javadoc/constant-values.html index 82f64e822de..2bdc0f742b0 100644 --- a/plugins/facet/editor/org.eclipse.papyrus.emf.facet.doc/javadoc/constant-values.html +++ b/plugins/facet/editor/org.eclipse.papyrus.emf.facet.doc/javadoc/constant-values.html @@ -154,7 +154,7 @@ org.eclipse.* public static final java.lang.String eNS_URI -"http://www.eclipse.org/emf/facet/examples/library/test/library" +"http://www.eclipse.org/papyrus/emf/facet/examples/library/test/library" @@ -238,7 +238,7 @@ org.eclipse.* public static final java.lang.String eNS_URI -"http://www.eclipse.org/emf/facet/query/ocl/0.3.incubation/oclquery" +"http://www.eclipse.org/papyrus/emf/facet/query/ocl/0.3.incubation/oclquery" diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.core/META-INF/MANIFEST.MF b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.core/META-INF/MANIFEST.MF index ce2dea96874..3b4af1d5e5b 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.core/META-INF/MANIFEST.MF +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.core/META-INF/MANIFEST.MF @@ -20,4 +20,6 @@ Bundle-ActivationPolicy: lazy Export-Package: org.eclipse.papyrus.emf.facet.custom.core, org.eclipse.papyrus.emf.facet.custom.core.exception, org.eclipse.papyrus.emf.facet.custom.core.internal, - org.eclipse.papyrus.emf.facet.custom.core.internal.exported + org.eclipse.papyrus.emf.facet.custom.core.internal.exception, + org.eclipse.papyrus.emf.facet.custom.core.internal.exported, + org.eclipse.papyrus.emf.facet.custom.core.internal.query diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.metamodel.edit/plugin.xml b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.metamodel.edit/plugin.xml index 8ec5f859f0d..23b4b78956c 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.metamodel.edit/plugin.xml +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.metamodel.edit/plugin.xml @@ -19,7 +19,7 @@ + nsURI="http://www.eclipse.org/papyrus/emf/facet/custom/0.2.incubation/custom" nsPrefix="custom">
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.metamodel/model/custom_primitive_types-0.2.0.ecore b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.metamodel/model/custom_primitive_types-0.2.0.ecore index 8b90e501e9f..16c772e2b38 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.metamodel/model/custom_primitive_types-0.2.0.ecore +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.metamodel/model/custom_primitive_types-0.2.0.ecore @@ -2,7 +2,7 @@ diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.metamodel/model/query-0.3.0.ecore b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.metamodel/model/query-0.3.0.ecore index e8c96e59657..a0a0cd71ffb 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.metamodel/model/query-0.3.0.ecore +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.metamodel/model/query-0.3.0.ecore @@ -1,8 +1,8 @@ - + diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.metamodel/model/treeproxy-0.2.0.ecore b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.metamodel/model/treeproxy-0.2.0.ecore index 331b54d8d91..b48ac8ce654 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.metamodel/model/treeproxy-0.2.0.ecore +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.metamodel/model/treeproxy-0.2.0.ecore @@ -2,8 +2,8 @@ - + diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.metamodel/src/org/eclipse/papyrus/emf/facet/custom/metamodel/v0_2_0/custom/CustomPackage.java b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.metamodel/src/org/eclipse/papyrus/emf/facet/custom/metamodel/v0_2_0/custom/CustomPackage.java index d4ebfa4b7f9..52c9d47992b 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.metamodel/src/org/eclipse/papyrus/emf/facet/custom/metamodel/v0_2_0/custom/CustomPackage.java +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.metamodel/src/org/eclipse/papyrus/emf/facet/custom/metamodel/v0_2_0/custom/CustomPackage.java @@ -50,7 +50,7 @@ public interface CustomPackage extends EPackage { * * @generated */ - String eNS_URI = "http://www.eclipse.org/emf/facet/custom/0.2.incubation/custom"; + String eNS_URI = "http://www.eclipse.org/papyrus/emf/facet/custom/0.2.incubation/custom"; /** * The package namespace name. diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.metamodel/src/org/eclipse/papyrus/emf/facet/custom/metamodel/v0_2_0/custom/impl/CustomFactoryImpl.java b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.metamodel/src/org/eclipse/papyrus/emf/facet/custom/metamodel/v0_2_0/custom/impl/CustomFactoryImpl.java index b6034182920..99c9d82afea 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.metamodel/src/org/eclipse/papyrus/emf/facet/custom/metamodel/v0_2_0/custom/impl/CustomFactoryImpl.java +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.metamodel/src/org/eclipse/papyrus/emf/facet/custom/metamodel/v0_2_0/custom/impl/CustomFactoryImpl.java @@ -35,7 +35,7 @@ public class CustomFactoryImpl extends EFactoryImpl implements CustomFactory { */ public static CustomFactory init() { try { - CustomFactory theCustomFactory = (CustomFactory)EPackage.Registry.INSTANCE.getEFactory("http://www.eclipse.org/emf/facet/custom/0.2.incubation/custom"); + CustomFactory theCustomFactory = (CustomFactory)EPackage.Registry.INSTANCE.getEFactory("http://www.eclipse.org/papyrus/emf/facet/custom/0.2.incubation/custom"); if (theCustomFactory != null) { return theCustomFactory; } diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.metamodel/src/org/eclipse/papyrus/emf/facet/custom/metamodel/v0_2_0/customizationcatalog/CustomizationcatalogPackage.java b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.metamodel/src/org/eclipse/papyrus/emf/facet/custom/metamodel/v0_2_0/customizationcatalog/CustomizationcatalogPackage.java index 2d5fcf2e169..1aaa1c3dd7e 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.metamodel/src/org/eclipse/papyrus/emf/facet/custom/metamodel/v0_2_0/customizationcatalog/CustomizationcatalogPackage.java +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.metamodel/src/org/eclipse/papyrus/emf/facet/custom/metamodel/v0_2_0/customizationcatalog/CustomizationcatalogPackage.java @@ -49,7 +49,7 @@ public interface CustomizationcatalogPackage extends EPackage { * * @generated */ - String eNS_URI = "http://www.eclipse.org/emf/facet/custom/0.2.internal/customizationcatalog"; + String eNS_URI = "http://www.eclipse.org/papyrus/emf/facet/custom/0.2.internal/customizationcatalog"; /** * The package namespace name. diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.metamodel/src/org/eclipse/papyrus/emf/facet/custom/metamodel/v0_2_0/customizationcatalog/impl/CustomizationcatalogFactoryImpl.java b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.metamodel/src/org/eclipse/papyrus/emf/facet/custom/metamodel/v0_2_0/customizationcatalog/impl/CustomizationcatalogFactoryImpl.java index 7d2cec71000..dd235875330 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.metamodel/src/org/eclipse/papyrus/emf/facet/custom/metamodel/v0_2_0/customizationcatalog/impl/CustomizationcatalogFactoryImpl.java +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.metamodel/src/org/eclipse/papyrus/emf/facet/custom/metamodel/v0_2_0/customizationcatalog/impl/CustomizationcatalogFactoryImpl.java @@ -35,7 +35,7 @@ public class CustomizationcatalogFactoryImpl extends EFactoryImpl implements Cus */ public static CustomizationcatalogFactory init() { try { - CustomizationcatalogFactory theCustomizationcatalogFactory = (CustomizationcatalogFactory)EPackage.Registry.INSTANCE.getEFactory("http://www.eclipse.org/emf/facet/custom/0.2.internal/customizationcatalog"); + CustomizationcatalogFactory theCustomizationcatalogFactory = (CustomizationcatalogFactory)EPackage.Registry.INSTANCE.getEFactory("http://www.eclipse.org/papyrus/emf/facet/custom/0.2.internal/customizationcatalog"); if (theCustomizationcatalogFactory != null) { return theCustomizationcatalogFactory; } diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.metamodel/src/org/eclipse/papyrus/emf/facet/custom/metamodel/v0_2_0/custompt/CustomptPackage.java b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.metamodel/src/org/eclipse/papyrus/emf/facet/custom/metamodel/v0_2_0/custompt/CustomptPackage.java index 9ec6291ec3e..171fb433611 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.metamodel/src/org/eclipse/papyrus/emf/facet/custom/metamodel/v0_2_0/custompt/CustomptPackage.java +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.metamodel/src/org/eclipse/papyrus/emf/facet/custom/metamodel/v0_2_0/custompt/CustomptPackage.java @@ -47,7 +47,7 @@ public interface CustomptPackage extends EPackage { * * @generated */ - String eNS_URI = "http://www.eclipse.org/emf/facet/custom/0.2.incubation/custom_primitive_types"; + String eNS_URI = "http://www.eclipse.org/papyrus/emf/facet/custom/0.2.incubation/custom_primitive_types"; /** * The package namespace name. diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.metamodel/src/org/eclipse/papyrus/emf/facet/custom/metamodel/v0_2_0/custompt/impl/CustomptFactoryImpl.java b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.metamodel/src/org/eclipse/papyrus/emf/facet/custom/metamodel/v0_2_0/custompt/impl/CustomptFactoryImpl.java index 1db2e5bfb88..06b678fd0ff 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.metamodel/src/org/eclipse/papyrus/emf/facet/custom/metamodel/v0_2_0/custompt/impl/CustomptFactoryImpl.java +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.metamodel/src/org/eclipse/papyrus/emf/facet/custom/metamodel/v0_2_0/custompt/impl/CustomptFactoryImpl.java @@ -38,7 +38,7 @@ public class CustomptFactoryImpl extends EFactoryImpl implements CustomptFactory */ public static CustomptFactory init() { try { - CustomptFactory theCustomptFactory = (CustomptFactory)EPackage.Registry.INSTANCE.getEFactory("http://www.eclipse.org/emf/facet/custom/0.2.incubation/custom_primitive_types"); + CustomptFactory theCustomptFactory = (CustomptFactory)EPackage.Registry.INSTANCE.getEFactory("http://www.eclipse.org/papyrus/emf/facet/custom/0.2.incubation/custom_primitive_types"); if (theCustomptFactory != null) { return theCustomptFactory; } diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.metamodel/src/org/eclipse/papyrus/emf/facet/custom/metamodel/v0_2_0/internal/treeproxy/TreeproxyPackage.java b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.metamodel/src/org/eclipse/papyrus/emf/facet/custom/metamodel/v0_2_0/internal/treeproxy/TreeproxyPackage.java index 58d0db53c97..9d292c2feef 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.metamodel/src/org/eclipse/papyrus/emf/facet/custom/metamodel/v0_2_0/internal/treeproxy/TreeproxyPackage.java +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.metamodel/src/org/eclipse/papyrus/emf/facet/custom/metamodel/v0_2_0/internal/treeproxy/TreeproxyPackage.java @@ -45,7 +45,7 @@ public interface TreeproxyPackage extends EPackage { * * @generated */ - String eNS_URI = "http://www.eclipse.org/emf/facet/custom/0.2.incubation/internal/treeproxy"; + String eNS_URI = "http://www.eclipse.org/papyrus/emf/facet/custom/0.2.incubation/internal/treeproxy"; /** * The package namespace name. diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.metamodel/src/org/eclipse/papyrus/emf/facet/custom/metamodel/v0_2_0/internal/treeproxy/impl/TreeproxyFactoryImpl.java b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.metamodel/src/org/eclipse/papyrus/emf/facet/custom/metamodel/v0_2_0/internal/treeproxy/impl/TreeproxyFactoryImpl.java index 3c57396a1f8..ad93f5eb5a6 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.metamodel/src/org/eclipse/papyrus/emf/facet/custom/metamodel/v0_2_0/internal/treeproxy/impl/TreeproxyFactoryImpl.java +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.metamodel/src/org/eclipse/papyrus/emf/facet/custom/metamodel/v0_2_0/internal/treeproxy/impl/TreeproxyFactoryImpl.java @@ -33,7 +33,7 @@ public class TreeproxyFactoryImpl extends EFactoryImpl implements TreeproxyFacto */ public static TreeproxyFactory init() { try { - TreeproxyFactory theTreeproxyFactory = (TreeproxyFactory)EPackage.Registry.INSTANCE.getEFactory("http://www.eclipse.org/emf/facet/custom/0.2.incubation/internal/treeproxy"); + TreeproxyFactory theTreeproxyFactory = (TreeproxyFactory)EPackage.Registry.INSTANCE.getEFactory("http://www.eclipse.org/papyrus/emf/facet/custom/0.2.incubation/internal/treeproxy"); if (theTreeproxyFactory != null) { return theTreeproxyFactory; } diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.metamodel/src/org/eclipse/papyrus/emf/facet/custom/metamodel/v0_3_0/query/QueryPackage.java b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.metamodel/src/org/eclipse/papyrus/emf/facet/custom/metamodel/v0_3_0/query/QueryPackage.java index edaca594698..9e032e607f5 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.metamodel/src/org/eclipse/papyrus/emf/facet/custom/metamodel/v0_3_0/query/QueryPackage.java +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.metamodel/src/org/eclipse/papyrus/emf/facet/custom/metamodel/v0_3_0/query/QueryPackage.java @@ -48,7 +48,7 @@ public interface QueryPackage extends EPackage { * * @generated */ - String eNS_URI = "http://www.eclipse.org/emf/facet/custom/0.3.incubation/query"; + String eNS_URI = "http://www.eclipse.org/papyrus/emf/facet/custom/0.3.incubation/query"; /** * The package namespace name. diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.metamodel/src/org/eclipse/papyrus/emf/facet/custom/metamodel/v0_3_0/query/impl/QueryFactoryImpl.java b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.metamodel/src/org/eclipse/papyrus/emf/facet/custom/metamodel/v0_3_0/query/impl/QueryFactoryImpl.java index 09f50b9d99c..e1275f1ce02 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.metamodel/src/org/eclipse/papyrus/emf/facet/custom/metamodel/v0_3_0/query/impl/QueryFactoryImpl.java +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.metamodel/src/org/eclipse/papyrus/emf/facet/custom/metamodel/v0_3_0/query/impl/QueryFactoryImpl.java @@ -34,7 +34,7 @@ public class QueryFactoryImpl extends EFactoryImpl implements QueryFactory { */ public static QueryFactory init() { try { - QueryFactory theQueryFactory = (QueryFactory)EPackage.Registry.INSTANCE.getEFactory("http://www.eclipse.org/emf/facet/custom/0.3.incubation/query"); + QueryFactory theQueryFactory = (QueryFactory)EPackage.Registry.INSTANCE.getEFactory("http://www.eclipse.org/papyrus/emf/facet/custom/0.3.incubation/query"); if (theQueryFactory != null) { return theQueryFactory; } diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.core/plugin.xml b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.core/plugin.xml index e34f04a4db5..f30725f362a 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.core/plugin.xml +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.sdk.core/plugin.xml @@ -9,8 +9,8 @@ name="%modelValidation.category"> - - + + - + diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/resources/customproperties.efacet b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/resources/customproperties.efacet index 07cfe6361cb..2c06694134a 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/resources/customproperties.efacet +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/resources/customproperties.efacet @@ -4,11 +4,11 @@ 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" - xmlns:efacet="http://www.eclipse.org/emf/facet/efacet/0.2.incubation/efacet" - xmlns:query="http://www.eclipse.org/emf/facet/efacet/0.2.incubation/efacet/query" - xmlns:javaQuery2="http://www.eclipse.org/emf/facet/query/java/0.2.incubation" + xmlns:efacet="http://www.eclipse.org/papyrus/emf/facet/efacet/0.2.incubation/efacet" + xmlns:query="http://www.eclipse.org/papyrus/emf/facet/efacet/0.2.incubation/efacet/query" + xmlns:javaQuery2="http://www.eclipse.org/papyrus/emf/facet/query/java/0.2.incubation" name="commoncustomproperties" - nsURI="http://www.eclipse.org/emf/facet/custom/0.2.incubation/commoncustomproperties" + nsURI="http://www.eclipse.org/papyrus/emf/facet/custom/0.2.incubation/commoncustomproperties" nsPrefix="commoncustomproperties"> @@ -20,7 +20,7 @@ - + @@ -55,14 +55,14 @@ - + - + @@ -83,42 +83,42 @@ - + - + - + - + - + - + @@ -149,7 +149,7 @@ - + @@ -184,56 +184,56 @@ - + - + - + - + - + - + - + - + @@ -254,14 +254,14 @@ - + - + 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 1e5e74d9389..de2949db421 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 @@ -2,7 +2,7 @@ + nsURI="http://www.eclipse.org/papyrus/emf/facet/eFacetCatalog/0.1.incubation" nsPrefix="efacetcatalog">
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 793f9d12139..241cca926fd 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 @@ -17,7 +17,7 @@ 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 a8fa639755b..bd4dec871aa 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 @@ -50,7 +50,7 @@ public interface EfacetcatalogPackage extends EPackage { * * @generated */ - String eNS_URI = "http://www.eclipse.org/emf/facet/eFacetCatalog/0.1.incubation"; //$NON-NLS-1$ + String eNS_URI = "http://www.eclipse.org/papyrus/emf/facet/eFacetCatalog/0.1.incubation"; //$NON-NLS-1$ /** * The package namespace name. 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 0125309dd6b..ed687be99cf 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 @@ -39,7 +39,7 @@ public class EfacetcatalogFactoryImpl extends EFactoryImpl implements Efacetcata */ public static EfacetcatalogFactory init() { try { - EfacetcatalogFactory theEfacetcatalogFactory = (EfacetcatalogFactory)EPackage.Registry.INSTANCE.getEFactory("http://www.eclipse.org/emf/facet/eFacetCatalog/0.1.incubation"); //$NON-NLS-1$ + EfacetcatalogFactory theEfacetcatalogFactory = (EfacetcatalogFactory)EPackage.Registry.INSTANCE.getEFactory("http://www.eclipse.org/papyrus/emf/facet/eFacetCatalog/0.1.incubation"); //$NON-NLS-1$ if (theEfacetcatalogFactory != null) { return theEfacetcatalogFactory; } diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.edit/plugin.xml b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.edit/plugin.xml index 3fe05ce6212..7efaae87a5b 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.edit/plugin.xml +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.edit/plugin.xml @@ -19,7 +19,7 @@ + nsURI="http://www.eclipse.org/papyrus/emf/facet/efacet/0.2.incubation/efacet" nsPrefix="efacet">
@@ -106,7 +106,7 @@ - - @@ -159,7 +159,7 @@ - @@ -210,7 +210,7 @@ eType="#//extensible/Query" containment="true"/> - diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/model/efacetcatalog-0.2.0.ecore b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/model/efacetcatalog-0.2.0.ecore index 098599f33c7..bc524f9b9f2 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/model/efacetcatalog-0.2.0.ecore +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/model/efacetcatalog-0.2.0.ecore @@ -2,7 +2,7 @@ + nsURI="http://www.eclipse.org/papyrus/emf/facet/efacet/0.2.incubation/efacetcatalog" nsPrefix="efacetcatalog">
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/plugin.xml b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/plugin.xml index 674d38d9a5d..bf33e375ec7 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/plugin.xml +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/plugin.xml @@ -20,19 +20,19 @@ diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/EFacetPackage.java b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/EFacetPackage.java index c55d2a99e9b..64b4c05a24d 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/EFacetPackage.java +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/EFacetPackage.java @@ -55,7 +55,7 @@ public interface EFacetPackage extends EPackage { * * @generated */ - String eNS_URI = "http://www.eclipse.org/emf/facet/efacet/0.2.incubation/efacet"; //$NON-NLS-1$ + String eNS_URI = "http://www.eclipse.org/papyrus/emf/facet/efacet/0.2.incubation/efacet"; //$NON-NLS-1$ /** * The package namespace name. diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/extensible/ExtensiblePackage.java b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/extensible/ExtensiblePackage.java index 105e9554779..c7a16a91265 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/extensible/ExtensiblePackage.java +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/extensible/ExtensiblePackage.java @@ -50,7 +50,7 @@ public interface ExtensiblePackage extends EPackage { * * @generated */ - String eNS_URI = "http://www.eclipse.org/emf/facet/efacet/0.2.incubation/efacet/extensible"; //$NON-NLS-1$ + String eNS_URI = "http://www.eclipse.org/papyrus/emf/facet/efacet/0.2.incubation/efacet/extensible"; //$NON-NLS-1$ /** * The package namespace name. diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/extensible/impl/ExtensibleFactoryImpl.java b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/extensible/impl/ExtensibleFactoryImpl.java index ef16af2651a..2dcfb6463e7 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/extensible/impl/ExtensibleFactoryImpl.java +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/extensible/impl/ExtensibleFactoryImpl.java @@ -38,7 +38,7 @@ public class ExtensibleFactoryImpl extends EFactoryImpl implements ExtensibleFac */ public static ExtensibleFactory init() { try { - ExtensibleFactory theExtensibleFactory = (ExtensibleFactory)EPackage.Registry.INSTANCE.getEFactory("http://www.eclipse.org/emf/facet/efacet/0.2.incubation/efacet/extensible"); //$NON-NLS-1$ + ExtensibleFactory theExtensibleFactory = (ExtensibleFactory)EPackage.Registry.INSTANCE.getEFactory("http://www.eclipse.org/papyrus/emf/facet/efacet/0.2.incubation/efacet/extensible"); //$NON-NLS-1$ if (theExtensibleFactory != null) { return theExtensibleFactory; } diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/impl/EFacetFactoryImpl.java b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/impl/EFacetFactoryImpl.java index b4ba5cc4d71..72a417ae101 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/impl/EFacetFactoryImpl.java +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/impl/EFacetFactoryImpl.java @@ -49,7 +49,7 @@ public class EFacetFactoryImpl extends EFactoryImpl implements EFacetFactory { */ public static EFacetFactory init() { try { - EFacetFactory theEFacetFactory = (EFacetFactory)EPackage.Registry.INSTANCE.getEFactory("http://www.eclipse.org/emf/facet/efacet/0.2.incubation/efacet"); //$NON-NLS-1$ + EFacetFactory theEFacetFactory = (EFacetFactory)EPackage.Registry.INSTANCE.getEFactory("http://www.eclipse.org/papyrus/emf/facet/efacet/0.2.incubation/efacet"); //$NON-NLS-1$ if (theEFacetFactory != null) { return theEFacetFactory; } diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/query/QueryPackage.java b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/query/QueryPackage.java index ad4054ffd1f..8bcb6697cbc 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/query/QueryPackage.java +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/query/QueryPackage.java @@ -55,7 +55,7 @@ public interface QueryPackage extends EPackage { * * @generated */ - String eNS_URI = "http://www.eclipse.org/emf/facet/efacet/0.2.incubation/efacet/query"; //$NON-NLS-1$ + String eNS_URI = "http://www.eclipse.org/papyrus/emf/facet/efacet/0.2.incubation/efacet/query"; //$NON-NLS-1$ /** * The package namespace name. diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/query/impl/QueryFactoryImpl.java b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/query/impl/QueryFactoryImpl.java index 84ba3c5e5a1..f51b295f2d8 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/query/impl/QueryFactoryImpl.java +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/query/impl/QueryFactoryImpl.java @@ -46,7 +46,7 @@ public class QueryFactoryImpl extends EFactoryImpl implements QueryFactory { */ public static QueryFactory init() { try { - QueryFactory theQueryFactory = (QueryFactory)EPackage.Registry.INSTANCE.getEFactory("http://www.eclipse.org/emf/facet/efacet/0.2.incubation/efacet/query"); //$NON-NLS-1$ + QueryFactory theQueryFactory = (QueryFactory)EPackage.Registry.INSTANCE.getEFactory("http://www.eclipse.org/papyrus/emf/facet/efacet/0.2.incubation/efacet/query"); //$NON-NLS-1$ if (theQueryFactory != null) { return theQueryFactory; } diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/runtime/RuntimePackage.java b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/runtime/RuntimePackage.java index a0429496b86..5388033bae2 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/runtime/RuntimePackage.java +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/runtime/RuntimePackage.java @@ -56,7 +56,7 @@ public interface RuntimePackage extends EPackage { * * @generated */ - String eNS_URI = "http://www.eclipse.org/emf/facet/efacet/0.2.incubation/efacet/runtime"; //$NON-NLS-1$ + String eNS_URI = "http://www.eclipse.org/papyrus/emf/facet/efacet/0.2.incubation/efacet/runtime"; //$NON-NLS-1$ /** * The package namespace name. diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/runtime/impl/RuntimeFactoryImpl.java b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/runtime/impl/RuntimeFactoryImpl.java index 8213c616500..c670d043636 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/runtime/impl/RuntimeFactoryImpl.java +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/runtime/impl/RuntimeFactoryImpl.java @@ -48,7 +48,7 @@ public class RuntimeFactoryImpl extends EFactoryImpl implements RuntimeFactory { */ public static RuntimeFactory init() { try { - RuntimeFactory theRuntimeFactory = (RuntimeFactory)EPackage.Registry.INSTANCE.getEFactory("http://www.eclipse.org/emf/facet/efacet/0.2.incubation/efacet/runtime"); //$NON-NLS-1$ + RuntimeFactory theRuntimeFactory = (RuntimeFactory)EPackage.Registry.INSTANCE.getEFactory("http://www.eclipse.org/papyrus/emf/facet/efacet/0.2.incubation/efacet/runtime"); //$NON-NLS-1$ if (theRuntimeFactory != null) { return theRuntimeFactory; } diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/serialization/SerializationPackage.java b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/serialization/SerializationPackage.java index 8948aa59736..3751c6ba497 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/serialization/SerializationPackage.java +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/serialization/SerializationPackage.java @@ -50,7 +50,7 @@ public interface SerializationPackage extends EPackage { * * @generated */ - String eNS_URI = "http://www.eclipse.org/emf/facet/efacet/0.2.incubation/efacet/serialization"; //$NON-NLS-1$ + String eNS_URI = "http://www.eclipse.org/papyrus/emf/facet/efacet/0.2.incubation/efacet/serialization"; //$NON-NLS-1$ /** * The package namespace name. diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/serialization/impl/SerializationFactoryImpl.java b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/serialization/impl/SerializationFactoryImpl.java index f782b5c5dc4..fd35b08be88 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/serialization/impl/SerializationFactoryImpl.java +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacet/serialization/impl/SerializationFactoryImpl.java @@ -47,7 +47,7 @@ public class SerializationFactoryImpl extends EFactoryImpl implements Serializat */ public static SerializationFactory init() { try { - SerializationFactory theSerializationFactory = (SerializationFactory)EPackage.Registry.INSTANCE.getEFactory("http://www.eclipse.org/emf/facet/efacet/0.2.incubation/efacet/serialization"); //$NON-NLS-1$ + SerializationFactory theSerializationFactory = (SerializationFactory)EPackage.Registry.INSTANCE.getEFactory("http://www.eclipse.org/papyrus/emf/facet/efacet/0.2.incubation/efacet/serialization"); //$NON-NLS-1$ if (theSerializationFactory != null) { return theSerializationFactory; } diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacetcatalog/EfacetcatalogPackage.java b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacetcatalog/EfacetcatalogPackage.java index e5e8a0c5d0b..65c1cce64c0 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacetcatalog/EfacetcatalogPackage.java +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacetcatalog/EfacetcatalogPackage.java @@ -51,7 +51,7 @@ public interface EfacetcatalogPackage extends EPackage { * * @generated */ - String eNS_URI = "http://www.eclipse.org/emf/facet/efacet/0.2.incubation/efacetcatalog"; //$NON-NLS-1$ + String eNS_URI = "http://www.eclipse.org/papyrus/emf/facet/efacet/0.2.incubation/efacetcatalog"; //$NON-NLS-1$ /** * The package namespace name. diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacetcatalog/impl/EfacetcatalogFactoryImpl.java b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacetcatalog/impl/EfacetcatalogFactoryImpl.java index 029e949b1bb..f7712005586 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacetcatalog/impl/EfacetcatalogFactoryImpl.java +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet.metamodel/src/org/eclipse/papyrus/emf/facet/efacet/metamodel/v0_2_0/efacetcatalog/impl/EfacetcatalogFactoryImpl.java @@ -41,7 +41,7 @@ public class EfacetcatalogFactoryImpl extends EFactoryImpl implements Efacetcata */ public static EfacetcatalogFactory init() { try { - EfacetcatalogFactory theEfacetcatalogFactory = (EfacetcatalogFactory)EPackage.Registry.INSTANCE.getEFactory("http://www.eclipse.org/emf/facet/efacet/0.2.incubation/efacetcatalog"); //$NON-NLS-1$ + EfacetcatalogFactory theEfacetcatalogFactory = (EfacetcatalogFactory)EPackage.Registry.INSTANCE.getEFactory("http://www.eclipse.org/papyrus/emf/facet/efacet/0.2.incubation/efacetcatalog"); //$NON-NLS-1$ if (theEfacetcatalogFactory != null) { return theEfacetcatalogFactory; } diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet/model/efacet.ecore b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet/model/efacet.ecore index 2816e8cf6b5..50644c6c985 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet/model/efacet.ecore +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet/model/efacet.ecore @@ -2,7 +2,7 @@ + nsURI="http://www.eclipse.org/papyrus/emf/facet/efacet/0.1.incubation" nsPrefix="efacet">
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet/plugin.xml b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet/plugin.xml index 8ab8e73fd1e..ead140eae42 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet/plugin.xml +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet/plugin.xml @@ -19,7 +19,7 @@ diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet/src/org/eclipse/papyrus/emf/facet/efacet/EFacetPackage.java b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet/src/org/eclipse/papyrus/emf/facet/efacet/EFacetPackage.java index 8cecd46967e..d7830e6bca8 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet/src/org/eclipse/papyrus/emf/facet/efacet/EFacetPackage.java +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet/src/org/eclipse/papyrus/emf/facet/efacet/EFacetPackage.java @@ -57,7 +57,7 @@ public interface EFacetPackage extends EPackage { * @deprecated use the new eFacet2 metamodel in org.eclipse.papyrus.emf.facet.efacet2.metamodel */ @Deprecated - String eNS_URI = "http://www.eclipse.org/emf/facet/efacet/0.1.incubation"; //$NON-NLS-1$ + String eNS_URI = "http://www.eclipse.org/papyrus/emf/facet/efacet/0.1.incubation"; //$NON-NLS-1$ /** * The package namespace name. diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet/src/org/eclipse/papyrus/emf/facet/efacet/impl/EFacetFactoryImpl.java b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet/src/org/eclipse/papyrus/emf/facet/efacet/impl/EFacetFactoryImpl.java index 43ad14b09c2..8a0e71e21cc 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.efacet/src/org/eclipse/papyrus/emf/facet/efacet/impl/EFacetFactoryImpl.java +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.efacet/src/org/eclipse/papyrus/emf/facet/efacet/impl/EFacetFactoryImpl.java @@ -44,7 +44,7 @@ public class EFacetFactoryImpl extends EFactoryImpl implements EFacetFactory { @Deprecated public static EFacetFactory init() { try { - EFacetFactory theEFacetFactory = (EFacetFactory)EPackage.Registry.INSTANCE.getEFactory("http://www.eclipse.org/emf/facet/efacet/0.1.incubation"); //$NON-NLS-1$ + EFacetFactory theEFacetFactory = (EFacetFactory)EPackage.Registry.INSTANCE.getEFactory("http://www.eclipse.org/papyrus/emf/facet/efacet/0.1.incubation"); //$NON-NLS-1$ if (theEFacetFactory != null) { return theEFacetFactory; } diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.query.java.metamodel/model/javaQuery-0.2.0.ecore b/plugins/facet/org.eclipse.papyrus.emf.facet.query.java.metamodel/model/javaQuery-0.2.0.ecore index 21704be0db4..eefdfcd7d4b 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.query.java.metamodel/model/javaQuery-0.2.0.ecore +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.query.java.metamodel/model/javaQuery-0.2.0.ecore @@ -2,7 +2,7 @@ + nsURI="http://www.eclipse.org/papyrus/emf/facet/query/java/0.2.incubation/javaquery" nsPrefix="javaQuery"> diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.query.java.metamodel/plugin.xml b/plugins/facet/org.eclipse.papyrus.emf.facet.query.java.metamodel/plugin.xml index 6c4e54b30f5..37783a30c1d 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.query.java.metamodel/plugin.xml +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.query.java.metamodel/plugin.xml @@ -3,13 +3,13 @@ diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.query.java.metamodel/src/org/eclipse/papyrus/emf/facet/query/java/metamodel/v0_2_0/javaquery/JavaQueryPackage.java b/plugins/facet/org.eclipse.papyrus.emf.facet.query.java.metamodel/src/org/eclipse/papyrus/emf/facet/query/java/metamodel/v0_2_0/javaquery/JavaQueryPackage.java index bb97ad4eb41..b97317cd88c 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.query.java.metamodel/src/org/eclipse/papyrus/emf/facet/query/java/metamodel/v0_2_0/javaquery/JavaQueryPackage.java +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.query.java.metamodel/src/org/eclipse/papyrus/emf/facet/query/java/metamodel/v0_2_0/javaquery/JavaQueryPackage.java @@ -51,7 +51,7 @@ public interface JavaQueryPackage extends EPackage { * * @generated */ - String eNS_URI = "http://www.eclipse.org/emf/facet/query/java/0.2.incubation/javaquery"; //$NON-NLS-1$ + String eNS_URI = "http://www.eclipse.org/papyrus/emf/facet/query/java/0.2.incubation/javaquery"; //$NON-NLS-1$ /** * The package namespace name. diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.query.java.metamodel/src/org/eclipse/papyrus/emf/facet/query/java/metamodel/v0_2_0/javaquery/impl/JavaQueryFactoryImpl.java b/plugins/facet/org.eclipse.papyrus.emf.facet.query.java.metamodel/src/org/eclipse/papyrus/emf/facet/query/java/metamodel/v0_2_0/javaquery/impl/JavaQueryFactoryImpl.java index 80da828c611..a2d2a6cc4b0 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.query.java.metamodel/src/org/eclipse/papyrus/emf/facet/query/java/metamodel/v0_2_0/javaquery/impl/JavaQueryFactoryImpl.java +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.query.java.metamodel/src/org/eclipse/papyrus/emf/facet/query/java/metamodel/v0_2_0/javaquery/impl/JavaQueryFactoryImpl.java @@ -38,7 +38,7 @@ public class JavaQueryFactoryImpl extends EFactoryImpl implements JavaQueryFacto */ public static JavaQueryFactory init() { try { - JavaQueryFactory theJavaQueryFactory = (JavaQueryFactory)EPackage.Registry.INSTANCE.getEFactory("http://www.eclipse.org/emf/facet/query/java/0.2.incubation/javaquery"); //$NON-NLS-1$ + JavaQueryFactory theJavaQueryFactory = (JavaQueryFactory)EPackage.Registry.INSTANCE.getEFactory("http://www.eclipse.org/papyrus/emf/facet/query/java/0.2.incubation/javaquery"); //$NON-NLS-1$ if (theJavaQueryFactory != null) { return theJavaQueryFactory; } diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.query.java/model/javaQuery.ecore b/plugins/facet/org.eclipse.papyrus.emf.facet.query.java/model/javaQuery.ecore index 5e8c4e4c254..eb3b57f1a76 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.query.java/model/javaQuery.ecore +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.query.java/model/javaQuery.ecore @@ -2,7 +2,7 @@ + nsURI="http://www.eclipse.org/papyrus/emf/facet/query/java/0.1.incubation" nsPrefix="javaQuery"> diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.query.java/plugin.xml b/plugins/facet/org.eclipse.papyrus.emf.facet.query.java/plugin.xml index 40405109eab..991b648edb6 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.query.java/plugin.xml +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.query.java/plugin.xml @@ -18,7 +18,7 @@ diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.query.java/src/org/eclipse/papyrus/emf/facet/query/java/javaquery/JavaqueryPackage.java b/plugins/facet/org.eclipse.papyrus.emf.facet.query.java/src/org/eclipse/papyrus/emf/facet/query/java/javaquery/JavaqueryPackage.java index 4265cb19ba2..06fb0cd5b21 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.query.java/src/org/eclipse/papyrus/emf/facet/query/java/javaquery/JavaqueryPackage.java +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.query.java/src/org/eclipse/papyrus/emf/facet/query/java/javaquery/JavaqueryPackage.java @@ -50,7 +50,7 @@ public interface JavaqueryPackage extends EPackage { * * @generated */ - String eNS_URI = "http://www.eclipse.org/emf/facet/query/java/0.1.incubation"; //$NON-NLS-1$ + String eNS_URI = "http://www.eclipse.org/papyrus/emf/facet/query/java/0.1.incubation"; //$NON-NLS-1$ /** * The package namespace name. diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.query.java/src/org/eclipse/papyrus/emf/facet/query/java/javaquery/impl/JavaqueryFactoryImpl.java b/plugins/facet/org.eclipse.papyrus.emf.facet.query.java/src/org/eclipse/papyrus/emf/facet/query/java/javaquery/impl/JavaqueryFactoryImpl.java index 034420aa962..92b32963f77 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.query.java/src/org/eclipse/papyrus/emf/facet/query/java/javaquery/impl/JavaqueryFactoryImpl.java +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.query.java/src/org/eclipse/papyrus/emf/facet/query/java/javaquery/impl/JavaqueryFactoryImpl.java @@ -39,7 +39,7 @@ public class JavaqueryFactoryImpl extends EFactoryImpl implements JavaqueryFacto */ public static JavaqueryFactory init() { try { - JavaqueryFactory theJavaqueryFactory = (JavaqueryFactory)EPackage.Registry.INSTANCE.getEFactory("http://www.eclipse.org/emf/facet/query/java/0.1.incubation"); //$NON-NLS-1$ + JavaqueryFactory theJavaqueryFactory = (JavaqueryFactory)EPackage.Registry.INSTANCE.getEFactory("http://www.eclipse.org/papyrus/emf/facet/query/java/0.1.incubation"); //$NON-NLS-1$ if (theJavaqueryFactory != null) { return theJavaqueryFactory; } diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.query.ocl.metamodel/model/oclQuery.ecore b/plugins/facet/org.eclipse.papyrus.emf.facet.query.ocl.metamodel/model/oclQuery.ecore index ec0a1964dfd..c8fa22eb550 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.query.ocl.metamodel/model/oclQuery.ecore +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.query.ocl.metamodel/model/oclQuery.ecore @@ -2,7 +2,7 @@ + nsURI="http://www.eclipse.org/papyrus/emf/facet/query/ocl/0.3.incubation/oclquery" nsPrefix="oclQuery"> diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.query.ocl.metamodel/plugin.xml b/plugins/facet/org.eclipse.papyrus.emf.facet.query.ocl.metamodel/plugin.xml index b71c5e90a96..c6127035606 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.query.ocl.metamodel/plugin.xml +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.query.ocl.metamodel/plugin.xml @@ -17,7 +17,7 @@ diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.query.ocl.metamodel/src/org/eclipse/papyrus/emf/facet/query/ocl/metamodel/oclquery/OclQueryPackage.java b/plugins/facet/org.eclipse.papyrus.emf.facet.query.ocl.metamodel/src/org/eclipse/papyrus/emf/facet/query/ocl/metamodel/oclquery/OclQueryPackage.java index af0315a4835..ef3b178fe54 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.query.ocl.metamodel/src/org/eclipse/papyrus/emf/facet/query/ocl/metamodel/oclquery/OclQueryPackage.java +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.query.ocl.metamodel/src/org/eclipse/papyrus/emf/facet/query/ocl/metamodel/oclquery/OclQueryPackage.java @@ -50,7 +50,7 @@ public interface OclQueryPackage extends EPackage { * * @generated */ - String eNS_URI = "http://www.eclipse.org/emf/facet/query/ocl/0.3.incubation/oclquery"; + String eNS_URI = "http://www.eclipse.org/papyrus/emf/facet/query/ocl/0.3.incubation/oclquery"; /** * The package namespace name. diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.query.ocl.metamodel/src/org/eclipse/papyrus/emf/facet/query/ocl/metamodel/oclquery/impl/OclQueryFactoryImpl.java b/plugins/facet/org.eclipse.papyrus.emf.facet.query.ocl.metamodel/src/org/eclipse/papyrus/emf/facet/query/ocl/metamodel/oclquery/impl/OclQueryFactoryImpl.java index 52009f9bc90..c101e3b6955 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.query.ocl.metamodel/src/org/eclipse/papyrus/emf/facet/query/ocl/metamodel/oclquery/impl/OclQueryFactoryImpl.java +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.query.ocl.metamodel/src/org/eclipse/papyrus/emf/facet/query/ocl/metamodel/oclquery/impl/OclQueryFactoryImpl.java @@ -38,7 +38,7 @@ public class OclQueryFactoryImpl extends EFactoryImpl implements OclQueryFactory */ public static OclQueryFactory init() { try { - OclQueryFactory theOclQueryFactory = (OclQueryFactory)EPackage.Registry.INSTANCE.getEFactory("http://www.eclipse.org/emf/facet/query/ocl/0.3.incubation/oclquery"); + OclQueryFactory theOclQueryFactory = (OclQueryFactory)EPackage.Registry.INSTANCE.getEFactory("http://www.eclipse.org/papyrus/emf/facet/query/ocl/0.3.incubation/oclquery"); if (theOclQueryFactory != null) { return theOclQueryFactory; } diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.util.emf.catalog/model/catalog.ecore b/plugins/facet/org.eclipse.papyrus.emf.facet.util.emf.catalog/model/catalog.ecore index 51a41f193c3..4eb364e31b8 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.util.emf.catalog/model/catalog.ecore +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.util.emf.catalog/model/catalog.ecore @@ -2,7 +2,7 @@ + nsURI="http://www.eclipse.org/papyrus/emf/facet/catalog/0.1.incubation" nsPrefix="catalog">
diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.util.emf.catalog/src/org/eclipse/papyrus/emf/facet/util/emf/catalog/CatalogPackage.java b/plugins/facet/org.eclipse.papyrus.emf.facet.util.emf.catalog/src/org/eclipse/papyrus/emf/facet/util/emf/catalog/CatalogPackage.java index d63c8498594..593741dd2db 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.util.emf.catalog/src/org/eclipse/papyrus/emf/facet/util/emf/catalog/CatalogPackage.java +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.util.emf.catalog/src/org/eclipse/papyrus/emf/facet/util/emf/catalog/CatalogPackage.java @@ -48,7 +48,7 @@ public interface CatalogPackage extends EPackage { * * @generated */ - String eNS_URI = "http://www.eclipse.org/emf/facet/catalog/0.1.incubation"; //$NON-NLS-1$ + String eNS_URI = "http://www.eclipse.org/papyrus/emf/facet/catalog/0.1.incubation"; //$NON-NLS-1$ /** * The package namespace name. diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.util.emf.catalog/src/org/eclipse/papyrus/emf/facet/util/emf/catalog/impl/CatalogFactoryImpl.java b/plugins/facet/org.eclipse.papyrus.emf.facet.util.emf.catalog/src/org/eclipse/papyrus/emf/facet/util/emf/catalog/impl/CatalogFactoryImpl.java index 3aef14322e9..7e3eba0c4a5 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.util.emf.catalog/src/org/eclipse/papyrus/emf/facet/util/emf/catalog/impl/CatalogFactoryImpl.java +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.util.emf.catalog/src/org/eclipse/papyrus/emf/facet/util/emf/catalog/impl/CatalogFactoryImpl.java @@ -35,7 +35,7 @@ public class CatalogFactoryImpl extends EFactoryImpl implements CatalogFactory { */ public static CatalogFactory init() { try { - CatalogFactory theCatalogFactory = (CatalogFactory)EPackage.Registry.INSTANCE.getEFactory("http://www.eclipse.org/emf/facet/catalog/0.1.incubation"); //$NON-NLS-1$ + CatalogFactory theCatalogFactory = (CatalogFactory)EPackage.Registry.INSTANCE.getEFactory("http://www.eclipse.org/papyrus/emf/facet/catalog/0.1.incubation"); //$NON-NLS-1$ if (theCatalogFactory != null) { return theCatalogFactory; } diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.util.emf.core/model/serialization.ecore b/plugins/facet/org.eclipse.papyrus.emf.facet.util.emf.core/model/serialization.ecore index 2ed9219c2e0..b2078ac0307 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.util.emf.core/model/serialization.ecore +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.util.emf.core/model/serialization.ecore @@ -2,7 +2,7 @@ + nsURI="http://www.eclipse.org/papyrus/emf/facet/serialization/0.1.incubation" nsPrefix="serialization"> diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.util.emf.core/src/org/eclipse/papyrus/emf/facet/util/emf/core/serialization/model/serialization/SerializationPackage.java b/plugins/facet/org.eclipse.papyrus.emf.facet.util.emf.core/src/org/eclipse/papyrus/emf/facet/util/emf/core/serialization/model/serialization/SerializationPackage.java index 90dca487f26..9e772576927 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.util.emf.core/src/org/eclipse/papyrus/emf/facet/util/emf/core/serialization/model/serialization/SerializationPackage.java +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.util.emf.core/src/org/eclipse/papyrus/emf/facet/util/emf/core/serialization/model/serialization/SerializationPackage.java @@ -44,7 +44,7 @@ public interface SerializationPackage extends EPackage { * * @generated */ - String eNS_URI = "http://www.eclipse.org/emf/facet/serialization/0.1.incubation"; //$NON-NLS-1$ + String eNS_URI = "http://www.eclipse.org/papyrus/emf/facet/serialization/0.1.incubation"; //$NON-NLS-1$ /** * The package namespace name. diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.util.emf.core/src/org/eclipse/papyrus/emf/facet/util/emf/core/serialization/model/serialization/impl/SerializationFactoryImpl.java b/plugins/facet/org.eclipse.papyrus.emf.facet.util.emf.core/src/org/eclipse/papyrus/emf/facet/util/emf/core/serialization/model/serialization/impl/SerializationFactoryImpl.java index 7cfeb483a04..9781c440886 100644 --- a/plugins/facet/org.eclipse.papyrus.emf.facet.util.emf.core/src/org/eclipse/papyrus/emf/facet/util/emf/core/serialization/model/serialization/impl/SerializationFactoryImpl.java +++ b/plugins/facet/org.eclipse.papyrus.emf.facet.util.emf.core/src/org/eclipse/papyrus/emf/facet/util/emf/core/serialization/model/serialization/impl/SerializationFactoryImpl.java @@ -35,7 +35,7 @@ public class SerializationFactoryImpl extends EFactoryImpl implements Serializat public static SerializationFactory init() { try { SerializationFactory theSerializationFactory = (SerializationFactory) EPackage.Registry.INSTANCE - .getEFactory("http://www.eclipse.org/emf/facet/serialization/0.1.incubation"); //$NON-NLS-1$ + .getEFactory("http://www.eclipse.org/papyrus/emf/facet/serialization/0.1.incubation"); //$NON-NLS-1$ if (theSerializationFactory != null) { return theSerializationFactory; } diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/resources/PapyrusNotation.custom b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/resources/PapyrusNotation.custom index 2dead5fd99f..a737d8541cf 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/resources/PapyrusNotation.custom +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/resources/PapyrusNotation.custom @@ -1,23 +1,70 @@ - - - - - - + + + + + + - - - - + + + + + - - - + + + - - + + + diff --git a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/META-INF/MANIFEST.MF b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/META-INF/MANIFEST.MF index a4ba42c34a1..62ffdb8146c 100644 --- a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/META-INF/MANIFEST.MF +++ b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/META-INF/MANIFEST.MF @@ -45,7 +45,8 @@ Require-Bundle: org.eclipse.ui, org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="0.4.0", org.eclipse.papyrus.emf.facet.custom.metamodel, org.eclipse.papyrus.emf.facet.util.ui;bundle-version="0.4.0", - org.eclipse.papyrus.emf.facet.query.java.core + org.eclipse.papyrus.emf.facet.query.java.core, + org.eclipse.papyrus.emf.facet.custom.core Bundle-Vendor: %providerName Bundle-ActivationPolicy: lazy Bundle-Version: 1.0.0.qualifier diff --git a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/handler/LoadBrowserCustomization.java b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/handler/LoadBrowserCustomization.java index 1e1a1f1ef12..22258bb0ae0 100644 --- a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/handler/LoadBrowserCustomization.java +++ b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/handler/LoadBrowserCustomization.java @@ -94,7 +94,7 @@ public class LoadBrowserCustomization extends AbstractHandler { if(Activator.getDefault().getCustomizationManager() != null) { ICustomizationManager customizationManager = Activator.getDefault().getCustomizationManager(); - final List registeredCustomizations = ICustomizationCatalogManagerFactory.DEFAULT.getOrCreateCustomizationCatalogManager(new ResourceSetImpl()).getRegisteredCustomizations(); + final List registeredCustomizations = ICustomizationCatalogManagerFactory.DEFAULT.getOrCreateCustomizationCatalogManager(customizationManager.getResourceSet()).getRegisteredCustomizations(); PapyrusLoadBrowserCustomizationDialog loadCustomizationsDialog; @@ -112,7 +112,7 @@ public class LoadBrowserCustomization extends AbstractHandler { return null; } }; - ILoadCustomizationsDialog dialog=ILoadCustomizationsDialogFactory.DEFAULT.createLoadCustomizationDialog(shell, registeredCustomizations, Collections. emptyList(), dialogCallBack); + ILoadCustomizationsDialog dialog=ILoadCustomizationsDialogFactory.DEFAULT.createLoadCustomizationDialog(shell, registeredCustomizations, Collections.EMPTY_LIST, dialogCallBack); // // try { // ServicesRegistry registry = ServiceUtilsForHandlers.getInstance().getServiceRegistry(event); @@ -123,27 +123,9 @@ public class LoadBrowserCustomization extends AbstractHandler { // } // if(Window.OK == dialog.open()) { + customizationManager.getManagedCustomizations().clear(); customizationManager.getManagedCustomizations().addAll( dialog.getSelectedCustomizations()); -// try { -// -// customizationManager.clearCustomizations(); -// List selectedCustomizations = loadCustomizationsDialog.getSelectedCustomizations(); -// //before loading, clean all facet to prevent to let not interesting facets. -// customizationManager.clearFacets(); -// -// -// // Always load facets corresponding to customizations -// loadFacetsForCustomizations(selectedCustomizations, customizationManager); -// -// -// for(MetamodelView metamodelView : selectedCustomizations) { -// customizationManager.registerCustomization(metamodelView); -// } -// customizationManager.loadCustomizations(); -// if(getCommonNavigator() != null) { -// Tree tree = getCommonNavigator().getCommonViewer().getTree(); -// customizationManager.installCustomPainter(tree); -// } + // // //Save the current state of the customizations // org.eclipse.papyrus.infra.emf.Activator.getDefault().saveCustomizationManagerState(); @@ -153,8 +135,9 @@ public class LoadBrowserCustomization extends AbstractHandler { // } // // load customizations defined as default through the customization // // extension -// if(getCommonNavigator() != null) { -// getCommonNavigator().getCommonViewer().refresh(); + if(getCommonNavigator() != null) { + getCommonNavigator().getCommonViewer().refresh(); + } } } return null; -- cgit v1.2.3