Merge branch 'master' of ssh://ptessier@git.eclipse.org:29418/papyrus/org.eclipse.papyrus

8 files changed, 44 insertions, 1049 deletions

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 460120a629e..89d23a9a4f6 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
@@ -968,257 +968,6 @@
 		class="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences.BlockDefinitionDiagramGeneralPreferencePage">
 	</page>
 
-	<!-- Element Preference pages declaration -->
-	<page  	category="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences"
-		class="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences.ModelPreferencePage"
-		id="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences.ModelPreferencePage"
-		name="Model">
-	</page>
-	
-	
-	
-	
-	<page  	category="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences"
-		class="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences.PackagePreferencePage"
-		id="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences.PackagePreferencePage"
-		name="Package">
-	</page>
-	
-	
-	
-	
-	<page  	category="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences"
-		class="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences.InstanceSpecificationPreferencePage"
-		id="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences.InstanceSpecificationPreferencePage"
-		name="InstanceSpecification">
-	</page>
-	
-	
-	
-	
-	<page  	category="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences"
-		class="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences.ConstraintPreferencePage"
-		id="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences.ConstraintPreferencePage"
-		name="Constraint">
-	</page>
-	
-	
-	
-	
-	<page  	category="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences"
-		class="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences.CommentPreferencePage"
-		id="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences.CommentPreferencePage"
-		name="Comment">
-	</page>
-	
-	
-	
-	
-	
-	
-	
-	
-	<page  	category="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences"
-		class="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences.SlotPreferencePage"
-		id="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences.SlotPreferencePage"
-		name="Slot">
-	</page>
-			
-
-
-	<page  	category="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences"
-		class="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences.ActorPreferencePage"
-		id="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences.ActorPreferencePage"
-		name="Actor">
-	</page>
-		
-	<page  	category="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences"
-		class="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences.BlockPreferencePage"
-		id="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences.BlockPreferencePage"
-		name="Block">
-	</page>
-		
-	<page  	category="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences"
-		class="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences.ConstraintBlockPreferencePage"
-		id="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences.ConstraintBlockPreferencePage"
-		name="ConstraintBlock">
-	</page>
-		
-	<page  	category="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences"
-		class="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences.ConstraintPropertyPreferencePage"
-		id="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences.ConstraintPropertyPreferencePage"
-		name="ConstraintProperty">
-	</page>
-		
-	<page  	category="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences"
-		class="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences.DataTypePreferencePage"
-		id="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences.DataTypePreferencePage"
-		name="DataType">
-	</page>
-		
-	<page  	category="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences"
-		class="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences.DimensionPreferencePage"
-		id="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences.DimensionPreferencePage"
-		name="Dimension">
-	</page>
-		
-	<page  	category="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences"
-		class="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences.EnumerationPreferencePage"
-		id="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences.EnumerationPreferencePage"
-		name="Enumeration">
-	</page>
-		
-	<page  	category="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences"
-		class="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences.EnumerationLiteralPreferencePage"
-		id="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences.EnumerationLiteralPreferencePage"
-		name="EnumerationLiteral">
-	</page>
-		
-	<page  	category="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences"
-		class="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences.FlowPortPreferencePage"
-		id="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences.FlowPortPreferencePage"
-		name="FlowPort">
-	</page>
-			
-	<page  	category="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences.FlowPortPreferencePage"
-		class="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences.FlowPortAsCompartmentItemPreferencePage"
-		id="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences.FlowPortAsCompartmentItemPreferencePage"
-		name="As compartment item">
-	</page>
-
-	<page  	category="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences.FlowPortPreferencePage"
-		class="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences.FlowPortAsBorderItemPreferencePage"
-		id="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences.FlowPortAsBorderItemPreferencePage"
-		name="As border item">
-	</page>
-			
-	<page  	category="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences"
-		class="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences.FlowPropertyPreferencePage"
-		id="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences.FlowPropertyPreferencePage"
-		name="FlowProperty">
-	</page>
-		
-	<page  	category="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences"
-		class="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences.FlowSpecificationPreferencePage"
-		id="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences.FlowSpecificationPreferencePage"
-		name="FlowSpecification">
-	</page>
-		
-	<page  	category="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences"
-		class="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences.InterfacePreferencePage"
-		id="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences.InterfacePreferencePage"
-		name="Interface">
-	</page>
-		
-	<page  	category="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences"
-		class="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences.OperationPreferencePage"
-		id="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences.OperationPreferencePage"
-		name="Operation">
-	</page>
-		
-	<page  	category="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences"
-		class="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences.PartPreferencePage"
-		id="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences.PartPreferencePage"
-		name="Part">
-	</page>
-		
-	<page  	category="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences"
-		class="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences.PortPreferencePage"
-		id="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences.PortPreferencePage"
-		name="Port">
-	</page>
-		
-	<page  	category="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences.PortPreferencePage"
-		class="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences.PortAsCompartmentItemPreferencePage"
-		id="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences.PortAsCompartmentItemPreferencePage"
-		name="As compartment item">
-	</page>
-
-	<page  	category="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences.PortPreferencePage"
-		class="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences.PortAsBorderItemPreferencePage"
-		id="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences.PortAsBorderItemPreferencePage"
-		name="As border item">
-	</page>
-			
-	<page  	category="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences"
-		class="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences.PrimitiveTypePreferencePage"
-		id="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences.PrimitiveTypePreferencePage"
-		name="PrimitiveType">
-	</page>
-		
-	<page  	category="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences"
-		class="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences.PropertyPreferencePage"
-		id="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences.PropertyPreferencePage"
-		name="Property">
-	</page>
-		
-	<page  	category="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences"
-		class="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences.ReceptionPreferencePage"
-		id="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences.ReceptionPreferencePage"
-		name="Reception">
-	</page>
-		
-	<page  	category="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences"
-		class="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences.ReferencePreferencePage"
-		id="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences.ReferencePreferencePage"
-		name="Reference">
-	</page>
-		
-	<page  	category="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences"
-		class="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences.SignalPreferencePage"
-		id="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences.SignalPreferencePage"
-		name="Signal">
-	</page>
-		
-	<page  	category="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences"
-		class="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences.UnitPreferencePage"
-		id="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences.UnitPreferencePage"
-		name="Unit">
-	</page>
-		
-	<page  	category="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences"
-		class="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences.ValuePreferencePage"
-		id="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences.ValuePreferencePage"
-		name="Value">
-	</page>
-		
-	<page  	category="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences"
-		class="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences.ValueTypePreferencePage"
-		id="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences.ValueTypePreferencePage"
-		name="ValueType">
-	</page>
-		
-	<page  	category="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences"
-		class="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences.AssociationPreferencePage"
-		id="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences.AssociationPreferencePage"
-		name="Association">
-	</page>
-		
-	<page  	category="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences"
-		class="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences.DependencyPreferencePage"
-		id="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences.DependencyPreferencePage"
-		name="Dependency">
-	</page>
-		
-	<page  	category="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences"
-		class="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences.GeneralizationPreferencePage"
-		id="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences.GeneralizationPreferencePage"
-		name="Generalization">
-	</page>
-		
-	<page  	category="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences"
-		class="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences.InterfaceRealizationPreferencePage"
-		id="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences.InterfaceRealizationPreferencePage"
-		name="InterfaceRealization">
-	</page>
-		
-	<page  	category="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences"
-		class="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences.UsagePreferencePage"
-		id="org.eclipse.papyrus.sysml.diagram.blockdefinition.preferences.UsagePreferencePage"
-		name="Usage">
-	</page>
-		
-
 </extension>
 
 <!-- // Start of user code custom extensions 

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 4f382bd8ebd..af482a83617 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
@@ -339,42 +339,6 @@
 	<page id="org.eclipse.papyrus.sysml.diagram.internalblock.preferences" name="Internal Block Diagram" category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams" class="org.eclipse.papyrus.sysml.diagram.internalblock.preferences.InternalBlockDiagramGeneralPreferencePage">
 	</page>
 
