RESOLVED - bug 350152: [SysML Block Definition Diagram] Incorrect tool id declaration leads to incorrect element creation in custom palettes

https://bugs.eclipse.org/bugs/show_bug.cgi?id=350152

5 files changed, 40 insertions, 40 deletions

diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition/palettes/blockdefinition.palette.associations.xml b/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition/palettes/blockdefinition.palette.associations.xml
index 30361ae802f..2c9e99aefa1 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition/palettes/blockdefinition.palette.associations.xml
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition/palettes/blockdefinition.palette.associations.xml
@@ -5,27 +5,27 @@
 			iconpath="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif"
 			id="org.eclipse.papyrus.sysml.diagram.blockdefinition.SYSML_BlockDefinition__Associations" name="Associations">
 			
-			<aspectTool description="Create a new Association" id="blockdefinition.tool.association_none"
+			<aspectTool description="Create a new Association" id="blockdefinition_associations.tool.association_none"
 				name="Association" refToolId="blockdefinition.tool.association_none">
 			</aspectTool>
 			
-			<aspectTool description="Create a new DirectedAssociation" id="blockdefinition.tool.association_none_directed"
+			<aspectTool description="Create a new DirectedAssociation" id="blockdefinition_associations.tool.association_none_directed"
 				name="DirectedAssociation" refToolId="blockdefinition.tool.association_none_directed">
 			</aspectTool>
 			
-			<aspectTool description="Create a new Composition" id="blockdefinition.tool.association_composite"
+			<aspectTool description="Create a new Composition" id="blockdefinition_associations.tool.association_composite"
 				name="Composition" refToolId="blockdefinition.tool.association_composite">
 			</aspectTool>
 
-			<aspectTool description="Create a new DirectedComposition" id="blockdefinition.tool.association_composite_directed"
+			<aspectTool description="Create a new DirectedComposition" id="blockdefinition_associations.tool.association_composite_directed"
 				name="DirectedComposition" refToolId="blockdefinition.tool.association_composite_directed">
 			</aspectTool>
 	
-			<aspectTool description="Create a new Aggregation" id="blockdefinition.tool.association_shared"
+			<aspectTool description="Create a new Aggregation" id="blockdefinition_associations.tool.association_shared"
 				name="Aggregation" refToolId="blockdefinition.tool.association_shared">
 			</aspectTool>
 
-			<aspectTool description="Create a new DirectedAggregation" id="blockdefinition.tool.association_shared_directed"
+			<aspectTool description="Create a new DirectedAggregation" id="blockdefinition_associations.tool.association_shared_directed"
 				name="DirectedAggregation" refToolId="blockdefinition.tool.association_shared_directed">
 			</aspectTool>
 											
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition/palettes/blockdefinition.palette.constraints.xml b/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition/palettes/blockdefinition.palette.constraints.xml
index 573e60a2a57..0cd691e179f 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition/palettes/blockdefinition.palette.constraints.xml
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition/palettes/blockdefinition.palette.constraints.xml
@@ -5,22 +5,22 @@
 			iconpath="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif"
 			id="org.eclipse.papyrus.sysml.diagram.blockdefinition.SYSML_BlockDefinition__ContraintTools" name="CommentAndConstraints">
 			
-			<aspectTool description="Create a new ConstraintBlock" id="blockdefinition.tool.constraintblock"
+			<aspectTool description="Create a new ConstraintBlock" id="blockdefinition_constraints.tool.constraintblock"
 				name="ConstraintBlock" refToolId="blockdefinition.tool.constraintblock">
 			</aspectTool>
-			<aspectTool description="Create a new ConstraintProperty" id="blockdefinition.tool.constraintproperty"
+			<aspectTool description="Create a new ConstraintProperty" id="blockdefinition_constraints.tool.constraintproperty"
 				name="ConstraintProperty" refToolId="blockdefinition.tool.constraintproperty">
 			</aspectTool>			
-			<aspectTool description="Create a new Parameter (Property)" id="blockdefinition.tool.property"
+			<aspectTool description="Create a new Parameter (Property)" id="blockdefinition_constraints.tool.property"
 				name="Parameter" refToolId="blockdefinition.tool.property">
 			</aspectTool>			
-			<aspectTool description="Create a new Constraint" id="blockdefinition.tool.constraint"
+			<aspectTool description="Create a new Constraint" id="blockdefinition_constraints.tool.constraint"
 				name="Constraint" refToolId="blockdefinition.tool.constraint">
 			</aspectTool>
-			<aspectTool description="Create a new Comment" id="blockdefinition.tool.comment"
+			<aspectTool description="Create a new Comment" id="blockdefinition_constraints.tool.comment"
 				name="Comment" refToolId="blockdefinition.tool.comment">
 			</aspectTool>				
