Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorcletavernie2011-12-15 15:13:29 +0000
committercletavernie2011-12-15 15:13:29 +0000
commit92870bec3e9aeb414b9ae8ad126429a597a76afd (patch)
tree577d37bc0d1af153bee09321b709e4a700823d05 /plugins
parentf6fc33713572f1346dac7d2deb4bb34b63062c0f (diff)
downloadorg.eclipse.papyrus-92870bec3e9aeb414b9ae8ad126429a597a76afd.tar.gz
org.eclipse.papyrus-92870bec3e9aeb414b9ae8ad126429a597a76afd.tar.xz
org.eclipse.papyrus-92870bec3e9aeb414b9ae8ad126429a597a76afd.zip
366527: [All diagram][refactoring] update papyrus to UML2.4
https://bugs.eclipse.org/bugs/show_bug.cgi?id=366527
Diffstat (limited to 'plugins')
-rw-r--r--plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/generators/ProfileGenerator.java3
-rw-r--r--plugins/customization/org.eclipse.papyrus.customization.properties.generation/transforms/profile2datacontext.qvto2
-rw-r--r--plugins/customization/org.eclipse.papyrus.customization.properties.model.xwt/.project10
-rw-r--r--plugins/customization/org.eclipse.papyrus.customization.properties.model.xwt/src/org/eclipse/papyrus/customization/properties/model/xwt/resource/XWTResource.java5
-rw-r--r--plugins/infra/table/org.eclipse.papyrus.infra.table.menu/src/org/eclipse/papyrus/infra/table/menu/handler/states/AbstractToggleStateProvider.java15
-rw-r--r--plugins/infra/table/org.eclipse.papyrus.infra.table.modelexplorer/resources/PapyrusTableFacet.facetSet4
-rw-r--r--plugins/infra/table/org.eclipse.papyrus.infra.table.modelexplorer/resources/PapyrusTableQuery.querySet11
-rw-r--r--plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/resources/SysMLDefaultExplorerCustomization.uiCustom121
-rw-r--r--plugins/sysml/org.eclipse.papyrus.sysml.facets/resources/requirementsFacets.facetSet20
-rw-r--r--plugins/sysml/org.eclipse.papyrus.sysml.facets/resources/requirementsQueries.querySet56
-rw-r--r--plugins/sysml/table/org.eclipse.papyrus.sysml.table.allocation/resources/allocate.querySet2
-rw-r--r--plugins/sysml/table/org.eclipse.papyrus.sysml.table.allocation/resources/table_SysML_Allocation_showOnlyClientAndSupplier.uiCustom2
-rw-r--r--plugins/sysml/table/org.eclipse.papyrus.sysml.table.requirement/resources/requirementsTable.querySet9
-rw-r--r--plugins/sysml/table/org.eclipse.papyrus.sysml.table.requirement/resources/table_UML_Class_hideAllClassFeatures.uiCustom2
-rw-r--r--plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/schema/org.eclipse.papyrus.uml.diagram.common.groups.groupcontainment.exsd (renamed from plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/schema/org.eclipse.papyrus.diagram.common.groups.groupcontainment.exsd)0
-rw-r--r--plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer.widgets/src/org/eclipse/papyrus/uml/modelexplorer/widgets/UMLElementMEBContentProvider.java2
-rw-r--r--plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/resource/PapyrusUMLFacet.facetSet4
-rw-r--r--plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/resource/UMLPapyrusDefaultBrowserCustomization.uiCustom121
-rw-r--r--plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/uml.querySet8
-rw-r--r--plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/providers/UMLLabelProvider.java7
-rw-r--r--plugins/uml/table/org.eclipse.papyrus.uml.table.widgets.celleditors/resources/umlCellEditors.modelcelleditors12
21 files changed, 98 insertions, 318 deletions
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/generators/ProfileGenerator.java b/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/generators/ProfileGenerator.java
index d6c4bf36593..76cfae4e0ee 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/generators/ProfileGenerator.java
+++ b/plugins/customization/org.eclipse.papyrus.customization.properties.generation/src/org/eclipse/papyrus/customization/properties/generation/generators/ProfileGenerator.java
@@ -40,6 +40,7 @@ import org.eclipse.uml2.uml.NamedElement;
import org.eclipse.uml2.uml.Package;
import org.eclipse.uml2.uml.Profile;
import org.eclipse.uml2.uml.Stereotype;
+import org.eclipse.uml2.uml.UMLPackage;
/**
* An IGenerator for building Contexts from a UML Profile
@@ -88,7 +89,7 @@ public class ProfileGenerator extends AbstractQVTGenerator {
umlProfile = (Profile)loadEMFModel(profileURI);
ModelExtent inPackage = new BasicModelExtent(Collections.singletonList(umlProfile));
- EPackage umlPackage = EPackage.Registry.INSTANCE.getEPackage("http://www.eclipse.org/uml2/3.0.0/UML"); //$NON-NLS-1$
+ EPackage umlPackage = UMLPackage.eINSTANCE;
ModelExtent inUml = new BasicModelExtent(Collections.singletonList(umlPackage));
PropertiesRoot root = ConfigurationManager.instance.getPropertiesRoot();
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/transforms/profile2datacontext.qvto b/plugins/customization/org.eclipse.papyrus.customization.properties.generation/transforms/profile2datacontext.qvto
index 1ae2d6d7522..864b784a01c 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/transforms/profile2datacontext.qvto
+++ b/plugins/customization/org.eclipse.papyrus.customization.properties.generation/transforms/profile2datacontext.qvto
@@ -1,4 +1,4 @@
-modeltype UML uses "http://www.eclipse.org/uml2/3.0.0/UML";
+modeltype UML uses "http://www.eclipse.org/uml2/4.0.0/UML";
modeltype PropertyContext uses "http://www.eclipse.org/papyrus/properties/contexts";
modeltype PropertyEnvironment uses "http://www.eclipse.org/papyrus/properties/environment";
modeltype PRoot uses "http://www.eclipse.org/papyrus/properties/root";
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.model.xwt/.project b/plugins/customization/org.eclipse.papyrus.customization.properties.model.xwt/.project
index c5803e5dca0..0736b2064bb 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties.model.xwt/.project
+++ b/plugins/customization/org.eclipse.papyrus.customization.properties.model.xwt/.project
@@ -20,9 +20,19 @@
<arguments>
</arguments>
</buildCommand>
+ <buildCommand>
+ <name>org.eclipse.m2m.qvt.oml.project.QVTOBuilder</name>
+ <arguments>
+ <dictionary>
+ <key>src_container</key>
+ <value>transforms</value>
+ </dictionary>
+ </arguments>
+ </buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.eclipse.m2m.qvt.oml.project.QVTONature</nature>
</natures>
</projectDescription>
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.model.xwt/src/org/eclipse/papyrus/customization/properties/model/xwt/resource/XWTResource.java b/plugins/customization/org.eclipse.papyrus.customization.properties.model.xwt/src/org/eclipse/papyrus/customization/properties/model/xwt/resource/XWTResource.java
index 1cbd9f903e8..ff35aaad9a0 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties.model.xwt/src/org/eclipse/papyrus/customization/properties/model/xwt/resource/XWTResource.java
+++ b/plugins/customization/org.eclipse.papyrus.customization.properties.model.xwt/src/org/eclipse/papyrus/customization/properties/model/xwt/resource/XWTResource.java
@@ -47,6 +47,7 @@ import org.eclipse.papyrus.customization.properties.model.xwt.format.XMLFormatte
import org.eclipse.papyrus.views.properties.contexts.Context;
import org.eclipse.papyrus.views.properties.runtime.ConfigurationManager;
import org.eclipse.papyrus.views.properties.ui.CompositeWidget;
+import org.eclipse.papyrus.views.properties.ui.UiPackage;
import org.eclipse.papyrus.views.properties.util.Util;
/**
@@ -154,7 +155,7 @@ public class XWTResource extends ResourceImpl {
}
private CompositeWidget xmlToUISection(Root genericXMLRoot) {
- URI transformationURI = URI.createURI("platform:/plugin/org.eclipse.papyrus.customization.properties.model.xwt/Transformation/XMLToUI.qvto"); //$NON-NLS-1$
+ URI transformationURI = URI.createPlatformPluginURI(Activator.PLUGIN_ID + "/Transformation/XMLToUI.qvto", true); //$NON-NLS-1$
TransformationExecutor executor = new TransformationExecutor(transformationURI);
List<Context> contexts = new LinkedList<Context>(findContexts());
@@ -208,7 +209,7 @@ public class XWTResource extends ResourceImpl {
}
private Root uiSectionToXML(CompositeWidget widget) {
- URI transformationURI = URI.createURI("platform:/plugin/org.eclipse.papyrus.customization.properties.model.xwt/Transformation/UIToXML.qvto"); //$NON-NLS-1$
+ URI transformationURI = URI.createPlatformPluginURI(Activator.PLUGIN_ID + "/Transformation/UIToXML.qvto", true); //$NON-NLS-1$
TransformationExecutor executor = new TransformationExecutor(transformationURI);
ModelExtent inWidget = getModelExtent(widget);
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.menu/src/org/eclipse/papyrus/infra/table/menu/handler/states/AbstractToggleStateProvider.java b/plugins/infra/table/org.eclipse.papyrus.infra.table.menu/src/org/eclipse/papyrus/infra/table/menu/handler/states/AbstractToggleStateProvider.java
index 4b6dfdc1ed3..9009d96524a 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.menu/src/org/eclipse/papyrus/infra/table/menu/handler/states/AbstractToggleStateProvider.java
+++ b/plugins/infra/table/org.eclipse.papyrus.infra.table.menu/src/org/eclipse/papyrus/infra/table/menu/handler/states/AbstractToggleStateProvider.java
@@ -17,7 +17,9 @@ import org.eclipse.jface.commands.ToggleState;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.ui.ISelectionListener;
import org.eclipse.ui.ISelectionService;
+import org.eclipse.ui.IWorkbench;
import org.eclipse.ui.IWorkbenchPart;
+import org.eclipse.ui.IWorkbenchWindow;
import org.eclipse.ui.PlatformUI;
/**
@@ -49,11 +51,14 @@ public abstract class AbstractToggleStateProvider extends ToggleState implements
PlatformUI.getWorkbench().getDisplay().asyncExec(new Runnable() {
public void run() {
- // TODO Auto-generated method stub
- serv = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getSelectionService();
- if(serv != null) {
- //serv.addSelectionListener(this);
- serv.addSelectionListener(AbstractToggleStateProvider.this);
+ IWorkbench workbench = PlatformUI.getWorkbench();
+ IWorkbenchWindow window = workbench.getActiveWorkbenchWindow();
+ if(window != null) {
+ serv = window.getSelectionService();
+ if(serv != null) {
+ //serv.addSelectionListener(this);
+ serv.addSelectionListener(AbstractToggleStateProvider.this);
+ }
}
}
});
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.modelexplorer/resources/PapyrusTableFacet.facetSet b/plugins/infra/table/org.eclipse.papyrus.infra.table.modelexplorer/resources/PapyrusTableFacet.facetSet
index d253b8a1fbb..b766ef65cfe 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.modelexplorer/resources/PapyrusTableFacet.facetSet
+++ b/plugins/infra/table/org.eclipse.papyrus.infra.table.modelexplorer/resources/PapyrusTableFacet.facetSet
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="ASCII"?>
<facet:FacetSet xmi:version="2.0" 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:facet="http://www.eclipse.org/EmfFacet/infra/facet/0.8.incubation" xmlns:query="http://www.eclipse.org/EmfFacet/infra/query/0.8.incubation" name="PapyrusTableFacet" nsURI="http://org.eclipse.org/papyrus/modelExplorer/PapyrusTableFacet" nsPrefix="PapyrusTableFacet">
<eClassifiers xsi:type="facet:Facet" name="FacetTableContainer" abstract="true">
- <eSuperTypes href="http://www.eclipse.org/uml2/3.0.0/UML#//Element"/>
+ <eSuperTypes href="http://www.eclipse.org/uml2/4.0.0/UML#//Element"/>
<eStructuralFeatures xsi:type="facet:FacetReference" name="tables" upperBound="-1" volatile="true" unsettable="true">
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/Papyrus/Table/0.8.0/papyrustableinstance#//PapyrusTableInstance"/>
<valueQuery xsi:type="query:JavaModelQuery" href="emffacet:/query/PapyrusTableQuery#GetContainedTables"/>
</eStructuralFeatures>
<conditionQuery xsi:type="query:JavaModelQuery" href="emffacet:/query/PapyrusTableQuery#IsTableContainer"/>
</eClassifiers>
- <extendedPackage href="http://www.eclipse.org/uml2/3.0.0/UML#/"/>
+ <extendedPackage href="http://www.eclipse.org/uml2/4.0.0/UML#/"/>
</facet:FacetSet>
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.modelexplorer/resources/PapyrusTableQuery.querySet b/plugins/infra/table/org.eclipse.papyrus.infra.table.modelexplorer/resources/PapyrusTableQuery.querySet
index e9c26762aa7..607a65452d2 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.modelexplorer/resources/PapyrusTableQuery.querySet
+++ b/plugins/infra/table/org.eclipse.papyrus.infra.table.modelexplorer/resources/PapyrusTableQuery.querySet
@@ -2,21 +2,22 @@
<query:ModelQuerySet xmi:version="2.0" 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:query="http://www.eclipse.org/EmfFacet/infra/query/0.8.incubation" name="PapyrusTableQuery">
<associatedMetamodels href="http://www.eclipse.org/Papyrus/Table/0.8.0/papyrustableinstance#/"/>
<associatedMetamodels href="http://www.eclipse.org/emf/2002/Ecore#/"/>
- <associatedMetamodels href="http://www.eclipse.org/uml2/3.0.0/UML#/"/>
+ <associatedMetamodels href="http://www.eclipse.org/uml2/4.0.0/UML#/"/>
+ <associatedMetamodels href="http://www.eclipse.org/uml2/4.0.0/Types#/"/>
<queries xsi:type="query:JavaModelQuery" name="IsTableContainer" description="Returns true if the element contains a Table" implementationClassName="org.eclipse.papyrus.infra.table.modelexplorer.queries.IsTableContainer">
<returnType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBooleanObject"/>
- <scope href="http://www.eclipse.org/uml2/3.0.0/UML#//Element"/>
+ <scope href="http://www.eclipse.org/uml2/4.0.0/UML#//Element"/>
</queries>
<queries xsi:type="query:JavaModelQuery" name="GetContainedTables" description="Get the collection of all contained tables" upperBound="-1" implementationClassName="org.eclipse.papyrus.infra.table.modelexplorer.queries.GetContainedTables">
<returnType xsi:type="ecore:EClass" href="http://www.eclipse.org/Papyrus/Table/0.8.0/papyrustableinstance#//PapyrusTableInstance"/>
- <scope href="http://www.eclipse.org/uml2/3.0.0/UML#//Element"/>
+ <scope href="http://www.eclipse.org/uml2/4.0.0/UML#//Element"/>
</queries>
<queries xsi:type="query:JavaModelQuery" name="GetTableIcon" description="Return the path to the icon of the corresponding table" implementationClassName="org.eclipse.papyrus.infra.table.modelexplorer.queries.GetTableIcon">
- <returnType xsi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/3.0.0/UML#//String"/>
+ <returnType xsi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/4.0.0/Types#//String"/>
<scope href="http://www.eclipse.org/Papyrus/Table/0.8.0/papyrustableinstance#//PapyrusTableInstance"/>
</queries>
<queries xsi:type="query:JavaModelQuery" name="GetTableName" description="Return the name for the table" implementationClassName="org.eclipse.papyrus.infra.table.modelexplorer.queries.GetTableName">
- <returnType xsi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/3.0.0/UML#//String"/>
+ <returnType xsi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/4.0.0/Types#//String"/>
<scope href="http://www.eclipse.org/Papyrus/Table/0.8.0/papyrustableinstance#//PapyrusTableInstance"/>
</queries>
</query:ModelQuerySet>
diff --git a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/resources/SysMLDefaultExplorerCustomization.uiCustom b/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/resources/SysMLDefaultExplorerCustomization.uiCustom
index 7219ba9c4ad..346212a760d 100644
--- a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/resources/SysMLDefaultExplorerCustomization.uiCustom
+++ b/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/resources/SysMLDefaultExplorerCustomization.uiCustom
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ASCII"?>
-<uicustom:MetamodelView xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:query="http://www.eclipse.org/EmfFacet/infra/query/0.8.incubation" xmlns:uicustom="http://www.eclipse.org/EmfFacet/infra/browser/custom/0.8" metamodelURI="http://www.eclipse.org/uml2/3.0.0/UML">
+<uicustom:MetamodelView xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:query="http://www.eclipse.org/EmfFacet/infra/query/0.8.incubation" xmlns:uicustom="http://www.eclipse.org/EmfFacet/infra/browser/custom/0.8" metamodelURI="http://www.eclipse.org/uml2/4.0.0/UML">
<types metaclassName="uml.Element">
<customizedFeatures customizedFeature="icon">
<valueCases>
@@ -5353,74 +5353,6 @@
</customizedFeatures>
</references>
</types>
- <types metaclassName="uml.ExecutionEvent">
- <references referenceName="ownedElement">
- <customizedFeatures>
- <defaultValue xsi:type="uicustom:StaticFeatureValue" value="false"/>
- </customizedFeatures>
- </references>
- <references referenceName="owner">
- <customizedFeatures>
- <defaultValue xsi:type="uicustom:StaticFeatureValue" value="false"/>
- </customizedFeatures>
- </references>
- <references referenceName="namespace">
- <customizedFeatures>
- <defaultValue xsi:type="uicustom:StaticFeatureValue" value="false"/>
- </customizedFeatures>
- </references>
- </types>
- <types metaclassName="uml.CreationEvent">
- <references referenceName="ownedElement">
- <customizedFeatures>
- <defaultValue xsi:type="uicustom:StaticFeatureValue" value="false"/>
- </customizedFeatures>
- </references>
- <references referenceName="owner">
- <customizedFeatures>
- <defaultValue xsi:type="uicustom:StaticFeatureValue" value="false"/>
- </customizedFeatures>
- </references>
- <references referenceName="namespace">
- <customizedFeatures>
- <defaultValue xsi:type="uicustom:StaticFeatureValue" value="false"/>
- </customizedFeatures>
- </references>
- </types>
- <types metaclassName="uml.DestructionEvent">
- <references referenceName="ownedElement">
- <customizedFeatures>
- <defaultValue xsi:type="uicustom:StaticFeatureValue" value="false"/>
- </customizedFeatures>
- </references>
- <references referenceName="owner">
- <customizedFeatures>
- <defaultValue xsi:type="uicustom:StaticFeatureValue" value="false"/>
- </customizedFeatures>
- </references>
- <references referenceName="namespace">
- <customizedFeatures>
- <defaultValue xsi:type="uicustom:StaticFeatureValue" value="false"/>
- </customizedFeatures>
- </references>
- </types>
- <types metaclassName="uml.SendOperationEvent">
- <references referenceName="ownedElement">
- <customizedFeatures>
- <defaultValue xsi:type="uicustom:StaticFeatureValue" value="false"/>
- </customizedFeatures>
- </references>
- <references referenceName="owner">
- <customizedFeatures>
- <defaultValue xsi:type="uicustom:StaticFeatureValue" value="false"/>
- </customizedFeatures>
- </references>
- <references referenceName="namespace">
- <customizedFeatures>
- <defaultValue xsi:type="uicustom:StaticFeatureValue" value="false"/>
- </customizedFeatures>
- </references>
- </types>
<types metaclassName="uml.MessageEvent">
<references referenceName="ownedElement">
<customizedFeatures>
@@ -5438,23 +5370,6 @@
</customizedFeatures>
</references>
</types>
- <types metaclassName="uml.SendSignalEvent">
- <references referenceName="ownedElement">
- <customizedFeatures>
- <defaultValue xsi:type="uicustom:StaticFeatureValue" value="false"/>
- </customizedFeatures>
- </references>
- <references referenceName="owner">
- <customizedFeatures>
- <defaultValue xsi:type="uicustom:StaticFeatureValue" value="false"/>
- </customizedFeatures>
- </references>
- <references referenceName="namespace">
- <customizedFeatures>
- <defaultValue xsi:type="uicustom:StaticFeatureValue" value="false"/>
- </customizedFeatures>
- </references>
- </types>
<types metaclassName="uml.MessageOccurrenceSpecification">
<references referenceName="ownedElement">
<customizedFeatures>
@@ -5489,40 +5404,6 @@
</customizedFeatures>
</references>
</types>
- <types metaclassName="uml.ReceiveOperationEvent">
- <references referenceName="ownedElement">
- <customizedFeatures>
- <defaultValue xsi:type="uicustom:StaticFeatureValue" value="false"/>
- </customizedFeatures>
- </references>
- <references referenceName="owner">
- <customizedFeatures>
- <defaultValue xsi:type="uicustom:StaticFeatureValue" value="false"/>
- </customizedFeatures>
- </references>
- <references referenceName="namespace">
- <customizedFeatures>
- <defaultValue xsi:type="uicustom:StaticFeatureValue" value="false"/>
- </customizedFeatures>
- </references>
- </types>
- <types metaclassName="uml.ReceiveSignalEvent">
- <references referenceName="ownedElement">
- <customizedFeatures>
- <defaultValue xsi:type="uicustom:StaticFeatureValue" value="false"/>
- </customizedFeatures>
- </references>
- <references referenceName="owner">
- <customizedFeatures>
- <defaultValue xsi:type="uicustom:StaticFeatureValue" value="false"/>
- </customizedFeatures>
- </references>
- <references referenceName="namespace">
- <customizedFeatures>
- <defaultValue xsi:type="uicustom:StaticFeatureValue" value="false"/>
- </customizedFeatures>
- </references>
- </types>
<types metaclassName="uml.Actor">
<references referenceName="ownedElement">
<customizedFeatures>
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.facets/resources/requirementsFacets.facetSet b/plugins/sysml/org.eclipse.papyrus.sysml.facets/resources/requirementsFacets.facetSet
index f16d6fe63b3..8e7cded63a0 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.facets/resources/requirementsFacets.facetSet
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.facets/resources/requirementsFacets.facetSet
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="ASCII"?>
<facet:FacetSet xmi:version="2.0" 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:facet="http://www.eclipse.org/EmfFacet/infra/facet/0.8.incubation" xmlns:query="http://www.eclipse.org/EmfFacet/infra/query/0.8.incubation" name="requirementsFacets" nsURI="http://www.eclipse.org/papyrus/sysml/requirements/SysMLRequirementsFacetSet.facetSet" nsPrefix="SysMLRequirementsFacetSet">
<eClassifiers xsi:type="facet:Facet" name="Requirement" abstract="true">
- <eSuperTypes href="http://www.eclipse.org/uml2/3.0.0/UML#//Class"/>
+ <eSuperTypes href="http://www.eclipse.org/uml2/4.0.0/UML#//Class"/>
<eStructuralFeatures xsi:type="facet:FacetAttribute" name="text" lowerBound="1" volatile="true" unsettable="true">
<eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>
<valueQuery xsi:type="query:JavaModelQuery" href="requirementsQueries.querySet#GetRequirementTextQuery"/>
@@ -13,44 +13,44 @@
<setQuery xsi:type="query:JavaModelQuery" href="requirementsQueries.querySet#SetRequirementIdQuery"/>
</eStructuralFeatures>
<eStructuralFeatures xsi:type="facet:FacetReference" name="/derived" upperBound="-1" volatile="true" unsettable="true">
- <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Class"/>
+ <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Class"/>
<valueQuery xsi:type="query:JavaModelQuery" href="requirementsQueries.querySet#GetRequirementDerivedQuery"/>
<setQuery xsi:type="query:JavaModelQuery" href="requirementsQueries.querySet#SetRequirementDerivedQuery"/>
</eStructuralFeatures>
<eStructuralFeatures xsi:type="facet:FacetReference" name="/derivedFrom" upperBound="-1" volatile="true" unsettable="true">
- <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Class"/>
+ <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Class"/>
<valueQuery xsi:type="query:JavaModelQuery" href="requirementsQueries.querySet#GetRequirementDerivedFromQuery"/>
<setQuery xsi:type="query:JavaModelQuery" href="requirementsQueries.querySet#SetRequirementDerivedFromQuery"/>
</eStructuralFeatures>
<eStructuralFeatures xsi:type="facet:FacetReference" name="/satisfiedBy" upperBound="-1" volatile="true" unsettable="true">
- <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//NamedElement"/>
+ <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement"/>
<valueQuery xsi:type="query:JavaModelQuery" href="requirementsQueries.querySet#GetRequirementSatisfiedByQuery"/>
<setQuery xsi:type="query:JavaModelQuery" href="requirementsQueries.querySet#SetRequirementSatisfiedByQuery"/>
</eStructuralFeatures>
<eStructuralFeatures xsi:type="facet:FacetReference" name="/refinedBy" upperBound="-1" volatile="true" unsettable="true">
- <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//NamedElement"/>
+ <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement"/>
<valueQuery xsi:type="query:JavaModelQuery" href="requirementsQueries.querySet#GetRequirementRefinedByQuery"/>
<setQuery xsi:type="query:JavaModelQuery" href="requirementsQueries.querySet#SetRequirementRefinedByQuery"/>
</eStructuralFeatures>
<eStructuralFeatures xsi:type="facet:FacetReference" name="/tracedTo" upperBound="-1" volatile="true" unsettable="true">
- <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//NamedElement"/>
+ <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement"/>
<valueQuery xsi:type="query:JavaModelQuery" href="requirementsQueries.querySet#GetRequirementTracedToQuery"/>
<setQuery xsi:type="query:JavaModelQuery" href="requirementsQueries.querySet#SetRequirementTracedToQuery"/>
</eStructuralFeatures>
<eStructuralFeatures xsi:type="facet:FacetReference" name="/verifiedBy" upperBound="-1" volatile="true" unsettable="true">
- <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//NamedElement"/>
+ <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement"/>
<valueQuery xsi:type="query:JavaModelQuery" href="requirementsQueries.querySet#GetRequirementVerifiedByQuery"/>
<setQuery xsi:type="query:JavaModelQuery" href="requirementsQueries.querySet#SetRequirementVerifiedByQuery"/>
</eStructuralFeatures>
<eStructuralFeatures xsi:type="facet:FacetReference" name="/master" volatile="true" unsettable="true">
- <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Class"/>
+ <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Class"/>
<valueQuery xsi:type="query:JavaModelQuery" href="requirementsQueries.querySet#GetRequirementMasterQuery"/>
<setQuery xsi:type="query:JavaModelQuery" href="requirementsQueries.querySet#SetRequirementMasterQuery"/>
</eStructuralFeatures>
<eStructuralFeatures xsi:type="facet:FacetReference" name="base_Class" lowerBound="1" changeable="false" volatile="true" unsettable="true">
- <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Class"/>
+ <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Class"/>
<valueQuery xsi:type="query:JavaModelQuery" href="requirementsQueries.querySet#GetRequirementBase_ClassQuery"/>
</eStructuralFeatures>
</eClassifiers>
- <extendedPackage href="http://www.eclipse.org/uml2/3.0.0/UML#/"/>
+ <extendedPackage href="http://www.eclipse.org/uml2/4.0.0/UML#/"/>
</facet:FacetSet>
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.facets/resources/requirementsQueries.querySet b/plugins/sysml/org.eclipse.papyrus.sysml.facets/resources/requirementsQueries.querySet
index 17e008dcf56..bdf14ce2ef7 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.facets/resources/requirementsQueries.querySet
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.facets/resources/requirementsQueries.querySet
@@ -1,80 +1,80 @@
<?xml version="1.0" encoding="ASCII"?>
<query:ModelQuerySet xmi:version="2.0" 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:query="http://www.eclipse.org/EmfFacet/infra/query/0.8.incubation" name="requirementsQueries" description="These queries are used to manage the requirements">
- <associatedMetamodels href="http://www.eclipse.org/uml2/3.0.0/UML#/"/>
+ <associatedMetamodels href="http://www.eclipse.org/uml2/4.0.0/UML#/"/>
<queries xsi:type="query:JavaModelQuery" name="GetRequirementIdQuery" description="Query to get the attribute &quot;id&quot; of the requirement" lowerBound="1" implementationClassName="org.eclipse.papyrus.sysml.facets.query.value.getter.GetRequirementIdQuery">
<returnType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- <scope href="http://www.eclipse.org/uml2/3.0.0/UML#//Class"/>
+ <scope href="http://www.eclipse.org/uml2/4.0.0/UML#//Class"/>
</queries>
<queries xsi:type="query:JavaModelQuery" name="GetRequirementTextQuery" description="Query to get the attribute &quot;text&quot; of the requirement" lowerBound="1" implementationClassName="org.eclipse.papyrus.sysml.facets.query.value.getter.GetRequirementTextQuery">
<returnType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- <scope href="http://www.eclipse.org/uml2/3.0.0/UML#//Class"/>
+ <scope href="http://www.eclipse.org/uml2/4.0.0/UML#//Class"/>
</queries>
<queries xsi:type="query:JavaModelQuery" name="GetRequirementDerivedQuery" description="Query to get the reference &quot;derived&quot; of the requirement" upperBound="-1" implementationClassName="org.eclipse.papyrus.sysml.facets.query.value.getter.GetRequirementDerivedQuery">
- <returnType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Class"/>
- <scope href="http://www.eclipse.org/uml2/3.0.0/UML#//Class"/>
+ <returnType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Class"/>
+ <scope href="http://www.eclipse.org/uml2/4.0.0/UML#//Class"/>
</queries>
<queries xsi:type="query:JavaModelQuery" name="GetRequirementDerivedFromQuery" description="Query to get the reference &quot;derivedBy&quot; of the requirement" upperBound="-1" implementationClassName="org.eclipse.papyrus.sysml.facets.query.value.getter.GetRequirementDerivedFromQuery">
- <returnType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Class"/>
- <scope href="http://www.eclipse.org/uml2/3.0.0/UML#//Class"/>
+ <returnType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Class"/>
+ <scope href="http://www.eclipse.org/uml2/4.0.0/UML#//Class"/>
</queries>
<queries xsi:type="query:JavaModelQuery" name="GetRequirementSatisfiedByQuery" description="Query to get the reference &quot;satisfiedBy&quot; of the requirement" upperBound="-1" implementationClassName="org.eclipse.papyrus.sysml.facets.query.value.getter.GetRequirementSatifiedByQuery">
- <returnType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//NamedElement"/>
- <scope href="http://www.eclipse.org/uml2/3.0.0/UML#//Class"/>
+ <returnType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement"/>
+ <scope href="http://www.eclipse.org/uml2/4.0.0/UML#//Class"/>
</queries>
<queries xsi:type="query:JavaModelQuery" name="GetRequirementRefinedByQuery" description="Query to get the reference &quot;redefinedBy&quot; of the requirement" upperBound="-1" implementationClassName="org.eclipse.papyrus.sysml.facets.query.value.getter.GetRequirementRefinedByQuery">
- <returnType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//NamedElement"/>
- <scope href="http://www.eclipse.org/uml2/3.0.0/UML#//Class"/>
+ <returnType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement"/>
+ <scope href="http://www.eclipse.org/uml2/4.0.0/UML#//Class"/>
</queries>
<queries xsi:type="query:JavaModelQuery" name="GetRequirementTracedToQuery" description="Query to get the reference &quot;tracedTo&quot; of the requirement" upperBound="-1" implementationClassName="org.eclipse.papyrus.sysml.facets.query.value.getter.GetRequirementTracedToQuery">
- <returnType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//NamedElement"/>
- <scope href="http://www.eclipse.org/uml2/3.0.0/UML#//Class"/>
+ <returnType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement"/>
+ <scope href="http://www.eclipse.org/uml2/4.0.0/UML#//Class"/>
</queries>
<queries xsi:type="query:JavaModelQuery" name="GetRequirementVerifiedByQuery" description="Query to get the reference &quot;verified by&quot; of the requirement" upperBound="-1" implementationClassName="org.eclipse.papyrus.sysml.facets.query.value.getter.GetRequirementVerifiedByQuery">
- <returnType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//NamedElement"/>
- <scope href="http://www.eclipse.org/uml2/3.0.0/UML#//Class"/>
+ <returnType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement"/>
+ <scope href="http://www.eclipse.org/uml2/4.0.0/UML#//Class"/>
</queries>
<queries xsi:type="query:JavaModelQuery" name="GetRequirementMasterQuery" description="Query to get the field reference &quot;master&quot; of the requirement" implementationClassName="org.eclipse.papyrus.sysml.facets.query.value.getter.GetRequirementMasterQuery">
- <returnType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Class"/>
- <scope href="http://www.eclipse.org/uml2/3.0.0/UML#//Class"/>
+ <returnType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Class"/>
+ <scope href="http://www.eclipse.org/uml2/4.0.0/UML#//Class"/>
</queries>
<queries xsi:type="query:JavaModelQuery" name="GetRequirementBase_ClassQuery" description="Query to get the reference &quot;base_class&quot; of the requirement" lowerBound="1" implementationClassName="org.eclipse.papyrus.sysml.facets.query.value.getter.GetRequirementBase_ClassQuery">
- <returnType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Class"/>
- <scope href="http://www.eclipse.org/uml2/3.0.0/UML#//Class"/>
+ <returnType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Class"/>
+ <scope href="http://www.eclipse.org/uml2/4.0.0/UML#//Class"/>
</queries>
<queries xsi:type="query:JavaModelQuery" name="SetRequirementIdQuery" description="Query to set the attribute &quot;id&quot; of the requirement" implementationClassName="org.eclipse.papyrus.sysml.facets.query.value.setter.SetRequirementIdQuery">
<returnType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
- <scope href="http://www.eclipse.org/uml2/3.0.0/UML#//Class"/>
+ <scope href="http://www.eclipse.org/uml2/4.0.0/UML#//Class"/>
</queries>
<queries xsi:type="query:JavaModelQuery" name="SetRequirementTextQuery" description="Query to set the attribute &quot;text&quot; of the requirement" implementationClassName="org.eclipse.papyrus.sysml.facets.query.value.setter.SetRequirementTextQuery">
<returnType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
- <scope href="http://www.eclipse.org/uml2/3.0.0/UML#//Class"/>
+ <scope href="http://www.eclipse.org/uml2/4.0.0/UML#//Class"/>
</queries>
<queries xsi:type="query:JavaModelQuery" name="SetRequirementDerivedFromQuery" description="Query to set the derived attribute &quot;derived From&quot; of the requirement" implementationClassName="org.eclipse.papyrus.sysml.facets.query.value.setter.SetRequirementDerivedFromQuery">
<returnType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
- <scope href="http://www.eclipse.org/uml2/3.0.0/UML#//Class"/>
+ <scope href="http://www.eclipse.org/uml2/4.0.0/UML#//Class"/>
</queries>
<queries xsi:type="query:JavaModelQuery" name="SetRequirementDerivedQuery" description="Query to set the derived attribute &quot;derived&quot; of the requirement" implementationClassName="org.eclipse.papyrus.sysml.facets.query.value.setter.SetRequirementDerivedQuery">
<returnType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
- <scope href="http://www.eclipse.org/uml2/3.0.0/UML#//Class"/>
+ <scope href="http://www.eclipse.org/uml2/4.0.0/UML#//Class"/>
</queries>
<queries xsi:type="query:JavaModelQuery" name="SetRequirementMasterQuery" description="Query to set the derived attribute &quot;master&quot; of the requirement" implementationClassName="org.eclipse.papyrus.sysml.facets.query.value.setter.SetRequirementMasterQuery">
<returnType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
- <scope href="http://www.eclipse.org/uml2/3.0.0/UML#//Class"/>
+ <scope href="http://www.eclipse.org/uml2/4.0.0/UML#//Class"/>
</queries>
<queries xsi:type="query:JavaModelQuery" name="SetRequirementSatisfiedByQuery" description="Query to set the derived attribute &quot;satisfiedBy&quot; of the requirement" implementationClassName="org.eclipse.papyrus.sysml.facets.query.value.setter.SetRequirementSatisfiedByQuery">
<returnType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
- <scope href="http://www.eclipse.org/uml2/3.0.0/UML#//NamedElement"/>
+ <scope href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement"/>
</queries>
<queries xsi:type="query:JavaModelQuery" name="SetRequirementVerifiedByQuery" description="Query to set the derived attribute &quot;verifiedBy&quot; of the requirement" implementationClassName="org.eclipse.papyrus.sysml.facets.query.value.setter.SetRequirementVerifiedByQuery">
<returnType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
- <scope href="http://www.eclipse.org/uml2/3.0.0/UML#//NamedElement"/>
+ <scope href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement"/>
</queries>
<queries xsi:type="query:JavaModelQuery" name="SetRequirementTracedToQuery" description="Query to set the derived attribute &quot;tracedTo&quot; of the requirement" implementationClassName="org.eclipse.papyrus.sysml.facets.query.value.setter.SetRequirementTracedToQuery">
<returnType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
- <scope href="http://www.eclipse.org/uml2/3.0.0/UML#//NamedElement"/>
+ <scope href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement"/>
</queries>
<queries xsi:type="query:JavaModelQuery" name="SetRequirementRefinedByQuery" description="Query to set the derived attribute &quot;refinedBy&quot; of the requirement" implementationClassName="org.eclipse.papyrus.sysml.facets.query.value.setter.SetRequirementRefinedByQuery">
<returnType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
- <scope href="http://www.eclipse.org/uml2/3.0.0/UML#//NamedElement"/>
+ <scope href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement"/>
</queries>
</query:ModelQuerySet>
diff --git a/plugins/sysml/table/org.eclipse.papyrus.sysml.table.allocation/resources/allocate.querySet b/plugins/sysml/table/org.eclipse.papyrus.sysml.table.allocation/resources/allocate.querySet
index 7f57f0ecd96..11d4bbe34c7 100644
--- a/plugins/sysml/table/org.eclipse.papyrus.sysml.table.allocation/resources/allocate.querySet
+++ b/plugins/sysml/table/org.eclipse.papyrus.sysml.table.allocation/resources/allocate.querySet
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="ASCII"?>
<query:ModelQuerySet xmi:version="2.0" 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:query="http://www.eclipse.org/EmfFacet/infra/query/0.8.incubation" name="allocate" description="Query Set for Allocation">
- <associatedMetamodels href="http://www.eclipse.org/uml2/3.0.0/UML#/"/>
+ <associatedMetamodels href="http://www.eclipse.org/uml2/4.0.0/UML#/"/>
<associatedMetamodels href="http://www.eclipse.org/papyrus/0.7.0/SysML#/"/>
<associatedMetamodels href="http://www.eclipse.org/EmfFacet/infra/browser/custom/0.8#/"/>
<associatedMetamodels href="http://www.eclipse.org/emf/2002/Ecore#/"/>
diff --git a/plugins/sysml/table/org.eclipse.papyrus.sysml.table.allocation/resources/table_SysML_Allocation_showOnlyClientAndSupplier.uiCustom b/plugins/sysml/table/org.eclipse.papyrus.sysml.table.allocation/resources/table_SysML_Allocation_showOnlyClientAndSupplier.uiCustom
index f760181f0e3..b445216d4cc 100644
--- a/plugins/sysml/table/org.eclipse.papyrus.sysml.table.allocation/resources/table_SysML_Allocation_showOnlyClientAndSupplier.uiCustom
+++ b/plugins/sysml/table/org.eclipse.papyrus.sysml.table.allocation/resources/table_SysML_Allocation_showOnlyClientAndSupplier.uiCustom
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ASCII"?>
-<uicustom:MetamodelView xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:uicustom="http://www.eclipse.org/EmfFacet/infra/browser/custom/0.8" metamodelURI="http://www.eclipse.org/uml2/3.0.0/UML" allQuerySetsAvailable="false">
+<uicustom:MetamodelView xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:uicustom="http://www.eclipse.org/EmfFacet/infra/browser/custom/0.8" metamodelURI="http://www.eclipse.org/uml2/4.0.0/UML" allQuerySetsAvailable="false">
<types metaclassName="uml.Element">
<references referenceName="ownedElement">
<customizedFeatures>
diff --git a/plugins/sysml/table/org.eclipse.papyrus.sysml.table.requirement/resources/requirementsTable.querySet b/plugins/sysml/table/org.eclipse.papyrus.sysml.table.requirement/resources/requirementsTable.querySet
index f004f1323a9..9bf233e3d56 100644
--- a/plugins/sysml/table/org.eclipse.papyrus.sysml.table.requirement/resources/requirementsTable.querySet
+++ b/plugins/sysml/table/org.eclipse.papyrus.sysml.table.requirement/resources/requirementsTable.querySet
@@ -1,13 +1,14 @@
<?xml version="1.0" encoding="ASCII"?>
<query:ModelQuerySet xmi:version="2.0" 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:query="http://www.eclipse.org/EmfFacet/infra/query/0.8.incubation" name="requirementsTable" description="This query set is used by the requirements table">
- <associatedMetamodels href="http://www.eclipse.org/uml2/3.0.0/UML#/"/>
+ <associatedMetamodels href="http://www.eclipse.org/uml2/4.0.0/UML#/"/>
<associatedMetamodels href="http://www.eclipse.org/emf/2002/Ecore#/"/>
+ <associatedMetamodels href="http://www.eclipse.org/uml2/4.0.0/Types#/"/>
<queries xsi:type="query:JavaModelQuery" name="CreateRequirements" description="This query creates a new Class stereotyped Requirement" implementationClassName="org.eclipse.papyrus.sysml.table.requirement.queries.CreateRequirement">
- <returnType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Class"/>
- <scope href="http://www.eclipse.org/uml2/3.0.0/UML#//Package"/>
+ <returnType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Class"/>
+ <scope href="http://www.eclipse.org/uml2/4.0.0/UML#//Package"/>
</queries>
<queries xsi:type="query:JavaModelQuery" name="IsRequirement" description="This query test if the EObject is a class stereotyped with requirement" lowerBound="1" implementationClassName="org.eclipse.papyrus.sysml.table.requirement.queries.IsRequirement">
- <returnType xsi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/3.0.0/UML#//Boolean"/>
+ <returnType xsi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/4.0.0/Types#//Boolean"/>
<scope href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
</queries>
</query:ModelQuerySet>
diff --git a/plugins/sysml/table/org.eclipse.papyrus.sysml.table.requirement/resources/table_UML_Class_hideAllClassFeatures.uiCustom b/plugins/sysml/table/org.eclipse.papyrus.sysml.table.requirement/resources/table_UML_Class_hideAllClassFeatures.uiCustom
index e3b98a64c7f..bdb189e92b6 100644
--- a/plugins/sysml/table/org.eclipse.papyrus.sysml.table.requirement/resources/table_UML_Class_hideAllClassFeatures.uiCustom
+++ b/plugins/sysml/table/org.eclipse.papyrus.sysml.table.requirement/resources/table_UML_Class_hideAllClassFeatures.uiCustom
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ASCII"?>
-<uicustom:MetamodelView xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:uicustom="http://www.eclipse.org/EmfFacet/infra/browser/custom/0.8" metamodelURI="http://www.eclipse.org/uml2/3.0.0/UML" allQuerySetsAvailable="false">
+<uicustom:MetamodelView xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:uicustom="http://www.eclipse.org/EmfFacet/infra/browser/custom/0.8" metamodelURI="http://www.eclipse.org/uml2/4.0.0/UML" allQuerySetsAvailable="false">
<types metaclassName="uml.Element">
<references referenceName="ownedElement">
<customizedFeatures>
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/schema/org.eclipse.papyrus.diagram.common.groups.groupcontainment.exsd b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/schema/org.eclipse.papyrus.uml.diagram.common.groups.groupcontainment.exsd
index 2897996c782..2897996c782 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/schema/org.eclipse.papyrus.diagram.common.groups.groupcontainment.exsd
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common.groups/schema/org.eclipse.papyrus.uml.diagram.common.groups.groupcontainment.exsd
diff --git a/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer.widgets/src/org/eclipse/papyrus/uml/modelexplorer/widgets/UMLElementMEBContentProvider.java b/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer.widgets/src/org/eclipse/papyrus/uml/modelexplorer/widgets/UMLElementMEBContentProvider.java
index 6dbad48584e..4c151dfd6d4 100644
--- a/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer.widgets/src/org/eclipse/papyrus/uml/modelexplorer/widgets/UMLElementMEBContentProvider.java
+++ b/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer.widgets/src/org/eclipse/papyrus/uml/modelexplorer/widgets/UMLElementMEBContentProvider.java
@@ -36,8 +36,6 @@ import org.eclipse.uml2.uml.util.UMLUtil;
*/
public class UMLElementMEBContentProvider extends GraphicalModelExplorerBasedContentProvider {
- public static final String UML_URI = "http://www.eclipse.org/uml2/3.0.0/UML";
-
public UMLElementMEBContentProvider(EObject semanticRoot, String historyId) {
super(semanticRoot, historyId);
}
diff --git a/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/resource/PapyrusUMLFacet.facetSet b/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/resource/PapyrusUMLFacet.facetSet
index ffc9a76ff76..5ac08792168 100644
--- a/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/resource/PapyrusUMLFacet.facetSet
+++ b/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/resource/PapyrusUMLFacet.facetSet
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="ASCII"?>
<facet:FacetSet xmi:version="2.0" 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:facet="http://www.eclipse.org/EmfFacet/infra/facet/0.8.incubation" xmlns:query="http://www.eclipse.org/EmfFacet/infra/query/0.8.incubation" name="PapyrusUMLFacet" nsURI="http://org.eclipse.org/papyrus/modelExplorer/Facet" nsPrefix="papyrusUMLFacet">
<eClassifiers xsi:type="facet:Facet" name="DiagramContainer" abstract="true">
- <eSuperTypes href="http://www.eclipse.org/uml2/3.0.0/UML#//Element"/>
+ <eSuperTypes href="http://www.eclipse.org/uml2/4.0.0/UML#//Element"/>
<eStructuralFeatures xsi:type="facet:FacetReference" name="diagrams" upperBound="-1" volatile="true" unsettable="true">
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//Diagram"/>
<valueQuery xsi:type="query:JavaModelQuery" href="emffacet:/query/PapyrusBrowserQuery#GetContainedDiagrams"/>
</eStructuralFeatures>
<conditionQuery xsi:type="query:JavaModelQuery" href="emffacet:/query/PapyrusBrowserQuery#IsDiagramContainer"/>
</eClassifiers>
- <extendedPackage href="http://www.eclipse.org/uml2/3.0.0/UML#/"/>
+ <extendedPackage href="http://www.eclipse.org/uml2/4.0.0/UML#/"/>
</facet:FacetSet>
diff --git a/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/resource/UMLPapyrusDefaultBrowserCustomization.uiCustom b/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/resource/UMLPapyrusDefaultBrowserCustomization.uiCustom
index b4cb2cfda11..dfa19ba3294 100644
--- a/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/resource/UMLPapyrusDefaultBrowserCustomization.uiCustom
+++ b/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/resource/UMLPapyrusDefaultBrowserCustomization.uiCustom
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ASCII"?>
-<uicustom:MetamodelView xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:query="http://www.eclipse.org/EmfFacet/infra/query/0.8.incubation" xmlns:uicustom="http://www.eclipse.org/EmfFacet/infra/browser/custom/0.8" metamodelURI="http://www.eclipse.org/uml2/3.0.0/UML">
+<uicustom:MetamodelView xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:query="http://www.eclipse.org/EmfFacet/infra/query/0.8.incubation" xmlns:uicustom="http://www.eclipse.org/EmfFacet/infra/browser/custom/0.8" metamodelURI="http://www.eclipse.org/uml2/4.0.0/UML">
<types metaclassName="uml.Package">
<references referenceName="packagedElement">
<customizedFeatures customizedFeature="collapseLink">
@@ -5358,74 +5358,6 @@
</customizedFeatures>
</references>
</types>
- <types metaclassName="uml.ExecutionEvent">
- <references referenceName="ownedElement">
- <customizedFeatures>
- <defaultValue xsi:type="uicustom:StaticFeatureValue" value="false"/>
- </customizedFeatures>
- </references>
- <references referenceName="owner">
- <customizedFeatures>
- <defaultValue xsi:type="uicustom:StaticFeatureValue" value="false"/>
- </customizedFeatures>
- </references>
- <references referenceName="namespace">
- <customizedFeatures>
- <defaultValue xsi:type="uicustom:StaticFeatureValue" value="false"/>
- </customizedFeatures>
- </references>
- </types>
- <types metaclassName="uml.CreationEvent">
- <references referenceName="ownedElement">
- <customizedFeatures>
- <defaultValue xsi:type="uicustom:StaticFeatureValue" value="false"/>
- </customizedFeatures>
- </references>
- <references referenceName="owner">
- <customizedFeatures>
- <defaultValue xsi:type="uicustom:StaticFeatureValue" value="false"/>
- </customizedFeatures>
- </references>
- <references referenceName="namespace">
- <customizedFeatures>
- <defaultValue xsi:type="uicustom:StaticFeatureValue" value="false"/>
- </customizedFeatures>
- </references>
- </types>
- <types metaclassName="uml.DestructionEvent">
- <references referenceName="ownedElement">
- <customizedFeatures>
- <defaultValue xsi:type="uicustom:StaticFeatureValue" value="false"/>
- </customizedFeatures>
- </references>
- <references referenceName="owner">
- <customizedFeatures>
- <defaultValue xsi:type="uicustom:StaticFeatureValue" value="false"/>
- </customizedFeatures>
- </references>
- <references referenceName="namespace">
- <customizedFeatures>
- <defaultValue xsi:type="uicustom:StaticFeatureValue" value="false"/>
- </customizedFeatures>
- </references>
- </types>
- <types metaclassName="uml.SendOperationEvent">
- <references referenceName="ownedElement">
- <customizedFeatures>
- <defaultValue xsi:type="uicustom:StaticFeatureValue" value="false"/>
- </customizedFeatures>
- </references>
- <references referenceName="owner">
- <customizedFeatures>
- <defaultValue xsi:type="uicustom:StaticFeatureValue" value="false"/>
- </customizedFeatures>
- </references>
- <references referenceName="namespace">
- <customizedFeatures>
- <defaultValue xsi:type="uicustom:StaticFeatureValue" value="false"/>
- </customizedFeatures>
- </references>
- </types>
<types metaclassName="uml.MessageEvent">
<references referenceName="ownedElement">
<customizedFeatures>
@@ -5443,23 +5375,6 @@
</customizedFeatures>
</references>
</types>
- <types metaclassName="uml.SendSignalEvent">
- <references referenceName="ownedElement">
- <customizedFeatures>
- <defaultValue xsi:type="uicustom:StaticFeatureValue" value="false"/>
- </customizedFeatures>
- </references>
- <references referenceName="owner">
- <customizedFeatures>
- <defaultValue xsi:type="uicustom:StaticFeatureValue" value="false"/>
- </customizedFeatures>
- </references>
- <references referenceName="namespace">
- <customizedFeatures>
- <defaultValue xsi:type="uicustom:StaticFeatureValue" value="false"/>
- </customizedFeatures>
- </references>
- </types>
<types metaclassName="uml.MessageOccurrenceSpecification">
<references referenceName="ownedElement">
<customizedFeatures>
@@ -5494,40 +5409,6 @@
</customizedFeatures>
</references>
</types>
- <types metaclassName="uml.ReceiveOperationEvent">
- <references referenceName="ownedElement">
- <customizedFeatures>
- <defaultValue xsi:type="uicustom:StaticFeatureValue" value="false"/>
- </customizedFeatures>
- </references>
- <references referenceName="owner">
- <customizedFeatures>
- <defaultValue xsi:type="uicustom:StaticFeatureValue" value="false"/>
- </customizedFeatures>
- </references>
- <references referenceName="namespace">
- <customizedFeatures>
- <defaultValue xsi:type="uicustom:StaticFeatureValue" value="false"/>
- </customizedFeatures>
- </references>
- </types>
- <types metaclassName="uml.ReceiveSignalEvent">
- <references referenceName="ownedElement">
- <customizedFeatures>
- <defaultValue xsi:type="uicustom:StaticFeatureValue" value="false"/>
- </customizedFeatures>
- </references>
- <references referenceName="owner">
- <customizedFeatures>
- <defaultValue xsi:type="uicustom:StaticFeatureValue" value="false"/>
- </customizedFeatures>
- </references>
- <references referenceName="namespace">
- <customizedFeatures>
- <defaultValue xsi:type="uicustom:StaticFeatureValue" value="false"/>
- </customizedFeatures>
- </references>
- </types>
<types metaclassName="uml.Actor">
<references referenceName="ownedElement">
<customizedFeatures>
diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/uml.querySet b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/uml.querySet
index afefa2ec274..f01e41ddac4 100644
--- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/uml.querySet
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/Model/UML/uml.querySet
@@ -1,16 +1,16 @@
<?xml version="1.0" encoding="ASCII"?>
<query:ModelQuerySet xmi:version="2.0" 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:query="http://www.eclipse.org/EmfFacet/infra/query/0.8.incubation" name="uml" description="UML Queries">
- <associatedMetamodels href="http://www.eclipse.org/uml2/3.0.0/UML#/"/>
+ <associatedMetamodels href="http://www.eclipse.org/uml2/4.0.0/UML#/"/>
<queries xsi:type="query:OCLModelQuery" name="isSynchCall" description="Tests if a message is a Synchronous Call" lowerBound="1" query="messageSort=MessageSort::synchCall">
<returnType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
- <scope href="http://www.eclipse.org/uml2/3.0.0/UML#//Message"/>
+ <scope href="http://www.eclipse.org/uml2/4.0.0/UML#//Message"/>
</queries>
<queries xsi:type="query:OCLModelQuery" name="isAsynchCall" description="Tests if a message is an Aynchronous Call" lowerBound="1" query="messageSort=MessageSort::asynchCall or messageSort=MessageSort::asynchSignal">
<returnType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
- <scope href="http://www.eclipse.org/uml2/3.0.0/UML#//Message"/>
+ <scope href="http://www.eclipse.org/uml2/4.0.0/UML#//Message"/>
</queries>
<queries xsi:type="query:OCLModelQuery" name="isReply" description="Tests if a message is a reply" lowerBound="1" query="messageSort=MessageSort::reply">
<returnType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
- <scope href="http://www.eclipse.org/uml2/3.0.0/UML#//Message"/>
+ <scope href="http://www.eclipse.org/uml2/4.0.0/UML#//Message"/>
</queries>
</query:ModelQuerySet>
diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/providers/UMLLabelProvider.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/providers/UMLLabelProvider.java
index 2b9023427a5..09f785d9f8e 100644
--- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/providers/UMLLabelProvider.java
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/providers/UMLLabelProvider.java
@@ -13,6 +13,7 @@ package org.eclipse.papyrus.uml.properties.providers;
import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.facet.infra.browser.uicore.CustomizableModelLabelProvider;
import org.eclipse.emf.facet.infra.browser.uicore.internal.model.ITreeElement;
import org.eclipse.gmf.runtime.notation.Diagram;
import org.eclipse.jface.viewers.ILabelProvider;
@@ -20,7 +21,7 @@ import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.viewers.LabelProvider;
import org.eclipse.papyrus.infra.widgets.providers.IDetailLabelProvider;
import org.eclipse.papyrus.uml.diagram.common.providers.EditorLabelProvider;
-import org.eclipse.papyrus.views.modelexplorer.MoDiscoLabelProvider;
+import org.eclipse.papyrus.views.modelexplorer.Activator;
import org.eclipse.papyrus.views.properties.providers.IFilteredLabelProvider;
import org.eclipse.swt.graphics.Image;
import org.eclipse.uml2.uml.Element;
@@ -46,8 +47,8 @@ public class UMLLabelProvider extends LabelProvider implements IDetailLabelProvi
*
*/
public UMLLabelProvider() {
- modiscoLabelProvider = new MoDiscoLabelProvider();
- // modiscoLabelProvider = new CustomizableModelLabelProvider(Activator.getDefault().getCustomizationManager());
+ // modiscoLabelProvider = new MoDiscoLabelProvider();
+ modiscoLabelProvider = new CustomizableModelLabelProvider(Activator.getDefault().getCustomizationManager());
eObjectLabelProvider = new EditorLabelProvider();
}
diff --git a/plugins/uml/table/org.eclipse.papyrus.uml.table.widgets.celleditors/resources/umlCellEditors.modelcelleditors b/plugins/uml/table/org.eclipse.papyrus.uml.table.widgets.celleditors/resources/umlCellEditors.modelcelleditors
index a1795dd8fa4..ebe83ff0d03 100644
--- a/plugins/uml/table/org.eclipse.papyrus.uml.table.widgets.celleditors/resources/umlCellEditors.modelcelleditors
+++ b/plugins/uml/table/org.eclipse.papyrus.uml.table.widgets.celleditors/resources/umlCellEditors.modelcelleditors
@@ -1,22 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
<modelCellEditor:ModelCellEditorDeclarations xmi:version="2.0" 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:modelCellEditor="http://www.eclipse.org/EMF_Facet/ModelCellEditor/0.1.0/modelCellEditor">
<modelCellEditors xsi:type="modelCellEditor:BasicCellEditor" cellId="uml_boolean_cell_papyrus" basicCellEditorImpl="org.eclipse.papyrus.uml.table.widget.celleditors.editors.BooleanCellEditor">
- <cellType xsi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/3.0.0/UML#//Boolean"/>
+ <cellType xsi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/4.0.0/Types#//Boolean"/>
</modelCellEditors>
<modelCellEditors xsi:type="modelCellEditor:BasicCellEditor" cellId="uml_string_cell_papyrus" basicCellEditorImpl="org.eclipse.papyrus.uml.table.widget.celleditors.editors.StringMultiCellEditor">
- <cellType xsi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/3.0.0/UML#//String"/>
+ <cellType xsi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/4.0.0/Types#//String"/>
</modelCellEditors>
<modelCellEditors xsi:type="modelCellEditor:BasicCellEditor" cellId="uml_int_cell_papyrus" basicCellEditorImpl="org.eclipse.papyrus.uml.table.widget.celleditors.editors.IntCellEditor">
- <cellType xsi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/3.0.0/UML#//Integer"/>
+ <cellType xsi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/4.0.0/Types#//Integer"/>
</modelCellEditors>
<modelCellEditors xsi:type="modelCellEditor:UnaryReferenceCellEditor" cellId="uml_enumeration_literal_cell_papyrus" unaryReferenceCellEditorImpl="org.eclipse.papyrus.uml.table.widget.celleditors.editors.EnumerationLiteralCellEditor">
- <cellType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//EnumerationLiteral"/>
+ <cellType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//EnumerationLiteral"/>
</modelCellEditors>
<modelCellEditors xsi:type="modelCellEditor:BasicCellEditor" cellId="uml_unlimited_natural_cell_papyrus" basicCellEditorImpl="org.eclipse.papyrus.uml.table.widget.celleditors.editors.LiteralUnlimitedNaturalCellEditor">
- <cellType xsi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/3.0.0/UML#//UnlimitedNatural"/>
+ <cellType xsi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/4.0.0/Types#//UnlimitedNatural"/>
</modelCellEditors>
<modelCellEditors xsi:type="modelCellEditor:UnaryReferenceCellEditor" cellId="uml_unary_reference_cell_papyrus" unaryReferenceCellEditorImpl="org.eclipse.papyrus.uml.table.widget.celleditors.editors.UnaryReferencePapyrusCellEditor">
- <cellType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/3.0.0/UML#//Element"/>
+ <cellType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Element"/>
</modelCellEditors>
<modelCellEditors xsi:type="modelCellEditor:BasicCellEditor" cellId="emf_enumerator_cell_papyrus" basicCellEditorImpl="org.eclipse.papyrus.uml.table.widget.celleditors.editors.EnumeratorEditor">
<cellType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EEnumerator"/>

Back to the top