-	<!-- Element Preference pages declaration -->
-	<page category="org.eclipse.papyrus.sysml.diagram.internalblock.preferences" class="org.eclipse.papyrus.sysml.diagram.internalblock.preferences.CommentPreferencePage" id="org.eclipse.papyrus.sysml.diagram.internalblock.preferences.CommentPreferencePage" name="Comment">
-	</page>
-			
-	<page category="org.eclipse.papyrus.sysml.diagram.internalblock.preferences" class="org.eclipse.papyrus.sysml.diagram.internalblock.preferences.ConstraintPreferencePage" id="org.eclipse.papyrus.sysml.diagram.internalblock.preferences.ConstraintPreferencePage" name="Constraint">
-	</page>
-
-	<page category="org.eclipse.papyrus.sysml.diagram.internalblock.preferences" class="org.eclipse.papyrus.sysml.diagram.internalblock.preferences.BlockCompositePreferencePage" id="org.eclipse.papyrus.sysml.diagram.internalblock.preferences.BlockCompositePreferencePage" name="Block">
-	</page>
-	
-	<page category="org.eclipse.papyrus.sysml.diagram.internalblock.preferences" class="org.eclipse.papyrus.sysml.diagram.internalblock.preferences.BlockPropertyCompositePreferencePage" id="org.eclipse.papyrus.sysml.diagram.internalblock.preferences.BlockPropertyCompositePreferencePage" name="PartAndReferences">
-	</page>
-		
-	<page category="org.eclipse.papyrus.sysml.diagram.internalblock.preferences.BlockPropertyCompositePreferencePage" class="org.eclipse.papyrus.sysml.diagram.internalblock.preferences.CustomBlockPropertyCompositePreferencePage" id="org.eclipse.papyrus.sysml.diagram.internalblock.preferences.CustomBlockPropertyCompositePreferencePage" name="block property">
-	</page>
-
-	<!--
-	<page  	category="org.eclipse.papyrus.sysml.diagram.internalblock.preferences.BlockPropertyCompositePreferencePage"
-		class="org.eclipse.papyrus.sysml.diagram.internalblock.preferences.CustomNestedBlockPropertyCompositePreferencePage"
-		id="org.eclipse.papyrus.sysml.diagram.internalblock.preferences.CustomBlockPropertyCompositePreferencePage"
-		name="nested property">
-	</page>
-	-->
-	<page category="org.eclipse.papyrus.sysml.diagram.internalblock.preferences" class="org.eclipse.papyrus.sysml.diagram.internalblock.preferences.FlowPortAsBorderItemPreferencePage" id="org.eclipse.papyrus.sysml.diagram.internalblock.preferences.FlowPortPreferencePage" name="FlowPort">
-	</page>
-			
-	<page category="org.eclipse.papyrus.sysml.diagram.internalblock.preferences" class="org.eclipse.papyrus.sysml.diagram.internalblock.preferences.PortAsBorderItemPreferencePage" id="org.eclipse.papyrus.sysml.diagram.internalblock.preferences.PortPreferencePage" name="Port">
-	</page>
-		
-	<page category="org.eclipse.papyrus.sysml.diagram.internalblock.preferences" class="org.eclipse.papyrus.sysml.diagram.internalblock.preferences.CustomConnectorPreferencePage" id="org.eclipse.papyrus.sysml.diagram.internalblock.preferences.ConnectorPreferencePage" name="Connector">
-	</page>	
-					
-	<page category="org.eclipse.papyrus.sysml.diagram.internalblock.preferences" class="org.eclipse.papyrus.sysml.diagram.internalblock.preferences.DependencyPreferencePage" id="org.eclipse.papyrus.sysml.diagram.internalblock.preferences.DependencyPreferencePage" name="Dependency">
-	</page>
-		
-
 </extension>
 
 <!-- // Start of user code custom extensions 
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 90703712cbc..d4c6ef12ad1 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
@@ -570,71 +570,21 @@
 	</page>
 
 	<!-- Element Preference pages declaration -->
-	<page  	category="org.eclipse.papyrus.sysml.diagram.parametric.preferences"
-		class="org.eclipse.papyrus.sysml.diagram.parametric.preferences.ConstraintPreferencePage"
-		id="org.eclipse.papyrus.sysml.diagram.parametric.preferences.ConstraintPreferencePage"
-		name="Constraint">
-	</page>
 	
 	
 	
 	
-	<page  	category="org.eclipse.papyrus.sysml.diagram.parametric.preferences"
-		class="org.eclipse.papyrus.sysml.diagram.parametric.preferences.CommentPreferencePage"
-		id="org.eclipse.papyrus.sysml.diagram.parametric.preferences.CommentPreferencePage"
-		name="Comment">
-	</page>
 	
-	<page  	category="org.eclipse.papyrus.sysml.diagram.parametric.preferences"
-		class="org.eclipse.papyrus.sysml.diagram.parametric.preferences.CommentAnnotatedElementPreferencePage"
-		id="org.eclipse.papyrus.sysml.diagram.parametric.preferences.CommentAnnotatedElementPreferencePage"
-		name="CommentAnnotatedElement">
-	</page>
 	
 	
 
 
-	<page  	category="org.eclipse.papyrus.sysml.diagram.parametric.preferences"
-		class="org.eclipse.papyrus.sysml.diagram.parametric.preferences.BlockCompositePreferencePage"
-		id="org.eclipse.papyrus.sysml.diagram.parametric.preferences.BlockCompositePreferencePage"
-		name="BlockComposite">
-	</page>
 		
-	<page  	category="org.eclipse.papyrus.sysml.diagram.parametric.preferences"
-		class="org.eclipse.papyrus.sysml.diagram.parametric.preferences.CustomBlockPropertyCompositePreferencePage"
-		id="org.eclipse.papyrus.sysml.diagram.parametric.preferences.CustomBlockPropertyCompositePreferencePage"
-		name="BlockPropertyComposite">
-	</page>
 		
-	<page  	category="org.eclipse.papyrus.sysml.diagram.parametric.preferences"
-		class="org.eclipse.papyrus.sysml.diagram.parametric.preferences.CustomConstraintPropertyCompositePreferencePage"
-		id="org.eclipse.papyrus.sysml.diagram.parametric.preferences.CustomConstraintPropertyCompositePreferencePage"
-		name="ConstraintPropertyComposite">
-	</page>
 		
-	<page  	category="org.eclipse.papyrus.sysml.diagram.parametric.preferences"
-		class="org.eclipse.papyrus.sysml.diagram.parametric.preferences.FlowPortPreferencePage"
-		id="org.eclipse.papyrus.sysml.diagram.parametric.preferences.FlowPortPreferencePage"
-		name="FlowPort">
-	</page>
 		
-	<page  	category="org.eclipse.papyrus.sysml.diagram.parametric.preferences"
-		class="org.eclipse.papyrus.sysml.diagram.parametric.preferences.PortPreferencePage"
-		id="org.eclipse.papyrus.sysml.diagram.parametric.preferences.PortPreferencePage"
-		name="Port">
-	</page>
 		
-	<page  	category="org.eclipse.papyrus.sysml.diagram.parametric.preferences"
-		class="org.eclipse.papyrus.sysml.diagram.parametric.preferences.ConnectorPreferencePage"
-		id="org.eclipse.papyrus.sysml.diagram.parametric.preferences.ConnectorPreferencePage"
-		name="Connector">
-	</page>
 		
-	<page  	category="org.eclipse.papyrus.sysml.diagram.parametric.preferences"
-		class="org.eclipse.papyrus.sysml.diagram.parametric.preferences.DependencyPreferencePage"
-		id="org.eclipse.papyrus.sysml.diagram.parametric.preferences.DependencyPreferencePage"
-		name="Dependency">
-	</page>
 		
 
 </extension>
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 cb5f27e3ee9..5f9892b7bc5 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
@@ -446,11 +446,6 @@
 	</page>

 

 	<!-- Element Preference pages declaration -->