-			<aspectTool description="Create a new Comment / Constraint link" id="blockdefinition.tool.comment_constraint_link"
+			<aspectTool description="Create a new Comment / Constraint link" id="blockdefinition_constraints.tool.comment_constraint_link"
 				name="Comment / Constraint link" refToolId="blockdefinition.tool.comment_constraint_link">
 			</aspectTool>				
 		</drawer>
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition/palettes/blockdefinition.palette.datatypes.xml b/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition/palettes/blockdefinition.palette.datatypes.xml
index 05fa6ed2f66..db6d81e1ef3 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition/palettes/blockdefinition.palette.datatypes.xml
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition/palettes/blockdefinition.palette.datatypes.xml
@@ -5,25 +5,25 @@
 			iconpath="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif"
 			id="org.eclipse.papyrus.sysml.diagram.blockdefinition.SYSML_BlockDefinition__DataTypeTools" name="DataTypes">
 			
-			<aspectTool description="Create a new DataType" id="blockdefinition.tool.datatype"
+			<aspectTool description="Create a new DataType" id="blockdefinition_datatypes.tool.datatype"
 				name="DataType" refToolId="blockdefinition.tool.datatype">
 			</aspectTool>
-			<aspectTool description="Create a new ValueType" id="blockdefinition.tool.valuetype"
+			<aspectTool description="Create a new ValueType" id="blockdefinition_datatypes.tool.valuetype"
 				name="ValueType" refToolId="blockdefinition.tool.valuetype">
 			</aspectTool>
-			<aspectTool description="Create a new PrimitiveType" id="blockdefinition.tool.primitivetype"
+			<aspectTool description="Create a new PrimitiveType" id="blockdefinition_datatypes.tool.primitivetype"
 				name="PrimitiveType" refToolId="blockdefinition.tool.primitivetype">
 			</aspectTool>				
-			<aspectTool description="Create a new Enumeration" id="blockdefinition.tool.enumeration"
+			<aspectTool description="Create a new Enumeration" id="blockdefinition_datatypes.tool.enumeration"
 				name="Enumeration" refToolId="blockdefinition.tool.enumeration">
 			</aspectTool>			
-			<aspectTool description="Create a new EnumerationLiteral" id="blockdefinition.tool.enumerationliteral"
+			<aspectTool description="Create a new EnumerationLiteral" id="blockdefinition_datatypes.tool.enumerationliteral"
 				name="EnumerationLiteral" refToolId="blockdefinition.tool.enumerationliteral">
 			</aspectTool>
-			<aspectTool description="Create a new Dimension" id="blockdefinition.tool.dimension"
+			<aspectTool description="Create a new Dimension" id="blockdefinition_datatypes.tool.dimension"
 				name="Dimension" refToolId="blockdefinition.tool.dimension">
 			</aspectTool>
-			<aspectTool description="Create a new Unit" id="blockdefinition.tool.unit"
+			<aspectTool description="Create a new Unit" id="blockdefinition_datatypes.tool.unit"
 				name="Unit" refToolId="blockdefinition.tool.unit">
 			</aspectTool>			
 		</drawer>
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition/palettes/blockdefinition.palette.modelelements.xml b/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition/palettes/blockdefinition.palette.modelelements.xml
index afa1f7a934a..aaac3251e52 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition/palettes/blockdefinition.palette.modelelements.xml
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition/palettes/blockdefinition.palette.modelelements.xml
@@ -5,46 +5,46 @@
 			iconpath="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif"
 			id="org.eclipse.papyrus.sysml.diagram.blockdefinition.SYSML_BlockDefinition__ModelElements" name="ModelElements">
 			
-			<aspectTool description="Create a new Package" id="blockdefinition.tool.package"
+			<aspectTool description="Create a new Package" id="blockdefinition_modelelements.tool.package"
 				name="Package" refToolId="blockdefinition.tool.package">
 			</aspectTool>			
-			<aspectTool description="Create a new Actor" id="blockdefinition.tool.actor"
+			<aspectTool description="Create a new Actor" id="blockdefinition_modelelements.tool.actor"
 				name="Actor" refToolId="blockdefinition.tool.actor">
 			</aspectTool>
-			<aspectTool description="Create a new Block" id="blockdefinition.tool.block"
+			<aspectTool description="Create a new Block" id="blockdefinition_modelelements.tool.block"
 				name="Block" refToolId="blockdefinition.tool.block">
 			</aspectTool>
-			<aspectTool description="Create a new Signal" id="blockdefinition.tool.signal"
+			<aspectTool description="Create a new Signal" id="blockdefinition_modelelements.tool.signal"
 				name="Signal" refToolId="blockdefinition.tool.signal">
 			</aspectTool>			
-			<aspectTool description="Create a new Operation" id="blockdefinition.tool.operation"
+			<aspectTool description="Create a new Operation" id="blockdefinition_modelelements.tool.operation"
 				name="Operation" refToolId="blockdefinition.tool.operation">
 			</aspectTool>
-			<aspectTool description="Create a new Reception" id="blockdefinition.tool.reception"
+			<aspectTool description="Create a new Reception" id="blockdefinition_modelelements.tool.reception"
 				name="Reception" refToolId="blockdefinition.tool.reception">
 			</aspectTool>
