Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuan Cadavid2016-01-03 14:31:02 -0500
committerJuan Cadavid2016-01-08 12:50:18 -0500
commit307f00fbb5e7242534f52deb68166ca2f5f36644 (patch)
treed2941cf563fb053bb57872f4a9a5b441d3773544
parent6b5617ec5dfeedfb51de94206c1617576afee55b (diff)
downloadorg.eclipse.papyrus-307f00fbb5e7242534f52deb68166ca2f5f36644.tar.gz
org.eclipse.papyrus-307f00fbb5e7242534f52deb68166ca2f5f36644.tar.xz
org.eclipse.papyrus-307f00fbb5e7242534f52deb68166ca2f5f36644.zip
[BPMN] Collaboration diagram palette fixing
Signed-off-by: Juan Cadavid <juan.cadavid@cea.fr>
-rw-r--r--extraplugins/bpmn/org.eclipse.papyrus.bpmn.diagram.collaboration/model/collaboration.paletteConfiguration14
-rw-r--r--extraplugins/bpmn/org.eclipse.papyrus.bpmn.diagram.collaboration/plugin.xml2
-rw-r--r--extraplugins/bpmn/org.eclipse.papyrus.bpmn.diagram.process/model/process.paletteConfiguration28
3 files changed, 13 insertions, 31 deletions
diff --git a/extraplugins/bpmn/org.eclipse.papyrus.bpmn.diagram.collaboration/model/collaboration.paletteConfiguration b/extraplugins/bpmn/org.eclipse.papyrus.bpmn.diagram.collaboration/model/collaboration.paletteConfiguration
index a08d708f2bd..940ec670693 100644
--- a/extraplugins/bpmn/org.eclipse.papyrus.bpmn.diagram.collaboration/model/collaboration.paletteConfiguration
+++ b/extraplugins/bpmn/org.eclipse.papyrus.bpmn.diagram.collaboration/model/collaboration.paletteConfiguration
@@ -8,7 +8,7 @@
label="BPMN Collaboration Palette Model"
description="Palette configuration for BPMN Collaboration Diagram">
<drawerConfigurations
- id="org.eclipse.papyrus.bpmn.collaboration.connectors"
+ id="bpmn.collaboration.connectors"
label="Connectors"
description="Drawer Configuration for BPMN Collaboration Diagram Connectors">
<ownedConfigurations
@@ -37,7 +37,7 @@
</ownedConfigurations>
</drawerConfigurations>
<drawerConfigurations
- id="org.eclipse.papyrus.bpmn.collaboration.tasks"
+ id="bpmn.collaboration.tasks"
label="Tasks"
description="Drawer Configuration for BPMN Collaboration Diagram Tasks">
<ownedConfigurations
@@ -119,7 +119,7 @@
</ownedConfigurations>
</drawerConfigurations>
<drawerConfigurations
- id="org.eclipse.papyrus.bpmn.collaboration.gateways"
+ id="bpmn.collaboration.gateways"
label="Gateways"
description="Drawer Configuration for BPMN Collaboration Diagram Gateways">
<ownedConfigurations
@@ -223,7 +223,7 @@
</ownedConfigurations>
</drawerConfigurations>
<drawerConfigurations
- id="org.eclipse.papyrus.bpmn.collaboration.events"
+ id="bpmn.collaboration.events"
label="Events"
description="Drawer Configuration for BPMN Collaboration Diagram Events">
<ownedConfigurations
@@ -283,7 +283,7 @@
</ownedConfigurations>
</drawerConfigurations>
<drawerConfigurations
- id="org.eclipse.papyrus.bpmn.collaboration.subprocesses"
+ id="bpmn.collaboration.subprocesses"
label="Subprocesses"
description="Drawer Configuration for BPMN Collaboration Diagram Subprocesses">
<ownedConfigurations
@@ -299,7 +299,7 @@
</ownedConfigurations>
</drawerConfigurations>
<drawerConfigurations
- id="org.eclipse.papyrus.bpmn.collaboration.data"
+ id="bpmn.collaboration.data"
label="Data"
description="Drawer Configuration for BPMN Collaboration Diagram Data">
<ownedConfigurations
@@ -348,7 +348,7 @@
</ownedConfigurations>
</drawerConfigurations>
<drawerConfigurations
- id="org.eclipse.papyrus.bpmn.collaboration.pools"
+ id="bpmn.collaboration.pools"
label="Pools and Lanes"
description="Drawer Configuration for BPMN Collaboration Diagram Pools and Lanes">
<ownedConfigurations
diff --git a/extraplugins/bpmn/org.eclipse.papyrus.bpmn.diagram.collaboration/plugin.xml b/extraplugins/bpmn/org.eclipse.papyrus.bpmn.diagram.collaboration/plugin.xml
index a5640d23376..01683b82f09 100644
--- a/extraplugins/bpmn/org.eclipse.papyrus.bpmn.diagram.collaboration/plugin.xml
+++ b/extraplugins/bpmn/org.eclipse.papyrus.bpmn.diagram.collaboration/plugin.xml
@@ -15,7 +15,6 @@
path="model/collaborationCustom.elementtypesconfigurations">
</elementTypeSet>
</extension>
- <!--
<extension
point="org.eclipse.papyrus.uml.diagram.common.paletteDefinition">
<paletteDefinition
@@ -33,7 +32,6 @@
</editor>
</paletteDefinition>
</extension>
- -->
<extension
point="org.eclipse.papyrus.infra.gmfdiag.common.diagramExpansion">
<diagramexpansion
diff --git a/extraplugins/bpmn/org.eclipse.papyrus.bpmn.diagram.process/model/process.paletteConfiguration b/extraplugins/bpmn/org.eclipse.papyrus.bpmn.diagram.process/model/process.paletteConfiguration
index 42df98018e1..2cfb7a0e7de 100644
--- a/extraplugins/bpmn/org.eclipse.papyrus.bpmn.diagram.process/model/process.paletteConfiguration
+++ b/extraplugins/bpmn/org.eclipse.papyrus.bpmn.diagram.process/model/process.paletteConfiguration
@@ -8,7 +8,7 @@
label="BPMN Process Palette Model"
description="Palette configuration for BPMN Process Diagram">
<drawerConfigurations
- id="org.eclipse.papyrus.bpmn.process.connectors"
+ id="bpmn.process.connectors"
label="Connectors"
description="Drawer Configuration for BPMN Process Diagram Connectors">
<ownedConfigurations
@@ -37,7 +37,7 @@
</ownedConfigurations>
</drawerConfigurations>
<drawerConfigurations
- id="org.eclipse.papyrus.bpmn.process.tasks"
+ id="bpmn.process.tasks"
label="Tasks"
description="Drawer Configuration for BPMN Process Diagram Tasks">
<ownedConfigurations
@@ -119,7 +119,7 @@
</ownedConfigurations>
</drawerConfigurations>
<drawerConfigurations
- id="org.eclipse.papyrus.bpmn.process.gateways"
+ id="bpmn.process.gateways"
label="Gateways"
description="Drawer Configuration for BPMN Process Diagram Gateways">
<ownedConfigurations
@@ -223,7 +223,7 @@
</ownedConfigurations>
</drawerConfigurations>
<drawerConfigurations
- id="org.eclipse.papyrus.bpmn.process.events"
+ id="bpmn.process.events"
label="Events"
description="Drawer Configuration for BPMN Process Diagram Events">
<ownedConfigurations
@@ -283,7 +283,7 @@
</ownedConfigurations>
</drawerConfigurations>
<drawerConfigurations
- id="org.eclipse.papyrus.bpmn.process.subprocesses"
+ id="bpmn.process.subprocesses"
label="Subprocesses"
description="Drawer Configuration for BPMN Process Diagram Subprocesses">
<ownedConfigurations
@@ -299,7 +299,7 @@
</ownedConfigurations>
</drawerConfigurations>
<drawerConfigurations
- id="org.eclipse.papyrus.bpmn.process.data"
+ id="bpmn.process.data"
label="Data"
description="Drawer Configuration for BPMN Process Diagram Data">
<ownedConfigurations
@@ -347,21 +347,5 @@
elementTypeId="org.eclipse.papyrus.bpmn.process.DataObject_DataStoreNode_3078"/>
</ownedConfigurations>
</drawerConfigurations>
- <drawerConfigurations
- id="org.eclipse.papyrus.bpmn.process.pools"
- label="Pools and Lanes"
- description="Drawer Configuration for BPMN Process Diagram Pools and Lanes">
- <ownedConfigurations
- xsi:type="paletteconfiguration:ToolConfiguration"
- id="bpmn.process.lane.tool"
- label="Lane"
- description="Lane (Activity Partition)">
- <icon
- pluginID="org.eclipse.papyrus.bpmn"
- iconPath="/icons/Lane.png"/>
- <elementDescriptors
- elementTypeId="org.eclipse.papyrus.bpmn.process.Lane_ActivityPartition_3067"/>
- </ownedConfigurations>
- </drawerConfigurations>
<requiredProfiles>BPMNProfile</requiredProfiles>
</paletteconfiguration:PaletteConfiguration>

Back to the top