-	<page  	category="org.eclipse.papyrus.sysml.diagram.requirement.preferences"

-		class="org.eclipse.papyrus.sysml.diagram.requirement.preferences.PackagePreferencePage"

-		id="org.eclipse.papyrus.sysml.diagram.requirement.preferences.PackagePreferencePage"

-		name="Package">

-	</page>

 	

 	

 	

@@ -459,107 +454,37 @@
 	

 	

 	

-	<page  	category="org.eclipse.papyrus.sysml.diagram.requirement.preferences"

-		class="org.eclipse.papyrus.sysml.diagram.requirement.preferences.NamedElementPreferencePage"

-		id="org.eclipse.papyrus.sysml.diagram.requirement.preferences.NamedElementPreferencePage"

-		name="NamedElement">

-	</page>

 	

 	

 	

 	

-	<page  	category="org.eclipse.papyrus.sysml.diagram.requirement.preferences"

-		class="org.eclipse.papyrus.sysml.diagram.requirement.preferences.CommentPreferencePage"

-		id="org.eclipse.papyrus.sysml.diagram.requirement.preferences.CommentPreferencePage"

-		name="Comment">

-	</page>

 	

 	

 	

 	

-	<page  	category="org.eclipse.papyrus.sysml.diagram.requirement.preferences"

-		class="org.eclipse.papyrus.sysml.diagram.requirement.preferences.ConstraintPreferencePage"

-		id="org.eclipse.papyrus.sysml.diagram.requirement.preferences.ConstraintPreferencePage"

-		name="Constraint">

-	</page>

 	

 	

 	

 	

-	<page  	category="org.eclipse.papyrus.sysml.diagram.requirement.preferences"

-		class="org.eclipse.papyrus.sysml.diagram.requirement.preferences.AbstractionPreferencePage"

-		id="org.eclipse.papyrus.sysml.diagram.requirement.preferences.AbstractionPreferencePage"

-		name="Abstraction">

-	</page>

 	

 	

-	<page  	category="org.eclipse.papyrus.sysml.diagram.requirement.preferences"

-		class="org.eclipse.papyrus.sysml.diagram.requirement.preferences.ContainmentLinkPreferencePage"

-		id="org.eclipse.papyrus.sysml.diagram.requirement.preferences.ContainmentLinkPreferencePage"

-		name="ContainmentLink">

-	</page>

 	

 	

 	

 	

-	<page  	category="org.eclipse.papyrus.sysml.diagram.requirement.preferences"

-		class="org.eclipse.papyrus.sysml.diagram.requirement.preferences.DependencyPreferencePage"

-		id="org.eclipse.papyrus.sysml.diagram.requirement.preferences.DependencyPreferencePage"

-		name="Dependency">

-	</page>

 	

 	

 	

 	

 	

 	

-	<page  	category="org.eclipse.papyrus.sysml.diagram.requirement.preferences"

-		class="org.eclipse.papyrus.sysml.diagram.requirement.preferences.PropertyPreferencePage"

-		id="org.eclipse.papyrus.sysml.diagram.requirement.preferences.PropertyPreferencePage"

-		name="Property">

-	</page>

 			

-	<page  	category="org.eclipse.papyrus.sysml.diagram.requirement.preferences"

-		class="org.eclipse.papyrus.sysml.diagram.requirement.preferences.ReceptionPreferencePage"

-		id="org.eclipse.papyrus.sysml.diagram.requirement.preferences.ReceptionPreferencePage"

-		name="Reception">

-	</page>

 			

-	<page  	category="org.eclipse.papyrus.sysml.diagram.requirement.preferences"

-		class="org.eclipse.papyrus.sysml.diagram.requirement.preferences.OperationPreferencePage"

-		id="org.eclipse.papyrus.sysml.diagram.requirement.preferences.OperationPreferencePage"

-		name="Operation">

-	</page>

 			

-	<page  	category="org.eclipse.papyrus.sysml.diagram.requirement.preferences"

-		class="org.eclipse.papyrus.sysml.diagram.requirement.preferences.InterfacePreferencePage"

-		id="org.eclipse.papyrus.sysml.diagram.requirement.preferences.InterfacePreferencePage"

-		name="Interface">

-	</page>

 			

-	<page  	category="org.eclipse.papyrus.sysml.diagram.requirement.preferences"

-		class="org.eclipse.papyrus.sysml.diagram.requirement.preferences.EnumerationPreferencePage"

-		id="org.eclipse.papyrus.sysml.diagram.requirement.preferences.EnumerationPreferencePage"

-		name="Enumeration">

-	</page>

 			

-	<page  	category="org.eclipse.papyrus.sysml.diagram.requirement.preferences"

-		class="org.eclipse.papyrus.sysml.diagram.requirement.preferences.PrimitiveTypePreferencePage"

-		id="org.eclipse.papyrus.sysml.diagram.requirement.preferences.PrimitiveTypePreferencePage"

-		name="PrimitiveType">

-	</page>

 			

-	<page  	category="org.eclipse.papyrus.sysml.diagram.requirement.preferences"

-		class="org.eclipse.papyrus.sysml.diagram.requirement.preferences.DataTypePreferencePage"

-		id="org.eclipse.papyrus.sysml.diagram.requirement.preferences.DataTypePreferencePage"

-		name="DataType">

-	</page>

 			

-	<page  	category="org.eclipse.papyrus.sysml.diagram.requirement.preferences"

-		class="org.eclipse.papyrus.sysml.diagram.requirement.preferences.SignalPreferencePage"

-		id="org.eclipse.papyrus.sysml.diagram.requirement.preferences.SignalPreferencePage"

-		name="Signal">

-	</page>

 			

 

 </extension>

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/plugin.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/plugin.xml
index 8173a29ee54..ba5ea39ced4 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/plugin.xml
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.activity/plugin.xml
@@ -2662,355 +2662,7 @@ self.structuralFeature.oclAsType(Property).opposite.type = self.object.type]]>
       <clientContext id="org.eclipse.papyrus.uml.diagram.activityDefaultCtx"/>
    </extension>
 
-

-<extension point="org.eclipse.ui.preferencePages">

-

-

-		

-	<?gmfgen generated="true"?>

-	<page  	category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.PapyrusUMLActivityDiagram"

-			class="org.eclipse.papyrus.uml.diagram.activity.preferences.ShapeNamedElementPreferencePage"

-            id="org.eclipse.papyrus.uml.diagram.activity.preferences.ShapeNamedElementPreferencePage"

-            name="ShapeNamedElement Node" />

-	
-		

-	<?gmfgen generated="true"?>

-	<page  	category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.PapyrusUMLActivityDiagram"

-			class="org.eclipse.papyrus.uml.diagram.activity.preferences.TimeConstraintPreferencePage"

-            id="org.eclipse.papyrus.uml.diagram.activity.preferences.TimeConstraintPreferencePage"

-            name="TimeConstraint Node" />

-	
-		

-	<?gmfgen generated="true"?>

-	<page  	category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.PapyrusUMLActivityDiagram"

-			class="org.eclipse.papyrus.uml.diagram.activity.preferences.ExpansionNodePreferencePage"

-            id="org.eclipse.papyrus.uml.diagram.activity.preferences.ExpansionNodePreferencePage"

-            name="ExpansionNode Node" />

-	
-		

-	<?gmfgen generated="true"?>

-	<page  	category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.PapyrusUMLActivityDiagram"

-			class="org.eclipse.papyrus.uml.diagram.activity.preferences.ValuePinPreferencePage"

-            id="org.eclipse.papyrus.uml.diagram.activity.preferences.ValuePinPreferencePage"

-            name="ValuePin Node" />

-	
-		

-	<?gmfgen generated="true"?>

-	<page  	category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.PapyrusUMLActivityDiagram"

-			class="org.eclipse.papyrus.uml.diagram.activity.preferences.CentralBufferNodePreferencePage"

-            id="org.eclipse.papyrus.uml.diagram.activity.preferences.CentralBufferNodePreferencePage"

-            name="CentralBufferNode Node" />

-	
-		

-	<?gmfgen generated="true"?>

-	<page  	category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.PapyrusUMLActivityDiagram"