-			<aspectTool description="Create a new Property" id="blockdefinition.tool.property"
+			<aspectTool description="Create a new Property" id="blockdefinition_modelelements.tool.property"
 				name="Property" refToolId="blockdefinition.tool.property">
 			</aspectTool>
-			<aspectTool description="Create a new Part" id="blockdefinition.tool.part"
+			<aspectTool description="Create a new Part" id="blockdefinition_modelelements.tool.part"
 				name="Part" refToolId="blockdefinition.tool.part">
 			</aspectTool>
-			<aspectTool description="Create a new Reference" id="blockdefinition.tool.reference"
+			<aspectTool description="Create a new Reference" id="blockdefinition_modelelements.tool.reference"
 				name="Reference" refToolId="blockdefinition.tool.reference">
 			</aspectTool>
-			<aspectTool description="Create a new Value" id="blockdefinition.tool.value"
+			<aspectTool description="Create a new Value" id="blockdefinition_modelelements.tool.value"
 				name="Value" refToolId="blockdefinition.tool.value">
 			</aspectTool>
-			<aspectTool description="Create a new InstanceSpecification" id="blockdefinition.tool.instancespecification"
+			<aspectTool description="Create a new InstanceSpecification" id="blockdefinition_modelelements.tool.instancespecification"
 				name="InstanceSpecification" refToolId="blockdefinition.tool.instancespecification">
 			</aspectTool>
-			<aspectTool description="Create a new Slot" id="blockdefinition.tool.slot"
+			<aspectTool description="Create a new Slot" id="blockdefinition_modelelements.tool.slot"
 				name="Slot" refToolId="blockdefinition.tool.slot">
 			</aspectTool>
-			<aspectTool description="Create a new Dependency" id="blockdefinition.tool.dependency"
+			<aspectTool description="Create a new Dependency" id="blockdefinition_modelelements.tool.dependency"
 				name="Dependency" refToolId="blockdefinition.tool.dependency">
 			</aspectTool>
-			<aspectTool description="Create a new Generalization" id="blockdefinition.tool.generalization"
+			<aspectTool description="Create a new Generalization" id="blockdefinition_modelelements.tool.generalization"
 				name="Generalization" refToolId="blockdefinition.tool.generalization">
 			</aspectTool>						
 		</drawer>
diff --git a/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition/palettes/blockdefinition.palette.portandflows.xml b/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition/palettes/blockdefinition.palette.portandflows.xml
index 10b5f940892..96c2a8a2c0f 100644
--- a/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition/palettes/blockdefinition.palette.portandflows.xml
+++ b/plugins/sysml/org.eclipse.papyrus.sysml.diagram.blockdefinition/palettes/blockdefinition.palette.portandflows.xml
@@ -5,25 +5,25 @@
 			iconpath="platform:/plugin/org.eclipse.gmf.runtime.diagram.ui/icons/group.gif"
 			id="org.eclipse.papyrus.sysml.diagram.blockdefinition.SYSML_BlockDefinition__PortAndFlowTools" name="PortAndFlows">
 			
-			<aspectTool description="Create a new Port" id="blockdefinition.tool.port"
+			<aspectTool description="Create a new Port" id="blockdefinition_portandflows.tool.port"
 				name="Port" refToolId="blockdefinition.tool.port">
 			</aspectTool>
-			<aspectTool description="Create a new FlowPort" id="blockdefinition.tool.flowport"
+			<aspectTool description="Create a new FlowPort" id="blockdefinition_portandflows.tool.flowport"
 				name="FlowPort" refToolId="blockdefinition.tool.flowport">
 			</aspectTool>			
-			<aspectTool description="Create a new FlowSpecification" id="blockdefinition.tool.flowspecification"
+			<aspectTool description="Create a new FlowSpecification" id="blockdefinition_portandflows.tool.flowspecification"
 				name="FlowSpecification" refToolId="blockdefinition.tool.flowspecification">
 			</aspectTool>			
-			<aspectTool description="Create a new FlowProperty" id="blockdefinition.tool.flowproperty"
+			<aspectTool description="Create a new FlowProperty" id="blockdefinition_portandflows.tool.flowproperty"
 				name="FlowProperty" refToolId="blockdefinition.tool.flowproperty">
 			</aspectTool>
-			<aspectTool description="Create a new Interface" id="blockdefinition.tool.interface"
+			<aspectTool description="Create a new Interface" id="blockdefinition_portandflows.tool.interface"
 				name="Interface" refToolId="blockdefinition.tool.interface">
 			</aspectTool>
-			<aspectTool description="Create a new InterfaceRealization" id="blockdefinition.tool.interfacerealization"
+			<aspectTool description="Create a new InterfaceRealization" id="blockdefinition_portandflows.tool.interfacerealization"
 				name="InterfaceRealization" refToolId="blockdefinition.tool.interfacerealization">
 			</aspectTool>
-			<aspectTool description="Create a new Usage" id="blockdefinition.tool.usage"
+			<aspectTool description="Create a new Usage" id="blockdefinition_portandflows.tool.usage"
 				name="Usage" refToolId="blockdefinition.tool.usage">
 			</aspectTool>