362162: [Architecture - Refactoring] The plug-ins should be renamed to match their layer's qualified name

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

874 files changed, 0 insertions, 0 deletions

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/.classpath b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/.classpath
index 2d1a4302f04..2d1a4302f04 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/.classpath
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/.classpath
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/.project b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/.project
index cdf2e551aed..cdf2e551aed 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/.project
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/.project
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/.settings/org.eclipse.core.resources.prefs b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/.settings/org.eclipse.core.resources.prefs
index c67a5491c6e..c67a5491c6e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/.settings/org.eclipse.core.resources.prefs
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/.settings/org.eclipse.core.resources.prefs
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/.settings/org.eclipse.jdt.core.prefs b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/.settings/org.eclipse.jdt.core.prefs
index c4474e7e443..c4474e7e443 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/.settings/org.eclipse.jdt.core.prefs
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/META-INF/MANIFEST.MF
index 6e02427fc29..6e02427fc29 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/META-INF/MANIFEST.MF
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/about.html b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/about.html
index 82d49bf5f81..82d49bf5f81 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/about.html
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/about.html
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/build.properties b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/build.properties
index f161ecb2d26..f161ecb2d26 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/build.properties
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/build.properties
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/custom-messages.properties b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/custom-messages.properties
index cdf18f53a09..cdf18f53a09 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/custom-messages.properties
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/custom-messages.properties
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/Activity.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/Activity.gif
index 698a6e49a6a..698a6e49a6a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/Activity.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/Activity.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/Class.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/Class.gif
index 7c33c76a304..7c33c76a304 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/Class.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/Class.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/Clause.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/Clause.gif
index da535fd0019..da535fd0019 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/Clause.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/Clause.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/Collaboration.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/Collaboration.gif
index 656b916ab23..656b916ab23 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/Collaboration.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/Collaboration.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/DataType.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/DataType.gif
index b4337de697d..b4337de697d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/DataType.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/DataType.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/Enumeration.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/Enumeration.gif
index c7573bde8f9..c7573bde8f9 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/Enumeration.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/Enumeration.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/EnumerationLiteral.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/EnumerationLiteral.gif
index 4967b569c1e..4967b569c1e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/EnumerationLiteral.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/EnumerationLiteral.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/Generalization-15x15.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/Generalization-15x15.gif
index 6f3189ac5aa..6f3189ac5aa 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/Generalization-15x15.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/Generalization-15x15.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/Interface.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/Interface.gif
index 8032f5e4fca..8032f5e4fca 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/Interface.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/Interface.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/LiteralBoolean.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/LiteralBoolean.gif
index 656797fed0c..656797fed0c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/LiteralBoolean.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/LiteralBoolean.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/LiteralInteger.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/LiteralInteger.gif
index 3bd99b385e2..3bd99b385e2 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/LiteralInteger.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/LiteralInteger.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/LiteralString.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/LiteralString.gif
index ef367ef6102..ef367ef6102 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/LiteralString.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/LiteralString.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/LiteralUnlimitedNatural.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/LiteralUnlimitedNatural.gif
index f1f019535ea..f1f019535ea 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/LiteralUnlimitedNatural.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/LiteralUnlimitedNatural.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/Metaclass.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/Metaclass.gif
index d022d2eb6c6..d022d2eb6c6 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/Metaclass.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/Metaclass.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/Operation.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/Operation.gif
index 482a4d51abb..482a4d51abb 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/Operation.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/Operation.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/Papyrus_16x16.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/Papyrus_16x16.gif
index 8a31f458379..8a31f458379 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/Papyrus_16x16.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/Papyrus_16x16.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/Port.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/Port.gif
index e602d058756..e602d058756 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/Port.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/Port.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/Property.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/Property.gif
index 99b7fa68d96..99b7fa68d96 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/Property.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/Property.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/Triangle.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/Triangle.gif
index e4eec9caa97..e4eec9caa97 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/Triangle.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/Triangle.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/alignbottom.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/alignbottom.gif
index 9eea5581bd8..9eea5581bd8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/alignbottom.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/alignbottom.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/aligncenter.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/aligncenter.gif
index 4e8c94a8802..4e8c94a8802 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/aligncenter.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/aligncenter.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/alignleft.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/alignleft.gif
index 55cecc20e96..55cecc20e96 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/alignleft.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/alignleft.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/alignmid.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/alignmid.gif
index 5f13c93d488..5f13c93d488 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/alignmid.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/alignmid.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/alignright.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/alignright.gif
index f6ead15809c..f6ead15809c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/alignright.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/alignright.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/aligntop.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/aligntop.gif
index 2f9ceeb1107..2f9ceeb1107 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/aligntop.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/aligntop.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/arrow_down.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/arrow_down.gif
index 072b1844572..072b1844572 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/arrow_down.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/arrow_down.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/arrow_left.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/arrow_left.gif
index 4fb41501036..4fb41501036 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/arrow_left.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/arrow_left.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/arrow_right.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/arrow_right.gif
index 19567890aa8..19567890aa8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/arrow_right.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/arrow_right.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/arrow_up.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/arrow_up.gif
index 07164754e5c..07164754e5c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/arrow_up.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/arrow_up.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/autosize.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/autosize.gif
index 2988e3df06d..2988e3df06d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/autosize.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/autosize.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/category_uml.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/category_uml.gif
index 6aa25e594e3..6aa25e594e3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/category_uml.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/category_uml.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/change_display.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/change_display.gif
index a598f6082f6..a598f6082f6 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/change_display.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/change_display.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/complete_tsk.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/complete_tsk.gif
index 9cacb96dca9..9cacb96dca9 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/complete_tsk.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/complete_tsk.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/delete.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/delete.gif
index b6922ac11cf..b6922ac11cf 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/delete.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/delete.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/distibute_vertically.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/distibute_vertically.gif
index e292586408b..e292586408b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/distibute_vertically.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/distibute_vertically.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/distribute_horizontally.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/distribute_horizontally.gif
index 6f672658a2b..6f672658a2b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/distribute_horizontally.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/distribute_horizontally.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/distribute_horizontally_between_nodes.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/distribute_horizontally_between_nodes.gif
index 3741f701496..3741f701496 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/distribute_horizontally_between_nodes.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/distribute_horizontally_between_nodes.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/distribute_vertically_between_nodes.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/distribute_vertically_between_nodes.gif
index 8e865758b90..8e865758b90 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/distribute_vertically_between_nodes.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/distribute_vertically_between_nodes.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/drawer.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/drawer.gif
index 51e703b1b9c..51e703b1b9c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/drawer.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/drawer.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/drawers_hidden.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/drawers_hidden.gif
index 99e31f42645..99e31f42645 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/drawers_hidden.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/drawers_hidden.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/drawers_shown.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/drawers_shown.gif
index 51e703b1b9c..51e703b1b9c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/drawers_shown.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/drawers_shown.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/drawers_shown.gifold b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/drawers_shown.gifold
index 871bd3ec2ef..871bd3ec2ef 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/drawers_shown.gifold
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/drawers_shown.gifold
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/extended_plugin_desc.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/extended_plugin_desc.gif
index faa5c5c24d2..faa5c5c24d2 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/extended_plugin_desc.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/extended_plugin_desc.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/fantom.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/fantom.gif
index 15dd6fdfe91..15dd6fdfe91 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/fantom.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/fantom.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/fantomCompartment.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/fantomCompartment.gif
index d4c0115f88c..d4c0115f88c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/fantomCompartment.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/fantomCompartment.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/fantomContents.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/fantomContents.gif
index 308aa3d15fd..308aa3d15fd 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/fantomContents.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/fantomContents.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/fantomInherited.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/fantomInherited.gif
index 29731243135..29731243135 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/fantomInherited.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/fantomInherited.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/flower.svg b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/flower.svg
index f8e0ba9ad68..f8e0ba9ad68 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/flower.svg
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/flower.svg
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/help/delete_obj.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/help/delete_obj.gif
index b6922ac11cf..b6922ac11cf 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/help/delete_obj.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/help/delete_obj.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/help/help_contents-1.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/help/help_contents-1.gif
index 9d70301dae3..9d70301dae3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/help/help_contents-1.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/help/help_contents-1.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/help/help_contents.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/help/help_contents.gif
index 74bf6173727..74bf6173727 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/help/help_contents.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/help/help_contents.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/horizontal_by_left.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/horizontal_by_left.gif
index b1d0710b519..b1d0710b519 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/horizontal_by_left.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/horizontal_by_left.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/horizontal_by_right.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/horizontal_by_right.gif
index 0695781bb2f..0695781bb2f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/horizontal_by_right.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/horizontal_by_right.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/hyperlink_13x13.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/hyperlink_13x13.gif
index f289a81f52b..f289a81f52b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/hyperlink_13x13.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/hyperlink_13x13.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/incomplete_tsk.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/incomplete_tsk.gif
index f6b9f8a590c..f6b9f8a590c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/incomplete_tsk.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/incomplete_tsk.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/label_role/MultiplicityHandler.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/label_role/MultiplicityHandler.gif
index f1f019535ea..f1f019535ea 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/label_role/MultiplicityHandler.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/label_role/MultiplicityHandler.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/label_role/alias.png b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/label_role/alias.png
index eb601ca6958..eb601ca6958 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/label_role/alias.png
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/label_role/alias.png
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/label_role/name.png b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/label_role/name.png
index a62319a99ed..a62319a99ed 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/label_role/name.png
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/label_role/name.png
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/label_role/role.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/label_role/role.gif
index b6831627209..b6831627209 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/label_role/role.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/label_role/role.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/local_desc.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/local_desc.gif
index d55b09f2e4b..d55b09f2e4b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/local_desc.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/local_desc.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/local_desc_delete.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/local_desc_delete.gif
index b6922ac11cf..b6922ac11cf 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/local_desc_delete.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/local_desc_delete.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/local_desc_destroy.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/local_desc_destroy.gif
index b6922ac11cf..b6922ac11cf 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/local_desc_destroy.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/local_desc_destroy.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/local_desc_edit.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/local_desc_edit.gif
index baa24ba0f09..baa24ba0f09 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/local_desc_edit.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/local_desc_edit.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/local_desc_new.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/local_desc_new.gif
index 252d7ebcb8c..252d7ebcb8c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/local_desc_new.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/local_desc_new.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/local_desc_wiz.png b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/local_desc_wiz.png
index 9a5d23f7c0f..9a5d23f7c0f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/local_desc_wiz.png
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/local_desc_wiz.png
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/new_drawer.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/new_drawer.gif
index 310eb18e34b..310eb18e34b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/new_drawer.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/new_drawer.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/new_drawer_wiz.png b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/new_drawer_wiz.png
index f4861b1c7ec..f4861b1c7ec 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/new_drawer_wiz.png
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/new_drawer_wiz.png
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/none_comp_vis.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/none_comp_vis.gif
index a2017d01c82..a2017d01c82 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/none_comp_vis.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/none_comp_vis.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/Abstraction.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/Abstraction.gif
index 38df3e62097..38df3e62097 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/Abstraction.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/Abstraction.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/AcceptCallAction.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/AcceptCallAction.gif
index de7357cfa37..de7357cfa37 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/AcceptCallAction.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/AcceptCallAction.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/AcceptEventAction.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/AcceptEventAction.gif
index 9379c8973fa..9379c8973fa 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/AcceptEventAction.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/AcceptEventAction.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/ActionExecutionSpecification.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/ActionExecutionSpecification.gif
index ccfb3c87d83..ccfb3c87d83 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/ActionExecutionSpecification.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/ActionExecutionSpecification.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/ActionInputPin.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/ActionInputPin.gif
index 12ad0562ea2..12ad0562ea2 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/ActionInputPin.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/ActionInputPin.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/Activity.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/Activity.gif
index c14b254c733..c14b254c733 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/Activity.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/Activity.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/ActivityFinalNode.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/ActivityFinalNode.gif
index ed497288418..ed497288418 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/ActivityFinalNode.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/ActivityFinalNode.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/ActivityParameterNode.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/ActivityParameterNode.gif
index 70d87372b5b..70d87372b5b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/ActivityParameterNode.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/ActivityParameterNode.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/ActivityPartition.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/ActivityPartition.gif
index 7c1f8fa7957..7c1f8fa7957 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/ActivityPartition.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/ActivityPartition.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/Actor.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/Actor.gif
index 1a65f9268c4..1a65f9268c4 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/Actor.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/Actor.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/AddStructuralFeatureValueAction.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/AddStructuralFeatureValueAction.gif
index 28a897e4e62..28a897e4e62 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/AddStructuralFeatureValueAction.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/AddStructuralFeatureValueAction.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/AddVariableValueAction.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/AddVariableValueAction.gif
index 1b41bd7cf1e..1b41bd7cf1e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/AddVariableValueAction.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/AddVariableValueAction.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/Add_16x16.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/Add_16x16.gif
index 252d7ebcb8c..252d7ebcb8c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/Add_16x16.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/Add_16x16.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/AnyReceiveEvent.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/AnyReceiveEvent.gif
index ac865701d99..ac865701d99 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/AnyReceiveEvent.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/AnyReceiveEvent.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/ArrowDown_16x16.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/ArrowDown_16x16.gif
index 072b1844572..072b1844572 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/ArrowDown_16x16.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/ArrowDown_16x16.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/ArrowLeft_16x16.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/ArrowLeft_16x16.gif
index 4fb41501036..4fb41501036 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/ArrowLeft_16x16.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/ArrowLeft_16x16.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/ArrowRight_16x16.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/ArrowRight_16x16.gif
index 19567890aa8..19567890aa8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/ArrowRight_16x16.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/ArrowRight_16x16.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/ArrowUp_16x16.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/ArrowUp_16x16.gif
index 07164754e5c..07164754e5c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/ArrowUp_16x16.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/ArrowUp_16x16.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/Artifact.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/Artifact.gif
index 8a559fc9c85..8a559fc9c85 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/Artifact.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/Artifact.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/Association.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/Association.gif
index 88ec3eca998..88ec3eca998 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/Association.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/Association.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/AssociationClass.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/AssociationClass.gif
index 314c198e302..314c198e302 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/AssociationClass.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/AssociationClass.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/Association_composite.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/Association_composite.gif
index b4fbec9c849..b4fbec9c849 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/Association_composite.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/Association_composite.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/Association_none.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/Association_none.gif
index d9712d1dad7..d9712d1dad7 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/Association_none.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/Association_none.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/Association_shared.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/Association_shared.gif
index 3b687d2171a..3b687d2171a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/Association_shared.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/Association_shared.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/BehaviorExecutionSpecification.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/BehaviorExecutionSpecification.gif
index 339e41f7804..339e41f7804 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/BehaviorExecutionSpecification.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/BehaviorExecutionSpecification.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/BroadcastSignalAction.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/BroadcastSignalAction.gif
index 64cff6043e6..64cff6043e6 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/BroadcastSignalAction.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/BroadcastSignalAction.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/CallBehaviorAction.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/CallBehaviorAction.gif
index ea029471d47..ea029471d47 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/CallBehaviorAction.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/CallBehaviorAction.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/CallEvent.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/CallEvent.gif
index fb748afe34b..fb748afe34b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/CallEvent.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/CallEvent.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/CallOperationAction.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/CallOperationAction.gif
index b394107797a..b394107797a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/CallOperationAction.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/CallOperationAction.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/CentralBufferNode.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/CentralBufferNode.gif
index 35311a4b9f5..35311a4b9f5 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/CentralBufferNode.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/CentralBufferNode.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/ChangeEvent.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/ChangeEvent.gif
index 22d4ab4b246..22d4ab4b246 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/ChangeEvent.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/ChangeEvent.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/Class.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/Class.gif
index 5c507250a41..5c507250a41 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/Class.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/Class.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/ClassifierTemplateParameter.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/ClassifierTemplateParameter.gif
index 3091c61757b..3091c61757b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/ClassifierTemplateParameter.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/ClassifierTemplateParameter.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/Clause.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/Clause.gif
index da535fd0019..da535fd0019 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/Clause.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/Clause.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/ClearAssociationAction.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/ClearAssociationAction.gif
index 96f12f9399b..96f12f9399b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/ClearAssociationAction.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/ClearAssociationAction.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/ClearStructuralFeatureAction.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/ClearStructuralFeatureAction.gif
index a5b4a02a1d1..a5b4a02a1d1 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/ClearStructuralFeatureAction.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/ClearStructuralFeatureAction.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/ClearVariableAction.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/ClearVariableAction.gif
index d91e79432ad..d91e79432ad 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/ClearVariableAction.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/ClearVariableAction.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/Collaboration.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/Collaboration.gif
index 03268e4c5dc..03268e4c5dc 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/Collaboration.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/Collaboration.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/CollaborationUse.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/CollaborationUse.gif
index cd209bbe064..cd209bbe064 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/CollaborationUse.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/CollaborationUse.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/CombinedFragment.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/CombinedFragment.gif
index ad2d9bb4d46..ad2d9bb4d46 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/CombinedFragment.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/CombinedFragment.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/Comment.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/Comment.gif
index c495731c682..c495731c682 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/Comment.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/Comment.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/CommunicationPath.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/CommunicationPath.gif
index 7c6185ff7ba..7c6185ff7ba 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/CommunicationPath.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/CommunicationPath.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/Component.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/Component.gif
index 56b94fc30b6..56b94fc30b6 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/Component.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/Component.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/ComponentRealization.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/ComponentRealization.gif
index 14cdfbbe2f1..14cdfbbe2f1 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/ComponentRealization.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/ComponentRealization.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/ConditionalNode.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/ConditionalNode.gif
index 0b4dcdf39da..0b4dcdf39da 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/ConditionalNode.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/ConditionalNode.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/ConnectableElementTemplateParameter.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/ConnectableElementTemplateParameter.gif
index f26173edbfb..f26173edbfb 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/ConnectableElementTemplateParameter.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/ConnectableElementTemplateParameter.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/ConnectionPointReference.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/ConnectionPointReference.gif
index 45db5cc9d31..45db5cc9d31 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/ConnectionPointReference.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/ConnectionPointReference.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/Connector.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/Connector.gif
index 88ec3eca998..88ec3eca998 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/Connector.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/Connector.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/ConnectorEnd.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/ConnectorEnd.gif
index a23b0b0a006..a23b0b0a006 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/ConnectorEnd.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/ConnectorEnd.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/Connector_assembly.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/Connector_assembly.gif
index ee13f291c94..ee13f291c94 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/Connector_assembly.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/Connector_assembly.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/Connector_delegation.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/Connector_delegation.gif
index f8a113349d7..f8a113349d7 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/Connector_delegation.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/Connector_delegation.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/ConsiderIgnoreFragment.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/ConsiderIgnoreFragment.gif
index 8943fc08174..8943fc08174 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/ConsiderIgnoreFragment.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/ConsiderIgnoreFragment.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/Constraint.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/Constraint.gif
index eed6acec1ee..eed6acec1ee 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/Constraint.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/Constraint.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/Continuation.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/Continuation.gif
index 2c83df9ac9c..2c83df9ac9c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/Continuation.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/Continuation.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/ControlFlow.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/ControlFlow.gif
index 8fbd465fadf..8fbd465fadf 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/ControlFlow.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/ControlFlow.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/CreateLinkAction.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/CreateLinkAction.gif
index 2f99e5d94ca..2f99e5d94ca 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/CreateLinkAction.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/CreateLinkAction.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/CreateLinkObjectAction.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/CreateLinkObjectAction.gif
index 7c253acdfdd..7c253acdfdd 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/CreateLinkObjectAction.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/CreateLinkObjectAction.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/CreateObjectAction.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/CreateObjectAction.gif
index 3842c5e2896..3842c5e2896 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/CreateObjectAction.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/CreateObjectAction.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/CreationEvent.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/CreationEvent.gif
index 4419a3d6dd1..4419a3d6dd1 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/CreationEvent.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/CreationEvent.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/DataStoreNode.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/DataStoreNode.gif
index 08c1cd54cc5..08c1cd54cc5 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/DataStoreNode.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/DataStoreNode.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/DataType.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/DataType.gif
index e7dec0cfd6c..e7dec0cfd6c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/DataType.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/DataType.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/DecisionNode.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/DecisionNode.gif
index 3848165ec94..3848165ec94 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/DecisionNode.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/DecisionNode.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/Delete_16x16.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/Delete_16x16.gif
index b6922ac11cf..b6922ac11cf 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/Delete_16x16.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/Delete_16x16.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/Dependency.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/Dependency.gif
index 1d9c7e3c63b..1d9c7e3c63b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/Dependency.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/Dependency.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/Deployment.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/Deployment.gif
index e4691c3bace..e4691c3bace 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/Deployment.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/Deployment.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/DeploymentSpecification.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/DeploymentSpecification.gif
index 626bddf32f8..626bddf32f8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/DeploymentSpecification.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/DeploymentSpecification.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/DestroyLinkAction.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/DestroyLinkAction.gif
index ffa1793909f..ffa1793909f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/DestroyLinkAction.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/DestroyLinkAction.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/DestroyObjectAction.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/DestroyObjectAction.gif
index 9a0d8583f5c..9a0d8583f5c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/DestroyObjectAction.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/DestroyObjectAction.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/DestructionEvent.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/DestructionEvent.gif
index 8f8741be106..8f8741be106 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/DestructionEvent.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/DestructionEvent.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/Device.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/Device.gif
index a181e6fd695..a181e6fd695 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/Device.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/Device.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/Duration.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/Duration.gif
index ccbe76de5ef..ccbe76de5ef 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/Duration.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/Duration.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/DurationConstraint.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/DurationConstraint.gif
index c355addc76c..c355addc76c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/DurationConstraint.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/DurationConstraint.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/DurationInterval.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/DurationInterval.gif
index 7a8e3ea1fc2..7a8e3ea1fc2 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/DurationInterval.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/DurationInterval.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/DurationObservation.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/DurationObservation.gif
index da5759fb435..da5759fb435 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/DurationObservation.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/DurationObservation.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/ElementImport.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/ElementImport.gif
index dd39064bc88..dd39064bc88 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/ElementImport.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/ElementImport.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/Enumeration.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/Enumeration.gif
index 4e5dcd0f565..4e5dcd0f565 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/Enumeration.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/Enumeration.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/EnumerationLiteral.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/EnumerationLiteral.gif
index cab41ef6b18..cab41ef6b18 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/EnumerationLiteral.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/EnumerationLiteral.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/ExceptionHandler.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/ExceptionHandler.gif
index d4af8d5ff8a..d4af8d5ff8a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/ExceptionHandler.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/ExceptionHandler.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/ExecutionEnvironment.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/ExecutionEnvironment.gif
index d05a59e961e..d05a59e961e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/ExecutionEnvironment.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/ExecutionEnvironment.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/ExecutionEvent.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/ExecutionEvent.gif
index 3d0e912caa1..3d0e912caa1 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/ExecutionEvent.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/ExecutionEvent.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/ExecutionOccurrenceSpecification.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/ExecutionOccurrenceSpecification.gif
index c95743aa66d..c95743aa66d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/ExecutionOccurrenceSpecification.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/ExecutionOccurrenceSpecification.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/ExpansionNode.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/ExpansionNode.gif
index 17be38b72e1..17be38b72e1 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/ExpansionNode.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/ExpansionNode.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/ExpansionRegion.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/ExpansionRegion.gif
index 9afad61e179..9afad61e179 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/ExpansionRegion.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/ExpansionRegion.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/Expression.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/Expression.gif
index 4c5d117d5d7..4c5d117d5d7 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/Expression.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/Expression.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/Extend.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/Extend.gif
index 27d876864ca..27d876864ca 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/Extend.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/Extend.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/Extension.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/Extension.gif
index d6e7b151c61..d6e7b151c61 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/Extension.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/Extension.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/ExtensionEnd.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/ExtensionEnd.gif
index 9a325e982e9..9a325e982e9 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/ExtensionEnd.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/ExtensionEnd.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/ExtensionPoint.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/ExtensionPoint.gif
index 72c6415e2ef..72c6415e2ef 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/ExtensionPoint.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/ExtensionPoint.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/FinalState.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/FinalState.gif
index d3972a3333b..d3972a3333b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/FinalState.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/FinalState.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/FlowFinalNode.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/FlowFinalNode.gif
index 701d34c1711..701d34c1711 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/FlowFinalNode.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/FlowFinalNode.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/ForkNode.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/ForkNode.gif
index fff0cfeaa00..fff0cfeaa00 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/ForkNode.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/ForkNode.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/FunctionBehavior.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/FunctionBehavior.gif
index ca01f01a928..ca01f01a928 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/FunctionBehavior.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/FunctionBehavior.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/Gate.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/Gate.gif
index 8a2673d81e2..8a2673d81e2 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/Gate.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/Gate.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/GeneralOrdering.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/GeneralOrdering.gif
index 623c8dbb99a..623c8dbb99a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/GeneralOrdering.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/GeneralOrdering.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/Generalization.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/Generalization.gif
index 20013dff017..20013dff017 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/Generalization.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/Generalization.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/GeneralizationSet.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/GeneralizationSet.gif
index fc9ec3119ad..fc9ec3119ad 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/GeneralizationSet.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/GeneralizationSet.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/Image.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/Image.gif
index 07e259867da..07e259867da 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/Image.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/Image.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/Include.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/Include.gif
index b19b0af6874..b19b0af6874 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/Include.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/Include.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/InformationFlow.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/InformationFlow.gif
index 31c9dc87412..31c9dc87412 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/InformationFlow.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/InformationFlow.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/InformationItem.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/InformationItem.gif
index d58d685bc2f..d58d685bc2f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/InformationItem.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/InformationItem.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/InitialNode.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/InitialNode.gif
index 7f1edff8a4a..7f1edff8a4a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/InitialNode.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/InitialNode.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/InputPin.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/InputPin.gif
index 77a927c550e..77a927c550e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/InputPin.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/InputPin.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/InstanceSpecification.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/InstanceSpecification.gif
index 862dd9eb00f..862dd9eb00f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/InstanceSpecification.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/InstanceSpecification.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/InstanceValue.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/InstanceValue.gif
index b821b12e1f6..b821b12e1f6 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/InstanceValue.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/InstanceValue.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/Interaction.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/Interaction.gif
index 1da8b146bc9..1da8b146bc9 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/Interaction.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/Interaction.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/InteractionConstraint.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/InteractionConstraint.gif
index ff0e0c96411..ff0e0c96411 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/InteractionConstraint.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/InteractionConstraint.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/InteractionOperand.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/InteractionOperand.gif
index 36c6979aad2..36c6979aad2 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/InteractionOperand.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/InteractionOperand.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/InteractionUse.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/InteractionUse.gif
index 30c49440d27..30c49440d27 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/InteractionUse.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/InteractionUse.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/Interface.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/Interface.gif
index 517996a6530..517996a6530 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/Interface.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/Interface.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/InterfaceRealization.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/InterfaceRealization.gif
index e73f5788ced..e73f5788ced 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/InterfaceRealization.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/InterfaceRealization.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/InterruptibleActivityRegion.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/InterruptibleActivityRegion.gif
index 18b47c1ba09..18b47c1ba09 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/InterruptibleActivityRegion.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/InterruptibleActivityRegion.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/Interval.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/Interval.gif
index 26d01180f64..26d01180f64 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/Interval.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/Interval.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/IntervalConstraint.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/IntervalConstraint.gif
index 7416f5c9070..7416f5c9070 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/IntervalConstraint.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/IntervalConstraint.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/JoinNode.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/JoinNode.gif
index a5d1ef858cc..a5d1ef858cc 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/JoinNode.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/JoinNode.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/Lifeline.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/Lifeline.gif
index 712a25989f2..712a25989f2 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/Lifeline.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/Lifeline.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/LinkEndCreationData.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/LinkEndCreationData.gif
index 5a57b7bdd84..5a57b7bdd84 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/LinkEndCreationData.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/LinkEndCreationData.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/LinkEndData.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/LinkEndData.gif
index ee8fbcc1b8e..ee8fbcc1b8e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/LinkEndData.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/LinkEndData.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/LinkEndDestructionData.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/LinkEndDestructionData.gif
index 660151bc870..660151bc870 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/LinkEndDestructionData.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/LinkEndDestructionData.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/LiteralBoolean.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/LiteralBoolean.gif
index 656797fed0c..656797fed0c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/LiteralBoolean.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/LiteralBoolean.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/LiteralInteger.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/LiteralInteger.gif
index 3bd99b385e2..3bd99b385e2 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/LiteralInteger.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/LiteralInteger.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/LiteralNull.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/LiteralNull.gif
index d28f9ccf273..d28f9ccf273 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/LiteralNull.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/LiteralNull.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/LiteralString.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/LiteralString.gif
index ef367ef6102..ef367ef6102 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/LiteralString.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/LiteralString.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/LiteralUnlimitedNatural.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/LiteralUnlimitedNatural.gif
index f1f019535ea..f1f019535ea 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/LiteralUnlimitedNatural.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/LiteralUnlimitedNatural.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/LoadResource.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/LoadResource.gif
index f2c989e6579..f2c989e6579 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/LoadResource.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/LoadResource.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/LoopNode.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/LoopNode.gif
index f93584fcb6d..f93584fcb6d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/LoopNode.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/LoopNode.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/Manifestation.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/Manifestation.gif
index de016683c1b..de016683c1b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/Manifestation.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/Manifestation.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/MergeNode.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/MergeNode.gif
index 739077c3ca7..739077c3ca7 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/MergeNode.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/MergeNode.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/Message.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/Message.gif
index bc0ef1b05c8..bc0ef1b05c8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/Message.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/Message.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/MessageOccurrenceSpecification.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/MessageOccurrenceSpecification.gif
index 35df2a55a40..35df2a55a40 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/MessageOccurrenceSpecification.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/MessageOccurrenceSpecification.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/Message_asynchCall.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/Message_asynchCall.gif
index 8957581f7b1..8957581f7b1 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/Message_asynchCall.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/Message_asynchCall.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/Message_asynchSignal.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/Message_asynchSignal.gif
index dade1f84fa0..dade1f84fa0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/Message_asynchSignal.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/Message_asynchSignal.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/Message_createMessage.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/Message_createMessage.gif
index 2427bf20d38..2427bf20d38 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/Message_createMessage.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/Message_createMessage.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/Message_deleteMessage.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/Message_deleteMessage.gif
index 991a48ad523..991a48ad523 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/Message_deleteMessage.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/Message_deleteMessage.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/Message_reply.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/Message_reply.gif
index 32614bddc7a..32614bddc7a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/Message_reply.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/Message_reply.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/Message_synchCall.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/Message_synchCall.gif
index de0890227e1..de0890227e1 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/Message_synchCall.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/Message_synchCall.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/Model.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/Model.gif
index 36a276dbdca..36a276dbdca 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/Model.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/Model.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/Modify.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/Modify.gif
index 17d8b2e7aa0..17d8b2e7aa0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/Modify.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/Modify.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/Node.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/Node.gif
index 047a553f7f0..047a553f7f0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/Node.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/Node.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/ObjectFlow.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/ObjectFlow.gif
index e7d848dea6c..e7d848dea6c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/ObjectFlow.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/ObjectFlow.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/OccurrenceSpecification.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/OccurrenceSpecification.gif
index 7c23f2f1d13..7c23f2f1d13 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/OccurrenceSpecification.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/OccurrenceSpecification.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/OpaqueAction.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/OpaqueAction.gif
index 01b03d5430e..01b03d5430e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/OpaqueAction.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/OpaqueAction.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/OpaqueBehavior.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/OpaqueBehavior.gif
index a22358e72e1..a22358e72e1 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/OpaqueBehavior.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/OpaqueBehavior.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/OpaqueExpression.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/OpaqueExpression.gif
index cb087e40d05..cb087e40d05 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/OpaqueExpression.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/OpaqueExpression.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/Operation.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/Operation.gif
index 01350e3c3c7..01350e3c3c7 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/Operation.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/Operation.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/OperationTemplateParameter.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/OperationTemplateParameter.gif
index 5aff7d9d5c4..5aff7d9d5c4 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/OperationTemplateParameter.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/OperationTemplateParameter.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/OutputPin.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/OutputPin.gif
index 7d741f808d1..7d741f808d1 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/OutputPin.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/OutputPin.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/Package.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/Package.gif
index e79ecca80f4..e79ecca80f4 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/Package.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/Package.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/PackageImport.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/PackageImport.gif
index 4b5f91e7583..4b5f91e7583 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/PackageImport.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/PackageImport.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/PackageMerge.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/PackageMerge.gif
index 4b7c2ffb458..4b7c2ffb458 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/PackageMerge.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/PackageMerge.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/Parameter.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/Parameter.gif
index d468477f9b4..d468477f9b4 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/Parameter.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/Parameter.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/ParameterSet.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/ParameterSet.gif
index 0667887f243..0667887f243 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/ParameterSet.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/ParameterSet.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/Parameter_in.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/Parameter_in.gif
index d12cafac18a..d12cafac18a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/Parameter_in.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/Parameter_in.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/Parameter_inout.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/Parameter_inout.gif
index 87a6574afc8..87a6574afc8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/Parameter_inout.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/Parameter_inout.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/Parameter_out.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/Parameter_out.gif
index aeea60e19a8..aeea60e19a8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/Parameter_out.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/Parameter_out.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/Parameter_return.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/Parameter_return.gif
index 4a421c211b3..4a421c211b3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/Parameter_return.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/Parameter_return.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/PartDecomposition.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/PartDecomposition.gif
index cf9cabea077..cf9cabea077 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/PartDecomposition.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/PartDecomposition.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/Pin.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/Pin.gif
index da5ffc84def..da5ffc84def 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/Pin.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/Pin.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/Plus.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/Plus.gif
index 252d7ebcb8c..252d7ebcb8c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/Plus.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/Plus.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/Port.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/Port.gif
index 43d235b47e9..43d235b47e9 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/Port.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/Port.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/PrimitiveType.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/PrimitiveType.gif
index 25d576699ee..25d576699ee 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/PrimitiveType.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/PrimitiveType.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/Profile.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/Profile.gif
index 18eed1f5cb9..18eed1f5cb9 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/Profile.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/Profile.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/ProfileApplication.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/ProfileApplication.gif
index 2638d49f546..2638d49f546 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/ProfileApplication.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/ProfileApplication.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/Property.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/Property.gif
index 99b7fa68d96..99b7fa68d96 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/Property.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/Property.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/ProtocolConformance.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/ProtocolConformance.gif
index bc653fc8f39..bc653fc8f39 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/ProtocolConformance.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/ProtocolConformance.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/ProtocolStateMachine.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/ProtocolStateMachine.gif
index c2bb71561a7..c2bb71561a7 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/ProtocolStateMachine.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/ProtocolStateMachine.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/ProtocolTransition.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/ProtocolTransition.gif
index d15825e228e..d15825e228e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/ProtocolTransition.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/ProtocolTransition.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/Pseudostate.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/Pseudostate.gif
index 1df8f27de10..1df8f27de10 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/Pseudostate.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/Pseudostate.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/Pseudostate_choice.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/Pseudostate_choice.gif
index 78419574959..78419574959 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/Pseudostate_choice.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/Pseudostate_choice.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/Pseudostate_deepHistory.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/Pseudostate_deepHistory.gif
index 1aa02f7a617..1aa02f7a617 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/Pseudostate_deepHistory.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/Pseudostate_deepHistory.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/Pseudostate_entryPoint.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/Pseudostate_entryPoint.gif
index d3050fb5f8e..d3050fb5f8e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/Pseudostate_entryPoint.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/Pseudostate_entryPoint.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/Pseudostate_exitPoint.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/Pseudostate_exitPoint.gif
index 8643925e7dd..8643925e7dd 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/Pseudostate_exitPoint.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/Pseudostate_exitPoint.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/Pseudostate_fork.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/Pseudostate_fork.gif
index fff0cfeaa00..fff0cfeaa00 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/Pseudostate_fork.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/Pseudostate_fork.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/Pseudostate_initial.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/Pseudostate_initial.gif
index 169e08988d0..169e08988d0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/Pseudostate_initial.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/Pseudostate_initial.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/Pseudostate_join.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/Pseudostate_join.gif
index a5d1ef858cc..a5d1ef858cc 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/Pseudostate_join.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/Pseudostate_join.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/Pseudostate_junction.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/Pseudostate_junction.gif
index edb56531099..edb56531099 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/Pseudostate_junction.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/Pseudostate_junction.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/Pseudostate_shallowHistory.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/Pseudostate_shallowHistory.gif
index 32b56a4c728..32b56a4c728 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/Pseudostate_shallowHistory.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/Pseudostate_shallowHistory.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/Pseudostate_terminate.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/Pseudostate_terminate.gif
index 9181fb99ffc..9181fb99ffc 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/Pseudostate_terminate.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/Pseudostate_terminate.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/QualifierValue.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/QualifierValue.gif
index 48f39c4fb6b..48f39c4fb6b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/QualifierValue.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/QualifierValue.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/RaiseExceptionAction.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/RaiseExceptionAction.gif
index fa16a6d4dbf..fa16a6d4dbf 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/RaiseExceptionAction.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/RaiseExceptionAction.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/ReadExtentAction.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/ReadExtentAction.gif
index 0242a644e97..0242a644e97 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/ReadExtentAction.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/ReadExtentAction.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/ReadIsClassifiedObjectAction.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/ReadIsClassifiedObjectAction.gif
index 4208b08f26e..4208b08f26e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/ReadIsClassifiedObjectAction.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/ReadIsClassifiedObjectAction.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/ReadLinkAction.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/ReadLinkAction.gif
index d547f75d991..d547f75d991 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/ReadLinkAction.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/ReadLinkAction.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/ReadLinkObjectEndAction.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/ReadLinkObjectEndAction.gif
index 8fbc8a990a4..8fbc8a990a4 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/ReadLinkObjectEndAction.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/ReadLinkObjectEndAction.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/ReadLinkObjectEndQualifierAction.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/ReadLinkObjectEndQualifierAction.gif
index ab2245f6b6b..ab2245f6b6b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/ReadLinkObjectEndQualifierAction.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/ReadLinkObjectEndQualifierAction.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/ReadSelfAction.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/ReadSelfAction.gif
index 2c66a9ab367..2c66a9ab367 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/ReadSelfAction.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/ReadSelfAction.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/ReadStructuralFeatureAction.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/ReadStructuralFeatureAction.gif
index 7963550be9a..7963550be9a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/ReadStructuralFeatureAction.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/ReadStructuralFeatureAction.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/ReadVariableAction.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/ReadVariableAction.gif
index c0e8d904218..c0e8d904218 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/ReadVariableAction.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/ReadVariableAction.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/Realization.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/Realization.gif
index 81880dda556..81880dda556 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/Realization.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/Realization.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/ReceiveOperationEvent.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/ReceiveOperationEvent.gif
index 4b62cecac05..4b62cecac05 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/ReceiveOperationEvent.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/ReceiveOperationEvent.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/ReceiveSignalEvent.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/ReceiveSignalEvent.gif
index c3be49c806b..c3be49c806b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/ReceiveSignalEvent.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/ReceiveSignalEvent.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/Reception.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/Reception.gif
index bec9f0e7797..bec9f0e7797 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/Reception.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/Reception.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/ReclassifyObjectAction.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/ReclassifyObjectAction.gif
index 360c87d8bd0..360c87d8bd0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/ReclassifyObjectAction.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/ReclassifyObjectAction.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/RedefinableTemplateSignature.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/RedefinableTemplateSignature.gif
index 9450bc50f13..9450bc50f13 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/RedefinableTemplateSignature.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/RedefinableTemplateSignature.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/ReduceAction.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/ReduceAction.gif
index 1e1594cfb90..1e1594cfb90 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/ReduceAction.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/ReduceAction.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/Region.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/Region.gif
index 2c9c14cb664..2c9c14cb664 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/Region.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/Region.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/RemoveStructuralFeatureValueAction.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/RemoveStructuralFeatureValueAction.gif
index d21c8e75737..d21c8e75737 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/RemoveStructuralFeatureValueAction.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/RemoveStructuralFeatureValueAction.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/RemoveVariableValueAction.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/RemoveVariableValueAction.gif
index 8bba16e984f..8bba16e984f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/RemoveVariableValueAction.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/RemoveVariableValueAction.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/ReplyAction.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/ReplyAction.gif
index 1cef6b70d74..1cef6b70d74 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/ReplyAction.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/ReplyAction.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/SendObjectAction.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/SendObjectAction.gif
index fd34b21391a..fd34b21391a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/SendObjectAction.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/SendObjectAction.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/SendOperationEvent.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/SendOperationEvent.gif
index 73e5c13dad0..73e5c13dad0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/SendOperationEvent.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/SendOperationEvent.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/SendSignalAction.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/SendSignalAction.gif
index 5f6e1bf60ee..5f6e1bf60ee 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/SendSignalAction.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/SendSignalAction.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/SendSignalEvent.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/SendSignalEvent.gif
index c0bf7e3998c..c0bf7e3998c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/SendSignalEvent.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/SendSignalEvent.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/SequenceNode.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/SequenceNode.gif
index e0347d8afa0..e0347d8afa0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/SequenceNode.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/SequenceNode.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/Signal.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/Signal.gif
index 9a0860f246a..9a0860f246a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/Signal.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/Signal.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/SignalEvent.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/SignalEvent.gif
index 691be51da4f..691be51da4f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/SignalEvent.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/SignalEvent.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/Slot.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/Slot.gif
index a5156ed11aa..a5156ed11aa 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/Slot.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/Slot.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/StartClassifierBehaviorAction.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/StartClassifierBehaviorAction.gif
index cda0f6e6c97..cda0f6e6c97 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/StartClassifierBehaviorAction.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/StartClassifierBehaviorAction.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/State.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/State.gif
index 5a2f9073516..5a2f9073516 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/State.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/State.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/StateInvariant.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/StateInvariant.gif
index 0e9f0737745..0e9f0737745 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/StateInvariant.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/StateInvariant.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/StateMachine.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/StateMachine.gif
index b58ee23f9c3..b58ee23f9c3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/StateMachine.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/StateMachine.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/Stereotype.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/Stereotype.gif
index 145e5d589d8..145e5d589d8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/Stereotype.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/Stereotype.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/StringExpression.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/StringExpression.gif
index 6c0b28e4043..6c0b28e4043 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/StringExpression.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/StringExpression.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/StructuredActivityNode.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/StructuredActivityNode.gif
index 260fb2909ce..260fb2909ce 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/StructuredActivityNode.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/StructuredActivityNode.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/Substitution.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/Substitution.gif
index e86854e07cf..e86854e07cf 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/Substitution.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/Substitution.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/TemplateBinding.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/TemplateBinding.gif
index 37972e18f99..37972e18f99 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/TemplateBinding.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/TemplateBinding.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/TemplateParameter.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/TemplateParameter.gif
index 8f9b4b595b2..8f9b4b595b2 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/TemplateParameter.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/TemplateParameter.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/TemplateParameterSubstitution.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/TemplateParameterSubstitution.gif
index 382ccb018b6..382ccb018b6 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/TemplateParameterSubstitution.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/TemplateParameterSubstitution.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/TemplateSignature.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/TemplateSignature.gif
index 1d1e425cab9..1d1e425cab9 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/TemplateSignature.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/TemplateSignature.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/TestIdentityAction.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/TestIdentityAction.gif
index 8cf783c23de..8cf783c23de 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/TestIdentityAction.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/TestIdentityAction.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/Thumbs.db b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/Thumbs.db
index 69fc6b5982e..69fc6b5982e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/Thumbs.db
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/Thumbs.db
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/TimeConstraint.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/TimeConstraint.gif
index 8bd27e05717..8bd27e05717 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/TimeConstraint.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/TimeConstraint.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/TimeEvent.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/TimeEvent.gif
index ed6a8660e06..ed6a8660e06 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/TimeEvent.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/TimeEvent.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/TimeExpression.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/TimeExpression.gif
index 5c9d232cb44..5c9d232cb44 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/TimeExpression.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/TimeExpression.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/TimeInterval.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/TimeInterval.gif
index afb8fa9e041..afb8fa9e041 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/TimeInterval.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/TimeInterval.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/TimeObservation.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/TimeObservation.gif
index c5b068515f5..c5b068515f5 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/TimeObservation.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/TimeObservation.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/Transition.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/Transition.gif
index 938aeed09fc..938aeed09fc 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/Transition.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/Transition.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/Transition_external.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/Transition_external.gif
index db357d548b4..db357d548b4 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/Transition_external.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/Transition_external.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/Transition_internal.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/Transition_internal.gif
index ae55cda6520..ae55cda6520 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/Transition_internal.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/Transition_internal.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/Transition_local.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/Transition_local.gif
index 65b7e1b2619..65b7e1b2619 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/Transition_local.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/Transition_local.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/Trigger.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/Trigger.gif
index 0b53cf6e296..0b53cf6e296 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/Trigger.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/Trigger.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/UMLDiagramFile.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/UMLDiagramFile.gif
index de938070dea..de938070dea 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/UMLDiagramFile.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/UMLDiagramFile.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/UnloadResource.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/UnloadResource.gif
index c1c07a7456b..c1c07a7456b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/UnloadResource.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/UnloadResource.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/UnmarshallAction.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/UnmarshallAction.gif
index 85fd404d041..85fd404d041 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/UnmarshallAction.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/UnmarshallAction.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/Usage.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/Usage.gif
index 6f8d212ebc4..6f8d212ebc4 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/Usage.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/Usage.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/UseCase.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/UseCase.gif
index 570069f1960..570069f1960 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/UseCase.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/UseCase.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/ValuePin.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/ValuePin.gif
index 16ab90864f0..16ab90864f0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/ValuePin.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/ValuePin.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/ValueSpecificationAction.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/ValueSpecificationAction.gif
index 86e7600b1bf..86e7600b1bf 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/ValueSpecificationAction.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/ValueSpecificationAction.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/Variable.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/Variable.gif
index cb47d00d9c9..cb47d00d9c9 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/Variable.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/Variable.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/call.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/call.gif
index d5aed7aa013..d5aed7aa013 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/call.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/call.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/eraser.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/eraser.gif
index 6bc10f9d07c..6bc10f9d07c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/eraser.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/eraser.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/file.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/file.gif
index ef302880717..ef302880717 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/file.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/file.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/hyperlink.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/hyperlink.gif
index 1e09d979520..1e09d979520 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/hyperlink.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/hyperlink.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/insp_sbook.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/insp_sbook.gif
index e936fbabfec..e936fbabfec 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/insp_sbook.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/insp_sbook.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/message_info.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/message_info.gif
index b484d9be1e9..b484d9be1e9 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/obj16/message_info.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/obj16/message_info.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/papyrus/PapyrusLogo16x16.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/papyrus/PapyrusLogo16x16.gif
index 8a31f458379..8a31f458379 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/papyrus/PapyrusLogo16x16.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/papyrus/PapyrusLogo16x16.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/papyrus/PapyrusLogo24x24.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/papyrus/PapyrusLogo24x24.gif
index 35bcddb69a8..35bcddb69a8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/papyrus/PapyrusLogo24x24.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/papyrus/PapyrusLogo24x24.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/papyrus/PapyrusLogo256x256.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/papyrus/PapyrusLogo256x256.gif
index aec1e61d4ce..aec1e61d4ce 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/papyrus/PapyrusLogo256x256.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/papyrus/PapyrusLogo256x256.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/papyrus/PapyrusLogo32x32.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/papyrus/PapyrusLogo32x32.gif
index 50cd9a142ee..50cd9a142ee 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/papyrus/PapyrusLogo32x32.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/papyrus/PapyrusLogo32x32.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/papyrus/PapyrusLogo48x48.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/papyrus/PapyrusLogo48x48.gif
index a1d04e56539..a1d04e56539 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/papyrus/PapyrusLogo48x48.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/papyrus/PapyrusLogo48x48.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/paste_edit.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/paste_edit.gif
index 39dd4d9d38a..39dd4d9d38a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/paste_edit.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/paste_edit.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/plugin_desc.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/plugin_desc.gif
index 8493df40dfe..8493df40dfe 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/plugin_desc.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/plugin_desc.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/profile.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/profile.gif
index 18eed1f5cb9..18eed1f5cb9 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/profile.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/profile.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/sample.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/sample.gif
index 34fb3c9d8cb..34fb3c9d8cb 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/sample.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/sample.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/separator.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/separator.gif
index cb415064e02..cb415064e02 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/separator.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/separator.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/size_to_control.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/size_to_control.gif
index 749644cf0c8..749644cf0c8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/size_to_control.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/size_to_control.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/size_to_control_height.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/size_to_control_height.gif
index 5e060428f98..5e060428f98 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/size_to_control_height.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/size_to_control_height.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/size_to_control_width.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/size_to_control_width.gif
index 478cc1eb568..478cc1eb568 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/size_to_control_width.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/size_to_control_width.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/stack.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/stack.gif
index 234486172ca..234486172ca 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/stack.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/stack.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/stereotype.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/stereotype.gif
index 145e5d589d8..145e5d589d8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/stereotype.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/stereotype.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/stereotype_display.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/stereotype_display.gif
index f8a7be331a3..f8a7be331a3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/stereotype_display.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/stereotype_display.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/switch_provider.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/switch_provider.gif
index f52d86a671b..f52d86a671b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/switch_provider.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/switch_provider.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/tool.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/tool.gif
index 9dfa28cb9e3..9dfa28cb9e3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/tool.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/tool.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/tools_hidden.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/tools_hidden.gif
index e7fad274c0c..e7fad274c0c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/tools_hidden.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/tools_hidden.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/tools_shown.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/tools_shown.gif
index 9dfa28cb9e3..9dfa28cb9e3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/tools_shown.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/tools_shown.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/validation.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/validation.gif
index e5b67efc55b..e5b67efc55b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/validation.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/validation.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/vertical_by_bottom.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/vertical_by_bottom.gif
index 8f4fa833e52..8f4fa833e52 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/vertical_by_bottom.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/vertical_by_bottom.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/vertical_by_top.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/vertical_by_top.gif
index 737656cb512..737656cb512 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/vertical_by_top.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/vertical_by_top.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/warning.gif b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/warning.gif
index 2f1c5a8fa7b..2f1c5a8fa7b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/icons/warning.gif
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/icons/warning.gif
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/messages.properties b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/messages.properties
index cc948ac021b..cc948ac021b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/messages.properties
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/messages.properties
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/model/Action.gmfgraph b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/model/Action.gmfgraph
index d63b39b6d7a..d63b39b6d7a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/model/Action.gmfgraph
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/model/Action.gmfgraph
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/model/Association.gmfgraph b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/model/Association.gmfgraph
index 1fa6e738fd7..1fa6e738fd7 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/model/Association.gmfgraph
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/model/Association.gmfgraph
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/model/Classifier.gmfgraph b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/model/Classifier.gmfgraph
index 469d6da156f..469d6da156f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/model/Classifier.gmfgraph
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/model/Classifier.gmfgraph
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/model/Comment.gmfgraph b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/model/Comment.gmfgraph
index 9db0344bd14..9db0344bd14 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/model/Comment.gmfgraph
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/model/Comment.gmfgraph
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/model/Constraint.gmfgraph b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/model/Constraint.gmfgraph
index 9a701a95d03..9a701a95d03 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/model/Constraint.gmfgraph
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/model/Constraint.gmfgraph
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/model/Dependency.gmfgraph b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/model/Dependency.gmfgraph
index 706150bdbe0..706150bdbe0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/model/Dependency.gmfgraph
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/model/Dependency.gmfgraph
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/model/DiamondNode.gmfgraph b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/model/DiamondNode.gmfgraph
index 6f1a0a86b38..6f1a0a86b38 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/model/DiamondNode.gmfgraph
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/model/DiamondNode.gmfgraph
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/model/Enumeration.gmfgraph b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/model/Enumeration.gmfgraph
index 1ddf0a0bd48..1ddf0a0bd48 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/model/Enumeration.gmfgraph
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/model/Enumeration.gmfgraph
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/model/FinalNode.gmfgraph b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/model/FinalNode.gmfgraph
index 5954e530f2f..5954e530f2f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/model/FinalNode.gmfgraph
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/model/FinalNode.gmfgraph
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/model/FlowFinalNode.gmfgraph b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/model/FlowFinalNode.gmfgraph
index 95a486b8f3a..95a486b8f3a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/model/FlowFinalNode.gmfgraph
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/model/FlowFinalNode.gmfgraph
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/model/ForkNode.gmfgraph b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/model/ForkNode.gmfgraph
index 45d589199b0..45d589199b0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/model/ForkNode.gmfgraph
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/model/ForkNode.gmfgraph
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/model/Generalization.gmfgraph b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/model/Generalization.gmfgraph
index 0162cbc7aac..0162cbc7aac 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/model/Generalization.gmfgraph
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/model/Generalization.gmfgraph
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/model/InitialNode.gmfgraph b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/model/InitialNode.gmfgraph
index c6a71306bd3..c6a71306bd3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/model/InitialNode.gmfgraph
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/model/InitialNode.gmfgraph
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/model/InstanceSpecification.gmfgraph b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/model/InstanceSpecification.gmfgraph
index a334825bd51..a334825bd51 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/model/InstanceSpecification.gmfgraph
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/model/InstanceSpecification.gmfgraph
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/model/InterfaceRealization.gmfgraph b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/model/InterfaceRealization.gmfgraph
index cdf1d0ec723..cdf1d0ec723 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/model/InterfaceRealization.gmfgraph
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/model/InterfaceRealization.gmfgraph
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/model/NodeNamedElement.gmfgraph b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/model/NodeNamedElement.gmfgraph
index 1ba2eabd061..1ba2eabd061 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/model/NodeNamedElement.gmfgraph
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/model/NodeNamedElement.gmfgraph
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/model/PackageElement.gmfgraph b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/model/PackageElement.gmfgraph
index ec16df88b1d..ec16df88b1d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/model/PackageElement.gmfgraph
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/model/PackageElement.gmfgraph
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/model/PrimitiveType.gmfgraph b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/model/PrimitiveType.gmfgraph
index ed59ff83838..ed59ff83838 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/model/PrimitiveType.gmfgraph
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/model/PrimitiveType.gmfgraph
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/model/ReceiveNodeFigure.gmfgraph b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/model/ReceiveNodeFigure.gmfgraph
index 182838f0208..182838f0208 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/model/ReceiveNodeFigure.gmfgraph
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/model/ReceiveNodeFigure.gmfgraph
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/model/SendNodeFigure.gmfgraph b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/model/SendNodeFigure.gmfgraph
index 693fa124d2d..693fa124d2d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/model/SendNodeFigure.gmfgraph
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/model/SendNodeFigure.gmfgraph
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/model/SideNodeNamedElement.gmfgraph b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/model/SideNodeNamedElement.gmfgraph
index 5c687590fa5..5c687590fa5 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/model/SideNodeNamedElement.gmfgraph
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/model/SideNodeNamedElement.gmfgraph
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/model/Template.gmfgraph b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/model/Template.gmfgraph
index 4a9c65f4269..4a9c65f4269 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/model/Template.gmfgraph
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/model/Template.gmfgraph
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/plugin.properties b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/plugin.properties
index b62804bd640..b62804bd640 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/plugin.properties
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/plugin.properties
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/plugin.xml b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/plugin.xml
index 83d170ad75e..83d170ad75e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/plugin.xml
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/plugin.xml
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/schema/aspectToolProvider.exsd b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/schema/aspectToolProvider.exsd
index 39a4bec9146..39a4bec9146 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/schema/aspectToolProvider.exsd
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/schema/aspectToolProvider.exsd
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/schema/editorAssistantProvider.exsd b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/schema/editorAssistantProvider.exsd
index b676fa1fba9..b676fa1fba9 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/schema/editorAssistantProvider.exsd
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/schema/editorAssistantProvider.exsd
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/schema/modelToEditorMap.exsd b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/schema/modelToEditorMap.exsd
index fcac4d82f5d..fcac4d82f5d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/schema/modelToEditorMap.exsd
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/schema/modelToEditorMap.exsd
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/schema/moskittEditorFactory.exsd b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/schema/moskittEditorFactory.exsd
index dfd55da5a38..dfd55da5a38 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/schema/moskittEditorFactory.exsd
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/schema/moskittEditorFactory.exsd
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/schema/paletteDefinition.exsd b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/schema/paletteDefinition.exsd
index 01ff1c9df6c..01ff1c9df6c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/schema/paletteDefinition.exsd
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/schema/paletteDefinition.exsd
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/schema/viewInfo.exsd b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/schema/viewInfo.exsd
index 729863927ac..729863927ac 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/schema/viewInfo.exsd
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/schema/viewInfo.exsd
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/Activator.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/Activator.java
index 4004404d28f..4004404d28f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/Activator.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/Activator.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/Messages.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/Messages.java
index dec1516823e..dec1516823e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/Messages.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/Messages.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/OverlayVisibilityIcon.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/OverlayVisibilityIcon.java
index 9d35891e212..9d35891e212 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/OverlayVisibilityIcon.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/OverlayVisibilityIcon.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/ProfileApplicationPreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/ProfileApplicationPreferencePage.java
index 003b1dbf515..003b1dbf515 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/ProfileApplicationPreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/ProfileApplicationPreferencePage.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/actions/AbstractAction.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/actions/AbstractAction.java
index d85dedd9bf0..d85dedd9bf0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/actions/AbstractAction.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/actions/AbstractAction.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/actions/AbstractShowHideAction.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/actions/AbstractShowHideAction.java
index 92f5a0dce12..92f5a0dce12 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/actions/AbstractShowHideAction.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/actions/AbstractShowHideAction.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/actions/FilterViewsLabelItemProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/actions/FilterViewsLabelItemProvider.java
index 7f4832ef9f3..7f4832ef9f3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/actions/FilterViewsLabelItemProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/actions/FilterViewsLabelItemProvider.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/actions/FilterViewsLabelsAction.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/actions/FilterViewsLabelsAction.java
index 1e8bac93e90..1e8bac93e90 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/actions/FilterViewsLabelsAction.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/actions/FilterViewsLabelsAction.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/actions/FilterViewsLabelsPopupMenuContributionPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/actions/FilterViewsLabelsPopupMenuContributionPolicy.java
index 762853de97a..762853de97a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/actions/FilterViewsLabelsPopupMenuContributionPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/actions/FilterViewsLabelsPopupMenuContributionPolicy.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/actions/LabelHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/actions/LabelHelper.java
index 2dc73d869cb..2dc73d869cb 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/actions/LabelHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/actions/LabelHelper.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/actions/LoadResourceAction.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/actions/LoadResourceAction.java
index 3d4eb1090f4..3d4eb1090f4 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/actions/LoadResourceAction.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/actions/LoadResourceAction.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/actions/MoveCompartmentObjectAction.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/actions/MoveCompartmentObjectAction.java
index 4db8d477961..4db8d477961 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/actions/MoveCompartmentObjectAction.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/actions/MoveCompartmentObjectAction.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/actions/MoveCompartmentObjectItemProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/actions/MoveCompartmentObjectItemProvider.java
index 4bfe8b58576..4bfe8b58576 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/actions/MoveCompartmentObjectItemProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/actions/MoveCompartmentObjectItemProvider.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/actions/MoveCompartmentPopupContributionPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/actions/MoveCompartmentPopupContributionPolicy.java
index c113b43ba26..c113b43ba26 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/actions/MoveCompartmentPopupContributionPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/actions/MoveCompartmentPopupContributionPolicy.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/actions/PasteWithModelAction.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/actions/PasteWithModelAction.java
index 044f0816ee1..044f0816ee1 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/actions/PasteWithModelAction.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/actions/PasteWithModelAction.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/actions/RotateAction.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/actions/RotateAction.java
index 4f88781db63..4f88781db63 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/actions/RotateAction.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/actions/RotateAction.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/actions/ShowHideContentsAction.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/actions/ShowHideContentsAction.java
index 6056b0c0d95..6056b0c0d95 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/actions/ShowHideContentsAction.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/actions/ShowHideContentsAction.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/actions/ValidationAction.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/actions/ValidationAction.java
index 636fc755a80..636fc755a80 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/actions/ValidationAction.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/actions/ValidationAction.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/actions/ValidationPopupMenuContributionPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/actions/ValidationPopupMenuContributionPolicy.java
index 69cd6e69246..69cd6e69246 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/actions/ValidationPopupMenuContributionPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/actions/ValidationPopupMenuContributionPolicy.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/actions/handlers/AbstractShowHideHandler.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/actions/handlers/AbstractShowHideHandler.java
index 86d0063f36d..86d0063f36d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/actions/handlers/AbstractShowHideHandler.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/actions/handlers/AbstractShowHideHandler.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/actions/handlers/ClipboardActionHandler.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/actions/handlers/ClipboardActionHandler.java
index 9d731ee50ed..9d731ee50ed 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/actions/handlers/ClipboardActionHandler.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/actions/handlers/ClipboardActionHandler.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/actions/handlers/ClipboardActionHandlerProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/actions/handlers/ClipboardActionHandlerProvider.java
index 7dbaed8055d..7dbaed8055d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/actions/handlers/ClipboardActionHandlerProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/actions/handlers/ClipboardActionHandlerProvider.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/actions/handlers/UMLClipboardActionHandler.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/actions/handlers/UMLClipboardActionHandler.java
index d471b8fa320..d471b8fa320 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/actions/handlers/UMLClipboardActionHandler.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/actions/handlers/UMLClipboardActionHandler.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/command/wrappers/CommandProxyWithResult.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/command/wrappers/CommandProxyWithResult.java
index bd913fff527..bd913fff527 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/command/wrappers/CommandProxyWithResult.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/command/wrappers/CommandProxyWithResult.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/command/wrappers/EMFtoGEFCommandWrapper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/command/wrappers/EMFtoGEFCommandWrapper.java
index 8c048334291..8c048334291 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/command/wrappers/EMFtoGEFCommandWrapper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/command/wrappers/EMFtoGEFCommandWrapper.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/command/wrappers/EMFtoGMFCommandWrapper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/command/wrappers/EMFtoGMFCommandWrapper.java
index 20abe6afe95..20abe6afe95 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/command/wrappers/EMFtoGMFCommandWrapper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/command/wrappers/EMFtoGMFCommandWrapper.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/command/wrappers/GEFtoEMFCommandWrapper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/command/wrappers/GEFtoEMFCommandWrapper.java
index b0cbdc506fe..b0cbdc506fe 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/command/wrappers/GEFtoEMFCommandWrapper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/command/wrappers/GEFtoEMFCommandWrapper.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/command/wrappers/GMFtoEMFCommandWrapper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/command/wrappers/GMFtoEMFCommandWrapper.java
index 2f7afa278d3..2f7afa278d3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/command/wrappers/GMFtoEMFCommandWrapper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/command/wrappers/GMFtoEMFCommandWrapper.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/commands/AbstractCommonTransactionalCommmand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/commands/AbstractCommonTransactionalCommmand.java
index 02e4c25bb27..02e4c25bb27 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/commands/AbstractCommonTransactionalCommmand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/commands/AbstractCommonTransactionalCommmand.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/commands/AddEObjectReferencesToDiagram.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/commands/AddEObjectReferencesToDiagram.java
index 50a266a422f..50a266a422f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/commands/AddEObjectReferencesToDiagram.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/commands/AddEObjectReferencesToDiagram.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/commands/AnnotateNodeStyleCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/commands/AnnotateNodeStyleCommand.java
index 9a97f6f0a85..9a97f6f0a85 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/commands/AnnotateNodeStyleCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/commands/AnnotateNodeStyleCommand.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/commands/ChangeZOrderOfCreatedEP.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/commands/ChangeZOrderOfCreatedEP.java
index dd24b56031e..dd24b56031e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/commands/ChangeZOrderOfCreatedEP.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/commands/ChangeZOrderOfCreatedEP.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/commands/CleanDiagram.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/commands/CleanDiagram.java
index 1bd4367eeae..1bd4367eeae 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/commands/CleanDiagram.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/commands/CleanDiagram.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/commands/CommonDeferredCreateConnectionViewCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/commands/CommonDeferredCreateConnectionViewCommand.java
index bc4bab72c25..bc4bab72c25 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/commands/CommonDeferredCreateConnectionViewCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/commands/CommonDeferredCreateConnectionViewCommand.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/commands/CreateBehavioredClassifierDiagramCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/commands/CreateBehavioredClassifierDiagramCommand.java
index c771fbb41a5..c771fbb41a5 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/commands/CreateBehavioredClassifierDiagramCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/commands/CreateBehavioredClassifierDiagramCommand.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/commands/CreateElementAndInitializeFeatureCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/commands/CreateElementAndInitializeFeatureCommand.java
index 82dfd6569e1..82dfd6569e1 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/commands/CreateElementAndInitializeFeatureCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/commands/CreateElementAndInitializeFeatureCommand.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/commands/CreateHyperLinkDiagramCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/commands/CreateHyperLinkDiagramCommand.java
index 5f25a3024c2..5f25a3024c2 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/commands/CreateHyperLinkDiagramCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/commands/CreateHyperLinkDiagramCommand.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/commands/CreateHyperLinkDocumentCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/commands/CreateHyperLinkDocumentCommand.java
index 977cd88a00a..977cd88a00a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/commands/CreateHyperLinkDocumentCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/commands/CreateHyperLinkDocumentCommand.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/commands/CreateHyperLinkWebCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/commands/CreateHyperLinkWebCommand.java
index f2b356c5275..f2b356c5275 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/commands/CreateHyperLinkWebCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/commands/CreateHyperLinkWebCommand.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/commands/CreateUMLModelCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/commands/CreateUMLModelCommand.java
index eea0ee2af17..eea0ee2af17 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/commands/CreateUMLModelCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/commands/CreateUMLModelCommand.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/commands/DeferredCreateCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/commands/DeferredCreateCommand.java
index e810c3a7dbd..e810c3a7dbd 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/commands/DeferredCreateCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/commands/DeferredCreateCommand.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/commands/DefferedAppliedStereotypeToDisplayCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/commands/DefferedAppliedStereotypeToDisplayCommand.java
index 04595702fe5..04595702fe5 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/commands/DefferedAppliedStereotypeToDisplayCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/commands/DefferedAppliedStereotypeToDisplayCommand.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/commands/DeleteHyperLinkDiagramCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/commands/DeleteHyperLinkDiagramCommand.java
index 396512c0722..396512c0722 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/commands/DeleteHyperLinkDiagramCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/commands/DeleteHyperLinkDiagramCommand.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/commands/DeleteHyperLinkDocumentCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/commands/DeleteHyperLinkDocumentCommand.java
index 6fab3a84b18..6fab3a84b18 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/commands/DeleteHyperLinkDocumentCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/commands/DeleteHyperLinkDocumentCommand.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/commands/DeleteLinkDuringCreationCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/commands/DeleteLinkDuringCreationCommand.java
index 2c3e7429f41..2c3e7429f41 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/commands/DeleteLinkDuringCreationCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/commands/DeleteLinkDuringCreationCommand.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/commands/DestroyElementPapyrusCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/commands/DestroyElementPapyrusCommand.java
index 980d38d89e3..980d38d89e3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/commands/DestroyElementPapyrusCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/commands/DestroyElementPapyrusCommand.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/commands/DuplicateAnythingCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/commands/DuplicateAnythingCommand.java
index b543d9af417..b543d9af417 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/commands/DuplicateAnythingCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/commands/DuplicateAnythingCommand.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/commands/DuplicateNamedElementCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/commands/DuplicateNamedElementCommand.java
index c08b6280824..c08b6280824 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/commands/DuplicateNamedElementCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/commands/DuplicateNamedElementCommand.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/commands/EObjectInheritanceCopyCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/commands/EObjectInheritanceCopyCommand.java
index 99fe120c11e..99fe120c11e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/commands/EObjectInheritanceCopyCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/commands/EObjectInheritanceCopyCommand.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/commands/EmptyAllHyperLinkCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/commands/EmptyAllHyperLinkCommand.java
index 8f517069de2..8f517069de2 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/commands/EmptyAllHyperLinkCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/commands/EmptyAllHyperLinkCommand.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/commands/FixPortLocationCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/commands/FixPortLocationCommand.java
index d8b25e99028..d8b25e99028 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/commands/FixPortLocationCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/commands/FixPortLocationCommand.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/commands/GMFToEMFCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/commands/GMFToEMFCommand.java
index e9398d75396..e9398d75396 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/commands/GMFToEMFCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/commands/GMFToEMFCommand.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/commands/PapyrusDuplicateViewsCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/commands/PapyrusDuplicateViewsCommand.java
index 73c701412e8..73c701412e8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/commands/PapyrusDuplicateViewsCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/commands/PapyrusDuplicateViewsCommand.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/commands/PreserveAnchorsPositionCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/commands/PreserveAnchorsPositionCommand.java
index 110b65c49e1..110b65c49e1 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/commands/PreserveAnchorsPositionCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/commands/PreserveAnchorsPositionCommand.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/commands/ReconnectToIntersectionPoints.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/commands/ReconnectToIntersectionPoints.java
index fa8ebb811d2..fa8ebb811d2 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/commands/ReconnectToIntersectionPoints.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/commands/ReconnectToIntersectionPoints.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/commands/RemoveEObjectReferencesFromDiagram.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/commands/RemoveEObjectReferencesFromDiagram.java
index c045e6cf372..c045e6cf372 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/commands/RemoveEObjectReferencesFromDiagram.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/commands/RemoveEObjectReferencesFromDiagram.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/commands/RemoveValueCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/commands/RemoveValueCommand.java
index 7f55b7779a7..7f55b7779a7 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/commands/RemoveValueCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/commands/RemoveValueCommand.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/commands/RemoveValueRequest.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/commands/RemoveValueRequest.java
index a610ba68250..a610ba68250 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/commands/RemoveValueRequest.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/commands/RemoveValueRequest.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/commands/SemanticAdapter.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/commands/SemanticAdapter.java
index 6a70319493f..6a70319493f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/commands/SemanticAdapter.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/commands/SemanticAdapter.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/commands/SetValueSpecificationValueCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/commands/SetValueSpecificationValueCommand.java
index 7a2261ce3f4..7a2261ce3f4 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/commands/SetValueSpecificationValueCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/commands/SetValueSpecificationValueCommand.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/commands/ShowHideCompartmentRequest.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/commands/ShowHideCompartmentRequest.java
index eaabba40b74..eaabba40b74 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/commands/ShowHideCompartmentRequest.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/commands/ShowHideCompartmentRequest.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/commands/ShowHideConnectionLabelsRequest.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/commands/ShowHideConnectionLabelsRequest.java
index 202dbdbdb02..202dbdbdb02 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/commands/ShowHideConnectionLabelsRequest.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/commands/ShowHideConnectionLabelsRequest.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/commands/ShowHideElementsRequest.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/commands/ShowHideElementsRequest.java
index 7f56de7f446..7f56de7f446 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/commands/ShowHideElementsRequest.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/commands/ShowHideElementsRequest.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/commands/ShowHideLabelsRequest.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/commands/ShowHideLabelsRequest.java
index 78ed96c7c10..78ed96c7c10 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/commands/ShowHideLabelsRequest.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/commands/ShowHideLabelsRequest.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/commands/ShowHideTitleOfCompartmentCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/commands/ShowHideTitleOfCompartmentCommand.java
index 067b7ca88bd..067b7ca88bd 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/commands/ShowHideTitleOfCompartmentCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/commands/ShowHideTitleOfCompartmentCommand.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/commands/SupplementCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/commands/SupplementCommand.java
index feaed6a3892..feaed6a3892 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/commands/SupplementCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/commands/SupplementCommand.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/commands/UnapplyAllStereotypesCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/commands/UnapplyAllStereotypesCommand.java
index f5933074e09..f5933074e09 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/commands/UnapplyAllStereotypesCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/commands/UnapplyAllStereotypesCommand.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/commands/UpdateDiagramCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/commands/UpdateDiagramCommand.java
index 7d1e78f661d..7d1e78f661d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/commands/UpdateDiagramCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/commands/UpdateDiagramCommand.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/commands/UpdateLifelineRepresentsCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/commands/UpdateLifelineRepresentsCommand.java
index c57e59a05ca..c57e59a05ca 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/commands/UpdateLifelineRepresentsCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/commands/UpdateLifelineRepresentsCommand.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/commands/UpdatePortLocationCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/commands/UpdatePortLocationCommand.java
index 6c6e15f7ccb..6c6e15f7ccb 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/commands/UpdatePortLocationCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/commands/UpdatePortLocationCommand.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/commands/setLayoutKindCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/commands/setLayoutKindCommand.java
index 2f1574b69aa..2f1574b69aa 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/commands/setLayoutKindCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/commands/setLayoutKindCommand.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/dialogs/AbstractCheckedTreeColumnViewerSelectionDialog.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/dialogs/AbstractCheckedTreeColumnViewerSelectionDialog.java
index 98b2443c4a5..98b2443c4a5 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/dialogs/AbstractCheckedTreeColumnViewerSelectionDialog.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/dialogs/AbstractCheckedTreeColumnViewerSelectionDialog.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/dialogs/CustomCheckedTreeSelectionDialog.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/dialogs/CustomCheckedTreeSelectionDialog.java
index 2c60fe29511..2c60fe29511 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/dialogs/CustomCheckedTreeSelectionDialog.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/dialogs/CustomCheckedTreeSelectionDialog.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/dialogs/DiagramNavigationDialog.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/dialogs/DiagramNavigationDialog.java
index 6332344b366..6332344b366 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/dialogs/DiagramNavigationDialog.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/dialogs/DiagramNavigationDialog.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/dialogs/IWizardModelElementProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/dialogs/IWizardModelElementProvider.java
index 6f6416724a5..6f6416724a5 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/dialogs/IWizardModelElementProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/dialogs/IWizardModelElementProvider.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/dialogs/SelectDiagramViewsFilterDialog.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/dialogs/SelectDiagramViewsFilterDialog.java
index 28ba14ffcef..28ba14ffcef 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/dialogs/SelectDiagramViewsFilterDialog.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/dialogs/SelectDiagramViewsFilterDialog.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/dialogs/SelectModelElementsForDiagramDialog.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/dialogs/SelectModelElementsForDiagramDialog.java
index 6bee188c24e..6bee188c24e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/dialogs/SelectModelElementsForDiagramDialog.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/dialogs/SelectModelElementsForDiagramDialog.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/directedit/FigureControler.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/directedit/FigureControler.java
index ce79abcf70b..ce79abcf70b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/directedit/FigureControler.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/directedit/FigureControler.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/directedit/ILabelControler.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/directedit/ILabelControler.java
index 16be3538658..16be3538658 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/directedit/ILabelControler.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/directedit/ILabelControler.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/directedit/IPropertyAccessor.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/directedit/IPropertyAccessor.java
index 5edd72fc7f9..5edd72fc7f9 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/directedit/IPropertyAccessor.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/directedit/IPropertyAccessor.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/directedit/LabelDirectEditManager.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/directedit/LabelDirectEditManager.java
index 2e85c592789..2e85c592789 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/directedit/LabelDirectEditManager.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/directedit/LabelDirectEditManager.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/directedit/MultiLineCellEditor.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/directedit/MultiLineCellEditor.java
index f37df42fe45..f37df42fe45 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/directedit/MultiLineCellEditor.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/directedit/MultiLineCellEditor.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/directedit/MultilineLabelDirectEditManager.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/directedit/MultilineLabelDirectEditManager.java
index c7e22a7b79b..c7e22a7b79b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/directedit/MultilineLabelDirectEditManager.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/directedit/MultilineLabelDirectEditManager.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/directedit/PropertyAccessor.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/directedit/PropertyAccessor.java
index 93d42dc8048..93d42dc8048 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/directedit/PropertyAccessor.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/directedit/PropertyAccessor.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/directedit/TextFlowCellEditorLocator.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/directedit/TextFlowCellEditorLocator.java
index 70dbf99c343..70dbf99c343 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/directedit/TextFlowCellEditorLocator.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/directedit/TextFlowCellEditorLocator.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/dragtracker/NoScrollDragEditPartsTrackerEx.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/dragtracker/NoScrollDragEditPartsTrackerEx.java
index 265c4c3edfd..265c4c3edfd 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/dragtracker/NoScrollDragEditPartsTrackerEx.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/dragtracker/NoScrollDragEditPartsTrackerEx.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/dragtracker/NoScrollResizeTracker.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/dragtracker/NoScrollResizeTracker.java
index 759e96d61c2..759e96d61c2 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/dragtracker/NoScrollResizeTracker.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/dragtracker/NoScrollResizeTracker.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/draw2d/CenterLayout.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/draw2d/CenterLayout.java
index 589dafb1e71..589dafb1e71 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/draw2d/CenterLayout.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/draw2d/CenterLayout.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/draw2d/InteractionFigure.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/draw2d/InteractionFigure.java
index 4b84e8eabd1..4b84e8eabd1 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/draw2d/InteractionFigure.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/draw2d/InteractionFigure.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/draw2d/LaneLayout.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/draw2d/LaneLayout.java
index 99985c4deb1..99985c4deb1 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/draw2d/LaneLayout.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/draw2d/LaneLayout.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/draw2d/LeftToolbarLayout.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/draw2d/LeftToolbarLayout.java
index e62efc4a029..e62efc4a029 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/draw2d/LeftToolbarLayout.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/draw2d/LeftToolbarLayout.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/draw2d/LifelineDotLineFigure.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/draw2d/LifelineDotLineFigure.java
index 748b8dad855..748b8dad855 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/draw2d/LifelineDotLineFigure.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/draw2d/LifelineDotLineFigure.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/draw2d/LinesBorder.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/draw2d/LinesBorder.java
index 906d7455d83..906d7455d83 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/draw2d/LinesBorder.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/draw2d/LinesBorder.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/draw2d/ManuallyDrawnShortcutDecorator.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/draw2d/ManuallyDrawnShortcutDecorator.java
index 0e7ea16f1f1..0e7ea16f1f1 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/draw2d/ManuallyDrawnShortcutDecorator.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/draw2d/ManuallyDrawnShortcutDecorator.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/draw2d/OneLineDashedBorder.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/draw2d/OneLineDashedBorder.java
index 7a14a8f8802..7a14a8f8802 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/draw2d/OneLineDashedBorder.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/draw2d/OneLineDashedBorder.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/draw2d/PileLayout.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/draw2d/PileLayout.java
index 47c7c7ec7c6..47c7c7ec7c6 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/draw2d/PileLayout.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/draw2d/PileLayout.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/draw2d/PolylineContainer.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/draw2d/PolylineContainer.java
index 285800da654..285800da654 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/draw2d/PolylineContainer.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/draw2d/PolylineContainer.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/draw2d/RoundedRectangleDashedBorder.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/draw2d/RoundedRectangleDashedBorder.java
index bdd91659dc0..bdd91659dc0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/draw2d/RoundedRectangleDashedBorder.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/draw2d/RoundedRectangleDashedBorder.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/draw2d/SplitEllipseLayout.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/draw2d/SplitEllipseLayout.java
index 8cf23a4d9f1..8cf23a4d9f1 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/draw2d/SplitEllipseLayout.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/draw2d/SplitEllipseLayout.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/draw2d/anchors/CenterAnchor.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/draw2d/anchors/CenterAnchor.java
index a730cfb8db7..a730cfb8db7 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/draw2d/anchors/CenterAnchor.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/draw2d/anchors/CenterAnchor.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/draw2d/anchors/FixedAnchor.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/draw2d/anchors/FixedAnchor.java
index 5e54f9a8cb7..5e54f9a8cb7 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/draw2d/anchors/FixedAnchor.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/draw2d/anchors/FixedAnchor.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/draw2d/anchors/LifelineAnchor.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/draw2d/anchors/LifelineAnchor.java
index ce1d193dfd4..ce1d193dfd4 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/draw2d/anchors/LifelineAnchor.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/draw2d/anchors/LifelineAnchor.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/editparts/AbstractBorderEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/editparts/AbstractBorderEditPart.java
index 3fc9bad15e0..3fc9bad15e0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/editparts/AbstractBorderEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/editparts/AbstractBorderEditPart.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/editparts/AbstractCommentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/editparts/AbstractCommentEditPart.java
index 14f54a385d4..14f54a385d4 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/editparts/AbstractCommentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/editparts/AbstractCommentEditPart.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/editparts/AbstractConstraintEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/editparts/AbstractConstraintEditPart.java
index dc69a13865e..dc69a13865e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/editparts/AbstractConstraintEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/editparts/AbstractConstraintEditPart.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/editparts/AbstractLabelEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/editparts/AbstractLabelEditPart.java
index 84e6f14c037..84e6f14c037 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/editparts/AbstractLabelEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/editparts/AbstractLabelEditPart.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/editparts/AbstractShapeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/editparts/AbstractShapeEditPart.java
index be38b5363ab..be38b5363ab 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/editparts/AbstractShapeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/editparts/AbstractShapeEditPart.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/editparts/AbstractShortCutDiagramEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/editparts/AbstractShortCutDiagramEditPart.java
index dc0deecb93b..dc0deecb93b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/editparts/AbstractShortCutDiagramEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/editparts/AbstractShortCutDiagramEditPart.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/editparts/AbstractShortcutDiagramNameEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/editparts/AbstractShortcutDiagramNameEditPart.java
index f152921b821..f152921b821 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/editparts/AbstractShortcutDiagramNameEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/editparts/AbstractShortcutDiagramNameEditPart.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/editparts/BorderNamedElementEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/editparts/BorderNamedElementEditPart.java
index fbedc857822..fbedc857822 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/editparts/BorderNamedElementEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/editparts/BorderNamedElementEditPart.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/editparts/BorderNodeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/editparts/BorderNodeEditPart.java
index cade9ef1b46..cade9ef1b46 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/editparts/BorderNodeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/editparts/BorderNodeEditPart.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/editparts/BorderUMLNodeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/editparts/BorderUMLNodeEditPart.java
index 0c4116962bc..0c4116962bc 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/editparts/BorderUMLNodeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/editparts/BorderUMLNodeEditPart.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/editparts/ClassifierEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/editparts/ClassifierEditPart.java
index b399fbf740c..b399fbf740c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/editparts/ClassifierEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/editparts/ClassifierEditPart.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/editparts/CompositeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/editparts/CompositeEditPart.java
index 9bdd2bd3e04..9bdd2bd3e04 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/editparts/CompositeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/editparts/CompositeEditPart.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/editparts/DeploymentNodeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/editparts/DeploymentNodeEditPart.java
index ad0559ea1ae..ad0559ea1ae 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/editparts/DeploymentNodeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/editparts/DeploymentNodeEditPart.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/editparts/IEditpartListenerAccess.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/editparts/IEditpartListenerAccess.java
index 9d2156a931b..9d2156a931b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/editparts/IEditpartListenerAccess.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/editparts/IEditpartListenerAccess.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/editparts/ILabelRoleProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/editparts/ILabelRoleProvider.java
index 8fe78390b63..8fe78390b63 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/editparts/ILabelRoleProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/editparts/ILabelRoleProvider.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/editparts/IPapyrusEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/editparts/IPapyrusEditPart.java
index 2ca42ce7503..2ca42ce7503 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/editparts/IPapyrusEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/editparts/IPapyrusEditPart.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/editparts/IUMLEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/editparts/IUMLEditPart.java
index 2af94bb6fd6..2af94bb6fd6 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/editparts/IUMLEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/editparts/IUMLEditPart.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/editparts/IUMLNamedElementEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/editparts/IUMLNamedElementEditPart.java
index 3342572813a..3342572813a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/editparts/IUMLNamedElementEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/editparts/IUMLNamedElementEditPart.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/editparts/NamedElementEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/editparts/NamedElementEditPart.java
index 76d32e9f47f..76d32e9f47f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/editparts/NamedElementEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/editparts/NamedElementEditPart.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/editparts/NoScrollBarShapeCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/editparts/NoScrollBarShapeCompartmentEditPart.java
index a480a044649..a480a044649 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/editparts/NoScrollBarShapeCompartmentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/editparts/NoScrollBarShapeCompartmentEditPart.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/editparts/NodeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/editparts/NodeEditPart.java
index 79cfb55d00f..79cfb55d00f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/editparts/NodeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/editparts/NodeEditPart.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/editparts/PapyrusStereotypeListener.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/editparts/PapyrusStereotypeListener.java
index 191b94b2b04..191b94b2b04 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/editparts/PapyrusStereotypeListener.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/editparts/PapyrusStereotypeListener.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/editparts/PrimaryShapeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/editparts/PrimaryShapeEditPart.java
index 6fa1af02aab..6fa1af02aab 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/editparts/PrimaryShapeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/editparts/PrimaryShapeEditPart.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/editparts/ResizeableListCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/editparts/ResizeableListCompartmentEditPart.java
index e6f9cd89213..e6f9cd89213 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/editparts/ResizeableListCompartmentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/editparts/ResizeableListCompartmentEditPart.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/editparts/UMLCompartmentEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/editparts/UMLCompartmentEditPart.java
index 5365bb2bec2..5365bb2bec2 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/editparts/UMLCompartmentEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/editparts/UMLCompartmentEditPart.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/editparts/UMLConnectionNodeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/editparts/UMLConnectionNodeEditPart.java
index b2887e5d0f3..b2887e5d0f3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/editparts/UMLConnectionNodeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/editparts/UMLConnectionNodeEditPart.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/editparts/UMLNodeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/editparts/UMLNodeEditPart.java
index 42b26767ed9..42b26767ed9 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/editparts/UMLNodeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/editparts/UMLNodeEditPart.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/editpolicies/AbstractAppliedStereotypeDisplayEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/editpolicies/AbstractAppliedStereotypeDisplayEditPolicy.java
index d92036ff6be..d92036ff6be 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/editpolicies/AbstractAppliedStereotypeDisplayEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/editpolicies/AbstractAppliedStereotypeDisplayEditPolicy.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/editpolicies/AbstractMaskManagedEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/editpolicies/AbstractMaskManagedEditPolicy.java
index 536d2cfb029..536d2cfb029 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/editpolicies/AbstractMaskManagedEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/editpolicies/AbstractMaskManagedEditPolicy.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/editpolicies/AffixedNodeAlignmentEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/editpolicies/AffixedNodeAlignmentEditPolicy.java
index 6f35d856158..6f35d856158 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/editpolicies/AffixedNodeAlignmentEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/editpolicies/AffixedNodeAlignmentEditPolicy.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/editpolicies/AppliedStereotypeAbstractionLabelDisplayEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/editpolicies/AppliedStereotypeAbstractionLabelDisplayEditPolicy.java
index 9ef3ea5f7f3..9ef3ea5f7f3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/editpolicies/AppliedStereotypeAbstractionLabelDisplayEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/editpolicies/AppliedStereotypeAbstractionLabelDisplayEditPolicy.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/editpolicies/AppliedStereotypeDeploymentLabelDisplayEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/editpolicies/AppliedStereotypeDeploymentLabelDisplayEditPolicy.java
index 9964db47abb..9964db47abb 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/editpolicies/AppliedStereotypeDeploymentLabelDisplayEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/editpolicies/AppliedStereotypeDeploymentLabelDisplayEditPolicy.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/editpolicies/AppliedStereotypeExternalNodeEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/editpolicies/AppliedStereotypeExternalNodeEditPolicy.java
index d238ddf605f..d238ddf605f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/editpolicies/AppliedStereotypeExternalNodeEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/editpolicies/AppliedStereotypeExternalNodeEditPolicy.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/editpolicies/AppliedStereotypeIconlDisplayEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/editpolicies/AppliedStereotypeIconlDisplayEditPolicy.java
index 91b7564da45..91b7564da45 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/editpolicies/AppliedStereotypeIconlDisplayEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/editpolicies/AppliedStereotypeIconlDisplayEditPolicy.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/editpolicies/AppliedStereotypeInformationFlowLabelDisplayEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/editpolicies/AppliedStereotypeInformationFlowLabelDisplayEditPolicy.java
index f677d3eec0d..f677d3eec0d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/editpolicies/AppliedStereotypeInformationFlowLabelDisplayEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/editpolicies/AppliedStereotypeInformationFlowLabelDisplayEditPolicy.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/editpolicies/AppliedStereotypeLabelDisplayEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/editpolicies/AppliedStereotypeLabelDisplayEditPolicy.java
index 303b91da3b0..303b91da3b0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/editpolicies/AppliedStereotypeLabelDisplayEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/editpolicies/AppliedStereotypeLabelDisplayEditPolicy.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/editpolicies/AppliedStereotypeLinkLabelDisplayEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/editpolicies/AppliedStereotypeLinkLabelDisplayEditPolicy.java
index 30d3ef8338f..30d3ef8338f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/editpolicies/AppliedStereotypeLinkLabelDisplayEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/editpolicies/AppliedStereotypeLinkLabelDisplayEditPolicy.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/editpolicies/AppliedStereotypeManifestationLabelDisplayEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/editpolicies/AppliedStereotypeManifestationLabelDisplayEditPolicy.java
index 7bf409b75ed..7bf409b75ed 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/editpolicies/AppliedStereotypeManifestationLabelDisplayEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/editpolicies/AppliedStereotypeManifestationLabelDisplayEditPolicy.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/editpolicies/AppliedStereotypeNodeLabelDisplayEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/editpolicies/AppliedStereotypeNodeLabelDisplayEditPolicy.java
index 22fca5a94ee..22fca5a94ee 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/editpolicies/AppliedStereotypeNodeLabelDisplayEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/editpolicies/AppliedStereotypeNodeLabelDisplayEditPolicy.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/editpolicies/AppliedStereotypePackageImportLabelDisplayEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/editpolicies/AppliedStereotypePackageImportLabelDisplayEditPolicy.java
index 9ab0807b277..9ab0807b277 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/editpolicies/AppliedStereotypePackageImportLabelDisplayEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/editpolicies/AppliedStereotypePackageImportLabelDisplayEditPolicy.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/editpolicies/AppliedStereotypePackageMergeLabelDisplayEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/editpolicies/AppliedStereotypePackageMergeLabelDisplayEditPolicy.java
index 588e5a57172..588e5a57172 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/editpolicies/AppliedStereotypePackageMergeLabelDisplayEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/editpolicies/AppliedStereotypePackageMergeLabelDisplayEditPolicy.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/editpolicies/AppliedStereotypeSubstitutionLabelDisplayEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/editpolicies/AppliedStereotypeSubstitutionLabelDisplayEditPolicy.java
index e90c96c8960..e90c96c8960 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/editpolicies/AppliedStereotypeSubstitutionLabelDisplayEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/editpolicies/AppliedStereotypeSubstitutionLabelDisplayEditPolicy.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/editpolicies/AppliedStereotypeUsageLabelDisplayEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/editpolicies/AppliedStereotypeUsageLabelDisplayEditPolicy.java
index b547e7c0577..b547e7c0577 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/editpolicies/AppliedStereotypeUsageLabelDisplayEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/editpolicies/AppliedStereotypeUsageLabelDisplayEditPolicy.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/editpolicies/ApplyStereotypeEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/editpolicies/ApplyStereotypeEditPolicy.java
index ef18806ebc0..ef18806ebc0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/editpolicies/ApplyStereotypeEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/editpolicies/ApplyStereotypeEditPolicy.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/editpolicies/BorderItemResizableEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/editpolicies/BorderItemResizableEditPolicy.java
index 71f036f51ea..71f036f51ea 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/editpolicies/BorderItemResizableEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/editpolicies/BorderItemResizableEditPolicy.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/editpolicies/CResizableCompartmentEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/editpolicies/CResizableCompartmentEditPolicy.java
index afe9bc9d8ec..afe9bc9d8ec 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/editpolicies/CResizableCompartmentEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/editpolicies/CResizableCompartmentEditPolicy.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/editpolicies/ChangeStereotypedShapeEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/editpolicies/ChangeStereotypedShapeEditPolicy.java
index d9d075113eb..d9d075113eb 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/editpolicies/ChangeStereotypedShapeEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/editpolicies/ChangeStereotypedShapeEditPolicy.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/editpolicies/CommonDiagramDragDropEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/editpolicies/CommonDiagramDragDropEditPolicy.java
index dacf1e613ad..dacf1e613ad 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/editpolicies/CommonDiagramDragDropEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/editpolicies/CommonDiagramDragDropEditPolicy.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/editpolicies/ConstrainedItemBorderLayoutEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/editpolicies/ConstrainedItemBorderLayoutEditPolicy.java
index b749e19bd0e..b749e19bd0e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/editpolicies/ConstrainedItemBorderLayoutEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/editpolicies/ConstrainedItemBorderLayoutEditPolicy.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/editpolicies/CustomConnectionLabelsEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/editpolicies/CustomConnectionLabelsEditPolicy.java
index f30b1049cd6..f30b1049cd6 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/editpolicies/CustomConnectionLabelsEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/editpolicies/CustomConnectionLabelsEditPolicy.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/editpolicies/CustomContainerEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/editpolicies/CustomContainerEditPolicy.java
index 5f213bb3ef8..5f213bb3ef8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/editpolicies/CustomContainerEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/editpolicies/CustomContainerEditPolicy.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/editpolicies/DeleteOnlyViewComponentEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/editpolicies/DeleteOnlyViewComponentEditPolicy.java
index a326f774f4b..a326f774f4b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/editpolicies/DeleteOnlyViewComponentEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/editpolicies/DeleteOnlyViewComponentEditPolicy.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/editpolicies/DiagramDragDropEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/editpolicies/DiagramDragDropEditPolicy.java
index 71be633e9ff..71be633e9ff 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/editpolicies/DiagramDragDropEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/editpolicies/DiagramDragDropEditPolicy.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/editpolicies/DragDropEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/editpolicies/DragDropEditPolicy.java
index 90a0fd251d2..90a0fd251d2 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/editpolicies/DragDropEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/editpolicies/DragDropEditPolicy.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/editpolicies/DuplicatePasteEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/editpolicies/DuplicatePasteEditPolicy.java
index 408c05ca7be..408c05ca7be 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/editpolicies/DuplicatePasteEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/editpolicies/DuplicatePasteEditPolicy.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/editpolicies/DynamicResizeDirectionsEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/editpolicies/DynamicResizeDirectionsEditPolicy.java
index 5d2d15009bb..5d2d15009bb 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/editpolicies/DynamicResizeDirectionsEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/editpolicies/DynamicResizeDirectionsEditPolicy.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/editpolicies/ExtendedDirectEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/editpolicies/ExtendedDirectEditPolicy.java
index 7c910f43aca..7c910f43aca 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/editpolicies/ExtendedDirectEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/editpolicies/ExtendedDirectEditPolicy.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/editpolicies/HyperLinkPopupBarEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/editpolicies/HyperLinkPopupBarEditPolicy.java
index 5e05e9adf78..5e05e9adf78 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/editpolicies/HyperLinkPopupBarEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/editpolicies/HyperLinkPopupBarEditPolicy.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/editpolicies/IDirectEdition.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/editpolicies/IDirectEdition.java
index eda692b72f0..eda692b72f0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/editpolicies/IDirectEdition.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/editpolicies/IDirectEdition.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/editpolicies/IMaskManagedLabelEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/editpolicies/IMaskManagedLabelEditPolicy.java
index 84f12eb1869..84f12eb1869 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/editpolicies/IMaskManagedLabelEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/editpolicies/IMaskManagedLabelEditPolicy.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/editpolicies/NavigationEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/editpolicies/NavigationEditPolicy.java
index 2cc1a9ed882..2cc1a9ed882 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/editpolicies/NavigationEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/editpolicies/NavigationEditPolicy.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/editpolicies/OldCommonDiagramDragDropEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/editpolicies/OldCommonDiagramDragDropEditPolicy.java
index 6399efe9ec7..6399efe9ec7 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/editpolicies/OldCommonDiagramDragDropEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/editpolicies/OldCommonDiagramDragDropEditPolicy.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/editpolicies/OrphanViewPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/editpolicies/OrphanViewPolicy.java
index 76199b985a8..76199b985a8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/editpolicies/OrphanViewPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/editpolicies/OrphanViewPolicy.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/editpolicies/PapyrusCreationEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/editpolicies/PapyrusCreationEditPolicy.java
index d56ab6e1217..d56ab6e1217 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/editpolicies/PapyrusCreationEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/editpolicies/PapyrusCreationEditPolicy.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/editpolicies/QualifiedNameDisplayEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/editpolicies/QualifiedNameDisplayEditPolicy.java
index fd235321a7d..fd235321a7d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/editpolicies/QualifiedNameDisplayEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/editpolicies/QualifiedNameDisplayEditPolicy.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/editpolicies/ShortCutDiagramEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/editpolicies/ShortCutDiagramEditPolicy.java
index da4b348960b..da4b348960b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/editpolicies/ShortCutDiagramEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/editpolicies/ShortCutDiagramEditPolicy.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/editpolicies/ShowHideClassifierContentsEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/editpolicies/ShowHideClassifierContentsEditPolicy.java
index 2b9b4ba3452..2b9b4ba3452 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/editpolicies/ShowHideClassifierContentsEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/editpolicies/ShowHideClassifierContentsEditPolicy.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/editpolicies/ShowHideCompartmentEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/editpolicies/ShowHideCompartmentEditPolicy.java
index 5aa4834bbb5..5aa4834bbb5 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/editpolicies/ShowHideCompartmentEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/editpolicies/ShowHideCompartmentEditPolicy.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/editpolicies/ShowHideLabelEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/editpolicies/ShowHideLabelEditPolicy.java
index 96f294815d2..96f294815d2 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/editpolicies/ShowHideLabelEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/editpolicies/ShowHideLabelEditPolicy.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/editpolicies/ShowHideRelatedContentsEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/editpolicies/ShowHideRelatedContentsEditPolicy.java
index db9a0329fdd..db9a0329fdd 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/editpolicies/ShowHideRelatedContentsEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/editpolicies/ShowHideRelatedContentsEditPolicy.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/editpolicies/ShowViewEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/editpolicies/ShowViewEditPolicy.java
index 9c15a7ad29e..9c15a7ad29e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/editpolicies/ShowViewEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/editpolicies/ShowViewEditPolicy.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/editpolicies/UMLBaseItemSemanticEditPolicy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/editpolicies/UMLBaseItemSemanticEditPolicy.java
index fd971d48c8b..fd971d48c8b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/editpolicies/UMLBaseItemSemanticEditPolicy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/editpolicies/UMLBaseItemSemanticEditPolicy.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/editpolicies/ViewAndFeatureResolver.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/editpolicies/ViewAndFeatureResolver.java
index dd14b6eff51..dd14b6eff51 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/editpolicies/ViewAndFeatureResolver.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/editpolicies/ViewAndFeatureResolver.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/editpolicies/ViewResolver.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/editpolicies/ViewResolver.java
index ffecc6a4550..ffecc6a4550 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/editpolicies/ViewResolver.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/editpolicies/ViewResolver.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/edge/CAssociationFigure.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/edge/CAssociationFigure.java
index a819256e829..a819256e829 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/edge/CAssociationFigure.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/edge/CAssociationFigure.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/edge/DashedEdgeFigure.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/edge/DashedEdgeFigure.java
index 314d327514d..314d327514d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/edge/DashedEdgeFigure.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/edge/DashedEdgeFigure.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/edge/GeneralizationFigure.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/edge/GeneralizationFigure.java
index c5b8d6bd7e8..c5b8d6bd7e8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/edge/GeneralizationFigure.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/edge/GeneralizationFigure.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/edge/InterfaceRealizationFigure.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/edge/InterfaceRealizationFigure.java
index a03a41c0a7c..a03a41c0a7c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/edge/InterfaceRealizationFigure.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/edge/InterfaceRealizationFigure.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/edge/UMLEdgeFigure.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/edge/UMLEdgeFigure.java
index 80c03e0f12b..80c03e0f12b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/edge/UMLEdgeFigure.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/edge/UMLEdgeFigure.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/layout/AutomaticCompartmentToolBox.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/layout/AutomaticCompartmentToolBox.java
index 7f674fc0a11..7f674fc0a11 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/layout/AutomaticCompartmentToolBox.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/layout/AutomaticCompartmentToolBox.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/layout/ILayoutToolBox.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/layout/ILayoutToolBox.java
index a86151811ab..a86151811ab 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/layout/ILayoutToolBox.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/layout/ILayoutToolBox.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/layout/ManualCompartmentToolBox.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/layout/ManualCompartmentToolBox.java
index 8733f5affd4..8733f5affd4 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/layout/ManualCompartmentToolBox.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/layout/ManualCompartmentToolBox.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/layout/PropertiesCompartmentLayoutManager.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/layout/PropertiesCompartmentLayoutManager.java
index 4c9deb530a3..4c9deb530a3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/layout/PropertiesCompartmentLayoutManager.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/layout/PropertiesCompartmentLayoutManager.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/AffixedNamedElementFigure.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/AffixedNamedElementFigure.java
index 5488c1ff1ec..5488c1ff1ec 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/AffixedNamedElementFigure.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/AffixedNamedElementFigure.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/AppliedStereotypeWrappingLabelFigure.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/AppliedStereotypeWrappingLabelFigure.java
index 8c76ea2dd48..8c76ea2dd48 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/AppliedStereotypeWrappingLabelFigure.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/AppliedStereotypeWrappingLabelFigure.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/AssociationNodeFigure.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/AssociationNodeFigure.java
index f462591749b..f462591749b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/AssociationNodeFigure.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/AssociationNodeFigure.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/AutomaticCompartmentLayoutManager.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/AutomaticCompartmentLayoutManager.java
index 89bc20c19f0..89bc20c19f0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/AutomaticCompartmentLayoutManager.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/AutomaticCompartmentLayoutManager.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/CenteredWrappedLabel.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/CenteredWrappedLabel.java
index 94759c6eccd..94759c6eccd 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/CenteredWrappedLabel.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/CenteredWrappedLabel.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/ClassifierFigure.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/ClassifierFigure.java
index c90792a5096..c90792a5096 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/ClassifierFigure.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/ClassifierFigure.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/CompartmentFigure.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/CompartmentFigure.java
index ae23fa11d0a..ae23fa11d0a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/CompartmentFigure.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/CompartmentFigure.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/ComponentFigure.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/ComponentFigure.java
index bd6396a6e87..bd6396a6e87 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/ComponentFigure.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/ComponentFigure.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/ConstraintFigure.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/ConstraintFigure.java
index 21a5e4b4b5e..21a5e4b4b5e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/ConstraintFigure.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/ConstraintFigure.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/ContainerBorder.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/ContainerBorder.java
index a2d55077a5a..a2d55077a5a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/ContainerBorder.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/ContainerBorder.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/ContainerFigure.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/ContainerFigure.java
index 644231a38c0..644231a38c0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/ContainerFigure.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/ContainerFigure.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/CornerBentFigure.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/CornerBentFigure.java
index c581185b0dc..c581185b0dc 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/CornerBentFigure.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/CornerBentFigure.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/CustomAbstractFigure.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/CustomAbstractFigure.java
index 918822e22ed..918822e22ed 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/CustomAbstractFigure.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/CustomAbstractFigure.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/DataTypeFigure.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/DataTypeFigure.java
index 5348e011470..5348e011470 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/DataTypeFigure.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/DataTypeFigure.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/DiagramNodeFigure.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/DiagramNodeFigure.java
index 7a271bf1e09..7a271bf1e09 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/DiagramNodeFigure.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/DiagramNodeFigure.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/DiamondNode.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/DiamondNode.java
index e5e996a698e..e5e996a698e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/DiamondNode.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/DiamondNode.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/EnumerationFigure.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/EnumerationFigure.java
index f8f273d524e..f8f273d524e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/EnumerationFigure.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/EnumerationFigure.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/FinalNode.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/FinalNode.java
index 31cbfaf88d9..31cbfaf88d9 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/FinalNode.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/FinalNode.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/FlowFinalNode.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/FlowFinalNode.java
index 0167c7df583..0167c7df583 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/FlowFinalNode.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/FlowFinalNode.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/ForkNode.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/ForkNode.java
index 06e48f23f42..06e48f23f42 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/ForkNode.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/ForkNode.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/HTMLCommentParser.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/HTMLCommentParser.java
index f11e54812a7..f11e54812a7 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/HTMLCommentParser.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/HTMLCommentParser.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/HTMLCornerBentBodyFigure.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/HTMLCornerBentBodyFigure.java
index 33448b72e3d..33448b72e3d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/HTMLCornerBentBodyFigure.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/HTMLCornerBentBodyFigure.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/HTMLCornerBentFigure.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/HTMLCornerBentFigure.java
index 83749639b06..83749639b06 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/HTMLCornerBentFigure.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/HTMLCornerBentFigure.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/IAbstractElementFigure.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/IAbstractElementFigure.java
index 6bcd2511f9d..6bcd2511f9d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/IAbstractElementFigure.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/IAbstractElementFigure.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/ILabelFigure.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/ILabelFigure.java
index b483ef39af5..b483ef39af5 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/ILabelFigure.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/ILabelFigure.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/IMultilineEditableFigure.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/IMultilineEditableFigure.java
index 38a9a77a548..38a9a77a548 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/IMultilineEditableFigure.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/IMultilineEditableFigure.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/IPapyrusNodeFigure.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/IPapyrusNodeFigure.java
index b793f97e9fe..b793f97e9fe 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/IPapyrusNodeFigure.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/IPapyrusNodeFigure.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/IPapyrusNodeNamedElementFigure.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/IPapyrusNodeNamedElementFigure.java
index bb77daf6910..bb77daf6910 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/IPapyrusNodeNamedElementFigure.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/IPapyrusNodeNamedElementFigure.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/IPapyrusNodeUMLElementFigure.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/IPapyrusNodeUMLElementFigure.java
index a7dce6fa3f4..a7dce6fa3f4 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/IPapyrusNodeUMLElementFigure.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/IPapyrusNodeUMLElementFigure.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/IPapyrusUMLElementFigure.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/IPapyrusUMLElementFigure.java
index 9a6a0151028..9a6a0151028 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/IPapyrusUMLElementFigure.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/IPapyrusUMLElementFigure.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/InitialNode.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/InitialNode.java
index 5545830baec..5545830baec 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/InitialNode.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/InitialNode.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/InstanceSpecificationFigure.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/InstanceSpecificationFigure.java
index d9ef5c62a02..d9ef5c62a02 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/InstanceSpecificationFigure.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/InstanceSpecificationFigure.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/InteractionRectangleFigure.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/InteractionRectangleFigure.java
index 471ec60dc88..471ec60dc88 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/InteractionRectangleFigure.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/InteractionRectangleFigure.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/InterfaceFigure.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/InterfaceFigure.java
index f2aa1d71f79..f2aa1d71f79 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/InterfaceFigure.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/InterfaceFigure.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/ManualCompartmentLayoutManager.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/ManualCompartmentLayoutManager.java
index 7fc4509164f..7fc4509164f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/ManualCompartmentLayoutManager.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/ManualCompartmentLayoutManager.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/NodeNamedElementFigure.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/NodeNamedElementFigure.java
index ee57a28c7f8..ee57a28c7f8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/NodeNamedElementFigure.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/NodeNamedElementFigure.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/NoteShadowBorder.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/NoteShadowBorder.java
index d9ad0012ed7..d9ad0012ed7 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/NoteShadowBorder.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/NoteShadowBorder.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/OLDCompartmentFigure.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/OLDCompartmentFigure.java
index ddf510eff5e..ddf510eff5e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/OLDCompartmentFigure.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/OLDCompartmentFigure.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/PackageFigure.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/PackageFigure.java
index d32962630da..d32962630da 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/PackageFigure.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/PackageFigure.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/PackageNodePlateFigure.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/PackageNodePlateFigure.java
index a63329d8356..a63329d8356 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/PackageNodePlateFigure.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/PackageNodePlateFigure.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/PapyrusNodeFigure.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/PapyrusNodeFigure.java
index 8ecf782a498..8ecf782a498 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/PapyrusNodeFigure.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/PapyrusNodeFigure.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/PapyrusReceiveNodeFigure.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/PapyrusReceiveNodeFigure.java
index 7d21ffa8af9..7d21ffa8af9 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/PapyrusReceiveNodeFigure.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/PapyrusReceiveNodeFigure.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/PapyrusRoundedNodeFigure.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/PapyrusRoundedNodeFigure.java
index 619d7195553..619d7195553 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/PapyrusRoundedNodeFigure.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/PapyrusRoundedNodeFigure.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/PapyrusSendNodeFigure.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/PapyrusSendNodeFigure.java
index e70bcb7efa7..e70bcb7efa7 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/PapyrusSendNodeFigure.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/PapyrusSendNodeFigure.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/PapyrusSendNodeShadowBorder.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/PapyrusSendNodeShadowBorder.java
index 47bff5f789c..47bff5f789c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/PapyrusSendNodeShadowBorder.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/PapyrusSendNodeShadowBorder.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/PrimitiveTypeFigure.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/PrimitiveTypeFigure.java
index d08fb2c2070..d08fb2c2070 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/PrimitiveTypeFigure.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/PrimitiveTypeFigure.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/ProfileFigure.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/ProfileFigure.java
index bb55352699b..bb55352699b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/ProfileFigure.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/ProfileFigure.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/Rectangular3DBorder.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/Rectangular3DBorder.java
index 7b7051832bf..7b7051832bf 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/Rectangular3DBorder.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/Rectangular3DBorder.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/RectangularShadowBorder.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/RectangularShadowBorder.java
index 3e2ea0b38a7..3e2ea0b38a7 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/RectangularShadowBorder.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/RectangularShadowBorder.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/RoundedRectangleDashedShadowBorder.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/RoundedRectangleDashedShadowBorder.java
index 081b1e7b55f..081b1e7b55f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/RoundedRectangleDashedShadowBorder.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/RoundedRectangleDashedShadowBorder.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/ShapeNamedElementFigure.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/ShapeNamedElementFigure.java
index 4ff81aac3a7..4ff81aac3a7 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/ShapeNamedElementFigure.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/ShapeNamedElementFigure.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/SignalFigure.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/SignalFigure.java
index 82faf01cdd2..82faf01cdd2 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/SignalFigure.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/SignalFigure.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/StereotypePropertiesCompartment.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/StereotypePropertiesCompartment.java
index 7b04bec1b58..7b04bec1b58 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/StereotypePropertiesCompartment.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/StereotypePropertiesCompartment.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/SubCompartmentLayoutManager.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/SubCompartmentLayoutManager.java
index ae096384651..ae096384651 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/SubCompartmentLayoutManager.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/figure/node/SubCompartmentLayoutManager.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/handlers/DeleteFromDiagramCommandHandler.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/handlers/DeleteFromDiagramCommandHandler.java
index 96c3634998c..96c3634998c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/handlers/DeleteFromDiagramCommandHandler.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/handlers/DeleteFromDiagramCommandHandler.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/handlers/DeleteFromModelCommandHandler.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/handlers/DeleteFromModelCommandHandler.java
index dcf31ef2b58..dcf31ef2b58 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/handlers/DeleteFromModelCommandHandler.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/handlers/DeleteFromModelCommandHandler.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/handlers/GraphicalCommandHandler.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/handlers/GraphicalCommandHandler.java
index 8f1eff1a56c..8f1eff1a56c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/handlers/GraphicalCommandHandler.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/handlers/GraphicalCommandHandler.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/handlers/LoadHandler.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/handlers/LoadHandler.java
index fb98d40cff3..fb98d40cff3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/handlers/LoadHandler.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/handlers/LoadHandler.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/handlers/ParametricAndListeningHandler.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/handlers/ParametricAndListeningHandler.java
index a8d9cc0135d..a8d9cc0135d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/handlers/ParametricAndListeningHandler.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/handlers/ParametricAndListeningHandler.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/handlers/PasteWithModelCommandHandler.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/handlers/PasteWithModelCommandHandler.java
index a90b131fc0b..a90b131fc0b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/handlers/PasteWithModelCommandHandler.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/handlers/PasteWithModelCommandHandler.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/handlers/PasteWithModelHandler.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/handlers/PasteWithModelHandler.java
index 338302c63dc..338302c63dc 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/handlers/PasteWithModelHandler.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/handlers/PasteWithModelHandler.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/handlers/RenamedElementHandler.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/handlers/RenamedElementHandler.java
index fb27b611467..fb27b611467 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/handlers/RenamedElementHandler.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/handlers/RenamedElementHandler.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/handlers/UnloadHandler.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/handlers/UnloadHandler.java
index 78102e9c2bd..78102e9c2bd 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/handlers/UnloadHandler.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/handlers/UnloadHandler.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/helper/AbstractHyperLinkHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/helper/AbstractHyperLinkHelper.java
index cdf55b03cd3..cdf55b03cd3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/helper/AbstractHyperLinkHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/helper/AbstractHyperLinkHelper.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/helper/AlignmentLinkHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/helper/AlignmentLinkHelper.java
index bdb2d0331d0..bdb2d0331d0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/helper/AlignmentLinkHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/helper/AlignmentLinkHelper.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/helper/AssociationHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/helper/AssociationHelper.java
index 9575132f757..9575132f757 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/helper/AssociationHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/helper/AssociationHelper.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/helper/BasicClassifierCompartmentLayoutHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/helper/BasicClassifierCompartmentLayoutHelper.java
index d9878645f90..d9878645f90 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/helper/BasicClassifierCompartmentLayoutHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/helper/BasicClassifierCompartmentLayoutHelper.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/helper/ClassifierCompartmentLayoutHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/helper/ClassifierCompartmentLayoutHelper.java
index 72a5ef4bebb..72a5ef4bebb 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/helper/ClassifierCompartmentLayoutHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/helper/ClassifierCompartmentLayoutHelper.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/helper/CleanDiagramHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/helper/CleanDiagramHelper.java
index 3b7e45215ae..3b7e45215ae 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/helper/CleanDiagramHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/helper/CleanDiagramHelper.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/helper/DiagramHyperLinkHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/helper/DiagramHyperLinkHelper.java
index 7aca15aff99..7aca15aff99 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/helper/DiagramHyperLinkHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/helper/DiagramHyperLinkHelper.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/helper/DocumentHyperLinkHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/helper/DocumentHyperLinkHelper.java
index 18fb4c832a3..18fb4c832a3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/helper/DocumentHyperLinkHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/helper/DocumentHyperLinkHelper.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/helper/DurationConstraintHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/helper/DurationConstraintHelper.java
index 8406a54d317..8406a54d317 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/helper/DurationConstraintHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/helper/DurationConstraintHelper.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/helper/DurationObservationHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/helper/DurationObservationHelper.java
index 56ff3851445..56ff3851445 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/helper/DurationObservationHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/helper/DurationObservationHelper.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/helper/ElementHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/helper/ElementHelper.java
index 1b521d4de2b..1b521d4de2b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/helper/ElementHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/helper/ElementHelper.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/helper/HyperlinkHelperFactory.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/helper/HyperlinkHelperFactory.java
index adc0a51dec8..adc0a51dec8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/helper/HyperlinkHelperFactory.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/helper/HyperlinkHelperFactory.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/helper/ICompartmentLayoutHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/helper/ICompartmentLayoutHelper.java
index ce04623ee73..ce04623ee73 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/helper/ICompartmentLayoutHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/helper/ICompartmentLayoutHelper.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/helper/ILinkMappingHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/helper/ILinkMappingHelper.java
index dc3e58313d6..dc3e58313d6 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/helper/ILinkMappingHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/helper/ILinkMappingHelper.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/helper/InteractionFragmentHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/helper/InteractionFragmentHelper.java
index 1e4391ae986..1e4391ae986 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/helper/InteractionFragmentHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/helper/InteractionFragmentHelper.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/helper/LinkMappingHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/helper/LinkMappingHelper.java
index 144084191b5..144084191b5 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/helper/LinkMappingHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/helper/LinkMappingHelper.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/helper/NamedElementHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/helper/NamedElementHelper.java
index 2cd7b20a3d0..2cd7b20a3d0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/helper/NamedElementHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/helper/NamedElementHelper.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/helper/NotificationHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/helper/NotificationHelper.java
index f1d049a6066..f1d049a6066 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/helper/NotificationHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/helper/NotificationHelper.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/helper/OperationLabelHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/helper/OperationLabelHelper.java
index 65c3ba66212..65c3ba66212 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/helper/OperationLabelHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/helper/OperationLabelHelper.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/helper/PreferenceInitializerForElementHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/helper/PreferenceInitializerForElementHelper.java
index 2e7f5a21503..2e7f5a21503 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/helper/PreferenceInitializerForElementHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/helper/PreferenceInitializerForElementHelper.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/helper/PropertyLabelHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/helper/PropertyLabelHelper.java
index 37a53465431..37a53465431 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/helper/PropertyLabelHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/helper/PropertyLabelHelper.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/helper/StereotypeFigureHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/helper/StereotypeFigureHelper.java
index e4886a1d79c..e4886a1d79c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/helper/StereotypeFigureHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/helper/StereotypeFigureHelper.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/helper/StereotypedElementLabelHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/helper/StereotypedElementLabelHelper.java
index 1d2992fc6b8..1d2992fc6b8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/helper/StereotypedElementLabelHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/helper/StereotypedElementLabelHelper.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/helper/TimeConstraintHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/helper/TimeConstraintHelper.java
index a227ae9b312..a227ae9b312 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/helper/TimeConstraintHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/helper/TimeConstraintHelper.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/helper/TimeObservationHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/helper/TimeObservationHelper.java
index 85ce43b0fbf..85ce43b0fbf 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/helper/TimeObservationHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/helper/TimeObservationHelper.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/helper/UMLBaseEditHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/helper/UMLBaseEditHelper.java
index e43c79912fc..e43c79912fc 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/helper/UMLBaseEditHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/helper/UMLBaseEditHelper.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/helper/WebHyperLinkHelper.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/helper/WebHyperLinkHelper.java
index ea896f681ae..ea896f681ae 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/helper/WebHyperLinkHelper.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/helper/WebHyperLinkHelper.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/ids/MOSKittEditorIDs.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/ids/MOSKittEditorIDs.java
index 6ab4bbc05ea..6ab4bbc05ea 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/ids/MOSKittEditorIDs.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/ids/MOSKittEditorIDs.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/ids/ReorientLinkIDs.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/ids/ReorientLinkIDs.java
index bfc29cd9939..bfc29cd9939 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/ids/ReorientLinkIDs.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/ids/ReorientLinkIDs.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/ids/UMLDiagramEditorIDs.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/ids/UMLDiagramEditorIDs.java
index 771ebefab89..771ebefab89 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/ids/UMLDiagramEditorIDs.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/ids/UMLDiagramEditorIDs.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/layout/AlignmentTree.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/layout/AlignmentTree.java
index 4d1c33fa3cd..4d1c33fa3cd 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/layout/AlignmentTree.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/layout/AlignmentTree.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/layout/DistributionConstants.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/layout/DistributionConstants.java
index 61daccc99b9..61daccc99b9 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/layout/DistributionConstants.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/layout/DistributionConstants.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/layout/DistributionTree.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/layout/DistributionTree.java
index d6fb7925538..d6fb7925538 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/layout/DistributionTree.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/layout/DistributionTree.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/layout/EditPartRepresentation.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/layout/EditPartRepresentation.java
index 87347bd05ae..87347bd05ae 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/layout/EditPartRepresentation.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/layout/EditPartRepresentation.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/layout/EditPartTree.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/layout/EditPartTree.java
index 584d1e8c94f..584d1e8c94f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/layout/EditPartTree.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/layout/EditPartTree.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/layout/LayoutUtils.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/layout/LayoutUtils.java
index fe03fca8c2c..fe03fca8c2c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/layout/LayoutUtils.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/layout/LayoutUtils.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/layout/LinkRepresentation.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/layout/LinkRepresentation.java
index 97ef423198e..97ef423198e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/layout/LinkRepresentation.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/layout/LinkRepresentation.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/layout/LinkRepresentationForLayoutAction.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/layout/LinkRepresentationForLayoutAction.java
index 3e57aa4ff24..3e57aa4ff24 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/layout/LinkRepresentationForLayoutAction.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/layout/LinkRepresentationForLayoutAction.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/layout/OverlayLocator.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/layout/OverlayLocator.java
index d52711b0edf..d52711b0edf 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/layout/OverlayLocator.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/layout/OverlayLocator.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/layout/RoutingConstants.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/layout/RoutingConstants.java
index 1146b61e8a1..1146b61e8a1 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/layout/RoutingConstants.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/layout/RoutingConstants.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/layout/SameAlignment.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/layout/SameAlignment.java
index e0355c2681e..e0355c2681e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/layout/SameAlignment.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/layout/SameAlignment.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/listeners/DropTargetListener.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/listeners/DropTargetListener.java
index a84aaf7e529..a84aaf7e529 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/listeners/DropTargetListener.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/listeners/DropTargetListener.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/listeners/RemoveStereotypeApplicationListener.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/listeners/RemoveStereotypeApplicationListener.java
index bf24db17375..bf24db17375 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/listeners/RemoveStereotypeApplicationListener.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/listeners/RemoveStereotypeApplicationListener.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/locator/AdvancedBorderItemLocator.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/locator/AdvancedBorderItemLocator.java
index 62fa6b69a8f..62fa6b69a8f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/locator/AdvancedBorderItemLocator.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/locator/AdvancedBorderItemLocator.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/locator/ExternalLabelPositionLocator.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/locator/ExternalLabelPositionLocator.java
index 66da35fa003..66da35fa003 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/locator/ExternalLabelPositionLocator.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/locator/ExternalLabelPositionLocator.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/locator/PortPositionLocator.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/locator/PortPositionLocator.java
index e89d4db6330..e89d4db6330 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/locator/PortPositionLocator.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/locator/PortPositionLocator.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/locator/PortPositionLocatorUtils.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/locator/PortPositionLocatorUtils.java
index 39475523149..39475523149 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/locator/PortPositionLocatorUtils.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/locator/PortPositionLocatorUtils.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/locator/TemplateBorderItemLocator.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/locator/TemplateBorderItemLocator.java
index 9d0dbb41fad..9d0dbb41fad 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/locator/TemplateBorderItemLocator.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/locator/TemplateBorderItemLocator.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/locator/TemplateClassifierBorderItemLocator.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/locator/TemplateClassifierBorderItemLocator.java
index 03641b709c4..03641b709c4 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/locator/TemplateClassifierBorderItemLocator.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/locator/TemplateClassifierBorderItemLocator.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/parser/CommentParser.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/parser/CommentParser.java
index 8dad66ff95f..8dad66ff95f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/parser/CommentParser.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/parser/CommentParser.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/parser/ConstraintParser.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/parser/ConstraintParser.java
index 6d8c39d71b8..6d8c39d71b8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/parser/ConstraintParser.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/parser/ConstraintParser.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/parser/HTMLCleaner.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/parser/HTMLCleaner.java
index c7bb4a23896..c7bb4a23896 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/parser/HTMLCleaner.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/parser/HTMLCleaner.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/parser/ShortcutDiagramParser.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/parser/ShortcutDiagramParser.java
index 96dc6593473..96dc6593473 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/parser/ShortcutDiagramParser.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/parser/ShortcutDiagramParser.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/parser/TagsAdderParser.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/parser/TagsAdderParser.java
index a84c9982377..a84c9982377 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/parser/TagsAdderParser.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/parser/TagsAdderParser.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/parser/assist/EObjectCompletionProcessor.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/parser/assist/EObjectCompletionProcessor.java
index ee2688561ab..ee2688561ab 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/parser/assist/EObjectCompletionProcessor.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/parser/assist/EObjectCompletionProcessor.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/parser/assist/FixedSetCompletionProcessor.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/parser/assist/FixedSetCompletionProcessor.java
index 88b80b66403..88b80b66403 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/parser/assist/FixedSetCompletionProcessor.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/parser/assist/FixedSetCompletionProcessor.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/parser/custom/AbstractAssociationEndParser.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/parser/custom/AbstractAssociationEndParser.java
index 6e3638aa180..6e3638aa180 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/parser/custom/AbstractAssociationEndParser.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/parser/custom/AbstractAssociationEndParser.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/parser/custom/AssociationEndParser.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/parser/custom/AssociationEndParser.java
index c07d514d3e9..c07d514d3e9 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/parser/custom/AssociationEndParser.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/parser/custom/AssociationEndParser.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/parser/custom/AssociationMultiplicityParser.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/parser/custom/AssociationMultiplicityParser.java
index bfd81d56c15..bfd81d56c15 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/parser/custom/AssociationMultiplicityParser.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/parser/custom/AssociationMultiplicityParser.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/parser/custom/OnlyStereotypesNamesParser.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/parser/custom/OnlyStereotypesNamesParser.java
index d233f7c4023..d233f7c4023 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/parser/custom/OnlyStereotypesNamesParser.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/parser/custom/OnlyStereotypesNamesParser.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/parser/lookup/DefaultOclLookups.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/parser/lookup/DefaultOclLookups.java
index 4cf1d480ebf..4cf1d480ebf 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/parser/lookup/DefaultOclLookups.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/parser/lookup/DefaultOclLookups.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/parser/lookup/Lookup.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/parser/lookup/Lookup.java
index c8fdda437f0..c8fdda437f0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/parser/lookup/Lookup.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/parser/lookup/Lookup.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/parser/lookup/LookupResolveRequest.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/parser/lookup/LookupResolveRequest.java
index dfffc735279..dfffc735279 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/parser/lookup/LookupResolveRequest.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/parser/lookup/LookupResolveRequest.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/parser/lookup/LookupResolver.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/parser/lookup/LookupResolver.java
index df8551ef6fe..df8551ef6fe 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/parser/lookup/LookupResolver.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/parser/lookup/LookupResolver.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/parser/lookup/LookupResolverImpl.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/parser/lookup/LookupResolverImpl.java
index 2485dc77343..2485dc77343 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/parser/lookup/LookupResolverImpl.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/parser/lookup/LookupResolverImpl.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/parser/lookup/LookupSuite.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/parser/lookup/LookupSuite.java
index 29151b785fb..29151b785fb 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/parser/lookup/LookupSuite.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/parser/lookup/LookupSuite.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/parser/lookup/LookupSuiteImpl.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/parser/lookup/LookupSuiteImpl.java
index e0cc52bf379..e0cc52bf379 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/parser/lookup/LookupSuiteImpl.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/parser/lookup/LookupSuiteImpl.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/parser/lookup/OCLLookup.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/parser/lookup/OCLLookup.java
index 9a6aa38b402..9a6aa38b402 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/parser/lookup/OCLLookup.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/parser/lookup/OCLLookup.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/parser/packageimport/PackageImportVisibilityParser.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/parser/packageimport/PackageImportVisibilityParser.java
index dbc7b7c35d3..dbc7b7c35d3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/parser/packageimport/PackageImportVisibilityParser.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/parser/packageimport/PackageImportVisibilityParser.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/parser/stereotype/AppliedStereotypeParser.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/parser/stereotype/AppliedStereotypeParser.java
index 45af0c6d97d..45af0c6d97d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/parser/stereotype/AppliedStereotypeParser.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/parser/stereotype/AppliedStereotypeParser.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/parser/structural/UMLAbstractParser.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/parser/structural/UMLAbstractParser.java
index 158fc73aab2..158fc73aab2 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/parser/structural/UMLAbstractParser.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/parser/structural/UMLAbstractParser.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/parser/structural/UMLStructuralFeatureParser.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/parser/structural/UMLStructuralFeatureParser.java
index 761dfd8706a..761dfd8706a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/parser/structural/UMLStructuralFeatureParser.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/parser/structural/UMLStructuralFeatureParser.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/part/CachedResourcesDiagramEditor.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/part/CachedResourcesDiagramEditor.java
index 6a190c82be6..6a190c82be6 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/part/CachedResourcesDiagramEditor.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/part/CachedResourcesDiagramEditor.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/part/CachedResourcesDocumentProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/part/CachedResourcesDocumentProvider.java
index 24efecd67d7..24efecd67d7 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/part/CachedResourcesDocumentProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/part/CachedResourcesDocumentProvider.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/part/CachedResourcesEditorInput.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/part/CachedResourcesEditorInput.java
index 3b8da0d1a5d..3b8da0d1a5d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/part/CachedResourcesEditorInput.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/part/CachedResourcesEditorInput.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/part/CreateLinkToolBase.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/part/CreateLinkToolBase.java
index 480e44b0c8d..480e44b0c8d 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/part/CreateLinkToolBase.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/part/CreateLinkToolBase.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/part/CustomMessages.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/part/CustomMessages.java
index fbd93ab727a..fbd93ab727a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/part/CustomMessages.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/part/CustomMessages.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/part/DiagramCanvasSwitch.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/part/DiagramCanvasSwitch.java
index bb0a43b985f..bb0a43b985f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/part/DiagramCanvasSwitch.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/part/DiagramCanvasSwitch.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/part/DocumentProviderRegistry.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/part/DocumentProviderRegistry.java
index 04e7f33ace6..04e7f33ace6 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/part/DocumentProviderRegistry.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/part/DocumentProviderRegistry.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/part/EditingDomainRegistry.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/part/EditingDomainRegistry.java
index 91d005b0424..91d005b0424 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/part/EditingDomainRegistry.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/part/EditingDomainRegistry.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/part/ICustomDiagramUpdater.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/part/ICustomDiagramUpdater.java
index 8f1d26e4e48..8f1d26e4e48 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/part/ICustomDiagramUpdater.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/part/ICustomDiagramUpdater.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/part/IPaletteDescription.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/part/IPaletteDescription.java
index 9a745c3e498..9a745c3e498 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/part/IPaletteDescription.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/part/IPaletteDescription.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/part/PaletteMenuAction.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/part/PaletteMenuAction.java
index 33f78bc26fb..33f78bc26fb 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/part/PaletteMenuAction.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/part/PaletteMenuAction.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/part/PaletteUtil.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/part/PaletteUtil.java
index a3be4074cda..a3be4074cda 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/part/PaletteUtil.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/part/PaletteUtil.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/part/PapyrusPaletteContextMenuProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/part/PapyrusPaletteContextMenuProvider.java
index 3179edc1eaa..3179edc1eaa 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/part/PapyrusPaletteContextMenuProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/part/PapyrusPaletteContextMenuProvider.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/part/PapyrusPaletteCustomizer.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/part/PapyrusPaletteCustomizer.java
index 399aca203d9..399aca203d9 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/part/PapyrusPaletteCustomizer.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/part/PapyrusPaletteCustomizer.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/part/PapyrusPaletteDescription.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/part/PapyrusPaletteDescription.java
index db2317db2d8..db2317db2d8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/part/PapyrusPaletteDescription.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/part/PapyrusPaletteDescription.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/part/PapyrusPaletteEntryState.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/part/PapyrusPaletteEntryState.java
index d338a8d15e7..d338a8d15e7 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/part/PapyrusPaletteEntryState.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/part/PapyrusPaletteEntryState.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/part/PapyrusPalettePreferences.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/part/PapyrusPalettePreferences.java
index 05e97b8f58e..05e97b8f58e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/part/PapyrusPalettePreferences.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/part/PapyrusPalettePreferences.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/part/PapyrusPaletteViewer.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/part/PapyrusPaletteViewer.java
index 40fe4611a09..40fe4611a09 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/part/PapyrusPaletteViewer.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/part/PapyrusPaletteViewer.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/part/UMLDiagramActionBarContributor.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/part/UMLDiagramActionBarContributor.java
index 2a891e80b42..2a891e80b42 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/part/UMLDiagramActionBarContributor.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/part/UMLDiagramActionBarContributor.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/part/UMLElementChooserDialog.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/part/UMLElementChooserDialog.java
index e645c929bd9..e645c929bd9 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/part/UMLElementChooserDialog.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/part/UMLElementChooserDialog.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/part/UmlGmfDiagramEditor.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/part/UmlGmfDiagramEditor.java
index 03bcdf77643..03bcdf77643 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/part/UmlGmfDiagramEditor.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/part/UmlGmfDiagramEditor.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/preferences/IconStylePreferencePage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/preferences/IconStylePreferencePage.java
index 9bbbdf79c8a..9bbbdf79c8a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/preferences/IconStylePreferencePage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/preferences/IconStylePreferencePage.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/preferences/UMLPreferencesConstants.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/preferences/UMLPreferencesConstants.java
index f6839b9fd43..f6839b9fd43 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/preferences/UMLPreferencesConstants.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/preferences/UMLPreferencesConstants.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/providers/AbstractActionStateSourceProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/providers/AbstractActionStateSourceProvider.java
index ccbcf8c7a9a..ccbcf8c7a9a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/providers/AbstractActionStateSourceProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/providers/AbstractActionStateSourceProvider.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/providers/ActionStateSourceProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/providers/ActionStateSourceProvider.java
index 5b1da817009..5b1da817009 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/providers/ActionStateSourceProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/providers/ActionStateSourceProvider.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/providers/AlternativeUMLItemProviderAdapterFactory.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/providers/AlternativeUMLItemProviderAdapterFactory.java
index 78cfaa83e96..78cfaa83e96 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/providers/AlternativeUMLItemProviderAdapterFactory.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/providers/AlternativeUMLItemProviderAdapterFactory.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/providers/BaseModelTypeProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/providers/BaseModelTypeProvider.java
index f1bff1e60a1..f1bff1e60a1 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/providers/BaseModelTypeProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/providers/BaseModelTypeProvider.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/providers/BaseViewInfo.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/providers/BaseViewInfo.java
index 1e7468de403..1e7468de403 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/providers/BaseViewInfo.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/providers/BaseViewInfo.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/providers/BaseViewInfoContentProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/providers/BaseViewInfoContentProvider.java
index 04d57d85a74..04d57d85a74 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/providers/BaseViewInfoContentProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/providers/BaseViewInfoContentProvider.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/providers/BaseViewInfoLabelProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/providers/BaseViewInfoLabelProvider.java
index aee0ad5b6c0..aee0ad5b6c0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/providers/BaseViewInfoLabelProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/providers/BaseViewInfoLabelProvider.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/providers/DiagramDecorationAdapter.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/providers/DiagramDecorationAdapter.java
index 3e9358e77d2..3e9358e77d2 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/providers/DiagramDecorationAdapter.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/providers/DiagramDecorationAdapter.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/providers/DiagramValidationDecoratorProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/providers/DiagramValidationDecoratorProvider.java
index 36af4d350ae..36af4d350ae 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/providers/DiagramValidationDecoratorProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/providers/DiagramValidationDecoratorProvider.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/providers/DiagramValidationMarkerNavigationProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/providers/DiagramValidationMarkerNavigationProvider.java
index 28024cff9eb..28024cff9eb 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/providers/DiagramValidationMarkerNavigationProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/providers/DiagramValidationMarkerNavigationProvider.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/providers/DiagramValidationProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/providers/DiagramValidationProvider.java
index 27e3da659ec..27e3da659ec 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/providers/DiagramValidationProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/providers/DiagramValidationProvider.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/providers/EditorLabelProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/providers/EditorLabelProvider.java
index da0e2af5dd5..da0e2af5dd5 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/providers/EditorLabelProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/providers/EditorLabelProvider.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/providers/IDiagramInitializer.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/providers/IDiagramInitializer.java
index ad0118b6454..ad0118b6454 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/providers/IDiagramInitializer.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/providers/IDiagramInitializer.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/providers/IMOSKittEditorFactory.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/providers/IMOSKittEditorFactory.java
index b45d00ab9c0..b45d00ab9c0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/providers/IMOSKittEditorFactory.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/providers/IMOSKittEditorFactory.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/providers/IModelTypesProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/providers/IModelTypesProvider.java
index 0165b1ad14c..0165b1ad14c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/providers/IModelTypesProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/providers/IModelTypesProvider.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/providers/IModelTypesProviderFactory.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/providers/IModelTypesProviderFactory.java
index b9590e438f7..b9590e438f7 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/providers/IModelTypesProviderFactory.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/providers/IModelTypesProviderFactory.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/providers/MOSKittEditorFactory.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/providers/MOSKittEditorFactory.java
index bd8105d5841..bd8105d5841 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/providers/MOSKittEditorFactory.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/providers/MOSKittEditorFactory.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/providers/MOSKittEditorFactoryRegistry.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/providers/MOSKittEditorFactoryRegistry.java
index 756c52fbf94..756c52fbf94 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/providers/MOSKittEditorFactoryRegistry.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/providers/MOSKittEditorFactoryRegistry.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/providers/ModelTypesProviderFactory.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/providers/ModelTypesProviderFactory.java
index 0cd865e7bb7..0cd865e7bb7 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/providers/ModelTypesProviderFactory.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/providers/ModelTypesProviderFactory.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/providers/PapyrusDiagramGlobalActionHandler.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/providers/PapyrusDiagramGlobalActionHandler.java
index 53b29a60bbb..53b29a60bbb 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/providers/PapyrusDiagramGlobalActionHandler.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/providers/PapyrusDiagramGlobalActionHandler.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/providers/PapyrusGlobalActionHandlerProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/providers/PapyrusGlobalActionHandlerProvider.java
index 220ce0552a8..220ce0552a8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/providers/PapyrusGlobalActionHandlerProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/providers/PapyrusGlobalActionHandlerProvider.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/providers/RootViewInfo.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/providers/RootViewInfo.java
index be00e96046a..be00e96046a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/providers/RootViewInfo.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/providers/RootViewInfo.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/providers/UIAdapterImpl.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/providers/UIAdapterImpl.java
index 9d27162b634..9d27162b634 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/providers/UIAdapterImpl.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/providers/UIAdapterImpl.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/providers/UMLComposedAdapterFactory.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/providers/UMLComposedAdapterFactory.java
index 0e1f99e38b1..0e1f99e38b1 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/providers/UMLComposedAdapterFactory.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/providers/UMLComposedAdapterFactory.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/providers/ValidationDecoratorProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/providers/ValidationDecoratorProvider.java
index 54157c10192..54157c10192 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/providers/ValidationDecoratorProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/providers/ValidationDecoratorProvider.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/providers/ValidationProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/providers/ValidationProvider.java
index e3139cb9984..e3139cb9984 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/providers/ValidationProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/providers/ValidationProvider.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/providers/ViewInfo.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/providers/ViewInfo.java
index 23e328da9c3..23e328da9c3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/providers/ViewInfo.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/providers/ViewInfo.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/providers/ViewInfoRegistry.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/providers/ViewInfoRegistry.java
index fa317d555c4..fa317d555c4 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/providers/ViewInfoRegistry.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/providers/ViewInfoRegistry.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/providers/assistant/Assistant.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/providers/assistant/Assistant.java
index 832181ceffe..832181ceffe 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/providers/assistant/Assistant.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/providers/assistant/Assistant.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/providers/assistant/AssistantCustomizeEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/providers/assistant/AssistantCustomizeEditPart.java
index 7d613691371..7d613691371 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/providers/assistant/AssistantCustomizeEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/providers/assistant/AssistantCustomizeEditPart.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/providers/assistant/AssistedEditPart.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/providers/assistant/AssistedEditPart.java
index d55d9474cbc..d55d9474cbc 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/providers/assistant/AssistedEditPart.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/providers/assistant/AssistedEditPart.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/providers/assistant/ElementType.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/providers/assistant/ElementType.java
index 9e644342c7c..9e644342c7c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/providers/assistant/ElementType.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/providers/assistant/ElementType.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/providers/assistant/Exclude.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/providers/assistant/Exclude.java
index d7dc69c2580..d7dc69c2580 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/providers/assistant/Exclude.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/providers/assistant/Exclude.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/providers/assistant/Include.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/providers/assistant/Include.java
index 514b522ac52..514b522ac52 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/providers/assistant/Include.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/providers/assistant/Include.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/providers/assistant/ModelingAssistantRegistry.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/providers/assistant/ModelingAssistantRegistry.java
index 243b7112b70..243b7112b70 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/providers/assistant/ModelingAssistantRegistry.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/providers/assistant/ModelingAssistantRegistry.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/resourceupdate/PartActivationListener.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/resourceupdate/PartActivationListener.java
index e1c67943852..e1c67943852 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/resourceupdate/PartActivationListener.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/resourceupdate/PartActivationListener.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/resourceupdate/ResourceUpdateService.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/resourceupdate/ResourceUpdateService.java
index 38d75d38274..38d75d38274 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/resourceupdate/ResourceUpdateService.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/resourceupdate/ResourceUpdateService.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/resourceupdate/SaveListener.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/resourceupdate/SaveListener.java
index bf78539e949..bf78539e949 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/resourceupdate/SaveListener.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/resourceupdate/SaveListener.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/service/AbstractXMLDefinitionPaletteFactory.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/service/AbstractXMLDefinitionPaletteFactory.java
index e1e3990ab7c..e1e3990ab7c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/service/AbstractXMLDefinitionPaletteFactory.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/service/AbstractXMLDefinitionPaletteFactory.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/service/ApplyStereotypeRequest.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/service/ApplyStereotypeRequest.java
index 49a3c5489f7..49a3c5489f7 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/service/ApplyStereotypeRequest.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/service/ApplyStereotypeRequest.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/service/AspectCreationEntry.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/service/AspectCreationEntry.java
index 22bd63ce3f8..22bd63ce3f8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/service/AspectCreationEntry.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/service/AspectCreationEntry.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/service/AspectUnspecifiedTypeConnectionTool.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/service/AspectUnspecifiedTypeConnectionTool.java
index b11c1b513f7..b11c1b513f7 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/service/AspectUnspecifiedTypeConnectionTool.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/service/AspectUnspecifiedTypeConnectionTool.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/service/AspectUnspecifiedTypeCreationTool.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/service/AspectUnspecifiedTypeCreationTool.java
index f05138a1498..f05138a1498 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/service/AspectUnspecifiedTypeCreationTool.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/service/AspectUnspecifiedTypeCreationTool.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/service/ExtendedPaletteProviderConfiguration.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/service/ExtendedPaletteProviderConfiguration.java
index 41a553ab6ce..41a553ab6ce 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/service/ExtendedPaletteProviderConfiguration.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/service/ExtendedPaletteProviderConfiguration.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/service/IPapyrusPaletteConstant.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/service/IPapyrusPaletteConstant.java
index 70d5b911e69..70d5b911e69 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/service/IPapyrusPaletteConstant.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/service/IPapyrusPaletteConstant.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/service/IProfileDependantPaletteProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/service/IProfileDependantPaletteProvider.java
index 7e59fd4331a..7e59fd4331a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/service/IProfileDependantPaletteProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/service/IProfileDependantPaletteProvider.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/service/InheritedDecorator.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/service/InheritedDecorator.java
index 995b6b12380..995b6b12380 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/service/InheritedDecorator.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/service/InheritedDecorator.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/service/InheritedDecoratorProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/service/InheritedDecoratorProvider.java
index f40fc8ee42a..f40fc8ee42a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/service/InheritedDecoratorProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/service/InheritedDecoratorProvider.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/service/LocalPaletteProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/service/LocalPaletteProvider.java
index ec3cab68d8c..ec3cab68d8c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/service/LocalPaletteProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/service/LocalPaletteProvider.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/service/PaletteProfileApplicationListener.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/service/PaletteProfileApplicationListener.java
index ebf47a71b16..ebf47a71b16 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/service/PaletteProfileApplicationListener.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/service/PaletteProfileApplicationListener.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/service/PapyrusPaletteService.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/service/PapyrusPaletteService.java
index 11e6c99667a..11e6c99667a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/service/PapyrusPaletteService.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/service/PapyrusPaletteService.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/service/PluginPaletteProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/service/PluginPaletteProvider.java
index c2a28715bc8..c2a28715bc8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/service/PluginPaletteProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/service/PluginPaletteProvider.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/service/XMLDefinitionPaletteFactory.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/service/XMLDefinitionPaletteFactory.java
index 47eaf27546f..47eaf27546f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/service/XMLDefinitionPaletteFactory.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/service/XMLDefinitionPaletteFactory.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/service/XMLDefinitionPaletteParser.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/service/XMLDefinitionPaletteParser.java
index 0b2deda5a43..0b2deda5a43 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/service/XMLDefinitionPaletteParser.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/service/XMLDefinitionPaletteParser.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/service/XMLPaletteProviderConfiguration.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/service/XMLPaletteProviderConfiguration.java
index 5af8db44d8a..5af8db44d8a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/service/XMLPaletteProviderConfiguration.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/service/XMLPaletteProviderConfiguration.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/service/XMLRequiredProfileFactory.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/service/XMLRequiredProfileFactory.java
index 7b8a7c9e074..7b8a7c9e074 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/service/XMLRequiredProfileFactory.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/service/XMLRequiredProfileFactory.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/service/palette/AbstractAspectActionProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/service/palette/AbstractAspectActionProvider.java
index 30b5a908c37..30b5a908c37 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/service/palette/AbstractAspectActionProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/service/palette/AbstractAspectActionProvider.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/service/palette/AspectActionFactoryRegistry.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/service/palette/AspectActionFactoryRegistry.java
index d6716017ebb..d6716017ebb 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/service/palette/AspectActionFactoryRegistry.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/service/palette/AspectActionFactoryRegistry.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/service/palette/AspectToolProviderConfiguration.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/service/palette/AspectToolProviderConfiguration.java
index bff0964e02a..bff0964e02a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/service/palette/AspectToolProviderConfiguration.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/service/palette/AspectToolProviderConfiguration.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/service/palette/AspectToolService.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/service/palette/AspectToolService.java
index 3cc46453d6a..3cc46453d6a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/service/palette/AspectToolService.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/service/palette/AspectToolService.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/service/palette/AssociationEndAspectActionProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/service/palette/AssociationEndAspectActionProvider.java
index 4b70c81a639..4b70c81a639 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/service/palette/AssociationEndAspectActionProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/service/palette/AssociationEndAspectActionProvider.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/service/palette/AssociationEndPostAction.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/service/palette/AssociationEndPostAction.java
index dacb704b00c..dacb704b00c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/service/palette/AssociationEndPostAction.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/service/palette/AssociationEndPostAction.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/service/palette/ChangeStereotypeDisplayAspectActionProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/service/palette/ChangeStereotypeDisplayAspectActionProvider.java
index d750e8a4837..d750e8a4837 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/service/palette/ChangeStereotypeDisplayAspectActionProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/service/palette/ChangeStereotypeDisplayAspectActionProvider.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/service/palette/ChangeStereotypeDisplayPostAction.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/service/palette/ChangeStereotypeDisplayPostAction.java
index cb162c8a6a3..cb162c8a6a3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/service/palette/ChangeStereotypeDisplayPostAction.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/service/palette/ChangeStereotypeDisplayPostAction.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/service/palette/Configuration.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/service/palette/Configuration.java
index e9a6f325ab5..e9a6f325ab5 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/service/palette/Configuration.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/service/palette/Configuration.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/service/palette/DefinedPropertiesAtRuntimeDialog.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/service/palette/DefinedPropertiesAtRuntimeDialog.java
index 68073e6bf6c..68073e6bf6c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/service/palette/DefinedPropertiesAtRuntimeDialog.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/service/palette/DefinedPropertiesAtRuntimeDialog.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/service/palette/DisplayAppliedStereotypeAspectActionProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/service/palette/DisplayAppliedStereotypeAspectActionProvider.java
index 82419709141..82419709141 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/service/palette/DisplayAppliedStereotypeAspectActionProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/service/palette/DisplayAppliedStereotypeAspectActionProvider.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/service/palette/DisplayAppliedStereotypePostAction.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/service/palette/DisplayAppliedStereotypePostAction.java
index 6dd332b50fd..6dd332b50fd 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/service/palette/DisplayAppliedStereotypePostAction.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/service/palette/DisplayAppliedStereotypePostAction.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/service/palette/DynamicConfigureRequest.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/service/palette/DynamicConfigureRequest.java
index 50899be8bb7..50899be8bb7 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/service/palette/DynamicConfigureRequest.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/service/palette/DynamicConfigureRequest.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/service/palette/GetAllAspectToolProvidersOperation.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/service/palette/GetAllAspectToolProvidersOperation.java
index d87012cc592..d87012cc592 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/service/palette/GetAllAspectToolProvidersOperation.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/service/palette/GetAllAspectToolProvidersOperation.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/service/palette/GetAspectToolProviderOperation.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/service/palette/GetAspectToolProviderOperation.java
index f05f8ae744c..f05f8ae744c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/service/palette/GetAspectToolProviderOperation.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/service/palette/GetAspectToolProviderOperation.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/service/palette/GraphicalAspectActionProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/service/palette/GraphicalAspectActionProvider.java
index 6cf3645fda9..6cf3645fda9 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/service/palette/GraphicalAspectActionProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/service/palette/GraphicalAspectActionProvider.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/service/palette/GraphicalPostAction.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/service/palette/GraphicalPostAction.java
index 6fc8f0235c0..6fc8f0235c0 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/service/palette/GraphicalPostAction.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/service/palette/GraphicalPostAction.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/service/palette/IAspectAction.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/service/palette/IAspectAction.java
index 695936ea64e..695936ea64e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/service/palette/IAspectAction.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/service/palette/IAspectAction.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/service/palette/IAspectActionProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/service/palette/IAspectActionProvider.java
index f094787e3e6..f094787e3e6 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/service/palette/IAspectActionProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/service/palette/IAspectActionProvider.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/service/palette/IAspectToolProviderService.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/service/palette/IAspectToolProviderService.java
index ba33499152e..ba33499152e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/service/palette/IAspectToolProviderService.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/service/palette/IAspectToolProviderService.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/service/palette/IFeatureSetterAspectAction.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/service/palette/IFeatureSetterAspectAction.java
index e71d9065d82..e71d9065d82 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/service/palette/IFeatureSetterAspectAction.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/service/palette/IFeatureSetterAspectAction.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/service/palette/IPaletteAspectToolEntryProxy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/service/palette/IPaletteAspectToolEntryProxy.java
index 72fef3a1183..72fef3a1183 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/service/palette/IPaletteAspectToolEntryProxy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/service/palette/IPaletteAspectToolEntryProxy.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/service/palette/IPaletteEntryProxy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/service/palette/IPaletteEntryProxy.java
index 606137a564f..606137a564f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/service/palette/IPaletteEntryProxy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/service/palette/IPaletteEntryProxy.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/service/palette/IPostAction.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/service/palette/IPostAction.java
index 15362b54ccd..15362b54ccd 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/service/palette/IPostAction.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/service/palette/IPostAction.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/service/palette/IPreAction.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/service/palette/IPreAction.java
index 5283742a606..5283742a606 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/service/palette/IPreAction.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/service/palette/IPreAction.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/service/palette/Messages.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/service/palette/Messages.java
index 9c597d183bd..9c597d183bd 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/service/palette/Messages.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/service/palette/Messages.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/service/palette/ModelPostAction.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/service/palette/ModelPostAction.java
index e61a3c0c257..e61a3c0c257 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/service/palette/ModelPostAction.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/service/palette/ModelPostAction.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/service/palette/PropertyRepresentation.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/service/palette/PropertyRepresentation.java
index bf935e099b1..bf935e099b1 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/service/palette/PropertyRepresentation.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/service/palette/PropertyRepresentation.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/service/palette/SemanticAspectActionProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/service/palette/SemanticAspectActionProvider.java
index 896271b1553..896271b1553 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/service/palette/SemanticAspectActionProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/service/palette/SemanticAspectActionProvider.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/service/palette/SemanticPostAction.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/service/palette/SemanticPostAction.java
index 285ba673388..285ba673388 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/service/palette/SemanticPostAction.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/service/palette/SemanticPostAction.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/service/palette/SetDynamicValueCommand.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/service/palette/SetDynamicValueCommand.java
index 31e9517bc5a..31e9517bc5a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/service/palette/SetDynamicValueCommand.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/service/palette/SetDynamicValueCommand.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/service/palette/StereotypeAspectActionProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/service/palette/StereotypeAspectActionProvider.java
index 2cfd100b2da..2cfd100b2da 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/service/palette/StereotypeAspectActionProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/service/palette/StereotypeAspectActionProvider.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/service/palette/StereotypePostAction.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/service/palette/StereotypePostAction.java
index 5401676944a..5401676944a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/service/palette/StereotypePostAction.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/service/palette/StereotypePostAction.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/service/palette/StereotypeRepresentation.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/service/palette/StereotypeRepresentation.java
index 1efe67ffd77..1efe67ffd77 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/service/palette/StereotypeRepresentation.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/service/palette/StereotypeRepresentation.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/service/palette/Value.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/service/palette/Value.java
index aa7a268b8c7..aa7a268b8c7 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/service/palette/Value.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/service/palette/Value.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/sheet/PropertySourceExtension.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/sheet/PropertySourceExtension.java
index 2d0ae3810ef..2d0ae3810ef 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/sheet/PropertySourceExtension.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/sheet/PropertySourceExtension.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/sheet/ReferenceComboAndDialogCellEditor.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/sheet/ReferenceComboAndDialogCellEditor.java
index 23bd6880c4e..23bd6880c4e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/sheet/ReferenceComboAndDialogCellEditor.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/sheet/ReferenceComboAndDialogCellEditor.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/sheet/ReferenceElementChooserDialog.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/sheet/ReferenceElementChooserDialog.java
index 27f0148a3cb..27f0148a3cb 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/sheet/ReferenceElementChooserDialog.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/sheet/ReferenceElementChooserDialog.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/sheet/ReferencePropertyDescriptor.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/sheet/ReferencePropertyDescriptor.java
index 0fd80683861..0fd80683861 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/sheet/ReferencePropertyDescriptor.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/sheet/ReferencePropertyDescriptor.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/sheet/UMLPropertySection.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/sheet/UMLPropertySection.java
index afd9fd49f64..afd9fd49f64 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/sheet/UMLPropertySection.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/sheet/UMLPropertySection.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/sheet/UMLPropertySource.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/sheet/UMLPropertySource.java
index ebcf629d040..ebcf629d040 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/sheet/UMLPropertySource.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/sheet/UMLPropertySource.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/ui/dialogs/AbstractChooseElement.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/ui/dialogs/AbstractChooseElement.java
index 328b40786f8..328b40786f8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/ui/dialogs/AbstractChooseElement.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/ui/dialogs/AbstractChooseElement.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/ui/dialogs/ComboDialogWithMessage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/ui/dialogs/ComboDialogWithMessage.java
index fdd051c4ce8..fdd051c4ce8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/ui/dialogs/ComboDialogWithMessage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/ui/dialogs/ComboDialogWithMessage.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/ui/dialogs/ComboInputDialog.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/ui/dialogs/ComboInputDialog.java
index 39e22286cf8..39e22286cf8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/ui/dialogs/ComboInputDialog.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/ui/dialogs/ComboInputDialog.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/ui/dialogs/ElementChooseDialog.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/ui/dialogs/ElementChooseDialog.java
index 22fa59bb7a6..22fa59bb7a6 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/ui/dialogs/ElementChooseDialog.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/ui/dialogs/ElementChooseDialog.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/ui/dialogs/InputDialog.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/ui/dialogs/InputDialog.java
index dfadba0960a..dfadba0960a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/ui/dialogs/InputDialog.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/ui/dialogs/InputDialog.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/ui/dialogs/InputDialogMessage.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/ui/dialogs/InputDialogMessage.java
index 2b0b6b9f2d3..2b0b6b9f2d3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/ui/dialogs/InputDialogMessage.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/ui/dialogs/InputDialogMessage.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/ui/dialogs/PropertyEditors.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/ui/dialogs/PropertyEditors.java
index b4e8cb77d64..b4e8cb77d64 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/ui/dialogs/PropertyEditors.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/ui/dialogs/PropertyEditors.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/ui/helper/CustomPopupDialog.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/ui/helper/CustomPopupDialog.java
index d6577b4c98e..d6577b4c98e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/ui/helper/CustomPopupDialog.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/ui/helper/CustomPopupDialog.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/ui/helper/HelpComponentFactory.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/ui/helper/HelpComponentFactory.java
index 79691c4a4ec..79691c4a4ec 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/ui/helper/HelpComponentFactory.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/ui/helper/HelpComponentFactory.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/ui/helper/HelpDialog.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/ui/helper/HelpDialog.java
index 8f4f7d50833..8f4f7d50833 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/ui/helper/HelpDialog.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/ui/helper/HelpDialog.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/ui/hyperlinkshell/AbstractEditHyperlinkDiagramShell.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/ui/hyperlinkshell/AbstractEditHyperlinkDiagramShell.java
index f89d6538c44..f89d6538c44 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/ui/hyperlinkshell/AbstractEditHyperlinkDiagramShell.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/ui/hyperlinkshell/AbstractEditHyperlinkDiagramShell.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/ui/hyperlinkshell/AbstractEditHyperlinkDocumentShell.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/ui/hyperlinkshell/AbstractEditHyperlinkDocumentShell.java
index 5c3cc771f9a..5c3cc771f9a 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/ui/hyperlinkshell/AbstractEditHyperlinkDocumentShell.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/ui/hyperlinkshell/AbstractEditHyperlinkDocumentShell.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/ui/hyperlinkshell/AbstractEditHyperlinkShell.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/ui/hyperlinkshell/AbstractEditHyperlinkShell.java
index 875d693df42..875d693df42 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/ui/hyperlinkshell/AbstractEditHyperlinkShell.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/ui/hyperlinkshell/AbstractEditHyperlinkShell.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/ui/hyperlinkshell/AbstractHyperLinkManagerShell.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/ui/hyperlinkshell/AbstractHyperLinkManagerShell.java
index 7587b49b211..7587b49b211 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/ui/hyperlinkshell/AbstractHyperLinkManagerShell.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/ui/hyperlinkshell/AbstractHyperLinkManagerShell.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/ui/hyperlinkshell/AbstractLookForDiagramShell.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/ui/hyperlinkshell/AbstractLookForDiagramShell.java
index a983302f672..a983302f672 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/ui/hyperlinkshell/AbstractLookForDiagramShell.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/ui/hyperlinkshell/AbstractLookForDiagramShell.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/ui/hyperlinkshell/AdvancedHLManager.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/ui/hyperlinkshell/AdvancedHLManager.java
index 1f794c8fa83..1f794c8fa83 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/ui/hyperlinkshell/AdvancedHLManager.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/ui/hyperlinkshell/AdvancedHLManager.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/ui/hyperlinkshell/CustomAdapterFactoryContentProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/ui/hyperlinkshell/CustomAdapterFactoryContentProvider.java
index 8dd4065fb6f..8dd4065fb6f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/ui/hyperlinkshell/CustomAdapterFactoryContentProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/ui/hyperlinkshell/CustomAdapterFactoryContentProvider.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/ui/hyperlinkshell/DefaultHyperLinkTab.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/ui/hyperlinkshell/DefaultHyperLinkTab.java
index 877f267f627..877f267f627 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/ui/hyperlinkshell/DefaultHyperLinkTab.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/ui/hyperlinkshell/DefaultHyperLinkTab.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/ui/hyperlinkshell/DownElementListener.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/ui/hyperlinkshell/DownElementListener.java
index 156560ed40e..156560ed40e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/ui/hyperlinkshell/DownElementListener.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/ui/hyperlinkshell/DownElementListener.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/ui/hyperlinkshell/EditorHyperlinkDiagramShell.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/ui/hyperlinkshell/EditorHyperlinkDiagramShell.java
index 1ba99e0ba6f..1ba99e0ba6f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/ui/hyperlinkshell/EditorHyperlinkDiagramShell.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/ui/hyperlinkshell/EditorHyperlinkDiagramShell.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/ui/hyperlinkshell/EditorHyperlinkDocumentShell.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/ui/hyperlinkshell/EditorHyperlinkDocumentShell.java
index 29fe58b202f..29fe58b202f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/ui/hyperlinkshell/EditorHyperlinkDocumentShell.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/ui/hyperlinkshell/EditorHyperlinkDocumentShell.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/ui/hyperlinkshell/EditorHyperlinkWebShell.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/ui/hyperlinkshell/EditorHyperlinkWebShell.java
index 9ce4cdc51cf..9ce4cdc51cf 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/ui/hyperlinkshell/EditorHyperlinkWebShell.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/ui/hyperlinkshell/EditorHyperlinkWebShell.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/ui/hyperlinkshell/EditorLookForDiagram.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/ui/hyperlinkshell/EditorLookForDiagram.java
index 4af0964ce85..4af0964ce85 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/ui/hyperlinkshell/EditorLookForDiagram.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/ui/hyperlinkshell/EditorLookForDiagram.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/ui/hyperlinkshell/HyperLinkContentProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/ui/hyperlinkshell/HyperLinkContentProvider.java
index 2033d1f0914..2033d1f0914 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/ui/hyperlinkshell/HyperLinkContentProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/ui/hyperlinkshell/HyperLinkContentProvider.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/ui/hyperlinkshell/HyperLinkDiagram.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/ui/hyperlinkshell/HyperLinkDiagram.java
index 14fbcc11c76..14fbcc11c76 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/ui/hyperlinkshell/HyperLinkDiagram.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/ui/hyperlinkshell/HyperLinkDiagram.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/ui/hyperlinkshell/HyperLinkException.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/ui/hyperlinkshell/HyperLinkException.java
index 505237656f8..505237656f8 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/ui/hyperlinkshell/HyperLinkException.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/ui/hyperlinkshell/HyperLinkException.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/ui/hyperlinkshell/HyperLinkLabelProvider.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/ui/hyperlinkshell/HyperLinkLabelProvider.java
index 474bba9d463..474bba9d463 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/ui/hyperlinkshell/HyperLinkLabelProvider.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/ui/hyperlinkshell/HyperLinkLabelProvider.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/ui/hyperlinkshell/HyperLinkManagerShell.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/ui/hyperlinkshell/HyperLinkManagerShell.java
index f210b2ef15e..f210b2ef15e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/ui/hyperlinkshell/HyperLinkManagerShell.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/ui/hyperlinkshell/HyperLinkManagerShell.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/ui/hyperlinkshell/HyperLinkTab.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/ui/hyperlinkshell/HyperLinkTab.java
index 1d2f86e6866..1d2f86e6866 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/ui/hyperlinkshell/HyperLinkTab.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/ui/hyperlinkshell/HyperLinkTab.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/ui/hyperlinkshell/HyperLinkWeb.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/ui/hyperlinkshell/HyperLinkWeb.java
index 33f39cd361e..33f39cd361e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/ui/hyperlinkshell/HyperLinkWeb.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/ui/hyperlinkshell/HyperLinkWeb.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/ui/hyperlinkshell/HyperlinkDocument.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/ui/hyperlinkshell/HyperlinkDocument.java
index 48e34205838..48e34205838 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/ui/hyperlinkshell/HyperlinkDocument.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/ui/hyperlinkshell/HyperlinkDocument.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/ui/hyperlinkshell/HyperlinkObject.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/ui/hyperlinkshell/HyperlinkObject.java
index 575f19bd56f..575f19bd56f 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/ui/hyperlinkshell/HyperlinkObject.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/ui/hyperlinkshell/HyperlinkObject.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/ui/hyperlinkshell/LocalDefaultLinkDiagramTab.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/ui/hyperlinkshell/LocalDefaultLinkDiagramTab.java
index dbda0cc01ce..dbda0cc01ce 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/ui/hyperlinkshell/LocalDefaultLinkDiagramTab.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/ui/hyperlinkshell/LocalDefaultLinkDiagramTab.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/ui/hyperlinkshell/RemoveElementListener.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/ui/hyperlinkshell/RemoveElementListener.java
index 45f09ec4c48..45f09ec4c48 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/ui/hyperlinkshell/RemoveElementListener.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/ui/hyperlinkshell/RemoveElementListener.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/ui/hyperlinkshell/UpElementListener.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/ui/hyperlinkshell/UpElementListener.java
index 73f2e4aacbb..73f2e4aacbb 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/ui/hyperlinkshell/UpElementListener.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/ui/hyperlinkshell/UpElementListener.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/util/BasicEcoreSwitch.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/util/BasicEcoreSwitch.java
index a627852154b..a627852154b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/util/BasicEcoreSwitch.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/util/BasicEcoreSwitch.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/util/ColorManager.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/util/ColorManager.java
index 2ece45cbefd..2ece45cbefd 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/util/ColorManager.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/util/ColorManager.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/util/CommandUtil.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/util/CommandUtil.java
index 488de53ebdb..488de53ebdb 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/util/CommandUtil.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/util/CommandUtil.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/util/CompartmentTitleRepresentation.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/util/CompartmentTitleRepresentation.java
index e6df0572325..e6df0572325 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/util/CompartmentTitleRepresentation.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/util/CompartmentTitleRepresentation.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/util/CompartmentUtils.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/util/CompartmentUtils.java
index 3877e9802c1..3877e9802c1 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/util/CompartmentUtils.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/util/CompartmentUtils.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/util/CrossReferencerUtil.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/util/CrossReferencerUtil.java
index 02446e54051..02446e54051 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/util/CrossReferencerUtil.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/util/CrossReferencerUtil.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/util/DiagramCoreServiceUtils.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/util/DiagramCoreServiceUtils.java
index 49375247757..49375247757 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/util/DiagramCoreServiceUtils.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/util/DiagramCoreServiceUtils.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/util/DiagramEditPartsUtil.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/util/DiagramEditPartsUtil.java
index 95c011ac189..95c011ac189 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/util/DiagramEditPartsUtil.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/util/DiagramEditPartsUtil.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/util/DiagramTester.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/util/DiagramTester.java
index 9541e5514cb..9541e5514cb 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/util/DiagramTester.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/util/DiagramTester.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/util/EcoreSwitch.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/util/EcoreSwitch.java
index 2246b00a803..2246b00a803 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/util/EcoreSwitch.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/util/EcoreSwitch.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/util/ExtensionPointParser.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/util/ExtensionPointParser.java
index 2a1c9fd95a4..2a1c9fd95a4 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/util/ExtensionPointParser.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/util/ExtensionPointParser.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/util/FontManager.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/util/FontManager.java
index 7a92dbb1a1e..7a92dbb1a1e 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/util/FontManager.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/util/FontManager.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/util/IObjectWithContributorId.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/util/IObjectWithContributorId.java
index 0b448466943..0b448466943 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/util/IObjectWithContributorId.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/util/IObjectWithContributorId.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/util/MDTUtil.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/util/MDTUtil.java
index 792ced475ac..792ced475ac 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/util/MDTUtil.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/util/MDTUtil.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/util/MessageDirection.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/util/MessageDirection.java
index 6e42c480957..6e42c480957 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/util/MessageDirection.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/util/MessageDirection.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/util/MultiDiagramUtil.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/util/MultiDiagramUtil.java
index 47ecb00c1b1..47ecb00c1b1 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/util/MultiDiagramUtil.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/util/MultiDiagramUtil.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/util/PathsUtil.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/util/PathsUtil.java
index c0bd3e010b3..c0bd3e010b3 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/util/PathsUtil.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/util/PathsUtil.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/util/ServiceUtilsForGMF.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/util/ServiceUtilsForGMF.java
index 5063d432902..5063d432902 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/util/ServiceUtilsForGMF.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/util/ServiceUtilsForGMF.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/util/StringComparator.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/util/StringComparator.java
index f0bb3c56f5b..f0bb3c56f5b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/util/StringComparator.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/util/StringComparator.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/util/UMLSelectionTester.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/util/UMLSelectionTester.java
index 65eb08d2a2c..65eb08d2a2c 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/util/UMLSelectionTester.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/util/UMLSelectionTester.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/util/URIUtil.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/util/URIUtil.java
index 68bc0fd77cb..68bc0fd77cb 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/util/URIUtil.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/util/URIUtil.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/util/Util.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/util/Util.java
index 6bee17e86e7..6bee17e86e7 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/util/Util.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/util/Util.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/util/ViewServiceUtil.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/util/ViewServiceUtil.java
index 2ef695166dc..2ef695166dc 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/util/ViewServiceUtil.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/util/ViewServiceUtil.java
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/util/Visitor.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/util/Visitor.java
index f1a40cd14c9..f1a40cd14c9 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.diagram.common/src/org/eclipse/papyrus/diagram/common/util/Visitor.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/diagram/common/util/Visitor.java