-			class="org.eclipse.papyrus.uml.diagram.activity.preferences.ReadStructuralFeatureActionPreferencePage"

-            id="org.eclipse.papyrus.uml.diagram.activity.preferences.ReadStructuralFeatureActionPreferencePage"

-            name="ReadStructuralFeatureAction Node" />

-	
-		

-	<?gmfgen generated="true"?>

-	<page  	category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.PapyrusUMLActivityDiagram"

-			class="org.eclipse.papyrus.uml.diagram.activity.preferences.LoopNodePreferencePage"

-            id="org.eclipse.papyrus.uml.diagram.activity.preferences.LoopNodePreferencePage"

-            name="LoopNode Node" />

-	
-		

-	<?gmfgen generated="true"?>

-	<page  	category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.PapyrusUMLActivityDiagram"

-			class="org.eclipse.papyrus.uml.diagram.activity.preferences.MergeNodePreferencePage"

-            id="org.eclipse.papyrus.uml.diagram.activity.preferences.MergeNodePreferencePage"

-            name="MergeNode Node" />

-	
-		

-	<?gmfgen generated="true"?>

-	<page  	category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.PapyrusUMLActivityDiagram"

-			class="org.eclipse.papyrus.uml.diagram.activity.preferences.ActionInputPinPreferencePage"

-            id="org.eclipse.papyrus.uml.diagram.activity.preferences.ActionInputPinPreferencePage"

-            name="ActionInputPin Node" />

-	
-		

-	<?gmfgen generated="true"?>

-	<page  	category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.PapyrusUMLActivityDiagram"

-			class="org.eclipse.papyrus.uml.diagram.activity.preferences.CreateObjectActionPreferencePage"

-            id="org.eclipse.papyrus.uml.diagram.activity.preferences.CreateObjectActionPreferencePage"

-            name="CreateObjectAction Node" />

-	
-		

-	<?gmfgen generated="true"?>

-	<page  	category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.PapyrusUMLActivityDiagram"

-			class="org.eclipse.papyrus.uml.diagram.activity.preferences.CallOperationActionPreferencePage"

-            id="org.eclipse.papyrus.uml.diagram.activity.preferences.CallOperationActionPreferencePage"

-            name="CallOperationAction Node" />

-	
-		

-	<?gmfgen generated="true"?>

-	<page  	category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.PapyrusUMLActivityDiagram"

-			class="org.eclipse.papyrus.uml.diagram.activity.preferences.CallBehaviorActionPreferencePage"

-            id="org.eclipse.papyrus.uml.diagram.activity.preferences.CallBehaviorActionPreferencePage"

-            name="CallBehaviorAction Node" />

-	
-		

-	<?gmfgen generated="true"?>

-	<page  	category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.PapyrusUMLActivityDiagram"

-			class="org.eclipse.papyrus.uml.diagram.activity.preferences.BroadcastSignalActionPreferencePage"

-            id="org.eclipse.papyrus.uml.diagram.activity.preferences.BroadcastSignalActionPreferencePage"

-            name="BroadcastSignalAction Node" />

-	
-		

-	<?gmfgen generated="true"?>

-	<page  	category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.PapyrusUMLActivityDiagram"

-			class="org.eclipse.papyrus.uml.diagram.activity.preferences.ActivityPartitionPreferencePage"

-            id="org.eclipse.papyrus.uml.diagram.activity.preferences.ActivityPartitionPreferencePage"

-            name="ActivityPartition Node" />

-	
-		

-	<?gmfgen generated="true"?>

-	<page  	category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.PapyrusUMLActivityDiagram"

-			class="org.eclipse.papyrus.uml.diagram.activity.preferences.InputPinPreferencePage"

-            id="org.eclipse.papyrus.uml.diagram.activity.preferences.InputPinPreferencePage"

-            name="InputPin Node" />

-	
-		

-	<?gmfgen generated="true"?>

-	<page  	category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.PapyrusUMLActivityDiagram"

-			class="org.eclipse.papyrus.uml.diagram.activity.preferences.SendObjectActionPreferencePage"

-            id="org.eclipse.papyrus.uml.diagram.activity.preferences.SendObjectActionPreferencePage"

-            name="SendObjectAction Node" />

-	
-		

-	<?gmfgen generated="true"?>

-	<page  	category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.PapyrusUMLActivityDiagram"

-			class="org.eclipse.papyrus.uml.diagram.activity.preferences.InitialNodePreferencePage"

-            id="org.eclipse.papyrus.uml.diagram.activity.preferences.InitialNodePreferencePage"

-            name="InitialNode Node" />

-	
-		

-	<?gmfgen generated="true"?>

-	<page  	category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.PapyrusUMLActivityDiagram"

-			class="org.eclipse.papyrus.uml.diagram.activity.preferences.OutputPinPreferencePage"

-            id="org.eclipse.papyrus.uml.diagram.activity.preferences.OutputPinPreferencePage"

-            name="OutputPin Node" />

-	
-		

-	<?gmfgen generated="true"?>

-	<page  	category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.PapyrusUMLActivityDiagram"

-			class="org.eclipse.papyrus.uml.diagram.activity.preferences.AddVariableValueActionPreferencePage"

-            id="org.eclipse.papyrus.uml.diagram.activity.preferences.AddVariableValueActionPreferencePage"

-            name="AddVariableValueAction Node" />

-	
-		

-	<?gmfgen generated="true"?>

-	<page  	category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.PapyrusUMLActivityDiagram"

-			class="org.eclipse.papyrus.uml.diagram.activity.preferences.CommentPreferencePage"

-            id="org.eclipse.papyrus.uml.diagram.activity.preferences.CommentPreferencePage"

-            name="Comment Node" />

-	
-		

-	<?gmfgen generated="true"?>

-	<page  	category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.PapyrusUMLActivityDiagram"

-			class="org.eclipse.papyrus.uml.diagram.activity.preferences.DurationConstraintPreferencePage"

-            id="org.eclipse.papyrus.uml.diagram.activity.preferences.DurationConstraintPreferencePage"

-            name="DurationConstraint Node" />

-	
-		

-	<?gmfgen generated="true"?>

-	<page  	category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.PapyrusUMLActivityDiagram"

-			class="org.eclipse.papyrus.uml.diagram.activity.preferences.StructuredActivityNodePreferencePage"

-            id="org.eclipse.papyrus.uml.diagram.activity.preferences.StructuredActivityNodePreferencePage"

-            name="StructuredActivityNode Node" />

-	
-		

-	<?gmfgen generated="true"?>

-	<page  	category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.PapyrusUMLActivityDiagram"

-			class="org.eclipse.papyrus.uml.diagram.activity.preferences.SequenceNodePreferencePage"

-            id="org.eclipse.papyrus.uml.diagram.activity.preferences.SequenceNodePreferencePage"

-            name="SequenceNode Node" />

-	
-		

-	<?gmfgen generated="true"?>

-	<page  	category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.PapyrusUMLActivityDiagram"

-			class="org.eclipse.papyrus.uml.diagram.activity.preferences.ActivityParameterNodePreferencePage"

-            id="org.eclipse.papyrus.uml.diagram.activity.preferences.ActivityParameterNodePreferencePage"

-            name="ActivityParameterNode Node" />

-	
-		

-	<?gmfgen generated="true"?>

-	<page  	category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.PapyrusUMLActivityDiagram"

-			class="org.eclipse.papyrus.uml.diagram.activity.preferences.ActivityPreferencePage"

-            id="org.eclipse.papyrus.uml.diagram.activity.preferences.ActivityPreferencePage"

-            name="Activity Node" />

-	
-		

-	<?gmfgen generated="true"?>

-	<page  	category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.PapyrusUMLActivityDiagram"

-			class="org.eclipse.papyrus.uml.diagram.activity.preferences.OpaqueActionPreferencePage"

-            id="org.eclipse.papyrus.uml.diagram.activity.preferences.OpaqueActionPreferencePage"

-            name="OpaqueAction Node" />

-	
-		

-	<?gmfgen generated="true"?>

-	<page  	category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.PapyrusUMLActivityDiagram"

