Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/sysml')
-rw-r--r--plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/palettes/PapyrusSYSMLBlockDefinitionDiagram.paletteconfiguration274
-rw-r--r--plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/plugin.gen.xml10
-rw-r--r--plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/plugin.xml590
-rw-r--r--plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/factory/DiagramPaletteFactory.java4
-rw-r--r--plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/part/BlockDefinitionDiagramEditor.java6
-rw-r--r--plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/policy/StructuredClassifierCreationEditPolicy.java2
-rw-r--r--plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/palettes/PapyrusSysMLInternalBlockDiagram.paletteconfiguration102
-rw-r--r--plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/plugin.xml126
-rw-r--r--plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/factory/DiagramPaletteFactory.java4
-rw-r--r--plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/part/InternalBlockDiagramEditor.java6
-rw-r--r--plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/palettes/PapyrusSYSMLParametricDiagram.paletteconfiguration78
-rw-r--r--plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/plugin.xml179
-rw-r--r--plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/factory/DiagramPaletteFactory.java4
-rw-r--r--plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/META-INF/MANIFEST.MF3
-rw-r--r--plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/palettes/PapyrusSYSMLRequirementDiagram.paletteconfiguration120
-rw-r--r--plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/plugin.xml53
-rw-r--r--plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src/org/eclipse/papyrus/sysml/diagram/requirement/provider/CustomInheritedElementViewProvider.java146
17 files changed, 798 insertions, 909 deletions
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/palettes/PapyrusSYSMLBlockDefinitionDiagram.paletteconfiguration b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/palettes/PapyrusSYSMLBlockDefinitionDiagram.paletteconfiguration
new file mode 100644
index 00000000000..92253fe122a
--- /dev/null
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/palettes/PapyrusSYSMLBlockDefinitionDiagram.paletteconfiguration
@@ -0,0 +1,274 @@
+<?xml version="1.0" encoding="ASCII"?>
+<paletteconfiguration:PaletteConfiguration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.2" xmlns:paletteconfiguration="http://www.eclipse.org/papyrus/diagram/paletteconfiguration/0.8" id="org.eclipse.papyrus.sysml.diagram.blockdefinition.paletteconfiguration" label="org.eclipse.papyrus.sysml.diagram.blockdefinition Palette" description="">
+ <drawerConfigurations id="org.eclipse.papyrus.sysml.diagram.blockdefinition.SYSML_BlockDefinition__Associations" label="Associations" description="">
+ <icon pluginID="org.eclipse.gmf.runtime.diagram.ui" iconPath="/icons/group.gif"/>
+ <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="blockdefinition_associations.tool.association_none" label="Association" description="Create a new Association" kind="ConnectionTool">
+ <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Association.gif"/>
+ <elementDescriptors>
+ <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.sysml.service.types/model/sysml.elementtypesconfigurations#_65CqCFYBEeS0WsAAtVmToA"/>
+ </elementDescriptors>
+ </ownedConfigurations>
+ <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="blockdefinition_associations.tool.association_none_directed" label="DirectedAssociation" description="Create a new DirectedAssociation" kind="ConnectionTool">
+ <icon pluginID="org.eclipse.papyrus.uml.service.types" iconPath="/icons/Association_none_directed.gif"/>
+ <elementDescriptors>
+ <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.sysml.service.types/model/sysml.elementtypesconfigurations#_65CqC1YBEeS0WsAAtVmToA"/>
+ </elementDescriptors>
+ </ownedConfigurations>
+ <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="blockdefinition_associations.tool.association_composite" label="Composition" description="Create a new Composition" kind="ConnectionTool">
+ <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Association_composite.gif"/>
+ <elementDescriptors>
+ <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.sysml.service.types/model/sysml.elementtypesconfigurations#_65CqAlYBEeS0WsAAtVmToA"/>
+ </elementDescriptors>
+ </ownedConfigurations>
+ <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="blockdefinition_associations.tool.association_composite_directed" label="DirectedComposition" description="Create a new DirectedComposition" kind="ConnectionTool">
+ <icon pluginID="org.eclipse.papyrus.uml.service.types" iconPath="/icons/Association_composite_directed.gif"/>
+ <elementDescriptors>
+ <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.sysml.service.types/model/sysml.elementtypesconfigurations#_65CqBVYBEeS0WsAAtVmToA"/>
+ </elementDescriptors>
+ </ownedConfigurations>
+ <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="blockdefinition_associations.tool.association_shared" label="Aggregation" description="Create a new Aggregation" kind="ConnectionTool">
+ <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Association_shared.gif"/>
+ <elementDescriptors>
+ <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.sysml.service.types/model/sysml.elementtypesconfigurations#_65CqDlYBEeS0WsAAtVmToA"/>
+ </elementDescriptors>
+ </ownedConfigurations>
+ <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="blockdefinition_associations.tool.association_shared_directed" label="DirectedAggregation" description="Create a new DirectedAggregation" kind="ConnectionTool">
+ <icon pluginID="org.eclipse.papyrus.uml.service.types" iconPath="/icons/Association_shared_directed.gif"/>
+ <elementDescriptors>
+ <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.sysml.service.types/model/sysml.elementtypesconfigurations#_65CqEVYBEeS0WsAAtVmToA"/>
+ </elementDescriptors>
+ </ownedConfigurations>
+ <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="blockdefinition_associations.tool.instance_specification_link" label="InstanceSpecificationLink" description="Create a new InstanceSpecificationLink" kind="ConnectionTool">
+ <icon pluginID="org.eclipse.papyrus.sysml.diagram.blockdefinition" iconPath="/icons/obj16/InstanceLink.gif"/>
+ <elementDescriptors>
+ <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#_eu5pI9x0EeWVxMf7SXAfhg"/>
+ </elementDescriptors>
+ </ownedConfigurations>
+ </drawerConfigurations>
+ <drawerConfigurations id="org.eclipse.papyrus.sysml.diagram.blockdefinition.SYSML_BlockDefinition__ModelElements" label="ModelElements" description="">
+ <icon pluginID="org.eclipse.gmf.runtime.diagram.ui" iconPath="/icons/group.gif"/>
+ <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="blockdefinition_modelelements.tool.package" label="Package" description="Create a new Package">
+ <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Package.gif"/>
+ <elementDescriptors>
+ <elementType xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_Sc9nZVYCEeS0WsAAtVmToA"/>
+ </elementDescriptors>
+ </ownedConfigurations>
+ <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="blockdefinition_modelelements.tool.actor" label="Actor" description="Create a new Actor">
+ <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Actor.gif"/>
+ <elementDescriptors>
+ <elementType xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_ScV8UVYCEeS0WsAAtVmToA"/>
+ </elementDescriptors>
+ </ownedConfigurations>
+ <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="blockdefinition_modelelements.tool.block" label="Block" description="Create a new Block">
+ <icon pluginID="org.eclipse.papyrus.sysml" iconPath="/icons/blocks/Block.gif"/>
+ <elementDescriptors>
+ <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.sysml.service.types/model/sysml.elementtypesconfigurations#_65DRElYBEeS0WsAAtVmToA"/>
+ </elementDescriptors>
+ </ownedConfigurations>
+ <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="blockdefinition_modelelements.tool.signal" label="Signal" description="Create a new Signal">
+ <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Signal.gif"/>
+ <elementDescriptors>
+ <elementType xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_SdB431YCEeS0WsAAtVmToA"/>
+ </elementDescriptors>
+ </ownedConfigurations>
+ <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="blockdefinition_modelelements.tool.operation" label="Operation" description="Create a new Operation">
+ <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Operation.gif"/>
+ <elementDescriptors>
+ <elementType xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_Sc8ZVFYCEeS0WsAAtVmToA"/>
+ </elementDescriptors>
+ </ownedConfigurations>
+ <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="blockdefinition_modelelements.tool.reception" label="Reception" description="Create a new Reception">
+ <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Reception.gif"/>
+ <elementDescriptors>
+ <elementType xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_SdADs1YCEeS0WsAAtVmToA"/>
+ </elementDescriptors>
+ </ownedConfigurations>
+ <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="blockdefinition_modelelements.tool.property" label="Property" description="Create a new Property">
+ <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Property.gif"/>
+ <elementDescriptors>
+ <elementType xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_Sc-1cFYCEeS0WsAAtVmToA"/>
+ </elementDescriptors>
+ </ownedConfigurations>
+ <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="blockdefinition_modelelements.tool.part" label="Part" description="Create a new Part">
+ <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Property.gif"/>
+ <elementDescriptors>
+ <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.sysml.service.types/model/sysml.elementtypesconfigurations#_65EfQVYBEeS0WsAAtVmToA"/>
+ </elementDescriptors>
+ </ownedConfigurations>
+ <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="blockdefinition_modelelements.tool.reference" label="Reference" description="Create a new Reference">
+ <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Property.gif"/>
+ <elementDescriptors>
+ <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.sysml.service.types/model/sysml.elementtypesconfigurations#_65FGRlYBEeS0WsAAtVmToA"/>
+ </elementDescriptors>
+ </ownedConfigurations>
+ <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="blockdefinition_modelelements.tool.actorpart" label="ActorPart" description="Create a new ActorPart">
+ <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Property.gif"/>
+ <elementDescriptors>
+ <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.sysml.service.types/model/sysml.elementtypesconfigurations#_64-_oFYBEeS0WsAAtVmToA"/>
+ </elementDescriptors>
+ </ownedConfigurations>
+ <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="blockdefinition_modelelements.tool.value" label="Value" description="Create a new Value">
+ <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Property.gif"/>
+ <elementDescriptors>
+ <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.sysml.service.types/model/sysml.elementtypesconfigurations#_65FtVFYBEeS0WsAAtVmToA"/>
+ </elementDescriptors>
+ </ownedConfigurations>
+ <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="blockdefinition_modelelements.tool.instancespecification" label="InstanceSpecification" description="Create a new InstanceSpecification">
+ <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InstanceSpecification.gif"/>
+ <elementDescriptors>
+ <elementType xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_Scr6iVYCEeS0WsAAtVmToA"/>
+ </elementDescriptors>
+ </ownedConfigurations>
+ <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="blockdefinition_modelelements.tool.slot" label="Slot" description="Create a new Slot">
+ <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Slot.gif"/>
+ <elementDescriptors>
+ <elementType xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_SdCf4lYCEeS0WsAAtVmToA"/>
+ </elementDescriptors>
+ </ownedConfigurations>
+ <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="blockdefinition_modelelements.tool.dependency" label="Dependency" description="Create a new Dependency" kind="ConnectionTool">
+ <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Dependency.gif"/>
+ <elementDescriptors>
+ <elementType xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_SccqG1YCEeS0WsAAtVmToA"/>
+ </elementDescriptors>
+ </ownedConfigurations>
+ <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="blockdefinition_modelelements.tool.generalization" label="Generalization" description="Create a new Generalization" kind="ConnectionTool">
+ <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Generalization.gif"/>
+ <elementDescriptors>
+ <elementType xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_Scma8FYCEeS0WsAAtVmToA"/>
+ </elementDescriptors>
+ </ownedConfigurations>
+ </drawerConfigurations>
+ <drawerConfigurations id="org.eclipse.papyrus.sysml.diagram.blockdefinition.SYSML_BlockDefinition__PortAndFlowTools" label="PortAndFlows">
+ <icon pluginID="org.eclipse.gmf.runtime.diagram.ui" iconPath="/icons/group.gif"/>
+ <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="blockdefinition_portandflows.tool.port" label="Port" description="Create a new Port">
+ <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Port.gif"/>
+ <elementDescriptors>
+ <elementType xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_Sc-ObFYCEeS0WsAAtVmToA"/>
+ </elementDescriptors>
+ </ownedConfigurations>
+ <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="blockdefinition_portandflows.tool.flowport" label="FlowPort" description="Create a new FlowPort">
+ <icon pluginID="org.eclipse.papyrus.sysml" iconPath="/icons/portandflows/FlowPort.gif"/>
+ <elementDescriptors>
+ <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.sysml.service.types/model/sysml.elementtypesconfigurations#_65D4KFYBEeS0WsAAtVmToA"/>
+ </elementDescriptors>
+ </ownedConfigurations>
+ <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="blockdefinition_portandflows.tool.flowspecification" label="FlowSpecification" description="Create a new FlowSpecification">
+ <icon pluginID="org.eclipse.papyrus.sysml" iconPath="/icons/portandflows/FlowSpecification.gif"/>
+ <elementDescriptors>
+ <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.sysml.service.types/model/sysml.elementtypesconfigurations#_65EfOVYBEeS0WsAAtVmToA"/>
+ </elementDescriptors>
+ </ownedConfigurations>
+ <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="blockdefinition_portandflows.tool.flowproperty" label="FlowProperty" description="Create a new FlowProperty">
+ <icon pluginID="org.eclipse.papyrus.sysml" iconPath="/icons/portandflows/FlowProperty.gif"/>
+ <elementDescriptors>
+ <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.sysml.service.types/model/sysml.elementtypesconfigurations#_65EfNVYBEeS0WsAAtVmToA"/>
+ </elementDescriptors>
+ </ownedConfigurations>
+ <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="blockdefinition_portandflows.tool.interface" label="Interface" description="Create a new Interface">
+ <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Interface.gif"/>
+ <elementDescriptors>
+ <elementType xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_ScuW2VYCEeS0WsAAtVmToA"/>
+ </elementDescriptors>
+ </ownedConfigurations>
+ <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="blockdefinition_portandflows.tool.interfacerealization" label="InterfaceRealization" description="Create a new InterfaceRealization" kind="ConnectionTool">
+ <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/InterfaceRealization.gif"/>
+ <elementDescriptors>
+ <elementType xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_ScuW21YCEeS0WsAAtVmToA"/>
+ </elementDescriptors>
+ </ownedConfigurations>
+ <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="blockdefinition_portandflows.tool.usage" label="Usage" description="Create a new Usage" kind="ConnectionTool">
+ <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Usage.gif"/>
+ <elementDescriptors>
+ <elementType xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_SdLCxVYCEeS0WsAAtVmToA"/>
+ </elementDescriptors>
+ </ownedConfigurations>
+ </drawerConfigurations>
+ <drawerConfigurations id="org.eclipse.papyrus.sysml.diagram.blockdefinition.SYSML_BlockDefinition__DataTypeTools" label="Datatypes">
+ <icon pluginID="org.eclipse.gmf.runtime.diagram.ui" iconPath="/icons/group.gif"/>
+ <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="blockdefinition_datatypes.tool.datatype" label="DataType" description="Create a new DataType">
+ <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/DataType.gif"/>
+ <elementDescriptors>
+ <elementType xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_SccqC1YCEeS0WsAAtVmToA"/>
+ </elementDescriptors>
+ </ownedConfigurations>
+ <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="blockdefinition_datatypes.tool.valuetype" label="ValueType" description="Create a new ValueType">
+ <icon pluginID="org.eclipse.papyrus.sysml" iconPath="/icons/blocks/ValueType.gif"/>
+ <elementDescriptors>
+ <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.sysml.service.types/model/sysml.elementtypesconfigurations#_65FtWFYBEeS0WsAAtVmToA"/>
+ </elementDescriptors>
+ </ownedConfigurations>
+ <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="blockdefinition_datatypes.tool.primitivetype" label="PrimitiveType" description="Create a new PrimitiveType">
+ <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/PrimitiveType.gif"/>
+ <elementDescriptors>
+ <elementType xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_Sc-OdFYCEeS0WsAAtVmToA"/>
+ </elementDescriptors>
+ </ownedConfigurations>
+ <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="blockdefinition_datatypes.tool.enumeration" label="Enumeration" description="Create a new Enumeration">
+ <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Enumeration.gif"/>
+ <elementDescriptors>
+ <elementType xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_ScgUVlYCEeS0WsAAtVmToA"/>
+ </elementDescriptors>
+ </ownedConfigurations>
+ <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="blockdefinition_datatypes.tool.enumerationliteral" label="EnumerationLiteral" description="Create a new EnumerationLiteral">
+ <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/EnumerationLiteral.gif"/>
+ <elementDescriptors>
+ <elementType xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_ScgUWFYCEeS0WsAAtVmToA"/>
+ </elementDescriptors>
+ </ownedConfigurations>
+ <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="blockdefinition_datatypes.tool.dimension" label="Dimension" description="Create a new Dimension">
+ <icon pluginID="org.eclipse.papyrus.sysml" iconPath="/icons/blocks/Dimension.gif"/>
+ <elementDescriptors>
+ <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.sysml.service.types/model/sysml.elementtypesconfigurations#_65D4JFYBEeS0WsAAtVmToA"/>
+ </elementDescriptors>
+ </ownedConfigurations>
+ <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="blockdefinition_datatypes.tool.unit" label="Unit" description="Create a new Unit">
+ <icon pluginID="org.eclipse.papyrus.sysml" iconPath="/icons/blocks/Unit.gif"/>
+ <elementDescriptors>
+ <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.sysml.service.types/model/sysml.elementtypesconfigurations#_65FtUFYBEeS0WsAAtVmToA"/>
+ </elementDescriptors>
+ </ownedConfigurations>
+ </drawerConfigurations>
+ <drawerConfigurations id="org.eclipse.papyrus.sysml.diagram.blockdefinition.SYSML_BlockDefinition__ContraintTools" label="CommentAndConstraints">
+ <icon pluginID="org.eclipse.gmf.runtime.diagram.ui" iconPath="/icons/group.gif"/>
+ <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="blockdefinition_constraints.tool.constraintblock" label="ConstraintBlock" description="Create a new ConstraintBlock">
+ <icon pluginID="org.eclipse.papyrus.sysml" iconPath="/icons/constraints/ConstraintBlock.gif"/>
+ <elementDescriptors>
+ <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.sysml.service.types/model/sysml.elementtypesconfigurations#_65DRGlYBEeS0WsAAtVmToA"/>
+ </elementDescriptors>
+ </ownedConfigurations>
+ <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="blockdefinition_constraints.tool.constraintproperty" label="ConstraintProperty" description="Create a new ConstraintProperty">
+ <icon pluginID="org.eclipse.papyrus.sysml" iconPath="/icons/constraints/ConstraintProperty.gif"/>
+ <elementDescriptors>
+ <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.sysml.service.types/model/sysml.elementtypesconfigurations#_65DRHlYBEeS0WsAAtVmToA"/>
+ </elementDescriptors>
+ </ownedConfigurations>
+ <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="blockdefinition_constraints.tool.property" label="Parameter" description="Create a new Parameter (Property)">
+ <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Property.gif"/>
+ <elementDescriptors>
+ <elementType xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_Sc-1cFYCEeS0WsAAtVmToA"/>
+ </elementDescriptors>
+ </ownedConfigurations>
+ <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="blockdefinition_constraints.tool.constraint" label="Constraint" description="Create a new Constraint">
+ <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Constraint.gif"/>
+ <elementDescriptors>
+ <elementType xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_SccC-1YCEeS0WsAAtVmToA"/>
+ </elementDescriptors>
+ </ownedConfigurations>
+ <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="blockdefinition_constraints.tool.comment" label="Comment" description="Create a new Comment">
+ <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Comment.gif"/>
+ <elementDescriptors>
+ <elementType xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_Scbb2FYCEeS0WsAAtVmToA"/>
+ </elementDescriptors>
+ </ownedConfigurations>
+ <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="blockdefinition_constraints.tool.comment_constraint_link_1486387609929" label="Comment / Constraint link" description="Create a new Comment / Constraint link" kind="ConnectionTool">
+ <icon pluginID="org.eclipse.papyrus.sysml.diagram.blockdefinition" iconPath="/icons/obj16/Link.gif"/>
+ <elementDescriptors>
+ <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#_eu4bt9x0EeWVxMf7SXAfhg"/>
+ </elementDescriptors>
+ <elementDescriptors>
+ <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#_eu4cA9x0EeWVxMf7SXAfhg"/>
+ </elementDescriptors>
+ </ownedConfigurations>
+ </drawerConfigurations>
+ <requiredProfiles>SysML</requiredProfiles>
+</paletteconfiguration:PaletteConfiguration>
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/plugin.gen.xml b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/plugin.gen.xml
index 37d985fa5e8..aceeac5c1d9 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/plugin.gen.xml
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/plugin.gen.xml
@@ -1116,7 +1116,7 @@
<!-- Insert custom extensions here. -->
<!-- Palette tool declaration (declares the real palette containment) -->
-<extension point="org.eclipse.papyrus.uml.diagram.common.paletteDefinition"
+<extension point="org.eclipse.papyrus.infra.gmfdiag.common.paletteDefinition"
name="SysML Constraints (BDD)">
<paletteDefinition ID="SYSML_Constraints_BlockDefinition"
class="org.eclipse.papyrus.uml.diagram.common.service.PluginPaletteProvider"
@@ -1131,7 +1131,7 @@
</extension>
<!-- Palette tool declaration (declares the real palette containment) -->
-<extension point="org.eclipse.papyrus.uml.diagram.common.paletteDefinition"
+<extension point="org.eclipse.papyrus.infra.gmfdiag.common.paletteDefinition"
name="SysML DataTypes (BDD)">
<paletteDefinition ID="SYSML_DataTypes_BlockDefinition"
class="org.eclipse.papyrus.uml.diagram.common.service.PluginPaletteProvider"
@@ -1146,7 +1146,7 @@
</extension>
<!-- Palette tool declaration (declares the real palette containment) -->
-<extension point="org.eclipse.papyrus.uml.diagram.common.paletteDefinition"
+<extension point="org.eclipse.papyrus.infra.gmfdiag.common.paletteDefinition"
name="SysML Port and flows (BDD)">
<paletteDefinition ID="SYSML_PortAndFlows_BlockDefinition"
class="org.eclipse.papyrus.uml.diagram.common.service.PluginPaletteProvider"
@@ -1161,7 +1161,7 @@
</extension>
<!-- Palette tool declaration (declares the real palette containment) -->
-<extension point="org.eclipse.papyrus.uml.diagram.common.paletteDefinition"
+<extension point="org.eclipse.papyrus.infra.gmfdiag.common.paletteDefinition"
name="SysML ModelElements (BDD)">
<paletteDefinition ID="SYSML_ModelElements_BlockDefinition"
class="org.eclipse.papyrus.uml.diagram.common.service.PluginPaletteProvider"
@@ -1176,7 +1176,7 @@
</extension>
<!-- Palette tool declaration (declares the real palette containment) -->
-<extension point="org.eclipse.papyrus.uml.diagram.common.paletteDefinition"
+<extension point="org.eclipse.papyrus.infra.gmfdiag.common.paletteDefinition"
name="SysML Associations (BDD)">
<paletteDefinition ID="SYSML_Associations_BlockDefinition"
class="org.eclipse.papyrus.uml.diagram.common.service.PluginPaletteProvider"
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/plugin.xml b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/plugin.xml
index 364e655b35f..83dab0d2c25 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/plugin.xml
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/plugin.xml
@@ -39,499 +39,6 @@
<!-- Diagram creation command registration in menu and toolbar -->
<!-- Palette tool definition (defines tools possibly used by the palette(s)) -->
-<extension point="org.eclipse.gmf.runtime.diagram.ui.paletteProviders"
- name="SYSML_BlockDefinition_Predefined_Entries"
- id="org.eclipse.papyrus.sysml.diagram.blockdefinition.palettedefinition">
-
- <paletteProvider class="org.eclipse.gmf.runtime.diagram.ui.providers.DefaultPaletteProvider">
- <Priority name="Lowest"/> <!-- Lower priority than Palette tool declaration -->
-
- <!-- SysML Block Definition Diagram specific tool definition -->
- <contribution
- factoryClass="org.eclipse.papyrus.sysml.diagram.blockdefinition.factory.DiagramPaletteFactory">
-
- <!-- blockdefinition.tool.actor -->
- <entry
- defineOnly="true"
- description="Create a Actor"
- id="blockdefinition.tool.actor"
- kind="tool"
- label="Actor"
- large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Actor.gif"
- small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Actor.gif">
- </entry>
-
- <!-- blockdefinition.tool.block -->
- <entry
- defineOnly="true"
- description="Create a Block"
- id="blockdefinition.tool.block"
- kind="tool"
- label="Block"
- large_icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/blocks/Block.gif"
- small_icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/blocks/Block.gif">
- </entry>
-
- <!-- blockdefinition.tool.constraint -->
- <entry
- defineOnly="true"
- description="Create a Constraint"
- id="blockdefinition.tool.constraint"
- kind="tool"
- label="Constraint"
- large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Constraint.gif"
- small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Constraint.gif">
- </entry>
-
- <!-- blockdefinition.tool.constraintblock -->
- <entry
- defineOnly="true"
- description="Create a ConstraintBlock"
- id="blockdefinition.tool.constraintblock"
- kind="tool"
- label="ConstraintBlock"
- large_icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/constraints/ConstraintBlock.gif"
- small_icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/constraints/ConstraintBlock.gif">
- </entry>
-
- <!-- blockdefinition.tool.constraintproperty -->
- <entry
- defineOnly="true"
- description="Create a ConstraintProperty"
- id="blockdefinition.tool.constraintproperty"
- kind="tool"
- label="ConstraintProperty"
- large_icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/constraints/ConstraintProperty.gif"
- small_icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/constraints/ConstraintProperty.gif">
- </entry>
-
- <!-- blockdefinition.tool.datatype -->
- <entry
- defineOnly="true"
- description="Create a DataType"
- id="blockdefinition.tool.datatype"
- kind="tool"
- label="DataType"
- large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/DataType.gif"
- small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/DataType.gif">
- </entry>
-
- <!-- blockdefinition.tool.dimension -->
- <entry
- defineOnly="true"
- description="Create a Dimension"
- id="blockdefinition.tool.dimension"
- kind="tool"
- label="Dimension"
- large_icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/blocks/Dimension.gif"
- small_icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/blocks/Dimension.gif">
- </entry>
-
- <!-- blockdefinition.tool.enumeration -->
- <entry
- defineOnly="true"
- description="Create a Enumeration"
- id="blockdefinition.tool.enumeration"
- kind="tool"
- label="Enumeration"
- large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Enumeration.gif"
- small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Enumeration.gif">
- </entry>
-
- <!-- blockdefinition.tool.enumerationliteral -->
- <entry
- defineOnly="true"
- description="Create a EnumerationLiteral"
- id="blockdefinition.tool.enumerationliteral"
- kind="tool"
- label="EnumerationLiteral"
- large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/EnumerationLiteral.gif"
- small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/EnumerationLiteral.gif">
- </entry>
-
- <!-- blockdefinition.tool.flowport -->
- <entry
- defineOnly="true"
- description="Create a FlowPort"
- id="blockdefinition.tool.flowport"
- kind="tool"
- label="FlowPort"
- large_icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/portandflows/FlowPort.gif"
- small_icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/portandflows/FlowPort.gif">
- </entry>
-
- <!-- blockdefinition.tool.flowproperty -->
- <entry
- defineOnly="true"
- description="Create a FlowProperty"
- id="blockdefinition.tool.flowproperty"
- kind="tool"
- label="FlowProperty"
- large_icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/portandflows/FlowProperty.gif"
- small_icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/portandflows/FlowProperty.gif">
- </entry>
-
- <!-- blockdefinition.tool.flowspecification -->
- <entry
- defineOnly="true"
- description="Create a FlowSpecification"
- id="blockdefinition.tool.flowspecification"
- kind="tool"
- label="FlowSpecification"
- large_icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/portandflows/FlowSpecification.gif"
- small_icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/portandflows/FlowSpecification.gif">
- </entry>
-
- <!-- blockdefinition.tool.interface -->
- <entry
- defineOnly="true"
- description="Create a Interface"
- id="blockdefinition.tool.interface"
- kind="tool"
- label="Interface"
- large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Interface.gif"
- small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Interface.gif">
- </entry>
-
- <!-- blockdefinition.tool.operation -->
- <entry
- defineOnly="true"
- description="Create a Operation"
- id="blockdefinition.tool.operation"
- kind="tool"
- label="Operation"
- large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Operation.gif"
- small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Operation.gif">
- </entry>
-
- <!-- blockdefinition.tool.part -->
- <entry
- defineOnly="true"
- description="Create a Part"
- id="blockdefinition.tool.part"
- kind="tool"
- label="Part"
- large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif"
- small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif">
- </entry>
-
- <!-- blockdefinition.tool.port -->
- <entry
- defineOnly="true"
- description="Create a Port"
- id="blockdefinition.tool.port"
- kind="tool"
- label="Port"
- large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Port.gif"
- small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Port.gif">
- </entry>
-
- <!-- blockdefinition.tool.primitivetype -->
- <entry
- defineOnly="true"
- description="Create a PrimitiveType"
- id="blockdefinition.tool.primitivetype"
- kind="tool"
- label="PrimitiveType"
- large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/PrimitiveType.gif"
- small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/PrimitiveType.gif">
- </entry>
-
- <!-- blockdefinition.tool.property -->
- <entry
- defineOnly="true"
- description="Create a Property"
- id="blockdefinition.tool.property"
- kind="tool"
- label="Property"
- large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif"
- small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif">
- </entry>
-
- <!-- blockdefinition.tool.reception -->
- <entry
- defineOnly="true"
- description="Create a Reception"
- id="blockdefinition.tool.reception"
- kind="tool"
- label="Reception"
- large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Reception.gif"
- small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Reception.gif">
- </entry>
-
- <!-- blockdefinition.tool.reference -->
- <entry
- defineOnly="true"
- description="Create a Reference"
- id="blockdefinition.tool.reference"
- kind="tool"
- label="Reference"
- large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif"
- small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif">
- </entry>
-
- <!-- blockdefinition.tool.signal -->
- <entry
- defineOnly="true"
- description="Create a Signal"
- id="blockdefinition.tool.signal"
- kind="tool"
- label="Signal"
- large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Signal.gif"
- small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Signal.gif">
- </entry>
-
- <!-- blockdefinition.tool.unit -->
- <entry
- defineOnly="true"
- description="Create a Unit"
- id="blockdefinition.tool.unit"
- kind="tool"
- label="Unit"
- large_icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/blocks/Unit.gif"
- small_icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/blocks/Unit.gif">
- </entry>
-
- <!-- blockdefinition.tool.value -->
- <entry
- defineOnly="true"
- description="Create a Value"
- id="blockdefinition.tool.value"
- kind="tool"
- label="Value"
- large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif"
- small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif">
- </entry>
-
- <!-- blockdefinition.tool.valuetype -->
- <entry
- defineOnly="true"
- description="Create a ValueType"
- id="blockdefinition.tool.valuetype"
- kind="tool"
- label="ValueType"
- large_icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/blocks/ValueType.gif"
- small_icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/blocks/ValueType.gif">
- </entry>
- <!-- Start of user code Custom node button entry -->
-
- <entry
- defineOnly="true"
- description="Create a Model"
- id="blockdefinition.tool.model"
- kind="tool"
- label="Model"
- large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Model.gif"
- small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Model.gif">
- </entry>
-
- <entry
- defineOnly="true"
- description="Create a Package"
- id="blockdefinition.tool.package"
- kind="tool"
- label="Package"
- large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Package.gif"
- small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Package.gif">
- </entry>
-
- <entry
- defineOnly="true"
- description="Create an InstanceSpecification"
- id="blockdefinition.tool.instancespecification"
- kind="tool"
- label="InstanceSpecification"
- large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/InstanceSpecification.gif"
- small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/InstanceSpecification.gif">
- </entry>
-
- <entry
- defineOnly="true"
- description="Create a Slot"
- id="blockdefinition.tool.slot"
- kind="tool"
- label="Slot"
- large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Slot.gif"
- small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Slot.gif">
- </entry>
-
- <entry
- defineOnly="true"
- description="Create a Comment"
- id="blockdefinition.tool.comment"
- kind="tool"
- label="Comment"
- large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Comment.gif"
- small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Comment.gif">
- </entry>
-
- <!-- internalblock.tool.actorpart -->
- <entry
- defineOnly="true"
- description="Create an ActorPart"
- id="blockdefinition.tool.actorpart"
- kind="tool"
- label="ActorPart"
- large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif"
- small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif">
- </entry>
-
- <!-- End of user code -->
-
-
- <!-- blockdefinition.tool.association -->
- <entry
- defineOnly="true"
- description="Create a Association"
- id="blockdefinition.tool.association"
- kind="tool"
- label="Association"
- large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Association.gif"
- small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Association.gif">
- </entry>
-
- <!-- blockdefinition.tool.instance_specification_link -->
- <entry
- defineOnly="true"
- description="Create an InstanceSpecification link"
- id="blockdefinition.tool.instance_specification_link"
- kind="tool"
- label="InstanceSpecification link"
- path=""
- large_icon="icons/obj16/InstanceLink.gif"
- small_icon="icons/obj16/InstanceLink.gif">
- </entry>
-
- <!-- blockdefinition.tool.dependency -->
- <entry
- defineOnly="true"
- description="Create a Dependency"
- id="blockdefinition.tool.dependency"
- kind="tool"
- label="Dependency"
- large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Dependency.gif"
- small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Dependency.gif">
- </entry>
-
- <!-- blockdefinition.tool.generalization -->
- <entry
- defineOnly="true"
- description="Create a Generalization"
- id="blockdefinition.tool.generalization"
- kind="tool"
- label="Generalization"
- large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Generalization.gif"
- small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Generalization.gif">
- </entry>
-
- <!-- blockdefinition.tool.interfacerealization -->
- <entry
- defineOnly="true"
- description="Create a InterfaceRealization"
- id="blockdefinition.tool.interfacerealization"
- kind="tool"
- label="InterfaceRealization"
- large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/InterfaceRealization.gif"
- small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/InterfaceRealization.gif">
- </entry>
-
- <!-- blockdefinition.tool.usage -->
- <entry
- defineOnly="true"
- description="Create a Usage"
- id="blockdefinition.tool.usage"
- kind="tool"
- label="Usage"
- large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Usage.gif"
- small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Usage.gif">
- </entry>
- <!-- Start of user code Custom edge button entry -->
-
- <!-- blockdefinition.tool.association -->
- <entry
- defineOnly="true"
- description="Create an Association"
- id="blockdefinition.tool.association_none"
- kind="tool"
- label="Association"
- large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Association.gif"
- small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Association.gif">
- </entry>
-
- <!-- blockdefinition.tool.directedassociation -->
- <entry
- defineOnly="true"
- description="Create a DirectedAssociation"
- id="blockdefinition.tool.association_none_directed"
- kind="tool"
- label="DirectedAssociation"
- large_icon="platform:/plugin/org.eclipse.papyrus.uml.service.types/icons/Association_none_directed.gif"
- small_icon="platform:/plugin/org.eclipse.papyrus.uml.service.types/icons/Association_none_directed.gif">
- </entry>
-
- <!-- blockdefinition.tool.composition -->
- <entry
- defineOnly="true"
- description="Create a Composition"
- id="blockdefinition.tool.association_composite"
- kind="tool"
- label="Composition"
- large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Association_composite.gif"
- small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Association_composite.gif">
- </entry>
-
- <!-- blockdefinition.tool.directedcomposition -->
- <entry
- defineOnly="true"
- description="Create a DirectedComposition"
- id="blockdefinition.tool.association_composite_directed"
- kind="tool"
- label="DirectedComposition"
- large_icon="platform:/plugin/org.eclipse.papyrus.uml.service.types/icons/Association_composite_directed.gif"
- small_icon="platform:/plugin/org.eclipse.papyrus.uml.service.types/icons/Association_composite_directed.gif">
- </entry>
-
- <!-- blockdefinition.tool.aggregation -->
- <entry
- defineOnly="true"
- description="Create an Aggregation"
- id="blockdefinition.tool.association_shared"
- kind="tool"
- label="Aggregation"
- large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Association_shared.gif"
- small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Association_shared.gif">
- </entry>
-
- <!-- blockdefinition.tool.directedaggregation -->
- <entry
- defineOnly="true"
- description="Create a DirectedAggregation"
- id="blockdefinition.tool.association_shared_directed"
- kind="tool"
- label="DirectedAggregation"
- large_icon="platform:/plugin/org.eclipse.papyrus.uml.service.types/icons/Association_shared_directed.gif"
- small_icon="platform:/plugin/org.eclipse.papyrus.uml.service.types/icons/Association_shared_directed.gif">
- </entry>
-
- <entry
- defineOnly="true"
- description="Create a Comment / Constraint link"
- id="blockdefinition.tool.comment_constraint_link"
- kind="tool"
- label="Comment / Constraint link"
- large_icon="icons/obj16/Link.gif"
- small_icon="icons/obj16/Link.gif">
- </entry>
-
- <!-- End of user code -->
-
- </contribution>
-
- <!-- Specify diagram this palette tools relate to -->
- <editor id="org.eclipse.papyrus.sysml.diagram.blockdefinition"/>
-
- </paletteProvider>
-</extension>
<!-- Diagram view providers declaration -->
<extension point="org.eclipse.gmf.runtime.diagram.core.viewProviders">
@@ -923,86 +430,6 @@
</extension>
-<!-- // Start of user code custom extensions
- -->
-
-<!-- Insert custom extensions here. -->
-
-<!-- Palette tool declaration (declares the real palette containment) -->
-<extension point="org.eclipse.papyrus.uml.diagram.common.paletteDefinition"
- name="SysML Constraints (BDD)">
- <paletteDefinition ID="SYSML_Constraints_BlockDefinition"
- class="org.eclipse.papyrus.uml.diagram.common.service.PluginPaletteProvider"
- name="SYSML_Constraints_BlockDefinition" icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif"
- path="palettes/blockdefinition.palette.constraints.xml"
- provider="CEA LIST">
- <Priority name="Low"/>
-
- <!-- Specify diagram this palette tools relate to -->
- <editor id="org.eclipse.papyrus.sysml.diagram.blockdefinition"/>
- </paletteDefinition>
-</extension>
-
-<!-- Palette tool declaration (declares the real palette containment) -->
-<extension point="org.eclipse.papyrus.uml.diagram.common.paletteDefinition"
- name="SysML DataTypes (BDD)">
- <paletteDefinition ID="SYSML_DataTypes_BlockDefinition"
- class="org.eclipse.papyrus.uml.diagram.common.service.PluginPaletteProvider"
- name="SYSML_DataTypes_BlockDefinition" icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif"
- path="palettes/blockdefinition.palette.datatypes.xml"
- provider="CEA LIST">
- <Priority name="Low"/>
-
- <!-- Specify diagram this palette tools relate to -->
- <editor id="org.eclipse.papyrus.sysml.diagram.blockdefinition"/>
- </paletteDefinition>
-</extension>
-
-<!-- Palette tool declaration (declares the real palette containment) -->
-<extension point="org.eclipse.papyrus.uml.diagram.common.paletteDefinition"
- name="SysML Port and flows (BDD)">
- <paletteDefinition ID="SYSML_PortAndFlows_BlockDefinition"
- class="org.eclipse.papyrus.uml.diagram.common.service.PluginPaletteProvider"
- name="SYSML_PortAndFlows_BlockDefinition" icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif"
- path="palettes/blockdefinition.palette.portandflows.xml"
- provider="CEA LIST">
- <Priority name="Low"/>
-
- <!-- Specify diagram this palette tools relate to -->
- <editor id="org.eclipse.papyrus.sysml.diagram.blockdefinition"/>
- </paletteDefinition>
-</extension>
-
-<!-- Palette tool declaration (declares the real palette containment) -->
-<extension point="org.eclipse.papyrus.uml.diagram.common.paletteDefinition"
- name="SysML ModelElements (BDD)">
- <paletteDefinition ID="SYSML_ModelElements_BlockDefinition"
- class="org.eclipse.papyrus.uml.diagram.common.service.PluginPaletteProvider"
- name="SYSML_ModelElements_BlockDefinition" icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif"
- path="palettes/blockdefinition.palette.modelelements.xml"
- provider="CEA LIST">
- <Priority name="Low"/>
-
- <!-- Specify diagram this palette tools relate to -->
- <editor id="org.eclipse.papyrus.sysml.diagram.blockdefinition"/>
- </paletteDefinition>
-</extension>
-
-<!-- Palette tool declaration (declares the real palette containment) -->
-<extension point="org.eclipse.papyrus.uml.diagram.common.paletteDefinition"
- name="SysML Associations (BDD)">
- <paletteDefinition ID="SYSML_Associations_BlockDefinition"
- class="org.eclipse.papyrus.uml.diagram.common.service.PluginPaletteProvider"
- name="SYSML_Associations_BlockDefinition" icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif"
- path="palettes/blockdefinition.palette.associations.xml"
- provider="CEA LIST">
- <Priority name="Low"/>
-
- <!-- Specify diagram this palette tools relate to -->
- <editor id="org.eclipse.papyrus.sysml.diagram.blockdefinition"/>
- </paletteDefinition>
-</extension>
-
<!-- Parser provider declaration -->
<extension point="org.eclipse.gmf.runtime.common.ui.services.parserProviders">
<ParserProvider class="org.eclipse.papyrus.sysml.diagram.blockdefinition.provider.ParserProvider">
@@ -1342,4 +769,21 @@
diagramType="BlockDefinition">
</visualTypeProvider>
</extension>
+
+<extension point="org.eclipse.papyrus.infra.gmfdiag.common.paletteDefinition">
+ <paletteDefinition
+ ID="org.eclipse.papyrus.sysml.diagram.blockdefinition.paletteconfiguration"
+ class="org.eclipse.papyrus.infra.gmfdiag.common.service.palette.ExtendedPluginPaletteProvider"
+ name="Papyrus SysML blockdefinition editor Plugin Palette"
+ path="palettes/PapyrusSYSMLBlockDefinitionDiagram.paletteconfiguration"
+ provider="Eclipse Modeling Project">
+ <Priority
+ name="Lowest">
+ </Priority>
+ <!-- Specify diagram this palette tools relate to -->
+ <editor
+ id="org.eclipse.papyrus.sysml.diagram.blockdefinition">
+ </editor>
+ </paletteDefinition>
+</extension>
</plugin>
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/factory/DiagramPaletteFactory.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/factory/DiagramPaletteFactory.java
index 3d2bfe8cbf1..991c6ceeabe 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/factory/DiagramPaletteFactory.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/factory/DiagramPaletteFactory.java
@@ -19,10 +19,10 @@ import java.util.HashMap;
import org.eclipse.gef.Tool;
import org.eclipse.gmf.runtime.diagram.ui.services.palette.PaletteFactory;
import org.eclipse.gmf.runtime.emf.type.core.IElementType;
+import org.eclipse.papyrus.infra.gmfdiag.common.service.palette.AspectUnspecifiedTypeConnectionTool;
+import org.eclipse.papyrus.infra.gmfdiag.common.service.palette.AspectUnspecifiedTypeCreationTool;
import org.eclipse.papyrus.sysml.diagram.blockdefinition.provider.ElementTypes;
import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
-import org.eclipse.papyrus.uml.diagram.common.service.AspectUnspecifiedTypeConnectionTool;
-import org.eclipse.papyrus.uml.diagram.common.service.AspectUnspecifiedTypeCreationTool;
import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
@SuppressWarnings("serial")
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/part/BlockDefinitionDiagramEditor.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/part/BlockDefinitionDiagramEditor.java
index f1e423830a6..1df0636b286 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/part/BlockDefinitionDiagramEditor.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.blockdefinition/src-gen/org/eclipse/papyrus/sysml/diagram/blockdefinition/part/BlockDefinitionDiagramEditor.java
@@ -43,14 +43,14 @@ import org.eclipse.papyrus.commands.util.OperationHistoryDirtyState;
import org.eclipse.papyrus.infra.core.services.ServiceException;
import org.eclipse.papyrus.infra.core.services.ServicesRegistry;
import org.eclipse.papyrus.infra.gmfdiag.common.GmfMultiDiagramDocumentProvider;
+import org.eclipse.papyrus.infra.gmfdiag.common.service.palette.PapyrusPaletteContextMenuProvider;
+import org.eclipse.papyrus.infra.gmfdiag.common.service.palette.PapyrusPaletteService;
+import org.eclipse.papyrus.infra.gmfdiag.common.service.palette.PapyrusPaletteViewer;
import org.eclipse.papyrus.infra.ui.editor.IMultiDiagramEditor;
import org.eclipse.papyrus.sysml.diagram.blockdefinition.Activator;
import org.eclipse.papyrus.sysml.diagram.blockdefinition.utils.FixPortsLocationOnOpening;
import org.eclipse.papyrus.uml.diagram.common.listeners.DropTargetListener;
-import org.eclipse.papyrus.uml.diagram.common.part.PapyrusPaletteContextMenuProvider;
-import org.eclipse.papyrus.uml.diagram.common.part.PapyrusPaletteViewer;
import org.eclipse.papyrus.uml.diagram.common.part.UmlGmfDiagramEditor;
-import org.eclipse.papyrus.uml.diagram.common.service.PapyrusPaletteService;
import org.eclipse.swt.SWT;
import org.eclipse.swt.dnd.TransferData;
import org.eclipse.swt.events.KeyEvent;
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/policy/StructuredClassifierCreationEditPolicy.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/policy/StructuredClassifierCreationEditPolicy.java
index a20355cf839..08a6de67b6d 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/policy/StructuredClassifierCreationEditPolicy.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src-common-uml/org/eclipse/papyrus/uml/diagram/common/edit/policy/StructuredClassifierCreationEditPolicy.java
@@ -41,9 +41,9 @@ import org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalC
import org.eclipse.gmf.runtime.notation.View;
import org.eclipse.papyrus.gmf.diagram.common.commands.CreateViewCommand;
import org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.DefaultCreationEditPolicy;
+import org.eclipse.papyrus.infra.gmfdiag.common.service.palette.AspectUnspecifiedTypeCreationTool;
import org.eclipse.papyrus.infra.gmfdiag.common.snap.NodeSnapHelper;
import org.eclipse.papyrus.uml.diagram.common.locator.PortPositionLocator;
-import org.eclipse.papyrus.uml.diagram.common.service.AspectUnspecifiedTypeCreationTool;
/**
* Replaces the {@link DefaultCreationEditPolicy} in order to manage Affixed Port position on creation or on drop.
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/palettes/PapyrusSysMLInternalBlockDiagram.paletteconfiguration b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/palettes/PapyrusSysMLInternalBlockDiagram.paletteconfiguration
new file mode 100644
index 00000000000..1896bd823bf
--- /dev/null
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/palettes/PapyrusSysMLInternalBlockDiagram.paletteconfiguration
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="ASCII"?>
+<paletteconfiguration:PaletteConfiguration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.2" xmlns:paletteconfiguration="http://www.eclipse.org/papyrus/diagram/paletteconfiguration/0.8" id="org.eclipse.papyrus.sysml.diagram.internalblock.paletteconfiguration" label="org.eclipse.papyrus.sysml.diagram.internalblock Palette" description="This is the palette of PapyrusSysMLInternalBlockDiagram.">
+ <drawerConfigurations id="internalblock.drawer.nodes" label="Nodes">
+ <icon pluginID="org.eclipse.gmf.runtime.diagram.ui" iconPath="/icons/group.gif"/>
+ <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="internalblock_main.tool.port" label="Port" description="Create a new Port">
+ <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Port.gif"/>
+ <elementDescriptors>
+ <elementType xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_Sc-ObFYCEeS0WsAAtVmToA"/>
+ </elementDescriptors>
+ </ownedConfigurations>
+ <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="internalblock_main.tool.flowport_in" label="FlowPort (IN)" description="Create a new FlowPort (IN)">
+ <icon pluginID="org.eclipse.papyrus.sysml" iconPath="/icons/portandflows/FlowPort_IN.gif"/>
+ <elementDescriptors>
+ <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.sysml.service.types/model/sysml.elementtypesconfigurations#_65D4MFYBEeS0WsAAtVmToA"/>
+ </elementDescriptors>
+ </ownedConfigurations>
+ <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="internalblock_main.tool.flowport_out" label="FlowPort (OUT)" description="Create a new FlowPort (OUT)">
+ <icon pluginID="org.eclipse.papyrus.sysml" iconPath="/icons/portandflows/FlowPort_OUT.gif"/>
+ <elementDescriptors>
+ <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.sysml.service.types/model/sysml.elementtypesconfigurations#_65D4NFYBEeS0WsAAtVmToA"/>
+ </elementDescriptors>
+ </ownedConfigurations>
+ <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="internalblock_main.tool.flowport_inout" label="FlowPort (INOUT)" description="Create a new FlowPort (INOUT)">
+ <icon pluginID="org.eclipse.papyrus.sysml" iconPath="/icons/portandflows/FlowPort_INOUT.gif"/>
+ <elementDescriptors>
+ <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.sysml.service.types/model/sysml.elementtypesconfigurations#_65D4LFYBEeS0WsAAtVmToA"/>
+ </elementDescriptors>
+ </ownedConfigurations>
+ <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="internalblock_main.tool.flowport_na" label="FlowPort (Non Atomic)" description="Create a new FlowPort (Non Atomic)">
+ <icon pluginID="org.eclipse.papyrus.sysml" iconPath="/icons/portandflows/FlowPort_NA.gif"/>
+ <elementDescriptors>
+ <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.sysml.service.types/model/sysml.elementtypesconfigurations#_65EfMVYBEeS0WsAAtVmToA"/>
+ </elementDescriptors>
+ </ownedConfigurations>
+ <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="internalblock_main.tool.property" label="Property" description="Create a new Property">
+ <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Property.gif"/>
+ <elementDescriptors>
+ <elementType xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_Sc-1cFYCEeS0WsAAtVmToA"/>
+ </elementDescriptors>
+ </ownedConfigurations>
+ <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="internalblock_main.tool.part" label="Part" description="Create a new Part">
+ <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Property.gif"/>
+ <elementDescriptors>
+ <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.sysml.service.types/model/sysml.elementtypesconfigurations#_65EfQVYBEeS0WsAAtVmToA"/>
+ </elementDescriptors>
+ </ownedConfigurations>
+ <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="internalblock_main.tool.reference" label="Reference" description="Create a new Reference">
+ <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Property.gif"/>
+ <elementDescriptors>
+ <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.sysml.service.types/model/sysml.elementtypesconfigurations#_65FGRlYBEeS0WsAAtVmToA"/>
+ </elementDescriptors>
+ </ownedConfigurations>
+ <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="internalblock_main.tool.actorpart" label="ActorPart" description="Create a new ActorPart">
+ <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Property.gif"/>
+ <elementDescriptors>
+ <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.sysml.service.types/model/sysml.elementtypesconfigurations#_64-_oFYBEeS0WsAAtVmToA"/>
+ </elementDescriptors>
+ </ownedConfigurations>
+ <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="internalblock_main.tool.value" label="Value" description="Create a new Value">
+ <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Property.gif"/>
+ <elementDescriptors>
+ <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.sysml.service.types/model/sysml.elementtypesconfigurations#_65FtVFYBEeS0WsAAtVmToA"/>
+ </elementDescriptors>
+ </ownedConfigurations>
+ <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="internalblock_main.tool.comment" label="Comment" description="Create a new Comment">
+ <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Comment.gif"/>
+ <elementDescriptors>
+ <elementType xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_Scbb2FYCEeS0WsAAtVmToA"/>
+ </elementDescriptors>
+ </ownedConfigurations>
+ <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="internalblock_main.tool.constraint" label="Constraint" description="Create a new Constraint">
+ <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Constraint.gif"/>
+ <elementDescriptors>
+ <elementType xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_SccC-1YCEeS0WsAAtVmToA"/>
+ </elementDescriptors>
+ </ownedConfigurations>
+ </drawerConfigurations>
+ <drawerConfigurations id="internalblock.drawer.edges" label="Edges">
+ <icon pluginID="org.eclipse.gmf.runtime.diagram.ui" iconPath="/icons/group.gif"/>
+ <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="internalblock_main.tool.connector" label="Connector" description="Create a new Connector" kind="ConnectionTool">
+ <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Connector.gif"/>
+ <elementDescriptors>
+ <elementType xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_SccC9VYCEeS0WsAAtVmToA"/>
+ </elementDescriptors>
+ </ownedConfigurations>
+ <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="internalblock_main.tool.dependency" label="Dependency" description="Create a new Dependency" kind="ConnectionTool">
+ <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Dependency.gif"/>
+ <elementDescriptors>
+ <elementType xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_SccqG1YCEeS0WsAAtVmToA"/>
+ </elementDescriptors>
+ </ownedConfigurations>
+ <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="internalblock_main.tool.comment_constraint_link" label="Comment / Constraint link" description="Create a new Comment / Constraint link" kind="ConnectionTool">
+ <icon pluginID="org.eclipse.papyrus.sysml.diagram.blockdefinition" iconPath="/icons/obj16/Link.gif"/>
+ <elementDescriptors>
+ <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#_eu4bt9x0EeWVxMf7SXAfhg"/>
+ </elementDescriptors>
+ <elementDescriptors>
+ <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#_eu4cA9x0EeWVxMf7SXAfhg"/>
+ </elementDescriptors>
+ </ownedConfigurations>
+ </drawerConfigurations>
+</paletteconfiguration:PaletteConfiguration>
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/plugin.xml b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/plugin.xml
index 025d0da3831..1ce2200cd9b 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/plugin.xml
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/plugin.xml
@@ -12,116 +12,6 @@
<command id="org.eclipse.papyrus.sysml.diagram.internalblock.CreateCommand" name="Create a new Internal Block Diagram" description="Create a new Internal Block Diagram" categoryId="org.eclipse.papyrus.editor.category"></command>
</extension>
-
-
-<!-- Diagram creation command registration in menu and toolbar -->
-
-<!-- Palette tool definition (defines tools possibly used by the palette(s)) -->
-<extension point="org.eclipse.gmf.runtime.diagram.ui.paletteProviders" name="SYSML_InternalBlock_Predefined_Entries" id="org.eclipse.papyrus.sysml.diagram.blockdefinition.palettedefinition">
-
- <paletteProvider class="org.eclipse.gmf.runtime.diagram.ui.providers.DefaultPaletteProvider">
- <Priority name="Lowest"></Priority> <!-- Lower priority than Palette tool declaration -->
-
- <!-- SysML Internal Block Diagram specific tool definition -->
- <contribution factoryClass="org.eclipse.papyrus.sysml.diagram.internalblock.factory.DiagramPaletteFactory">
-
- <!-- internalblock.tool.block -->
- <entry defineOnly="true" description="Create a Block" id="internalblock.tool.block" kind="tool" label="Block" large_icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/blocks/Block.gif" small_icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/blocks/Block.gif">
- </entry>
-
- <!-- internalblock.tool.blockpropertycomposite -->
- <entry defineOnly="true" description="Create a BlockPropertyComposite" id="internalblock.tool.blockpropertycomposite" kind="tool" label="BlockPropertyComposite" large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif" small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif">
- </entry>
-
- <!-- internalblock.tool.flowport -->
- <entry defineOnly="true" description="Create a FlowPort" id="internalblock.tool.flowport" kind="tool" label="FlowPort" large_icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/portandflows/FlowPort.gif" small_icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/portandflows/FlowPort.gif">
- </entry>
-
- <!-- internalblock.tool.port -->
- <entry defineOnly="true" description="Create a Port" id="internalblock.tool.port" kind="tool" label="Port" large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Port.gif" small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Port.gif">
- </entry>
- <!-- Start of user code Custom node button entry -->
-
- <!-- internalblock.tool.property -->
- <entry defineOnly="true" description="Create a Property" id="internalblock.tool.property" kind="tool" label="Property" large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif" small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif">
- </entry>
-
- <!-- internalblock.tool.part -->
- <entry defineOnly="true" description="Create a Part" id="internalblock.tool.part" kind="tool" label="Part" large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif" small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif">
- </entry>
-
- <!-- internalblock.tool.reference -->
- <entry defineOnly="true" description="Create a Reference" id="internalblock.tool.reference" kind="tool" label="Reference" large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif" small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif">
- </entry>
-
- <!-- internalblock.tool.actorpart -->
- <entry defineOnly="true" description="Create an ActorPart" id="internalblock.tool.actorpart" kind="tool" label="ActorPart" large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif" small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif">
- </entry>
-
- <!-- internalblock.tool.value -->
- <entry defineOnly="true" description="Create a Value" id="internalblock.tool.value" kind="tool" label="Value" large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif" small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif">
- </entry>
-
- <!-- internalblock.tool.flowport (IN) -->
- <entry defineOnly="true" description="Create a FlowPort (IN)" id="internalblock.tool.flowport_in" kind="tool" label="FlowPort" large_icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/portandflows/FlowPort_IN.gif" small_icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/portandflows/FlowPort_IN.gif">
- </entry>
-
- <!-- internalblock.tool.flowport (OUT) -->
- <entry defineOnly="true" description="Create a FlowPort (OUT)" id="internalblock.tool.flowport_out" kind="tool" label="FlowPort" large_icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/portandflows/FlowPort_OUT.gif" small_icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/portandflows/FlowPort_OUT.gif">
- </entry>
-
- <!-- internalblock.tool.flowport (INOUT) -->
- <entry defineOnly="true" description="Create a FlowPort (INOUT)" id="internalblock.tool.flowport_inout" kind="tool" label="FlowPort" large_icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/portandflows/FlowPort_INOUT.gif" small_icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/portandflows/FlowPort_INOUT.gif">
- </entry>
-
- <!-- internalblock.tool.flowport -->
- <entry defineOnly="true" description="Create a FlowPort (non atomic)" id="internalblock.tool.flowport_na" kind="tool" label="FlowPort (non atomic)" large_icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/portandflows/FlowPort_NA.gif" small_icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/portandflows/FlowPort_NA.gif">
- </entry>
-
- <!-- internalblock.tool.comment -->
- <entry defineOnly="true" description="Create a Comment" id="internalblock.tool.comment" kind="tool" label="Comment" large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Comment.gif" small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Comment.gif">
- </entry>
-
- <!-- internalblock.tool.constraint -->
- <entry defineOnly="true" description="Create a Constraint" id="internalblock.tool.constraint" kind="tool" label="Constraint" large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Constraint.gif" small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Constraint.gif">
- </entry>
-
- <!-- End of user code -->
-
-
- <!-- internalblock.tool.connector -->
- <entry defineOnly="true" description="Create a Connector" id="internalblock.tool.connector" kind="tool" label="Connector" large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Connector.gif" small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Connector.gif">
- </entry>
-
- <!-- internalblock.tool.dependency -->
- <entry defineOnly="true" description="Create a Dependency" id="internalblock.tool.dependency" kind="tool" label="Dependency" large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Dependency.gif" small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Dependency.gif">
- </entry>
- <!-- Start of user code Custom edge button entry -->
-
- <!-- internalblock.tool.comment_constraint_link -->
- <entry defineOnly="true" description="Create a Comment / Constraint link" id="internalblock.tool.comment_constraint_link" kind="tool" label="Comment / Constraint link" large_icon="icons/obj16/Link.gif" small_icon="icons/obj16/Link.gif">
- </entry>
-
- <!-- End of user code -->
-
- </contribution>
-
- <!-- Specify diagram this palette tools relate to -->
- <editor id="org.eclipse.papyrus.sysml.diagram.internalblock"></editor>
-
- </paletteProvider>
-</extension>
-
-<!-- Palette tool declaration (declares the real palette containment) -->
-<extension point="org.eclipse.papyrus.uml.diagram.common.paletteDefinition" name="SYSML_InternalBlock">
-
- <paletteDefinition ID="SYSML_InternalBlock" class="org.eclipse.papyrus.uml.diagram.common.service.PluginPaletteProvider" name="SYSML_InternalBlock" icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif" path="palettes/internalblock.palette.xml" provider="CEA LIST">
- <Priority name="Low"></Priority>
-
- <!-- Specify diagram this palette tools relate to -->
- <editor id="org.eclipse.papyrus.sysml.diagram.internalblock"></editor>
- </paletteDefinition>
-</extension>
<!-- Diagram view providers declaration -->
<extension point="org.eclipse.gmf.runtime.diagram.core.viewProviders">
@@ -554,4 +444,20 @@
</visualTypeProvider>
</extension>
+<extension point="org.eclipse.papyrus.infra.gmfdiag.common.paletteDefinition">
+ <paletteDefinition
+ ID="org.eclipse.papyrus.sysml.diagram.internalblock.paletteconfiguration"
+ class="org.eclipse.papyrus.infra.gmfdiag.common.service.palette.ExtendedPluginPaletteProvider"
+ name="Papyrus SysML internalblock editor Plugin Palette"
+ path="palettes/PapyrusSysMLInternalBlockDiagram.paletteconfiguration"
+ provider="Eclipse Modeling Project">
+ <Priority
+ name="Lowest">
+ </Priority>
+ <!-- Specify diagram this palette tools relate to -->
+ <editor
+ id="org.eclipse.papyrus.sysml.diagram.internalblock">
+ </editor>
+ </paletteDefinition>
+</extension>
</plugin>
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/factory/DiagramPaletteFactory.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/factory/DiagramPaletteFactory.java
index baa79966e65..bc27f1d84a3 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/factory/DiagramPaletteFactory.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/factory/DiagramPaletteFactory.java
@@ -19,10 +19,10 @@ import java.util.HashMap;
import org.eclipse.gef.Tool;
import org.eclipse.gmf.runtime.diagram.ui.services.palette.PaletteFactory;
import org.eclipse.gmf.runtime.emf.type.core.IElementType;
+import org.eclipse.papyrus.infra.gmfdiag.common.service.palette.AspectUnspecifiedTypeConnectionTool;
+import org.eclipse.papyrus.infra.gmfdiag.common.service.palette.AspectUnspecifiedTypeCreationTool;
import org.eclipse.papyrus.sysml.diagram.internalblock.provider.ElementTypes;
import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
-import org.eclipse.papyrus.uml.diagram.common.service.AspectUnspecifiedTypeConnectionTool;
-import org.eclipse.papyrus.uml.diagram.common.service.AspectUnspecifiedTypeCreationTool;
import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
@SuppressWarnings("serial")
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/part/InternalBlockDiagramEditor.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/part/InternalBlockDiagramEditor.java
index e497248cd40..5ed04b12383 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/part/InternalBlockDiagramEditor.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.internalblock/src-gen/org/eclipse/papyrus/sysml/diagram/internalblock/part/InternalBlockDiagramEditor.java
@@ -44,15 +44,15 @@ import org.eclipse.papyrus.gmf.diagram.common.compatibility.IDiagramVersionUpdat
import org.eclipse.papyrus.infra.core.services.ServiceException;
import org.eclipse.papyrus.infra.core.services.ServicesRegistry;
import org.eclipse.papyrus.infra.gmfdiag.common.GmfMultiDiagramDocumentProvider;
+import org.eclipse.papyrus.infra.gmfdiag.common.service.palette.PapyrusPaletteContextMenuProvider;
+import org.eclipse.papyrus.infra.gmfdiag.common.service.palette.PapyrusPaletteService;
+import org.eclipse.papyrus.infra.gmfdiag.common.service.palette.PapyrusPaletteViewer;
import org.eclipse.papyrus.infra.ui.editor.IMultiDiagramEditor;
import org.eclipse.papyrus.sysml.diagram.internalblock.Activator;
import org.eclipse.papyrus.sysml.diagram.internalblock.compatibility.DiagramVersionUpdater;
import org.eclipse.papyrus.sysml.diagram.internalblock.factory.InternalBlockDiagramViewFactory;
import org.eclipse.papyrus.uml.diagram.common.listeners.DropTargetListener;
-import org.eclipse.papyrus.uml.diagram.common.part.PapyrusPaletteContextMenuProvider;
-import org.eclipse.papyrus.uml.diagram.common.part.PapyrusPaletteViewer;
import org.eclipse.papyrus.uml.diagram.common.part.UmlGmfDiagramEditor;
-import org.eclipse.papyrus.uml.diagram.common.service.PapyrusPaletteService;
import org.eclipse.swt.SWT;
import org.eclipse.swt.dnd.TransferData;
import org.eclipse.swt.events.KeyEvent;
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/palettes/PapyrusSYSMLParametricDiagram.paletteconfiguration b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/palettes/PapyrusSYSMLParametricDiagram.paletteconfiguration
new file mode 100644
index 00000000000..41c44e7d9b3
--- /dev/null
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/palettes/PapyrusSYSMLParametricDiagram.paletteconfiguration
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="ASCII"?>
+<paletteconfiguration:PaletteConfiguration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.2" xmlns:paletteconfiguration="http://www.eclipse.org/papyrus/diagram/paletteconfiguration/0.8" id="org.eclipse.papyrus.sysml.diagram.parametric.paletteconfiguration" label="org.eclipse.papyrus.sysml.diagram.parametric Palette" description="This is the palette of PapyrusSysMLParametricDiagram">
+ <drawerConfigurations id="parametric.drawer.nodes" label="Nodes">
+ <icon pluginID="org.eclipse.gmf.runtime.diagram.ui" iconPath="/icons/group.gif"/>
+ <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="parametric.tool.constraintblockpropertycomposite" label="ConstraintProperty" description="Create a new ConstraintProperty">
+ <icon pluginID="org.eclipse.papyrus.sysml" iconPath="/icons/blocks/Block.gif"/>
+ <elementDescriptors>
+ <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.sysml.service.types/model/sysml.elementtypesconfigurations#_65DRHlYBEeS0WsAAtVmToA"/>
+ </elementDescriptors>
+ </ownedConfigurations>
+ <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="parametric.tool.parameter" label="ConstraintParameter" description="Create a new ConstraintParameter">
+ <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Port.gif"/>
+ <elementDescriptors>
+ <elementType xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_Sc-1cFYCEeS0WsAAtVmToA"/>
+ </elementDescriptors>
+ </ownedConfigurations>
+ <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="parametric.tool.blockpropertycomposite" label="Part" description="Create a new Part">
+ <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Property.gif"/>
+ <elementDescriptors>
+ <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.sysml.service.types/model/sysml.elementtypesconfigurations#_65EfQVYBEeS0WsAAtVmToA"/>
+ </elementDescriptors>
+ </ownedConfigurations>
+ <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="parametric.tool.reference" label="Reference" description="Create a new Reference">
+ <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Property.gif"/>
+ <elementDescriptors>
+ <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.sysml.service.types/model/sysml.elementtypesconfigurations#_65FGRlYBEeS0WsAAtVmToA"/>
+ </elementDescriptors>
+ </ownedConfigurations>
+ <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="parametric.tool.value" label="Value" description="Create a new Value">
+ <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Property.gif"/>
+ <elementDescriptors>
+ <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.sysml.service.types/model/sysml.elementtypesconfigurations#_65FtVFYBEeS0WsAAtVmToA"/>
+ </elementDescriptors>
+ </ownedConfigurations>
+ </drawerConfigurations>
+ <drawerConfigurations id="parametric.drawer.edges" label="Edges">
+ <icon pluginID="org.eclipse.gmf.runtime.diagram.ui" iconPath="/icons/group.gif"/>
+ <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="parametric.tool.connector" label="BindingConnector" description="Create a new BindingConnector" kind="ConnectionTool">
+ <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Connector.gif"/>
+ <elementDescriptors>
+ <elementType xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_SccC9VYCEeS0WsAAtVmToA"/>
+ </elementDescriptors>
+ </ownedConfigurations>
+ </drawerConfigurations>
+ <drawerConfigurations id="parametric.drawer.others" label="Others">
+ <icon pluginID="org.eclipse.gmf.runtime.diagram.ui" iconPath="/icons/group.gif"/>
+ <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="parametric.tool.dependency" label="Dependency" description="Create a new Dependency" kind="ConnectionTool">
+ <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Dependency.gif"/>
+ <elementDescriptors>
+ <elementType xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_SccqG1YCEeS0WsAAtVmToA"/>
+ </elementDescriptors>
+ </ownedConfigurations>
+ <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="parametric.tool.comment" label="Comment" description="Create a new Comment">
+ <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16//Comment.gif"/>
+ <elementDescriptors>
+ <elementType xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_Scbb2FYCEeS0WsAAtVmToA"/>
+ </elementDescriptors>
+ </ownedConfigurations>
+ <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="parametric.tool.constraint" label="Constraint" description="Create a new Constraint">
+ <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Constraint.gif"/>
+ <elementDescriptors>
+ <elementType xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_SccC-1YCEeS0WsAAtVmToA"/>
+ </elementDescriptors>
+ </ownedConfigurations>
+ <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="parametric.tool.commentannotatedelement" label="CommentAnnotatedElement" description="Create a new CommentAnnotatedElement" kind="ConnectionTool">
+ <icon pluginID="org.eclipse.papyrus.sysml.diagram.blockdefinition" iconPath="/icons/obj16/Link.gif"/>
+ <elementDescriptors>
+ <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#_eu4bt9x0EeWVxMf7SXAfhg"/>
+ </elementDescriptors>
+ </ownedConfigurations>
+ <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="parametric.tool.context_link" label="ContextLink" description="Create a new ContextLink" kind="ConnectionTool">
+ <icon pluginID="org.eclipse.papyrus.sysml.diagram.blockdefinition" iconPath="/icons/obj16/Link.gif"/>
+ <elementDescriptors>
+ <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#_eu4cBdx0EeWVxMf7SXAfhg"/>
+ </elementDescriptors>
+ </ownedConfigurations>
+ </drawerConfigurations>
+</paletteconfiguration:PaletteConfiguration>
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/plugin.xml b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/plugin.xml
index 60063823af8..44487bcb7a8 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/plugin.xml
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/plugin.xml
@@ -183,169 +183,6 @@
</handler>
</extension>
-<!-- Palette tool definition (defines tools possibly used by the palette(s)) -->
-<extension point="org.eclipse.gmf.runtime.diagram.ui.paletteProviders"
- name="SYSML_Parametric_Predefined_Entries"
- id="org.eclipse.papyrus.sysml.diagram.blockdefinition.palettedefinition">
-
- <paletteProvider class="org.eclipse.gmf.runtime.diagram.ui.providers.DefaultPaletteProvider">
- <Priority name="Lowest"/> <!-- Lower priority than Palette tool declaration -->
-
- <!-- SysML Parametric Diagram specific tool definition -->
- <contribution
- factoryClass="org.eclipse.papyrus.sysml.diagram.parametric.factory.DiagramPaletteFactory">
-
- <!-- parametric.tool.constraintblockpropertycomposite -->
- <entry
- defineOnly="true"
- description="Create a ConstraintBlockProperty"
- id="parametric.tool.constraintblockpropertycomposite"
- kind="tool"
- label="ConstraintProperty"
- large_icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/blocks/Block.gif"
- small_icon="platform:/plugin/org.eclipse.papyrus.sysml/icons/blocks/Block.gif">
- </entry>
-
- <!-- parametric.tool.parameter -->
- <entry
- defineOnly="true"
- description="Create a Parameter"
- id="parametric.tool.parameter"
- kind="tool"
- label="ConstraintParameter"
- large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Port.gif"
- small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Port.gif">
- </entry>
-
- <!-- parametric.tool.blockpropertycomposite -->
- <entry
- defineOnly="true"
- description="Create a Part"
- id="parametric.tool.blockpropertycomposite"
- kind="tool"
- label="Part"
- large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif"
- small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif">
- </entry>
-
- <!-- parametric.tool.reference -->
- <entry
- defineOnly="true"
- description="Create a Reference"
- id="parametric.tool.reference"
- kind="tool"
- label="Reference"
- large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif"
- small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif">
- </entry>
-
- <!-- parametric.tool.value -->
- <entry
- defineOnly="true"
- description="Create a Value"
- id="parametric.tool.value"
- kind="tool"
- label="Value"
- large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif"
- small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Property.gif">
- </entry>
-
- <!-- Start of user code Custom node button entry
- -->
-
- <!-- End of user code -->
-
-
- <!-- parametric.tool.connector -->
- <entry
- defineOnly="true"
- description="Create a Connector"
- id="parametric.tool.connector"
- kind="tool"
- label="Connector"
- large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Connector.gif"
- small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Connector.gif">
- </entry>
-
- <!-- parametric.tool.dependency -->
- <entry
- defineOnly="true"
- description="Create a Dependency"
- id="parametric.tool.dependency"
- kind="tool"
- label="Dependency"
- large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Dependency.gif"
- small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Dependency.gif">
- </entry>
- <!-- Start of user code Custom edge button entry -->
- <!-- parametric.tool.comment -->
- <entry
- defineOnly="true"
- description="Create a Comment"
- id="parametric.tool.comment"
- kind="tool"
- label="Comment"
- large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Comment.gif"
- small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Comment.gif">
- </entry>
-
- <!-- parametric.tool.constraint -->
- <entry defineOnly="true"
- description="Create a Constraint"
- id="parametric.tool.constraint"
- kind="tool"
- label="Constraint"
- large_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Constraint.gif"
- small_icon="platform:/plugin/org.eclipse.uml2.uml.edit/icons/full/obj16/Constraint.gif">
- </entry>
-
- <entry
- defineOnly="true"
- description="CommentAnnotatedElement"
- id="parametric.tool.comment_constraint_link"
- kind="tool"
- label="CommentAnnotatedElement"
- large_icon="icons/obj16/Link.gif"
- small_icon="icons/obj16/Link.gif">
- </entry>
-
- <entry
- defineOnly="true"
- description="Create a ContextLink"
- id="parametric.tool.context_link"
- kind="tool"
- label="Constraint link"
- large_icon="icons/obj16/Link.gif"
- small_icon="icons/obj16/Link.gif">
- </entry>
-
- <!-- End of user code -->
-
- </contribution>
-
- <!-- Specify diagram this palette tools relate to -->
- <editor id="org.eclipse.papyrus.sysml.diagram.parametric"/>
-
- </paletteProvider>
-</extension>
-
-<!-- Palette tool declaration (declares the real palette containment) -->
-<extension point="org.eclipse.papyrus.uml.diagram.common.paletteDefinition"
- name="SYSML_Parametric">
-
- <paletteDefinition ID="SYSML_Parametric"
- class="org.eclipse.papyrus.uml.diagram.common.service.PluginPaletteProvider"
- name="SYSML_Parametric" icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif"
- path="palettes/parametric.palette.xml"
- provider="CEA LIST">
- <Priority name="Low"/>
-
- <!-- Specify diagram this palette tools relate to -->
- <editor id="org.eclipse.papyrus.sysml.diagram.parametric"/>
- </paletteDefinition>
-</extension>
-
-
<!-- Diagram view providers declaration -->
<extension point="org.eclipse.gmf.runtime.diagram.core.viewProviders">
<!-- Diagram view provider -->
@@ -705,4 +542,20 @@
target="1.3.0">
</diagramReconciler>
</extension>
+<extension point="org.eclipse.papyrus.infra.gmfdiag.common.paletteDefinition">
+ <paletteDefinition
+ ID="org.eclipse.papyrus.sysml.diagram.parametric.paletteconfiguration"
+ class="org.eclipse.papyrus.infra.gmfdiag.common.service.palette.ExtendedPluginPaletteProvider"
+ name="Papyrus SysML parametric editor Plugin Palette"
+ path="palettes/PapyrusSYSMLParametricDiagram.paletteconfiguration"
+ provider="Eclipse Modeling Project">
+ <Priority
+ name="Lowest">
+ </Priority>
+ <!-- Specify diagram this palette tools relate to -->
+ <editor
+ id="org.eclipse.papyrus.sysml.diagram.parametric">
+ </editor>
+ </paletteDefinition>
+</extension>
</plugin>
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/factory/DiagramPaletteFactory.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/factory/DiagramPaletteFactory.java
index 9394e8c22ac..a5028a8a321 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/factory/DiagramPaletteFactory.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.parametric/src-gen/org/eclipse/papyrus/sysml/diagram/parametric/factory/DiagramPaletteFactory.java
@@ -19,10 +19,10 @@ import java.util.HashMap;
import org.eclipse.gef.Tool;
import org.eclipse.gmf.runtime.diagram.ui.services.palette.PaletteFactory;
import org.eclipse.gmf.runtime.emf.type.core.IElementType;
+import org.eclipse.papyrus.infra.gmfdiag.common.service.palette.AspectUnspecifiedTypeConnectionTool;
+import org.eclipse.papyrus.infra.gmfdiag.common.service.palette.AspectUnspecifiedTypeCreationTool;
import org.eclipse.papyrus.sysml.diagram.parametric.provider.ElementTypes;
import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
-import org.eclipse.papyrus.uml.diagram.common.service.AspectUnspecifiedTypeConnectionTool;
-import org.eclipse.papyrus.uml.diagram.common.service.AspectUnspecifiedTypeCreationTool;
import org.eclipse.papyrus.uml.service.types.element.UMLElementTypes;
@SuppressWarnings("serial")
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/META-INF/MANIFEST.MF b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/META-INF/MANIFEST.MF
index 82b32409899..78b3db28eff 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/META-INF/MANIFEST.MF
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/META-INF/MANIFEST.MF
@@ -15,7 +15,8 @@ Require-Bundle: org.eclipse.papyrus.uml.diagram.common;bundle-version="[3.0.0,4.
org.eclipse.papyrus.sysml.diagram.common;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
org.eclipse.papyrus.uml.appearance;bundle-version="[2.0.0,3.0.0)",
org.eclipse.papyrus.infra.internationalization.utils;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.papyrus.uml.internationalization.utils;bundle-version="[1.0.0,2.0.0)"
+ org.eclipse.papyrus.uml.internationalization.utils;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.papyrus.sysml.service.types;bundle-version="[2.0.0,3.0.0)"
Bundle-Vendor: %providerName
Bundle-ActivationPolicy: lazy
Bundle-Version: 3.0.0.qualifier
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/palettes/PapyrusSYSMLRequirementDiagram.paletteconfiguration b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/palettes/PapyrusSYSMLRequirementDiagram.paletteconfiguration
new file mode 100644
index 00000000000..b21fced9612
--- /dev/null
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/palettes/PapyrusSYSMLRequirementDiagram.paletteconfiguration
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<paletteconfiguration:PaletteConfiguration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:elementtypesconfigurations="http://www.eclipse.org/papyrus/infra/elementtypesconfigurations/1.2" xmlns:paletteconfiguration="http://www.eclipse.org/papyrus/diagram/paletteconfiguration/0.8" id="org.eclipse.papyrus.sysml.diagram.requirement.paletteconfiguration" label="org.eclipse.papyrus.sysml.diagram.requirement Palette">
+ <drawerConfigurations id="requirement.drawer.nodes" label="Nodes">
+ <icon pluginID="org.eclipse.gmf.runtime.diagram.ui" iconPath="/icons/group.gif"/>
+ <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="requirement.tool.package" label="Package" description="Create a new Package">
+ <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Package.gif"/>
+ <elementDescriptors>
+ <elementType xsi:type="elementtypesconfigurations:MetamodelTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/uml.elementtypesconfigurations#_Sc9nZVYCEeS0WsAAtVmToA"/>
+ </elementDescriptors>
+ <elementDescriptors>
+ <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#_eu6Qd9x0EeWVxMf7SXAfhg"/>
+ </elementDescriptors>
+ <elementDescriptors>
+ <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#_eu6Qddx0EeWVxMf7SXAfhg"/>
+ </elementDescriptors>
+ </ownedConfigurations>
+ <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="requirement.tool.class" label="Requirement" description="Create a new Requirement">
+ <icon pluginID="org.eclipse.papyrus.sysml" iconPath="/icons/requirements/Requirement.gif"/>
+ <elementDescriptors>
+ <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.sysml.service.types/model/sysml.elementtypesconfigurations#_65FGSlYBEeS0WsAAtVmToA"/>
+ </elementDescriptors>
+ </ownedConfigurations>
+ <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="requirement.tool.problem" label="Problem" description="Create a new Problem">
+ <icon pluginID="org.eclipse.papyrus.sysml" iconPath="/icons/modelelements/Problem.gif"/>
+ <elementDescriptors>
+ <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.sysml.service.types/model/sysml.elementtypesconfigurations#_65EfRVYBEeS0WsAAtVmToA"/>
+ </elementDescriptors>
+ </ownedConfigurations>
+ <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="requirement.tool.rational" label="Rationale" description="Create a new Rationale">
+ <icon pluginID="org.eclipse.papyrus.sysml" iconPath="/icons/modelelements/Rationale.gif"/>
+ <elementDescriptors>
+ <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.sysml.service.types/model/sysml.elementtypesconfigurations#_65FGQlYBEeS0WsAAtVmToA"/>
+ </elementDescriptors>
+ </ownedConfigurations>
+ <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="requirement.tool.comment" label="Comment" description="Create a new Comment">
+ <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Comment.gif"/>
+ <elementDescriptors>
+ <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#_eu4bu9x0EeWVxMf7SXAfhg"/>
+ </elementDescriptors>
+ <elementDescriptors>
+ <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#_eu4budx0EeWVxMf7SXAfhg"/>
+ </elementDescriptors>
+ </ownedConfigurations>
+ <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="requirement.tool.constraint" label="Constraint" description="Create a new Constraint">
+ <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Constraint.gif"/>
+ <elementDescriptors>
+ <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#_eu4cDdx0EeWVxMf7SXAfhg"/>
+ </elementDescriptors>
+ <elementDescriptors>
+ <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#_eu4cC9x0EeWVxMf7SXAfhg"/>
+ </elementDescriptors>
+ </ownedConfigurations>
+ </drawerConfigurations>
+ <drawerConfigurations id="requirement.drawer.edges" label="Edges">
+ <icon pluginID="org.eclipse.gmf.runtime.diagram.ui" iconPath="/icons/group.gif"/>
+ <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="requirement.tool.copy" label="Copy" description="Create a Copy Link" kind="ConnectionTool">
+ <icon pluginID="org.eclipse.papyrus.sysml" iconPath="/icons/requirements/Copy.gif"/>
+ <elementDescriptors>
+ <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.sysml.service.types/model/sysml.elementtypesconfigurations#_65DRIlYBEeS0WsAAtVmToA"/>
+ </elementDescriptors>
+ </ownedConfigurations>
+ <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="requirement.tool.dependency" label="Dependency" description="Create a new Dependency" kind="ConnectionTool">
+ <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Dependency.gif"/>
+ <elementDescriptors>
+ <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#_eu4cO9x0EeWVxMf7SXAfhg"/>
+ </elementDescriptors>
+ </ownedConfigurations>
+ <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="requirement.tool.derive" label="Derive" description="Create a Derive Link" kind="ConnectionTool">
+ <icon pluginID="org.eclipse.papyrus.sysml" iconPath="/icons/requirements/DeriveReqt.gif"/>
+ <elementDescriptors>
+ <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.sysml.service.types/model/sysml.elementtypesconfigurations#_65D4IFYBEeS0WsAAtVmToA"/>
+ </elementDescriptors>
+ </ownedConfigurations>
+ <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="requirement.tool.decompose" label="Decompose" description="Create a Decompose Link" kind="ConnectionTool">
+ <icon pluginID="org.eclipse.papyrus.uml.diagram.clazz" iconPath="/icons/obj16/ContainmentConnection.gif"/>
+ <elementDescriptors>
+ <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#_eu5COtx0EeWVxMf7SXAfhg"/>
+ </elementDescriptors>
+ </ownedConfigurations>
+ <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="requirement.tool.packageimport" label="PackageImport" description="Create a new PackageImport" kind="ConnectionTool">
+ <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/PackageImport.gif"/>
+ <elementDescriptors>
+ <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#_eu6QW9x0EeWVxMf7SXAfhg"/>
+ </elementDescriptors>
+ </ownedConfigurations>
+ <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="requirement.tool.realization" label="Realization" description="Create a new Realization" kind="ConnectionTool">
+ <icon pluginID="org.eclipse.uml2.uml.edit" iconPath="/icons/full/obj16/Realization.gif"/>
+ <elementDescriptors>
+ <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#_eu6RHtx0EeWVxMf7SXAfhg"/>
+ </elementDescriptors>
+ </ownedConfigurations>
+ <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="requirement.tool.satisfy" label="Satisfy" description="Create a Satisfy Link" kind="ConnectionTool">
+ <icon pluginID="org.eclipse.papyrus.sysml" iconPath="/icons/requirements/Satisfy.gif"/>
+ <elementDescriptors>
+ <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.sysml.service.types/model/sysml.elementtypesconfigurations#_65FGTlYBEeS0WsAAtVmToA"/>
+ </elementDescriptors>
+ </ownedConfigurations>
+ <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="requirement.tool.verify" label="Verify" description="Create a Verify Link" kind="ConnectionTool">
+ <icon pluginID="org.eclipse.papyrus.sysml" iconPath="/icons/requirements/Verify.gif"/>
+ <elementDescriptors>
+ <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.sysml.service.types/model/sysml.elementtypesconfigurations#_65GUYFYBEeS0WsAAtVmToA"/>
+ </elementDescriptors>
+ </ownedConfigurations>
+ <ownedConfigurations xsi:type="paletteconfiguration:ToolConfiguration" id="package.tool.link" label="Link" description="Create a new Link" kind="ConnectionTool">
+ <icon pluginID="org.eclipse.papyrus.uml.diagram.clazz" iconPath="/icons/obj16/Link.gif"/>
+ <elementDescriptors>
+ <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#_eu4bt9x0EeWVxMf7SXAfhg"/>
+ </elementDescriptors>
+ <elementDescriptors>
+ <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#_eu63c9x0EeWVxMf7SXAfhg"/>
+ </elementDescriptors>
+ <elementDescriptors>
+ <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#_eu5CLtx0EeWVxMf7SXAfhg"/>
+ </elementDescriptors>
+ <elementDescriptors>
+ <elementType xsi:type="elementtypesconfigurations:SpecializationTypeConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.service.types/model/umldi.elementtypesconfigurations#_eu4cA9x0EeWVxMf7SXAfhg"/>
+ </elementDescriptors>
+ </ownedConfigurations>
+ </drawerConfigurations>
+</paletteconfiguration:PaletteConfiguration>
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/plugin.xml b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/plugin.xml
index 4b720d17968..a1f7f3a7ffa 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/plugin.xml
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/plugin.xml
@@ -25,40 +25,6 @@
categoryId="org.eclipse.papyrus.editor.category"/>
</extension>
-
-<!-- Diagram creation command registration in menu and toolbar -->
-
-<!-- Palette tool declaration (declares the real palette containment) -->
-<extension point="org.eclipse.papyrus.uml.diagram.common.paletteDefinition"
- name="SYSML_Requirement">
-
- <paletteDefinition ID="SYSML_Requirement"
- class="org.eclipse.papyrus.uml.diagram.common.service.PluginPaletteProvider"
- name="SYSML_Requirement" icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif"
- path="palettes/requirement.palette.xml"
- provider="CEA LIST">
- <Priority name="Low"/>
-
- <!-- Specify diagram this palette tools relate to -->
- <editor id="org.eclipse.papyrus.sysml.diagram.requirement"/>
- </paletteDefinition>
-</extension>
-
-<extension point="org.eclipse.papyrus.uml.diagram.common.paletteDefinition"
- name="SYSML_Requirement_Addition">
-
- <paletteDefinition ID="SYSML_Requirement_Addition"
- class="org.eclipse.papyrus.uml.diagram.common.service.PluginPaletteProvider"
- name="Addition" icon="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif"
- path="palettes/Addition.palette.xml"
- provider="CEA LIST">
- <Priority name="Low"/>
-
- <!-- Specify diagram this palette tools relate to -->
- <editor id="org.eclipse.papyrus.sysml.diagram.requirement"/>
- </paletteDefinition>
-</extension>
-
<!-- Diagram view providers declaration -->
<extension point="org.eclipse.gmf.runtime.diagram.core.viewProviders">
<!-- Diagram view provider -->
@@ -182,6 +148,8 @@
elements="uml.Abstraction, uml.Dependency"/>
</viewProvider>
+
+ <!-- Custom graphical types view provider -->
</extension>
<!-- Diagram edit part providers declaration -->
@@ -869,4 +837,21 @@
diagramType="RequirementDiagram">
</visualTypeProvider>
</extension>
+
+ <extension point="org.eclipse.papyrus.infra.gmfdiag.common.paletteDefinition">
+ <paletteDefinition
+ ID="org.eclipse.papyrus.sysml.diagram.requirement.paletteconfiguration"
+ class="org.eclipse.papyrus.infra.gmfdiag.common.service.palette.ExtendedPluginPaletteProvider"
+ name="Papyrus SysML requirement editor Plugin Palette"
+ path="palettes/PapyrusSYSMLRequirementDiagram.paletteconfiguration"
+ provider="Eclipse Modeling Project">
+ <Priority
+ name="Lowest">
+ </Priority>
+ <!-- Specify diagram this palette tools relate to -->
+ <editor
+ id="org.eclipse.papyrus.sysml.diagram.requirement">
+ </editor>
+ </paletteDefinition>
+</extension>
</plugin>
diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src/org/eclipse/papyrus/sysml/diagram/requirement/provider/CustomInheritedElementViewProvider.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src/org/eclipse/papyrus/sysml/diagram/requirement/provider/CustomInheritedElementViewProvider.java
index 6aa348384ab..a66cfc04b93 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src/org/eclipse/papyrus/sysml/diagram/requirement/provider/CustomInheritedElementViewProvider.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.requirement/src/org/eclipse/papyrus/sysml/diagram/requirement/provider/CustomInheritedElementViewProvider.java
@@ -1,23 +1,30 @@
/*****************************************************************************
- * Copyright (c) 2010 CEA LIST.
+ * Copyright (c) 2017 CEA LIST.
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
- *
+ *
+ * Mickaƫl ADAM (ALL4TEC) mickael.adam@all4tec.net - Bug 510587
*****************************************************************************/
package org.eclipse.papyrus.sysml.diagram.requirement.provider;
+import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint;
+import org.eclipse.gmf.runtime.diagram.core.services.view.CreateEdgeViewOperation;
+import org.eclipse.gmf.runtime.diagram.core.services.view.CreateNodeViewOperation;
import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
+import org.eclipse.gmf.runtime.emf.type.core.IElementType;
+import org.eclipse.gmf.runtime.notation.Edge;
import org.eclipse.gmf.runtime.notation.Node;
import org.eclipse.gmf.runtime.notation.NotationFactory;
import org.eclipse.gmf.runtime.notation.Shape;
import org.eclipse.gmf.runtime.notation.View;
import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.papyrus.sysml.diagram.common.utils.SysMLGraphicalTypes;
+import org.eclipse.papyrus.sysml.service.types.element.SysMLElementTypes;
import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassAttributeCompartmentEditPart;
import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassNameEditPart;
import org.eclipse.papyrus.uml.diagram.clazz.edit.parts.ClassNestedClassifierCompartmentEditPart;
@@ -35,26 +42,146 @@ public class CustomInheritedElementViewProvider extends InheritedClassDiagramVie
super();
}
+ /**
+ *
+ * @see org.eclipse.papyrus.sysml.diagram.requirement.provider.InheritedClassDiagramViewProvider#provides(org.eclipse.gmf.runtime.diagram.core.services.view.CreateNodeViewOperation)
+ */
@Override
- public Node createClass_Shape(EObject domainElement, View containerView, int index, boolean persisted, PreferencesHint preferencesHint) {
+ protected boolean provides(final CreateNodeViewOperation operation) {
+ boolean provides = false;
+
+ // Must have a container
+ if (operation.getContainerView() != null) {
+
+ // This provider is registered for Requirement Diagram only
+ String diagramType = operation.getContainerView().getDiagram().getType();
+ if (ElementTypes.DIAGRAM_ID.equals(diagramType)) {
+
+ // Get the type of the container
+ String containerGraphicalType = operation.getContainerView().getType();
+ if (ElementTypes.DIAGRAM_ID.equals(containerGraphicalType)) {
- Shape node = NotationFactory.eINSTANCE.createShape();
+ // get the type
+ IElementType elementType = (IElementType) operation.getSemanticAdapter().getAdapter(IElementType.class);
+ if (SysMLElementTypes.REQUIREMENT == elementType
+ || SysMLElementTypes.PROBLEM == elementType
+ || SysMLElementTypes.RATIONALE == elementType) {
+ provides = true;
+ }
+ }
+ }
+ }
+ return provides || super.provides(operation);
+ }
+
+ /**
+ * {@inheritDoc}
+ *
+ * @see org.eclipse.papyrus.sysml.diagram.requirement.provider.InheritedClassDiagramViewProvider#provides(org.eclipse.gmf.runtime.diagram.core.services.view.CreateEdgeViewOperation)
+ */
+ @Override
+ protected boolean provides(final CreateEdgeViewOperation operation) {
+ boolean provides = false;
+
+ // Must have a container
+ if (operation.getContainerView() != null) {
+
+ String diagramType = operation.getContainerView().getDiagram().getType();
+ if (ElementTypes.DIAGRAM_ID.equals(diagramType)) {
+
+ // get the type
+ IElementType elementType = (IElementType) operation.getSemanticAdapter().getAdapter(IElementType.class);
+ if (SysMLElementTypes.COPY == elementType
+ || SysMLElementTypes.DERIVE_REQT == elementType
+ || SysMLElementTypes.SATISFY == elementType
+ || SysMLElementTypes.VERIFY == elementType) {
+ provides = true;
+ }
+ }
+ }
+ return provides || super.provides(operation);
+ }
+
+ /**
+ * {@inheritDoc}
+ *
+ * @see org.eclipse.papyrus.sysml.diagram.requirement.provider.InheritedClassDiagramViewProvider#createNode(org.eclipse.core.runtime.IAdaptable, org.eclipse.gmf.runtime.notation.View, java.lang.String, int, boolean,
+ * org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint)
+ */
+ @Override
+ public Node createNode(final IAdaptable semanticAdapter, final View containerView, final String semanticHint, final int index, final boolean persisted, final PreferencesHint preferencesHint) {
+ Node node = null;
+ if (SysMLElementTypes.REQUIREMENT.getDisplayName().equals(semanticHint)) {
+ node = createRequirementNode(semanticAdapter, containerView, index, persisted, preferencesHint);
+ } else if (SysMLElementTypes.PROBLEM.getDisplayName().equals(semanticHint)
+ || SysMLElementTypes.RATIONALE.getDisplayName().equals(semanticHint)) {
+
+ final EObject domainElement = getSemanticElement(semanticAdapter);
+ node = createComment_Shape(domainElement, containerView, index, persisted, preferencesHint);
+ }
+
+ return null != node ? node : super.createNode(semanticAdapter, containerView, semanticHint, index, persisted, preferencesHint);
+ }
+
+
+ /**
+ * {@inheritDoc}
+ *
+ * @see org.eclipse.papyrus.sysml.diagram.requirement.provider.InheritedClassDiagramViewProvider#createEdge(org.eclipse.core.runtime.IAdaptable, org.eclipse.gmf.runtime.notation.View, java.lang.String, int, boolean,
+ * org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint)
+ */
+ @Override
+ public Edge createEdge(final IAdaptable semanticAdapter, final View containerView, final String semanticHint, final int index, final boolean persisted, final PreferencesHint preferencesHint) {
+ Edge edge = null;
+
+ if (SysMLElementTypes.COPY.getDisplayName().equals(semanticHint)
+ || SysMLElementTypes.DERIVE_REQT.getDisplayName().equals(semanticHint)
+ || SysMLElementTypes.SATISFY.getDisplayName().equals(semanticHint)
+ || SysMLElementTypes.VERIFY.getDisplayName().equals(semanticHint)) {
+ final EObject domainElement = getSemanticElement(semanticAdapter);
+ edge = createAbstraction_Edge(domainElement, containerView, index, persisted, preferencesHint);
+ }
+
+ return null != edge ? edge : super.createEdge(semanticAdapter, containerView, semanticHint, index, persisted, preferencesHint);
+ }
+
+ /**
+ * create a <code>Requirement Node</code>.
+ *
+ * @param IAdaptable
+ * (for semantic element)
+ * @param containerView
+ * the container view that will contain the created view.
+ * @param index
+ * position in the container view's list of children views.
+ * @param persisted
+ * indicates if the created view will be persisted or not
+ * @param preferencesHint
+ * The preference hint that is to be used to find the appropriate
+ * preference store from which to retrieve diagram preference
+ * values. The preference hint is mapped to a preference store in
+ * the preference registry <@link DiagramPreferencesRegistry>.
+ * @return the created <code>Requirement Node</code>
+ */
+ protected Shape createRequirementNode(final IAdaptable semanticAdapter, final View containerView, final int index, final boolean persisted, final PreferencesHint preferencesHint) {
+ Shape node;
+ node = NotationFactory.eINSTANCE.createShape();
node.setLayoutConstraint(NotationFactory.eINSTANCE.createBounds());
node.setType(SysMLGraphicalTypes.SHAPE_SYSML_REQUIREMENT_AS_CLASSIFER_ID);
ViewUtil.insertChildView(containerView, node, index, persisted);
+ final EObject domainElement = getSemanticElement(semanticAdapter);
node.setElement(domainElement);
stampShortcut(containerView, node);
// initializeFromPreferences
final IPreferenceStore prefStore = (IPreferenceStore) preferencesHint.getPreferenceStore();
- PreferenceInitializerForElementHelper.initForegroundFromPrefs(node, prefStore, "Class");
- PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Class");
- PreferenceInitializerForElementHelper.initBackgroundFromPrefs(node, prefStore, "Class");
+ PreferenceInitializerForElementHelper.initForegroundFromPrefs(node, prefStore, "Class");//$NON-NLS-1$
+ PreferenceInitializerForElementHelper.initFontStyleFromPrefs(node, prefStore, "Class");//$NON-NLS-1$
+ PreferenceInitializerForElementHelper.initBackgroundFromPrefs(node, prefStore, "Class");//$NON-NLS-1$
// createLabel(node, UMLVisualIDRegistry.getType(ClassNameEditPart.VISUAL_ID));
createLabel(node, UMLVisualIDRegistry.getType(ClassNameEditPart.VISUAL_ID));
-
createCompartment(node, UMLVisualIDRegistry.getType(ClassAttributeCompartmentEditPart.VISUAL_ID), true, true, true, true);
createCompartment(node, UMLVisualIDRegistry.getType(ClassOperationCompartmentEditPart.VISUAL_ID), true, true, true, true);
createCompartment(node, UMLVisualIDRegistry.getType(ClassNestedClassifierCompartmentEditPart.VISUAL_ID), true, true, true, true);
@@ -66,8 +193,7 @@ public class CustomInheritedElementViewProvider extends InheritedClassDiagramVie
createLabel(compartment, SysMLGraphicalTypes.LABEL_SYSML_REQUIREMENT_ID_ID);
createLabel(compartment, SysMLGraphicalTypes.LABEL_SYSML_REQUIREMENT_TEXT_ID);
- PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(node, prefStore, "Class");
+ PreferenceInitializerForElementHelper.initCompartmentsStatusFromPrefs(node, prefStore, "Class");//$NON-NLS-1$
return node;
-
}
}

Back to the top