Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorcletavernie2011-12-15 05:39:09 -0500
committercletavernie2011-12-15 05:39:09 -0500
commitb8d8dd085e64a660d3de6a1993ad59e8ec35b7b0 (patch)
treeb629a5412b92d0036c928bb8432f3178eaa267e4
parentb74557428f61bfacd3ae56db7f3a6f489c6b83ad (diff)
downloadorg.eclipse.papyrus-b8d8dd085e64a660d3de6a1993ad59e8ec35b7b0.tar.gz
org.eclipse.papyrus-b8d8dd085e64a660d3de6a1993ad59e8ec35b7b0.tar.xz
org.eclipse.papyrus-b8d8dd085e64a660d3de6a1993ad59e8ec35b7b0.zip
366527: [All diagram][refactoring] update papyrus to UML2.4
https://bugs.eclipse.org/bugs/show_bug.cgi?id=366527
-rw-r--r--plugins/customization/org.eclipse.papyrus.customization.paletteconfiguration/facet/PaletteConfiguration.querySet11
-rw-r--r--plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/resources/SysMLDefaultExplorerQueries.querySet15
-rw-r--r--plugins/sysml/org.eclipse.papyrus.sysml.facets/resources/portAndFlowsFacets.facetSet6
-rw-r--r--plugins/sysml/org.eclipse.papyrus.sysml.facets/resources/portAndFlowsQueries.querySet11
-rw-r--r--plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/resource/PapyrusBrowserQuery.querySet21
-rw-r--r--plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/MoDiscoLabelProvider.java2
6 files changed, 36 insertions, 30 deletions
diff --git a/plugins/customization/org.eclipse.papyrus.customization.paletteconfiguration/facet/PaletteConfiguration.querySet b/plugins/customization/org.eclipse.papyrus.customization.paletteconfiguration/facet/PaletteConfiguration.querySet
index 371e8194cfe..fa9003faf65 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.paletteconfiguration/facet/PaletteConfiguration.querySet
+++ b/plugins/customization/org.eclipse.papyrus.customization.paletteconfiguration/facet/PaletteConfiguration.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="PaletteConfiguration" description="Query Set For Palette Configuration">
<associatedMetamodels href="http://www.eclipse.org/papyrus/diagram/paletteconfiguration/0.7#/"/>
<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="getIcon" description="Gets the icon for a configuration element in the palette configuration model" implementationClassName="org.eclipse.papyrus.customization.paletteconfiguration.queries.GetIconQuery">
- <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/diagram/paletteconfiguration/0.7#//Configuration"/>
</queries>
<queries xsi:type="query:JavaModelQuery" name="hasIcon" description="Returns &lt;code>true&lt;/code> if the element has a specific icon to display" implementationClassName="org.eclipse.papyrus.customization.paletteconfiguration.queries.HasIconQuery">
- <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/papyrus/diagram/paletteconfiguration/0.7#//Configuration"/>
</queries>
<queries xsi:type="query:JavaModelQuery" name="getToolLabel" description="Returns the Label for a tool." implementationClassName="org.eclipse.papyrus.customization.paletteconfiguration.queries.GetToolLabelQuery">
- <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/diagram/paletteconfiguration/0.7#//ToolConfiguration"/>
</queries>
<queries xsi:type="query:JavaModelQuery" name="getDrawerLabel" description="Returns the label for a drawer" implementationClassName="org.eclipse.papyrus.customization.paletteconfiguration.queries.GetDrawerLabelQuery">
- <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/diagram/paletteconfiguration/0.7#//DrawerConfiguration"/>
</queries>
</query:ModelQuerySet>
diff --git a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/resources/SysMLDefaultExplorerQueries.querySet b/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/resources/SysMLDefaultExplorerQueries.querySet
index 03bcbcbaddc..c6d30b5baf4 100644
--- a/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/resources/SysMLDefaultExplorerQueries.querySet
+++ b/plugins/sysml/modelexplorer/org.eclipse.papyrus.sysml.modelexplorer/resources/SysMLDefaultExplorerQueries.querySet
@@ -1,16 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<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="SysMLDefaultExplorerQueries">
- <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="getLabel" description="Basic label provider for named elements" lowerBound="1" implementationClassName="org.eclipse.papyrus.sysml.modelexplorer.query.GetLabelQuery">
- <returnType xsi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/3.0.0/UML#//String"/>
- <scope href="http://www.eclipse.org/uml2/3.0.0/UML#//NamedElement"/>
+ <returnType xsi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/4.0.0/Types#//String"/>
+ <scope href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement"/>
</queries>
<queries xsi:type="query:JavaModelQuery" name="getImage" description="SysML icon provider" implementationClassName="org.eclipse.papyrus.sysml.modelexplorer.query.GetImageQuery">
- <returnType xsi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/3.0.0/UML#//String"/>
- <scope href="http://www.eclipse.org/uml2/3.0.0/UML#//Element"/>
+ <returnType xsi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/4.0.0/Types#//String"/>
+ <scope href="http://www.eclipse.org/uml2/4.0.0/UML#//Element"/>
</queries>
<queries xsi:type="query:JavaModelQuery" name="hasImage" description="SysML icon tester" implementationClassName="org.eclipse.papyrus.sysml.modelexplorer.query.HasImageQuery">
- <returnType xsi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/3.0.0/UML#//Boolean"/>
- <scope href="http://www.eclipse.org/uml2/3.0.0/UML#//Element"/>
+ <returnType xsi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/4.0.0/Types#//Boolean"/>
+ <scope href="http://www.eclipse.org/uml2/4.0.0/UML#//Element"/>
</queries>
</query:ModelQuerySet>
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.facets/resources/portAndFlowsFacets.facetSet b/plugins/sysml/org.eclipse.papyrus.sysml.facets/resources/portAndFlowsFacets.facetSet
index 4a1595523df..ab24bf55d01 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.facets/resources/portAndFlowsFacets.facetSet
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.facets/resources/portAndFlowsFacets.facetSet
@@ -1,9 +1,9 @@
<?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="portAndFlowsFacets" nsURI="http://www.eclipse.org/papyrus/sysml/portAndFlows/SysMLPortAndFlowsFacetSet.facetSet" nsPrefix="SysMLPortAndFlowsFacetSet">
<eClassifiers xsi:type="facet:Facet" name="FlowPort" abstract="true">
- <eSuperTypes href="http://www.eclipse.org/uml2/3.0.0/UML#//Port"/>
+ <eSuperTypes href="http://www.eclipse.org/uml2/4.0.0/UML#//Port"/>
<eStructuralFeatures xsi:type="facet:FacetAttribute" name="/isAtomic" changeable="false" volatile="true" unsettable="true">
- <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/3.0.0/UML#//Boolean"/>
+ <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/4.0.0/Types#//Boolean"/>
<valueQuery xsi:type="query:JavaModelQuery" href="emffacet:/query/portAndFlowsQueries#GetFlowPortIsAtomicQuery"/>
</eStructuralFeatures>
<eStructuralFeatures xsi:type="facet:FacetAttribute" name="direction" volatile="true" unsettable="true">
@@ -12,5 +12,5 @@
<setQuery xsi:type="query:JavaModelQuery" href="emffacet:/query/portAndFlowsQueries#SetFlowPortDirectionQuery"/>
</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/portAndFlowsQueries.querySet b/plugins/sysml/org.eclipse.papyrus.sysml.facets/resources/portAndFlowsQueries.querySet
index 7c1fedbeb5c..de8e0bcf4a9 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.facets/resources/portAndFlowsQueries.querySet
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.facets/resources/portAndFlowsQueries.querySet
@@ -1,18 +1,19 @@
<?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="portAndFlowsQueries" description="These queries are used to manage the PortAndFlowsProfile">
- <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/papyrus/0.7.0/SysML#//portandflows"/>
+ <associatedMetamodels href="http://www.eclipse.org/uml2/4.0.0/Types#/"/>
<queries xsi:type="query:JavaModelQuery" name="GetFlowPortIsAtomicQuery" description="Query to get the derived attribute &quot;isAtomic&quot; of the FlowPort" implementationClassName="org.eclipse.papyrus.sysml.facets.portandflows.query.value.getter.GetFlowPortIsAtomicQuery">
- <returnType xsi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/3.0.0/UML#//Boolean"/>
- <scope href="http://www.eclipse.org/uml2/3.0.0/UML#//Port"/>
+ <returnType xsi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/4.0.0/Types#//Boolean"/>
+ <scope href="http://www.eclipse.org/uml2/4.0.0/UML#//Port"/>
</queries>
<queries xsi:type="query:JavaModelQuery" name="GetFlowPortDirectionQuery" description="Query to qet the attribute &quot;Direction&quot; of the FlowPort" implementationClassName="org.eclipse.papyrus.sysml.facets.portandflows.query.value.getter.GetFlowPortDirectionQuery">
<returnType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EEnumerator"/>
- <scope href="http://www.eclipse.org/uml2/3.0.0/UML#//Port"/>
+ <scope href="http://www.eclipse.org/uml2/4.0.0/UML#//Port"/>
</queries>
<queries xsi:type="query:JavaModelQuery" name="SetFlowPortDirectionQuery" description="Query to qet the attribute &quot;Direction&quot; of the FlowPort" implementationClassName="org.eclipse.papyrus.sysml.facets.portandflows.query.value.setter.SetFlowPortDirectionQuery">
<returnType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EEnumerator"/>
- <scope href="http://www.eclipse.org/uml2/3.0.0/UML#//Port"/>
+ <scope href="http://www.eclipse.org/uml2/4.0.0/UML#//Port"/>
</queries>
</query:ModelQuerySet>
diff --git a/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/resource/PapyrusBrowserQuery.querySet b/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/resource/PapyrusBrowserQuery.querySet
index 49df2f23297..9b26124ef3b 100644
--- a/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/resource/PapyrusBrowserQuery.querySet
+++ b/plugins/uml/modelexplorer/org.eclipse.papyrus.uml.modelexplorer/resource/PapyrusBrowserQuery.querySet
@@ -1,31 +1,32 @@
<?xml version="1.0" encoding="UTF-8"?>
<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="PapyrusBrowserQuery">
- <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/gmf/runtime/1.0.2/notation#/"/>
<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="GetComplexName" description="get the name + the list of applied stereotypes" implementationClassName="org.eclipse.papyrus.uml.modelexplorer.queries.GetComplexName">
- <returnType xsi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/3.0.0/UML#//String"/>
- <scope href="http://www.eclipse.org/uml2/3.0.0/UML#//NamedElement"/>
+ <returnType xsi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/4.0.0/Types#//String"/>
+ <scope href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement"/>
</queries>
<queries xsi:type="query:JavaModelQuery" name="IsReadOnly" description="Return true if the ressource is in a read only mode" implementationClassName="org.eclipse.papyrus.uml.modelexplorer.queries.IsReadOnly">
- <returnType xsi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/3.0.0/UML#//Boolean"/>
- <scope href="http://www.eclipse.org/uml2/3.0.0/UML#//Element"/>
+ <returnType xsi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/4.0.0/Types#//Boolean"/>
+ <scope href="http://www.eclipse.org/uml2/4.0.0/UML#//Element"/>
<scope href="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//Diagram"/>
</queries>
<queries xsi:type="query:JavaModelQuery" name="IsDiagramContainer" description="return true if the element contains diagrams" implementationClassName="org.eclipse.papyrus.uml.modelexplorer.queries.IsDiagramContainer">
- <returnType xsi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/3.0.0/UML#//Boolean"/>
- <scope href="http://www.eclipse.org/uml2/3.0.0/UML#//Element"/>
+ <returnType xsi:type="ecore:EDataType" href="http://www.eclipse.org/uml2/4.0.0/Types#//Boolean"/>
+ <scope href="http://www.eclipse.org/uml2/4.0.0/UML#//Element"/>
</queries>
<queries xsi:type="query:JavaModelQuery" name="GetContainedDiagrams" description="Get the collection of all contained diagrams" upperBound="-1" implementationClassName="org.eclipse.papyrus.uml.modelexplorer.queries.GetContainedDiagrams">
<returnType xsi:type="ecore:EClass" href="http://www.eclipse.org/gmf/runtime/1.0.2/notation#//Diagram"/>
- <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="GetDiagramIcon" description="Return the path to the icon of the corresponding diagram" implementationClassName="org.eclipse.papyrus.uml.modelexplorer.queries.GetDiagramIcon">
- <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/gmf/runtime/1.0.2/notation#//Diagram"/>
</queries>
<queries xsi:type="query:JavaModelQuery" name="IsDiagram" description="Return tru eif the element is a diagram" implementationClassName="org.eclipse.papyrus.uml.modelexplorer.queries.IsDiagram">
- <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/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/MoDiscoLabelProvider.java b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/MoDiscoLabelProvider.java
index a25e5f635a9..aa9cd1857d6 100644
--- a/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/MoDiscoLabelProvider.java
+++ b/plugins/views/modelexplorer/org.eclipse.papyrus.views.modelexplorer/src/org/eclipse/papyrus/views/modelexplorer/MoDiscoLabelProvider.java
@@ -54,6 +54,8 @@ public class MoDiscoLabelProvider extends CustomizableModelLabelProvider {
/* OR : decorationService = ServiceUtilsForActionHandlers.getInstance().getServiceRegistry().getService(DecorationService.class); */
} catch (ServiceException ex) {
Activator.log.error(ex);
+ } catch (Exception ex){
+ Activator.log.error(ex);
}
}

Back to the top