-			class="org.eclipse.papyrus.uml.diagram.activity.preferences.DecisionNodePreferencePage"

-            id="org.eclipse.papyrus.uml.diagram.activity.preferences.DecisionNodePreferencePage"

-            name="DecisionNode Node" />

-	
-		

-	<?gmfgen generated="true"?>

-	<page  	category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.PapyrusUMLActivityDiagram"

-			class="org.eclipse.papyrus.uml.diagram.activity.preferences.ValueSpecificationActionPreferencePage"

-            id="org.eclipse.papyrus.uml.diagram.activity.preferences.ValueSpecificationActionPreferencePage"

-            name="ValueSpecificationAction Node" />

-	
-		

-	<?gmfgen generated="true"?>

-	<page  	category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.PapyrusUMLActivityDiagram"

-			class="org.eclipse.papyrus.uml.diagram.activity.preferences.JoinNodePreferencePage"

-            id="org.eclipse.papyrus.uml.diagram.activity.preferences.JoinNodePreferencePage"

-            name="JoinNode Node" />

-	
-		

-	<?gmfgen generated="true"?>

-	<page  	category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.PapyrusUMLActivityDiagram"

-			class="org.eclipse.papyrus.uml.diagram.activity.preferences.ConstraintPreferencePage"

-            id="org.eclipse.papyrus.uml.diagram.activity.preferences.ConstraintPreferencePage"

-            name="Constraint Node" />

-	
-		

-	<?gmfgen generated="true"?>

-	<page  	category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.PapyrusUMLActivityDiagram"

-			class="org.eclipse.papyrus.uml.diagram.activity.preferences.SendSignalActionPreferencePage"

-            id="org.eclipse.papyrus.uml.diagram.activity.preferences.SendSignalActionPreferencePage"

-            name="SendSignalAction Node" />

-	
-		

-	<?gmfgen generated="true"?>

-	<page  	category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.PapyrusUMLActivityDiagram"

-			class="org.eclipse.papyrus.uml.diagram.activity.preferences.FlowFinalNodePreferencePage"

-            id="org.eclipse.papyrus.uml.diagram.activity.preferences.FlowFinalNodePreferencePage"

-            name="FlowFinalNode Node" />

-	
-		

-	<?gmfgen generated="true"?>

-	<page  	category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.PapyrusUMLActivityDiagram"

-			class="org.eclipse.papyrus.uml.diagram.activity.preferences.InterruptibleActivityRegionPreferencePage"

-            id="org.eclipse.papyrus.uml.diagram.activity.preferences.InterruptibleActivityRegionPreferencePage"

-            name="InterruptibleActivityRegion Node" />

-	
-		

-	<?gmfgen generated="true"?>

-	<page  	category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.PapyrusUMLActivityDiagram"

-			class="org.eclipse.papyrus.uml.diagram.activity.preferences.IntervalConstraintPreferencePage"

-            id="org.eclipse.papyrus.uml.diagram.activity.preferences.IntervalConstraintPreferencePage"

-            name="IntervalConstraint Node" />

-	
-		

-	<?gmfgen generated="true"?>

-	<page  	category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.PapyrusUMLActivityDiagram"

-			class="org.eclipse.papyrus.uml.diagram.activity.preferences.ReadSelfActionPreferencePage"

-            id="org.eclipse.papyrus.uml.diagram.activity.preferences.ReadSelfActionPreferencePage"

-            name="ReadSelfAction Node" />

-	
-		

-	<?gmfgen generated="true"?>

-	<page  	category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.PapyrusUMLActivityDiagram"

-			class="org.eclipse.papyrus.uml.diagram.activity.preferences.DataStoreNodePreferencePage"

-            id="org.eclipse.papyrus.uml.diagram.activity.preferences.DataStoreNodePreferencePage"

-            name="DataStoreNode Node" />

-	
-		

-	<?gmfgen generated="true"?>

-	<page  	category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.PapyrusUMLActivityDiagram"

-			class="org.eclipse.papyrus.uml.diagram.activity.preferences.ActivityFinalNodePreferencePage"

-            id="org.eclipse.papyrus.uml.diagram.activity.preferences.ActivityFinalNodePreferencePage"

-            name="ActivityFinalNode Node" />

-	
-		

-	<?gmfgen generated="true"?>

-	<page  	category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.PapyrusUMLActivityDiagram"

-			class="org.eclipse.papyrus.uml.diagram.activity.preferences.ReadVariableActionPreferencePage"

-            id="org.eclipse.papyrus.uml.diagram.activity.preferences.ReadVariableActionPreferencePage"

-            name="ReadVariableAction Node" />

-	
-		

-	<?gmfgen generated="true"?>

-	<page  	category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.PapyrusUMLActivityDiagram"

-			class="org.eclipse.papyrus.uml.diagram.activity.preferences.ParameterPreferencePage"

-            id="org.eclipse.papyrus.uml.diagram.activity.preferences.ParameterPreferencePage"

-            name="Parameter Node" />

-	
-		

-	<?gmfgen generated="true"?>

-	<page  	category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.PapyrusUMLActivityDiagram"

-			class="org.eclipse.papyrus.uml.diagram.activity.preferences.ExpansionRegionPreferencePage"

-            id="org.eclipse.papyrus.uml.diagram.activity.preferences.ExpansionRegionPreferencePage"

-            name="ExpansionRegion Node" />

-	
-		

-	<?gmfgen generated="true"?>

-	<page  	category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.PapyrusUMLActivityDiagram"

-			class="org.eclipse.papyrus.uml.diagram.activity.preferences.AcceptEventActionPreferencePage"

-            id="org.eclipse.papyrus.uml.diagram.activity.preferences.AcceptEventActionPreferencePage"

-            name="AcceptEventAction Node" />

-	
-		

-	<?gmfgen generated="true"?>

-	<page  	category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.PapyrusUMLActivityDiagram"

-			class="org.eclipse.papyrus.uml.diagram.activity.preferences.DestroyObjectActionPreferencePage"

-            id="org.eclipse.papyrus.uml.diagram.activity.preferences.DestroyObjectActionPreferencePage"

-            name="DestroyObjectAction Node" />

-	
-		

-	<?gmfgen generated="true"?>

-	<page  	category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.PapyrusUMLActivityDiagram"

-			class="org.eclipse.papyrus.uml.diagram.activity.preferences.AddStructuralFeatureValueActionPreferencePage"

-            id="org.eclipse.papyrus.uml.diagram.activity.preferences.AddStructuralFeatureValueActionPreferencePage"

-            name="AddStructuralFeatureValueAction Node" />

-	
-		

-	<?gmfgen generated="true"?>

-	<page  	category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.PapyrusUMLActivityDiagram"

-			class="org.eclipse.papyrus.uml.diagram.activity.preferences.ForkNodePreferencePage"

-            id="org.eclipse.papyrus.uml.diagram.activity.preferences.ForkNodePreferencePage"

-            name="ForkNode Node" />

-	
-		

-	<?gmfgen generated="true"?>

-	<page  	category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.PapyrusUMLActivityDiagram"

-			class="org.eclipse.papyrus.uml.diagram.activity.preferences.ConditionalNodePreferencePage"

-            id="org.eclipse.papyrus.uml.diagram.activity.preferences.ConditionalNodePreferencePage"

-            name="ConditionalNode Node" />

-	
-

-

-		

-

-	<?gmfgen generated="true"?>

-	<page  	category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.PapyrusUMLActivityDiagram"

-			class="org.eclipse.papyrus.uml.diagram.activity.preferences.ControlFlowPreferencePage"

-            id="org.eclipse.papyrus.uml.diagram.activity.preferences.ControlFlowPreferencePage"

-            name="ControlFlow Link" />

-		

-		

-		

-		

-

-	<?gmfgen generated="true"?>

-	<page  	category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.PapyrusUMLActivityDiagram"

-			class="org.eclipse.papyrus.uml.diagram.activity.preferences.ExceptionHandlerPreferencePage"

-            id="org.eclipse.papyrus.uml.diagram.activity.preferences.ExceptionHandlerPreferencePage"

-            name="ExceptionHandler Link" />

-		

-		

-

-	<?gmfgen generated="true"?>

-	<page  	category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.PapyrusUMLActivityDiagram"

-			class="org.eclipse.papyrus.uml.diagram.activity.preferences.ObjectFlowPreferencePage"

-            id="org.eclipse.papyrus.uml.diagram.activity.preferences.ObjectFlowPreferencePage"

-            name="ObjectFlow Link" />

-		

-

-</extension>

+
 <extension

 		id="Papyrus activity editor Plugin.palettedefinition"

 		name="Papyrus activity editor Plugin Predefined Entries"

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/plugin.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/plugin.xml
index 4cf243d4b2a..b0e7ea1c43e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/plugin.xml
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.interactionoverview/plugin.xml
@@ -536,155 +536,41 @@
         </page>

 

         <!-- Element Preference pages declaration -->

-        <page

-            category="org.eclipse.papyrus.uml.diagram.interactionoverview.preferences"

-            class="org.eclipse.papyrus.uml.diagram.interactionoverview.preferences.ActivityFinalNodePreferencePage"

-            id="org.eclipse.papyrus.uml.diagram.interactionoverview.preferences.ActivityFinalNodePreferencePage"

-            name="ActivityFinalNode">

-        </page>

 

 

-        <page

-            category="org.eclipse.papyrus.uml.diagram.interactionoverview.preferences"

-            class="org.eclipse.papyrus.uml.diagram.interactionoverview.preferences.CallBehaviorActionPreferencePage"

-            id="org.eclipse.papyrus.uml.diagram.interactionoverview.preferences.CallBehaviorActionPreferencePage"

-            name="CallBehaviorAction">

-        </page>

 

 

-        <page

-            category="org.eclipse.papyrus.uml.diagram.interactionoverview.preferences"

-            class="org.eclipse.papyrus.uml.diagram.interactionoverview.preferences.CommentPreferencePage"

-            id="org.eclipse.papyrus.uml.diagram.interactionoverview.preferences.CommentPreferencePage"

-            name="Comment">

-        </page>

 

 

-        <page

-            category="org.eclipse.papyrus.uml.diagram.interactionoverview.preferences"

-            class="org.eclipse.papyrus.uml.diagram.interactionoverview.preferences.ConditionalNodePreferencePage"

-            id="org.eclipse.papyrus.uml.diagram.interactionoverview.preferences.ConditionalNodePreferencePage"

-            name="ConditionalNode">

-        </page>

 

 

-        <page

-            category="org.eclipse.papyrus.uml.diagram.interactionoverview.preferences"

-            class="org.eclipse.papyrus.uml.diagram.interactionoverview.preferences.DecisionNodePreferencePage"

-            id="org.eclipse.papyrus.uml.diagram.interactionoverview.preferences.DecisionNodePreferencePage"

-            name="DecisionNode">

-        </page>

 

 

-        <page

-            category="org.eclipse.papyrus.uml.diagram.interactionoverview.preferences"

-            class="org.eclipse.papyrus.uml.diagram.interactionoverview.preferences.FlowFinalNodePreferencePage"

-            id="org.eclipse.papyrus.uml.diagram.interactionoverview.preferences.FlowFinalNodePreferencePage"

-            name="FlowFinalNode">

-        </page>

 

 

-        <page

-            category="org.eclipse.papyrus.uml.diagram.interactionoverview.preferences"

-            class="org.eclipse.papyrus.uml.diagram.interactionoverview.preferences.ForkNodePreferencePage"

-            id="org.eclipse.papyrus.uml.diagram.interactionoverview.preferences.ForkNodePreferencePage"

-            name="ForkNode">

-        </page>

 

 

-        <page

-            category="org.eclipse.papyrus.uml.diagram.interactionoverview.preferences"

-            class="org.eclipse.papyrus.uml.diagram.interactionoverview.preferences.InitialNodePreferencePage"

-            id="org.eclipse.papyrus.uml.diagram.interactionoverview.preferences.InitialNodePreferencePage"

-            name="InitialNode">

-        </page>

-

 

-        <page

-            category="org.eclipse.papyrus.uml.diagram.interactionoverview.preferences"

-            class="org.eclipse.papyrus.uml.diagram.interactionoverview.preferences.JoinNodePreferencePage"

-            id="org.eclipse.papyrus.uml.diagram.interactionoverview.preferences.JoinNodePreferencePage"

-            name="JoinNode">

-        </page>

 

 

-        <page

-            category="org.eclipse.papyrus.uml.diagram.interactionoverview.preferences"

-            class="org.eclipse.papyrus.uml.diagram.interactionoverview.preferences.LoopNodePreferencePage"

-            id="org.eclipse.papyrus.uml.diagram.interactionoverview.preferences.LoopNodePreferencePage"

-            name="LoopNode">

-        </page>

 

 

-        <page

-            category="org.eclipse.papyrus.uml.diagram.interactionoverview.preferences"

-            class="org.eclipse.papyrus.uml.diagram.interactionoverview.preferences.MergeNodePreferencePage"

-            id="org.eclipse.papyrus.uml.diagram.interactionoverview.preferences.MergeNodePreferencePage"

-            name="MergeNode">

-        </page>

 

 

-        <page

-            category="org.eclipse.papyrus.uml.diagram.interactionoverview.preferences"

-            class="org.eclipse.papyrus.uml.diagram.interactionoverview.preferences.NamedElementPreferencePage"

-            id="org.eclipse.papyrus.uml.diagram.interactionoverview.preferences.NamedElementPreferencePage"

-            name="NamedElement">

-        </page>

 

 

-        <page

-            category="org.eclipse.papyrus.uml.diagram.interactionoverview.preferences"

-            class="org.eclipse.papyrus.uml.diagram.interactionoverview.preferences.ActivityPreferencePage"

-            id="org.eclipse.papyrus.uml.diagram.interactionoverview.preferences.ActivityPreferencePage"

-            name="Activity">

-        </page>

 

 

-        <page

-            category="org.eclipse.papyrus.uml.diagram.interactionoverview.preferences"

-            class="org.eclipse.papyrus.uml.diagram.interactionoverview.preferences.SequenceNodePreferencePage"

-            id="org.eclipse.papyrus.uml.diagram.interactionoverview.preferences.SequenceNodePreferencePage"

-            name="SequenceNode">

-        </page>

 

 

-        <page

-            category="org.eclipse.papyrus.uml.diagram.interactionoverview.preferences"

-            class="org.eclipse.papyrus.uml.diagram.interactionoverview.preferences.ConstraintPreferencePage"
-            id="org.eclipse.papyrus.uml.diagram.interactionoverview.preferences.ConstraintPreferencePage"
-            name="Constraint">
-        </page>
 
 
-        <page
-            category="org.eclipse.papyrus.uml.diagram.interactionoverview.preferences"
-            class="org.eclipse.papyrus.uml.diagram.interactionoverview.preferences.CommentAnnotatedElementPreferencePage"

-            id="org.eclipse.papyrus.uml.diagram.interactionoverview.preferences.CommentAnnotatedElementPreferencePage"

-            name="CommentAnnotatedElement">

-        </page>

 

 

-        <page

-            category="org.eclipse.papyrus.uml.diagram.interactionoverview.preferences"

-            class="org.eclipse.papyrus.uml.diagram.interactionoverview.preferences.ControlFlowPreferencePage"

-            id="org.eclipse.papyrus.uml.diagram.interactionoverview.preferences.ControlFlowPreferencePage"

-            name="ControlFlow">

-        </page>

 

 

-        <page

-            category="org.eclipse.papyrus.uml.diagram.interactionoverview.preferences"

-            class="org.eclipse.papyrus.uml.diagram.interactionoverview.preferences.ParameterPreferencePage"

-            id="org.eclipse.papyrus.uml.diagram.interactionoverview.preferences.ParameterPreferencePage"

-            name="Parameter">

-        </page>

 

-        <page

-            category="org.eclipse.papyrus.uml.diagram.interactionoverview.preferences"

-            class="org.eclipse.papyrus.uml.diagram.interactionoverview.preferences.ConstraintPreferencePage"

-            id="org.eclipse.papyrus.uml.diagram.interactionoverview.preferences.ConstraintPreferencePage"

-            name="Constraint">

-        </page>

+

 

 

     </extension>

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/plugin.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/plugin.xml
index 75d882f2d56..89bf930df84 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/plugin.xml
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.sequence/plugin.xml
@@ -753,151 +753,7 @@
       </page>

 
    </extension>

-

-<extension point="org.eclipse.ui.preferencePages">

-

-

-		

-	<?gmfgen generated="true"?>

-	<page  	category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.PapyrusUMLSequenceDiagram"

-			class="org.eclipse.papyrus.uml.diagram.sequence.preferences.InteractionPreferencePage"

-            id="org.eclipse.papyrus.uml.diagram.sequence.preferences.InteractionPreferencePage"

-            name="Interaction Node" />

-	
-		

-	<?gmfgen generated="true"?>

-	<page  	category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.PapyrusUMLSequenceDiagram"

-			class="org.eclipse.papyrus.uml.diagram.sequence.preferences.TimeConstraintPreferencePage"

-            id="org.eclipse.papyrus.uml.diagram.sequence.preferences.TimeConstraintPreferencePage"

-            name="TimeConstraint Node" />

-	
-		

-	<?gmfgen generated="true"?>

-	<page  	category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.PapyrusUMLSequenceDiagram"

-			class="org.eclipse.papyrus.uml.diagram.sequence.preferences.TimeObservationPreferencePage"

-            id="org.eclipse.papyrus.uml.diagram.sequence.preferences.TimeObservationPreferencePage"

-            name="TimeObservation Node" />

-	
-		

-	<?gmfgen generated="true"?>

-	<page  	category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.PapyrusUMLSequenceDiagram"

-			class="org.eclipse.papyrus.uml.diagram.sequence.preferences.CommentPreferencePage"

-            id="org.eclipse.papyrus.uml.diagram.sequence.preferences.CommentPreferencePage"

-            name="Comment Node" />

-	
-		

-	<?gmfgen generated="true"?>

-	<page  	category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.PapyrusUMLSequenceDiagram"

-			class="org.eclipse.papyrus.uml.diagram.sequence.preferences.ConstraintPreferencePage"

-            id="org.eclipse.papyrus.uml.diagram.sequence.preferences.ConstraintPreferencePage"

-            name="Constraint Node" />

-	
-		

-	<?gmfgen generated="true"?>

-	<page  	category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.PapyrusUMLSequenceDiagram"

-			class="org.eclipse.papyrus.uml.diagram.sequence.preferences.CustomLifelinePreferencePage"

-            id="org.eclipse.papyrus.uml.diagram.sequence.preferences.LifelinePreferencePage"

-            name="Lifeline Node" />

-	
-		

-	<?gmfgen generated="true"?>

-	<page  	category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.PapyrusUMLSequenceDiagram"

-			class="org.eclipse.papyrus.uml.diagram.sequence.preferences.InteractionUsePreferencePage"

-            id="org.eclipse.papyrus.uml.diagram.sequence.preferences.InteractionUsePreferencePage"

-            name="InteractionUse Node" />

-	
-		

-	<?gmfgen generated="true"?>

-	<page  	category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.PapyrusUMLSequenceDiagram"

-			class="org.eclipse.papyrus.uml.diagram.sequence.preferences.CustomCombinedFragmentPreferencePage"

-            id="org.eclipse.papyrus.uml.diagram.sequence.preferences.CombinedFragmentPreferencePage"

-            name="CombinedFragment Node" />

-	
-		

-	<?gmfgen generated="true"?>

-	<page  	category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.PapyrusUMLSequenceDiagram"

-			class="org.eclipse.papyrus.uml.diagram.sequence.preferences.DurationConstraintPreferencePage"

-            id="org.eclipse.papyrus.uml.diagram.sequence.preferences.DurationConstraintPreferencePage"

-            name="DurationConstraint Node" />

-	
-		

-	<?gmfgen generated="true"?>

-	<page  	category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.PapyrusUMLSequenceDiagram"

-			class="org.eclipse.papyrus.uml.diagram.sequence.preferences.BehaviorExecutionSpecificationPreferencePage"

-            id="org.eclipse.papyrus.uml.diagram.sequence.preferences.BehaviorExecutionSpecificationPreferencePage"

-            name="BehaviorExecutionSpecification Node" />

-	
-		

-	<?gmfgen generated="true"?>

-	<page  	category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.PapyrusUMLSequenceDiagram"

-			class="org.eclipse.papyrus.uml.diagram.sequence.preferences.DurationObservationPreferencePage"

-            id="org.eclipse.papyrus.uml.diagram.sequence.preferences.DurationObservationPreferencePage"

-            name="DurationObservation Node" />

-	
-		

-	<?gmfgen generated="true"?>

-	<page  	category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.PapyrusUMLSequenceDiagram"

-			class="org.eclipse.papyrus.uml.diagram.sequence.preferences.ActionExecutionSpecificationPreferencePage"

-            id="org.eclipse.papyrus.uml.diagram.sequence.preferences.ActionExecutionSpecificationPreferencePage"

-            name="ActionExecutionSpecification Node" />

-	
-		

-	<?gmfgen generated="true"?>

-	<page  	category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.PapyrusUMLSequenceDiagram"

-			class="org.eclipse.papyrus.uml.diagram.sequence.preferences.CustomInteractionOperandPreferencePage"

-            id="org.eclipse.papyrus.uml.diagram.sequence.preferences.InteractionOperandPreferencePage"

-            name="InteractionOperand Node" />

-	
-		

-	<?gmfgen generated="true"?>

-	<page  	category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.PapyrusUMLSequenceDiagram"

-			class="org.eclipse.papyrus.uml.diagram.sequence.preferences.ContinuationPreferencePage"

-            id="org.eclipse.papyrus.uml.diagram.sequence.preferences.ContinuationPreferencePage"

-            name="Continuation Node" />

-	
-		

-	<?gmfgen generated="true"?>

-	<page  	category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.PapyrusUMLSequenceDiagram"

-			class="org.eclipse.papyrus.uml.diagram.sequence.preferences.StateInvariantPreferencePage"

-            id="org.eclipse.papyrus.uml.diagram.sequence.preferences.StateInvariantPreferencePage"

-            name="StateInvariant Node" />

-	
-		

-	<?gmfgen generated="true"?>

-	<page  	category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.PapyrusUMLSequenceDiagram"

-			class="org.eclipse.papyrus.uml.diagram.sequence.preferences.CustomDestructionOccurrenceSpecificationPreferencePage"

-            id="org.eclipse.papyrus.uml.diagram.sequence.preferences.DestructionOccurrenceSpecificationPreferencePage"

-            name="DestructionOccurrenceSpecification Node" />

-	
-		

-	<?gmfgen generated="true"?>

-	<page  	category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.PapyrusUMLSequenceDiagram"

-			class="org.eclipse.papyrus.uml.diagram.sequence.preferences.CustomConsiderIgnoreFragmentPreferencePage"

-            id="org.eclipse.papyrus.uml.diagram.sequence.preferences.ConsiderIgnoreFragmentPreferencePage"

-            name="ConsiderIgnoreFragment Node" />

-	
-

-

-		

-

-	<?gmfgen generated="true"?>

-	<page  	category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.PapyrusUMLSequenceDiagram"

-			class="org.eclipse.papyrus.uml.diagram.sequence.preferences.CustomMessagePreferencePage"

-            id="org.eclipse.papyrus.uml.diagram.sequence.preferences.MessagePreferencePage"

-            name="Message Link" />

-		

-		

-

-	<?gmfgen generated="true"?>

-	<page  	category="org.eclipse.papyrus.infra.gmfdiag.preferences.diagrams.PapyrusUMLSequenceDiagram"

-			class="org.eclipse.papyrus.uml.diagram.sequence.preferences.GeneralOrderingPreferencePage"

-            id="org.eclipse.papyrus.uml.diagram.sequence.preferences.GeneralOrderingPreferencePage"

-            name="GeneralOrdering Link" />

-		

-		

-		

-

-</extension>

+
 <extension

 		id="UML Plugin.palettedefinition"

 		name="UML Plugin Predefined Entries"

diff --git a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/databinding/AppliedCommentsObservableList.java b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/databinding/AppliedCommentsObservableList.java
index a976dabf71c..5518e837f85 100644
--- a/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/databinding/AppliedCommentsObservableList.java
+++ b/plugins/uml/properties/org.eclipse.papyrus.uml.properties/src/org/eclipse/papyrus/uml/properties/databinding/AppliedCommentsObservableList.java
@@ -8,9 +8,11 @@
  *

  * Contributors:

  *  Sebastien Poissonnet (CEA LIST) sebastien.poissonnet@cea.fr

+ *  Mickaël ADAM (ALL4TEC) mickael.adam@all4tec.net - bug 435174

  *****************************************************************************/

 package org.eclipse.papyrus.uml.properties.databinding;

 

+import java.util.ArrayList;

 import java.util.Collection;

 import java.util.Collections;

 import java.util.Iterator;

@@ -20,9 +22,14 @@ import java.util.List;
 import org.eclipse.core.runtime.Assert;

 import org.eclipse.emf.common.command.Command;

 import org.eclipse.emf.common.command.CompoundCommand;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.EReference;

 import org.eclipse.emf.ecore.EStructuralFeature.Setting;

 import org.eclipse.emf.edit.command.AddCommand;

 import org.eclipse.emf.edit.domain.EditingDomain;

+import org.eclipse.emf.transaction.TransactionalEditingDomain;

+import org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest;

+import org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest;

 import org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest;

 import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;

 import org.eclipse.papyrus.uml.tools.databinding.PapyrusObservableList;

@@ -39,14 +46,12 @@ public class AppliedCommentsObservableList extends PapyrusObservableList {
 

 	private static List<Comment> getAppliedCommentsList(Element source) {

 		List<Comment> result = new LinkedList<Comment>();

-

 		Iterator<Setting> it = UML2Util.getNonNavigableInverseReferences(source).iterator();

 		while(it.hasNext()) {

 			Setting setting = it.next();

 			if(setting.getEStructuralFeature() == UMLPackage.Literals.COMMENT__ANNOTATED_ELEMENT) {

 				if(setting.getEObject() instanceof Comment) {

 					Comment comment = (Comment)setting.getEObject();

-

 					// small bugfix...

 					// UML2Util.getNonNavigableInverseReferences returns more element than

 					// needed, especially elements that are not real ones

@@ -58,18 +63,15 @@ public class AppliedCommentsObservableList extends PapyrusObservableList {
 							isProxy = true;

 						}

 					}

-

 					// this is the real element, not a ghost one. display it in the list

 					if(!isProxy) {

 						if(comment.getAnnotatedElements().contains(source)) {

 							result.add(comment);

 						}

 					}

-

 				}

 			}

 		}

-

 		return result;

 	}

 

@@ -104,13 +106,10 @@ public class AppliedCommentsObservableList extends PapyrusObservableList {
 	@Override

 	public Command getAddCommand(Object value) {

 		Assert.isTrue(value instanceof Comment);

-

 		Comment comment = (Comment)value;

-

 		//Add the comment to source#ownedComment

 		CompoundCommand addAppliedCommentCommand = new CompoundCommand("Add applied comment");

 		addAppliedCommentCommand.append(super.getAddCommand(value));

-

 		//Add the source element to comment#annotatedElement

 		//		List<Element> values = new LinkedList<Element>(comment.getAnnotatedElements());

 		//		values.add((Element)source);

@@ -119,56 +118,43 @@ public class AppliedCommentsObservableList extends PapyrusObservableList {
 		//		IElementEditService provider = getProvider();

 		//

 		//		addAppliedCommentCommand.append(getCommandFromRequests(provider, Collections.singletonList(setRequest)));

-

-

 		AddCommand addCommand = new AddCommand(editingDomain, comment, UMLPackage.eINSTANCE.getComment_AnnotatedElement(), source);

 		addAppliedCommentCommand.append(addCommand);

-

 		return addAppliedCommentCommand;

 	}

 

 	@Override

 	public Command getRemoveCommand(Object value) {

 		Assert.isTrue(value instanceof Comment);

-

 		CompoundCommand removeAppliedCommentCommand = new CompoundCommand("Remove applied comment");

 		Comment comment = (Comment)value;

-

 		if(comment.getAnnotatedElements().size() <= 1) {

 			return super.getRemoveCommand(value);

 		}

-

 		//Remove the source element to comment#annotatedElement

 		List<Element> values = new LinkedList<Element>(comment.getAnnotatedElements());

 		values.remove(source);

 		SetRequest setRequest = new SetRequest(comment, UMLPackage.eINSTANCE.getComment_AnnotatedElement(), values);

 		IElementEditService provider = getProvider();

-

 		removeAppliedCommentCommand.append(getCommandFromRequests(provider, Collections.singletonList(setRequest)));

-

-

 		//		if(editingDomain != null) {

 		//			RemoveCommand command = new RemoveCommand(editingDomain, comment, UMLPackage.eINSTANCE.getComment_AnnotatedElement(), source);

 		//			return command;

 		//		}

-

 		return removeAppliedCommentCommand;

 	}

 

 	@Override

 	public Command getRemoveAllCommand(Collection<?> values) {

-

 		Iterator<?> itr = values.iterator();

 		Comment comment;

 		Element value;

 		List<Element> values_;

 		CompoundCommand removeAppliedCommentCommand = new CompoundCommand("Remove applied comment");

-

 		while(itr.hasNext()) {

 			value = (Element)itr.next();

 			Assert.isTrue(value instanceof Comment);

 			comment = (Comment)value;

-

 			if(comment.getAnnotatedElements().size() <= 1) {

 				removeAppliedCommentCommand.append(super.getRemoveCommand(value));

 			} else {

@@ -176,19 +162,49 @@ public class AppliedCommentsObservableList extends PapyrusObservableList {
 				values_.remove(source);

 				SetRequest setRequest = new SetRequest(comment, UMLPackage.eINSTANCE.getComment_AnnotatedElement(), values_);

 				IElementEditService provider = getProvider();

-

 				removeAppliedCommentCommand.append(getCommandFromRequests(provider, Collections.singletonList(setRequest)));

 			}

-

 		}

-

 		return removeAppliedCommentCommand;

 	}

 

+	//override to patch bug 435174

+	@Override

+	protected Collection<? extends IEditCommandRequest> getRequests(List<Object> newValues, Collection<?> removedValues) {

+		LinkedList<IEditCommandRequest> requests = new LinkedList<IEditCommandRequest>();

+		//DestroyElement request

+		if(feature instanceof EReference && ((EReference)feature).isContainment() && removedValues != null) {

+			for(Object o : removedValues) {

+				if(o instanceof EObject) {

+					requests.add(new DestroyElementRequest((TransactionalEditingDomain)editingDomain, (EObject)o, false));

+				}

+			}

+		}

+		//List to take into account the no annotated owned comment

+		List<Object> ownedComments = new ArrayList<Object>();

+		//Look for all owned comments of the source

+		for(EObject ownedComment : ((Element)source).getOwnedComments()) {

+			//Add comment the list

+			if(removedValues == null || !removedValues.contains(ownedComment)) {

+				ownedComments.add(ownedComment);

+			}

+		}

+		//Add new values

+		for(Object value : newValues) {

+			if(value instanceof Comment) {

+				//Only if the comment isn't owned by an other object

+				if(((Comment)value).eContainer() == null) {

+					ownedComments.add(value);

+				}

+			}

+		}

+		requests.add(new SetRequest((TransactionalEditingDomain)editingDomain, source, feature, ownedComments));

+		return requests;

+	}

+

 	//

 	// Unsupported operations

 	//

-

 	@Override

 	public Command getClearCommand() {

 		throw new UnsupportedOperationException();

@@ -212,7 +228,4 @@ public class AppliedCommentsObservableList extends PapyrusObservableList {
 		throw new UnsupportedOperationException();

 		//		return super.getSetCommand(index, value);

 	}

-

-

-

 }