Formatting all files and fixing find-bugs errors

Change-Id: I330d5a9d9647cf33ef57cc6a906a0ec4543e54eb
Signed-off-by: Maged Elaasar <melaasar@gmail.com>

234 files changed, 13022 insertions, 10836 deletions

diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/.settings/org.eclipse.jdt.core.prefs b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 00000000000..e5766923962
--- /dev/null
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,281 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=0
+org.eclipse.jdt.core.formatter.alignment_for_assignment=0
+org.eclipse.jdt.core.formatter.alignment_for_binary_expression=0
+org.eclipse.jdt.core.formatter.alignment_for_compact_if=0
+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=0
+org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=0
+org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
+org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=0
+org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
+org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_after_package=1
+org.eclipse.jdt.core.formatter.blank_lines_before_field=1
+org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=1
+org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
+org.eclipse.jdt.core.formatter.blank_lines_before_method=1
+org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
+org.eclipse.jdt.core.formatter.blank_lines_before_package=0
+org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
+org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
+org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=next_line
+org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=next_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
+org.eclipse.jdt.core.formatter.comment.format_block_comments=true
+org.eclipse.jdt.core.formatter.comment.format_header=false
+org.eclipse.jdt.core.formatter.comment.format_html=true
+org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
+org.eclipse.jdt.core.formatter.comment.format_line_comments=false
+org.eclipse.jdt.core.formatter.comment.format_source_code=true
+org.eclipse.jdt.core.formatter.comment.indent_parameter_description=false
+org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
+org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
+org.eclipse.jdt.core.formatter.comment.line_length=150
+org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
+org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
+org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
+org.eclipse.jdt.core.formatter.compact_else_if=true
+org.eclipse.jdt.core.formatter.continuation_indentation=1
+org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=1
+org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
+org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
+org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
+org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
+org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_empty_lines=false
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
+org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
+org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
+org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.join_lines_in_comments=false
+org.eclipse.jdt.core.formatter.join_wrapped_lines=true
+org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.lineSplit=200
+org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
+org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=0
+org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=false
+org.eclipse.jdt.core.formatter.tabulation.char=tab
+org.eclipse.jdt.core.formatter.tabulation.size=4
+org.eclipse.jdt.core.formatter.use_on_off_tags=false
+org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
+org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
+org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/.settings/org.eclipse.jdt.ui.prefs b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/.settings/org.eclipse.jdt.ui.prefs
index e7906dea54b..b5f980cae55 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/.settings/org.eclipse.jdt.ui.prefs
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/.settings/org.eclipse.jdt.ui.prefs
@@ -1,3 +1,3 @@
 eclipse.preferences.version=1
-org.eclipse.jdt.ui.javadoc=false
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="false" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * Constructor.\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/**\n * \n */</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * @author ${user}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/**\n * ${see_to_overridden}\n *\n * ${tags}\n */\n</template><template autoinsert\="false" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${see_to_target}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
+formatter_profile=_Zero blank Papyrus Formatter Profile CDM
+formatter_settings_version=12
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dc/provider/BoundsItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dc/provider/BoundsItemProvider.java
index c318b54768b..fd5d21a0631 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dc/provider/BoundsItemProvider.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dc/provider/BoundsItemProvider.java
@@ -39,11 +39,10 @@ import org.eclipse.papyrus.dd.edit.DDEditPlugin;
  * This is the item provider adapter for a {@link org.eclipse.papyrus.dd.dc.Bounds} object.
  * <!-- begin-user-doc --> <!--
  * end-user-doc -->
+ * 
  * @generated
  */
-public class BoundsItemProvider extends ItemProviderAdapter implements
-		IEditingDomainItemProvider, IStructuredItemContentProvider,
-		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
+public class BoundsItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
 
 	/**
 	 * This constructs an instance from a factory and a notifier. <!--
@@ -63,9 +62,8 @@ public class BoundsItemProvider extends ItemProviderAdapter implements
 	 */
 	@Override
 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
+		if(itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
-
 			addXPropertyDescriptor(object);
 			addYPropertyDescriptor(object);
 			addWidthPropertyDescriptor(object);
@@ -78,44 +76,22 @@ public class BoundsItemProvider extends ItemProviderAdapter implements
 	 * This adds a property descriptor for the X feature.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addXPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Bounds_x_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Bounds_x_feature", "_UI_Bounds_type"),
-				 DCPackage.Literals.BOUNDS__X,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.REAL_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Bounds_x_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Bounds_x_feature", "_UI_Bounds_type"), DCPackage.Literals.BOUNDS__X, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
 	}
 
 	/**
 	 * This adds a property descriptor for the Y feature.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addYPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Bounds_y_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Bounds_y_feature", "_UI_Bounds_type"),
-				 DCPackage.Literals.BOUNDS__Y,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.REAL_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Bounds_y_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Bounds_y_feature", "_UI_Bounds_type"), DCPackage.Literals.BOUNDS__Y, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
 	}
 
 	/**
@@ -125,19 +101,7 @@ public class BoundsItemProvider extends ItemProviderAdapter implements
 	 * @generated
 	 */
 	protected void addWidthPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Bounds_width_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Bounds_width_feature", "_UI_Bounds_type"),
-				 DCPackage.Literals.BOUNDS__WIDTH,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.REAL_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Bounds_width_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Bounds_width_feature", "_UI_Bounds_type"), DCPackage.Literals.BOUNDS__WIDTH, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
 	}
 
 	/**
@@ -147,24 +111,13 @@ public class BoundsItemProvider extends ItemProviderAdapter implements
 	 * @generated
 	 */
 	protected void addHeightPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Bounds_height_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Bounds_height_feature", "_UI_Bounds_type"),
-				 DCPackage.Literals.BOUNDS__HEIGHT,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.REAL_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Bounds_height_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Bounds_height_feature", "_UI_Bounds_type"), DCPackage.Literals.BOUNDS__HEIGHT, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
 	}
 
 	/**
 	 * This returns Bounds.gif.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -180,10 +133,8 @@ public class BoundsItemProvider extends ItemProviderAdapter implements
 	 */
 	@Override
 	public String getText(Object object) {
-		Bounds bounds = (Bounds) object;
-		return getString("_UI_Bounds_type") + " " + bounds.getX() + ", "
-				+ bounds.getY() + ", " + bounds.getWidth() + ", "
-				+ bounds.getHeight();
+		Bounds bounds = (Bounds)object;
+		return getString("_UI_Bounds_type") + " " + bounds.getX() + ", " + bounds.getY() + ", " + bounds.getWidth() + ", " + bounds.getHeight();
 	}
 
 	/**
@@ -191,19 +142,19 @@ public class BoundsItemProvider extends ItemProviderAdapter implements
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void notifyChanged(Notification notification) {
 		updateChildren(notification);
-
-		switch (notification.getFeatureID(Bounds.class)) {
-			case DCPackage.BOUNDS__X:
-			case DCPackage.BOUNDS__Y:
-			case DCPackage.BOUNDS__WIDTH:
-			case DCPackage.BOUNDS__HEIGHT:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
+		switch(notification.getFeatureID(Bounds.class)) {
+		case DCPackage.BOUNDS__X:
+		case DCPackage.BOUNDS__Y:
+		case DCPackage.BOUNDS__WIDTH:
+		case DCPackage.BOUNDS__HEIGHT:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+			return;
 		}
 		super.notifyChanged(notification);
 	}
@@ -216,8 +167,7 @@ public class BoundsItemProvider extends ItemProviderAdapter implements
 	 * @generated
 	 */
 	@Override
-	protected void collectNewChildDescriptors(
-			Collection<Object> newChildDescriptors, Object object) {
+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
 	}
 
@@ -231,5 +181,4 @@ public class BoundsItemProvider extends ItemProviderAdapter implements
 	public ResourceLocator getResourceLocator() {
 		return DDEditPlugin.INSTANCE;
 	}
-
 }
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dc/provider/DCItemProviderAdapterFactory.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dc/provider/DCItemProviderAdapterFactory.java
index 8de50b30abc..dc9f6b59a8f 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dc/provider/DCItemProviderAdapterFactory.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dc/provider/DCItemProviderAdapterFactory.java
@@ -39,21 +39,21 @@ import org.eclipse.papyrus.dd.dc.util.DCAdapterFactory;
  * Note that most of the adapters are shared among multiple instances.
  * <!-- begin-user-doc --> <!--
  * end-user-doc -->
+ * 
  * @generated
  */
-public class DCItemProviderAdapterFactory extends DCAdapterFactory implements
-		ComposeableAdapterFactory, IChangeNotifier, IDisposable {
+public class DCItemProviderAdapterFactory extends DCAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier, IDisposable {
 
 	/**
 	 * This keeps track of the root adapter factory that delegates to this adapter factory.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected ComposedAdapterFactory parentAdapterFactory;
 
 	/**
-	 * This is used to implement
-	 * {@link org.eclipse.emf.edit.provider.IChangeNotifier}. <!--
+	 * This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @generated
@@ -64,6 +64,7 @@ public class DCItemProviderAdapterFactory extends DCAdapterFactory implements
 	 * This keeps track of all the supported types checked by {@link #isFactoryForType isFactoryForType}.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected Collection<Object> supportedTypes = new ArrayList<Object>();
@@ -86,6 +87,7 @@ public class DCItemProviderAdapterFactory extends DCAdapterFactory implements
 	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.dd.dc.Point} instances.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected PointItemProvider pointItemProvider;
@@ -93,20 +95,19 @@ public class DCItemProviderAdapterFactory extends DCAdapterFactory implements
 	/**
 	 * This creates an adapter for a {@link org.eclipse.papyrus.dd.dc.Point}.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Adapter createPointAdapter() {
-		if (pointItemProvider == null) {
+		if(pointItemProvider == null) {
 			pointItemProvider = new PointItemProvider(this);
 		}
-
 		return pointItemProvider;
 	}
 
 	/**
-	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.papyrus.dd.dc.Dimension} instances. <!--
+	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.dd.dc.Dimension} instances. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @generated
@@ -116,14 +117,14 @@ public class DCItemProviderAdapterFactory extends DCAdapterFactory implements
 	/**
 	 * This creates an adapter for a {@link org.eclipse.papyrus.dd.dc.Dimension}.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Adapter createDimensionAdapter() {
-		if (dimensionItemProvider == null) {
+		if(dimensionItemProvider == null) {
 			dimensionItemProvider = new DimensionItemProvider(this);
 		}
-
 		return dimensionItemProvider;
 	}
 
@@ -131,6 +132,7 @@ public class DCItemProviderAdapterFactory extends DCAdapterFactory implements
 	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.dd.dc.Bounds} instances.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected BoundsItemProvider boundsItemProvider;
@@ -138,14 +140,14 @@ public class DCItemProviderAdapterFactory extends DCAdapterFactory implements
 	/**
 	 * This creates an adapter for a {@link org.eclipse.papyrus.dd.dc.Bounds}.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Adapter createBoundsAdapter() {
-		if (boundsItemProvider == null) {
+		if(boundsItemProvider == null) {
 			boundsItemProvider = new BoundsItemProvider(this);
 		}
-
 		return boundsItemProvider;
 	}
 
@@ -165,13 +167,13 @@ public class DCItemProviderAdapterFactory extends DCAdapterFactory implements
 	 * 
 	 * @generated
 	 */
-	public void setParentAdapterFactory(
-			ComposedAdapterFactory parentAdapterFactory) {
+	public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory) {
 		this.parentAdapterFactory = parentAdapterFactory;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -182,6 +184,7 @@ public class DCItemProviderAdapterFactory extends DCAdapterFactory implements
 	/**
 	 * This implementation substitutes the factory itself as the key for the adapter.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -191,23 +194,24 @@ public class DCItemProviderAdapterFactory extends DCAdapterFactory implements
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object adapt(Object object, Object type) {
-		if (isFactoryForType(type)) {
+		if(isFactoryForType(type)) {
 			Object adapter = super.adapt(object, type);
-			if (!(type instanceof Class<?>) || (((Class<?>)type).isInstance(adapter))) {
+			if(!(type instanceof Class<?>) || (((Class<?>)type).isInstance(adapter))) {
 				return adapter;
 			}
 		}
-
 		return null;
 	}
 
 	/**
 	 * This adds a listener.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void addListener(INotifyChangedListener notifyChangedListener) {
@@ -217,6 +221,7 @@ public class DCItemProviderAdapterFactory extends DCAdapterFactory implements
 	/**
 	 * This removes a listener.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void removeListener(INotifyChangedListener notifyChangedListener) {
@@ -224,16 +229,14 @@ public class DCItemProviderAdapterFactory extends DCAdapterFactory implements
 	}
 
 	/**
-	 * This delegates to {@link #changeNotifier} and to
-	 * {@link #parentAdapterFactory}. <!-- begin-user-doc --> <!-- end-user-doc
+	 * This delegates to {@link #changeNotifier} and to {@link #parentAdapterFactory}. <!-- begin-user-doc --> <!-- end-user-doc
 	 * -->
 	 * 
 	 * @generated
 	 */
 	public void fireNotifyChanged(Notification notification) {
 		changeNotifier.fireNotifyChanged(notification);
-
-		if (parentAdapterFactory != null) {
+		if(parentAdapterFactory != null) {
 			parentAdapterFactory.fireNotifyChanged(notification);
 		}
 	}
@@ -245,9 +248,11 @@ public class DCItemProviderAdapterFactory extends DCAdapterFactory implements
 	 * @generated
 	 */
 	public void dispose() {
-		if (pointItemProvider != null) pointItemProvider.dispose();
-		if (dimensionItemProvider != null) dimensionItemProvider.dispose();
-		if (boundsItemProvider != null) boundsItemProvider.dispose();
+		if(pointItemProvider != null)
+			pointItemProvider.dispose();
+		if(dimensionItemProvider != null)
+			dimensionItemProvider.dispose();
+		if(boundsItemProvider != null)
+			boundsItemProvider.dispose();
 	}
-
 }
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dc/provider/DimensionItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dc/provider/DimensionItemProvider.java
index cee9cbc0731..a386d6a1bfc 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dc/provider/DimensionItemProvider.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dc/provider/DimensionItemProvider.java
@@ -39,11 +39,10 @@ import org.eclipse.papyrus.dd.edit.DDEditPlugin;
  * This is the item provider adapter for a {@link org.eclipse.papyrus.dd.dc.Dimension} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
+ * 
  * @generated
  */
-public class DimensionItemProvider extends ItemProviderAdapter implements
-		IEditingDomainItemProvider, IStructuredItemContentProvider,
-		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
+public class DimensionItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
 
 	/**
 	 * This constructs an instance from a factory and a notifier. <!--
@@ -63,9 +62,8 @@ public class DimensionItemProvider extends ItemProviderAdapter implements
 	 */
 	@Override
 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
+		if(itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
-
 			addWidthPropertyDescriptor(object);
 			addHeightPropertyDescriptor(object);
 		}
@@ -79,19 +77,7 @@ public class DimensionItemProvider extends ItemProviderAdapter implements
 	 * @generated
 	 */
 	protected void addWidthPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Dimension_width_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Dimension_width_feature", "_UI_Dimension_type"),
-				 DCPackage.Literals.DIMENSION__WIDTH,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.REAL_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Dimension_width_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Dimension_width_feature", "_UI_Dimension_type"), DCPackage.Literals.DIMENSION__WIDTH, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
 	}
 
 	/**
@@ -101,24 +87,13 @@ public class DimensionItemProvider extends ItemProviderAdapter implements
 	 * @generated
 	 */
 	protected void addHeightPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Dimension_height_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Dimension_height_feature", "_UI_Dimension_type"),
-				 DCPackage.Literals.DIMENSION__HEIGHT,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.REAL_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Dimension_height_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Dimension_height_feature", "_UI_Dimension_type"), DCPackage.Literals.DIMENSION__HEIGHT, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
 	}
 
 	/**
 	 * This returns Dimension.gif.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -134,9 +109,8 @@ public class DimensionItemProvider extends ItemProviderAdapter implements
 	 */
 	@Override
 	public String getText(Object object) {
-		Dimension dimension = (Dimension) object;
-		return getString("_UI_Dimension_type") + " " + dimension.getWidth()
-				+ ", " + dimension.getHeight();
+		Dimension dimension = (Dimension)object;
+		return getString("_UI_Dimension_type") + " " + dimension.getWidth() + ", " + dimension.getHeight();
 	}
 
 	/**
@@ -144,17 +118,17 @@ public class DimensionItemProvider extends ItemProviderAdapter implements
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void notifyChanged(Notification notification) {
 		updateChildren(notification);
-
-		switch (notification.getFeatureID(Dimension.class)) {
-			case DCPackage.DIMENSION__WIDTH:
-			case DCPackage.DIMENSION__HEIGHT:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
+		switch(notification.getFeatureID(Dimension.class)) {
+		case DCPackage.DIMENSION__WIDTH:
+		case DCPackage.DIMENSION__HEIGHT:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+			return;
 		}
 		super.notifyChanged(notification);
 	}
@@ -167,8 +141,7 @@ public class DimensionItemProvider extends ItemProviderAdapter implements
 	 * @generated
 	 */
 	@Override
-	protected void collectNewChildDescriptors(
-			Collection<Object> newChildDescriptors, Object object) {
+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
 	}
 
@@ -182,5 +155,4 @@ public class DimensionItemProvider extends ItemProviderAdapter implements
 	public ResourceLocator getResourceLocator() {
 		return DDEditPlugin.INSTANCE;
 	}
-
 }
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dc/provider/PointItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dc/provider/PointItemProvider.java
index dd0da3705d9..cffbe9c5d6c 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dc/provider/PointItemProvider.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dc/provider/PointItemProvider.java
@@ -39,11 +39,10 @@ import org.eclipse.papyrus.dd.edit.DDEditPlugin;
  * This is the item provider adapter for a {@link org.eclipse.papyrus.dd.dc.Point} object.
  * <!-- begin-user-doc --> <!--
  * end-user-doc -->
+ * 
  * @generated
  */
-public class PointItemProvider extends ItemProviderAdapter implements
-		IEditingDomainItemProvider, IStructuredItemContentProvider,
-		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
+public class PointItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
 
 	/**
 	 * This constructs an instance from a factory and a notifier. <!--
@@ -63,9 +62,8 @@ public class PointItemProvider extends ItemProviderAdapter implements
 	 */
 	@Override
 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
+		if(itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
-
 			addXPropertyDescriptor(object);
 			addYPropertyDescriptor(object);
 		}
@@ -76,49 +74,28 @@ public class PointItemProvider extends ItemProviderAdapter implements
 	 * This adds a property descriptor for the X feature.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addXPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Point_x_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Point_x_feature", "_UI_Point_type"),
-				 DCPackage.Literals.POINT__X,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.REAL_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Point_x_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Point_x_feature", "_UI_Point_type"), DCPackage.Literals.POINT__X, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
 	}
 
 	/**
 	 * This adds a property descriptor for the Y feature.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addYPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Point_y_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Point_y_feature", "_UI_Point_type"),
-				 DCPackage.Literals.POINT__Y,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.REAL_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Point_y_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Point_y_feature", "_UI_Point_type"), DCPackage.Literals.POINT__Y, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
 	}
 
 	/**
 	 * This returns Point.gif.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -134,9 +111,8 @@ public class PointItemProvider extends ItemProviderAdapter implements
 	 */
 	@Override
 	public String getText(Object object) {
-		Point point = (Point) object;
-		return getString("_UI_Point_type") + " " + point.getX() + ", "
-				+ point.getY();
+		Point point = (Point)object;
+		return getString("_UI_Point_type") + " " + point.getX() + ", " + point.getY();
 	}
 
 	/**
@@ -144,17 +120,17 @@ public class PointItemProvider extends ItemProviderAdapter implements
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void notifyChanged(Notification notification) {
 		updateChildren(notification);
-
-		switch (notification.getFeatureID(Point.class)) {
-			case DCPackage.POINT__X:
-			case DCPackage.POINT__Y:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
+		switch(notification.getFeatureID(Point.class)) {
+		case DCPackage.POINT__X:
+		case DCPackage.POINT__Y:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+			return;
 		}
 		super.notifyChanged(notification);
 	}
@@ -167,8 +143,7 @@ public class PointItemProvider extends ItemProviderAdapter implements
 	 * @generated
 	 */
 	@Override
-	protected void collectNewChildDescriptors(
-			Collection<Object> newChildDescriptors, Object object) {
+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
 	}
 
@@ -182,5 +157,4 @@ public class PointItemProvider extends ItemProviderAdapter implements
 	public ResourceLocator getResourceLocator() {
 		return DDEditPlugin.INSTANCE;
 	}
-
 }
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/CanvasItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/CanvasItemProvider.java
index 3d5b31485f9..b28a017e29f 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/CanvasItemProvider.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/CanvasItemProvider.java
@@ -33,12 +33,11 @@ import org.eclipse.papyrus.dd.dg.DGPackage;
  * This is the item provider adapter for a {@link org.eclipse.papyrus.dd.dg.Canvas} object.
  * <!-- begin-user-doc --> <!--
  * end-user-doc -->
+ * 
  * @generated
  */
-public class CanvasItemProvider extends GroupItemProvider implements
-		IEditingDomainItemProvider, IStructuredItemContentProvider,
-		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
-		IItemColorProvider, IItemFontProvider {
+public class CanvasItemProvider extends GroupItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider {
+
 	/**
 	 * This constructs an instance from a factory and a notifier. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
@@ -57,9 +56,8 @@ public class CanvasItemProvider extends GroupItemProvider implements
 	 */
 	@Override
 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
+		if(itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
-
 		}
 		return itemPropertyDescriptors;
 	}
@@ -69,12 +67,12 @@ public class CanvasItemProvider extends GroupItemProvider implements
 	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
 	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
-	public Collection<? extends EStructuralFeature> getChildrenFeatures(
-			Object object) {
-		if (childrenFeatures == null) {
+	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
+		if(childrenFeatures == null) {
 			super.getChildrenFeatures(object);
 			childrenFeatures.add(DGPackage.Literals.CANVAS__BOUNDS);
 		}
@@ -83,19 +81,20 @@ public class CanvasItemProvider extends GroupItemProvider implements
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	protected EStructuralFeature getChildFeature(Object object, Object child) {
 		// Check the type of the specified child object and return the proper feature to use for
 		// adding (see {@link AddCommand}) it as a child.
-
 		return super.getChildFeature(object, child);
 	}
 
 	/**
 	 * This returns Canvas.gif.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -107,14 +106,13 @@ public class CanvasItemProvider extends GroupItemProvider implements
 	 * This returns the label text for the adapted class.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String getText(Object object) {
 		String label = ((Canvas)object).getId();
-		return label == null || label.length() == 0 ?
-			getString("_UI_Canvas_type") :
-			getString("_UI_Canvas_type") + " " + label;
+		return label == null || label.length() == 0 ? getString("_UI_Canvas_type") : getString("_UI_Canvas_type") + " " + label;
 	}
 
 	/**
@@ -122,16 +120,16 @@ public class CanvasItemProvider extends GroupItemProvider implements
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void notifyChanged(Notification notification) {
 		updateChildren(notification);
-
-		switch (notification.getFeatureID(Canvas.class)) {
-			case DGPackage.CANVAS__BOUNDS:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
+		switch(notification.getFeatureID(Canvas.class)) {
+		case DGPackage.CANVAS__BOUNDS:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+			return;
 		}
 		super.notifyChanged(notification);
 	}
@@ -144,14 +142,8 @@ public class CanvasItemProvider extends GroupItemProvider implements
 	 * @generated
 	 */
 	@Override
-	protected void collectNewChildDescriptors(
-			Collection<Object> newChildDescriptors, Object object) {
+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.CANVAS__BOUNDS,
-				 DCFactory.eINSTANCE.createBounds()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.CANVAS__BOUNDS, DCFactory.eINSTANCE.createBounds()));
 	}
-
 }
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/CircleItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/CircleItemProvider.java
index 6299674439b..3376cb772d2 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/CircleItemProvider.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/CircleItemProvider.java
@@ -40,12 +40,11 @@ import org.eclipse.papyrus.dd.dg.DGPackage;
  * This is the item provider adapter for a {@link org.eclipse.papyrus.dd.dg.Circle} object.
  * <!-- begin-user-doc --> <!--
  * end-user-doc -->
+ * 
  * @generated
  */
-public class CircleItemProvider extends GraphicalElementItemProvider implements
-		IEditingDomainItemProvider, IStructuredItemContentProvider,
-		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
-		IItemColorProvider, IItemFontProvider {
+public class CircleItemProvider extends GraphicalElementItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider {
+
 	/**
 	 * This constructs an instance from a factory and a notifier. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
@@ -64,9 +63,8 @@ public class CircleItemProvider extends GraphicalElementItemProvider implements
 	 */
 	@Override
 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
+		if(itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
-
 			addRadiusPropertyDescriptor(object);
 		}
 		return itemPropertyDescriptors;
@@ -79,19 +77,7 @@ public class CircleItemProvider extends GraphicalElementItemProvider implements
 	 * @generated
 	 */
 	protected void addRadiusPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Circle_radius_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Circle_radius_feature", "_UI_Circle_type"),
-				 DGPackage.Literals.CIRCLE__RADIUS,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.REAL_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Circle_radius_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Circle_radius_feature", "_UI_Circle_type"), DGPackage.Literals.CIRCLE__RADIUS, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
 	}
 
 	/**
@@ -99,12 +85,12 @@ public class CircleItemProvider extends GraphicalElementItemProvider implements
 	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
 	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
-	public Collection<? extends EStructuralFeature> getChildrenFeatures(
-			Object object) {
-		if (childrenFeatures == null) {
+	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
+		if(childrenFeatures == null) {
 			super.getChildrenFeatures(object);
 			childrenFeatures.add(DGPackage.Literals.CIRCLE__CENTER);
 		}
@@ -113,19 +99,20 @@ public class CircleItemProvider extends GraphicalElementItemProvider implements
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	protected EStructuralFeature getChildFeature(Object object, Object child) {
 		// Check the type of the specified child object and return the proper feature to use for
 		// adding (see {@link AddCommand}) it as a child.
-
 		return super.getChildFeature(object, child);
 	}
 
 	/**
 	 * This returns Circle.gif.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -137,14 +124,13 @@ public class CircleItemProvider extends GraphicalElementItemProvider implements
 	 * This returns the label text for the adapted class.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String getText(Object object) {
 		String label = ((Circle)object).getId();
-		return label == null || label.length() == 0 ?
-			getString("_UI_Circle_type") :
-			getString("_UI_Circle_type") + " " + label;
+		return label == null || label.length() == 0 ? getString("_UI_Circle_type") : getString("_UI_Circle_type") + " " + label;
 	}
 
 	/**
@@ -152,19 +138,19 @@ public class CircleItemProvider extends GraphicalElementItemProvider implements
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void notifyChanged(Notification notification) {
 		updateChildren(notification);
-
-		switch (notification.getFeatureID(Circle.class)) {
-			case DGPackage.CIRCLE__RADIUS:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
-			case DGPackage.CIRCLE__CENTER:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
+		switch(notification.getFeatureID(Circle.class)) {
+		case DGPackage.CIRCLE__RADIUS:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+			return;
+		case DGPackage.CIRCLE__CENTER:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+			return;
 		}
 		super.notifyChanged(notification);
 	}
@@ -177,14 +163,8 @@ public class CircleItemProvider extends GraphicalElementItemProvider implements
 	 * @generated
 	 */
 	@Override
-	protected void collectNewChildDescriptors(
-			Collection<Object> newChildDescriptors, Object object) {
+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.CIRCLE__CENTER,
-				 DCFactory.eINSTANCE.createPoint()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.CIRCLE__CENTER, DCFactory.eINSTANCE.createPoint()));
 	}
-
 }
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/ClipPathItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/ClipPathItemProvider.java
index f8f0e6f160b..e60df8c692a 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/ClipPathItemProvider.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/ClipPathItemProvider.java
@@ -32,12 +32,11 @@ import org.eclipse.papyrus.dd.dg.ClipPath;
  * This is the item provider adapter for a {@link org.eclipse.papyrus.dd.dg.ClipPath} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
+ * 
  * @generated
  */
-public class ClipPathItemProvider extends GroupItemProvider implements
-		IEditingDomainItemProvider, IStructuredItemContentProvider,
-		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
-		IItemColorProvider, IItemFontProvider {
+public class ClipPathItemProvider extends GroupItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider {
+
 	/**
 	 * This constructs an instance from a factory and a notifier. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
@@ -56,9 +55,8 @@ public class ClipPathItemProvider extends GroupItemProvider implements
 	 */
 	@Override
 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
+		if(itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
-
 		}
 		return itemPropertyDescriptors;
 	}
@@ -66,6 +64,7 @@ public class ClipPathItemProvider extends GroupItemProvider implements
 	/**
 	 * This returns ClipPath.gif.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -77,14 +76,13 @@ public class ClipPathItemProvider extends GroupItemProvider implements
 	 * This returns the label text for the adapted class.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String getText(Object object) {
 		String label = ((ClipPath)object).getId();
-		return label == null || label.length() == 0 ?
-			getString("_UI_ClipPath_type") :
-			getString("_UI_ClipPath_type") + " " + label;
+		return label == null || label.length() == 0 ? getString("_UI_ClipPath_type") : getString("_UI_ClipPath_type") + " " + label;
 	}
 
 	/**
@@ -92,6 +90,7 @@ public class ClipPathItemProvider extends GroupItemProvider implements
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -108,9 +107,7 @@ public class ClipPathItemProvider extends GroupItemProvider implements
 	 * @generated
 	 */
 	@Override
-	protected void collectNewChildDescriptors(
-			Collection<Object> newChildDescriptors, Object object) {
+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
 	}
-
 }
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/ClosePathItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/ClosePathItemProvider.java
index 9dff16f4eee..08a21314ec7 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/ClosePathItemProvider.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/ClosePathItemProvider.java
@@ -32,12 +32,11 @@ import org.eclipse.papyrus.dd.dg.ClosePath;
  * This is the item provider adapter for a {@link org.eclipse.papyrus.dd.dg.ClosePath} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
+ * 
  * @generated
  */
-public class ClosePathItemProvider extends PathCommandItemProvider implements
-		IEditingDomainItemProvider, IStructuredItemContentProvider,
-		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
-		IItemColorProvider, IItemFontProvider {
+public class ClosePathItemProvider extends PathCommandItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider {
+
 	/**
 	 * This constructs an instance from a factory and a notifier. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
@@ -56,9 +55,8 @@ public class ClosePathItemProvider extends PathCommandItemProvider implements
 	 */
 	@Override
 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
+		if(itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
-
 		}
 		return itemPropertyDescriptors;
 	}
@@ -66,6 +64,7 @@ public class ClosePathItemProvider extends PathCommandItemProvider implements
 	/**
 	 * This returns ClosePath.gif.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -77,6 +76,7 @@ public class ClosePathItemProvider extends PathCommandItemProvider implements
 	 * This returns the label text for the adapted class.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -90,6 +90,7 @@ public class ClosePathItemProvider extends PathCommandItemProvider implements
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -106,9 +107,7 @@ public class ClosePathItemProvider extends PathCommandItemProvider implements
 	 * @generated
 	 */
 	@Override
-	protected void collectNewChildDescriptors(
-			Collection<Object> newChildDescriptors, Object object) {
+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
 	}
-
 }
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/CubicCurveToItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/CubicCurveToItemProvider.java
index aeb1f0c7032..9703fa4c05e 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/CubicCurveToItemProvider.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/CubicCurveToItemProvider.java
@@ -38,12 +38,11 @@ import org.eclipse.papyrus.dd.dg.DGPackage;
  * This is the item provider adapter for a {@link org.eclipse.papyrus.dd.dg.CubicCurveTo} object.
  * <!-- begin-user-doc
  * --> <!-- end-user-doc -->
+ * 
  * @generated
  */
-public class CubicCurveToItemProvider extends PathCommandItemProvider implements
-		IEditingDomainItemProvider, IStructuredItemContentProvider,
-		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
-		IItemColorProvider, IItemFontProvider {
+public class CubicCurveToItemProvider extends PathCommandItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider {
+
 	/**
 	 * This constructs an instance from a factory and a notifier. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
@@ -62,9 +61,8 @@ public class CubicCurveToItemProvider extends PathCommandItemProvider implements
 	 */
 	@Override
 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
+		if(itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
-
 		}
 		return itemPropertyDescriptors;
 	}
@@ -74,12 +72,12 @@ public class CubicCurveToItemProvider extends PathCommandItemProvider implements
 	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
 	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
-	public Collection<? extends EStructuralFeature> getChildrenFeatures(
-			Object object) {
-		if (childrenFeatures == null) {
+	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
+		if(childrenFeatures == null) {
 			super.getChildrenFeatures(object);
 			childrenFeatures.add(DGPackage.Literals.CUBIC_CURVE_TO__START_CONTROL);
 			childrenFeatures.add(DGPackage.Literals.CUBIC_CURVE_TO__END_CONTROL);
@@ -90,13 +88,13 @@ public class CubicCurveToItemProvider extends PathCommandItemProvider implements
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	protected EStructuralFeature getChildFeature(Object object, Object child) {
 		// Check the type of the specified child object and return the proper feature to use for
 		// adding (see {@link AddCommand}) it as a child.
-
 		return super.getChildFeature(object, child);
 	}
 
@@ -115,6 +113,7 @@ public class CubicCurveToItemProvider extends PathCommandItemProvider implements
 	 * This returns the label text for the adapted class.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -128,18 +127,18 @@ public class CubicCurveToItemProvider extends PathCommandItemProvider implements
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void notifyChanged(Notification notification) {
 		updateChildren(notification);
-
-		switch (notification.getFeatureID(CubicCurveTo.class)) {
-			case DGPackage.CUBIC_CURVE_TO__START_CONTROL:
-			case DGPackage.CUBIC_CURVE_TO__END_CONTROL:
-			case DGPackage.CUBIC_CURVE_TO__POINT:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
+		switch(notification.getFeatureID(CubicCurveTo.class)) {
+		case DGPackage.CUBIC_CURVE_TO__START_CONTROL:
+		case DGPackage.CUBIC_CURVE_TO__END_CONTROL:
+		case DGPackage.CUBIC_CURVE_TO__POINT:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+			return;
 		}
 		super.notifyChanged(notification);
 	}
@@ -152,50 +151,27 @@ public class CubicCurveToItemProvider extends PathCommandItemProvider implements
 	 * @generated
 	 */
 	@Override
-	protected void collectNewChildDescriptors(
-			Collection<Object> newChildDescriptors, Object object) {
+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.CUBIC_CURVE_TO__START_CONTROL,
-				 DCFactory.eINSTANCE.createPoint()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.CUBIC_CURVE_TO__END_CONTROL,
-				 DCFactory.eINSTANCE.createPoint()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.CUBIC_CURVE_TO__POINT,
-				 DCFactory.eINSTANCE.createPoint()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.CUBIC_CURVE_TO__START_CONTROL, DCFactory.eINSTANCE.createPoint()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.CUBIC_CURVE_TO__END_CONTROL, DCFactory.eINSTANCE.createPoint()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.CUBIC_CURVE_TO__POINT, DCFactory.eINSTANCE.createPoint()));
 	}
 
 	/**
-	 * This returns the label text for
-	 * {@link org.eclipse.emf.edit.command.CreateChildCommand}. <!--
+	 * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @generated
 	 */
 	@Override
-	public String getCreateChildText(Object owner, Object feature,
-			Object child, Collection<?> selection) {
+	public String getCreateChildText(Object owner, Object feature, Object child, Collection<?> selection) {
 		Object childFeature = feature;
 		Object childObject = child;
-
-		boolean qualify =
-			childFeature == DGPackage.Literals.CUBIC_CURVE_TO__START_CONTROL ||
-			childFeature == DGPackage.Literals.CUBIC_CURVE_TO__END_CONTROL ||
-			childFeature == DGPackage.Literals.CUBIC_CURVE_TO__POINT;
-
-		if (qualify) {
-			return getString
-				("_UI_CreateChild_text2",
-				 new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
+		boolean qualify = childFeature == DGPackage.Literals.CUBIC_CURVE_TO__START_CONTROL || childFeature == DGPackage.Literals.CUBIC_CURVE_TO__END_CONTROL || childFeature == DGPackage.Literals.CUBIC_CURVE_TO__POINT;
+		if(qualify) {
+			return getString("_UI_CreateChild_text2", new Object[]{ getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
 		}
 		return super.getCreateChildText(owner, feature, child, selection);
 	}
-
 }
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/DGItemProviderAdapterFactory.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/DGItemProviderAdapterFactory.java
index e09cde68bab..8553f38333d 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/DGItemProviderAdapterFactory.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/DGItemProviderAdapterFactory.java
@@ -41,20 +41,21 @@ import org.eclipse.papyrus.dd.dg.util.DGAdapterFactory;
  * Note that most of the adapters are shared among multiple instances.
  * <!-- begin-user-doc --> <!--
  * end-user-doc -->
+ * 
  * @generated
  */
-public class DGItemProviderAdapterFactory extends DGAdapterFactory implements
-		ComposeableAdapterFactory, IChangeNotifier, IDisposable {
+public class DGItemProviderAdapterFactory extends DGAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier, IDisposable {
+
 	/**
 	 * This keeps track of the root adapter factory that delegates to this adapter factory.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected ComposedAdapterFactory parentAdapterFactory;
 
 	/**
-	 * This is used to implement
-	 * {@link org.eclipse.emf.edit.provider.IChangeNotifier}. <!--
+	 * This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @generated
@@ -65,6 +66,7 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements
 	 * This keeps track of all the supported types checked by {@link #isFactoryForType isFactoryForType}.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected Collection<Object> supportedTypes = new ArrayList<Object>();
@@ -89,6 +91,7 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements
 	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.dd.dg.Canvas} instances.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected CanvasItemProvider canvasItemProvider;
@@ -96,14 +99,14 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements
 	/**
 	 * This creates an adapter for a {@link org.eclipse.papyrus.dd.dg.Canvas}.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Adapter createCanvasAdapter() {
-		if (canvasItemProvider == null) {
+		if(canvasItemProvider == null) {
 			canvasItemProvider = new CanvasItemProvider(this);
 		}
-
 		return canvasItemProvider;
 	}
 
@@ -111,6 +114,7 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements
 	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.dd.dg.Group} instances.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected GroupItemProvider groupItemProvider;
@@ -118,14 +122,14 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements
 	/**
 	 * This creates an adapter for a {@link org.eclipse.papyrus.dd.dg.Group}.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Adapter createGroupAdapter() {
-		if (groupItemProvider == null) {
+		if(groupItemProvider == null) {
 			groupItemProvider = new GroupItemProvider(this);
 		}
-
 		return groupItemProvider;
 	}
 
@@ -133,6 +137,7 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements
 	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.dd.dg.MoveTo} instances.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected MoveToItemProvider moveToItemProvider;
@@ -140,14 +145,14 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements
 	/**
 	 * This creates an adapter for a {@link org.eclipse.papyrus.dd.dg.MoveTo}.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Adapter createMoveToAdapter() {
-		if (moveToItemProvider == null) {
+		if(moveToItemProvider == null) {
 			moveToItemProvider = new MoveToItemProvider(this);
 		}
-
 		return moveToItemProvider;
 	}
 
@@ -155,6 +160,7 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements
 	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.dd.dg.ClipPath} instances.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected ClipPathItemProvider clipPathItemProvider;
@@ -162,14 +168,14 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements
 	/**
 	 * This creates an adapter for a {@link org.eclipse.papyrus.dd.dg.ClipPath}.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Adapter createClipPathAdapter() {
-		if (clipPathItemProvider == null) {
+		if(clipPathItemProvider == null) {
 			clipPathItemProvider = new ClipPathItemProvider(this);
 		}
-
 		return clipPathItemProvider;
 	}
 
@@ -177,6 +183,7 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements
 	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.dd.dg.Style} instances.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected StyleItemProvider styleItemProvider;
@@ -184,14 +191,14 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements
 	/**
 	 * This creates an adapter for a {@link org.eclipse.papyrus.dd.dg.Style}.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Adapter createStyleAdapter() {
-		if (styleItemProvider == null) {
+		if(styleItemProvider == null) {
 			styleItemProvider = new StyleItemProvider(this);
 		}
-
 		return styleItemProvider;
 	}
 
@@ -199,6 +206,7 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements
 	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.dd.dg.Paint} instances.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected PaintItemProvider paintItemProvider;
@@ -206,14 +214,14 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements
 	/**
 	 * This creates an adapter for a {@link org.eclipse.papyrus.dd.dg.Paint}.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Adapter createPaintAdapter() {
-		if (paintItemProvider == null) {
+		if(paintItemProvider == null) {
 			paintItemProvider = new PaintItemProvider(this);
 		}
-
 		return paintItemProvider;
 	}
 
@@ -221,6 +229,7 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements
 	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.dd.dg.Circle} instances.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected CircleItemProvider circleItemProvider;
@@ -228,20 +237,19 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements
 	/**
 	 * This creates an adapter for a {@link org.eclipse.papyrus.dd.dg.Circle}.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Adapter createCircleAdapter() {
-		if (circleItemProvider == null) {
+		if(circleItemProvider == null) {
 			circleItemProvider = new CircleItemProvider(this);
 		}
-
 		return circleItemProvider;
 	}
 
 	/**
-	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.papyrus.dd.dg.ClosePath} instances. <!--
+	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.dd.dg.ClosePath} instances. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @generated
@@ -251,20 +259,19 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements
 	/**
 	 * This creates an adapter for a {@link org.eclipse.papyrus.dd.dg.ClosePath}.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Adapter createClosePathAdapter() {
-		if (closePathItemProvider == null) {
+		if(closePathItemProvider == null) {
 			closePathItemProvider = new ClosePathItemProvider(this);
 		}
-
 		return closePathItemProvider;
 	}
 
 	/**
-	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.papyrus.dd.dg.CubicCurveTo} instances. <!--
+	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.dd.dg.CubicCurveTo} instances. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @generated
@@ -275,20 +282,19 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements
 	 * This creates an adapter for a {@link org.eclipse.papyrus.dd.dg.CubicCurveTo}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Adapter createCubicCurveToAdapter() {
-		if (cubicCurveToItemProvider == null) {
+		if(cubicCurveToItemProvider == null) {
 			cubicCurveToItemProvider = new CubicCurveToItemProvider(this);
 		}
-
 		return cubicCurveToItemProvider;
 	}
 
 	/**
-	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.papyrus.dd.dg.Definitions} instances. <!--
+	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.dd.dg.Definitions} instances. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @generated
@@ -299,20 +305,19 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements
 	 * This creates an adapter for a {@link org.eclipse.papyrus.dd.dg.Definitions}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Adapter createDefinitionsAdapter() {
-		if (definitionsItemProvider == null) {
+		if(definitionsItemProvider == null) {
 			definitionsItemProvider = new DefinitionsItemProvider(this);
 		}
-
 		return definitionsItemProvider;
 	}
 
 	/**
-	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.papyrus.dd.dg.StyleSheet} instances. <!--
+	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.dd.dg.StyleSheet} instances. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @generated
@@ -323,20 +328,19 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements
 	 * This creates an adapter for a {@link org.eclipse.papyrus.dd.dg.StyleSheet}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Adapter createStyleSheetAdapter() {
-		if (styleSheetItemProvider == null) {
+		if(styleSheetItemProvider == null) {
 			styleSheetItemProvider = new StyleSheetItemProvider(this);
 		}
-
 		return styleSheetItemProvider;
 	}
 
 	/**
-	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.papyrus.dd.dg.StyleRule} instances. <!--
+	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.dd.dg.StyleRule} instances. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @generated
@@ -346,20 +350,19 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements
 	/**
 	 * This creates an adapter for a {@link org.eclipse.papyrus.dd.dg.StyleRule}.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Adapter createStyleRuleAdapter() {
-		if (styleRuleItemProvider == null) {
+		if(styleRuleItemProvider == null) {
 			styleRuleItemProvider = new StyleRuleItemProvider(this);
 		}
-
 		return styleRuleItemProvider;
 	}
 
 	/**
-	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.papyrus.dd.dg.StyleSelector} instances. <!--
+	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.dd.dg.StyleSelector} instances. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @generated
@@ -370,14 +373,14 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements
 	 * This creates an adapter for a {@link org.eclipse.papyrus.dd.dg.StyleSelector}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Adapter createStyleSelectorAdapter() {
-		if (styleSelectorItemProvider == null) {
+		if(styleSelectorItemProvider == null) {
 			styleSelectorItemProvider = new StyleSelectorItemProvider(this);
 		}
-
 		return styleSelectorItemProvider;
 	}
 
@@ -385,6 +388,7 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements
 	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.dd.dg.Ellipse} instances.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected EllipseItemProvider ellipseItemProvider;
@@ -392,20 +396,19 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements
 	/**
 	 * This creates an adapter for a {@link org.eclipse.papyrus.dd.dg.Ellipse}.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Adapter createEllipseAdapter() {
-		if (ellipseItemProvider == null) {
+		if(ellipseItemProvider == null) {
 			ellipseItemProvider = new EllipseItemProvider(this);
 		}
-
 		return ellipseItemProvider;
 	}
 
 	/**
-	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.papyrus.dd.dg.EllipticalArcTo} instances. <!--
+	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.dd.dg.EllipticalArcTo} instances. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @generated
@@ -416,20 +419,19 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements
 	 * This creates an adapter for a {@link org.eclipse.papyrus.dd.dg.EllipticalArcTo}.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Adapter createEllipticalArcToAdapter() {
-		if (ellipticalArcToItemProvider == null) {
+		if(ellipticalArcToItemProvider == null) {
 			ellipticalArcToItemProvider = new EllipticalArcToItemProvider(this);
 		}
-
 		return ellipticalArcToItemProvider;
 	}
 
 	/**
-	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.papyrus.dd.dg.QuadraticCurveTo} instances. <!--
+	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.dd.dg.QuadraticCurveTo} instances. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @generated
@@ -440,20 +442,19 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements
 	 * This creates an adapter for a {@link org.eclipse.papyrus.dd.dg.QuadraticCurveTo}.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Adapter createQuadraticCurveToAdapter() {
-		if (quadraticCurveToItemProvider == null) {
+		if(quadraticCurveToItemProvider == null) {
 			quadraticCurveToItemProvider = new QuadraticCurveToItemProvider(this);
 		}
-
 		return quadraticCurveToItemProvider;
 	}
 
 	/**
-	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.papyrus.dd.dg.GradientStop} instances. <!--
+	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.dd.dg.GradientStop} instances. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @generated
@@ -464,14 +465,14 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements
 	 * This creates an adapter for a {@link org.eclipse.papyrus.dd.dg.GradientStop}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Adapter createGradientStopAdapter() {
-		if (gradientStopItemProvider == null) {
+		if(gradientStopItemProvider == null) {
 			gradientStopItemProvider = new GradientStopItemProvider(this);
 		}
-
 		return gradientStopItemProvider;
 	}
 
@@ -479,6 +480,7 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements
 	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.dd.dg.Image} instances.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected ImageItemProvider imageItemProvider;
@@ -486,14 +488,14 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements
 	/**
 	 * This creates an adapter for a {@link org.eclipse.papyrus.dd.dg.Image}.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Adapter createImageAdapter() {
-		if (imageItemProvider == null) {
+		if(imageItemProvider == null) {
 			imageItemProvider = new ImageItemProvider(this);
 		}
-
 		return imageItemProvider;
 	}
 
@@ -501,6 +503,7 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements
 	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.dd.dg.Line} instances.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected LineItemProvider lineItemProvider;
@@ -508,14 +511,14 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements
 	/**
 	 * This creates an adapter for a {@link org.eclipse.papyrus.dd.dg.Line}.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Adapter createLineAdapter() {
-		if (lineItemProvider == null) {
+		if(lineItemProvider == null) {
 			lineItemProvider = new LineItemProvider(this);
 		}
-
 		return lineItemProvider;
 	}
 
@@ -523,6 +526,7 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements
 	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.dd.dg.Marker} instances.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected MarkerItemProvider markerItemProvider;
@@ -530,20 +534,19 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements
 	/**
 	 * This creates an adapter for a {@link org.eclipse.papyrus.dd.dg.Marker}.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Adapter createMarkerAdapter() {
-		if (markerItemProvider == null) {
+		if(markerItemProvider == null) {
 			markerItemProvider = new MarkerItemProvider(this);
 		}
-
 		return markerItemProvider;
 	}
 
 	/**
-	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.papyrus.dd.dg.LinearGradient} instances. <!--
+	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.dd.dg.LinearGradient} instances. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @generated
@@ -554,14 +557,14 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements
 	 * This creates an adapter for a {@link org.eclipse.papyrus.dd.dg.LinearGradient}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Adapter createLinearGradientAdapter() {
-		if (linearGradientItemProvider == null) {
+		if(linearGradientItemProvider == null) {
 			linearGradientItemProvider = new LinearGradientItemProvider(this);
 		}
-
 		return linearGradientItemProvider;
 	}
 
@@ -569,6 +572,7 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements
 	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.dd.dg.LineTo} instances.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected LineToItemProvider lineToItemProvider;
@@ -576,14 +580,14 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements
 	/**
 	 * This creates an adapter for a {@link org.eclipse.papyrus.dd.dg.LineTo}.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Adapter createLineToAdapter() {
-		if (lineToItemProvider == null) {
+		if(lineToItemProvider == null) {
 			lineToItemProvider = new LineToItemProvider(this);
 		}
-
 		return lineToItemProvider;
 	}
 
@@ -591,6 +595,7 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements
 	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.dd.dg.Matrix} instances.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected MatrixItemProvider matrixItemProvider;
@@ -598,14 +603,14 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements
 	/**
 	 * This creates an adapter for a {@link org.eclipse.papyrus.dd.dg.Matrix}.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Adapter createMatrixAdapter() {
-		if (matrixItemProvider == null) {
+		if(matrixItemProvider == null) {
 			matrixItemProvider = new MatrixItemProvider(this);
 		}
-
 		return matrixItemProvider;
 	}
 
@@ -613,6 +618,7 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements
 	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.dd.dg.Path} instances.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected PathItemProvider pathItemProvider;
@@ -620,14 +626,14 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements
 	/**
 	 * This creates an adapter for a {@link org.eclipse.papyrus.dd.dg.Path}.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Adapter createPathAdapter() {
-		if (pathItemProvider == null) {
+		if(pathItemProvider == null) {
 			pathItemProvider = new PathItemProvider(this);
 		}
-
 		return pathItemProvider;
 	}
 
@@ -635,6 +641,7 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements
 	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.dd.dg.Pattern} instances.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected PatternItemProvider patternItemProvider;
@@ -642,14 +649,14 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements
 	/**
 	 * This creates an adapter for a {@link org.eclipse.papyrus.dd.dg.Pattern}.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Adapter createPatternAdapter() {
-		if (patternItemProvider == null) {
+		if(patternItemProvider == null) {
 			patternItemProvider = new PatternItemProvider(this);
 		}
-
 		return patternItemProvider;
 	}
 
@@ -657,6 +664,7 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements
 	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.dd.dg.Polygon} instances.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected PolygonItemProvider polygonItemProvider;
@@ -664,14 +672,14 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements
 	/**
 	 * This creates an adapter for a {@link org.eclipse.papyrus.dd.dg.Polygon}.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Adapter createPolygonAdapter() {
-		if (polygonItemProvider == null) {
+		if(polygonItemProvider == null) {
 			polygonItemProvider = new PolygonItemProvider(this);
 		}
-
 		return polygonItemProvider;
 	}
 
@@ -679,6 +687,7 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements
 	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.dd.dg.Polyline} instances.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected PolylineItemProvider polylineItemProvider;
@@ -686,20 +695,19 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements
 	/**
 	 * This creates an adapter for a {@link org.eclipse.papyrus.dd.dg.Polyline}.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Adapter createPolylineAdapter() {
-		if (polylineItemProvider == null) {
+		if(polylineItemProvider == null) {
 			polylineItemProvider = new PolylineItemProvider(this);
 		}
-
 		return polylineItemProvider;
 	}
 
 	/**
-	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.papyrus.dd.dg.RadialGradient} instances. <!--
+	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.dd.dg.RadialGradient} instances. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @generated
@@ -710,20 +718,19 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements
 	 * This creates an adapter for a {@link org.eclipse.papyrus.dd.dg.RadialGradient}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Adapter createRadialGradientAdapter() {
-		if (radialGradientItemProvider == null) {
+		if(radialGradientItemProvider == null) {
 			radialGradientItemProvider = new RadialGradientItemProvider(this);
 		}
-
 		return radialGradientItemProvider;
 	}
 
 	/**
-	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.papyrus.dd.dg.Rectangle} instances. <!--
+	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.dd.dg.Rectangle} instances. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @generated
@@ -733,20 +740,19 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements
 	/**
 	 * This creates an adapter for a {@link org.eclipse.papyrus.dd.dg.Rectangle}.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Adapter createRectangleAdapter() {
-		if (rectangleItemProvider == null) {
+		if(rectangleItemProvider == null) {
 			rectangleItemProvider = new RectangleItemProvider(this);
 		}
-
 		return rectangleItemProvider;
 	}
 
 	/**
-	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.papyrus.dd.dg.RootCanvas} instances. <!--
+	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.dd.dg.RootCanvas} instances. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @generated
@@ -757,14 +763,14 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements
 	 * This creates an adapter for a {@link org.eclipse.papyrus.dd.dg.RootCanvas}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Adapter createRootCanvasAdapter() {
-		if (rootCanvasItemProvider == null) {
+		if(rootCanvasItemProvider == null) {
 			rootCanvasItemProvider = new RootCanvasItemProvider(this);
 		}
-
 		return rootCanvasItemProvider;
 	}
 
@@ -772,6 +778,7 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements
 	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.dd.dg.Rotate} instances.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected RotateItemProvider rotateItemProvider;
@@ -779,14 +786,14 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements
 	/**
 	 * This creates an adapter for a {@link org.eclipse.papyrus.dd.dg.Rotate}.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Adapter createRotateAdapter() {
-		if (rotateItemProvider == null) {
+		if(rotateItemProvider == null) {
 			rotateItemProvider = new RotateItemProvider(this);
 		}
-
 		return rotateItemProvider;
 	}
 
@@ -794,6 +801,7 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements
 	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.dd.dg.Scale} instances.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected ScaleItemProvider scaleItemProvider;
@@ -801,14 +809,14 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements
 	/**
 	 * This creates an adapter for a {@link org.eclipse.papyrus.dd.dg.Scale}.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Adapter createScaleAdapter() {
-		if (scaleItemProvider == null) {
+		if(scaleItemProvider == null) {
 			scaleItemProvider = new ScaleItemProvider(this);
 		}
-
 		return scaleItemProvider;
 	}
 
@@ -816,6 +824,7 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements
 	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.dd.dg.Skew} instances.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected SkewItemProvider skewItemProvider;
@@ -823,14 +832,14 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements
 	/**
 	 * This creates an adapter for a {@link org.eclipse.papyrus.dd.dg.Skew}.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Adapter createSkewAdapter() {
-		if (skewItemProvider == null) {
+		if(skewItemProvider == null) {
 			skewItemProvider = new SkewItemProvider(this);
 		}
-
 		return skewItemProvider;
 	}
 
@@ -838,6 +847,7 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements
 	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.dd.dg.Text} instances.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected TextItemProvider textItemProvider;
@@ -845,20 +855,19 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements
 	/**
 	 * This creates an adapter for a {@link org.eclipse.papyrus.dd.dg.Text}.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Adapter createTextAdapter() {
-		if (textItemProvider == null) {
+		if(textItemProvider == null) {
 			textItemProvider = new TextItemProvider(this);
 		}
-
 		return textItemProvider;
 	}
 
 	/**
-	 * This keeps track of the one adapter used for all
-	 * {@link org.eclipse.papyrus.dd.dg.Translate} instances. <!--
+	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.dd.dg.Translate} instances. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @generated
@@ -868,14 +877,14 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements
 	/**
 	 * This creates an adapter for a {@link org.eclipse.papyrus.dd.dg.Translate}.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Adapter createTranslateAdapter() {
-		if (translateItemProvider == null) {
+		if(translateItemProvider == null) {
 			translateItemProvider = new TranslateItemProvider(this);
 		}
-
 		return translateItemProvider;
 	}
 
@@ -883,6 +892,7 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements
 	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.dd.dg.Use} instances.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected UseItemProvider useItemProvider;
@@ -895,10 +905,9 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements
 	 */
 	@Override
 	public Adapter createUseAdapter() {
-		if (useItemProvider == null) {
+		if(useItemProvider == null) {
 			useItemProvider = new UseItemProvider(this);
 		}
-
 		return useItemProvider;
 	}
 
@@ -918,13 +927,13 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements
 	 * 
 	 * @generated
 	 */
-	public void setParentAdapterFactory(
-			ComposedAdapterFactory parentAdapterFactory) {
+	public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory) {
 		this.parentAdapterFactory = parentAdapterFactory;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -935,6 +944,7 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements
 	/**
 	 * This implementation substitutes the factory itself as the key for the adapter.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -944,23 +954,24 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object adapt(Object object, Object type) {
-		if (isFactoryForType(type)) {
+		if(isFactoryForType(type)) {
 			Object adapter = super.adapt(object, type);
-			if (!(type instanceof Class<?>) || (((Class<?>)type).isInstance(adapter))) {
+			if(!(type instanceof Class<?>) || (((Class<?>)type).isInstance(adapter))) {
 				return adapter;
 			}
 		}
-
 		return null;
 	}
 
 	/**
 	 * This adds a listener.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void addListener(INotifyChangedListener notifyChangedListener) {
@@ -970,6 +981,7 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements
 	/**
 	 * This removes a listener.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void removeListener(INotifyChangedListener notifyChangedListener) {
@@ -977,16 +989,14 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements
 	}
 
 	/**
-	 * This delegates to {@link #changeNotifier} and to
-	 * {@link #parentAdapterFactory}. <!-- begin-user-doc --> <!-- end-user-doc
+	 * This delegates to {@link #changeNotifier} and to {@link #parentAdapterFactory}. <!-- begin-user-doc --> <!-- end-user-doc
 	 * -->
 	 * 
 	 * @generated
 	 */
 	public void fireNotifyChanged(Notification notification) {
 		changeNotifier.fireNotifyChanged(notification);
-
-		if (parentAdapterFactory != null) {
+		if(parentAdapterFactory != null) {
 			parentAdapterFactory.fireNotifyChanged(notification);
 		}
 	}
@@ -998,42 +1008,77 @@ public class DGItemProviderAdapterFactory extends DGAdapterFactory implements
 	 * @generated
 	 */
 	public void dispose() {
-		if (canvasItemProvider != null) canvasItemProvider.dispose();
-		if (groupItemProvider != null) groupItemProvider.dispose();
-		if (moveToItemProvider != null) moveToItemProvider.dispose();
-		if (clipPathItemProvider != null) clipPathItemProvider.dispose();
-		if (styleItemProvider != null) styleItemProvider.dispose();
-		if (paintItemProvider != null) paintItemProvider.dispose();
-		if (circleItemProvider != null) circleItemProvider.dispose();
-		if (closePathItemProvider != null) closePathItemProvider.dispose();
-		if (cubicCurveToItemProvider != null) cubicCurveToItemProvider.dispose();
-		if (definitionsItemProvider != null) definitionsItemProvider.dispose();
-		if (styleSheetItemProvider != null) styleSheetItemProvider.dispose();
-		if (styleRuleItemProvider != null) styleRuleItemProvider.dispose();
-		if (styleSelectorItemProvider != null) styleSelectorItemProvider.dispose();
-		if (ellipseItemProvider != null) ellipseItemProvider.dispose();
-		if (ellipticalArcToItemProvider != null) ellipticalArcToItemProvider.dispose();
-		if (quadraticCurveToItemProvider != null) quadraticCurveToItemProvider.dispose();
-		if (gradientStopItemProvider != null) gradientStopItemProvider.dispose();
-		if (imageItemProvider != null) imageItemProvider.dispose();
-		if (lineItemProvider != null) lineItemProvider.dispose();
-		if (markerItemProvider != null) markerItemProvider.dispose();
-		if (linearGradientItemProvider != null) linearGradientItemProvider.dispose();
-		if (lineToItemProvider != null) lineToItemProvider.dispose();
-		if (matrixItemProvider != null) matrixItemProvider.dispose();
-		if (pathItemProvider != null) pathItemProvider.dispose();
-		if (patternItemProvider != null) patternItemProvider.dispose();
-		if (polygonItemProvider != null) polygonItemProvider.dispose();
-		if (polylineItemProvider != null) polylineItemProvider.dispose();
-		if (radialGradientItemProvider != null) radialGradientItemProvider.dispose();
-		if (rectangleItemProvider != null) rectangleItemProvider.dispose();
-		if (rootCanvasItemProvider != null) rootCanvasItemProvider.dispose();
-		if (rotateItemProvider != null) rotateItemProvider.dispose();
-		if (scaleItemProvider != null) scaleItemProvider.dispose();
-		if (skewItemProvider != null) skewItemProvider.dispose();
-		if (textItemProvider != null) textItemProvider.dispose();
-		if (translateItemProvider != null) translateItemProvider.dispose();
-		if (useItemProvider != null) useItemProvider.dispose();
+		if(canvasItemProvider != null)
+			canvasItemProvider.dispose();
+		if(groupItemProvider != null)
+			groupItemProvider.dispose();
+		if(moveToItemProvider != null)
+			moveToItemProvider.dispose();
+		if(clipPathItemProvider != null)
+			clipPathItemProvider.dispose();
+		if(styleItemProvider != null)
+			styleItemProvider.dispose();
+		if(paintItemProvider != null)
+			paintItemProvider.dispose();
+		if(circleItemProvider != null)
+			circleItemProvider.dispose();
+		if(closePathItemProvider != null)
+			closePathItemProvider.dispose();
+		if(cubicCurveToItemProvider != null)
+			cubicCurveToItemProvider.dispose();
+		if(definitionsItemProvider != null)
+			definitionsItemProvider.dispose();
+		if(styleSheetItemProvider != null)
+			styleSheetItemProvider.dispose();
+		if(styleRuleItemProvider != null)
+			styleRuleItemProvider.dispose();
+		if(styleSelectorItemProvider != null)
+			styleSelectorItemProvider.dispose();
+		if(ellipseItemProvider != null)
+			ellipseItemProvider.dispose();
+		if(ellipticalArcToItemProvider != null)
+			ellipticalArcToItemProvider.dispose();
+		if(quadraticCurveToItemProvider != null)
+			quadraticCurveToItemProvider.dispose();
+		if(gradientStopItemProvider != null)
+			gradientStopItemProvider.dispose();
+		if(imageItemProvider != null)
+			imageItemProvider.dispose();
+		if(lineItemProvider != null)
+			lineItemProvider.dispose();
+		if(markerItemProvider != null)
+			markerItemProvider.dispose();
+		if(linearGradientItemProvider != null)
+			linearGradientItemProvider.dispose();
+		if(lineToItemProvider != null)
+			lineToItemProvider.dispose();
+		if(matrixItemProvider != null)
+			matrixItemProvider.dispose();
+		if(pathItemProvider != null)
+			pathItemProvider.dispose();
+		if(patternItemProvider != null)
+			patternItemProvider.dispose();
+		if(polygonItemProvider != null)
+			polygonItemProvider.dispose();
+		if(polylineItemProvider != null)
+			polylineItemProvider.dispose();
+		if(radialGradientItemProvider != null)
+			radialGradientItemProvider.dispose();
+		if(rectangleItemProvider != null)
+			rectangleItemProvider.dispose();
+		if(rootCanvasItemProvider != null)
+			rootCanvasItemProvider.dispose();
+		if(rotateItemProvider != null)
+			rotateItemProvider.dispose();
+		if(scaleItemProvider != null)
+			scaleItemProvider.dispose();
+		if(skewItemProvider != null)
+			skewItemProvider.dispose();
+		if(textItemProvider != null)
+			textItemProvider.dispose();
+		if(translateItemProvider != null)
+			translateItemProvider.dispose();
+		if(useItemProvider != null)
+			useItemProvider.dispose();
 	}
-
 }
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/DefinitionItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/DefinitionItemProvider.java
index d334d2f0e02..bfb6ca04392 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/DefinitionItemProvider.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/DefinitionItemProvider.java
@@ -41,12 +41,11 @@ import org.eclipse.papyrus.dd.edit.DDEditPlugin;
  * This is the item provider adapter for a {@link org.eclipse.papyrus.dd.dg.Definition} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
+ * 
  * @generated
  */
-public class DefinitionItemProvider extends ItemProviderAdapter implements
-		IEditingDomainItemProvider, IStructuredItemContentProvider,
-		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
-		IItemColorProvider, IItemFontProvider {
+public class DefinitionItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider {
+
 	/**
 	 * This constructs an instance from a factory and a notifier. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
@@ -65,9 +64,8 @@ public class DefinitionItemProvider extends ItemProviderAdapter implements
 	 */
 	@Override
 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
+		if(itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
-
 			addIdPropertyDescriptor(object);
 		}
 		return itemPropertyDescriptors;
@@ -77,36 +75,24 @@ public class DefinitionItemProvider extends ItemProviderAdapter implements
 	 * This adds a property descriptor for the Id feature.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addIdPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Definition_id_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Definition_id_feature", "_UI_Definition_type"),
-				 DGPackage.Literals.DEFINITION__ID,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Definition_id_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Definition_id_feature", "_UI_Definition_type"), DGPackage.Literals.DEFINITION__ID, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
 	 * This returns the label text for the adapted class.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String getText(Object object) {
 		String label = ((Definition)object).getId();
-		return label == null || label.length() == 0 ?
-			getString("_UI_Definition_type") :
-			getString("_UI_Definition_type") + " " + label;
+		return label == null || label.length() == 0 ? getString("_UI_Definition_type") : getString("_UI_Definition_type") + " " + label;
 	}
 
 	/**
@@ -114,16 +100,16 @@ public class DefinitionItemProvider extends ItemProviderAdapter implements
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void notifyChanged(Notification notification) {
 		updateChildren(notification);
-
-		switch (notification.getFeatureID(Definition.class)) {
-			case DGPackage.DEFINITION__ID:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
+		switch(notification.getFeatureID(Definition.class)) {
+		case DGPackage.DEFINITION__ID:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+			return;
 		}
 		super.notifyChanged(notification);
 	}
@@ -136,8 +122,7 @@ public class DefinitionItemProvider extends ItemProviderAdapter implements
 	 * @generated
 	 */
 	@Override
-	protected void collectNewChildDescriptors(
-			Collection<Object> newChildDescriptors, Object object) {
+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
 	}
 
@@ -151,5 +136,4 @@ public class DefinitionItemProvider extends ItemProviderAdapter implements
 	public ResourceLocator getResourceLocator() {
 		return DDEditPlugin.INSTANCE;
 	}
-
 }
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/DefinitionsItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/DefinitionsItemProvider.java
index b2c0a428222..df9c938e61f 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/DefinitionsItemProvider.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/DefinitionsItemProvider.java
@@ -42,12 +42,11 @@ import org.eclipse.papyrus.dd.edit.DDEditPlugin;
  * This is the item provider adapter for a {@link org.eclipse.papyrus.dd.dg.Definitions} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
+ * 
  * @generated
  */
-public class DefinitionsItemProvider extends ItemProviderAdapter implements
-		IEditingDomainItemProvider, IStructuredItemContentProvider,
-		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
-		IItemColorProvider, IItemFontProvider {
+public class DefinitionsItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider {
+
 	/**
 	 * This constructs an instance from a factory and a notifier. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
@@ -66,9 +65,8 @@ public class DefinitionsItemProvider extends ItemProviderAdapter implements
 	 */
 	@Override
 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
+		if(itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
-
 		}
 		return itemPropertyDescriptors;
 	}
@@ -78,12 +76,12 @@ public class DefinitionsItemProvider extends ItemProviderAdapter implements
 	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
 	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
-	public Collection<? extends EStructuralFeature> getChildrenFeatures(
-			Object object) {
-		if (childrenFeatures == null) {
+	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
+		if(childrenFeatures == null) {
 			super.getChildrenFeatures(object);
 			childrenFeatures.add(DGPackage.Literals.DEFINITIONS__DEFNITION);
 			childrenFeatures.add(DGPackage.Literals.DEFINITIONS__STYLE_SHEET);
@@ -93,13 +91,13 @@ public class DefinitionsItemProvider extends ItemProviderAdapter implements
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	protected EStructuralFeature getChildFeature(Object object, Object child) {
 		// Check the type of the specified child object and return the proper feature to use for
 		// adding (see {@link AddCommand}) it as a child.
-
 		return super.getChildFeature(object, child);
 	}
 
@@ -118,6 +116,7 @@ public class DefinitionsItemProvider extends ItemProviderAdapter implements
 	 * This returns the label text for the adapted class.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -130,17 +129,17 @@ public class DefinitionsItemProvider extends ItemProviderAdapter implements
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void notifyChanged(Notification notification) {
 		updateChildren(notification);
-
-		switch (notification.getFeatureID(Definitions.class)) {
-			case DGPackage.DEFINITIONS__DEFNITION:
-			case DGPackage.DEFINITIONS__STYLE_SHEET:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
+		switch(notification.getFeatureID(Definitions.class)) {
+		case DGPackage.DEFINITIONS__DEFNITION:
+		case DGPackage.DEFINITIONS__STYLE_SHEET:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+			return;
 		}
 		super.notifyChanged(notification);
 	}
@@ -153,104 +152,27 @@ public class DefinitionsItemProvider extends ItemProviderAdapter implements
 	 * @generated
 	 */
 	@Override
-	protected void collectNewChildDescriptors(
-			Collection<Object> newChildDescriptors, Object object) {
+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.DEFINITIONS__DEFNITION,
-				 DGFactory.eINSTANCE.createGroup()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.DEFINITIONS__DEFNITION,
-				 DGFactory.eINSTANCE.createCanvas()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.DEFINITIONS__DEFNITION,
-				 DGFactory.eINSTANCE.createClipPath()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.DEFINITIONS__DEFNITION,
-				 DGFactory.eINSTANCE.createCircle()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.DEFINITIONS__DEFNITION,
-				 DGFactory.eINSTANCE.createEllipse()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.DEFINITIONS__DEFNITION,
-				 DGFactory.eINSTANCE.createImage()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.DEFINITIONS__DEFNITION,
-				 DGFactory.eINSTANCE.createLine()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.DEFINITIONS__DEFNITION,
-				 DGFactory.eINSTANCE.createMarker()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.DEFINITIONS__DEFNITION,
-				 DGFactory.eINSTANCE.createLinearGradient()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.DEFINITIONS__DEFNITION,
-				 DGFactory.eINSTANCE.createPath()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.DEFINITIONS__DEFNITION,
-				 DGFactory.eINSTANCE.createPattern()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.DEFINITIONS__DEFNITION,
-				 DGFactory.eINSTANCE.createPolygon()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.DEFINITIONS__DEFNITION,
-				 DGFactory.eINSTANCE.createPolyline()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.DEFINITIONS__DEFNITION,
-				 DGFactory.eINSTANCE.createRadialGradient()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.DEFINITIONS__DEFNITION,
-				 DGFactory.eINSTANCE.createRectangle()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.DEFINITIONS__DEFNITION,
-				 DGFactory.eINSTANCE.createRootCanvas()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.DEFINITIONS__DEFNITION,
-				 DGFactory.eINSTANCE.createText()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.DEFINITIONS__DEFNITION,
-				 DGFactory.eINSTANCE.createUse()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.DEFINITIONS__STYLE_SHEET,
-				 DGFactory.eINSTANCE.createStyleSheet()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.DEFINITIONS__DEFNITION, DGFactory.eINSTANCE.createGroup()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.DEFINITIONS__DEFNITION, DGFactory.eINSTANCE.createCanvas()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.DEFINITIONS__DEFNITION, DGFactory.eINSTANCE.createClipPath()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.DEFINITIONS__DEFNITION, DGFactory.eINSTANCE.createCircle()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.DEFINITIONS__DEFNITION, DGFactory.eINSTANCE.createEllipse()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.DEFINITIONS__DEFNITION, DGFactory.eINSTANCE.createImage()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.DEFINITIONS__DEFNITION, DGFactory.eINSTANCE.createLine()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.DEFINITIONS__DEFNITION, DGFactory.eINSTANCE.createMarker()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.DEFINITIONS__DEFNITION, DGFactory.eINSTANCE.createLinearGradient()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.DEFINITIONS__DEFNITION, DGFactory.eINSTANCE.createPath()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.DEFINITIONS__DEFNITION, DGFactory.eINSTANCE.createPattern()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.DEFINITIONS__DEFNITION, DGFactory.eINSTANCE.createPolygon()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.DEFINITIONS__DEFNITION, DGFactory.eINSTANCE.createPolyline()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.DEFINITIONS__DEFNITION, DGFactory.eINSTANCE.createRadialGradient()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.DEFINITIONS__DEFNITION, DGFactory.eINSTANCE.createRectangle()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.DEFINITIONS__DEFNITION, DGFactory.eINSTANCE.createRootCanvas()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.DEFINITIONS__DEFNITION, DGFactory.eINSTANCE.createText()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.DEFINITIONS__DEFNITION, DGFactory.eINSTANCE.createUse()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.DEFINITIONS__STYLE_SHEET, DGFactory.eINSTANCE.createStyleSheet()));
 	}
 
 	/**
@@ -263,5 +185,4 @@ public class DefinitionsItemProvider extends ItemProviderAdapter implements
 	public ResourceLocator getResourceLocator() {
 		return DDEditPlugin.INSTANCE;
 	}
-
 }
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/EllipseItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/EllipseItemProvider.java
index 5f1fe66b8fb..9b8f94fd665 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/EllipseItemProvider.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/EllipseItemProvider.java
@@ -38,12 +38,11 @@ import org.eclipse.papyrus.dd.dg.Ellipse;
  * This is the item provider adapter for a {@link org.eclipse.papyrus.dd.dg.Ellipse} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
+ * 
  * @generated
  */
-public class EllipseItemProvider extends GraphicalElementItemProvider implements
-		IEditingDomainItemProvider, IStructuredItemContentProvider,
-		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
-		IItemColorProvider, IItemFontProvider {
+public class EllipseItemProvider extends GraphicalElementItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider {
+
 	/**
 	 * This constructs an instance from a factory and a notifier. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
@@ -62,9 +61,8 @@ public class EllipseItemProvider extends GraphicalElementItemProvider implements
 	 */
 	@Override
 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
+		if(itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
-
 		}
 		return itemPropertyDescriptors;
 	}
@@ -74,12 +72,12 @@ public class EllipseItemProvider extends GraphicalElementItemProvider implements
 	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
 	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
-	public Collection<? extends EStructuralFeature> getChildrenFeatures(
-			Object object) {
-		if (childrenFeatures == null) {
+	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
+		if(childrenFeatures == null) {
 			super.getChildrenFeatures(object);
 			childrenFeatures.add(DGPackage.Literals.ELLIPSE__CENTER);
 			childrenFeatures.add(DGPackage.Literals.ELLIPSE__RADII);
@@ -89,19 +87,20 @@ public class EllipseItemProvider extends GraphicalElementItemProvider implements
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	protected EStructuralFeature getChildFeature(Object object, Object child) {
 		// Check the type of the specified child object and return the proper feature to use for
 		// adding (see {@link AddCommand}) it as a child.
-
 		return super.getChildFeature(object, child);
 	}
 
 	/**
 	 * This returns Ellipse.gif.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -113,14 +112,13 @@ public class EllipseItemProvider extends GraphicalElementItemProvider implements
 	 * This returns the label text for the adapted class.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String getText(Object object) {
 		String label = ((Ellipse)object).getId();
-		return label == null || label.length() == 0 ?
-			getString("_UI_Ellipse_type") :
-			getString("_UI_Ellipse_type") + " " + label;
+		return label == null || label.length() == 0 ? getString("_UI_Ellipse_type") : getString("_UI_Ellipse_type") + " " + label;
 	}
 
 	/**
@@ -128,17 +126,17 @@ public class EllipseItemProvider extends GraphicalElementItemProvider implements
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void notifyChanged(Notification notification) {
 		updateChildren(notification);
-
-		switch (notification.getFeatureID(Ellipse.class)) {
-			case DGPackage.ELLIPSE__CENTER:
-			case DGPackage.ELLIPSE__RADII:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
+		switch(notification.getFeatureID(Ellipse.class)) {
+		case DGPackage.ELLIPSE__CENTER:
+		case DGPackage.ELLIPSE__RADII:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+			return;
 		}
 		super.notifyChanged(notification);
 	}
@@ -151,19 +149,9 @@ public class EllipseItemProvider extends GraphicalElementItemProvider implements
 	 * @generated
 	 */
 	@Override
-	protected void collectNewChildDescriptors(
-			Collection<Object> newChildDescriptors, Object object) {
+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.ELLIPSE__CENTER,
-				 DCFactory.eINSTANCE.createPoint()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.ELLIPSE__RADII,
-				 DCFactory.eINSTANCE.createDimension()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.ELLIPSE__CENTER, DCFactory.eINSTANCE.createPoint()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.ELLIPSE__RADII, DCFactory.eINSTANCE.createDimension()));
 	}
-
 }
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/EllipticalArcToItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/EllipticalArcToItemProvider.java
index d5ccf84344e..d613681db1c 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/EllipticalArcToItemProvider.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/EllipticalArcToItemProvider.java
@@ -40,12 +40,11 @@ import org.eclipse.papyrus.dd.dg.EllipticalArcTo;
  * This is the item provider adapter for a {@link org.eclipse.papyrus.dd.dg.EllipticalArcTo} object.
  * <!-- begin-user-doc
  * --> <!-- end-user-doc -->
+ * 
  * @generated
  */
-public class EllipticalArcToItemProvider extends PathCommandItemProvider
-		implements IEditingDomainItemProvider, IStructuredItemContentProvider,
-		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
-		IItemColorProvider, IItemFontProvider {
+public class EllipticalArcToItemProvider extends PathCommandItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider {
+
 	/**
 	 * This constructs an instance from a factory and a notifier. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
@@ -64,9 +63,8 @@ public class EllipticalArcToItemProvider extends PathCommandItemProvider
 	 */
 	@Override
 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
+		if(itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
-
 			addRotationPropertyDescriptor(object);
 			addIsLargeArcPropertyDescriptor(object);
 			addIsSweepPropertyDescriptor(object);
@@ -81,19 +79,7 @@ public class EllipticalArcToItemProvider extends PathCommandItemProvider
 	 * @generated
 	 */
 	protected void addRotationPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_EllipticalArcTo_rotation_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_EllipticalArcTo_rotation_feature", "_UI_EllipticalArcTo_type"),
-				 DGPackage.Literals.ELLIPTICAL_ARC_TO__ROTATION,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.REAL_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_EllipticalArcTo_rotation_feature"), getString("_UI_PropertyDescriptor_description", "_UI_EllipticalArcTo_rotation_feature", "_UI_EllipticalArcTo_type"), DGPackage.Literals.ELLIPTICAL_ARC_TO__ROTATION, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
 	}
 
 	/**
@@ -103,19 +89,7 @@ public class EllipticalArcToItemProvider extends PathCommandItemProvider
 	 * @generated
 	 */
 	protected void addIsLargeArcPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_EllipticalArcTo_isLargeArc_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_EllipticalArcTo_isLargeArc_feature", "_UI_EllipticalArcTo_type"),
-				 DGPackage.Literals.ELLIPTICAL_ARC_TO__IS_LARGE_ARC,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_EllipticalArcTo_isLargeArc_feature"), getString("_UI_PropertyDescriptor_description", "_UI_EllipticalArcTo_isLargeArc_feature", "_UI_EllipticalArcTo_type"), DGPackage.Literals.ELLIPTICAL_ARC_TO__IS_LARGE_ARC, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null));
 	}
 
 	/**
@@ -125,19 +99,7 @@ public class EllipticalArcToItemProvider extends PathCommandItemProvider
 	 * @generated
 	 */
 	protected void addIsSweepPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_EllipticalArcTo_isSweep_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_EllipticalArcTo_isSweep_feature", "_UI_EllipticalArcTo_type"),
-				 DGPackage.Literals.ELLIPTICAL_ARC_TO__IS_SWEEP,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_EllipticalArcTo_isSweep_feature"), getString("_UI_PropertyDescriptor_description", "_UI_EllipticalArcTo_isSweep_feature", "_UI_EllipticalArcTo_type"), DGPackage.Literals.ELLIPTICAL_ARC_TO__IS_SWEEP, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null));
 	}
 
 	/**
@@ -145,12 +107,12 @@ public class EllipticalArcToItemProvider extends PathCommandItemProvider
 	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
 	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
-	public Collection<? extends EStructuralFeature> getChildrenFeatures(
-			Object object) {
-		if (childrenFeatures == null) {
+	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
+		if(childrenFeatures == null) {
 			super.getChildrenFeatures(object);
 			childrenFeatures.add(DGPackage.Literals.ELLIPTICAL_ARC_TO__RADII);
 			childrenFeatures.add(DGPackage.Literals.ELLIPTICAL_ARC_TO__POINT);
@@ -160,13 +122,13 @@ public class EllipticalArcToItemProvider extends PathCommandItemProvider
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	protected EStructuralFeature getChildFeature(Object object, Object child) {
 		// Check the type of the specified child object and return the proper feature to use for
 		// adding (see {@link AddCommand}) it as a child.
-
 		return super.getChildFeature(object, child);
 	}
 
@@ -174,6 +136,7 @@ public class EllipticalArcToItemProvider extends PathCommandItemProvider
 	 * This returns EllipticalArcTo.gif.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -185,6 +148,7 @@ public class EllipticalArcToItemProvider extends PathCommandItemProvider
 	 * This returns the label text for the adapted class.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -198,22 +162,22 @@ public class EllipticalArcToItemProvider extends PathCommandItemProvider
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void notifyChanged(Notification notification) {
 		updateChildren(notification);
-
-		switch (notification.getFeatureID(EllipticalArcTo.class)) {
-			case DGPackage.ELLIPTICAL_ARC_TO__ROTATION:
-			case DGPackage.ELLIPTICAL_ARC_TO__IS_LARGE_ARC:
-			case DGPackage.ELLIPTICAL_ARC_TO__IS_SWEEP:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
-			case DGPackage.ELLIPTICAL_ARC_TO__RADII:
-			case DGPackage.ELLIPTICAL_ARC_TO__POINT:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
+		switch(notification.getFeatureID(EllipticalArcTo.class)) {
+		case DGPackage.ELLIPTICAL_ARC_TO__ROTATION:
+		case DGPackage.ELLIPTICAL_ARC_TO__IS_LARGE_ARC:
+		case DGPackage.ELLIPTICAL_ARC_TO__IS_SWEEP:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+			return;
+		case DGPackage.ELLIPTICAL_ARC_TO__RADII:
+		case DGPackage.ELLIPTICAL_ARC_TO__POINT:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+			return;
 		}
 		super.notifyChanged(notification);
 	}
@@ -226,19 +190,9 @@ public class EllipticalArcToItemProvider extends PathCommandItemProvider
 	 * @generated
 	 */
 	@Override
-	protected void collectNewChildDescriptors(
-			Collection<Object> newChildDescriptors, Object object) {
+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.ELLIPTICAL_ARC_TO__RADII,
-				 DCFactory.eINSTANCE.createDimension()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.ELLIPTICAL_ARC_TO__POINT,
-				 DCFactory.eINSTANCE.createPoint()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.ELLIPTICAL_ARC_TO__RADII, DCFactory.eINSTANCE.createDimension()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.ELLIPTICAL_ARC_TO__POINT, DCFactory.eINSTANCE.createPoint()));
 	}
-
 }
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/GradientItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/GradientItemProvider.java
index 07eaa395f2b..a4d65eba261 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/GradientItemProvider.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/GradientItemProvider.java
@@ -33,12 +33,11 @@ import org.eclipse.papyrus.dd.dg.Gradient;
  * This is the item provider adapter for a {@link org.eclipse.papyrus.dd.dg.Gradient} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
+ * 
  * @generated
  */
-public class GradientItemProvider extends PaintServerItemProvider implements
-		IEditingDomainItemProvider, IStructuredItemContentProvider,
-		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
-		IItemColorProvider, IItemFontProvider {
+public class GradientItemProvider extends PaintServerItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider {
+
 	/**
 	 * This constructs an instance from a factory and a notifier. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
@@ -57,9 +56,8 @@ public class GradientItemProvider extends PaintServerItemProvider implements
 	 */
 	@Override
 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
+		if(itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
-
 		}
 		return itemPropertyDescriptors;
 	}
@@ -69,12 +67,12 @@ public class GradientItemProvider extends PaintServerItemProvider implements
 	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
 	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
-	public Collection<? extends EStructuralFeature> getChildrenFeatures(
-			Object object) {
-		if (childrenFeatures == null) {
+	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
+		if(childrenFeatures == null) {
 			super.getChildrenFeatures(object);
 			childrenFeatures.add(DGPackage.Literals.GRADIENT__STOP);
 		}
@@ -83,13 +81,13 @@ public class GradientItemProvider extends PaintServerItemProvider implements
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	protected EStructuralFeature getChildFeature(Object object, Object child) {
 		// Check the type of the specified child object and return the proper feature to use for
 		// adding (see {@link AddCommand}) it as a child.
-
 		return super.getChildFeature(object, child);
 	}
 
@@ -97,14 +95,13 @@ public class GradientItemProvider extends PaintServerItemProvider implements
 	 * This returns the label text for the adapted class.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String getText(Object object) {
 		String label = ((Gradient)object).getId();
-		return label == null || label.length() == 0 ?
-			getString("_UI_Gradient_type") :
-			getString("_UI_Gradient_type") + " " + label;
+		return label == null || label.length() == 0 ? getString("_UI_Gradient_type") : getString("_UI_Gradient_type") + " " + label;
 	}
 
 	/**
@@ -112,16 +109,16 @@ public class GradientItemProvider extends PaintServerItemProvider implements
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void notifyChanged(Notification notification) {
 		updateChildren(notification);
-
-		switch (notification.getFeatureID(Gradient.class)) {
-			case DGPackage.GRADIENT__STOP:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
+		switch(notification.getFeatureID(Gradient.class)) {
+		case DGPackage.GRADIENT__STOP:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+			return;
 		}
 		super.notifyChanged(notification);
 	}
@@ -134,14 +131,8 @@ public class GradientItemProvider extends PaintServerItemProvider implements
 	 * @generated
 	 */
 	@Override
-	protected void collectNewChildDescriptors(
-			Collection<Object> newChildDescriptors, Object object) {
+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.GRADIENT__STOP,
-				 DGFactory.eINSTANCE.createGradientStop()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.GRADIENT__STOP, DGFactory.eINSTANCE.createGradientStop()));
 	}
-
 }
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/GradientStopItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/GradientStopItemProvider.java
index 9f277529ea5..8f566eda596 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/GradientStopItemProvider.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/GradientStopItemProvider.java
@@ -43,12 +43,11 @@ import org.eclipse.papyrus.dd.edit.DDEditPlugin;
  * This is the item provider adapter for a {@link org.eclipse.papyrus.dd.dg.GradientStop} object.
  * <!-- begin-user-doc
  * --> <!-- end-user-doc -->
+ * 
  * @generated
  */
-public class GradientStopItemProvider extends ItemProviderAdapter implements
-		IEditingDomainItemProvider, IStructuredItemContentProvider,
-		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
-		IItemColorProvider, IItemFontProvider {
+public class GradientStopItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider {
+
 	/**
 	 * This constructs an instance from a factory and a notifier. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
@@ -67,9 +66,8 @@ public class GradientStopItemProvider extends ItemProviderAdapter implements
 	 */
 	@Override
 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
+		if(itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
-
 			addColorPropertyDescriptor(object);
 			addOffsetPropertyDescriptor(object);
 			addOpacityPropertyDescriptor(object);
@@ -84,19 +82,7 @@ public class GradientStopItemProvider extends ItemProviderAdapter implements
 	 * @generated
 	 */
 	protected void addColorPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_GradientStop_color_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_GradientStop_color_feature", "_UI_GradientStop_type"),
-				 DGPackage.Literals.GRADIENT_STOP__COLOR,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_GradientStop_color_feature"), getString("_UI_PropertyDescriptor_description", "_UI_GradientStop_color_feature", "_UI_GradientStop_type"), DGPackage.Literals.GRADIENT_STOP__COLOR, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
@@ -106,19 +92,7 @@ public class GradientStopItemProvider extends ItemProviderAdapter implements
 	 * @generated
 	 */
 	protected void addOffsetPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_GradientStop_offset_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_GradientStop_offset_feature", "_UI_GradientStop_type"),
-				 DGPackage.Literals.GRADIENT_STOP__OFFSET,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.REAL_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_GradientStop_offset_feature"), getString("_UI_PropertyDescriptor_description", "_UI_GradientStop_offset_feature", "_UI_GradientStop_type"), DGPackage.Literals.GRADIENT_STOP__OFFSET, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
 	}
 
 	/**
@@ -128,19 +102,7 @@ public class GradientStopItemProvider extends ItemProviderAdapter implements
 	 * @generated
 	 */
 	protected void addOpacityPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_GradientStop_opacity_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_GradientStop_opacity_feature", "_UI_GradientStop_type"),
-				 DGPackage.Literals.GRADIENT_STOP__OPACITY,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.REAL_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_GradientStop_opacity_feature"), getString("_UI_PropertyDescriptor_description", "_UI_GradientStop_opacity_feature", "_UI_GradientStop_type"), DGPackage.Literals.GRADIENT_STOP__OPACITY, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
 	}
 
 	/**
@@ -158,15 +120,14 @@ public class GradientStopItemProvider extends ItemProviderAdapter implements
 	 * This returns the label text for the adapted class.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String getText(Object object) {
 		Color labelValue = ((GradientStop)object).getColor();
 		String label = labelValue == null ? null : labelValue.toString();
-		return label == null || label.length() == 0 ?
-			getString("_UI_GradientStop_type") :
-			getString("_UI_GradientStop_type") + " " + label;
+		return label == null || label.length() == 0 ? getString("_UI_GradientStop_type") : getString("_UI_GradientStop_type") + " " + label;
 	}
 
 	/**
@@ -174,18 +135,18 @@ public class GradientStopItemProvider extends ItemProviderAdapter implements
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void notifyChanged(Notification notification) {
 		updateChildren(notification);
-
-		switch (notification.getFeatureID(GradientStop.class)) {
-			case DGPackage.GRADIENT_STOP__COLOR:
-			case DGPackage.GRADIENT_STOP__OFFSET:
-			case DGPackage.GRADIENT_STOP__OPACITY:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
+		switch(notification.getFeatureID(GradientStop.class)) {
+		case DGPackage.GRADIENT_STOP__COLOR:
+		case DGPackage.GRADIENT_STOP__OFFSET:
+		case DGPackage.GRADIENT_STOP__OPACITY:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+			return;
 		}
 		super.notifyChanged(notification);
 	}
@@ -198,8 +159,7 @@ public class GradientStopItemProvider extends ItemProviderAdapter implements
 	 * @generated
 	 */
 	@Override
-	protected void collectNewChildDescriptors(
-			Collection<Object> newChildDescriptors, Object object) {
+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
 	}
 
@@ -213,5 +173,4 @@ public class GradientStopItemProvider extends ItemProviderAdapter implements
 	public ResourceLocator getResourceLocator() {
 		return DDEditPlugin.INSTANCE;
 	}
-
 }
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/GraphicalElementItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/GraphicalElementItemProvider.java
index a53434a2d85..14fe780e0d9 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/GraphicalElementItemProvider.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/GraphicalElementItemProvider.java
@@ -33,16 +33,13 @@ import org.eclipse.papyrus.dd.dg.DGPackage;
 import org.eclipse.papyrus.dd.dg.GraphicalElement;
 
 /**
- * This is the item provider adapter for a
- * {@link org.eclipse.papyrus.dd.dg.GraphicalElement} object. <!--
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.dd.dg.GraphicalElement} object. <!--
  * begin-user-doc --> <!-- end-user-doc -->
  * 
  * @generated
  */
-public class GraphicalElementItemProvider extends DefinitionItemProvider
-		implements IEditingDomainItemProvider, IStructuredItemContentProvider,
-		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
-		IItemColorProvider, IItemFontProvider {
+public class GraphicalElementItemProvider extends DefinitionItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider {
+
 	/**
 	 * This constructs an instance from a factory and a notifier. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
@@ -61,9 +58,8 @@ public class GraphicalElementItemProvider extends DefinitionItemProvider
 	 */
 	@Override
 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
+		if(itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
-
 			addClipPathPropertyDescriptor(object);
 			addClassPropertyDescriptor(object);
 			addLayoutDataPropertyDescriptor(object);
@@ -78,19 +74,7 @@ public class GraphicalElementItemProvider extends DefinitionItemProvider
 	 * @generated
 	 */
 	protected void addClipPathPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_GraphicalElement_clipPath_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_GraphicalElement_clipPath_feature", "_UI_GraphicalElement_type"),
-				 DGPackage.Literals.GRAPHICAL_ELEMENT__CLIP_PATH,
-				 true,
-				 false,
-				 true,
-				 null,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_GraphicalElement_clipPath_feature"), getString("_UI_PropertyDescriptor_description", "_UI_GraphicalElement_clipPath_feature", "_UI_GraphicalElement_type"), DGPackage.Literals.GRAPHICAL_ELEMENT__CLIP_PATH, true, false, true, null, null, null));
 	}
 
 	/**
@@ -100,41 +84,18 @@ public class GraphicalElementItemProvider extends DefinitionItemProvider
 	 * @generated
 	 */
 	protected void addClassPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_GraphicalElement_class_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_GraphicalElement_class_feature", "_UI_GraphicalElement_type"),
-				 DGPackage.Literals.GRAPHICAL_ELEMENT__CLASS,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_GraphicalElement_class_feature"), getString("_UI_PropertyDescriptor_description", "_UI_GraphicalElement_class_feature", "_UI_GraphicalElement_type"), DGPackage.Literals.GRAPHICAL_ELEMENT__CLASS, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
 	 * This adds a property descriptor for the Layout Data feature.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addLayoutDataPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_GraphicalElement_layoutData_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_GraphicalElement_layoutData_feature", "_UI_GraphicalElement_type"),
-				 DGPackage.Literals.GRAPHICAL_ELEMENT__LAYOUT_DATA,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_GraphicalElement_layoutData_feature"), getString("_UI_PropertyDescriptor_description", "_UI_GraphicalElement_layoutData_feature", "_UI_GraphicalElement_type"), DGPackage.Literals.GRAPHICAL_ELEMENT__LAYOUT_DATA, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
@@ -142,12 +103,12 @@ public class GraphicalElementItemProvider extends DefinitionItemProvider
 	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
 	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
-	public Collection<? extends EStructuralFeature> getChildrenFeatures(
-			Object object) {
-		if (childrenFeatures == null) {
+	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
+		if(childrenFeatures == null) {
 			super.getChildrenFeatures(object);
 			childrenFeatures.add(DGPackage.Literals.GRAPHICAL_ELEMENT__STYLE);
 			childrenFeatures.add(DGPackage.Literals.GRAPHICAL_ELEMENT__TRANSFORM);
@@ -157,13 +118,13 @@ public class GraphicalElementItemProvider extends DefinitionItemProvider
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	protected EStructuralFeature getChildFeature(Object object, Object child) {
 		// Check the type of the specified child object and return the proper feature to use for
 		// adding (see {@link AddCommand}) it as a child.
-
 		return super.getChildFeature(object, child);
 	}
 
@@ -171,64 +132,61 @@ public class GraphicalElementItemProvider extends DefinitionItemProvider
 	 * This returns the label text for the adapted class.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated NOT
 	 */
 	@Override
 	public String getText(Object object) {
 		String label = getLabel((GraphicalElement)object);
-		return label == null || label.length() == 0 ?
-			getString("_UI_GraphicalElement_type") :
-			getString("_UI_GraphicalElement_type") + " " + label;
+		return label == null || label.length() == 0 ? getString("_UI_GraphicalElement_type") : getString("_UI_GraphicalElement_type") + " " + label;
 	}
 
 	/**
 	 * Get the label of the given graphical element
 	 * 
-	 * @param element The graphical element
+	 * @param element
+	 *        The graphical element
 	 * @return String label of the graphical element
 	 */
 	protected String getLabel(GraphicalElement element) {
 		String label = "";
-		
-		if (element.getId() != null)
-			label += "id="+element.getId();
-			
-		if (!element.getClasses().isEmpty()) {
-			if (label.length()>0)
+		if(element.getId() != null)
+			label += "id=" + element.getId();
+		if(!element.getClasses().isEmpty()) {
+			if(label.length() > 0)
 				label += ", ";
 			label += joinString("class", element.getClasses(), ",");
 		}
-		
-		return (label.length()>0) ? "["+label+"]" : "";
+		return (label.length() > 0) ? "[" + label + "]" : "";
 	}
-	
+
 	private String joinString(String key, Collection<String> values, String sep) {
 		String s = "";
-		for (String v : values)
-			s += (s.length()>0) ? ", "+v : v;
-		return key+"="+s;
+		for(String v : values)
+			s += (s.length() > 0) ? ", " + v : v;
+		return key + "=" + s;
 	}
-	
+
 	/**
 	 * This handles model notifications by calling {@link #updateChildren} to update any cached
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void notifyChanged(Notification notification) {
 		updateChildren(notification);
-
-		switch (notification.getFeatureID(GraphicalElement.class)) {
-			case DGPackage.GRAPHICAL_ELEMENT__CLASS:
-			case DGPackage.GRAPHICAL_ELEMENT__LAYOUT_DATA:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
-			case DGPackage.GRAPHICAL_ELEMENT__STYLE:
-			case DGPackage.GRAPHICAL_ELEMENT__TRANSFORM:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
+		switch(notification.getFeatureID(GraphicalElement.class)) {
+		case DGPackage.GRAPHICAL_ELEMENT__CLASS:
+		case DGPackage.GRAPHICAL_ELEMENT__LAYOUT_DATA:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+			return;
+		case DGPackage.GRAPHICAL_ELEMENT__STYLE:
+		case DGPackage.GRAPHICAL_ELEMENT__TRANSFORM:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+			return;
 		}
 		super.notifyChanged(notification);
 	}
@@ -241,39 +199,13 @@ public class GraphicalElementItemProvider extends DefinitionItemProvider
 	 * @generated
 	 */
 	@Override
-	protected void collectNewChildDescriptors(
-			Collection<Object> newChildDescriptors, Object object) {
+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.GRAPHICAL_ELEMENT__STYLE,
-				 DGFactory.eINSTANCE.createStyle()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.GRAPHICAL_ELEMENT__TRANSFORM,
-				 DGFactory.eINSTANCE.createMatrix()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.GRAPHICAL_ELEMENT__TRANSFORM,
-				 DGFactory.eINSTANCE.createRotate()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.GRAPHICAL_ELEMENT__TRANSFORM,
-				 DGFactory.eINSTANCE.createScale()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.GRAPHICAL_ELEMENT__TRANSFORM,
-				 DGFactory.eINSTANCE.createSkew()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.GRAPHICAL_ELEMENT__TRANSFORM,
-				 DGFactory.eINSTANCE.createTranslate()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.GRAPHICAL_ELEMENT__STYLE, DGFactory.eINSTANCE.createStyle()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.GRAPHICAL_ELEMENT__TRANSFORM, DGFactory.eINSTANCE.createMatrix()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.GRAPHICAL_ELEMENT__TRANSFORM, DGFactory.eINSTANCE.createRotate()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.GRAPHICAL_ELEMENT__TRANSFORM, DGFactory.eINSTANCE.createScale()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.GRAPHICAL_ELEMENT__TRANSFORM, DGFactory.eINSTANCE.createSkew()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.GRAPHICAL_ELEMENT__TRANSFORM, DGFactory.eINSTANCE.createTranslate()));
 	}
-
 }
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/GroupItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/GroupItemProvider.java
index 4b0e3253205..0bbf89ce4ab 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/GroupItemProvider.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/GroupItemProvider.java
@@ -39,12 +39,11 @@ import org.eclipse.papyrus.dd.dg.Group;
  * This is the item provider adapter for a {@link org.eclipse.papyrus.dd.dg.Group} object.
  * <!-- begin-user-doc --> <!--
  * end-user-doc -->
+ * 
  * @generated
  */
-public class GroupItemProvider extends GraphicalElementItemProvider implements
-		IEditingDomainItemProvider, IStructuredItemContentProvider,
-		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
-		IItemColorProvider, IItemFontProvider {
+public class GroupItemProvider extends GraphicalElementItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider {
+
 	/**
 	 * This constructs an instance from a factory and a notifier. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
@@ -63,9 +62,8 @@ public class GroupItemProvider extends GraphicalElementItemProvider implements
 	 */
 	@Override
 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
+		if(itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
-
 			addLayoutPropertyDescriptor(object);
 		}
 		return itemPropertyDescriptors;
@@ -75,22 +73,11 @@ public class GroupItemProvider extends GraphicalElementItemProvider implements
 	 * This adds a property descriptor for the Layout feature.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addLayoutPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Group_layout_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Group_layout_feature", "_UI_Group_type"),
-				 DGPackage.Literals.GROUP__LAYOUT,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Group_layout_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Group_layout_feature", "_UI_Group_type"), DGPackage.Literals.GROUP__LAYOUT, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
@@ -98,12 +85,12 @@ public class GroupItemProvider extends GraphicalElementItemProvider implements
 	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
 	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
-	public Collection<? extends EStructuralFeature> getChildrenFeatures(
-			Object object) {
-		if (childrenFeatures == null) {
+	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
+		if(childrenFeatures == null) {
 			super.getChildrenFeatures(object);
 			childrenFeatures.add(DGPackage.Literals.GROUP__MEMBER);
 		}
@@ -112,19 +99,20 @@ public class GroupItemProvider extends GraphicalElementItemProvider implements
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	protected EStructuralFeature getChildFeature(Object object, Object child) {
 		// Check the type of the specified child object and return the proper feature to use for
 		// adding (see {@link AddCommand}) it as a child.
-
 		return super.getChildFeature(object, child);
 	}
 
 	/**
 	 * This returns Group.gif.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -136,14 +124,13 @@ public class GroupItemProvider extends GraphicalElementItemProvider implements
 	 * This returns the label text for the adapted class.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated NOT
 	 */
 	@Override
 	public String getText(Object object) {
 		String label = getLabel((Group)object);
-		return label == null || label.length() == 0 ?
-			getString("_UI_Group_type") :
-			getString("_UI_Group_type") + " " + label;
+		return label == null || label.length() == 0 ? getString("_UI_Group_type") : getString("_UI_Group_type") + " " + label;
 	}
 
 	/**
@@ -151,19 +138,19 @@ public class GroupItemProvider extends GraphicalElementItemProvider implements
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void notifyChanged(Notification notification) {
 		updateChildren(notification);
-
-		switch (notification.getFeatureID(Group.class)) {
-			case DGPackage.GROUP__LAYOUT:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
-			case DGPackage.GROUP__MEMBER:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
+		switch(notification.getFeatureID(Group.class)) {
+		case DGPackage.GROUP__LAYOUT:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+			return;
+		case DGPackage.GROUP__MEMBER:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+			return;
 		}
 		super.notifyChanged(notification);
 	}
@@ -176,84 +163,22 @@ public class GroupItemProvider extends GraphicalElementItemProvider implements
 	 * @generated
 	 */
 	@Override
-	protected void collectNewChildDescriptors(
-			Collection<Object> newChildDescriptors, Object object) {
+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.GROUP__MEMBER,
-				 DGFactory.eINSTANCE.createGroup()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.GROUP__MEMBER,
-				 DGFactory.eINSTANCE.createCanvas()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.GROUP__MEMBER,
-				 DGFactory.eINSTANCE.createClipPath()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.GROUP__MEMBER,
-				 DGFactory.eINSTANCE.createCircle()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.GROUP__MEMBER,
-				 DGFactory.eINSTANCE.createEllipse()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.GROUP__MEMBER,
-				 DGFactory.eINSTANCE.createImage()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.GROUP__MEMBER,
-				 DGFactory.eINSTANCE.createLine()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.GROUP__MEMBER,
-				 DGFactory.eINSTANCE.createMarker()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.GROUP__MEMBER,
-				 DGFactory.eINSTANCE.createPath()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.GROUP__MEMBER,
-				 DGFactory.eINSTANCE.createPolygon()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.GROUP__MEMBER,
-				 DGFactory.eINSTANCE.createPolyline()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.GROUP__MEMBER,
-				 DGFactory.eINSTANCE.createRectangle()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.GROUP__MEMBER,
-				 DGFactory.eINSTANCE.createRootCanvas()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.GROUP__MEMBER,
-				 DGFactory.eINSTANCE.createText()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.GROUP__MEMBER,
-				 DGFactory.eINSTANCE.createUse()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.GROUP__MEMBER, DGFactory.eINSTANCE.createGroup()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.GROUP__MEMBER, DGFactory.eINSTANCE.createCanvas()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.GROUP__MEMBER, DGFactory.eINSTANCE.createClipPath()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.GROUP__MEMBER, DGFactory.eINSTANCE.createCircle()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.GROUP__MEMBER, DGFactory.eINSTANCE.createEllipse()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.GROUP__MEMBER, DGFactory.eINSTANCE.createImage()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.GROUP__MEMBER, DGFactory.eINSTANCE.createLine()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.GROUP__MEMBER, DGFactory.eINSTANCE.createMarker()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.GROUP__MEMBER, DGFactory.eINSTANCE.createPath()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.GROUP__MEMBER, DGFactory.eINSTANCE.createPolygon()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.GROUP__MEMBER, DGFactory.eINSTANCE.createPolyline()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.GROUP__MEMBER, DGFactory.eINSTANCE.createRectangle()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.GROUP__MEMBER, DGFactory.eINSTANCE.createRootCanvas()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.GROUP__MEMBER, DGFactory.eINSTANCE.createText()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.GROUP__MEMBER, DGFactory.eINSTANCE.createUse()));
 	}
-
 }
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/ImageItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/ImageItemProvider.java
index 833458fddd7..462886f6d09 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/ImageItemProvider.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/ImageItemProvider.java
@@ -40,12 +40,11 @@ import org.eclipse.papyrus.dd.dg.Image;
  * This is the item provider adapter for a {@link org.eclipse.papyrus.dd.dg.Image} object.
  * <!-- begin-user-doc --> <!--
  * end-user-doc -->
+ * 
  * @generated
  */
-public class ImageItemProvider extends GraphicalElementItemProvider implements
-		IEditingDomainItemProvider, IStructuredItemContentProvider,
-		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
-		IItemColorProvider, IItemFontProvider {
+public class ImageItemProvider extends GraphicalElementItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider {
+
 	/**
 	 * This constructs an instance from a factory and a notifier. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
@@ -64,9 +63,8 @@ public class ImageItemProvider extends GraphicalElementItemProvider implements
 	 */
 	@Override
 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
+		if(itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
-
 			addSourcePropertyDescriptor(object);
 			addIsAspectRatioPreservedPropertyDescriptor(object);
 		}
@@ -80,40 +78,17 @@ public class ImageItemProvider extends GraphicalElementItemProvider implements
 	 * @generated
 	 */
 	protected void addSourcePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Image_source_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Image_source_feature", "_UI_Image_type"),
-				 DGPackage.Literals.IMAGE__SOURCE,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Image_source_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Image_source_feature", "_UI_Image_type"), DGPackage.Literals.IMAGE__SOURCE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
 	 * This adds a property descriptor for the Is Aspect Ratio Preserved feature.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addIsAspectRatioPreservedPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Image_isAspectRatioPreserved_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Image_isAspectRatioPreserved_feature", "_UI_Image_type"),
-				 DGPackage.Literals.IMAGE__IS_ASPECT_RATIO_PRESERVED,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Image_isAspectRatioPreserved_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Image_isAspectRatioPreserved_feature", "_UI_Image_type"), DGPackage.Literals.IMAGE__IS_ASPECT_RATIO_PRESERVED, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null));
 	}
 
 	/**
@@ -121,12 +96,12 @@ public class ImageItemProvider extends GraphicalElementItemProvider implements
 	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
 	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
-	public Collection<? extends EStructuralFeature> getChildrenFeatures(
-			Object object) {
-		if (childrenFeatures == null) {
+	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
+		if(childrenFeatures == null) {
 			super.getChildrenFeatures(object);
 			childrenFeatures.add(DGPackage.Literals.IMAGE__BOUNDS);
 		}
@@ -135,19 +110,20 @@ public class ImageItemProvider extends GraphicalElementItemProvider implements
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	protected EStructuralFeature getChildFeature(Object object, Object child) {
 		// Check the type of the specified child object and return the proper feature to use for
 		// adding (see {@link AddCommand}) it as a child.
-
 		return super.getChildFeature(object, child);
 	}
 
 	/**
 	 * This returns Image.gif.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -159,14 +135,13 @@ public class ImageItemProvider extends GraphicalElementItemProvider implements
 	 * This returns the label text for the adapted class.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String getText(Object object) {
 		String label = ((Image)object).getId();
-		return label == null || label.length() == 0 ?
-			getString("_UI_Image_type") :
-			getString("_UI_Image_type") + " " + label;
+		return label == null || label.length() == 0 ? getString("_UI_Image_type") : getString("_UI_Image_type") + " " + label;
 	}
 
 	/**
@@ -174,20 +149,20 @@ public class ImageItemProvider extends GraphicalElementItemProvider implements
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void notifyChanged(Notification notification) {
 		updateChildren(notification);
-
-		switch (notification.getFeatureID(Image.class)) {
-			case DGPackage.IMAGE__SOURCE:
-			case DGPackage.IMAGE__IS_ASPECT_RATIO_PRESERVED:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
-			case DGPackage.IMAGE__BOUNDS:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
+		switch(notification.getFeatureID(Image.class)) {
+		case DGPackage.IMAGE__SOURCE:
+		case DGPackage.IMAGE__IS_ASPECT_RATIO_PRESERVED:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+			return;
+		case DGPackage.IMAGE__BOUNDS:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+			return;
 		}
 		super.notifyChanged(notification);
 	}
@@ -200,14 +175,8 @@ public class ImageItemProvider extends GraphicalElementItemProvider implements
 	 * @generated
 	 */
 	@Override
-	protected void collectNewChildDescriptors(
-			Collection<Object> newChildDescriptors, Object object) {
+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.IMAGE__BOUNDS,
-				 DCFactory.eINSTANCE.createBounds()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.IMAGE__BOUNDS, DCFactory.eINSTANCE.createBounds()));
 	}
-
 }
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/LineItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/LineItemProvider.java
index 1c5325c65ce..68f8e733301 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/LineItemProvider.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/LineItemProvider.java
@@ -38,12 +38,11 @@ import org.eclipse.papyrus.dd.dg.Line;
  * This is the item provider adapter for a {@link org.eclipse.papyrus.dd.dg.Line} object.
  * <!-- begin-user-doc --> <!--
  * end-user-doc -->
+ * 
  * @generated
  */
-public class LineItemProvider extends MarkedElementItemProvider implements
-		IEditingDomainItemProvider, IStructuredItemContentProvider,
-		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
-		IItemColorProvider, IItemFontProvider {
+public class LineItemProvider extends MarkedElementItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider {
+
 	/**
 	 * This constructs an instance from a factory and a notifier. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
@@ -62,9 +61,8 @@ public class LineItemProvider extends MarkedElementItemProvider implements
 	 */
 	@Override
 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
+		if(itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
-
 		}
 		return itemPropertyDescriptors;
 	}
@@ -74,12 +72,12 @@ public class LineItemProvider extends MarkedElementItemProvider implements
 	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
 	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
-	public Collection<? extends EStructuralFeature> getChildrenFeatures(
-			Object object) {
-		if (childrenFeatures == null) {
+	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
+		if(childrenFeatures == null) {
 			super.getChildrenFeatures(object);
 			childrenFeatures.add(DGPackage.Literals.LINE__START);
 			childrenFeatures.add(DGPackage.Literals.LINE__END);
@@ -89,19 +87,20 @@ public class LineItemProvider extends MarkedElementItemProvider implements
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	protected EStructuralFeature getChildFeature(Object object, Object child) {
 		// Check the type of the specified child object and return the proper feature to use for
 		// adding (see {@link AddCommand}) it as a child.
-
 		return super.getChildFeature(object, child);
 	}
 
 	/**
 	 * This returns Line.gif.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -113,14 +112,13 @@ public class LineItemProvider extends MarkedElementItemProvider implements
 	 * This returns the label text for the adapted class.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String getText(Object object) {
 		String label = ((Line)object).getId();
-		return label == null || label.length() == 0 ?
-			getString("_UI_Line_type") :
-			getString("_UI_Line_type") + " " + label;
+		return label == null || label.length() == 0 ? getString("_UI_Line_type") : getString("_UI_Line_type") + " " + label;
 	}
 
 	/**
@@ -128,17 +126,17 @@ public class LineItemProvider extends MarkedElementItemProvider implements
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void notifyChanged(Notification notification) {
 		updateChildren(notification);
-
-		switch (notification.getFeatureID(Line.class)) {
-			case DGPackage.LINE__START:
-			case DGPackage.LINE__END:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
+		switch(notification.getFeatureID(Line.class)) {
+		case DGPackage.LINE__START:
+		case DGPackage.LINE__END:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+			return;
 		}
 		super.notifyChanged(notification);
 	}
@@ -151,44 +149,26 @@ public class LineItemProvider extends MarkedElementItemProvider implements
 	 * @generated
 	 */
 	@Override
-	protected void collectNewChildDescriptors(
-			Collection<Object> newChildDescriptors, Object object) {
+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.LINE__START,
-				 DCFactory.eINSTANCE.createPoint()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.LINE__END,
-				 DCFactory.eINSTANCE.createPoint()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.LINE__START, DCFactory.eINSTANCE.createPoint()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.LINE__END, DCFactory.eINSTANCE.createPoint()));
 	}
 
 	/**
-	 * This returns the label text for
-	 * {@link org.eclipse.emf.edit.command.CreateChildCommand}. <!--
+	 * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @generated
 	 */
 	@Override
-	public String getCreateChildText(Object owner, Object feature,
-			Object child, Collection<?> selection) {
+	public String getCreateChildText(Object owner, Object feature, Object child, Collection<?> selection) {
 		Object childFeature = feature;
 		Object childObject = child;
-
-		boolean qualify =
-			childFeature == DGPackage.Literals.LINE__START ||
-			childFeature == DGPackage.Literals.LINE__END;
-
-		if (qualify) {
-			return getString
-				("_UI_CreateChild_text2",
-				 new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
+		boolean qualify = childFeature == DGPackage.Literals.LINE__START || childFeature == DGPackage.Literals.LINE__END;
+		if(qualify) {
+			return getString("_UI_CreateChild_text2", new Object[]{ getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
 		}
 		return super.getCreateChildText(owner, feature, child, selection);
 	}
-
 }
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/LineToItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/LineToItemProvider.java
index 8cb70eb8d90..f043752a62e 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/LineToItemProvider.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/LineToItemProvider.java
@@ -38,12 +38,11 @@ import org.eclipse.papyrus.dd.dg.LineTo;
  * This is the item provider adapter for a {@link org.eclipse.papyrus.dd.dg.LineTo} object.
  * <!-- begin-user-doc --> <!--
  * end-user-doc -->
+ * 
  * @generated
  */
-public class LineToItemProvider extends PathCommandItemProvider implements
-		IEditingDomainItemProvider, IStructuredItemContentProvider,
-		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
-		IItemColorProvider, IItemFontProvider {
+public class LineToItemProvider extends PathCommandItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider {
+
 	/**
 	 * This constructs an instance from a factory and a notifier. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
@@ -62,9 +61,8 @@ public class LineToItemProvider extends PathCommandItemProvider implements
 	 */
 	@Override
 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
+		if(itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
-
 		}
 		return itemPropertyDescriptors;
 	}
@@ -74,12 +72,12 @@ public class LineToItemProvider extends PathCommandItemProvider implements
 	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
 	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
-	public Collection<? extends EStructuralFeature> getChildrenFeatures(
-			Object object) {
-		if (childrenFeatures == null) {
+	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
+		if(childrenFeatures == null) {
 			super.getChildrenFeatures(object);
 			childrenFeatures.add(DGPackage.Literals.LINE_TO__POINT);
 		}
@@ -88,19 +86,20 @@ public class LineToItemProvider extends PathCommandItemProvider implements
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	protected EStructuralFeature getChildFeature(Object object, Object child) {
 		// Check the type of the specified child object and return the proper feature to use for
 		// adding (see {@link AddCommand}) it as a child.
-
 		return super.getChildFeature(object, child);
 	}
 
 	/**
 	 * This returns LineTo.gif.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -112,6 +111,7 @@ public class LineToItemProvider extends PathCommandItemProvider implements
 	 * This returns the label text for the adapted class.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -125,16 +125,16 @@ public class LineToItemProvider extends PathCommandItemProvider implements
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void notifyChanged(Notification notification) {
 		updateChildren(notification);
-
-		switch (notification.getFeatureID(LineTo.class)) {
-			case DGPackage.LINE_TO__POINT:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
+		switch(notification.getFeatureID(LineTo.class)) {
+		case DGPackage.LINE_TO__POINT:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+			return;
 		}
 		super.notifyChanged(notification);
 	}
@@ -147,14 +147,8 @@ public class LineToItemProvider extends PathCommandItemProvider implements
 	 * @generated
 	 */
 	@Override
-	protected void collectNewChildDescriptors(
-			Collection<Object> newChildDescriptors, Object object) {
+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.LINE_TO__POINT,
-				 DCFactory.eINSTANCE.createPoint()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.LINE_TO__POINT, DCFactory.eINSTANCE.createPoint()));
 	}
-
 }
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/LinearGradientItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/LinearGradientItemProvider.java
index 28a5b7b1d9c..af2f283eae5 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/LinearGradientItemProvider.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/LinearGradientItemProvider.java
@@ -33,12 +33,11 @@ import org.eclipse.papyrus.dd.dg.LinearGradient;
  * This is the item provider adapter for a {@link org.eclipse.papyrus.dd.dg.LinearGradient} object.
  * <!-- begin-user-doc
  * --> <!-- end-user-doc -->
+ * 
  * @generated
  */
-public class LinearGradientItemProvider extends GradientItemProvider implements
-		IEditingDomainItemProvider, IStructuredItemContentProvider,
-		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
-		IItemColorProvider, IItemFontProvider {
+public class LinearGradientItemProvider extends GradientItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider {
+
 	/**
 	 * This constructs an instance from a factory and a notifier. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
@@ -57,9 +56,8 @@ public class LinearGradientItemProvider extends GradientItemProvider implements
 	 */
 	@Override
 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
+		if(itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
-
 		}
 		return itemPropertyDescriptors;
 	}
@@ -69,12 +67,12 @@ public class LinearGradientItemProvider extends GradientItemProvider implements
 	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
 	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
-	public Collection<? extends EStructuralFeature> getChildrenFeatures(
-			Object object) {
-		if (childrenFeatures == null) {
+	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
+		if(childrenFeatures == null) {
 			super.getChildrenFeatures(object);
 			childrenFeatures.add(DGPackage.Literals.LINEAR_GRADIENT__START);
 			childrenFeatures.add(DGPackage.Literals.LINEAR_GRADIENT__END);
@@ -84,13 +82,13 @@ public class LinearGradientItemProvider extends GradientItemProvider implements
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	protected EStructuralFeature getChildFeature(Object object, Object child) {
 		// Check the type of the specified child object and return the proper feature to use for
 		// adding (see {@link AddCommand}) it as a child.
-
 		return super.getChildFeature(object, child);
 	}
 
@@ -98,6 +96,7 @@ public class LinearGradientItemProvider extends GradientItemProvider implements
 	 * This returns LinearGradient.gif.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -109,14 +108,13 @@ public class LinearGradientItemProvider extends GradientItemProvider implements
 	 * This returns the label text for the adapted class.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String getText(Object object) {
 		String label = ((LinearGradient)object).getId();
-		return label == null || label.length() == 0 ?
-			getString("_UI_LinearGradient_type") :
-			getString("_UI_LinearGradient_type") + " " + label;
+		return label == null || label.length() == 0 ? getString("_UI_LinearGradient_type") : getString("_UI_LinearGradient_type") + " " + label;
 	}
 
 	/**
@@ -124,17 +122,17 @@ public class LinearGradientItemProvider extends GradientItemProvider implements
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void notifyChanged(Notification notification) {
 		updateChildren(notification);
-
-		switch (notification.getFeatureID(LinearGradient.class)) {
-			case DGPackage.LINEAR_GRADIENT__START:
-			case DGPackage.LINEAR_GRADIENT__END:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
+		switch(notification.getFeatureID(LinearGradient.class)) {
+		case DGPackage.LINEAR_GRADIENT__START:
+		case DGPackage.LINEAR_GRADIENT__END:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+			return;
 		}
 		super.notifyChanged(notification);
 	}
@@ -147,44 +145,26 @@ public class LinearGradientItemProvider extends GradientItemProvider implements
 	 * @generated
 	 */
 	@Override
-	protected void collectNewChildDescriptors(
-			Collection<Object> newChildDescriptors, Object object) {
+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.LINEAR_GRADIENT__START,
-				 DCFactory.eINSTANCE.createPoint()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.LINEAR_GRADIENT__END,
-				 DCFactory.eINSTANCE.createPoint()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.LINEAR_GRADIENT__START, DCFactory.eINSTANCE.createPoint()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.LINEAR_GRADIENT__END, DCFactory.eINSTANCE.createPoint()));
 	}
 
 	/**
-	 * This returns the label text for
-	 * {@link org.eclipse.emf.edit.command.CreateChildCommand}. <!--
+	 * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @generated
 	 */
 	@Override
-	public String getCreateChildText(Object owner, Object feature,
-			Object child, Collection<?> selection) {
+	public String getCreateChildText(Object owner, Object feature, Object child, Collection<?> selection) {
 		Object childFeature = feature;
 		Object childObject = child;
-
-		boolean qualify =
-			childFeature == DGPackage.Literals.LINEAR_GRADIENT__START ||
-			childFeature == DGPackage.Literals.LINEAR_GRADIENT__END;
-
-		if (qualify) {
-			return getString
-				("_UI_CreateChild_text2",
-				 new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
+		boolean qualify = childFeature == DGPackage.Literals.LINEAR_GRADIENT__START || childFeature == DGPackage.Literals.LINEAR_GRADIENT__END;
+		if(qualify) {
+			return getString("_UI_CreateChild_text2", new Object[]{ getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
 		}
 		return super.getCreateChildText(owner, feature, child, selection);
 	}
-
 }
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/MarkedElementItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/MarkedElementItemProvider.java
index 87d0edd3baa..a810433a641 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/MarkedElementItemProvider.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/MarkedElementItemProvider.java
@@ -34,12 +34,11 @@ import org.eclipse.papyrus.dd.dg.MarkedElement;
  * This is the item provider adapter for a {@link org.eclipse.papyrus.dd.dg.MarkedElement} object.
  * <!-- begin-user-doc
  * --> <!-- end-user-doc -->
+ * 
  * @generated
  */
-public class MarkedElementItemProvider extends GraphicalElementItemProvider
-		implements IEditingDomainItemProvider, IStructuredItemContentProvider,
-		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
-		IItemColorProvider, IItemFontProvider {
+public class MarkedElementItemProvider extends GraphicalElementItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider {
+
 	/**
 	 * This constructs an instance from a factory and a notifier. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
@@ -58,9 +57,8 @@ public class MarkedElementItemProvider extends GraphicalElementItemProvider
 	 */
 	@Override
 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
+		if(itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
-
 			addEndMarkerPropertyDescriptor(object);
 			addMidMarkerPropertyDescriptor(object);
 			addStartMarkerPropertyDescriptor(object);
@@ -75,19 +73,7 @@ public class MarkedElementItemProvider extends GraphicalElementItemProvider
 	 * @generated
 	 */
 	protected void addEndMarkerPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_MarkedElement_endMarker_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_MarkedElement_endMarker_feature", "_UI_MarkedElement_type"),
-				 DGPackage.Literals.MARKED_ELEMENT__END_MARKER,
-				 true,
-				 false,
-				 true,
-				 null,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_MarkedElement_endMarker_feature"), getString("_UI_PropertyDescriptor_description", "_UI_MarkedElement_endMarker_feature", "_UI_MarkedElement_type"), DGPackage.Literals.MARKED_ELEMENT__END_MARKER, true, false, true, null, null, null));
 	}
 
 	/**
@@ -97,19 +83,7 @@ public class MarkedElementItemProvider extends GraphicalElementItemProvider
 	 * @generated
 	 */
 	protected void addMidMarkerPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_MarkedElement_midMarker_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_MarkedElement_midMarker_feature", "_UI_MarkedElement_type"),
-				 DGPackage.Literals.MARKED_ELEMENT__MID_MARKER,
-				 true,
-				 false,
-				 true,
-				 null,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_MarkedElement_midMarker_feature"), getString("_UI_PropertyDescriptor_description", "_UI_MarkedElement_midMarker_feature", "_UI_MarkedElement_type"), DGPackage.Literals.MARKED_ELEMENT__MID_MARKER, true, false, true, null, null, null));
 	}
 
 	/**
@@ -119,33 +93,20 @@ public class MarkedElementItemProvider extends GraphicalElementItemProvider
 	 * @generated
 	 */
 	protected void addStartMarkerPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_MarkedElement_startMarker_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_MarkedElement_startMarker_feature", "_UI_MarkedElement_type"),
-				 DGPackage.Literals.MARKED_ELEMENT__START_MARKER,
-				 true,
-				 false,
-				 true,
-				 null,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_MarkedElement_startMarker_feature"), getString("_UI_PropertyDescriptor_description", "_UI_MarkedElement_startMarker_feature", "_UI_MarkedElement_type"), DGPackage.Literals.MARKED_ELEMENT__START_MARKER, true, false, true, null, null, null));
 	}
 
 	/**
 	 * This returns the label text for the adapted class.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String getText(Object object) {
 		String label = ((MarkedElement)object).getId();
-		return label == null || label.length() == 0 ?
-			getString("_UI_MarkedElement_type") :
-			getString("_UI_MarkedElement_type") + " " + label;
+		return label == null || label.length() == 0 ? getString("_UI_MarkedElement_type") : getString("_UI_MarkedElement_type") + " " + label;
 	}
 
 	/**
@@ -153,6 +114,7 @@ public class MarkedElementItemProvider extends GraphicalElementItemProvider
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -169,9 +131,7 @@ public class MarkedElementItemProvider extends GraphicalElementItemProvider
 	 * @generated
 	 */
 	@Override
-	protected void collectNewChildDescriptors(
-			Collection<Object> newChildDescriptors, Object object) {
+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
 	}
-
 }
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/MarkerItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/MarkerItemProvider.java
index 8fb604fdad0..0fbe78b58dc 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/MarkerItemProvider.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/MarkerItemProvider.java
@@ -38,12 +38,11 @@ import org.eclipse.papyrus.dd.dg.Marker;
  * This is the item provider adapter for a {@link org.eclipse.papyrus.dd.dg.Marker} object.
  * <!-- begin-user-doc --> <!--
  * end-user-doc -->
+ * 
  * @generated
  */
-public class MarkerItemProvider extends GroupItemProvider implements
-		IEditingDomainItemProvider, IStructuredItemContentProvider,
-		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
-		IItemColorProvider, IItemFontProvider {
+public class MarkerItemProvider extends GroupItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider {
+
 	/**
 	 * This constructs an instance from a factory and a notifier. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
@@ -62,9 +61,8 @@ public class MarkerItemProvider extends GroupItemProvider implements
 	 */
 	@Override
 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
+		if(itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
-
 		}
 		return itemPropertyDescriptors;
 	}
@@ -74,12 +72,12 @@ public class MarkerItemProvider extends GroupItemProvider implements
 	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
 	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
-	public Collection<? extends EStructuralFeature> getChildrenFeatures(
-			Object object) {
-		if (childrenFeatures == null) {
+	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
+		if(childrenFeatures == null) {
 			super.getChildrenFeatures(object);
 			childrenFeatures.add(DGPackage.Literals.MARKER__SIZE);
 			childrenFeatures.add(DGPackage.Literals.MARKER__REFERENCE);
@@ -89,19 +87,20 @@ public class MarkerItemProvider extends GroupItemProvider implements
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	protected EStructuralFeature getChildFeature(Object object, Object child) {
 		// Check the type of the specified child object and return the proper feature to use for
 		// adding (see {@link AddCommand}) it as a child.
-
 		return super.getChildFeature(object, child);
 	}
 
 	/**
 	 * This returns Marker.gif.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -113,14 +112,13 @@ public class MarkerItemProvider extends GroupItemProvider implements
 	 * This returns the label text for the adapted class.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String getText(Object object) {
 		String label = ((Marker)object).getId();
-		return label == null || label.length() == 0 ?
-			getString("_UI_Marker_type") :
-			getString("_UI_Marker_type") + " " + label;
+		return label == null || label.length() == 0 ? getString("_UI_Marker_type") : getString("_UI_Marker_type") + " " + label;
 	}
 
 	/**
@@ -128,17 +126,17 @@ public class MarkerItemProvider extends GroupItemProvider implements
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void notifyChanged(Notification notification) {
 		updateChildren(notification);
-
-		switch (notification.getFeatureID(Marker.class)) {
-			case DGPackage.MARKER__SIZE:
-			case DGPackage.MARKER__REFERENCE:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
+		switch(notification.getFeatureID(Marker.class)) {
+		case DGPackage.MARKER__SIZE:
+		case DGPackage.MARKER__REFERENCE:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+			return;
 		}
 		super.notifyChanged(notification);
 	}
@@ -151,19 +149,9 @@ public class MarkerItemProvider extends GroupItemProvider implements
 	 * @generated
 	 */
 	@Override
-	protected void collectNewChildDescriptors(
-			Collection<Object> newChildDescriptors, Object object) {
+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.MARKER__SIZE,
-				 DCFactory.eINSTANCE.createDimension()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.MARKER__REFERENCE,
-				 DCFactory.eINSTANCE.createPoint()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.MARKER__SIZE, DCFactory.eINSTANCE.createDimension()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.MARKER__REFERENCE, DCFactory.eINSTANCE.createPoint()));
 	}
-
 }
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/MatrixItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/MatrixItemProvider.java
index b12c1304084..ae4088fc3fb 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/MatrixItemProvider.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/MatrixItemProvider.java
@@ -36,12 +36,11 @@ import org.eclipse.papyrus.dd.dg.Matrix;
  * This is the item provider adapter for a {@link org.eclipse.papyrus.dd.dg.Matrix} object.
  * <!-- begin-user-doc --> <!--
  * end-user-doc -->
+ * 
  * @generated
  */
-public class MatrixItemProvider extends TransformItemProvider implements
-		IEditingDomainItemProvider, IStructuredItemContentProvider,
-		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
-		IItemColorProvider, IItemFontProvider {
+public class MatrixItemProvider extends TransformItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider {
+
 	/**
 	 * This constructs an instance from a factory and a notifier. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
@@ -60,9 +59,8 @@ public class MatrixItemProvider extends TransformItemProvider implements
 	 */
 	@Override
 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
+		if(itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
-
 			addAPropertyDescriptor(object);
 			addBPropertyDescriptor(object);
 			addCPropertyDescriptor(object);
@@ -77,137 +75,72 @@ public class MatrixItemProvider extends TransformItemProvider implements
 	 * This adds a property descriptor for the A feature.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addAPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Matrix_a_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Matrix_a_feature", "_UI_Matrix_type"),
-				 DGPackage.Literals.MATRIX__A,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.REAL_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Matrix_a_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Matrix_a_feature", "_UI_Matrix_type"), DGPackage.Literals.MATRIX__A, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
 	}
 
 	/**
 	 * This adds a property descriptor for the B feature.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addBPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Matrix_b_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Matrix_b_feature", "_UI_Matrix_type"),
-				 DGPackage.Literals.MATRIX__B,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.REAL_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Matrix_b_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Matrix_b_feature", "_UI_Matrix_type"), DGPackage.Literals.MATRIX__B, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
 	}
 
 	/**
 	 * This adds a property descriptor for the C feature.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addCPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Matrix_c_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Matrix_c_feature", "_UI_Matrix_type"),
-				 DGPackage.Literals.MATRIX__C,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.REAL_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Matrix_c_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Matrix_c_feature", "_UI_Matrix_type"), DGPackage.Literals.MATRIX__C, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
 	}
 
 	/**
 	 * This adds a property descriptor for the D feature.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addDPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Matrix_d_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Matrix_d_feature", "_UI_Matrix_type"),
-				 DGPackage.Literals.MATRIX__D,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.REAL_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Matrix_d_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Matrix_d_feature", "_UI_Matrix_type"), DGPackage.Literals.MATRIX__D, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
 	}
 
 	/**
 	 * This adds a property descriptor for the E feature.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addEPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Matrix_e_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Matrix_e_feature", "_UI_Matrix_type"),
-				 DGPackage.Literals.MATRIX__E,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.REAL_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Matrix_e_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Matrix_e_feature", "_UI_Matrix_type"), DGPackage.Literals.MATRIX__E, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
 	}
 
 	/**
 	 * This adds a property descriptor for the F feature.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addFPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Matrix_f_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Matrix_f_feature", "_UI_Matrix_type"),
-				 DGPackage.Literals.MATRIX__F,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.REAL_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Matrix_f_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Matrix_f_feature", "_UI_Matrix_type"), DGPackage.Literals.MATRIX__F, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
 	}
 
 	/**
 	 * This returns Matrix.gif.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -219,6 +152,7 @@ public class MatrixItemProvider extends TransformItemProvider implements
 	 * This returns the label text for the adapted class.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -232,21 +166,21 @@ public class MatrixItemProvider extends TransformItemProvider implements
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void notifyChanged(Notification notification) {
 		updateChildren(notification);
-
-		switch (notification.getFeatureID(Matrix.class)) {
-			case DGPackage.MATRIX__A:
-			case DGPackage.MATRIX__B:
-			case DGPackage.MATRIX__C:
-			case DGPackage.MATRIX__D:
-			case DGPackage.MATRIX__E:
-			case DGPackage.MATRIX__F:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
+		switch(notification.getFeatureID(Matrix.class)) {
+		case DGPackage.MATRIX__A:
+		case DGPackage.MATRIX__B:
+		case DGPackage.MATRIX__C:
+		case DGPackage.MATRIX__D:
+		case DGPackage.MATRIX__E:
+		case DGPackage.MATRIX__F:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+			return;
 		}
 		super.notifyChanged(notification);
 	}
@@ -259,9 +193,7 @@ public class MatrixItemProvider extends TransformItemProvider implements
 	 * @generated
 	 */
 	@Override
-	protected void collectNewChildDescriptors(
-			Collection<Object> newChildDescriptors, Object object) {
+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
 	}
-
 }
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/MoveToItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/MoveToItemProvider.java
index 6987e9fff29..74df552674e 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/MoveToItemProvider.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/MoveToItemProvider.java
@@ -38,12 +38,11 @@ import org.eclipse.papyrus.dd.dg.MoveTo;
  * This is the item provider adapter for a {@link org.eclipse.papyrus.dd.dg.MoveTo} object.
  * <!-- begin-user-doc --> <!--
  * end-user-doc -->
+ * 
  * @generated
  */
-public class MoveToItemProvider extends PathCommandItemProvider implements
-		IEditingDomainItemProvider, IStructuredItemContentProvider,
-		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
-		IItemColorProvider, IItemFontProvider {
+public class MoveToItemProvider extends PathCommandItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider {
+
 	/**
 	 * This constructs an instance from a factory and a notifier. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
@@ -62,9 +61,8 @@ public class MoveToItemProvider extends PathCommandItemProvider implements
 	 */
 	@Override
 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
+		if(itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
-
 		}
 		return itemPropertyDescriptors;
 	}
@@ -74,12 +72,12 @@ public class MoveToItemProvider extends PathCommandItemProvider implements
 	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
 	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
-	public Collection<? extends EStructuralFeature> getChildrenFeatures(
-			Object object) {
-		if (childrenFeatures == null) {
+	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
+		if(childrenFeatures == null) {
 			super.getChildrenFeatures(object);
 			childrenFeatures.add(DGPackage.Literals.MOVE_TO__POINT);
 		}
@@ -88,19 +86,20 @@ public class MoveToItemProvider extends PathCommandItemProvider implements
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	protected EStructuralFeature getChildFeature(Object object, Object child) {
 		// Check the type of the specified child object and return the proper feature to use for
 		// adding (see {@link AddCommand}) it as a child.
-
 		return super.getChildFeature(object, child);
 	}
 
 	/**
 	 * This returns MoveTo.gif.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -112,6 +111,7 @@ public class MoveToItemProvider extends PathCommandItemProvider implements
 	 * This returns the label text for the adapted class.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -125,16 +125,16 @@ public class MoveToItemProvider extends PathCommandItemProvider implements
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void notifyChanged(Notification notification) {
 		updateChildren(notification);
-
-		switch (notification.getFeatureID(MoveTo.class)) {
-			case DGPackage.MOVE_TO__POINT:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
+		switch(notification.getFeatureID(MoveTo.class)) {
+		case DGPackage.MOVE_TO__POINT:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+			return;
 		}
 		super.notifyChanged(notification);
 	}
@@ -147,14 +147,8 @@ public class MoveToItemProvider extends PathCommandItemProvider implements
 	 * @generated
 	 */
 	@Override
-	protected void collectNewChildDescriptors(
-			Collection<Object> newChildDescriptors, Object object) {
+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.MOVE_TO__POINT,
-				 DCFactory.eINSTANCE.createPoint()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.MOVE_TO__POINT, DCFactory.eINSTANCE.createPoint()));
 	}
-
 }
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/PaintItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/PaintItemProvider.java
index 81fbd4cf24d..1cc187b86fc 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/PaintItemProvider.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/PaintItemProvider.java
@@ -43,12 +43,11 @@ import org.eclipse.papyrus.dd.edit.DDEditPlugin;
  * This is the item provider adapter for a {@link org.eclipse.papyrus.dd.dg.Paint} object.
  * <!-- begin-user-doc --> <!--
  * end-user-doc -->
+ * 
  * @generated
  */
-public class PaintItemProvider extends ItemProviderAdapter implements
-		IEditingDomainItemProvider, IStructuredItemContentProvider,
-		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
-		IItemColorProvider, IItemFontProvider {
+public class PaintItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider {
+
 	/**
 	 * This constructs an instance from a factory and a notifier. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
@@ -67,9 +66,8 @@ public class PaintItemProvider extends ItemProviderAdapter implements
 	 */
 	@Override
 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
+		if(itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
-
 			addColorPropertyDescriptor(object);
 			addPaintServerPropertyDescriptor(object);
 		}
@@ -83,19 +81,7 @@ public class PaintItemProvider extends ItemProviderAdapter implements
 	 * @generated
 	 */
 	protected void addColorPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Paint_color_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Paint_color_feature", "_UI_Paint_type"),
-				 DGPackage.Literals.PAINT__COLOR,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Paint_color_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Paint_color_feature", "_UI_Paint_type"), DGPackage.Literals.PAINT__COLOR, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
@@ -105,24 +91,13 @@ public class PaintItemProvider extends ItemProviderAdapter implements
 	 * @generated
 	 */
 	protected void addPaintServerPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Paint_paintServer_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Paint_paintServer_feature", "_UI_Paint_type"),
-				 DGPackage.Literals.PAINT__PAINT_SERVER,
-				 true,
-				 false,
-				 true,
-				 null,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Paint_paintServer_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Paint_paintServer_feature", "_UI_Paint_type"), DGPackage.Literals.PAINT__PAINT_SERVER, true, false, true, null, null, null));
 	}
 
 	/**
 	 * This returns Paint.gif.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -134,15 +109,14 @@ public class PaintItemProvider extends ItemProviderAdapter implements
 	 * This returns the label text for the adapted class.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String getText(Object object) {
 		Color labelValue = ((Paint)object).getColor();
 		String label = labelValue == null ? null : labelValue.toString();
-		return label == null || label.length() == 0 ?
-			getString("_UI_Paint_type") :
-			getString("_UI_Paint_type") + " " + label;
+		return label == null || label.length() == 0 ? getString("_UI_Paint_type") : getString("_UI_Paint_type") + " " + label;
 	}
 
 	/**
@@ -150,16 +124,16 @@ public class PaintItemProvider extends ItemProviderAdapter implements
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void notifyChanged(Notification notification) {
 		updateChildren(notification);
-
-		switch (notification.getFeatureID(Paint.class)) {
-			case DGPackage.PAINT__COLOR:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
+		switch(notification.getFeatureID(Paint.class)) {
+		case DGPackage.PAINT__COLOR:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+			return;
 		}
 		super.notifyChanged(notification);
 	}
@@ -172,8 +146,7 @@ public class PaintItemProvider extends ItemProviderAdapter implements
 	 * @generated
 	 */
 	@Override
-	protected void collectNewChildDescriptors(
-			Collection<Object> newChildDescriptors, Object object) {
+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
 	}
 
@@ -187,5 +160,4 @@ public class PaintItemProvider extends ItemProviderAdapter implements
 	public ResourceLocator getResourceLocator() {
 		return DDEditPlugin.INSTANCE;
 	}
-
 }
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/PaintServerItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/PaintServerItemProvider.java
index ebaded5b87a..c0419345725 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/PaintServerItemProvider.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/PaintServerItemProvider.java
@@ -37,12 +37,11 @@ import org.eclipse.papyrus.dd.dg.PaintServer;
  * This is the item provider adapter for a {@link org.eclipse.papyrus.dd.dg.PaintServer} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
+ * 
  * @generated
  */
-public class PaintServerItemProvider extends DefinitionItemProvider implements
-		IEditingDomainItemProvider, IStructuredItemContentProvider,
-		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
-		IItemColorProvider, IItemFontProvider {
+public class PaintServerItemProvider extends DefinitionItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider {
+
 	/**
 	 * This constructs an instance from a factory and a notifier. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
@@ -61,9 +60,8 @@ public class PaintServerItemProvider extends DefinitionItemProvider implements
 	 */
 	@Override
 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
+		if(itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
-
 		}
 		return itemPropertyDescriptors;
 	}
@@ -73,12 +71,12 @@ public class PaintServerItemProvider extends DefinitionItemProvider implements
 	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
 	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
-	public Collection<? extends EStructuralFeature> getChildrenFeatures(
-			Object object) {
-		if (childrenFeatures == null) {
+	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
+		if(childrenFeatures == null) {
 			super.getChildrenFeatures(object);
 			childrenFeatures.add(DGPackage.Literals.PAINT_SERVER__TRANSFORM);
 		}
@@ -87,13 +85,13 @@ public class PaintServerItemProvider extends DefinitionItemProvider implements
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	protected EStructuralFeature getChildFeature(Object object, Object child) {
 		// Check the type of the specified child object and return the proper feature to use for
 		// adding (see {@link AddCommand}) it as a child.
-
 		return super.getChildFeature(object, child);
 	}
 
@@ -101,14 +99,13 @@ public class PaintServerItemProvider extends DefinitionItemProvider implements
 	 * This returns the label text for the adapted class.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String getText(Object object) {
 		String label = ((PaintServer)object).getId();
-		return label == null || label.length() == 0 ?
-			getString("_UI_PaintServer_type") :
-			getString("_UI_PaintServer_type") + " " + label;
+		return label == null || label.length() == 0 ? getString("_UI_PaintServer_type") : getString("_UI_PaintServer_type") + " " + label;
 	}
 
 	/**
@@ -116,16 +113,16 @@ public class PaintServerItemProvider extends DefinitionItemProvider implements
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void notifyChanged(Notification notification) {
 		updateChildren(notification);
-
-		switch (notification.getFeatureID(PaintServer.class)) {
-			case DGPackage.PAINT_SERVER__TRANSFORM:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
+		switch(notification.getFeatureID(PaintServer.class)) {
+		case DGPackage.PAINT_SERVER__TRANSFORM:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+			return;
 		}
 		super.notifyChanged(notification);
 	}
@@ -138,34 +135,12 @@ public class PaintServerItemProvider extends DefinitionItemProvider implements
 	 * @generated
 	 */
 	@Override
-	protected void collectNewChildDescriptors(
-			Collection<Object> newChildDescriptors, Object object) {
+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.PAINT_SERVER__TRANSFORM,
-				 DGFactory.eINSTANCE.createMatrix()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.PAINT_SERVER__TRANSFORM,
-				 DGFactory.eINSTANCE.createRotate()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.PAINT_SERVER__TRANSFORM,
-				 DGFactory.eINSTANCE.createScale()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.PAINT_SERVER__TRANSFORM,
-				 DGFactory.eINSTANCE.createSkew()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.PAINT_SERVER__TRANSFORM,
-				 DGFactory.eINSTANCE.createTranslate()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.PAINT_SERVER__TRANSFORM, DGFactory.eINSTANCE.createMatrix()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.PAINT_SERVER__TRANSFORM, DGFactory.eINSTANCE.createRotate()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.PAINT_SERVER__TRANSFORM, DGFactory.eINSTANCE.createScale()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.PAINT_SERVER__TRANSFORM, DGFactory.eINSTANCE.createSkew()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.PAINT_SERVER__TRANSFORM, DGFactory.eINSTANCE.createTranslate()));
 	}
-
 }
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/PathCommandItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/PathCommandItemProvider.java
index 10955bca3c7..d57937b78b0 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/PathCommandItemProvider.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/PathCommandItemProvider.java
@@ -41,12 +41,11 @@ import org.eclipse.papyrus.dd.edit.DDEditPlugin;
  * This is the item provider adapter for a {@link org.eclipse.papyrus.dd.dg.PathCommand} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
+ * 
  * @generated
  */
-public class PathCommandItemProvider extends ItemProviderAdapter implements
-		IEditingDomainItemProvider, IStructuredItemContentProvider,
-		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
-		IItemColorProvider, IItemFontProvider {
+public class PathCommandItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider {
+
 	/**
 	 * This constructs an instance from a factory and a notifier. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
@@ -65,9 +64,8 @@ public class PathCommandItemProvider extends ItemProviderAdapter implements
 	 */
 	@Override
 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
+		if(itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
-
 			addIsRelativePropertyDescriptor(object);
 		}
 		return itemPropertyDescriptors;
@@ -80,25 +78,14 @@ public class PathCommandItemProvider extends ItemProviderAdapter implements
 	 * @generated
 	 */
 	protected void addIsRelativePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_PathCommand_isRelative_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_PathCommand_isRelative_feature", "_UI_PathCommand_type"),
-				 DGPackage.Literals.PATH_COMMAND__IS_RELATIVE,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_PathCommand_isRelative_feature"), getString("_UI_PropertyDescriptor_description", "_UI_PathCommand_isRelative_feature", "_UI_PathCommand_type"), DGPackage.Literals.PATH_COMMAND__IS_RELATIVE, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null));
 	}
 
 	/**
 	 * This returns the label text for the adapted class.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -112,16 +99,16 @@ public class PathCommandItemProvider extends ItemProviderAdapter implements
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void notifyChanged(Notification notification) {
 		updateChildren(notification);
-
-		switch (notification.getFeatureID(PathCommand.class)) {
-			case DGPackage.PATH_COMMAND__IS_RELATIVE:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
+		switch(notification.getFeatureID(PathCommand.class)) {
+		case DGPackage.PATH_COMMAND__IS_RELATIVE:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+			return;
 		}
 		super.notifyChanged(notification);
 	}
@@ -134,8 +121,7 @@ public class PathCommandItemProvider extends ItemProviderAdapter implements
 	 * @generated
 	 */
 	@Override
-	protected void collectNewChildDescriptors(
-			Collection<Object> newChildDescriptors, Object object) {
+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
 	}
 
@@ -149,5 +135,4 @@ public class PathCommandItemProvider extends ItemProviderAdapter implements
 	public ResourceLocator getResourceLocator() {
 		return DDEditPlugin.INSTANCE;
 	}
-
 }
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/PathItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/PathItemProvider.java
index 01d4e890a3b..6d10e28f45e 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/PathItemProvider.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/PathItemProvider.java
@@ -37,12 +37,11 @@ import org.eclipse.papyrus.dd.dg.Path;
  * This is the item provider adapter for a {@link org.eclipse.papyrus.dd.dg.Path} object.
  * <!-- begin-user-doc --> <!--
  * end-user-doc -->
+ * 
  * @generated
  */
-public class PathItemProvider extends MarkedElementItemProvider implements
-		IEditingDomainItemProvider, IStructuredItemContentProvider,
-		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
-		IItemColorProvider, IItemFontProvider {
+public class PathItemProvider extends MarkedElementItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider {
+
 	/**
 	 * This constructs an instance from a factory and a notifier. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
@@ -61,9 +60,8 @@ public class PathItemProvider extends MarkedElementItemProvider implements
 	 */
 	@Override
 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
+		if(itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
-
 		}
 		return itemPropertyDescriptors;
 	}
@@ -73,12 +71,12 @@ public class PathItemProvider extends MarkedElementItemProvider implements
 	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
 	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
-	public Collection<? extends EStructuralFeature> getChildrenFeatures(
-			Object object) {
-		if (childrenFeatures == null) {
+	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
+		if(childrenFeatures == null) {
 			super.getChildrenFeatures(object);
 			childrenFeatures.add(DGPackage.Literals.PATH__COMMAND);
 		}
@@ -87,19 +85,20 @@ public class PathItemProvider extends MarkedElementItemProvider implements
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	protected EStructuralFeature getChildFeature(Object object, Object child) {
 		// Check the type of the specified child object and return the proper feature to use for
 		// adding (see {@link AddCommand}) it as a child.
-
 		return super.getChildFeature(object, child);
 	}
 
 	/**
 	 * This returns Path.gif.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -111,14 +110,13 @@ public class PathItemProvider extends MarkedElementItemProvider implements
 	 * This returns the label text for the adapted class.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String getText(Object object) {
 		String label = ((Path)object).getId();
-		return label == null || label.length() == 0 ?
-			getString("_UI_Path_type") :
-			getString("_UI_Path_type") + " " + label;
+		return label == null || label.length() == 0 ? getString("_UI_Path_type") : getString("_UI_Path_type") + " " + label;
 	}
 
 	/**
@@ -126,16 +124,16 @@ public class PathItemProvider extends MarkedElementItemProvider implements
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void notifyChanged(Notification notification) {
 		updateChildren(notification);
-
-		switch (notification.getFeatureID(Path.class)) {
-			case DGPackage.PATH__COMMAND:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
+		switch(notification.getFeatureID(Path.class)) {
+		case DGPackage.PATH__COMMAND:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+			return;
 		}
 		super.notifyChanged(notification);
 	}
@@ -148,39 +146,13 @@ public class PathItemProvider extends MarkedElementItemProvider implements
 	 * @generated
 	 */
 	@Override
-	protected void collectNewChildDescriptors(
-			Collection<Object> newChildDescriptors, Object object) {
+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.PATH__COMMAND,
-				 DGFactory.eINSTANCE.createMoveTo()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.PATH__COMMAND,
-				 DGFactory.eINSTANCE.createClosePath()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.PATH__COMMAND,
-				 DGFactory.eINSTANCE.createCubicCurveTo()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.PATH__COMMAND,
-				 DGFactory.eINSTANCE.createEllipticalArcTo()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.PATH__COMMAND,
-				 DGFactory.eINSTANCE.createQuadraticCurveTo()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.PATH__COMMAND,
-				 DGFactory.eINSTANCE.createLineTo()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.PATH__COMMAND, DGFactory.eINSTANCE.createMoveTo()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.PATH__COMMAND, DGFactory.eINSTANCE.createClosePath()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.PATH__COMMAND, DGFactory.eINSTANCE.createCubicCurveTo()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.PATH__COMMAND, DGFactory.eINSTANCE.createEllipticalArcTo()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.PATH__COMMAND, DGFactory.eINSTANCE.createQuadraticCurveTo()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.PATH__COMMAND, DGFactory.eINSTANCE.createLineTo()));
 	}
-
 }
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/PatternItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/PatternItemProvider.java
index 0aa9e094c13..ab7979c73e1 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/PatternItemProvider.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/PatternItemProvider.java
@@ -39,12 +39,11 @@ import org.eclipse.papyrus.dd.dg.Pattern;
  * This is the item provider adapter for a {@link org.eclipse.papyrus.dd.dg.Pattern} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
+ * 
  * @generated
  */
-public class PatternItemProvider extends PaintServerItemProvider implements
-		IEditingDomainItemProvider, IStructuredItemContentProvider,
-		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
-		IItemColorProvider, IItemFontProvider {
+public class PatternItemProvider extends PaintServerItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider {
+
 	/**
 	 * This constructs an instance from a factory and a notifier. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
@@ -63,9 +62,8 @@ public class PatternItemProvider extends PaintServerItemProvider implements
 	 */
 	@Override
 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
+		if(itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
-
 		}
 		return itemPropertyDescriptors;
 	}
@@ -75,12 +73,12 @@ public class PatternItemProvider extends PaintServerItemProvider implements
 	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
 	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
-	public Collection<? extends EStructuralFeature> getChildrenFeatures(
-			Object object) {
-		if (childrenFeatures == null) {
+	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
+		if(childrenFeatures == null) {
 			super.getChildrenFeatures(object);
 			childrenFeatures.add(DGPackage.Literals.PATTERN__BOUNDS);
 			childrenFeatures.add(DGPackage.Literals.PATTERN__TILE);
@@ -90,19 +88,20 @@ public class PatternItemProvider extends PaintServerItemProvider implements
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	protected EStructuralFeature getChildFeature(Object object, Object child) {
 		// Check the type of the specified child object and return the proper feature to use for
 		// adding (see {@link AddCommand}) it as a child.
-
 		return super.getChildFeature(object, child);
 	}
 
 	/**
 	 * This returns Pattern.gif.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -114,14 +113,13 @@ public class PatternItemProvider extends PaintServerItemProvider implements
 	 * This returns the label text for the adapted class.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String getText(Object object) {
 		String label = ((Pattern)object).getId();
-		return label == null || label.length() == 0 ?
-			getString("_UI_Pattern_type") :
-			getString("_UI_Pattern_type") + " " + label;
+		return label == null || label.length() == 0 ? getString("_UI_Pattern_type") : getString("_UI_Pattern_type") + " " + label;
 	}
 
 	/**
@@ -129,17 +127,17 @@ public class PatternItemProvider extends PaintServerItemProvider implements
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void notifyChanged(Notification notification) {
 		updateChildren(notification);
-
-		switch (notification.getFeatureID(Pattern.class)) {
-			case DGPackage.PATTERN__BOUNDS:
-			case DGPackage.PATTERN__TILE:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
+		switch(notification.getFeatureID(Pattern.class)) {
+		case DGPackage.PATTERN__BOUNDS:
+		case DGPackage.PATTERN__TILE:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+			return;
 		}
 		super.notifyChanged(notification);
 	}
@@ -152,89 +150,23 @@ public class PatternItemProvider extends PaintServerItemProvider implements
 	 * @generated
 	 */
 	@Override
-	protected void collectNewChildDescriptors(
-			Collection<Object> newChildDescriptors, Object object) {
+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.PATTERN__BOUNDS,
-				 DCFactory.eINSTANCE.createBounds()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.PATTERN__TILE,
-				 DGFactory.eINSTANCE.createGroup()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.PATTERN__TILE,
-				 DGFactory.eINSTANCE.createCanvas()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.PATTERN__TILE,
-				 DGFactory.eINSTANCE.createClipPath()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.PATTERN__TILE,
-				 DGFactory.eINSTANCE.createCircle()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.PATTERN__TILE,
-				 DGFactory.eINSTANCE.createEllipse()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.PATTERN__TILE,
-				 DGFactory.eINSTANCE.createImage()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.PATTERN__TILE,
-				 DGFactory.eINSTANCE.createLine()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.PATTERN__TILE,
-				 DGFactory.eINSTANCE.createMarker()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.PATTERN__TILE,
-				 DGFactory.eINSTANCE.createPath()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.PATTERN__TILE,
-				 DGFactory.eINSTANCE.createPolygon()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.PATTERN__TILE,
-				 DGFactory.eINSTANCE.createPolyline()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.PATTERN__TILE,
-				 DGFactory.eINSTANCE.createRectangle()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.PATTERN__TILE,
-				 DGFactory.eINSTANCE.createRootCanvas()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.PATTERN__TILE,
-				 DGFactory.eINSTANCE.createText()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.PATTERN__TILE,
-				 DGFactory.eINSTANCE.createUse()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.PATTERN__BOUNDS, DCFactory.eINSTANCE.createBounds()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.PATTERN__TILE, DGFactory.eINSTANCE.createGroup()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.PATTERN__TILE, DGFactory.eINSTANCE.createCanvas()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.PATTERN__TILE, DGFactory.eINSTANCE.createClipPath()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.PATTERN__TILE, DGFactory.eINSTANCE.createCircle()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.PATTERN__TILE, DGFactory.eINSTANCE.createEllipse()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.PATTERN__TILE, DGFactory.eINSTANCE.createImage()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.PATTERN__TILE, DGFactory.eINSTANCE.createLine()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.PATTERN__TILE, DGFactory.eINSTANCE.createMarker()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.PATTERN__TILE, DGFactory.eINSTANCE.createPath()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.PATTERN__TILE, DGFactory.eINSTANCE.createPolygon()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.PATTERN__TILE, DGFactory.eINSTANCE.createPolyline()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.PATTERN__TILE, DGFactory.eINSTANCE.createRectangle()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.PATTERN__TILE, DGFactory.eINSTANCE.createRootCanvas()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.PATTERN__TILE, DGFactory.eINSTANCE.createText()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.PATTERN__TILE, DGFactory.eINSTANCE.createUse()));
 	}
-
 }
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/PolygonItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/PolygonItemProvider.java
index 1d9e77c4827..73cc2f25641 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/PolygonItemProvider.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/PolygonItemProvider.java
@@ -38,12 +38,11 @@ import org.eclipse.papyrus.dd.dg.Polygon;
  * This is the item provider adapter for a {@link org.eclipse.papyrus.dd.dg.Polygon} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
+ * 
  * @generated
  */
-public class PolygonItemProvider extends MarkedElementItemProvider implements
-		IEditingDomainItemProvider, IStructuredItemContentProvider,
-		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
-		IItemColorProvider, IItemFontProvider {
+public class PolygonItemProvider extends MarkedElementItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider {
+
 	/**
 	 * This constructs an instance from a factory and a notifier. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
@@ -62,9 +61,8 @@ public class PolygonItemProvider extends MarkedElementItemProvider implements
 	 */
 	@Override
 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
+		if(itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
-
 		}
 		return itemPropertyDescriptors;
 	}
@@ -74,12 +72,12 @@ public class PolygonItemProvider extends MarkedElementItemProvider implements
 	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
 	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
-	public Collection<? extends EStructuralFeature> getChildrenFeatures(
-			Object object) {
-		if (childrenFeatures == null) {
+	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
+		if(childrenFeatures == null) {
 			super.getChildrenFeatures(object);
 			childrenFeatures.add(DGPackage.Literals.POLYGON__POINT);
 		}
@@ -88,19 +86,20 @@ public class PolygonItemProvider extends MarkedElementItemProvider implements
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	protected EStructuralFeature getChildFeature(Object object, Object child) {
 		// Check the type of the specified child object and return the proper feature to use for
 		// adding (see {@link AddCommand}) it as a child.
-
 		return super.getChildFeature(object, child);
 	}
 
 	/**
 	 * This returns Polygon.gif.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -112,14 +111,13 @@ public class PolygonItemProvider extends MarkedElementItemProvider implements
 	 * This returns the label text for the adapted class.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String getText(Object object) {
 		String label = ((Polygon)object).getId();
-		return label == null || label.length() == 0 ?
-			getString("_UI_Polygon_type") :
-			getString("_UI_Polygon_type") + " " + label;
+		return label == null || label.length() == 0 ? getString("_UI_Polygon_type") : getString("_UI_Polygon_type") + " " + label;
 	}
 
 	/**
@@ -127,16 +125,16 @@ public class PolygonItemProvider extends MarkedElementItemProvider implements
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void notifyChanged(Notification notification) {
 		updateChildren(notification);
-
-		switch (notification.getFeatureID(Polygon.class)) {
-			case DGPackage.POLYGON__POINT:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
+		switch(notification.getFeatureID(Polygon.class)) {
+		case DGPackage.POLYGON__POINT:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+			return;
 		}
 		super.notifyChanged(notification);
 	}
@@ -149,14 +147,8 @@ public class PolygonItemProvider extends MarkedElementItemProvider implements
 	 * @generated
 	 */
 	@Override
-	protected void collectNewChildDescriptors(
-			Collection<Object> newChildDescriptors, Object object) {
+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.POLYGON__POINT,
-				 DCFactory.eINSTANCE.createPoint()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.POLYGON__POINT, DCFactory.eINSTANCE.createPoint()));
 	}
-
 }
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/PolylineItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/PolylineItemProvider.java
index f15043ab333..26f038b6c99 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/PolylineItemProvider.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/PolylineItemProvider.java
@@ -38,12 +38,11 @@ import org.eclipse.papyrus.dd.dg.Polyline;
  * This is the item provider adapter for a {@link org.eclipse.papyrus.dd.dg.Polyline} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
+ * 
  * @generated
  */
-public class PolylineItemProvider extends MarkedElementItemProvider implements
-		IEditingDomainItemProvider, IStructuredItemContentProvider,
-		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
-		IItemColorProvider, IItemFontProvider {
+public class PolylineItemProvider extends MarkedElementItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider {
+
 	/**
 	 * This constructs an instance from a factory and a notifier. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
@@ -62,9 +61,8 @@ public class PolylineItemProvider extends MarkedElementItemProvider implements
 	 */
 	@Override
 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
+		if(itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
-
 		}
 		return itemPropertyDescriptors;
 	}
@@ -74,12 +72,12 @@ public class PolylineItemProvider extends MarkedElementItemProvider implements
 	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
 	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
-	public Collection<? extends EStructuralFeature> getChildrenFeatures(
-			Object object) {
-		if (childrenFeatures == null) {
+	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
+		if(childrenFeatures == null) {
 			super.getChildrenFeatures(object);
 			childrenFeatures.add(DGPackage.Literals.POLYLINE__POINT);
 		}
@@ -88,19 +86,20 @@ public class PolylineItemProvider extends MarkedElementItemProvider implements
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	protected EStructuralFeature getChildFeature(Object object, Object child) {
 		// Check the type of the specified child object and return the proper feature to use for
 		// adding (see {@link AddCommand}) it as a child.
-
 		return super.getChildFeature(object, child);
 	}
 
 	/**
 	 * This returns Polyline.gif.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -112,14 +111,13 @@ public class PolylineItemProvider extends MarkedElementItemProvider implements
 	 * This returns the label text for the adapted class.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String getText(Object object) {
 		String label = ((Polyline)object).getId();
-		return label == null || label.length() == 0 ?
-			getString("_UI_Polyline_type") :
-			getString("_UI_Polyline_type") + " " + label;
+		return label == null || label.length() == 0 ? getString("_UI_Polyline_type") : getString("_UI_Polyline_type") + " " + label;
 	}
 
 	/**
@@ -127,16 +125,16 @@ public class PolylineItemProvider extends MarkedElementItemProvider implements
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void notifyChanged(Notification notification) {
 		updateChildren(notification);
-
-		switch (notification.getFeatureID(Polyline.class)) {
-			case DGPackage.POLYLINE__POINT:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
+		switch(notification.getFeatureID(Polyline.class)) {
+		case DGPackage.POLYLINE__POINT:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+			return;
 		}
 		super.notifyChanged(notification);
 	}
@@ -149,14 +147,8 @@ public class PolylineItemProvider extends MarkedElementItemProvider implements
 	 * @generated
 	 */
 	@Override
-	protected void collectNewChildDescriptors(
-			Collection<Object> newChildDescriptors, Object object) {
+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.POLYLINE__POINT,
-				 DCFactory.eINSTANCE.createPoint()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.POLYLINE__POINT, DCFactory.eINSTANCE.createPoint()));
 	}
-
 }
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/QuadraticCurveToItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/QuadraticCurveToItemProvider.java
index b53005cfcb6..f92f223bca0 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/QuadraticCurveToItemProvider.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/QuadraticCurveToItemProvider.java
@@ -35,16 +35,13 @@ import org.eclipse.papyrus.dd.dg.DGPackage;
 import org.eclipse.papyrus.dd.dg.QuadraticCurveTo;
 
 /**
- * This is the item provider adapter for a
- * {@link org.eclipse.papyrus.dd.dg.QuadraticCurveTo} object. <!--
+ * This is the item provider adapter for a {@link org.eclipse.papyrus.dd.dg.QuadraticCurveTo} object. <!--
  * begin-user-doc --> <!-- end-user-doc -->
  * 
  * @generated
  */
-public class QuadraticCurveToItemProvider extends PathCommandItemProvider
-		implements IEditingDomainItemProvider, IStructuredItemContentProvider,
-		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
-		IItemColorProvider, IItemFontProvider {
+public class QuadraticCurveToItemProvider extends PathCommandItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider {
+
 	/**
 	 * This constructs an instance from a factory and a notifier. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
@@ -63,9 +60,8 @@ public class QuadraticCurveToItemProvider extends PathCommandItemProvider
 	 */
 	@Override
 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
+		if(itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
-
 		}
 		return itemPropertyDescriptors;
 	}
@@ -75,12 +71,12 @@ public class QuadraticCurveToItemProvider extends PathCommandItemProvider
 	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
 	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
-	public Collection<? extends EStructuralFeature> getChildrenFeatures(
-			Object object) {
-		if (childrenFeatures == null) {
+	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
+		if(childrenFeatures == null) {
 			super.getChildrenFeatures(object);
 			childrenFeatures.add(DGPackage.Literals.QUADRATIC_CURVE_TO__CONTROL);
 			childrenFeatures.add(DGPackage.Literals.QUADRATIC_CURVE_TO__POINT);
@@ -90,13 +86,13 @@ public class QuadraticCurveToItemProvider extends PathCommandItemProvider
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	protected EStructuralFeature getChildFeature(Object object, Object child) {
 		// Check the type of the specified child object and return the proper feature to use for
 		// adding (see {@link AddCommand}) it as a child.
-
 		return super.getChildFeature(object, child);
 	}
 
@@ -104,6 +100,7 @@ public class QuadraticCurveToItemProvider extends PathCommandItemProvider
 	 * This returns QuadraticCurveTo.gif.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -115,6 +112,7 @@ public class QuadraticCurveToItemProvider extends PathCommandItemProvider
 	 * This returns the label text for the adapted class.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -128,17 +126,17 @@ public class QuadraticCurveToItemProvider extends PathCommandItemProvider
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void notifyChanged(Notification notification) {
 		updateChildren(notification);
-
-		switch (notification.getFeatureID(QuadraticCurveTo.class)) {
-			case DGPackage.QUADRATIC_CURVE_TO__CONTROL:
-			case DGPackage.QUADRATIC_CURVE_TO__POINT:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
+		switch(notification.getFeatureID(QuadraticCurveTo.class)) {
+		case DGPackage.QUADRATIC_CURVE_TO__CONTROL:
+		case DGPackage.QUADRATIC_CURVE_TO__POINT:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+			return;
 		}
 		super.notifyChanged(notification);
 	}
@@ -151,44 +149,26 @@ public class QuadraticCurveToItemProvider extends PathCommandItemProvider
 	 * @generated
 	 */
 	@Override
-	protected void collectNewChildDescriptors(
-			Collection<Object> newChildDescriptors, Object object) {
+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.QUADRATIC_CURVE_TO__CONTROL,
-				 DCFactory.eINSTANCE.createPoint()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.QUADRATIC_CURVE_TO__POINT,
-				 DCFactory.eINSTANCE.createPoint()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.QUADRATIC_CURVE_TO__CONTROL, DCFactory.eINSTANCE.createPoint()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.QUADRATIC_CURVE_TO__POINT, DCFactory.eINSTANCE.createPoint()));
 	}
 
 	/**
-	 * This returns the label text for
-	 * {@link org.eclipse.emf.edit.command.CreateChildCommand}. <!--
+	 * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @generated
 	 */
 	@Override
-	public String getCreateChildText(Object owner, Object feature,
-			Object child, Collection<?> selection) {
+	public String getCreateChildText(Object owner, Object feature, Object child, Collection<?> selection) {
 		Object childFeature = feature;
 		Object childObject = child;
-
-		boolean qualify =
-			childFeature == DGPackage.Literals.QUADRATIC_CURVE_TO__CONTROL ||
-			childFeature == DGPackage.Literals.QUADRATIC_CURVE_TO__POINT;
-
-		if (qualify) {
-			return getString
-				("_UI_CreateChild_text2",
-				 new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
+		boolean qualify = childFeature == DGPackage.Literals.QUADRATIC_CURVE_TO__CONTROL || childFeature == DGPackage.Literals.QUADRATIC_CURVE_TO__POINT;
+		if(qualify) {
+			return getString("_UI_CreateChild_text2", new Object[]{ getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
 		}
 		return super.getCreateChildText(owner, feature, child, selection);
 	}
-
 }
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/RadialGradientItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/RadialGradientItemProvider.java
index 8eccf4cdd20..d5ae1e8b72e 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/RadialGradientItemProvider.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/RadialGradientItemProvider.java
@@ -38,12 +38,11 @@ import org.eclipse.papyrus.dd.dg.RadialGradient;
  * This is the item provider adapter for a {@link org.eclipse.papyrus.dd.dg.RadialGradient} object.
  * <!-- begin-user-doc
  * --> <!-- end-user-doc -->
+ * 
  * @generated
  */
-public class RadialGradientItemProvider extends GradientItemProvider implements
-		IEditingDomainItemProvider, IStructuredItemContentProvider,
-		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
-		IItemColorProvider, IItemFontProvider {
+public class RadialGradientItemProvider extends GradientItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider {
+
 	/**
 	 * This constructs an instance from a factory and a notifier. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
@@ -62,9 +61,8 @@ public class RadialGradientItemProvider extends GradientItemProvider implements
 	 */
 	@Override
 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
+		if(itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
-
 			addRadiusPropertyDescriptor(object);
 		}
 		return itemPropertyDescriptors;
@@ -77,19 +75,7 @@ public class RadialGradientItemProvider extends GradientItemProvider implements
 	 * @generated
 	 */
 	protected void addRadiusPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_RadialGradient_radius_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_RadialGradient_radius_feature", "_UI_RadialGradient_type"),
-				 DGPackage.Literals.RADIAL_GRADIENT__RADIUS,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.REAL_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_RadialGradient_radius_feature"), getString("_UI_PropertyDescriptor_description", "_UI_RadialGradient_radius_feature", "_UI_RadialGradient_type"), DGPackage.Literals.RADIAL_GRADIENT__RADIUS, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
 	}
 
 	/**
@@ -97,12 +83,12 @@ public class RadialGradientItemProvider extends GradientItemProvider implements
 	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
 	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
-	public Collection<? extends EStructuralFeature> getChildrenFeatures(
-			Object object) {
-		if (childrenFeatures == null) {
+	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
+		if(childrenFeatures == null) {
 			super.getChildrenFeatures(object);
 			childrenFeatures.add(DGPackage.Literals.RADIAL_GRADIENT__CENTER);
 			childrenFeatures.add(DGPackage.Literals.RADIAL_GRADIENT__FOCUS);
@@ -112,13 +98,13 @@ public class RadialGradientItemProvider extends GradientItemProvider implements
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	protected EStructuralFeature getChildFeature(Object object, Object child) {
 		// Check the type of the specified child object and return the proper feature to use for
 		// adding (see {@link AddCommand}) it as a child.
-
 		return super.getChildFeature(object, child);
 	}
 
@@ -126,6 +112,7 @@ public class RadialGradientItemProvider extends GradientItemProvider implements
 	 * This returns RadialGradient.gif.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -137,14 +124,13 @@ public class RadialGradientItemProvider extends GradientItemProvider implements
 	 * This returns the label text for the adapted class.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String getText(Object object) {
 		String label = ((RadialGradient)object).getId();
-		return label == null || label.length() == 0 ?
-			getString("_UI_RadialGradient_type") :
-			getString("_UI_RadialGradient_type") + " " + label;
+		return label == null || label.length() == 0 ? getString("_UI_RadialGradient_type") : getString("_UI_RadialGradient_type") + " " + label;
 	}
 
 	/**
@@ -152,20 +138,20 @@ public class RadialGradientItemProvider extends GradientItemProvider implements
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void notifyChanged(Notification notification) {
 		updateChildren(notification);
-
-		switch (notification.getFeatureID(RadialGradient.class)) {
-			case DGPackage.RADIAL_GRADIENT__RADIUS:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
-			case DGPackage.RADIAL_GRADIENT__CENTER:
-			case DGPackage.RADIAL_GRADIENT__FOCUS:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
+		switch(notification.getFeatureID(RadialGradient.class)) {
+		case DGPackage.RADIAL_GRADIENT__RADIUS:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+			return;
+		case DGPackage.RADIAL_GRADIENT__CENTER:
+		case DGPackage.RADIAL_GRADIENT__FOCUS:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+			return;
 		}
 		super.notifyChanged(notification);
 	}
@@ -178,44 +164,26 @@ public class RadialGradientItemProvider extends GradientItemProvider implements
 	 * @generated
 	 */
 	@Override
-	protected void collectNewChildDescriptors(
-			Collection<Object> newChildDescriptors, Object object) {
+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.RADIAL_GRADIENT__CENTER,
-				 DCFactory.eINSTANCE.createPoint()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.RADIAL_GRADIENT__FOCUS,
-				 DCFactory.eINSTANCE.createPoint()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.RADIAL_GRADIENT__CENTER, DCFactory.eINSTANCE.createPoint()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.RADIAL_GRADIENT__FOCUS, DCFactory.eINSTANCE.createPoint()));
 	}
 
 	/**
-	 * This returns the label text for
-	 * {@link org.eclipse.emf.edit.command.CreateChildCommand}. <!--
+	 * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @generated
 	 */
 	@Override
-	public String getCreateChildText(Object owner, Object feature,
-			Object child, Collection<?> selection) {
+	public String getCreateChildText(Object owner, Object feature, Object child, Collection<?> selection) {
 		Object childFeature = feature;
 		Object childObject = child;
-
-		boolean qualify =
-			childFeature == DGPackage.Literals.RADIAL_GRADIENT__CENTER ||
-			childFeature == DGPackage.Literals.RADIAL_GRADIENT__FOCUS;
-
-		if (qualify) {
-			return getString
-				("_UI_CreateChild_text2",
-				 new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
+		boolean qualify = childFeature == DGPackage.Literals.RADIAL_GRADIENT__CENTER || childFeature == DGPackage.Literals.RADIAL_GRADIENT__FOCUS;
+		if(qualify) {
+			return getString("_UI_CreateChild_text2", new Object[]{ getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
 		}
 		return super.getCreateChildText(owner, feature, child, selection);
 	}
-
 }
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/RectangleItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/RectangleItemProvider.java
index 7cd140a0565..f1036679a09 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/RectangleItemProvider.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/RectangleItemProvider.java
@@ -40,12 +40,11 @@ import org.eclipse.papyrus.dd.dg.Rectangle;
  * This is the item provider adapter for a {@link org.eclipse.papyrus.dd.dg.Rectangle} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
+ * 
  * @generated
  */
-public class RectangleItemProvider extends GraphicalElementItemProvider
-		implements IEditingDomainItemProvider, IStructuredItemContentProvider,
-		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
-		IItemColorProvider, IItemFontProvider {
+public class RectangleItemProvider extends GraphicalElementItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider {
+
 	/**
 	 * This constructs an instance from a factory and a notifier. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
@@ -64,9 +63,8 @@ public class RectangleItemProvider extends GraphicalElementItemProvider
 	 */
 	@Override
 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
+		if(itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
-
 			addCornerRadiusPropertyDescriptor(object);
 		}
 		return itemPropertyDescriptors;
@@ -79,19 +77,7 @@ public class RectangleItemProvider extends GraphicalElementItemProvider
 	 * @generated
 	 */
 	protected void addCornerRadiusPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Rectangle_cornerRadius_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Rectangle_cornerRadius_feature", "_UI_Rectangle_type"),
-				 DGPackage.Literals.RECTANGLE__CORNER_RADIUS,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.REAL_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Rectangle_cornerRadius_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Rectangle_cornerRadius_feature", "_UI_Rectangle_type"), DGPackage.Literals.RECTANGLE__CORNER_RADIUS, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
 	}
 
 	/**
@@ -99,12 +85,12 @@ public class RectangleItemProvider extends GraphicalElementItemProvider
 	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
 	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
-	public Collection<? extends EStructuralFeature> getChildrenFeatures(
-			Object object) {
-		if (childrenFeatures == null) {
+	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
+		if(childrenFeatures == null) {
 			super.getChildrenFeatures(object);
 			childrenFeatures.add(DGPackage.Literals.RECTANGLE__BOUNDS);
 		}
@@ -113,19 +99,20 @@ public class RectangleItemProvider extends GraphicalElementItemProvider
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	protected EStructuralFeature getChildFeature(Object object, Object child) {
 		// Check the type of the specified child object and return the proper feature to use for
 		// adding (see {@link AddCommand}) it as a child.
-
 		return super.getChildFeature(object, child);
 	}
 
 	/**
 	 * This returns Rectangle.gif.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -137,14 +124,13 @@ public class RectangleItemProvider extends GraphicalElementItemProvider
 	 * This returns the label text for the adapted class.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String getText(Object object) {
 		String label = ((Rectangle)object).getId();
-		return label == null || label.length() == 0 ?
-			getString("_UI_Rectangle_type") :
-			getString("_UI_Rectangle_type") + " " + label;
+		return label == null || label.length() == 0 ? getString("_UI_Rectangle_type") : getString("_UI_Rectangle_type") + " " + label;
 	}
 
 	/**
@@ -152,19 +138,19 @@ public class RectangleItemProvider extends GraphicalElementItemProvider
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void notifyChanged(Notification notification) {
 		updateChildren(notification);
-
-		switch (notification.getFeatureID(Rectangle.class)) {
-			case DGPackage.RECTANGLE__CORNER_RADIUS:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
-			case DGPackage.RECTANGLE__BOUNDS:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
+		switch(notification.getFeatureID(Rectangle.class)) {
+		case DGPackage.RECTANGLE__CORNER_RADIUS:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+			return;
+		case DGPackage.RECTANGLE__BOUNDS:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+			return;
 		}
 		super.notifyChanged(notification);
 	}
@@ -177,14 +163,8 @@ public class RectangleItemProvider extends GraphicalElementItemProvider
 	 * @generated
 	 */
 	@Override
-	protected void collectNewChildDescriptors(
-			Collection<Object> newChildDescriptors, Object object) {
+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.RECTANGLE__BOUNDS,
-				 DCFactory.eINSTANCE.createBounds()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.RECTANGLE__BOUNDS, DCFactory.eINSTANCE.createBounds()));
 	}
-
 }
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/RootCanvasItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/RootCanvasItemProvider.java
index 6315811b4b7..0b190bec8c8 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/RootCanvasItemProvider.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/RootCanvasItemProvider.java
@@ -39,12 +39,11 @@ import org.eclipse.papyrus.dd.dg.RootCanvas;
  * This is the item provider adapter for a {@link org.eclipse.papyrus.dd.dg.RootCanvas} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
+ * 
  * @generated
  */
-public class RootCanvasItemProvider extends CanvasItemProvider implements
-		IEditingDomainItemProvider, IStructuredItemContentProvider,
-		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
-		IItemColorProvider, IItemFontProvider {
+public class RootCanvasItemProvider extends CanvasItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider {
+
 	/**
 	 * This constructs an instance from a factory and a notifier. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
@@ -63,9 +62,8 @@ public class RootCanvasItemProvider extends CanvasItemProvider implements
 	 */
 	@Override
 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
+		if(itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
-
 			addBackgroundColorPropertyDescriptor(object);
 			addExternalStyleSheetPropertyDescriptor(object);
 			addScriptPropertyDescriptor(object);
@@ -80,62 +78,28 @@ public class RootCanvasItemProvider extends CanvasItemProvider implements
 	 * @generated
 	 */
 	protected void addBackgroundColorPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_RootCanvas_backgroundColor_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_RootCanvas_backgroundColor_feature", "_UI_RootCanvas_type"),
-				 DGPackage.Literals.ROOT_CANVAS__BACKGROUND_COLOR,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_RootCanvas_backgroundColor_feature"), getString("_UI_PropertyDescriptor_description", "_UI_RootCanvas_backgroundColor_feature", "_UI_RootCanvas_type"), DGPackage.Literals.ROOT_CANVAS__BACKGROUND_COLOR, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
 	 * This adds a property descriptor for the External Style Sheet feature.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addExternalStyleSheetPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_RootCanvas_externalStyleSheet_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_RootCanvas_externalStyleSheet_feature", "_UI_RootCanvas_type"),
-				 DGPackage.Literals.ROOT_CANVAS__EXTERNAL_STYLE_SHEET,
-				 true,
-				 false,
-				 true,
-				 null,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_RootCanvas_externalStyleSheet_feature"), getString("_UI_PropertyDescriptor_description", "_UI_RootCanvas_externalStyleSheet_feature", "_UI_RootCanvas_type"), DGPackage.Literals.ROOT_CANVAS__EXTERNAL_STYLE_SHEET, true, false, true, null, null, null));
 	}
 
 	/**
 	 * This adds a property descriptor for the Script feature.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addScriptPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_RootCanvas_script_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_RootCanvas_script_feature", "_UI_RootCanvas_type"),
-				 DGPackage.Literals.ROOT_CANVAS__SCRIPT,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_RootCanvas_script_feature"), getString("_UI_PropertyDescriptor_description", "_UI_RootCanvas_script_feature", "_UI_RootCanvas_type"), DGPackage.Literals.ROOT_CANVAS__SCRIPT, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
@@ -143,12 +107,12 @@ public class RootCanvasItemProvider extends CanvasItemProvider implements
 	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
 	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
-	public Collection<? extends EStructuralFeature> getChildrenFeatures(
-			Object object) {
-		if (childrenFeatures == null) {
+	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
+		if(childrenFeatures == null) {
 			super.getChildrenFeatures(object);
 			childrenFeatures.add(DGPackage.Literals.ROOT_CANVAS__DEFINITIONS);
 		}
@@ -157,13 +121,13 @@ public class RootCanvasItemProvider extends CanvasItemProvider implements
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	protected EStructuralFeature getChildFeature(Object object, Object child) {
 		// Check the type of the specified child object and return the proper feature to use for
 		// adding (see {@link AddCommand}) it as a child.
-
 		return super.getChildFeature(object, child);
 	}
 
@@ -182,14 +146,13 @@ public class RootCanvasItemProvider extends CanvasItemProvider implements
 	 * This returns the label text for the adapted class.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String getText(Object object) {
 		String label = ((RootCanvas)object).getId();
-		return label == null || label.length() == 0 ?
-			getString("_UI_RootCanvas_type") :
-			getString("_UI_RootCanvas_type") + " " + label;
+		return label == null || label.length() == 0 ? getString("_UI_RootCanvas_type") : getString("_UI_RootCanvas_type") + " " + label;
 	}
 
 	/**
@@ -197,20 +160,20 @@ public class RootCanvasItemProvider extends CanvasItemProvider implements
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void notifyChanged(Notification notification) {
 		updateChildren(notification);
-
-		switch (notification.getFeatureID(RootCanvas.class)) {
-			case DGPackage.ROOT_CANVAS__BACKGROUND_COLOR:
-			case DGPackage.ROOT_CANVAS__SCRIPT:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
-			case DGPackage.ROOT_CANVAS__DEFINITIONS:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
+		switch(notification.getFeatureID(RootCanvas.class)) {
+		case DGPackage.ROOT_CANVAS__BACKGROUND_COLOR:
+		case DGPackage.ROOT_CANVAS__SCRIPT:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+			return;
+		case DGPackage.ROOT_CANVAS__DEFINITIONS:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+			return;
 		}
 		super.notifyChanged(notification);
 	}
@@ -223,14 +186,8 @@ public class RootCanvasItemProvider extends CanvasItemProvider implements
 	 * @generated
 	 */
 	@Override
-	protected void collectNewChildDescriptors(
-			Collection<Object> newChildDescriptors, Object object) {
+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.ROOT_CANVAS__DEFINITIONS,
-				 DGFactory.eINSTANCE.createDefinitions()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.ROOT_CANVAS__DEFINITIONS, DGFactory.eINSTANCE.createDefinitions()));
 	}
-
 }
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/RotateItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/RotateItemProvider.java
index db397dddaa4..e1471140534 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/RotateItemProvider.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/RotateItemProvider.java
@@ -40,12 +40,11 @@ import org.eclipse.papyrus.dd.dg.Rotate;
  * This is the item provider adapter for a {@link org.eclipse.papyrus.dd.dg.Rotate} object.
  * <!-- begin-user-doc --> <!--
  * end-user-doc -->
+ * 
  * @generated
  */
-public class RotateItemProvider extends TransformItemProvider implements
-		IEditingDomainItemProvider, IStructuredItemContentProvider,
-		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
-		IItemColorProvider, IItemFontProvider {
+public class RotateItemProvider extends TransformItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider {
+
 	/**
 	 * This constructs an instance from a factory and a notifier. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
@@ -64,9 +63,8 @@ public class RotateItemProvider extends TransformItemProvider implements
 	 */
 	@Override
 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
+		if(itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
-
 			addAnglePropertyDescriptor(object);
 		}
 		return itemPropertyDescriptors;
@@ -79,19 +77,7 @@ public class RotateItemProvider extends TransformItemProvider implements
 	 * @generated
 	 */
 	protected void addAnglePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Rotate_angle_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Rotate_angle_feature", "_UI_Rotate_type"),
-				 DGPackage.Literals.ROTATE__ANGLE,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.REAL_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Rotate_angle_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Rotate_angle_feature", "_UI_Rotate_type"), DGPackage.Literals.ROTATE__ANGLE, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
 	}
 
 	/**
@@ -99,12 +85,12 @@ public class RotateItemProvider extends TransformItemProvider implements
 	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
 	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
-	public Collection<? extends EStructuralFeature> getChildrenFeatures(
-			Object object) {
-		if (childrenFeatures == null) {
+	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
+		if(childrenFeatures == null) {
 			super.getChildrenFeatures(object);
 			childrenFeatures.add(DGPackage.Literals.ROTATE__CENTER);
 		}
@@ -113,19 +99,20 @@ public class RotateItemProvider extends TransformItemProvider implements
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	protected EStructuralFeature getChildFeature(Object object, Object child) {
 		// Check the type of the specified child object and return the proper feature to use for
 		// adding (see {@link AddCommand}) it as a child.
-
 		return super.getChildFeature(object, child);
 	}
 
 	/**
 	 * This returns Rotate.gif.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -137,6 +124,7 @@ public class RotateItemProvider extends TransformItemProvider implements
 	 * This returns the label text for the adapted class.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -150,19 +138,19 @@ public class RotateItemProvider extends TransformItemProvider implements
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void notifyChanged(Notification notification) {
 		updateChildren(notification);
-
-		switch (notification.getFeatureID(Rotate.class)) {
-			case DGPackage.ROTATE__ANGLE:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
-			case DGPackage.ROTATE__CENTER:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
+		switch(notification.getFeatureID(Rotate.class)) {
+		case DGPackage.ROTATE__ANGLE:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+			return;
+		case DGPackage.ROTATE__CENTER:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+			return;
 		}
 		super.notifyChanged(notification);
 	}
@@ -175,14 +163,8 @@ public class RotateItemProvider extends TransformItemProvider implements
 	 * @generated
 	 */
 	@Override
-	protected void collectNewChildDescriptors(
-			Collection<Object> newChildDescriptors, Object object) {
+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.ROTATE__CENTER,
-				 DCFactory.eINSTANCE.createPoint()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.ROTATE__CENTER, DCFactory.eINSTANCE.createPoint()));
 	}
-
 }
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/ScaleItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/ScaleItemProvider.java
index 1133c16998d..97f0ca0d4c2 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/ScaleItemProvider.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/ScaleItemProvider.java
@@ -36,12 +36,11 @@ import org.eclipse.papyrus.dd.dg.Scale;
  * This is the item provider adapter for a {@link org.eclipse.papyrus.dd.dg.Scale} object.
  * <!-- begin-user-doc --> <!--
  * end-user-doc -->
+ * 
  * @generated
  */
-public class ScaleItemProvider extends TransformItemProvider implements
-		IEditingDomainItemProvider, IStructuredItemContentProvider,
-		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
-		IItemColorProvider, IItemFontProvider {
+public class ScaleItemProvider extends TransformItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider {
+
 	/**
 	 * This constructs an instance from a factory and a notifier. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
@@ -60,9 +59,8 @@ public class ScaleItemProvider extends TransformItemProvider implements
 	 */
 	@Override
 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
+		if(itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
-
 			addFactorXPropertyDescriptor(object);
 			addFactorYPropertyDescriptor(object);
 		}
@@ -76,19 +74,7 @@ public class ScaleItemProvider extends TransformItemProvider implements
 	 * @generated
 	 */
 	protected void addFactorXPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Scale_factorX_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Scale_factorX_feature", "_UI_Scale_type"),
-				 DGPackage.Literals.SCALE__FACTOR_X,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.REAL_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Scale_factorX_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Scale_factorX_feature", "_UI_Scale_type"), DGPackage.Literals.SCALE__FACTOR_X, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
 	}
 
 	/**
@@ -98,24 +84,13 @@ public class ScaleItemProvider extends TransformItemProvider implements
 	 * @generated
 	 */
 	protected void addFactorYPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Scale_factorY_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Scale_factorY_feature", "_UI_Scale_type"),
-				 DGPackage.Literals.SCALE__FACTOR_Y,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.REAL_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Scale_factorY_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Scale_factorY_feature", "_UI_Scale_type"), DGPackage.Literals.SCALE__FACTOR_Y, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
 	}
 
 	/**
 	 * This returns Scale.gif.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -127,6 +102,7 @@ public class ScaleItemProvider extends TransformItemProvider implements
 	 * This returns the label text for the adapted class.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -140,17 +116,17 @@ public class ScaleItemProvider extends TransformItemProvider implements
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void notifyChanged(Notification notification) {
 		updateChildren(notification);
-
-		switch (notification.getFeatureID(Scale.class)) {
-			case DGPackage.SCALE__FACTOR_X:
-			case DGPackage.SCALE__FACTOR_Y:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
+		switch(notification.getFeatureID(Scale.class)) {
+		case DGPackage.SCALE__FACTOR_X:
+		case DGPackage.SCALE__FACTOR_Y:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+			return;
 		}
 		super.notifyChanged(notification);
 	}
@@ -163,9 +139,7 @@ public class ScaleItemProvider extends TransformItemProvider implements
 	 * @generated
 	 */
 	@Override
-	protected void collectNewChildDescriptors(
-			Collection<Object> newChildDescriptors, Object object) {
+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
 	}
-
 }
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/SkewItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/SkewItemProvider.java
index 968c5e90c38..acb70c15f8b 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/SkewItemProvider.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/SkewItemProvider.java
@@ -36,12 +36,11 @@ import org.eclipse.papyrus.dd.dg.Skew;
  * This is the item provider adapter for a {@link org.eclipse.papyrus.dd.dg.Skew} object.
  * <!-- begin-user-doc --> <!--
  * end-user-doc -->
+ * 
  * @generated
  */
-public class SkewItemProvider extends TransformItemProvider implements
-		IEditingDomainItemProvider, IStructuredItemContentProvider,
-		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
-		IItemColorProvider, IItemFontProvider {
+public class SkewItemProvider extends TransformItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider {
+
 	/**
 	 * This constructs an instance from a factory and a notifier. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
@@ -60,9 +59,8 @@ public class SkewItemProvider extends TransformItemProvider implements
 	 */
 	@Override
 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
+		if(itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
-
 			addAngleXPropertyDescriptor(object);
 			addAngleYPropertyDescriptor(object);
 		}
@@ -76,19 +74,7 @@ public class SkewItemProvider extends TransformItemProvider implements
 	 * @generated
 	 */
 	protected void addAngleXPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Skew_angleX_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Skew_angleX_feature", "_UI_Skew_type"),
-				 DGPackage.Literals.SKEW__ANGLE_X,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.REAL_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Skew_angleX_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Skew_angleX_feature", "_UI_Skew_type"), DGPackage.Literals.SKEW__ANGLE_X, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
 	}
 
 	/**
@@ -98,24 +84,13 @@ public class SkewItemProvider extends TransformItemProvider implements
 	 * @generated
 	 */
 	protected void addAngleYPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Skew_angleY_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Skew_angleY_feature", "_UI_Skew_type"),
-				 DGPackage.Literals.SKEW__ANGLE_Y,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.REAL_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Skew_angleY_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Skew_angleY_feature", "_UI_Skew_type"), DGPackage.Literals.SKEW__ANGLE_Y, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
 	}
 
 	/**
 	 * This returns Skew.gif.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -127,6 +102,7 @@ public class SkewItemProvider extends TransformItemProvider implements
 	 * This returns the label text for the adapted class.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -140,17 +116,17 @@ public class SkewItemProvider extends TransformItemProvider implements
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void notifyChanged(Notification notification) {
 		updateChildren(notification);
-
-		switch (notification.getFeatureID(Skew.class)) {
-			case DGPackage.SKEW__ANGLE_X:
-			case DGPackage.SKEW__ANGLE_Y:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
+		switch(notification.getFeatureID(Skew.class)) {
+		case DGPackage.SKEW__ANGLE_X:
+		case DGPackage.SKEW__ANGLE_Y:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+			return;
 		}
 		super.notifyChanged(notification);
 	}
@@ -163,9 +139,7 @@ public class SkewItemProvider extends TransformItemProvider implements
 	 * @generated
 	 */
 	@Override
-	protected void collectNewChildDescriptors(
-			Collection<Object> newChildDescriptors, Object object) {
+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
 	}
-
 }
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/StyleItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/StyleItemProvider.java
index 49212e8b3f6..39c38d70260 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/StyleItemProvider.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/StyleItemProvider.java
@@ -44,12 +44,11 @@ import org.eclipse.papyrus.dd.edit.DDEditPlugin;
  * This is the item provider adapter for a {@link org.eclipse.papyrus.dd.dg.Style} object.
  * <!-- begin-user-doc --> <!--
  * end-user-doc -->
+ * 
  * @generated
  */
-public class StyleItemProvider extends ItemProviderAdapter implements
-		IEditingDomainItemProvider, IStructuredItemContentProvider,
-		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
-		IItemColorProvider, IItemFontProvider {
+public class StyleItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider {
+
 	/**
 	 * This constructs an instance from a factory and a notifier. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
@@ -68,9 +67,8 @@ public class StyleItemProvider extends ItemProviderAdapter implements
 	 */
 	@Override
 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
+		if(itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
-
 			addFillPropertyDescriptor(object);
 			addFillOpacityPropertyDescriptor(object);
 			addStrokePropertyDescriptor(object);
@@ -90,22 +88,11 @@ public class StyleItemProvider extends ItemProviderAdapter implements
 	 * This adds a property descriptor for the Fill feature.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addFillPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Style_fill_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Style_fill_feature", "_UI_Style_type"),
-				 DGPackage.Literals.STYLE__FILL,
-				 true,
-				 false,
-				 false,
-				 null,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Style_fill_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Style_fill_feature", "_UI_Style_type"), DGPackage.Literals.STYLE__FILL, true, false, false, null, null, null));
 	}
 
 	/**
@@ -115,19 +102,7 @@ public class StyleItemProvider extends ItemProviderAdapter implements
 	 * @generated
 	 */
 	protected void addFillOpacityPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Style_fillOpacity_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Style_fillOpacity_feature", "_UI_Style_type"),
-				 DGPackage.Literals.STYLE__FILL_OPACITY,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.REAL_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Style_fillOpacity_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Style_fillOpacity_feature", "_UI_Style_type"), DGPackage.Literals.STYLE__FILL_OPACITY, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
 	}
 
 	/**
@@ -137,19 +112,7 @@ public class StyleItemProvider extends ItemProviderAdapter implements
 	 * @generated
 	 */
 	protected void addStrokePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Style_stroke_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Style_stroke_feature", "_UI_Style_type"),
-				 DGPackage.Literals.STYLE__STROKE,
-				 true,
-				 false,
-				 false,
-				 null,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Style_stroke_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Style_stroke_feature", "_UI_Style_type"), DGPackage.Literals.STYLE__STROKE, true, false, false, null, null, null));
 	}
 
 	/**
@@ -159,19 +122,7 @@ public class StyleItemProvider extends ItemProviderAdapter implements
 	 * @generated
 	 */
 	protected void addStrokeWidthPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Style_strokeWidth_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Style_strokeWidth_feature", "_UI_Style_type"),
-				 DGPackage.Literals.STYLE__STROKE_WIDTH,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.REAL_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Style_strokeWidth_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Style_strokeWidth_feature", "_UI_Style_type"), DGPackage.Literals.STYLE__STROKE_WIDTH, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
 	}
 
 	/**
@@ -181,19 +132,7 @@ public class StyleItemProvider extends ItemProviderAdapter implements
 	 * @generated
 	 */
 	protected void addStrokeOpacityPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Style_strokeOpacity_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Style_strokeOpacity_feature", "_UI_Style_type"),
-				 DGPackage.Literals.STYLE__STROKE_OPACITY,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.REAL_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Style_strokeOpacity_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Style_strokeOpacity_feature", "_UI_Style_type"), DGPackage.Literals.STYLE__STROKE_OPACITY, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
 	}
 
 	/**
@@ -203,19 +142,7 @@ public class StyleItemProvider extends ItemProviderAdapter implements
 	 * @generated
 	 */
 	protected void addStrokeDashLengthPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Style_strokeDashLength_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Style_strokeDashLength_feature", "_UI_Style_type"),
-				 DGPackage.Literals.STYLE__STROKE_DASH_LENGTH,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.REAL_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Style_strokeDashLength_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Style_strokeDashLength_feature", "_UI_Style_type"), DGPackage.Literals.STYLE__STROKE_DASH_LENGTH, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
 	}
 
 	/**
@@ -225,19 +152,7 @@ public class StyleItemProvider extends ItemProviderAdapter implements
 	 * @generated
 	 */
 	protected void addFontSizePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Style_fontSize_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Style_fontSize_feature", "_UI_Style_type"),
-				 DGPackage.Literals.STYLE__FONT_SIZE,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.REAL_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Style_fontSize_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Style_fontSize_feature", "_UI_Style_type"), DGPackage.Literals.STYLE__FONT_SIZE, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
 	}
 
 	/**
@@ -247,19 +162,7 @@ public class StyleItemProvider extends ItemProviderAdapter implements
 	 * @generated
 	 */
 	protected void addFontNamePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Style_fontName_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Style_fontName_feature", "_UI_Style_type"),
-				 DGPackage.Literals.STYLE__FONT_NAME,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Style_fontName_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Style_fontName_feature", "_UI_Style_type"), DGPackage.Literals.STYLE__FONT_NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
@@ -269,19 +172,7 @@ public class StyleItemProvider extends ItemProviderAdapter implements
 	 * @generated
 	 */
 	protected void addFontItalicPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Style_fontItalic_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Style_fontItalic_feature", "_UI_Style_type"),
-				 DGPackage.Literals.STYLE__FONT_ITALIC,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Style_fontItalic_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Style_fontItalic_feature", "_UI_Style_type"), DGPackage.Literals.STYLE__FONT_ITALIC, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null));
 	}
 
 	/**
@@ -291,19 +182,7 @@ public class StyleItemProvider extends ItemProviderAdapter implements
 	 * @generated
 	 */
 	protected void addFontBoldPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Style_fontBold_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Style_fontBold_feature", "_UI_Style_type"),
-				 DGPackage.Literals.STYLE__FONT_BOLD,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Style_fontBold_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Style_fontBold_feature", "_UI_Style_type"), DGPackage.Literals.STYLE__FONT_BOLD, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null));
 	}
 
 	/**
@@ -313,19 +192,7 @@ public class StyleItemProvider extends ItemProviderAdapter implements
 	 * @generated
 	 */
 	protected void addFontDecorationPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Style_fontDecoration_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Style_fontDecoration_feature", "_UI_Style_type"),
-				 DGPackage.Literals.STYLE__FONT_DECORATION,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Style_fontDecoration_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Style_fontDecoration_feature", "_UI_Style_type"), DGPackage.Literals.STYLE__FONT_DECORATION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
@@ -333,12 +200,12 @@ public class StyleItemProvider extends ItemProviderAdapter implements
 	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
 	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
-	public Collection<? extends EStructuralFeature> getChildrenFeatures(
-			Object object) {
-		if (childrenFeatures == null) {
+	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
+		if(childrenFeatures == null) {
 			super.getChildrenFeatures(object);
 			childrenFeatures.add(DGPackage.Literals.STYLE__FILL);
 			childrenFeatures.add(DGPackage.Literals.STYLE__STROKE);
@@ -348,19 +215,20 @@ public class StyleItemProvider extends ItemProviderAdapter implements
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	protected EStructuralFeature getChildFeature(Object object, Object child) {
 		// Check the type of the specified child object and return the proper feature to use for
 		// adding (see {@link AddCommand}) it as a child.
-
 		return super.getChildFeature(object, child);
 	}
 
 	/**
 	 * This returns Style.gif.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -372,14 +240,13 @@ public class StyleItemProvider extends ItemProviderAdapter implements
 	 * This returns the label text for the adapted class.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String getText(Object object) {
 		String label = ((Style)object).getFontName();
-		return label == null || label.length() == 0 ?
-			getString("_UI_Style_type") :
-			getString("_UI_Style_type") + " " + label;
+		return label == null || label.length() == 0 ? getString("_UI_Style_type") : getString("_UI_Style_type") + " " + label;
 	}
 
 	/**
@@ -387,28 +254,28 @@ public class StyleItemProvider extends ItemProviderAdapter implements
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void notifyChanged(Notification notification) {
 		updateChildren(notification);
-
-		switch (notification.getFeatureID(Style.class)) {
-			case DGPackage.STYLE__FILL_OPACITY:
-			case DGPackage.STYLE__STROKE_WIDTH:
-			case DGPackage.STYLE__STROKE_OPACITY:
-			case DGPackage.STYLE__STROKE_DASH_LENGTH:
-			case DGPackage.STYLE__FONT_SIZE:
-			case DGPackage.STYLE__FONT_NAME:
-			case DGPackage.STYLE__FONT_ITALIC:
-			case DGPackage.STYLE__FONT_BOLD:
-			case DGPackage.STYLE__FONT_DECORATION:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
-			case DGPackage.STYLE__FILL:
-			case DGPackage.STYLE__STROKE:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
+		switch(notification.getFeatureID(Style.class)) {
+		case DGPackage.STYLE__FILL_OPACITY:
+		case DGPackage.STYLE__STROKE_WIDTH:
+		case DGPackage.STYLE__STROKE_OPACITY:
+		case DGPackage.STYLE__STROKE_DASH_LENGTH:
+		case DGPackage.STYLE__FONT_SIZE:
+		case DGPackage.STYLE__FONT_NAME:
+		case DGPackage.STYLE__FONT_ITALIC:
+		case DGPackage.STYLE__FONT_BOLD:
+		case DGPackage.STYLE__FONT_DECORATION:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+			return;
+		case DGPackage.STYLE__FILL:
+		case DGPackage.STYLE__STROKE:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+			return;
 		}
 		super.notifyChanged(notification);
 	}
@@ -421,42 +288,25 @@ public class StyleItemProvider extends ItemProviderAdapter implements
 	 * @generated
 	 */
 	@Override
-	protected void collectNewChildDescriptors(
-			Collection<Object> newChildDescriptors, Object object) {
+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.STYLE__FILL,
-				 DGFactory.eINSTANCE.createPaint()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.STYLE__STROKE,
-				 DGFactory.eINSTANCE.createPaint()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.STYLE__FILL, DGFactory.eINSTANCE.createPaint()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.STYLE__STROKE, DGFactory.eINSTANCE.createPaint()));
 	}
 
 	/**
-	 * This returns the label text for
-	 * {@link org.eclipse.emf.edit.command.CreateChildCommand}. <!--
+	 * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @generated
 	 */
 	@Override
-	public String getCreateChildText(Object owner, Object feature,
-			Object child, Collection<?> selection) {
+	public String getCreateChildText(Object owner, Object feature, Object child, Collection<?> selection) {
 		Object childFeature = feature;
 		Object childObject = child;
-
-		boolean qualify =
-			childFeature == DGPackage.Literals.STYLE__FILL ||
-			childFeature == DGPackage.Literals.STYLE__STROKE;
-
-		if (qualify) {
-			return getString
-				("_UI_CreateChild_text2",
-				 new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
+		boolean qualify = childFeature == DGPackage.Literals.STYLE__FILL || childFeature == DGPackage.Literals.STYLE__STROKE;
+		if(qualify) {
+			return getString("_UI_CreateChild_text2", new Object[]{ getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
 		}
 		return super.getCreateChildText(owner, feature, child, selection);
 	}
@@ -471,5 +321,4 @@ public class StyleItemProvider extends ItemProviderAdapter implements
 	public ResourceLocator getResourceLocator() {
 		return DDEditPlugin.INSTANCE;
 	}
-
 }
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/StyleRuleItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/StyleRuleItemProvider.java
index 5cd45d15037..3f78bb203cb 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/StyleRuleItemProvider.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/StyleRuleItemProvider.java
@@ -42,12 +42,11 @@ import org.eclipse.papyrus.dd.edit.DDEditPlugin;
  * This is the item provider adapter for a {@link org.eclipse.papyrus.dd.dg.StyleRule} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
+ * 
  * @generated
  */
-public class StyleRuleItemProvider extends ItemProviderAdapter implements
-		IEditingDomainItemProvider, IStructuredItemContentProvider,
-		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
-		IItemColorProvider, IItemFontProvider {
+public class StyleRuleItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider {
+
 	/**
 	 * This constructs an instance from a factory and a notifier. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
@@ -66,9 +65,8 @@ public class StyleRuleItemProvider extends ItemProviderAdapter implements
 	 */
 	@Override
 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
+		if(itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
-
 		}
 		return itemPropertyDescriptors;
 	}
@@ -78,12 +76,12 @@ public class StyleRuleItemProvider extends ItemProviderAdapter implements
 	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
 	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
-	public Collection<? extends EStructuralFeature> getChildrenFeatures(
-			Object object) {
-		if (childrenFeatures == null) {
+	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
+		if(childrenFeatures == null) {
 			super.getChildrenFeatures(object);
 			childrenFeatures.add(DGPackage.Literals.STYLE_RULE__SELECTOR);
 			childrenFeatures.add(DGPackage.Literals.STYLE_RULE__STYLE);
@@ -93,19 +91,20 @@ public class StyleRuleItemProvider extends ItemProviderAdapter implements
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	protected EStructuralFeature getChildFeature(Object object, Object child) {
 		// Check the type of the specified child object and return the proper feature to use for
 		// adding (see {@link AddCommand}) it as a child.
-
 		return super.getChildFeature(object, child);
 	}
 
 	/**
 	 * This returns StyleRule.gif.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -117,6 +116,7 @@ public class StyleRuleItemProvider extends ItemProviderAdapter implements
 	 * This returns the label text for the adapted class.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -129,17 +129,17 @@ public class StyleRuleItemProvider extends ItemProviderAdapter implements
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void notifyChanged(Notification notification) {
 		updateChildren(notification);
-
-		switch (notification.getFeatureID(StyleRule.class)) {
-			case DGPackage.STYLE_RULE__SELECTOR:
-			case DGPackage.STYLE_RULE__STYLE:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
+		switch(notification.getFeatureID(StyleRule.class)) {
+		case DGPackage.STYLE_RULE__SELECTOR:
+		case DGPackage.STYLE_RULE__STYLE:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+			return;
 		}
 		super.notifyChanged(notification);
 	}
@@ -152,19 +152,10 @@ public class StyleRuleItemProvider extends ItemProviderAdapter implements
 	 * @generated
 	 */
 	@Override
-	protected void collectNewChildDescriptors(
-			Collection<Object> newChildDescriptors, Object object) {
+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.STYLE_RULE__SELECTOR,
-				 DGFactory.eINSTANCE.createStyleSelector()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.STYLE_RULE__STYLE,
-				 DGFactory.eINSTANCE.createStyle()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.STYLE_RULE__SELECTOR, DGFactory.eINSTANCE.createStyleSelector()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.STYLE_RULE__STYLE, DGFactory.eINSTANCE.createStyle()));
 	}
 
 	/**
@@ -177,5 +168,4 @@ public class StyleRuleItemProvider extends ItemProviderAdapter implements
 	public ResourceLocator getResourceLocator() {
 		return DDEditPlugin.INSTANCE;
 	}
-
 }
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/StyleSelectorItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/StyleSelectorItemProvider.java
index d0adecda5f2..a18897a1a50 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/StyleSelectorItemProvider.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/StyleSelectorItemProvider.java
@@ -42,12 +42,11 @@ import org.eclipse.papyrus.dd.edit.DDEditPlugin;
  * This is the item provider adapter for a {@link org.eclipse.papyrus.dd.dg.StyleSelector} object.
  * <!-- begin-user-doc
  * --> <!-- end-user-doc -->
+ * 
  * @generated
  */
-public class StyleSelectorItemProvider extends ItemProviderAdapter implements
-		IEditingDomainItemProvider, IStructuredItemContentProvider,
-		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
-		IItemColorProvider, IItemFontProvider {
+public class StyleSelectorItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider {
+
 	/**
 	 * This constructs an instance from a factory and a notifier. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
@@ -66,9 +65,8 @@ public class StyleSelectorItemProvider extends ItemProviderAdapter implements
 	 */
 	@Override
 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
+		if(itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
-
 			addKindPropertyDescriptor(object);
 			addClassPropertyDescriptor(object);
 		}
@@ -79,22 +77,11 @@ public class StyleSelectorItemProvider extends ItemProviderAdapter implements
 	 * This adds a property descriptor for the Kind feature.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addKindPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_StyleSelector_kind_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_StyleSelector_kind_feature", "_UI_StyleSelector_type"),
-				 DGPackage.Literals.STYLE_SELECTOR__KIND,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_StyleSelector_kind_feature"), getString("_UI_PropertyDescriptor_description", "_UI_StyleSelector_kind_feature", "_UI_StyleSelector_type"), DGPackage.Literals.STYLE_SELECTOR__KIND, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
@@ -104,19 +91,7 @@ public class StyleSelectorItemProvider extends ItemProviderAdapter implements
 	 * @generated
 	 */
 	protected void addClassPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_StyleSelector_class_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_StyleSelector_class_feature", "_UI_StyleSelector_type"),
-				 DGPackage.Literals.STYLE_SELECTOR__CLASS,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_StyleSelector_class_feature"), getString("_UI_PropertyDescriptor_description", "_UI_StyleSelector_class_feature", "_UI_StyleSelector_type"), DGPackage.Literals.STYLE_SELECTOR__CLASS, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
@@ -134,15 +109,14 @@ public class StyleSelectorItemProvider extends ItemProviderAdapter implements
 	 * This returns the label text for the adapted class.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String getText(Object object) {
 		ElementKind labelValue = ((StyleSelector)object).getKind();
 		String label = labelValue == null ? null : labelValue.toString();
-		return label == null || label.length() == 0 ?
-			getString("_UI_StyleSelector_type") :
-			getString("_UI_StyleSelector_type") + " " + label;
+		return label == null || label.length() == 0 ? getString("_UI_StyleSelector_type") : getString("_UI_StyleSelector_type") + " " + label;
 	}
 
 	/**
@@ -150,17 +124,17 @@ public class StyleSelectorItemProvider extends ItemProviderAdapter implements
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void notifyChanged(Notification notification) {
 		updateChildren(notification);
-
-		switch (notification.getFeatureID(StyleSelector.class)) {
-			case DGPackage.STYLE_SELECTOR__KIND:
-			case DGPackage.STYLE_SELECTOR__CLASS:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
+		switch(notification.getFeatureID(StyleSelector.class)) {
+		case DGPackage.STYLE_SELECTOR__KIND:
+		case DGPackage.STYLE_SELECTOR__CLASS:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+			return;
 		}
 		super.notifyChanged(notification);
 	}
@@ -173,8 +147,7 @@ public class StyleSelectorItemProvider extends ItemProviderAdapter implements
 	 * @generated
 	 */
 	@Override
-	protected void collectNewChildDescriptors(
-			Collection<Object> newChildDescriptors, Object object) {
+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
 	}
 
@@ -188,5 +161,4 @@ public class StyleSelectorItemProvider extends ItemProviderAdapter implements
 	public ResourceLocator getResourceLocator() {
 		return DDEditPlugin.INSTANCE;
 	}
-
 }
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/StyleSheetItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/StyleSheetItemProvider.java
index de184c6b5eb..302389530b8 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/StyleSheetItemProvider.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/StyleSheetItemProvider.java
@@ -42,12 +42,11 @@ import org.eclipse.papyrus.dd.edit.DDEditPlugin;
  * This is the item provider adapter for a {@link org.eclipse.papyrus.dd.dg.StyleSheet} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
+ * 
  * @generated
  */
-public class StyleSheetItemProvider extends ItemProviderAdapter implements
-		IEditingDomainItemProvider, IStructuredItemContentProvider,
-		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
-		IItemColorProvider, IItemFontProvider {
+public class StyleSheetItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider {
+
 	/**
 	 * This constructs an instance from a factory and a notifier. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
@@ -66,9 +65,8 @@ public class StyleSheetItemProvider extends ItemProviderAdapter implements
 	 */
 	@Override
 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
+		if(itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
-
 		}
 		return itemPropertyDescriptors;
 	}
@@ -78,12 +76,12 @@ public class StyleSheetItemProvider extends ItemProviderAdapter implements
 	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
 	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
-	public Collection<? extends EStructuralFeature> getChildrenFeatures(
-			Object object) {
-		if (childrenFeatures == null) {
+	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
+		if(childrenFeatures == null) {
 			super.getChildrenFeatures(object);
 			childrenFeatures.add(DGPackage.Literals.STYLE_SHEET__RULE);
 		}
@@ -92,13 +90,13 @@ public class StyleSheetItemProvider extends ItemProviderAdapter implements
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	protected EStructuralFeature getChildFeature(Object object, Object child) {
 		// Check the type of the specified child object and return the proper feature to use for
 		// adding (see {@link AddCommand}) it as a child.
-
 		return super.getChildFeature(object, child);
 	}
 
@@ -117,6 +115,7 @@ public class StyleSheetItemProvider extends ItemProviderAdapter implements
 	 * This returns the label text for the adapted class.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -129,16 +128,16 @@ public class StyleSheetItemProvider extends ItemProviderAdapter implements
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void notifyChanged(Notification notification) {
 		updateChildren(notification);
-
-		switch (notification.getFeatureID(StyleSheet.class)) {
-			case DGPackage.STYLE_SHEET__RULE:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
+		switch(notification.getFeatureID(StyleSheet.class)) {
+		case DGPackage.STYLE_SHEET__RULE:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+			return;
 		}
 		super.notifyChanged(notification);
 	}
@@ -151,14 +150,9 @@ public class StyleSheetItemProvider extends ItemProviderAdapter implements
 	 * @generated
 	 */
 	@Override
-	protected void collectNewChildDescriptors(
-			Collection<Object> newChildDescriptors, Object object) {
+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.STYLE_SHEET__RULE,
-				 DGFactory.eINSTANCE.createStyleRule()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.STYLE_SHEET__RULE, DGFactory.eINSTANCE.createStyleRule()));
 	}
 
 	/**
@@ -171,5 +165,4 @@ public class StyleSheetItemProvider extends ItemProviderAdapter implements
 	public ResourceLocator getResourceLocator() {
 		return DDEditPlugin.INSTANCE;
 	}
-
 }
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/TextItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/TextItemProvider.java
index 54beedce73a..e859a77f983 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/TextItemProvider.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/TextItemProvider.java
@@ -40,12 +40,11 @@ import org.eclipse.papyrus.dd.dg.Text;
  * This is the item provider adapter for a {@link org.eclipse.papyrus.dd.dg.Text} object.
  * <!-- begin-user-doc --> <!--
  * end-user-doc -->
+ * 
  * @generated
  */
-public class TextItemProvider extends GraphicalElementItemProvider implements
-		IEditingDomainItemProvider, IStructuredItemContentProvider,
-		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
-		IItemColorProvider, IItemFontProvider {
+public class TextItemProvider extends GraphicalElementItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider {
+
 	/**
 	 * This constructs an instance from a factory and a notifier. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
@@ -64,9 +63,8 @@ public class TextItemProvider extends GraphicalElementItemProvider implements
 	 */
 	@Override
 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
+		if(itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
-
 			addDataPropertyDescriptor(object);
 			addAnchorPropertyDescriptor(object);
 		}
@@ -77,44 +75,22 @@ public class TextItemProvider extends GraphicalElementItemProvider implements
 	 * This adds a property descriptor for the Data feature.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addDataPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Text_data_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Text_data_feature", "_UI_Text_type"),
-				 DGPackage.Literals.TEXT__DATA,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Text_data_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Text_data_feature", "_UI_Text_type"), DGPackage.Literals.TEXT__DATA, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
 	 * This adds a property descriptor for the Anchor feature.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addAnchorPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Text_anchor_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Text_anchor_feature", "_UI_Text_type"),
-				 DGPackage.Literals.TEXT__ANCHOR,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Text_anchor_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Text_anchor_feature", "_UI_Text_type"), DGPackage.Literals.TEXT__ANCHOR, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
@@ -122,12 +98,12 @@ public class TextItemProvider extends GraphicalElementItemProvider implements
 	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
 	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
-	public Collection<? extends EStructuralFeature> getChildrenFeatures(
-			Object object) {
-		if (childrenFeatures == null) {
+	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
+		if(childrenFeatures == null) {
 			super.getChildrenFeatures(object);
 			childrenFeatures.add(DGPackage.Literals.TEXT__POSITION);
 		}
@@ -136,19 +112,20 @@ public class TextItemProvider extends GraphicalElementItemProvider implements
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	protected EStructuralFeature getChildFeature(Object object, Object child) {
 		// Check the type of the specified child object and return the proper feature to use for
 		// adding (see {@link AddCommand}) it as a child.
-
 		return super.getChildFeature(object, child);
 	}
 
 	/**
 	 * This returns Text.gif.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -160,14 +137,13 @@ public class TextItemProvider extends GraphicalElementItemProvider implements
 	 * This returns the label text for the adapted class.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String getText(Object object) {
 		String label = ((Text)object).getId();
-		return label == null || label.length() == 0 ?
-			getString("_UI_Text_type") :
-			getString("_UI_Text_type") + " " + label;
+		return label == null || label.length() == 0 ? getString("_UI_Text_type") : getString("_UI_Text_type") + " " + label;
 	}
 
 	/**
@@ -175,20 +151,20 @@ public class TextItemProvider extends GraphicalElementItemProvider implements
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void notifyChanged(Notification notification) {
 		updateChildren(notification);
-
-		switch (notification.getFeatureID(Text.class)) {
-			case DGPackage.TEXT__DATA:
-			case DGPackage.TEXT__ANCHOR:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
-			case DGPackage.TEXT__POSITION:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
+		switch(notification.getFeatureID(Text.class)) {
+		case DGPackage.TEXT__DATA:
+		case DGPackage.TEXT__ANCHOR:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+			return;
+		case DGPackage.TEXT__POSITION:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+			return;
 		}
 		super.notifyChanged(notification);
 	}
@@ -201,14 +177,8 @@ public class TextItemProvider extends GraphicalElementItemProvider implements
 	 * @generated
 	 */
 	@Override
-	protected void collectNewChildDescriptors(
-			Collection<Object> newChildDescriptors, Object object) {
+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.TEXT__POSITION,
-				 DCFactory.eINSTANCE.createPoint()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.TEXT__POSITION, DCFactory.eINSTANCE.createPoint()));
 	}
-
 }
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/TransformItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/TransformItemProvider.java
index 7fba8fcad7f..dcd5f492007 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/TransformItemProvider.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/TransformItemProvider.java
@@ -35,12 +35,11 @@ import org.eclipse.papyrus.dd.edit.DDEditPlugin;
  * This is the item provider adapter for a {@link org.eclipse.papyrus.dd.dg.Transform} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
+ * 
  * @generated
  */
-public class TransformItemProvider extends ItemProviderAdapter implements
-		IEditingDomainItemProvider, IStructuredItemContentProvider,
-		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
-		IItemColorProvider, IItemFontProvider {
+public class TransformItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider {
+
 	/**
 	 * This constructs an instance from a factory and a notifier. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
@@ -59,9 +58,8 @@ public class TransformItemProvider extends ItemProviderAdapter implements
 	 */
 	@Override
 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
+		if(itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
-
 		}
 		return itemPropertyDescriptors;
 	}
@@ -70,6 +68,7 @@ public class TransformItemProvider extends ItemProviderAdapter implements
 	 * This returns the label text for the adapted class.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -82,6 +81,7 @@ public class TransformItemProvider extends ItemProviderAdapter implements
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -98,8 +98,7 @@ public class TransformItemProvider extends ItemProviderAdapter implements
 	 * @generated
 	 */
 	@Override
-	protected void collectNewChildDescriptors(
-			Collection<Object> newChildDescriptors, Object object) {
+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
 	}
 
@@ -113,5 +112,4 @@ public class TransformItemProvider extends ItemProviderAdapter implements
 	public ResourceLocator getResourceLocator() {
 		return DDEditPlugin.INSTANCE;
 	}
-
 }
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/TranslateItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/TranslateItemProvider.java
index f1b500a480a..f7bd404a9f0 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/TranslateItemProvider.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/TranslateItemProvider.java
@@ -36,12 +36,11 @@ import org.eclipse.papyrus.dd.dg.Translate;
  * This is the item provider adapter for a {@link org.eclipse.papyrus.dd.dg.Translate} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
+ * 
  * @generated
  */
-public class TranslateItemProvider extends TransformItemProvider implements
-		IEditingDomainItemProvider, IStructuredItemContentProvider,
-		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
-		IItemColorProvider, IItemFontProvider {
+public class TranslateItemProvider extends TransformItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider {
+
 	/**
 	 * This constructs an instance from a factory and a notifier. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
@@ -60,9 +59,8 @@ public class TranslateItemProvider extends TransformItemProvider implements
 	 */
 	@Override
 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
+		if(itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
-
 			addDeltaXPropertyDescriptor(object);
 			addDeltaYPropertyDescriptor(object);
 		}
@@ -76,19 +74,7 @@ public class TranslateItemProvider extends TransformItemProvider implements
 	 * @generated
 	 */
 	protected void addDeltaXPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Translate_deltaX_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Translate_deltaX_feature", "_UI_Translate_type"),
-				 DGPackage.Literals.TRANSLATE__DELTA_X,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.REAL_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Translate_deltaX_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Translate_deltaX_feature", "_UI_Translate_type"), DGPackage.Literals.TRANSLATE__DELTA_X, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
 	}
 
 	/**
@@ -98,24 +84,13 @@ public class TranslateItemProvider extends TransformItemProvider implements
 	 * @generated
 	 */
 	protected void addDeltaYPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Translate_deltaY_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Translate_deltaY_feature", "_UI_Translate_type"),
-				 DGPackage.Literals.TRANSLATE__DELTA_Y,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.REAL_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Translate_deltaY_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Translate_deltaY_feature", "_UI_Translate_type"), DGPackage.Literals.TRANSLATE__DELTA_Y, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
 	}
 
 	/**
 	 * This returns Translate.gif.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -127,6 +102,7 @@ public class TranslateItemProvider extends TransformItemProvider implements
 	 * This returns the label text for the adapted class.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -140,17 +116,17 @@ public class TranslateItemProvider extends TransformItemProvider implements
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void notifyChanged(Notification notification) {
 		updateChildren(notification);
-
-		switch (notification.getFeatureID(Translate.class)) {
-			case DGPackage.TRANSLATE__DELTA_X:
-			case DGPackage.TRANSLATE__DELTA_Y:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
+		switch(notification.getFeatureID(Translate.class)) {
+		case DGPackage.TRANSLATE__DELTA_X:
+		case DGPackage.TRANSLATE__DELTA_Y:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+			return;
 		}
 		super.notifyChanged(notification);
 	}
@@ -163,9 +139,7 @@ public class TranslateItemProvider extends TransformItemProvider implements
 	 * @generated
 	 */
 	@Override
-	protected void collectNewChildDescriptors(
-			Collection<Object> newChildDescriptors, Object object) {
+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
 	}
-
 }
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/UseItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/UseItemProvider.java
index 9a6c2c9acc7..24a2eea3056 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/UseItemProvider.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/dg/provider/UseItemProvider.java
@@ -38,12 +38,11 @@ import org.eclipse.papyrus.dd.dg.Use;
 /**
  * This is the item provider adapter for a {@link org.eclipse.papyrus.dd.dg.Use} object.
  * <!-- begin-user-doc --> <!-- end-user-doc -->
+ * 
  * @generated
  */
-public class UseItemProvider extends GraphicalElementItemProvider implements
-		IEditingDomainItemProvider, IStructuredItemContentProvider,
-		ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource,
-		IItemColorProvider, IItemFontProvider {
+public class UseItemProvider extends GraphicalElementItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider {
+
 	/**
 	 * This constructs an instance from a factory and a notifier. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
@@ -62,9 +61,8 @@ public class UseItemProvider extends GraphicalElementItemProvider implements
 	 */
 	@Override
 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
+		if(itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
-
 			addReferencedElementPropertyDescriptor(object);
 		}
 		return itemPropertyDescriptors;
@@ -77,19 +75,7 @@ public class UseItemProvider extends GraphicalElementItemProvider implements
 	 * @generated
 	 */
 	protected void addReferencedElementPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Use_referencedElement_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Use_referencedElement_feature", "_UI_Use_type"),
-				 DGPackage.Literals.USE__REFERENCED_ELEMENT,
-				 true,
-				 false,
-				 true,
-				 null,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Use_referencedElement_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Use_referencedElement_feature", "_UI_Use_type"), DGPackage.Literals.USE__REFERENCED_ELEMENT, true, false, true, null, null, null));
 	}
 
 	/**
@@ -97,12 +83,12 @@ public class UseItemProvider extends GraphicalElementItemProvider implements
 	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
 	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
-	public Collection<? extends EStructuralFeature> getChildrenFeatures(
-			Object object) {
-		if (childrenFeatures == null) {
+	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
+		if(childrenFeatures == null) {
 			super.getChildrenFeatures(object);
 			childrenFeatures.add(DGPackage.Literals.USE__BOUNDS);
 		}
@@ -111,19 +97,20 @@ public class UseItemProvider extends GraphicalElementItemProvider implements
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	protected EStructuralFeature getChildFeature(Object object, Object child) {
 		// Check the type of the specified child object and return the proper feature to use for
 		// adding (see {@link AddCommand}) it as a child.
-
 		return super.getChildFeature(object, child);
 	}
 
 	/**
 	 * This returns Use.gif.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -135,14 +122,13 @@ public class UseItemProvider extends GraphicalElementItemProvider implements
 	 * This returns the label text for the adapted class.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String getText(Object object) {
 		String label = ((Use)object).getId();
-		return label == null || label.length() == 0 ?
-			getString("_UI_Use_type") :
-			getString("_UI_Use_type") + " " + label;
+		return label == null || label.length() == 0 ? getString("_UI_Use_type") : getString("_UI_Use_type") + " " + label;
 	}
 
 	/**
@@ -150,16 +136,16 @@ public class UseItemProvider extends GraphicalElementItemProvider implements
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void notifyChanged(Notification notification) {
 		updateChildren(notification);
-
-		switch (notification.getFeatureID(Use.class)) {
-			case DGPackage.USE__BOUNDS:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
+		switch(notification.getFeatureID(Use.class)) {
+		case DGPackage.USE__BOUNDS:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+			return;
 		}
 		super.notifyChanged(notification);
 	}
@@ -172,14 +158,8 @@ public class UseItemProvider extends GraphicalElementItemProvider implements
 	 * @generated
 	 */
 	@Override
-	protected void collectNewChildDescriptors(
-			Collection<Object> newChildDescriptors, Object object) {
+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DGPackage.Literals.USE__BOUNDS,
-				 DCFactory.eINSTANCE.createBounds()));
+		newChildDescriptors.add(createChildParameter(DGPackage.Literals.USE__BOUNDS, DCFactory.eINSTANCE.createBounds()));
 	}
-
 }
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/di/provider/DIItemProviderAdapterFactory.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/di/provider/DIItemProviderAdapterFactory.java
index d7635c394a5..e9ed9f3604a 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/di/provider/DIItemProviderAdapterFactory.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/di/provider/DIItemProviderAdapterFactory.java
@@ -41,21 +41,21 @@ import org.eclipse.papyrus.dd.di.util.DIAdapterFactory;
  * Note that most of the adapters are shared among multiple instances.
  * <!-- begin-user-doc --> <!--
  * end-user-doc -->
+ * 
  * @generated
  */
-public class DIItemProviderAdapterFactory extends DIAdapterFactory implements
-		ComposeableAdapterFactory, IChangeNotifier, IDisposable {
+public class DIItemProviderAdapterFactory extends DIAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier, IDisposable {
 
 	/**
 	 * This keeps track of the root adapter factory that delegates to this adapter factory.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected ComposedAdapterFactory parentAdapterFactory;
 
 	/**
-	 * This is used to implement
-	 * {@link org.eclipse.emf.edit.provider.IChangeNotifier}. <!--
+	 * This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @generated
@@ -66,6 +66,7 @@ public class DIItemProviderAdapterFactory extends DIAdapterFactory implements
 	 * This keeps track of all the supported types checked by {@link #isFactoryForType isFactoryForType}.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected Collection<Object> supportedTypes = new ArrayList<Object>();
@@ -102,13 +103,13 @@ public class DIItemProviderAdapterFactory extends DIAdapterFactory implements
 	 * 
 	 * @generated
 	 */
-	public void setParentAdapterFactory(
-			ComposedAdapterFactory parentAdapterFactory) {
+	public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory) {
 		this.parentAdapterFactory = parentAdapterFactory;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -119,6 +120,7 @@ public class DIItemProviderAdapterFactory extends DIAdapterFactory implements
 	/**
 	 * This implementation substitutes the factory itself as the key for the adapter.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -128,23 +130,24 @@ public class DIItemProviderAdapterFactory extends DIAdapterFactory implements
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object adapt(Object object, Object type) {
-		if (isFactoryForType(type)) {
+		if(isFactoryForType(type)) {
 			Object adapter = super.adapt(object, type);
-			if (!(type instanceof Class<?>) || (((Class<?>)type).isInstance(adapter))) {
+			if(!(type instanceof Class<?>) || (((Class<?>)type).isInstance(adapter))) {
 				return adapter;
 			}
 		}
-
 		return null;
 	}
 
 	/**
 	 * This adds a listener.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void addListener(INotifyChangedListener notifyChangedListener) {
@@ -154,6 +157,7 @@ public class DIItemProviderAdapterFactory extends DIAdapterFactory implements
 	/**
 	 * This removes a listener.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void removeListener(INotifyChangedListener notifyChangedListener) {
@@ -161,16 +165,14 @@ public class DIItemProviderAdapterFactory extends DIAdapterFactory implements
 	}
 
 	/**
-	 * This delegates to {@link #changeNotifier} and to
-	 * {@link #parentAdapterFactory}. <!-- begin-user-doc --> <!-- end-user-doc
+	 * This delegates to {@link #changeNotifier} and to {@link #parentAdapterFactory}. <!-- begin-user-doc --> <!-- end-user-doc
 	 * -->
 	 * 
 	 * @generated
 	 */
 	public void fireNotifyChanged(Notification notification) {
 		changeNotifier.fireNotifyChanged(notification);
-
-		if (parentAdapterFactory != null) {
+		if(parentAdapterFactory != null) {
 			parentAdapterFactory.fireNotifyChanged(notification);
 		}
 	}
@@ -183,5 +185,4 @@ public class DIItemProviderAdapterFactory extends DIAdapterFactory implements
 	 */
 	public void dispose() {
 	}
-
 }
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/di/provider/DiagramElementItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/di/provider/DiagramElementItemProvider.java
index 5f9279ae5ca..48626d4c709 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/di/provider/DiagramElementItemProvider.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/di/provider/DiagramElementItemProvider.java
@@ -31,10 +31,10 @@ import org.eclipse.papyrus.dd.edit.DDEditPlugin;
  * This is the item provider adapter for a {@link org.eclipse.papyrus.dd.di.DiagramElement} object.
  * <!-- begin-user-doc
  * --> <!-- end-user-doc -->
+ * 
  * @generated
  */
-public class DiagramElementItemProvider extends ItemProviderAdapter implements
-		IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider {
+public class DiagramElementItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider {
 
 	/**
 	 * This constructs an instance from a factory and a notifier. <!--
@@ -54,9 +54,8 @@ public class DiagramElementItemProvider extends ItemProviderAdapter implements
 	 */
 	@Override
 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
+		if(itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
-
 		}
 		return itemPropertyDescriptors;
 	}
@@ -65,6 +64,7 @@ public class DiagramElementItemProvider extends ItemProviderAdapter implements
 	 * This returns the label text for the adapted class.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -77,6 +77,7 @@ public class DiagramElementItemProvider extends ItemProviderAdapter implements
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -93,8 +94,7 @@ public class DiagramElementItemProvider extends ItemProviderAdapter implements
 	 * @generated
 	 */
 	@Override
-	protected void collectNewChildDescriptors(
-			Collection<Object> newChildDescriptors, Object object) {
+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
 	}
 
@@ -108,5 +108,4 @@ public class DiagramElementItemProvider extends ItemProviderAdapter implements
 	public ResourceLocator getResourceLocator() {
 		return DDEditPlugin.INSTANCE;
 	}
-
 }
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/di/provider/DiagramItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/di/provider/DiagramItemProvider.java
index 79270f1dcc2..ed5a7fc6b73 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/di/provider/DiagramItemProvider.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/di/provider/DiagramItemProvider.java
@@ -36,10 +36,10 @@ import org.eclipse.papyrus.dd.di.Diagram;
  * This is the item provider adapter for a {@link org.eclipse.papyrus.dd.di.Diagram} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
+ * 
  * @generated
  */
-public class DiagramItemProvider extends ShapeItemProvider implements
-		IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider {
+public class DiagramItemProvider extends ShapeItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider {
 
 	/**
 	 * This constructs an instance from a factory and a notifier. <!--
@@ -59,9 +59,8 @@ public class DiagramItemProvider extends ShapeItemProvider implements
 	 */
 	@Override
 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
+		if(itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
-
 			addNamePropertyDescriptor(object);
 			addDocumentationPropertyDescriptor(object);
 			addResolutionPropertyDescriptor(object);
@@ -73,22 +72,11 @@ public class DiagramItemProvider extends ShapeItemProvider implements
 	 * This adds a property descriptor for the Name feature.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addNamePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Diagram_name_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Diagram_name_feature", "_UI_Diagram_type"),
-				 DIPackage.Literals.DIAGRAM__NAME,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Diagram_name_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Diagram_name_feature", "_UI_Diagram_type"), DIPackage.Literals.DIAGRAM__NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
@@ -98,19 +86,7 @@ public class DiagramItemProvider extends ShapeItemProvider implements
 	 * @generated
 	 */
 	protected void addDocumentationPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Diagram_documentation_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Diagram_documentation_feature", "_UI_Diagram_type"),
-				 DIPackage.Literals.DIAGRAM__DOCUMENTATION,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Diagram_documentation_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Diagram_documentation_feature", "_UI_Diagram_type"), DIPackage.Literals.DIAGRAM__DOCUMENTATION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
@@ -120,33 +96,20 @@ public class DiagramItemProvider extends ShapeItemProvider implements
 	 * @generated
 	 */
 	protected void addResolutionPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Diagram_resolution_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Diagram_resolution_feature", "_UI_Diagram_type"),
-				 DIPackage.Literals.DIAGRAM__RESOLUTION,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.REAL_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Diagram_resolution_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Diagram_resolution_feature", "_UI_Diagram_type"), DIPackage.Literals.DIAGRAM__RESOLUTION, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
 	}
 
 	/**
 	 * This returns the label text for the adapted class.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String getText(Object object) {
 		String label = ((Diagram)object).getName();
-		return label == null || label.length() == 0 ?
-			getString("_UI_Diagram_type") :
-			getString("_UI_Diagram_type") + " " + label;
+		return label == null || label.length() == 0 ? getString("_UI_Diagram_type") : getString("_UI_Diagram_type") + " " + label;
 	}
 
 	/**
@@ -154,18 +117,18 @@ public class DiagramItemProvider extends ShapeItemProvider implements
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void notifyChanged(Notification notification) {
 		updateChildren(notification);
-
-		switch (notification.getFeatureID(Diagram.class)) {
-			case DIPackage.DIAGRAM__NAME:
-			case DIPackage.DIAGRAM__DOCUMENTATION:
-			case DIPackage.DIAGRAM__RESOLUTION:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
+		switch(notification.getFeatureID(Diagram.class)) {
+		case DIPackage.DIAGRAM__NAME:
+		case DIPackage.DIAGRAM__DOCUMENTATION:
+		case DIPackage.DIAGRAM__RESOLUTION:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+			return;
 		}
 		super.notifyChanged(notification);
 	}
@@ -178,9 +141,7 @@ public class DiagramItemProvider extends ShapeItemProvider implements
 	 * @generated
 	 */
 	@Override
-	protected void collectNewChildDescriptors(
-			Collection<Object> newChildDescriptors, Object object) {
+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
 	}
-
 }
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/di/provider/EdgeItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/di/provider/EdgeItemProvider.java
index fdb2b782ebc..9ad5b42784a 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/di/provider/EdgeItemProvider.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/di/provider/EdgeItemProvider.java
@@ -33,10 +33,10 @@ import org.eclipse.papyrus.dd.di.Edge;
  * This is the item provider adapter for a {@link org.eclipse.papyrus.dd.di.Edge} object.
  * <!-- begin-user-doc --> <!--
  * end-user-doc -->
+ * 
  * @generated
  */
-public class EdgeItemProvider extends DiagramElementItemProvider implements
-		IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider {
+public class EdgeItemProvider extends DiagramElementItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider {
 
 	/**
 	 * This constructs an instance from a factory and a notifier. <!--
@@ -56,9 +56,8 @@ public class EdgeItemProvider extends DiagramElementItemProvider implements
 	 */
 	@Override
 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
+		if(itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
-
 		}
 		return itemPropertyDescriptors;
 	}
@@ -68,12 +67,12 @@ public class EdgeItemProvider extends DiagramElementItemProvider implements
 	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
 	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
-	public Collection<? extends EStructuralFeature> getChildrenFeatures(
-			Object object) {
-		if (childrenFeatures == null) {
+	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
+		if(childrenFeatures == null) {
 			super.getChildrenFeatures(object);
 			childrenFeatures.add(DIPackage.Literals.EDGE__WAYPOINT);
 		}
@@ -82,13 +81,13 @@ public class EdgeItemProvider extends DiagramElementItemProvider implements
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	protected EStructuralFeature getChildFeature(Object object, Object child) {
 		// Check the type of the specified child object and return the proper feature to use for
 		// adding (see {@link AddCommand}) it as a child.
-
 		return super.getChildFeature(object, child);
 	}
 
@@ -96,6 +95,7 @@ public class EdgeItemProvider extends DiagramElementItemProvider implements
 	 * This returns the label text for the adapted class.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -108,16 +108,16 @@ public class EdgeItemProvider extends DiagramElementItemProvider implements
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void notifyChanged(Notification notification) {
 		updateChildren(notification);
-
-		switch (notification.getFeatureID(Edge.class)) {
-			case DIPackage.EDGE__WAYPOINT:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
+		switch(notification.getFeatureID(Edge.class)) {
+		case DIPackage.EDGE__WAYPOINT:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+			return;
 		}
 		super.notifyChanged(notification);
 	}
@@ -130,14 +130,8 @@ public class EdgeItemProvider extends DiagramElementItemProvider implements
 	 * @generated
 	 */
 	@Override
-	protected void collectNewChildDescriptors(
-			Collection<Object> newChildDescriptors, Object object) {
+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DIPackage.Literals.EDGE__WAYPOINT,
-				 DCFactory.eINSTANCE.createPoint()));
+		newChildDescriptors.add(createChildParameter(DIPackage.Literals.EDGE__WAYPOINT, DCFactory.eINSTANCE.createPoint()));
 	}
-
 }
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/di/provider/ShapeItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/di/provider/ShapeItemProvider.java
index 9f02b47c37b..d0c42907be6 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/di/provider/ShapeItemProvider.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/di/provider/ShapeItemProvider.java
@@ -38,10 +38,10 @@ import org.eclipse.papyrus.dd.di.Shape;
  * This is the item provider adapter for a {@link org.eclipse.papyrus.dd.di.Shape} object.
  * <!-- begin-user-doc --> <!--
  * end-user-doc -->
+ * 
  * @generated
  */
-public class ShapeItemProvider extends DiagramElementItemProvider implements
-		IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider {
+public class ShapeItemProvider extends DiagramElementItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider {
 
 	/**
 	 * This constructs an instance from a factory and a notifier. <!--
@@ -61,9 +61,8 @@ public class ShapeItemProvider extends DiagramElementItemProvider implements
 	 */
 	@Override
 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
+		if(itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
-
 		}
 		return itemPropertyDescriptors;
 	}
@@ -73,12 +72,12 @@ public class ShapeItemProvider extends DiagramElementItemProvider implements
 	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
 	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
-	public Collection<? extends EStructuralFeature> getChildrenFeatures(
-			Object object) {
-		if (childrenFeatures == null) {
+	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
+		if(childrenFeatures == null) {
 			super.getChildrenFeatures(object);
 			childrenFeatures.add(DIPackage.Literals.SHAPE__BOUNDS);
 		}
@@ -87,13 +86,13 @@ public class ShapeItemProvider extends DiagramElementItemProvider implements
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	protected EStructuralFeature getChildFeature(Object object, Object child) {
 		// Check the type of the specified child object and return the proper feature to use for
 		// adding (see {@link AddCommand}) it as a child.
-
 		return super.getChildFeature(object, child);
 	}
 
@@ -101,6 +100,7 @@ public class ShapeItemProvider extends DiagramElementItemProvider implements
 	 * This returns the label text for the adapted class.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -113,16 +113,16 @@ public class ShapeItemProvider extends DiagramElementItemProvider implements
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void notifyChanged(Notification notification) {
 		updateChildren(notification);
-
-		switch (notification.getFeatureID(Shape.class)) {
-			case DIPackage.SHAPE__BOUNDS:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
+		switch(notification.getFeatureID(Shape.class)) {
+		case DIPackage.SHAPE__BOUNDS:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+			return;
 		}
 		super.notifyChanged(notification);
 	}
@@ -135,14 +135,8 @@ public class ShapeItemProvider extends DiagramElementItemProvider implements
 	 * @generated
 	 */
 	@Override
-	protected void collectNewChildDescriptors(
-			Collection<Object> newChildDescriptors, Object object) {
+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DIPackage.Literals.SHAPE__BOUNDS,
-				 DCFactory.eINSTANCE.createBounds()));
+		newChildDescriptors.add(createChildParameter(DIPackage.Literals.SHAPE__BOUNDS, DCFactory.eINSTANCE.createBounds()));
 	}
-
 }
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/di/provider/StyleItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/di/provider/StyleItemProvider.java
index 3c0430abc35..50a10a464a9 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/di/provider/StyleItemProvider.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/di/provider/StyleItemProvider.java
@@ -35,10 +35,10 @@ import org.eclipse.papyrus.dd.edit.DDEditPlugin;
  * This is the item provider adapter for a {@link org.eclipse.papyrus.dd.di.Style} object.
  * <!-- begin-user-doc --> <!--
  * end-user-doc -->
+ * 
  * @generated
  */
-public class StyleItemProvider extends ItemProviderAdapter implements
-		IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider {
+public class StyleItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider {
 
 	/**
 	 * This constructs an instance from a factory and a notifier. <!--
@@ -58,9 +58,8 @@ public class StyleItemProvider extends ItemProviderAdapter implements
 	 */
 	@Override
 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
+		if(itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
-
 		}
 		return itemPropertyDescriptors;
 	}
@@ -69,6 +68,7 @@ public class StyleItemProvider extends ItemProviderAdapter implements
 	 * This returns the label text for the adapted class.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -81,6 +81,7 @@ public class StyleItemProvider extends ItemProviderAdapter implements
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -97,8 +98,7 @@ public class StyleItemProvider extends ItemProviderAdapter implements
 	 * @generated
 	 */
 	@Override
-	protected void collectNewChildDescriptors(
-			Collection<Object> newChildDescriptors, Object object) {
+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
 	}
 
@@ -112,5 +112,4 @@ public class StyleItemProvider extends ItemProviderAdapter implements
 	public ResourceLocator getResourceLocator() {
 		return DDEditPlugin.INSTANCE;
 	}
-
 }
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/edit/DDEditPlugin.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/edit/DDEditPlugin.java
index 33bc648df61..0a3c01556ca 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/edit/DDEditPlugin.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.edit/src/org/eclipse/papyrus/dd/edit/DDEditPlugin.java
@@ -20,6 +20,7 @@ import org.eclipse.emf.ecore.provider.EcoreEditPlugin;
  * This is the central singleton for the DG edit plugin.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
+ * 
  * @generated
  */
 public final class DDEditPlugin extends EMFPlugin {
@@ -46,13 +47,14 @@ public final class DDEditPlugin extends EMFPlugin {
 	 * @generated NOT
 	 */
 	public DDEditPlugin() {
-		super(new ResourceLocator[] { EcoreEditPlugin.INSTANCE, });
+		super(new ResourceLocator[]{ EcoreEditPlugin.INSTANCE, });
 	}
 
 	/**
 	 * Returns the singleton instance of the Eclipse plugin.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @return the singleton instance.
 	 * @generated
 	 */
@@ -65,6 +67,7 @@ public final class DDEditPlugin extends EMFPlugin {
 	 * Returns the singleton instance of the Eclipse plugin.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @return the singleton instance.
 	 * @generated
 	 */
@@ -83,15 +86,14 @@ public final class DDEditPlugin extends EMFPlugin {
 		/**
 		 * Creates an instance.
 		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		public Implementation() {
 			super();
-
 			// Remember the static instance.
 			//
 			plugin = this;
 		}
 	}
-
 }
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.editor/src/org/eclipse/papyrus/dd/dg/editor/DGToSVGConverter.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.editor/src/org/eclipse/papyrus/dd/dg/editor/DGToSVGConverter.java
index be3f5cc4245..5fd5d05978b 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.editor/src/org/eclipse/papyrus/dd/dg/editor/DGToSVGConverter.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.editor/src/org/eclipse/papyrus/dd/dg/editor/DGToSVGConverter.java
@@ -307,7 +307,7 @@ public class DGToSVGConverter extends DGSwitch<Object> implements SVGSyntax {
 				svg.setAttribute(SVG_HEIGHT_ATTRIBUTE,
 						convertDoubleToString(bounds.getHeight()));
 		}
-		
+
 		return super.caseCanvas(object);
 	}
 
@@ -533,9 +533,10 @@ public class DGToSVGConverter extends DGSwitch<Object> implements SVGSyntax {
 				}
 				element.setAttribute(SVG_TRANSFORM_ATTRIBUTE, transforms);
 			}
-			
+
 			if (object.getLayoutData() != null)
-				element.setAttribute(SVG_LAYOUT_DATA_ATTRIBUTE, object.getLayoutData());
+				element.setAttribute(SVG_LAYOUT_DATA_ATTRIBUTE,
+						object.getLayoutData());
 		}
 
 		return super.caseGraphicalElement(object);
@@ -550,7 +551,7 @@ public class DGToSVGConverter extends DGSwitch<Object> implements SVGSyntax {
 					svgDocument.createElementNS(SVG_NAMESPACE_URI, SVG_G_TAG));
 			getParentElement(object).appendChild(g);
 		}
-		
+
 		if (object.getLayout() != null)
 			g.setAttribute(SVG_LAYOUT_ATTRIBUTE, object.getLayout());
 
@@ -975,7 +976,7 @@ public class DGToSVGConverter extends DGSwitch<Object> implements SVGSyntax {
 		svg.setAttribute(XMLNS_PREFIX, SVG_NAMESPACE_URI);
 		svg.setAttribute(XMLNS_PREFIX + ":" + XLINK_PREFIX, XLINK_NAMESPACE_URI);
 		svg.setAttribute(SVG_ONLOAD_ATTRIBUTE, "validate(evt.target)");
-		
+
 		if (object.eIsSet(DGPackage.Literals.ROOT_CANVAS__BACKGROUND_COLOR)) {
 			String background = convertColorToString(object
 					.getBackgroundColor());
@@ -990,18 +991,20 @@ public class DGToSVGConverter extends DGSwitch<Object> implements SVGSyntax {
 					target, data);
 			svgDocument.insertBefore(pi, svgDocument.getDocumentElement());
 		}
-		
+
 		for (String s : object.getScripts()) {
 			try {
 				URL url = FileLocator.toFileURL(new URL(s));
-				Element script = svgDocument.createElementNS(SVG_NAMESPACE_URI, SVG_SCRIPT_TAG);
-				script.setAttributeNS(XLINK_NAMESPACE_URI, XLINK_HREF_QNAME, url.toString());
+				Element script = svgDocument.createElementNS(SVG_NAMESPACE_URI,
+						SVG_SCRIPT_TAG);
+				script.setAttributeNS(XLINK_NAMESPACE_URI, XLINK_HREF_QNAME,
+						url.toString());
 				svg.appendChild(script);
 			} catch (IOException e) {
 				DDEditorPlugin.getPlugin().log(e);
 			}
 		}
-		
+
 		if (object.getDefinitions() != null) {
 			doSwitch(object.getDefinitions());
 		}
@@ -1262,7 +1265,7 @@ public class DGToSVGConverter extends DGSwitch<Object> implements SVGSyntax {
 				text.setAttribute(SVG_Y_ATTRIBUTE,
 						convertDoubleToString(position.getY()));
 		}
-		
+
 		if (object.getAnchor() != null) {
 			TextAnchor ta = object.getAnchor();
 			String value = null;
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.editor/src/org/eclipse/papyrus/dd/editor/DDEditorPage.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.editor/src/org/eclipse/papyrus/dd/editor/DDEditorPage.java
index 4b35d846ce0..5b3bb9bfa03 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.editor/src/org/eclipse/papyrus/dd/editor/DDEditorPage.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.editor/src/org/eclipse/papyrus/dd/editor/DDEditorPage.java
@@ -128,24 +128,27 @@ public abstract class DDEditorPage extends FormPage {
 	/**
 	 * Adds actions to the page's toolbar
 	 * 
-	 * @param manager The page's toolbar manager
+	 * @param manager
+	 *            The page's toolbar manager
 	 */
 	public void setupActions(IToolBarManager manager) {
 		manager.add(new Separator("Page"));
 		manager.add(new Separator("Common"));
 
 		Action action;
-		
+
 		action = new Action("Help") {
 			public void run() {
-				PlatformUI.getWorkbench().getHelpSystem().displayHelp(getPageHelpId());
+				PlatformUI.getWorkbench().getHelpSystem()
+						.displayHelp(getPageHelpId());
 			}
 		};
 		action.setToolTipText("Show help");
-		action.setImageDescriptor(DDEditorPlugin.getImageDescriptor(DDEditorPlugin.IMAGE_HELP));
+		action.setImageDescriptor(DDEditorPlugin
+				.getImageDescriptor(DDEditorPlugin.IMAGE_HELP));
 		manager.appendToGroup("Common", action);
 	}
-	
+
 	/**
 	 * Get the help id associated with this page
 	 * 
@@ -154,5 +157,5 @@ public abstract class DDEditorPage extends FormPage {
 	protected String getPageHelpId() {
 		return "";
 	}
-	
+
 }
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.editor/src/org/eclipse/papyrus/dd/editor/DDEditorPlugin.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.editor/src/org/eclipse/papyrus/dd/editor/DDEditorPlugin.java
index a2d3eda0860..16cdcbc71a8 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd.editor/src/org/eclipse/papyrus/dd/editor/DDEditorPlugin.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd.editor/src/org/eclipse/papyrus/dd/editor/DDEditorPlugin.java
@@ -25,7 +25,7 @@ import org.eclipse.papyrus.dd.edit.DDEditPlugin;
 public final class DDEditorPlugin extends EMFPlugin {
 
 	public static final String IMAGE_HELP = "Help";
-	
+
 	/**
 	 * Keep track of the singleton.
 	 */
@@ -81,9 +81,11 @@ public final class DDEditorPlugin extends EMFPlugin {
 		@Override
 		protected void initializeImageRegistry(ImageRegistry reg) {
 			super.initializeImageRegistry(reg);
-			reg.put(IMAGE_HELP, ImageDescriptor.createFromURL(getBundle().getEntry("icons/help.gif")));
+			reg.put(IMAGE_HELP,
+					ImageDescriptor.createFromURL(getBundle().getEntry(
+							"icons/help.gif")));
 		}
-		
+
 	}
 
 	public static ImageDescriptor getImageDescriptor(String id) {
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/.settings/org.eclipse.jdt.core.prefs b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/.settings/org.eclipse.jdt.core.prefs
index f42de363afa..56b6907735f 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/.settings/org.eclipse.jdt.core.prefs
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/.settings/org.eclipse.jdt.core.prefs
@@ -5,3 +5,283 @@ org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.source=1.7
+org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=0
+org.eclipse.jdt.core.formatter.alignment_for_assignment=0
+org.eclipse.jdt.core.formatter.alignment_for_binary_expression=0
+org.eclipse.jdt.core.formatter.alignment_for_compact_if=0
+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=0
+org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=0
+org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
+org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=0
+org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
+org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_after_package=1
+org.eclipse.jdt.core.formatter.blank_lines_before_field=1
+org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=1
+org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
+org.eclipse.jdt.core.formatter.blank_lines_before_method=1
+org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
+org.eclipse.jdt.core.formatter.blank_lines_before_package=0
+org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
+org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
+org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=next_line
+org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=next_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
+org.eclipse.jdt.core.formatter.comment.format_block_comments=true
+org.eclipse.jdt.core.formatter.comment.format_header=false
+org.eclipse.jdt.core.formatter.comment.format_html=true
+org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
+org.eclipse.jdt.core.formatter.comment.format_line_comments=false
+org.eclipse.jdt.core.formatter.comment.format_source_code=true
+org.eclipse.jdt.core.formatter.comment.indent_parameter_description=false
+org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
+org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
+org.eclipse.jdt.core.formatter.comment.line_length=150
+org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
+org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
+org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
+org.eclipse.jdt.core.formatter.compact_else_if=true
+org.eclipse.jdt.core.formatter.continuation_indentation=1
+org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=1
+org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
+org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
+org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
+org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
+org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_empty_lines=false
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
+org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
+org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
+org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.join_lines_in_comments=false
+org.eclipse.jdt.core.formatter.join_wrapped_lines=true
+org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.lineSplit=200
+org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
+org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=0
+org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=false
+org.eclipse.jdt.core.formatter.tabulation.char=tab
+org.eclipse.jdt.core.formatter.tabulation.size=4
+org.eclipse.jdt.core.formatter.use_on_off_tags=false
+org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
+org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
+org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/.settings/org.eclipse.jdt.ui.prefs b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/.settings/org.eclipse.jdt.ui.prefs
index ced03a54ede..b5f980cae55 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/.settings/org.eclipse.jdt.ui.prefs
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/.settings/org.eclipse.jdt.ui.prefs
@@ -1,3 +1,3 @@
 eclipse.preferences.version=1
-org.eclipse.jdt.ui.javadoc=false
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * ${tags}\n */</template><template autoinsert\="true" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/**\n * \n */</template><template autoinsert\="true" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n * @author ${user}\n *\n * ${tags}\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="true" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/* (non-Javadoc)\n * ${see_to_overridden}\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${tags}\n * ${see_to_target}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
+formatter_profile=_Zero blank Papyrus Formatter Profile CDM
+formatter_settings_version=12
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/Bounds.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/Bounds.java
index a2980485f52..313912f5613 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/Bounds.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/Bounds.java
@@ -18,23 +18,22 @@ import org.eclipse.emf.common.util.DiagnosticChain;
 import org.eclipse.emf.ecore.EObject;
 
 /**
- * <!-- begin-user-doc --> A representation of the model object '
- * <em><b>Bounds</b></em>'. <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object ' <em><b>Bounds</b></em>'. <!-- end-user-doc -->
+ * 
  * <!-- begin-model-doc -->
  * Bounds specifies a rectangular area in some x-y coordinate system that is defined by a location (x and y) and a size (width and height).
  * <!-- end-model-doc -->
- *
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.dd.dc.Bounds#getX <em>X</em>}</li>
- *   <li>{@link org.eclipse.papyrus.dd.dc.Bounds#getY <em>Y</em>}</li>
- *   <li>{@link org.eclipse.papyrus.dd.dc.Bounds#getWidth <em>Width</em>}</li>
- *   <li>{@link org.eclipse.papyrus.dd.dc.Bounds#getHeight <em>Height</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dc.Bounds#getX <em>X</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dc.Bounds#getY <em>Y</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dc.Bounds#getWidth <em>Width</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dc.Bounds#getHeight <em>Height</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.dd.dc.DCPackage#getBounds()
  * @model
  * @generated
@@ -59,7 +58,9 @@ public interface Bounds extends EObject {
 	/**
 	 * Sets the value of the '{@link org.eclipse.papyrus.dd.dc.Bounds#getX <em>X</em>}' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @param value the new value of the '<em>X</em>' attribute.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>X</em>' attribute.
 	 * @see #isSetX()
 	 * @see #unsetX()
 	 * @see #getX()
@@ -70,6 +71,7 @@ public interface Bounds extends EObject {
 	/**
 	 * Unsets the value of the '{@link org.eclipse.papyrus.dd.dc.Bounds#getX <em>X</em>}' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isSetX()
 	 * @see #getX()
 	 * @see #setX(double)
@@ -80,6 +82,7 @@ public interface Bounds extends EObject {
 	/**
 	 * Returns whether the value of the '{@link org.eclipse.papyrus.dd.dc.Bounds#getX <em>X</em>}' attribute is set.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return whether the value of the '<em>X</em>' attribute is set.
 	 * @see #unsetX()
 	 * @see #getX()
@@ -106,7 +109,9 @@ public interface Bounds extends EObject {
 	/**
 	 * Sets the value of the '{@link org.eclipse.papyrus.dd.dc.Bounds#getY <em>Y</em>}' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Y</em>' attribute.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Y</em>' attribute.
 	 * @see #isSetY()
 	 * @see #unsetY()
 	 * @see #getY()
@@ -117,6 +122,7 @@ public interface Bounds extends EObject {
 	/**
 	 * Unsets the value of the '{@link org.eclipse.papyrus.dd.dc.Bounds#getY <em>Y</em>}' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isSetY()
 	 * @see #getY()
 	 * @see #setY(double)
@@ -127,6 +133,7 @@ public interface Bounds extends EObject {
 	/**
 	 * Returns whether the value of the '{@link org.eclipse.papyrus.dd.dc.Bounds#getY <em>Y</em>}' attribute is set.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return whether the value of the '<em>Y</em>' attribute is set.
 	 * @see #unsetY()
 	 * @see #getY()
@@ -153,7 +160,9 @@ public interface Bounds extends EObject {
 	/**
 	 * Sets the value of the '{@link org.eclipse.papyrus.dd.dc.Bounds#getWidth <em>Width</em>}' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Width</em>' attribute.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Width</em>' attribute.
 	 * @see #isSetWidth()
 	 * @see #unsetWidth()
 	 * @see #getWidth()
@@ -164,6 +173,7 @@ public interface Bounds extends EObject {
 	/**
 	 * Unsets the value of the '{@link org.eclipse.papyrus.dd.dc.Bounds#getWidth <em>Width</em>}' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isSetWidth()
 	 * @see #getWidth()
 	 * @see #setWidth(double)
@@ -174,6 +184,7 @@ public interface Bounds extends EObject {
 	/**
 	 * Returns whether the value of the '{@link org.eclipse.papyrus.dd.dc.Bounds#getWidth <em>Width</em>}' attribute is set.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return whether the value of the '<em>Width</em>' attribute is set.
 	 * @see #unsetWidth()
 	 * @see #getWidth()
@@ -203,7 +214,7 @@ public interface Bounds extends EObject {
 	 * -->
 	 * 
 	 * @param value
-	 *            the new value of the '<em>Height</em>' attribute.
+	 *        the new value of the '<em>Height</em>' attribute.
 	 * @see #getHeight()
 	 * @generated
 	 */
@@ -212,6 +223,7 @@ public interface Bounds extends EObject {
 	/**
 	 * Unsets the value of the '{@link org.eclipse.papyrus.dd.dc.Bounds#getHeight <em>Height</em>}' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isSetHeight()
 	 * @see #getHeight()
 	 * @see #setHeight(double)
@@ -222,6 +234,7 @@ public interface Bounds extends EObject {
 	/**
 	 * Returns whether the value of the '{@link org.eclipse.papyrus.dd.dc.Bounds#getHeight <em>Height</em>}' attribute is set.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return whether the value of the '<em>Height</em>' attribute is set.
 	 * @see #unsetHeight()
 	 * @see #getHeight()
@@ -235,31 +248,28 @@ public interface Bounds extends EObject {
 	 * the width of bounds cannot be negative
 	 * 
 	 * @param diagnostics
-	 *            The chain of diagnostics to which problems are to be appended.
+	 *        The chain of diagnostics to which problems are to be appended.
 	 * @param context
-	 *            The cache of context-specific information. <!-- end-model-doc
-	 *            -->
-	 * @model 
+	 *        The cache of context-specific information. <!-- end-model-doc
+	 *        -->
+	 * @model
 	 *        annotation="http://www.eclipse.org/emf/2002/Ecore/OCL body='width >= 0'"
 	 * @generated
 	 */
-	boolean nonNegativeWidth(DiagnosticChain diagnostics,
-			Map<Object, Object> context);
+	boolean nonNegativeWidth(DiagnosticChain diagnostics, Map<Object, Object> context);
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc --> <!-- begin-model-doc -->
 	 * the height of bounds cannot be negative
 	 * 
 	 * @param diagnostics
-	 *            The chain of diagnostics to which problems are to be appended.
+	 *        The chain of diagnostics to which problems are to be appended.
 	 * @param context
-	 *            The cache of context-specific information. <!-- end-model-doc
-	 *            -->
-	 * @model 
+	 *        The cache of context-specific information. <!-- end-model-doc
+	 *        -->
+	 * @model
 	 *        annotation="http://www.eclipse.org/emf/2002/Ecore/OCL body='height >=0'"
 	 * @generated
 	 */
-	boolean nonNegativeHeight(DiagnosticChain diagnostics,
-			Map<Object, Object> context);
-
+	boolean nonNegativeHeight(DiagnosticChain diagnostics, Map<Object, Object> context);
 } // Bounds
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/DCFactory.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/DCFactory.java
index b364e15c327..26e3361c2a2 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/DCFactory.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/DCFactory.java
@@ -16,6 +16,7 @@ import org.eclipse.emf.ecore.EFactory;
 /**
  * <!-- begin-user-doc --> The <b>Factory</b> for the model. It provides a
  * create method for each non-abstract class of the model. <!-- end-user-doc -->
+ * 
  * @see org.eclipse.papyrus.dd.dc.DCPackage
  * @generated
  */
@@ -25,6 +26,7 @@ public interface DCFactory extends EFactory {
 	 * The singleton instance of the factory.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	DCFactory eINSTANCE = org.eclipse.papyrus.dd.dc.impl.DCFactoryImpl.init();
@@ -33,6 +35,7 @@ public interface DCFactory extends EFactory {
 	 * Returns a new object of class '<em>Point</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Point</em>'.
 	 * @generated
 	 */
@@ -42,6 +45,7 @@ public interface DCFactory extends EFactory {
 	 * Returns a new object of class '<em>Dimension</em>'.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Dimension</em>'.
 	 * @generated
 	 */
@@ -51,6 +55,7 @@ public interface DCFactory extends EFactory {
 	 * Returns a new object of class '<em>Bounds</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Bounds</em>'.
 	 * @generated
 	 */
@@ -60,9 +65,9 @@ public interface DCFactory extends EFactory {
 	 * Returns the package supported by this factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the package supported by this factory.
 	 * @generated
 	 */
 	DCPackage getDCPackage();
-
 } // DCFactory
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/DCPackage.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/DCPackage.java
index f15cee65e34..d62517de624 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/DCPackage.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/DCPackage.java
@@ -42,6 +42,7 @@ public interface DCPackage extends EPackage {
 	/**
 	 * The package name.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	String eNAME = "dc";
@@ -49,6 +50,7 @@ public interface DCPackage extends EPackage {
 	/**
 	 * The package namespace URI.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	String eNS_URI = "http://www.omg.org/spec/DD/20110901/DC";
@@ -56,6 +58,7 @@ public interface DCPackage extends EPackage {
 	/**
 	 * The package namespace name.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	String eNS_PREFIX = "dc";
@@ -64,6 +67,7 @@ public interface DCPackage extends EPackage {
 	 * The singleton instance of the package.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	DCPackage eINSTANCE = org.eclipse.papyrus.dd.dc.impl.DCPackageImpl.init();
@@ -71,6 +75,7 @@ public interface DCPackage extends EPackage {
 	/**
 	 * The meta object id for the '{@link org.eclipse.papyrus.dd.dc.impl.PointImpl <em>Point</em>}' class.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.papyrus.dd.dc.impl.PointImpl
 	 * @see org.eclipse.papyrus.dd.dc.impl.DCPackageImpl#getPoint()
 	 * @generated
@@ -81,6 +86,7 @@ public interface DCPackage extends EPackage {
 	 * The feature id for the '<em><b>X</b></em>' attribute.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -90,6 +96,7 @@ public interface DCPackage extends EPackage {
 	 * The feature id for the '<em><b>Y</b></em>' attribute.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -116,6 +123,7 @@ public interface DCPackage extends EPackage {
 	/**
 	 * The meta object id for the '{@link org.eclipse.papyrus.dd.dc.impl.DimensionImpl <em>Dimension</em>}' class.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.papyrus.dd.dc.impl.DimensionImpl
 	 * @see org.eclipse.papyrus.dd.dc.impl.DCPackageImpl#getDimension()
 	 * @generated
@@ -179,6 +187,7 @@ public interface DCPackage extends EPackage {
 	/**
 	 * The meta object id for the '{@link org.eclipse.papyrus.dd.dc.impl.BoundsImpl <em>Bounds</em>}' class.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.papyrus.dd.dc.impl.BoundsImpl
 	 * @see org.eclipse.papyrus.dd.dc.impl.DCPackageImpl#getBounds()
 	 * @generated
@@ -189,6 +198,7 @@ public interface DCPackage extends EPackage {
 	 * The feature id for the '<em><b>X</b></em>' attribute.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -198,6 +208,7 @@ public interface DCPackage extends EPackage {
 	 * The feature id for the '<em><b>Y</b></em>' attribute.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -290,6 +301,7 @@ public interface DCPackage extends EPackage {
 	 * The meta object id for the '<em>Real</em>' data type.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.papyrus.dd.dc.impl.DCPackageImpl#getReal()
 	 * @generated
 	 */
@@ -316,8 +328,7 @@ public interface DCPackage extends EPackage {
 	int COLOR = 8;
 
 	/**
-	 * Returns the meta object for class '
-	 * {@link org.eclipse.papyrus.dd.dc.Point <em>Point</em>}'. <!--
+	 * Returns the meta object for class ' {@link org.eclipse.papyrus.dd.dc.Point <em>Point</em>}'. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @return the meta object for class '<em>Point</em>'.
@@ -327,8 +338,7 @@ public interface DCPackage extends EPackage {
 	EClass getPoint();
 
 	/**
-	 * Returns the meta object for the attribute '
-	 * {@link org.eclipse.papyrus.dd.dc.Point#getX <em>X</em>}'. <!--
+	 * Returns the meta object for the attribute ' {@link org.eclipse.papyrus.dd.dc.Point#getX <em>X</em>}'. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @return the meta object for the attribute '<em>X</em>'.
@@ -339,8 +349,7 @@ public interface DCPackage extends EPackage {
 	EAttribute getPoint_X();
 
 	/**
-	 * Returns the meta object for the attribute '
-	 * {@link org.eclipse.papyrus.dd.dc.Point#getY <em>Y</em>}'. <!--
+	 * Returns the meta object for the attribute ' {@link org.eclipse.papyrus.dd.dc.Point#getY <em>Y</em>}'. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @return the meta object for the attribute '<em>Y</em>'.
@@ -351,8 +360,7 @@ public interface DCPackage extends EPackage {
 	EAttribute getPoint_Y();
 
 	/**
-	 * Returns the meta object for class '
-	 * {@link org.eclipse.papyrus.dd.dc.Dimension <em>Dimension</em>}'. <!--
+	 * Returns the meta object for class ' {@link org.eclipse.papyrus.dd.dc.Dimension <em>Dimension</em>}'. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @return the meta object for class '<em>Dimension</em>'.
@@ -364,6 +372,7 @@ public interface DCPackage extends EPackage {
 	/**
 	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.dd.dc.Dimension#getWidth <em>Width</em>}'.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Width</em>'.
 	 * @see org.eclipse.papyrus.dd.dc.Dimension#getWidth()
 	 * @see #getDimension()
@@ -374,6 +383,7 @@ public interface DCPackage extends EPackage {
 	/**
 	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.dd.dc.Dimension#getHeight <em>Height</em>}'.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Height</em>'.
 	 * @see org.eclipse.papyrus.dd.dc.Dimension#getHeight()
 	 * @see #getDimension()
@@ -382,9 +392,12 @@ public interface DCPackage extends EPackage {
 	EAttribute getDimension_Height();
 
 	/**
-	 * Returns the meta object for the '{@link org.eclipse.papyrus.dd.dc.Dimension#nonNegativeWidth(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Non Negative Width</em>}' operation.
+	 * Returns the meta object for the '
+	 * {@link org.eclipse.papyrus.dd.dc.Dimension#nonNegativeWidth(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
+	 * <em>Non Negative Width</em>}' operation.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the '<em>Non Negative Width</em>' operation.
 	 * @see org.eclipse.papyrus.dd.dc.Dimension#nonNegativeWidth(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
 	 * @generated
@@ -392,9 +405,12 @@ public interface DCPackage extends EPackage {
 	EOperation getDimension__NonNegativeWidth__DiagnosticChain_Map();
 
 	/**
-	 * Returns the meta object for the '{@link org.eclipse.papyrus.dd.dc.Dimension#nonNegativeHeight(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Non Negative Height</em>}' operation.
+	 * Returns the meta object for the '
+	 * {@link org.eclipse.papyrus.dd.dc.Dimension#nonNegativeHeight(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
+	 * <em>Non Negative Height</em>}' operation.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the '<em>Non Negative Height</em>' operation.
 	 * @see org.eclipse.papyrus.dd.dc.Dimension#nonNegativeHeight(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
 	 * @generated
@@ -402,8 +418,7 @@ public interface DCPackage extends EPackage {
 	EOperation getDimension__NonNegativeHeight__DiagnosticChain_Map();
 
 	/**
-	 * Returns the meta object for class '
-	 * {@link org.eclipse.papyrus.dd.dc.Bounds <em>Bounds</em>}'. <!--
+	 * Returns the meta object for class ' {@link org.eclipse.papyrus.dd.dc.Bounds <em>Bounds</em>}'. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @return the meta object for class '<em>Bounds</em>'.
@@ -413,8 +428,7 @@ public interface DCPackage extends EPackage {
 	EClass getBounds();
 
 	/**
-	 * Returns the meta object for the attribute '
-	 * {@link org.eclipse.papyrus.dd.dc.Bounds#getX <em>X</em>}'. <!--
+	 * Returns the meta object for the attribute ' {@link org.eclipse.papyrus.dd.dc.Bounds#getX <em>X</em>}'. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @return the meta object for the attribute '<em>X</em>'.
@@ -425,8 +439,7 @@ public interface DCPackage extends EPackage {
 	EAttribute getBounds_X();
 
 	/**
-	 * Returns the meta object for the attribute '
-	 * {@link org.eclipse.papyrus.dd.dc.Bounds#getY <em>Y</em>}'. <!--
+	 * Returns the meta object for the attribute ' {@link org.eclipse.papyrus.dd.dc.Bounds#getY <em>Y</em>}'. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @return the meta object for the attribute '<em>Y</em>'.
@@ -437,8 +450,7 @@ public interface DCPackage extends EPackage {
 	EAttribute getBounds_Y();
 
 	/**
-	 * Returns the meta object for the attribute '
-	 * {@link org.eclipse.papyrus.dd.dc.Bounds#getWidth <em>Width</em>}'. <!--
+	 * Returns the meta object for the attribute ' {@link org.eclipse.papyrus.dd.dc.Bounds#getWidth <em>Width</em>}'. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @return the meta object for the attribute '<em>Width</em>'.
@@ -449,8 +461,7 @@ public interface DCPackage extends EPackage {
 	EAttribute getBounds_Width();
 
 	/**
-	 * Returns the meta object for the attribute '
-	 * {@link org.eclipse.papyrus.dd.dc.Bounds#getHeight <em>Height</em>}'. <!--
+	 * Returns the meta object for the attribute ' {@link org.eclipse.papyrus.dd.dc.Bounds#getHeight <em>Height</em>}'. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @return the meta object for the attribute '<em>Height</em>'.
@@ -461,9 +472,12 @@ public interface DCPackage extends EPackage {
 	EAttribute getBounds_Height();
 
 	/**
-	 * Returns the meta object for the '{@link org.eclipse.papyrus.dd.dc.Bounds#nonNegativeWidth(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Non Negative Width</em>}' operation.
+	 * Returns the meta object for the '
+	 * {@link org.eclipse.papyrus.dd.dc.Bounds#nonNegativeWidth(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
+	 * <em>Non Negative Width</em>}' operation.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the '<em>Non Negative Width</em>' operation.
 	 * @see org.eclipse.papyrus.dd.dc.Bounds#nonNegativeWidth(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
 	 * @generated
@@ -471,9 +485,12 @@ public interface DCPackage extends EPackage {
 	EOperation getBounds__NonNegativeWidth__DiagnosticChain_Map();
 
 	/**
-	 * Returns the meta object for the '{@link org.eclipse.papyrus.dd.dc.Bounds#nonNegativeHeight(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Non Negative Height</em>}' operation.
+	 * Returns the meta object for the '
+	 * {@link org.eclipse.papyrus.dd.dc.Bounds#nonNegativeHeight(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
+	 * <em>Non Negative Height</em>}' operation.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the '<em>Non Negative Height</em>' operation.
 	 * @see org.eclipse.papyrus.dd.dc.Bounds#nonNegativeHeight(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
 	 * @generated
@@ -481,8 +498,7 @@ public interface DCPackage extends EPackage {
 	EOperation getBounds__NonNegativeHeight__DiagnosticChain_Map();
 
 	/**
-	 * Returns the meta object for enum '
-	 * {@link org.eclipse.papyrus.dd.dc.KnownColor <em>Known Color</em>}'. <!--
+	 * Returns the meta object for enum ' {@link org.eclipse.papyrus.dd.dc.KnownColor <em>Known Color</em>}'. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @return the meta object for enum '<em>Known Color</em>'.
@@ -524,6 +540,7 @@ public interface DCPackage extends EPackage {
 	/**
 	 * Returns the meta object for data type '{@link java.lang.String <em>String</em>}'.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for data type '<em>String</em>'.
 	 * @see java.lang.String
 	 * @model instanceClass="java.lang.String"
@@ -534,6 +551,7 @@ public interface DCPackage extends EPackage {
 	/**
 	 * Returns the meta object for data type '{@link java.awt.Color <em>Color</em>}'.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for data type '<em>Color</em>'.
 	 * @see java.awt.Color
 	 * @model instanceClass="java.awt.Color"
@@ -561,6 +579,7 @@ public interface DCPackage extends EPackage {
 	 * <li>and each data type</li>
 	 * </ul>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	interface Literals {
@@ -568,6 +587,7 @@ public interface DCPackage extends EPackage {
 		/**
 		 * The meta object literal for the '{@link org.eclipse.papyrus.dd.dc.impl.PointImpl <em>Point</em>}' class.
 		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.dd.dc.impl.PointImpl
 		 * @see org.eclipse.papyrus.dd.dc.impl.DCPackageImpl#getPoint()
 		 * @generated
@@ -577,6 +597,7 @@ public interface DCPackage extends EPackage {
 		/**
 		 * The meta object literal for the '<em><b>X</b></em>' attribute feature.
 		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute POINT__X = eINSTANCE.getPoint_X();
@@ -584,13 +605,13 @@ public interface DCPackage extends EPackage {
 		/**
 		 * The meta object literal for the '<em><b>Y</b></em>' attribute feature.
 		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute POINT__Y = eINSTANCE.getPoint_Y();
 
 		/**
-		 * The meta object literal for the '
-		 * {@link org.eclipse.papyrus.dd.dc.impl.DimensionImpl
+		 * The meta object literal for the ' {@link org.eclipse.papyrus.dd.dc.impl.DimensionImpl
 		 * <em>Dimension</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc
 		 * -->
 		 * 
@@ -603,6 +624,7 @@ public interface DCPackage extends EPackage {
 		/**
 		 * The meta object literal for the '<em><b>Width</b></em>' attribute feature.
 		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute DIMENSION__WIDTH = eINSTANCE.getDimension_Width();
@@ -610,6 +632,7 @@ public interface DCPackage extends EPackage {
 		/**
 		 * The meta object literal for the '<em><b>Height</b></em>' attribute feature.
 		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute DIMENSION__HEIGHT = eINSTANCE.getDimension_Height();
@@ -617,6 +640,7 @@ public interface DCPackage extends EPackage {
 		/**
 		 * The meta object literal for the '<em><b>Non Negative Width</b></em>' operation.
 		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EOperation DIMENSION___NON_NEGATIVE_WIDTH__DIAGNOSTICCHAIN_MAP = eINSTANCE.getDimension__NonNegativeWidth__DiagnosticChain_Map();
@@ -624,6 +648,7 @@ public interface DCPackage extends EPackage {
 		/**
 		 * The meta object literal for the '<em><b>Non Negative Height</b></em>' operation.
 		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EOperation DIMENSION___NON_NEGATIVE_HEIGHT__DIAGNOSTICCHAIN_MAP = eINSTANCE.getDimension__NonNegativeHeight__DiagnosticChain_Map();
@@ -631,6 +656,7 @@ public interface DCPackage extends EPackage {
 		/**
 		 * The meta object literal for the '{@link org.eclipse.papyrus.dd.dc.impl.BoundsImpl <em>Bounds</em>}' class.
 		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.dd.dc.impl.BoundsImpl
 		 * @see org.eclipse.papyrus.dd.dc.impl.DCPackageImpl#getBounds()
 		 * @generated
@@ -640,6 +666,7 @@ public interface DCPackage extends EPackage {
 		/**
 		 * The meta object literal for the '<em><b>X</b></em>' attribute feature.
 		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute BOUNDS__X = eINSTANCE.getBounds_X();
@@ -647,6 +674,7 @@ public interface DCPackage extends EPackage {
 		/**
 		 * The meta object literal for the '<em><b>Y</b></em>' attribute feature.
 		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute BOUNDS__Y = eINSTANCE.getBounds_Y();
@@ -654,6 +682,7 @@ public interface DCPackage extends EPackage {
 		/**
 		 * The meta object literal for the '<em><b>Width</b></em>' attribute feature.
 		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute BOUNDS__WIDTH = eINSTANCE.getBounds_Width();
@@ -661,6 +690,7 @@ public interface DCPackage extends EPackage {
 		/**
 		 * The meta object literal for the '<em><b>Height</b></em>' attribute feature.
 		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute BOUNDS__HEIGHT = eINSTANCE.getBounds_Height();
@@ -668,6 +698,7 @@ public interface DCPackage extends EPackage {
 		/**
 		 * The meta object literal for the '<em><b>Non Negative Width</b></em>' operation.
 		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EOperation BOUNDS___NON_NEGATIVE_WIDTH__DIAGNOSTICCHAIN_MAP = eINSTANCE.getBounds__NonNegativeWidth__DiagnosticChain_Map();
@@ -675,6 +706,7 @@ public interface DCPackage extends EPackage {
 		/**
 		 * The meta object literal for the '<em><b>Non Negative Height</b></em>' operation.
 		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EOperation BOUNDS___NON_NEGATIVE_HEIGHT__DIAGNOSTICCHAIN_MAP = eINSTANCE.getBounds__NonNegativeHeight__DiagnosticChain_Map();
@@ -682,6 +714,7 @@ public interface DCPackage extends EPackage {
 		/**
 		 * The meta object literal for the '{@link org.eclipse.papyrus.dd.dc.KnownColor <em>Known Color</em>}' enum.
 		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.dd.dc.KnownColor
 		 * @see org.eclipse.papyrus.dd.dc.impl.DCPackageImpl#getKnownColor()
 		 * @generated
@@ -734,7 +767,5 @@ public interface DCPackage extends EPackage {
 		 * @generated
 		 */
 		EDataType COLOR = eINSTANCE.getColor();
-
 	}
-
 } // DCPackage
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/Dimension.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/Dimension.java
index 72a90128bb9..8c9fbc4247d 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/Dimension.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/Dimension.java
@@ -18,21 +18,20 @@ import org.eclipse.emf.common.util.DiagnosticChain;
 import org.eclipse.emf.ecore.EObject;
 
 /**
- * <!-- begin-user-doc --> A representation of the model object '
- * <em><b>Dimension</b></em>'. <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object ' <em><b>Dimension</b></em>'. <!-- end-user-doc -->
+ * 
  * <!-- begin-model-doc -->
  * Dimension specifies two lengths (width and height) along the x and y axes in some x-y coordinate system.
  * <!-- end-model-doc -->
- *
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.dd.dc.Dimension#getWidth <em>Width</em>}</li>
- *   <li>{@link org.eclipse.papyrus.dd.dc.Dimension#getHeight <em>Height</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dc.Dimension#getWidth <em>Width</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dc.Dimension#getHeight <em>Height</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.dd.dc.DCPackage#getDimension()
  * @model
  * @generated
@@ -57,7 +56,9 @@ public interface Dimension extends EObject {
 	/**
 	 * Sets the value of the '{@link org.eclipse.papyrus.dd.dc.Dimension#getWidth <em>Width</em>}' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Width</em>' attribute.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Width</em>' attribute.
 	 * @see #isSetWidth()
 	 * @see #unsetWidth()
 	 * @see #getWidth()
@@ -68,6 +69,7 @@ public interface Dimension extends EObject {
 	/**
 	 * Unsets the value of the '{@link org.eclipse.papyrus.dd.dc.Dimension#getWidth <em>Width</em>}' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isSetWidth()
 	 * @see #getWidth()
 	 * @see #setWidth(double)
@@ -78,6 +80,7 @@ public interface Dimension extends EObject {
 	/**
 	 * Returns whether the value of the '{@link org.eclipse.papyrus.dd.dc.Dimension#getWidth <em>Width</em>}' attribute is set.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return whether the value of the '<em>Width</em>' attribute is set.
 	 * @see #unsetWidth()
 	 * @see #getWidth()
@@ -104,7 +107,9 @@ public interface Dimension extends EObject {
 	/**
 	 * Sets the value of the '{@link org.eclipse.papyrus.dd.dc.Dimension#getHeight <em>Height</em>}' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Height</em>' attribute.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Height</em>' attribute.
 	 * @see #isSetHeight()
 	 * @see #unsetHeight()
 	 * @see #getHeight()
@@ -115,6 +120,7 @@ public interface Dimension extends EObject {
 	/**
 	 * Unsets the value of the '{@link org.eclipse.papyrus.dd.dc.Dimension#getHeight <em>Height</em>}' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isSetHeight()
 	 * @see #getHeight()
 	 * @see #setHeight(double)
@@ -125,6 +131,7 @@ public interface Dimension extends EObject {
 	/**
 	 * Returns whether the value of the '{@link org.eclipse.papyrus.dd.dc.Dimension#getHeight <em>Height</em>}' attribute is set.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return whether the value of the '<em>Height</em>' attribute is set.
 	 * @see #unsetHeight()
 	 * @see #getHeight()
@@ -138,31 +145,28 @@ public interface Dimension extends EObject {
 	 * the width of a dimension cannot be negative
 	 * 
 	 * @param diagnostics
-	 *            The chain of diagnostics to which problems are to be appended.
+	 *        The chain of diagnostics to which problems are to be appended.
 	 * @param context
-	 *            The cache of context-specific information. <!-- end-model-doc
-	 *            -->
-	 * @model 
+	 *        The cache of context-specific information. <!-- end-model-doc
+	 *        -->
+	 * @model
 	 *        annotation="http://www.eclipse.org/emf/2002/Ecore/OCL body='width >=0'"
 	 * @generated
 	 */
-	boolean nonNegativeWidth(DiagnosticChain diagnostics,
-			Map<Object, Object> context);
+	boolean nonNegativeWidth(DiagnosticChain diagnostics, Map<Object, Object> context);
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc --> <!-- begin-model-doc -->
 	 * the height of a dimension cannot be negative
 	 * 
 	 * @param diagnostics
-	 *            The chain of diagnostics to which problems are to be appended.
+	 *        The chain of diagnostics to which problems are to be appended.
 	 * @param context
-	 *            The cache of context-specific information. <!-- end-model-doc
-	 *            -->
-	 * @model 
+	 *        The cache of context-specific information. <!-- end-model-doc
+	 *        -->
+	 * @model
 	 *        annotation="http://www.eclipse.org/emf/2002/Ecore/OCL body='height >=0'"
 	 * @generated
 	 */
-	boolean nonNegativeHeight(DiagnosticChain diagnostics,
-			Map<Object, Object> context);
-
+	boolean nonNegativeHeight(DiagnosticChain diagnostics, Map<Object, Object> context);
 } // Dimension
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/KnownColor.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/KnownColor.java
index b08e6b71175..242470a17be 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/KnownColor.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/KnownColor.java
@@ -18,8 +18,8 @@ import java.util.List;
 import org.eclipse.emf.common.util.Enumerator;
 
 /**
- * <!-- begin-user-doc --> A representation of the literals of the enumeration '
- * <em><b>Known Color</b></em>', and utility methods for working with them. <!--
+ * <!-- begin-user-doc --> A representation of the literals of the enumeration ' <em><b>Known Color</b></em>', and utility methods for working with
+ * them. <!--
  * end-user-doc --> <!-- begin-model-doc --> KnownColor is an enumeration of 17
  * known colors. <!-- end-model-doc -->
  * 
@@ -32,166 +32,167 @@ public enum KnownColor implements Enumerator {
 	 * The '<em><b>Maroon</b></em>' literal object.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @see #MAROON_VALUE
 	 * @generated
 	 * @ordered
 	 */
 	MAROON(0, "maroon", "#800000"),
-
 	/**
 	 * The '<em><b>Red</b></em>' literal object.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @see #RED_VALUE
 	 * @generated
 	 * @ordered
 	 */
 	RED(1, "red", "#FF0000"),
-
 	/**
 	 * The '<em><b>Orange</b></em>' literal object.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @see #ORANGE_VALUE
 	 * @generated
 	 * @ordered
 	 */
 	ORANGE(2, "orange", "#FFA500"),
-
 	/**
 	 * The '<em><b>Yellow</b></em>' literal object.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @see #YELLOW_VALUE
 	 * @generated
 	 * @ordered
 	 */
 	YELLOW(3, "yellow", "#FFFF00"),
-
 	/**
 	 * The '<em><b>Olive</b></em>' literal object.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @see #OLIVE_VALUE
 	 * @generated
 	 * @ordered
 	 */
 	OLIVE(4, "olive", "#808000"),
-
 	/**
 	 * The '<em><b>Purple</b></em>' literal object.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @see #PURPLE_VALUE
 	 * @generated
 	 * @ordered
 	 */
 	PURPLE(5, "purple", "#800080"),
-
 	/**
 	 * The '<em><b>Fuchsia</b></em>' literal object.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #FUCHSIA_VALUE
 	 * @generated
 	 * @ordered
 	 */
 	FUCHSIA(6, "fuchsia", "#FF00FF"),
-
 	/**
 	 * The '<em><b>White</b></em>' literal object.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @see #WHITE_VALUE
 	 * @generated
 	 * @ordered
 	 */
 	WHITE(7, "white", "#FFFFFF"),
-
 	/**
 	 * The '<em><b>Lime</b></em>' literal object.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @see #LIME_VALUE
 	 * @generated
 	 * @ordered
 	 */
 	LIME(8, "lime", "#00FF00"),
-
 	/**
 	 * The '<em><b>Green</b></em>' literal object.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @see #GREEN_VALUE
 	 * @generated
 	 * @ordered
 	 */
 	GREEN(9, "green", "#008000"),
-
 	/**
 	 * The '<em><b>Navy</b></em>' literal object.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @see #NAVY_VALUE
 	 * @generated
 	 * @ordered
 	 */
 	NAVY(10, "navy", "#000080"),
-
 	/**
 	 * The '<em><b>Blue</b></em>' literal object.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @see #BLUE_VALUE
 	 * @generated
 	 * @ordered
 	 */
 	BLUE(11, "blue", "#0000FF"),
-
 	/**
 	 * The '<em><b>Aqua</b></em>' literal object.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @see #AQUA_VALUE
 	 * @generated
 	 * @ordered
 	 */
 	AQUA(12, "aqua", "#00FFFF"),
-
 	/**
 	 * The '<em><b>Teal</b></em>' literal object.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @see #TEAL_VALUE
 	 * @generated
 	 * @ordered
 	 */
 	TEAL(13, "teal", "#008080"),
-
 	/**
 	 * The '<em><b>Black</b></em>' literal object.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @see #BLACK_VALUE
 	 * @generated
 	 * @ordered
 	 */
 	BLACK(14, "black", "#000000"),
-
 	/**
 	 * The '<em><b>Silver</b></em>' literal object.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @see #SILVER_VALUE
 	 * @generated
 	 * @ordered
 	 */
 	SILVER(15, "silver", "#C0C0C0"),
-
 	/**
 	 * The '<em><b>Gray</b></em>' literal object.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @see #GRAY_VALUE
 	 * @generated
 	 * @ordered
@@ -408,29 +409,12 @@ public enum KnownColor implements Enumerator {
 	 * 
 	 * @generated
 	 */
-	private static final KnownColor[] VALUES_ARRAY = new KnownColor[] {
-			MAROON,
-			RED,
-			ORANGE,
-			YELLOW,
-			OLIVE,
-			PURPLE,
-			FUCHSIA,
-			WHITE,
-			LIME,
-			GREEN,
-			NAVY,
-			BLUE,
-			AQUA,
-			TEAL,
-			BLACK,
-			SILVER,
-			GRAY,
-		};
+	private static final KnownColor[] VALUES_ARRAY = new KnownColor[]{ MAROON, RED, ORANGE, YELLOW, OLIVE, PURPLE, FUCHSIA, WHITE, LIME, GREEN, NAVY, BLUE, AQUA, TEAL, BLACK, SILVER, GRAY, };
 
 	/**
 	 * A public read-only list of all the '<em><b>Known Color</b></em>' enumerators.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static final List<KnownColor> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
@@ -438,12 +422,13 @@ public enum KnownColor implements Enumerator {
 	/**
 	 * Returns the '<em><b>Known Color</b></em>' literal with the specified literal value.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static KnownColor get(String literal) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+		for(int i = 0; i < VALUES_ARRAY.length; ++i) {
 			KnownColor result = VALUES_ARRAY[i];
-			if (result.toString().equals(literal)) {
+			if(result.toString().equals(literal)) {
 				return result;
 			}
 		}
@@ -453,12 +438,13 @@ public enum KnownColor implements Enumerator {
 	/**
 	 * Returns the '<em><b>Known Color</b></em>' literal with the specified name.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static KnownColor getByName(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+		for(int i = 0; i < VALUES_ARRAY.length; ++i) {
 			KnownColor result = VALUES_ARRAY[i];
-			if (result.getName().equals(name)) {
+			if(result.getName().equals(name)) {
 				return result;
 			}
 		}
@@ -468,45 +454,66 @@ public enum KnownColor implements Enumerator {
 	/**
 	 * Returns the '<em><b>Known Color</b></em>' literal with the specified integer value.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static KnownColor get(int value) {
-		switch (value) {
-			case MAROON_VALUE: return MAROON;
-			case RED_VALUE: return RED;
-			case ORANGE_VALUE: return ORANGE;
-			case YELLOW_VALUE: return YELLOW;
-			case OLIVE_VALUE: return OLIVE;
-			case PURPLE_VALUE: return PURPLE;
-			case FUCHSIA_VALUE: return FUCHSIA;
-			case WHITE_VALUE: return WHITE;
-			case LIME_VALUE: return LIME;
-			case GREEN_VALUE: return GREEN;
-			case NAVY_VALUE: return NAVY;
-			case BLUE_VALUE: return BLUE;
-			case AQUA_VALUE: return AQUA;
-			case TEAL_VALUE: return TEAL;
-			case BLACK_VALUE: return BLACK;
-			case SILVER_VALUE: return SILVER;
-			case GRAY_VALUE: return GRAY;
+		switch(value) {
+		case MAROON_VALUE:
+			return MAROON;
+		case RED_VALUE:
+			return RED;
+		case ORANGE_VALUE:
+			return ORANGE;
+		case YELLOW_VALUE:
+			return YELLOW;
+		case OLIVE_VALUE:
+			return OLIVE;
+		case PURPLE_VALUE:
+			return PURPLE;
+		case FUCHSIA_VALUE:
+			return FUCHSIA;
+		case WHITE_VALUE:
+			return WHITE;
+		case LIME_VALUE:
+			return LIME;
+		case GREEN_VALUE:
+			return GREEN;
+		case NAVY_VALUE:
+			return NAVY;
+		case BLUE_VALUE:
+			return BLUE;
+		case AQUA_VALUE:
+			return AQUA;
+		case TEAL_VALUE:
+			return TEAL;
+		case BLACK_VALUE:
+			return BLACK;
+		case SILVER_VALUE:
+			return SILVER;
+		case GRAY_VALUE:
+			return GRAY;
 		}
 		return null;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private final int value;
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private final String name;
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private final String literal;
@@ -515,6 +522,7 @@ public enum KnownColor implements Enumerator {
 	 * Only this class can construct instances.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private KnownColor(int value, String name, String literal) {
@@ -525,36 +533,39 @@ public enum KnownColor implements Enumerator {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public int getValue() {
-	  return value;
+		return value;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getName() {
-	  return name;
+		return name;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getLiteral() {
-	  return literal;
+		return literal;
 	}
 
 	/**
 	 * Returns the literal value of the enumerator, which is its string representation.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
 		return literal;
 	}
-
 } // KnownColor
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/Point.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/Point.java
index 1f14eeeac17..8b5162a07f5 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/Point.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/Point.java
@@ -14,21 +14,20 @@ package org.eclipse.papyrus.dd.dc;
 import org.eclipse.emf.ecore.EObject;
 
 /**
- * <!-- begin-user-doc --> A representation of the model object '
- * <em><b>Point</b></em>'. <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object ' <em><b>Point</b></em>'. <!-- end-user-doc -->
+ * 
  * <!-- begin-model-doc -->
  * A Point specifies an location in some x-y coordinate system.
  * <!-- end-model-doc -->
- *
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.dd.dc.Point#getX <em>X</em>}</li>
- *   <li>{@link org.eclipse.papyrus.dd.dc.Point#getY <em>Y</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dc.Point#getX <em>X</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dc.Point#getY <em>Y</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.dd.dc.DCPackage#getPoint()
  * @model
  * @generated
@@ -53,7 +52,9 @@ public interface Point extends EObject {
 	/**
 	 * Sets the value of the '{@link org.eclipse.papyrus.dd.dc.Point#getX <em>X</em>}' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @param value the new value of the '<em>X</em>' attribute.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>X</em>' attribute.
 	 * @see #isSetX()
 	 * @see #unsetX()
 	 * @see #getX()
@@ -64,6 +65,7 @@ public interface Point extends EObject {
 	/**
 	 * Unsets the value of the '{@link org.eclipse.papyrus.dd.dc.Point#getX <em>X</em>}' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isSetX()
 	 * @see #getX()
 	 * @see #setX(double)
@@ -74,6 +76,7 @@ public interface Point extends EObject {
 	/**
 	 * Returns whether the value of the '{@link org.eclipse.papyrus.dd.dc.Point#getX <em>X</em>}' attribute is set.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return whether the value of the '<em>X</em>' attribute is set.
 	 * @see #unsetX()
 	 * @see #getX()
@@ -100,7 +103,9 @@ public interface Point extends EObject {
 	/**
 	 * Sets the value of the '{@link org.eclipse.papyrus.dd.dc.Point#getY <em>Y</em>}' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Y</em>' attribute.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Y</em>' attribute.
 	 * @see #isSetY()
 	 * @see #unsetY()
 	 * @see #getY()
@@ -111,6 +116,7 @@ public interface Point extends EObject {
 	/**
 	 * Unsets the value of the '{@link org.eclipse.papyrus.dd.dc.Point#getY <em>Y</em>}' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isSetY()
 	 * @see #getY()
 	 * @see #setY(double)
@@ -121,6 +127,7 @@ public interface Point extends EObject {
 	/**
 	 * Returns whether the value of the '{@link org.eclipse.papyrus.dd.dc.Point#getY <em>Y</em>}' attribute is set.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return whether the value of the '<em>Y</em>' attribute is set.
 	 * @see #unsetY()
 	 * @see #getY()
@@ -128,5 +135,4 @@ public interface Point extends EObject {
 	 * @generated
 	 */
 	boolean isSetY();
-
 } // Point
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/impl/BoundsImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/impl/BoundsImpl.java
index e782b9357ff..4fd90b775fd 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/impl/BoundsImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/impl/BoundsImpl.java
@@ -32,18 +32,17 @@ import org.eclipse.papyrus.dd.dc.DCPackage;
 import org.eclipse.papyrus.dd.dc.util.DCValidator;
 
 /**
- * <!-- begin-user-doc --> An implementation of the model object '
- * <em><b>Bounds</b></em>'. <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object ' <em><b>Bounds</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.dd.dc.impl.BoundsImpl#getX <em>X</em>}</li>
- *   <li>{@link org.eclipse.papyrus.dd.dc.impl.BoundsImpl#getY <em>Y</em>}</li>
- *   <li>{@link org.eclipse.papyrus.dd.dc.impl.BoundsImpl#getWidth <em>Width</em>}</li>
- *   <li>{@link org.eclipse.papyrus.dd.dc.impl.BoundsImpl#getHeight <em>Height</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dc.impl.BoundsImpl#getX <em>X</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dc.impl.BoundsImpl#getY <em>Y</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dc.impl.BoundsImpl#getWidth <em>Width</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dc.impl.BoundsImpl#getHeight <em>Height</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class BoundsImpl extends MinimalEObjectImpl.Container implements Bounds {
@@ -72,6 +71,7 @@ public class BoundsImpl extends MinimalEObjectImpl.Container implements Bounds {
 	 * This is true if the X attribute has been set.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -101,6 +101,7 @@ public class BoundsImpl extends MinimalEObjectImpl.Container implements Bounds {
 	 * This is true if the Y attribute has been set.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -109,6 +110,7 @@ public class BoundsImpl extends MinimalEObjectImpl.Container implements Bounds {
 	/**
 	 * The default value of the '{@link #getWidth() <em>Width</em>}' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getWidth()
 	 * @generated
 	 * @ordered
@@ -118,6 +120,7 @@ public class BoundsImpl extends MinimalEObjectImpl.Container implements Bounds {
 	/**
 	 * The cached value of the '{@link #getWidth() <em>Width</em>}' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getWidth()
 	 * @generated
 	 * @ordered
@@ -128,6 +131,7 @@ public class BoundsImpl extends MinimalEObjectImpl.Container implements Bounds {
 	 * This is true if the Width attribute has been set.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -136,6 +140,7 @@ public class BoundsImpl extends MinimalEObjectImpl.Container implements Bounds {
 	/**
 	 * The default value of the '{@link #getHeight() <em>Height</em>}' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getHeight()
 	 * @generated
 	 * @ordered
@@ -145,6 +150,7 @@ public class BoundsImpl extends MinimalEObjectImpl.Container implements Bounds {
 	/**
 	 * The cached value of the '{@link #getHeight() <em>Height</em>}' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getHeight()
 	 * @generated
 	 * @ordered
@@ -155,6 +161,7 @@ public class BoundsImpl extends MinimalEObjectImpl.Container implements Bounds {
 	 * This is true if the Height attribute has been set.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -162,6 +169,7 @@ public class BoundsImpl extends MinimalEObjectImpl.Container implements Bounds {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected BoundsImpl() {
@@ -170,6 +178,7 @@ public class BoundsImpl extends MinimalEObjectImpl.Container implements Bounds {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -179,6 +188,7 @@ public class BoundsImpl extends MinimalEObjectImpl.Container implements Bounds {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public double getX() {
@@ -187,6 +197,7 @@ public class BoundsImpl extends MinimalEObjectImpl.Container implements Bounds {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setX(double newX) {
@@ -194,12 +205,13 @@ public class BoundsImpl extends MinimalEObjectImpl.Container implements Bounds {
 		x = newX;
 		boolean oldXESet = xESet;
 		xESet = true;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, DCPackage.BOUNDS__X, oldX, x, !oldXESet));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void unsetX() {
@@ -207,12 +219,13 @@ public class BoundsImpl extends MinimalEObjectImpl.Container implements Bounds {
 		boolean oldXESet = xESet;
 		x = X_EDEFAULT;
 		xESet = false;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.UNSET, DCPackage.BOUNDS__X, oldX, X_EDEFAULT, oldXESet));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetX() {
@@ -221,6 +234,7 @@ public class BoundsImpl extends MinimalEObjectImpl.Container implements Bounds {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public double getY() {
@@ -229,6 +243,7 @@ public class BoundsImpl extends MinimalEObjectImpl.Container implements Bounds {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setY(double newY) {
@@ -236,12 +251,13 @@ public class BoundsImpl extends MinimalEObjectImpl.Container implements Bounds {
 		y = newY;
 		boolean oldYESet = yESet;
 		yESet = true;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, DCPackage.BOUNDS__Y, oldY, y, !oldYESet));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void unsetY() {
@@ -249,12 +265,13 @@ public class BoundsImpl extends MinimalEObjectImpl.Container implements Bounds {
 		boolean oldYESet = yESet;
 		y = Y_EDEFAULT;
 		yESet = false;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.UNSET, DCPackage.BOUNDS__Y, oldY, Y_EDEFAULT, oldYESet));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetY() {
@@ -263,6 +280,7 @@ public class BoundsImpl extends MinimalEObjectImpl.Container implements Bounds {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public double getWidth() {
@@ -271,6 +289,7 @@ public class BoundsImpl extends MinimalEObjectImpl.Container implements Bounds {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setWidth(double newWidth) {
@@ -278,12 +297,13 @@ public class BoundsImpl extends MinimalEObjectImpl.Container implements Bounds {
 		width = newWidth;
 		boolean oldWidthESet = widthESet;
 		widthESet = true;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, DCPackage.BOUNDS__WIDTH, oldWidth, width, !oldWidthESet));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void unsetWidth() {
@@ -291,12 +311,13 @@ public class BoundsImpl extends MinimalEObjectImpl.Container implements Bounds {
 		boolean oldWidthESet = widthESet;
 		width = WIDTH_EDEFAULT;
 		widthESet = false;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.UNSET, DCPackage.BOUNDS__WIDTH, oldWidth, WIDTH_EDEFAULT, oldWidthESet));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetWidth() {
@@ -305,6 +326,7 @@ public class BoundsImpl extends MinimalEObjectImpl.Container implements Bounds {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public double getHeight() {
@@ -313,6 +335,7 @@ public class BoundsImpl extends MinimalEObjectImpl.Container implements Bounds {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setHeight(double newHeight) {
@@ -320,12 +343,13 @@ public class BoundsImpl extends MinimalEObjectImpl.Container implements Bounds {
 		height = newHeight;
 		boolean oldHeightESet = heightESet;
 		heightESet = true;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, DCPackage.BOUNDS__HEIGHT, oldHeight, height, !oldHeightESet));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void unsetHeight() {
@@ -333,12 +357,13 @@ public class BoundsImpl extends MinimalEObjectImpl.Container implements Bounds {
 		boolean oldHeightESet = heightESet;
 		height = HEIGHT_EDEFAULT;
 		heightESet = false;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.UNSET, DCPackage.BOUNDS__HEIGHT, oldHeight, HEIGHT_EDEFAULT, oldHeightESet));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetHeight() {
@@ -346,9 +371,11 @@ public class BoundsImpl extends MinimalEObjectImpl.Container implements Bounds {
 	}
 
 	/**
-	 * The cached validation expression for the '{@link #nonNegativeWidth(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Non Negative Width</em>}' invariant operation.
+	 * The cached validation expression for the '{@link #nonNegativeWidth(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
+	 * <em>Non Negative Width</em>}' invariant operation.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @see #nonNegativeWidth(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
 	 * @generated
 	 * @ordered
@@ -357,28 +384,19 @@ public class BoundsImpl extends MinimalEObjectImpl.Container implements Bounds {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public boolean nonNegativeWidth(DiagnosticChain diagnostics,
-			Map<Object, Object> context) {
-		return
-			DCValidator.validate
-				(DCPackage.Literals.BOUNDS,
-				 this,
-				 diagnostics,
-				 context,
-				 "http://www.eclipse.org/emf/2002/Ecore/OCL",
-				 DCPackage.Literals.BOUNDS___NON_NEGATIVE_WIDTH__DIAGNOSTICCHAIN_MAP,
-				 NON_NEGATIVE_WIDTH_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION,
-				 Diagnostic.ERROR,
-				 DCValidator.DIAGNOSTIC_SOURCE,
-				 DCValidator.BOUNDS__NON_NEGATIVE_WIDTH);
+	public boolean nonNegativeWidth(DiagnosticChain diagnostics, Map<Object, Object> context) {
+		return DCValidator.validate(DCPackage.Literals.BOUNDS, this, diagnostics, context, "http://www.eclipse.org/emf/2002/Ecore/OCL", DCPackage.Literals.BOUNDS___NON_NEGATIVE_WIDTH__DIAGNOSTICCHAIN_MAP, NON_NEGATIVE_WIDTH_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION, Diagnostic.ERROR, DCValidator.DIAGNOSTIC_SOURCE, DCValidator.BOUNDS__NON_NEGATIVE_WIDTH);
 	}
 
 	/**
-	 * The cached validation expression for the '{@link #nonNegativeHeight(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Non Negative Height</em>}' invariant operation.
+	 * The cached validation expression for the '{@link #nonNegativeHeight(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
+	 * <em>Non Negative Height</em>}' invariant operation.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @see #nonNegativeHeight(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
 	 * @generated
 	 * @ordered
@@ -387,144 +405,149 @@ public class BoundsImpl extends MinimalEObjectImpl.Container implements Bounds {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public boolean nonNegativeHeight(DiagnosticChain diagnostics,
-			Map<Object, Object> context) {
-		return
-			DCValidator.validate
-				(DCPackage.Literals.BOUNDS,
-				 this,
-				 diagnostics,
-				 context,
-				 "http://www.eclipse.org/emf/2002/Ecore/OCL",
-				 DCPackage.Literals.BOUNDS___NON_NEGATIVE_HEIGHT__DIAGNOSTICCHAIN_MAP,
-				 NON_NEGATIVE_HEIGHT_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION,
-				 Diagnostic.ERROR,
-				 DCValidator.DIAGNOSTIC_SOURCE,
-				 DCValidator.BOUNDS__NON_NEGATIVE_HEIGHT);
+	public boolean nonNegativeHeight(DiagnosticChain diagnostics, Map<Object, Object> context) {
+		return DCValidator.validate(DCPackage.Literals.BOUNDS, this, diagnostics, context, "http://www.eclipse.org/emf/2002/Ecore/OCL", DCPackage.Literals.BOUNDS___NON_NEGATIVE_HEIGHT__DIAGNOSTICCHAIN_MAP, NON_NEGATIVE_HEIGHT_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION, Diagnostic.ERROR, DCValidator.DIAGNOSTIC_SOURCE, DCValidator.BOUNDS__NON_NEGATIVE_HEIGHT);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case DCPackage.BOUNDS__X:
-				return getX();
-			case DCPackage.BOUNDS__Y:
-				return getY();
-			case DCPackage.BOUNDS__WIDTH:
-				return getWidth();
-			case DCPackage.BOUNDS__HEIGHT:
-				return getHeight();
+		switch(featureID) {
+		case DCPackage.BOUNDS__X:
+			return getX();
+		case DCPackage.BOUNDS__Y:
+			return getY();
+		case DCPackage.BOUNDS__WIDTH:
+			return getWidth();
+		case DCPackage.BOUNDS__HEIGHT:
+			return getHeight();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case DCPackage.BOUNDS__X:
-				setX((Double)newValue);
-				return;
-			case DCPackage.BOUNDS__Y:
-				setY((Double)newValue);
-				return;
-			case DCPackage.BOUNDS__WIDTH:
-				setWidth((Double)newValue);
-				return;
-			case DCPackage.BOUNDS__HEIGHT:
-				setHeight((Double)newValue);
-				return;
+		switch(featureID) {
+		case DCPackage.BOUNDS__X:
+			setX((Double)newValue);
+			return;
+		case DCPackage.BOUNDS__Y:
+			setY((Double)newValue);
+			return;
+		case DCPackage.BOUNDS__WIDTH:
+			setWidth((Double)newValue);
+			return;
+		case DCPackage.BOUNDS__HEIGHT:
+			setHeight((Double)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case DCPackage.BOUNDS__X:
-				unsetX();
-				return;
-			case DCPackage.BOUNDS__Y:
-				unsetY();
-				return;
-			case DCPackage.BOUNDS__WIDTH:
-				unsetWidth();
-				return;
-			case DCPackage.BOUNDS__HEIGHT:
-				unsetHeight();
-				return;
+		switch(featureID) {
+		case DCPackage.BOUNDS__X:
+			unsetX();
+			return;
+		case DCPackage.BOUNDS__Y:
+			unsetY();
+			return;
+		case DCPackage.BOUNDS__WIDTH:
+			unsetWidth();
+			return;
+		case DCPackage.BOUNDS__HEIGHT:
+			unsetHeight();
+			return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case DCPackage.BOUNDS__X:
-				return isSetX();
-			case DCPackage.BOUNDS__Y:
-				return isSetY();
-			case DCPackage.BOUNDS__WIDTH:
-				return isSetWidth();
-			case DCPackage.BOUNDS__HEIGHT:
-				return isSetHeight();
+		switch(featureID) {
+		case DCPackage.BOUNDS__X:
+			return isSetX();
+		case DCPackage.BOUNDS__Y:
+			return isSetY();
+		case DCPackage.BOUNDS__WIDTH:
+			return isSetWidth();
+		case DCPackage.BOUNDS__HEIGHT:
+			return isSetHeight();
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	@SuppressWarnings("unchecked")
-	public Object eInvoke(int operationID, EList<?> arguments)
-			throws InvocationTargetException {
-		switch (operationID) {
-			case DCPackage.BOUNDS___NON_NEGATIVE_WIDTH__DIAGNOSTICCHAIN_MAP:
-				return nonNegativeWidth((DiagnosticChain)arguments.get(0), (Map<Object, Object>)arguments.get(1));
-			case DCPackage.BOUNDS___NON_NEGATIVE_HEIGHT__DIAGNOSTICCHAIN_MAP:
-				return nonNegativeHeight((DiagnosticChain)arguments.get(0), (Map<Object, Object>)arguments.get(1));
+	public Object eInvoke(int operationID, EList<?> arguments) throws InvocationTargetException {
+		switch(operationID) {
+		case DCPackage.BOUNDS___NON_NEGATIVE_WIDTH__DIAGNOSTICCHAIN_MAP:
+			return nonNegativeWidth((DiagnosticChain)arguments.get(0), (Map<Object, Object>)arguments.get(1));
+		case DCPackage.BOUNDS___NON_NEGATIVE_HEIGHT__DIAGNOSTICCHAIN_MAP:
+			return nonNegativeHeight((DiagnosticChain)arguments.get(0), (Map<Object, Object>)arguments.get(1));
 		}
 		return super.eInvoke(operationID, arguments);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) return super.toString();
-
+		if(eIsProxy())
+			return super.toString();
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (x: ");
-		if (xESet) result.append(x); else result.append("<unset>");
+		if(xESet)
+			result.append(x);
+		else
+			result.append("<unset>");
 		result.append(", y: ");
-		if (yESet) result.append(y); else result.append("<unset>");
+		if(yESet)
+			result.append(y);
+		else
+			result.append("<unset>");
 		result.append(", width: ");
-		if (widthESet) result.append(width); else result.append("<unset>");
+		if(widthESet)
+			result.append(width);
+		else
+			result.append("<unset>");
 		result.append(", height: ");
-		if (heightESet) result.append(height); else result.append("<unset>");
+		if(heightESet)
+			result.append(height);
+		else
+			result.append("<unset>");
 		result.append(')');
 		return result.toString();
 	}
-
 } // BoundsImpl
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/impl/DCFactoryImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/impl/DCFactoryImpl.java
index f956501aad9..06ced0e6f4b 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/impl/DCFactoryImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/impl/DCFactoryImpl.java
@@ -27,6 +27,7 @@ import org.eclipse.papyrus.dd.dc.*;
 /**
  * <!-- begin-user-doc --> An implementation of the model <b>Factory</b>. <!--
  * end-user-doc -->
+ * 
  * @generated
  */
 public class DCFactoryImpl extends EFactoryImpl implements DCFactory {
@@ -35,16 +36,16 @@ public class DCFactoryImpl extends EFactoryImpl implements DCFactory {
 	 * Creates the default factory implementation.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static DCFactory init() {
 		try {
 			DCFactory theDCFactory = (DCFactory)EPackage.Registry.INSTANCE.getEFactory(DCPackage.eNS_URI);
-			if (theDCFactory != null) {
+			if(theDCFactory != null) {
 				return theDCFactory;
 			}
-		}
-		catch (Exception exception) {
+		} catch (Exception exception) {
 			EcorePlugin.INSTANCE.log(exception);
 		}
 		return new DCFactoryImpl();
@@ -54,6 +55,7 @@ public class DCFactoryImpl extends EFactoryImpl implements DCFactory {
 	 * Creates an instance of the factory.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public DCFactoryImpl() {
@@ -62,69 +64,76 @@ public class DCFactoryImpl extends EFactoryImpl implements DCFactory {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public EObject create(EClass eClass) {
-		switch (eClass.getClassifierID()) {
-			case DCPackage.POINT: return createPoint();
-			case DCPackage.DIMENSION: return createDimension();
-			case DCPackage.BOUNDS: return createBounds();
-			default:
-				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
+		switch(eClass.getClassifierID()) {
+		case DCPackage.POINT:
+			return createPoint();
+		case DCPackage.DIMENSION:
+			return createDimension();
+		case DCPackage.BOUNDS:
+			return createBounds();
+		default:
+			throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
 		}
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object createFromString(EDataType eDataType, String initialValue) {
-		switch (eDataType.getClassifierID()) {
-			case DCPackage.KNOWN_COLOR:
-				return createKnownColorFromString(eDataType, initialValue);
-			case DCPackage.BOOLEAN:
-				return createBooleanFromString(eDataType, initialValue);
-			case DCPackage.INTEGER:
-				return createIntegerFromString(eDataType, initialValue);
-			case DCPackage.REAL:
-				return createRealFromString(eDataType, initialValue);
-			case DCPackage.STRING:
-				return createStringFromString(eDataType, initialValue);
-			case DCPackage.COLOR:
-				return createColorFromString(eDataType, initialValue);
-			default:
-				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
+		switch(eDataType.getClassifierID()) {
+		case DCPackage.KNOWN_COLOR:
+			return createKnownColorFromString(eDataType, initialValue);
+		case DCPackage.BOOLEAN:
+			return createBooleanFromString(eDataType, initialValue);
+		case DCPackage.INTEGER:
+			return createIntegerFromString(eDataType, initialValue);
+		case DCPackage.REAL:
+			return createRealFromString(eDataType, initialValue);
+		case DCPackage.STRING:
+			return createStringFromString(eDataType, initialValue);
+		case DCPackage.COLOR:
+			return createColorFromString(eDataType, initialValue);
+		default:
+			throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
 		}
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String convertToString(EDataType eDataType, Object instanceValue) {
-		switch (eDataType.getClassifierID()) {
-			case DCPackage.KNOWN_COLOR:
-				return convertKnownColorToString(eDataType, instanceValue);
-			case DCPackage.BOOLEAN:
-				return convertBooleanToString(eDataType, instanceValue);
-			case DCPackage.INTEGER:
-				return convertIntegerToString(eDataType, instanceValue);
-			case DCPackage.REAL:
-				return convertRealToString(eDataType, instanceValue);
-			case DCPackage.STRING:
-				return convertStringToString(eDataType, instanceValue);
-			case DCPackage.COLOR:
-				return convertColorToString(eDataType, instanceValue);
-			default:
-				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
+		switch(eDataType.getClassifierID()) {
+		case DCPackage.KNOWN_COLOR:
+			return convertKnownColorToString(eDataType, instanceValue);
+		case DCPackage.BOOLEAN:
+			return convertBooleanToString(eDataType, instanceValue);
+		case DCPackage.INTEGER:
+			return convertIntegerToString(eDataType, instanceValue);
+		case DCPackage.REAL:
+			return convertRealToString(eDataType, instanceValue);
+		case DCPackage.STRING:
+			return convertStringToString(eDataType, instanceValue);
+		case DCPackage.COLOR:
+			return convertColorToString(eDataType, instanceValue);
+		default:
+			throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
 		}
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Point createPoint() {
@@ -134,6 +143,7 @@ public class DCFactoryImpl extends EFactoryImpl implements DCFactory {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Dimension createDimension() {
@@ -143,6 +153,7 @@ public class DCFactoryImpl extends EFactoryImpl implements DCFactory {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Bounds createBounds() {
@@ -152,62 +163,64 @@ public class DCFactoryImpl extends EFactoryImpl implements DCFactory {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public KnownColor createKnownColorFromString(EDataType eDataType,
-			String initialValue) {
+	public KnownColor createKnownColorFromString(EDataType eDataType, String initialValue) {
 		KnownColor result = KnownColor.get(initialValue);
-		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
+		if(result == null)
+			throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
 		return result;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public String convertKnownColorToString(EDataType eDataType,
-			Object instanceValue) {
+	public String convertKnownColorToString(EDataType eDataType, Object instanceValue) {
 		return instanceValue == null ? null : instanceValue.toString();
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public Boolean createBooleanFromString(EDataType eDataType,
-			String initialValue) {
+	public Boolean createBooleanFromString(EDataType eDataType, String initialValue) {
 		return (Boolean)super.createFromString(eDataType, initialValue);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public String convertBooleanToString(EDataType eDataType,
-			Object instanceValue) {
+	public String convertBooleanToString(EDataType eDataType, Object instanceValue) {
 		return super.convertToString(eDataType, instanceValue);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public Integer createIntegerFromString(EDataType eDataType,
-			String initialValue) {
+	public Integer createIntegerFromString(EDataType eDataType, String initialValue) {
 		return (Integer)super.createFromString(eDataType, initialValue);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public String convertIntegerToString(EDataType eDataType,
-			Object instanceValue) {
+	public String convertIntegerToString(EDataType eDataType, Object instanceValue) {
 		return super.convertToString(eDataType, instanceValue);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Double createRealFromString(EDataType eDataType, String initialValue) {
@@ -216,6 +229,7 @@ public class DCFactoryImpl extends EFactoryImpl implements DCFactory {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String convertRealToString(EDataType eDataType, Object instanceValue) {
@@ -224,19 +238,19 @@ public class DCFactoryImpl extends EFactoryImpl implements DCFactory {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public String createStringFromString(EDataType eDataType,
-			String initialValue) {
+	public String createStringFromString(EDataType eDataType, String initialValue) {
 		return (String)super.createFromString(eDataType, initialValue);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public String convertStringToString(EDataType eDataType,
-			Object instanceValue) {
+	public String convertStringToString(EDataType eDataType, Object instanceValue) {
 		return super.convertToString(eDataType, instanceValue);
 	}
 
@@ -246,7 +260,7 @@ public class DCFactoryImpl extends EFactoryImpl implements DCFactory {
 	 * @generated NOT
 	 */
 	public Color createColorFromString(EDataType eDataType, String initialValue) {
-		if (initialValue == null || initialValue.isEmpty())
+		if(initialValue == null || initialValue.isEmpty())
 			return null;
 		return Color.decode(initialValue);
 	}
@@ -257,15 +271,15 @@ public class DCFactoryImpl extends EFactoryImpl implements DCFactory {
 	 * @generated NOT
 	 */
 	public String convertColorToString(EDataType eDataType, Object instanceValue) {
-		if (instanceValue == null)
+		if(instanceValue == null)
 			return null;
-		Color c = (Color) instanceValue;
-		return String.format("#%02X%02X%02X", c.getRed(), c.getGreen(),
-				c.getBlue());
+		Color c = (Color)instanceValue;
+		return String.format("#%02X%02X%02X", c.getRed(), c.getGreen(), c.getBlue());
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public DCPackage getDCPackage() {
@@ -274,6 +288,7 @@ public class DCFactoryImpl extends EFactoryImpl implements DCFactory {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @deprecated
 	 * @generated
 	 */
@@ -281,5 +296,4 @@ public class DCFactoryImpl extends EFactoryImpl implements DCFactory {
 	public static DCPackage getPackage() {
 		return DCPackage.eINSTANCE;
 	}
-
 } // DCFactoryImpl
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/impl/DCPackageImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/impl/DCPackageImpl.java
index 43cc688b7c1..66dd0fd5eed 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/impl/DCPackageImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/impl/DCPackageImpl.java
@@ -32,73 +32,80 @@ import org.eclipse.papyrus.dd.dc.util.DCValidator;
 /**
  * <!-- begin-user-doc --> An implementation of the model <b>Package</b>. <!--
  * end-user-doc -->
+ * 
  * @generated
  */
 public class DCPackageImpl extends EPackageImpl implements DCPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass pointEClass = null;
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass dimensionEClass = null;
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass boundsEClass = null;
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EEnum knownColorEEnum = null;
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EDataType booleanEDataType = null;
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EDataType integerEDataType = null;
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EDataType realEDataType = null;
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EDataType stringEDataType = null;
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EDataType colorEDataType = null;
 
 	/**
-	 * Creates an instance of the model <b>Package</b>, registered with
-	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the
+	 * Creates an instance of the model <b>Package</b>, registered with {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the
 	 * package package URI value.
 	 * <p>
-	 * Note: the correct way to create the package is via the static factory
-	 * method {@link #init init()}, which also performs initialization of the
-	 * package, or returns the registered package, if one already exists. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
+	 * Note: the correct way to create the package is via the static factory method {@link #init init()}, which also performs initialization of the
+	 * package, or returns the registered package, if one already exists. <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @see org.eclipse.emf.ecore.EPackage.Registry
 	 * @see org.eclipse.papyrus.dd.dc.DCPackage#eNS_URI
@@ -111,6 +118,7 @@ public class DCPackageImpl extends EPackageImpl implements DCPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private static boolean isInited = false;
@@ -120,10 +128,8 @@ public class DCPackageImpl extends EPackageImpl implements DCPackage {
 	 * and for any others upon which it depends.
 	 * 
 	 * <p>
-	 * This method is used to initialize {@link DCPackage#eINSTANCE} when that
-	 * field is accessed. Clients should not invoke it directly. Instead, they
-	 * should simply access that field to obtain the package. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
+	 * This method is used to initialize {@link DCPackage#eINSTANCE} when that field is accessed. Clients should not invoke it directly. Instead, they
+	 * should simply access that field to obtain the package. <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @see #eNS_URI
 	 * @see #createPackageContents()
@@ -131,32 +137,24 @@ public class DCPackageImpl extends EPackageImpl implements DCPackage {
 	 * @generated
 	 */
 	public static DCPackage init() {
-		if (isInited) return (DCPackage)EPackage.Registry.INSTANCE.getEPackage(DCPackage.eNS_URI);
-
+		if(isInited)
+			return (DCPackage)EPackage.Registry.INSTANCE.getEPackage(DCPackage.eNS_URI);
 		// Obtain or create and register package
 		DCPackageImpl theDCPackage = (DCPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof DCPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new DCPackageImpl());
-
 		isInited = true;
-
 		// Create package meta-data objects
 		theDCPackage.createPackageContents();
-
 		// Initialize created meta-data
 		theDCPackage.initializePackageContents();
-
 		// Register package validator
-		EValidator.Registry.INSTANCE.put
-			(theDCPackage, 
-			 new EValidator.Descriptor() {
-				 public EValidator getEValidator() {
-					 return DCValidator.INSTANCE;
-				 }
-			 });
+		EValidator.Registry.INSTANCE.put(theDCPackage, new EValidator.Descriptor() {
 
+			public EValidator getEValidator() {
+				return DCValidator.INSTANCE;
+			}
+		});
 		// Mark meta-data to indicate it can't be changed
 		theDCPackage.freeze();
-
-  
 		// Update the registry and return the package
 		EPackage.Registry.INSTANCE.put(DCPackage.eNS_URI, theDCPackage);
 		return theDCPackage;
@@ -164,6 +162,7 @@ public class DCPackageImpl extends EPackageImpl implements DCPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getPoint() {
@@ -172,6 +171,7 @@ public class DCPackageImpl extends EPackageImpl implements DCPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getPoint_X() {
@@ -180,6 +180,7 @@ public class DCPackageImpl extends EPackageImpl implements DCPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getPoint_Y() {
@@ -188,6 +189,7 @@ public class DCPackageImpl extends EPackageImpl implements DCPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getDimension() {
@@ -196,6 +198,7 @@ public class DCPackageImpl extends EPackageImpl implements DCPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getDimension_Width() {
@@ -204,6 +207,7 @@ public class DCPackageImpl extends EPackageImpl implements DCPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getDimension_Height() {
@@ -212,6 +216,7 @@ public class DCPackageImpl extends EPackageImpl implements DCPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EOperation getDimension__NonNegativeWidth__DiagnosticChain_Map() {
@@ -220,6 +225,7 @@ public class DCPackageImpl extends EPackageImpl implements DCPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EOperation getDimension__NonNegativeHeight__DiagnosticChain_Map() {
@@ -228,6 +234,7 @@ public class DCPackageImpl extends EPackageImpl implements DCPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getBounds() {
@@ -236,6 +243,7 @@ public class DCPackageImpl extends EPackageImpl implements DCPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getBounds_X() {
@@ -244,6 +252,7 @@ public class DCPackageImpl extends EPackageImpl implements DCPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getBounds_Y() {
@@ -252,6 +261,7 @@ public class DCPackageImpl extends EPackageImpl implements DCPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getBounds_Width() {
@@ -260,6 +270,7 @@ public class DCPackageImpl extends EPackageImpl implements DCPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getBounds_Height() {
@@ -268,6 +279,7 @@ public class DCPackageImpl extends EPackageImpl implements DCPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EOperation getBounds__NonNegativeWidth__DiagnosticChain_Map() {
@@ -276,6 +288,7 @@ public class DCPackageImpl extends EPackageImpl implements DCPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EOperation getBounds__NonNegativeHeight__DiagnosticChain_Map() {
@@ -284,6 +297,7 @@ public class DCPackageImpl extends EPackageImpl implements DCPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EEnum getKnownColor() {
@@ -292,6 +306,7 @@ public class DCPackageImpl extends EPackageImpl implements DCPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EDataType getBoolean() {
@@ -300,6 +315,7 @@ public class DCPackageImpl extends EPackageImpl implements DCPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EDataType getInteger() {
@@ -308,6 +324,7 @@ public class DCPackageImpl extends EPackageImpl implements DCPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EDataType getReal() {
@@ -316,6 +333,7 @@ public class DCPackageImpl extends EPackageImpl implements DCPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EDataType getString() {
@@ -324,6 +342,7 @@ public class DCPackageImpl extends EPackageImpl implements DCPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EDataType getColor() {
@@ -332,6 +351,7 @@ public class DCPackageImpl extends EPackageImpl implements DCPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public DCFactory getDCFactory() {
@@ -340,32 +360,32 @@ public class DCPackageImpl extends EPackageImpl implements DCPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private boolean isCreated = false;
 
 	/**
-	 * Creates the meta-model objects for the package.  This method is
+	 * Creates the meta-model objects for the package. This method is
 	 * guarded to have no affect on any invocation but its first.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void createPackageContents() {
-		if (isCreated) return;
+		if(isCreated)
+			return;
 		isCreated = true;
-
 		// Create classes and their features
 		pointEClass = createEClass(POINT);
 		createEAttribute(pointEClass, POINT__X);
 		createEAttribute(pointEClass, POINT__Y);
-
 		dimensionEClass = createEClass(DIMENSION);
 		createEAttribute(dimensionEClass, DIMENSION__WIDTH);
 		createEAttribute(dimensionEClass, DIMENSION__HEIGHT);
 		createEOperation(dimensionEClass, DIMENSION___NON_NEGATIVE_WIDTH__DIAGNOSTICCHAIN_MAP);
 		createEOperation(dimensionEClass, DIMENSION___NON_NEGATIVE_HEIGHT__DIAGNOSTICCHAIN_MAP);
-
 		boundsEClass = createEClass(BOUNDS);
 		createEAttribute(boundsEClass, BOUNDS__X);
 		createEAttribute(boundsEClass, BOUNDS__Y);
@@ -373,10 +393,8 @@ public class DCPackageImpl extends EPackageImpl implements DCPackage {
 		createEAttribute(boundsEClass, BOUNDS__HEIGHT);
 		createEOperation(boundsEClass, BOUNDS___NON_NEGATIVE_WIDTH__DIAGNOSTICCHAIN_MAP);
 		createEOperation(boundsEClass, BOUNDS___NON_NEGATIVE_HEIGHT__DIAGNOSTICCHAIN_MAP);
-
 		// Create enums
 		knownColorEEnum = createEEnum(KNOWN_COLOR);
-
 		// Create data types
 		booleanEDataType = createEDataType(BOOLEAN);
 		integerEDataType = createEDataType(INTEGER);
@@ -387,6 +405,7 @@ public class DCPackageImpl extends EPackageImpl implements DCPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private boolean isInitialized = false;
@@ -399,29 +418,23 @@ public class DCPackageImpl extends EPackageImpl implements DCPackage {
 	 * @generated
 	 */
 	public void initializePackageContents() {
-		if (isInitialized) return;
+		if(isInitialized)
+			return;
 		isInitialized = true;
-
 		// Initialize package
 		setName(eNAME);
 		setNsPrefix(eNS_PREFIX);
 		setNsURI(eNS_URI);
-
 		// Create type parameters
-
 		// Set bounds for type parameters
-
 		// Add supertypes to classes
-
 		// Initialize classes, features, and operations; add parameters
 		initEClass(pointEClass, Point.class, "Point", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEAttribute(getPoint_X(), this.getReal(), "x", "0", 0, 1, Point.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
 		initEAttribute(getPoint_Y(), this.getReal(), "y", "0", 0, 1, Point.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-
 		initEClass(dimensionEClass, Dimension.class, "Dimension", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEAttribute(getDimension_Width(), this.getReal(), "width", "0", 0, 1, Dimension.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
 		initEAttribute(getDimension_Height(), this.getReal(), "height", "0", 0, 1, Dimension.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-
 		EOperation op = initEOperation(getDimension__NonNegativeWidth__DiagnosticChain_Map(), ecorePackage.getEBoolean(), "nonNegativeWidth", 0, 1, IS_UNIQUE, IS_ORDERED);
 		addEParameter(op, ecorePackage.getEDiagnosticChain(), "diagnostics", 0, 1, IS_UNIQUE, IS_ORDERED);
 		EGenericType g1 = createEGenericType(ecorePackage.getEMap());
@@ -430,7 +443,6 @@ public class DCPackageImpl extends EPackageImpl implements DCPackage {
 		g2 = createEGenericType(ecorePackage.getEJavaObject());
 		g1.getETypeArguments().add(g2);
 		addEParameter(op, g1, "context", 0, 1, IS_UNIQUE, IS_ORDERED);
-
 		op = initEOperation(getDimension__NonNegativeHeight__DiagnosticChain_Map(), ecorePackage.getEBoolean(), "nonNegativeHeight", 0, 1, IS_UNIQUE, IS_ORDERED);
 		addEParameter(op, ecorePackage.getEDiagnosticChain(), "diagnostics", 0, 1, IS_UNIQUE, IS_ORDERED);
 		g1 = createEGenericType(ecorePackage.getEMap());
@@ -439,13 +451,11 @@ public class DCPackageImpl extends EPackageImpl implements DCPackage {
 		g2 = createEGenericType(ecorePackage.getEJavaObject());
 		g1.getETypeArguments().add(g2);
 		addEParameter(op, g1, "context", 0, 1, IS_UNIQUE, IS_ORDERED);
-
 		initEClass(boundsEClass, Bounds.class, "Bounds", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEAttribute(getBounds_X(), this.getReal(), "x", "0", 0, 1, Bounds.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
 		initEAttribute(getBounds_Y(), this.getReal(), "y", "0", 0, 1, Bounds.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
 		initEAttribute(getBounds_Width(), this.getReal(), "width", "0", 0, 1, Bounds.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
 		initEAttribute(getBounds_Height(), this.getReal(), "height", "0", 0, 1, Bounds.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-
 		op = initEOperation(getBounds__NonNegativeWidth__DiagnosticChain_Map(), ecorePackage.getEBoolean(), "nonNegativeWidth", 0, 1, IS_UNIQUE, IS_ORDERED);
 		addEParameter(op, ecorePackage.getEDiagnosticChain(), "diagnostics", 0, 1, IS_UNIQUE, IS_ORDERED);
 		g1 = createEGenericType(ecorePackage.getEMap());
@@ -454,7 +464,6 @@ public class DCPackageImpl extends EPackageImpl implements DCPackage {
 		g2 = createEGenericType(ecorePackage.getEJavaObject());
 		g1.getETypeArguments().add(g2);
 		addEParameter(op, g1, "context", 0, 1, IS_UNIQUE, IS_ORDERED);
-
 		op = initEOperation(getBounds__NonNegativeHeight__DiagnosticChain_Map(), ecorePackage.getEBoolean(), "nonNegativeHeight", 0, 1, IS_UNIQUE, IS_ORDERED);
 		addEParameter(op, ecorePackage.getEDiagnosticChain(), "diagnostics", 0, 1, IS_UNIQUE, IS_ORDERED);
 		g1 = createEGenericType(ecorePackage.getEMap());
@@ -463,7 +472,6 @@ public class DCPackageImpl extends EPackageImpl implements DCPackage {
 		g2 = createEGenericType(ecorePackage.getEJavaObject());
 		g1.getETypeArguments().add(g2);
 		addEParameter(op, g1, "context", 0, 1, IS_UNIQUE, IS_ORDERED);
-
 		// Initialize enums and add enum literals
 		initEEnum(knownColorEEnum, KnownColor.class, "KnownColor");
 		addEEnumLiteral(knownColorEEnum, KnownColor.MAROON);
@@ -483,17 +491,14 @@ public class DCPackageImpl extends EPackageImpl implements DCPackage {
 		addEEnumLiteral(knownColorEEnum, KnownColor.BLACK);
 		addEEnumLiteral(knownColorEEnum, KnownColor.SILVER);
 		addEEnumLiteral(knownColorEEnum, KnownColor.GRAY);
-
 		// Initialize data types
 		initEDataType(booleanEDataType, boolean.class, "Boolean", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS);
 		initEDataType(integerEDataType, int.class, "Integer", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS);
 		initEDataType(realEDataType, double.class, "Real", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS);
 		initEDataType(stringEDataType, String.class, "String", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS);
 		initEDataType(colorEDataType, Color.class, "Color", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS);
-
 		// Create resource
 		createResource(eNS_URI);
-
 		// Create annotations
 		// http://www.eclipse.org/emf/2002/Ecore
 		createEcoreAnnotations();
@@ -505,50 +510,26 @@ public class DCPackageImpl extends EPackageImpl implements DCPackage {
 	 * Initializes the annotations for <b>http://www.eclipse.org/emf/2002/Ecore</b>.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void createEcoreAnnotations() {
-		String source = "http://www.eclipse.org/emf/2002/Ecore";			
-		addAnnotation
-		  (this, 
-		   source, 
-		   new String[] {
-			 "validationDelegates", "http://www.eclipse.org/emf/2002/Ecore/OCL"
-		   });																																																		
+		String source = "http://www.eclipse.org/emf/2002/Ecore";
+		addAnnotation(this, source, new String[]{ "validationDelegates", "http://www.eclipse.org/emf/2002/Ecore/OCL" });
 	}
 
 	/**
 	 * Initializes the annotations for <b>http://www.eclipse.org/emf/2002/Ecore/OCL</b>.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void createOCLAnnotations() {
-		String source = "http://www.eclipse.org/emf/2002/Ecore/OCL";																															
-		addAnnotation
-		  (getDimension__NonNegativeWidth__DiagnosticChain_Map(), 
-		   source, 
-		   new String[] {
-			 "body", "width >=0"
-		   });					
-		addAnnotation
-		  (getDimension__NonNegativeHeight__DiagnosticChain_Map(), 
-		   source, 
-		   new String[] {
-			 "body", "height >=0"
-		   });								
-		addAnnotation
-		  (getBounds__NonNegativeWidth__DiagnosticChain_Map(), 
-		   source, 
-		   new String[] {
-			 "body", "width >= 0"
-		   });					
-		addAnnotation
-		  (getBounds__NonNegativeHeight__DiagnosticChain_Map(), 
-		   source, 
-		   new String[] {
-			 "body", "height >=0"
-		   });							
+		String source = "http://www.eclipse.org/emf/2002/Ecore/OCL";
+		addAnnotation(getDimension__NonNegativeWidth__DiagnosticChain_Map(), source, new String[]{ "body", "width >=0" });
+		addAnnotation(getDimension__NonNegativeHeight__DiagnosticChain_Map(), source, new String[]{ "body", "height >=0" });
+		addAnnotation(getBounds__NonNegativeWidth__DiagnosticChain_Map(), source, new String[]{ "body", "width >= 0" });
+		addAnnotation(getBounds__NonNegativeHeight__DiagnosticChain_Map(), source, new String[]{ "body", "height >=0" });
 	}
-
 } // DCPackageImpl
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/impl/DimensionImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/impl/DimensionImpl.java
index d80e6927294..669ddcdafb4 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/impl/DimensionImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/impl/DimensionImpl.java
@@ -32,24 +32,23 @@ import org.eclipse.papyrus.dd.dc.Dimension;
 import org.eclipse.papyrus.dd.dc.util.DCValidator;
 
 /**
- * <!-- begin-user-doc --> An implementation of the model object '
- * <em><b>Dimension</b></em>'. <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object ' <em><b>Dimension</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.dd.dc.impl.DimensionImpl#getWidth <em>Width</em>}</li>
- *   <li>{@link org.eclipse.papyrus.dd.dc.impl.DimensionImpl#getHeight <em>Height</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dc.impl.DimensionImpl#getWidth <em>Width</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dc.impl.DimensionImpl#getHeight <em>Height</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
-public class DimensionImpl extends MinimalEObjectImpl.Container implements
-		Dimension {
+public class DimensionImpl extends MinimalEObjectImpl.Container implements Dimension {
 
 	/**
 	 * The default value of the '{@link #getWidth() <em>Width</em>}' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getWidth()
 	 * @generated
 	 * @ordered
@@ -59,6 +58,7 @@ public class DimensionImpl extends MinimalEObjectImpl.Container implements
 	/**
 	 * The cached value of the '{@link #getWidth() <em>Width</em>}' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getWidth()
 	 * @generated
 	 * @ordered
@@ -69,6 +69,7 @@ public class DimensionImpl extends MinimalEObjectImpl.Container implements
 	 * This is true if the Width attribute has been set.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -77,6 +78,7 @@ public class DimensionImpl extends MinimalEObjectImpl.Container implements
 	/**
 	 * The default value of the '{@link #getHeight() <em>Height</em>}' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getHeight()
 	 * @generated
 	 * @ordered
@@ -86,6 +88,7 @@ public class DimensionImpl extends MinimalEObjectImpl.Container implements
 	/**
 	 * The cached value of the '{@link #getHeight() <em>Height</em>}' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getHeight()
 	 * @generated
 	 * @ordered
@@ -96,6 +99,7 @@ public class DimensionImpl extends MinimalEObjectImpl.Container implements
 	 * This is true if the Height attribute has been set.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -103,6 +107,7 @@ public class DimensionImpl extends MinimalEObjectImpl.Container implements
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected DimensionImpl() {
@@ -111,6 +116,7 @@ public class DimensionImpl extends MinimalEObjectImpl.Container implements
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -120,6 +126,7 @@ public class DimensionImpl extends MinimalEObjectImpl.Container implements
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public double getWidth() {
@@ -128,6 +135,7 @@ public class DimensionImpl extends MinimalEObjectImpl.Container implements
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setWidth(double newWidth) {
@@ -135,12 +143,13 @@ public class DimensionImpl extends MinimalEObjectImpl.Container implements
 		width = newWidth;
 		boolean oldWidthESet = widthESet;
 		widthESet = true;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, DCPackage.DIMENSION__WIDTH, oldWidth, width, !oldWidthESet));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void unsetWidth() {
@@ -148,12 +157,13 @@ public class DimensionImpl extends MinimalEObjectImpl.Container implements
 		boolean oldWidthESet = widthESet;
 		width = WIDTH_EDEFAULT;
 		widthESet = false;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.UNSET, DCPackage.DIMENSION__WIDTH, oldWidth, WIDTH_EDEFAULT, oldWidthESet));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetWidth() {
@@ -162,6 +172,7 @@ public class DimensionImpl extends MinimalEObjectImpl.Container implements
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public double getHeight() {
@@ -170,6 +181,7 @@ public class DimensionImpl extends MinimalEObjectImpl.Container implements
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setHeight(double newHeight) {
@@ -177,12 +189,13 @@ public class DimensionImpl extends MinimalEObjectImpl.Container implements
 		height = newHeight;
 		boolean oldHeightESet = heightESet;
 		heightESet = true;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, DCPackage.DIMENSION__HEIGHT, oldHeight, height, !oldHeightESet));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void unsetHeight() {
@@ -190,12 +203,13 @@ public class DimensionImpl extends MinimalEObjectImpl.Container implements
 		boolean oldHeightESet = heightESet;
 		height = HEIGHT_EDEFAULT;
 		heightESet = false;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.UNSET, DCPackage.DIMENSION__HEIGHT, oldHeight, HEIGHT_EDEFAULT, oldHeightESet));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetHeight() {
@@ -203,9 +217,11 @@ public class DimensionImpl extends MinimalEObjectImpl.Container implements
 	}
 
 	/**
-	 * The cached validation expression for the '{@link #nonNegativeWidth(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Non Negative Width</em>}' invariant operation.
+	 * The cached validation expression for the '{@link #nonNegativeWidth(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
+	 * <em>Non Negative Width</em>}' invariant operation.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @see #nonNegativeWidth(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
 	 * @generated
 	 * @ordered
@@ -214,28 +230,19 @@ public class DimensionImpl extends MinimalEObjectImpl.Container implements
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public boolean nonNegativeWidth(DiagnosticChain diagnostics,
-			Map<Object, Object> context) {
-		return
-			DCValidator.validate
-				(DCPackage.Literals.DIMENSION,
-				 this,
-				 diagnostics,
-				 context,
-				 "http://www.eclipse.org/emf/2002/Ecore/OCL",
-				 DCPackage.Literals.DIMENSION___NON_NEGATIVE_WIDTH__DIAGNOSTICCHAIN_MAP,
-				 NON_NEGATIVE_WIDTH_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION,
-				 Diagnostic.ERROR,
-				 DCValidator.DIAGNOSTIC_SOURCE,
-				 DCValidator.DIMENSION__NON_NEGATIVE_WIDTH);
+	public boolean nonNegativeWidth(DiagnosticChain diagnostics, Map<Object, Object> context) {
+		return DCValidator.validate(DCPackage.Literals.DIMENSION, this, diagnostics, context, "http://www.eclipse.org/emf/2002/Ecore/OCL", DCPackage.Literals.DIMENSION___NON_NEGATIVE_WIDTH__DIAGNOSTICCHAIN_MAP, NON_NEGATIVE_WIDTH_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION, Diagnostic.ERROR, DCValidator.DIAGNOSTIC_SOURCE, DCValidator.DIMENSION__NON_NEGATIVE_WIDTH);
 	}
 
 	/**
-	 * The cached validation expression for the '{@link #nonNegativeHeight(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Non Negative Height</em>}' invariant operation.
+	 * The cached validation expression for the '{@link #nonNegativeHeight(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
+	 * <em>Non Negative Height</em>}' invariant operation.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @see #nonNegativeHeight(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
 	 * @generated
 	 * @ordered
@@ -244,120 +251,119 @@ public class DimensionImpl extends MinimalEObjectImpl.Container implements
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public boolean nonNegativeHeight(DiagnosticChain diagnostics,
-			Map<Object, Object> context) {
-		return
-			DCValidator.validate
-				(DCPackage.Literals.DIMENSION,
-				 this,
-				 diagnostics,
-				 context,
-				 "http://www.eclipse.org/emf/2002/Ecore/OCL",
-				 DCPackage.Literals.DIMENSION___NON_NEGATIVE_HEIGHT__DIAGNOSTICCHAIN_MAP,
-				 NON_NEGATIVE_HEIGHT_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION,
-				 Diagnostic.ERROR,
-				 DCValidator.DIAGNOSTIC_SOURCE,
-				 DCValidator.DIMENSION__NON_NEGATIVE_HEIGHT);
+	public boolean nonNegativeHeight(DiagnosticChain diagnostics, Map<Object, Object> context) {
+		return DCValidator.validate(DCPackage.Literals.DIMENSION, this, diagnostics, context, "http://www.eclipse.org/emf/2002/Ecore/OCL", DCPackage.Literals.DIMENSION___NON_NEGATIVE_HEIGHT__DIAGNOSTICCHAIN_MAP, NON_NEGATIVE_HEIGHT_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION, Diagnostic.ERROR, DCValidator.DIAGNOSTIC_SOURCE, DCValidator.DIMENSION__NON_NEGATIVE_HEIGHT);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case DCPackage.DIMENSION__WIDTH:
-				return getWidth();
-			case DCPackage.DIMENSION__HEIGHT:
-				return getHeight();
+		switch(featureID) {
+		case DCPackage.DIMENSION__WIDTH:
+			return getWidth();
+		case DCPackage.DIMENSION__HEIGHT:
+			return getHeight();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case DCPackage.DIMENSION__WIDTH:
-				setWidth((Double)newValue);
-				return;
-			case DCPackage.DIMENSION__HEIGHT:
-				setHeight((Double)newValue);
-				return;
+		switch(featureID) {
+		case DCPackage.DIMENSION__WIDTH:
+			setWidth((Double)newValue);
+			return;
+		case DCPackage.DIMENSION__HEIGHT:
+			setHeight((Double)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case DCPackage.DIMENSION__WIDTH:
-				unsetWidth();
-				return;
-			case DCPackage.DIMENSION__HEIGHT:
-				unsetHeight();
-				return;
+		switch(featureID) {
+		case DCPackage.DIMENSION__WIDTH:
+			unsetWidth();
+			return;
+		case DCPackage.DIMENSION__HEIGHT:
+			unsetHeight();
+			return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case DCPackage.DIMENSION__WIDTH:
-				return isSetWidth();
-			case DCPackage.DIMENSION__HEIGHT:
-				return isSetHeight();
+		switch(featureID) {
+		case DCPackage.DIMENSION__WIDTH:
+			return isSetWidth();
+		case DCPackage.DIMENSION__HEIGHT:
+			return isSetHeight();
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	@SuppressWarnings("unchecked")
-	public Object eInvoke(int operationID, EList<?> arguments)
-			throws InvocationTargetException {
-		switch (operationID) {
-			case DCPackage.DIMENSION___NON_NEGATIVE_WIDTH__DIAGNOSTICCHAIN_MAP:
-				return nonNegativeWidth((DiagnosticChain)arguments.get(0), (Map<Object, Object>)arguments.get(1));
-			case DCPackage.DIMENSION___NON_NEGATIVE_HEIGHT__DIAGNOSTICCHAIN_MAP:
-				return nonNegativeHeight((DiagnosticChain)arguments.get(0), (Map<Object, Object>)arguments.get(1));
+	public Object eInvoke(int operationID, EList<?> arguments) throws InvocationTargetException {
+		switch(operationID) {
+		case DCPackage.DIMENSION___NON_NEGATIVE_WIDTH__DIAGNOSTICCHAIN_MAP:
+			return nonNegativeWidth((DiagnosticChain)arguments.get(0), (Map<Object, Object>)arguments.get(1));
+		case DCPackage.DIMENSION___NON_NEGATIVE_HEIGHT__DIAGNOSTICCHAIN_MAP:
+			return nonNegativeHeight((DiagnosticChain)arguments.get(0), (Map<Object, Object>)arguments.get(1));
 		}
 		return super.eInvoke(operationID, arguments);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) return super.toString();
-
+		if(eIsProxy())
+			return super.toString();
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (width: ");
-		if (widthESet) result.append(width); else result.append("<unset>");
+		if(widthESet)
+			result.append(width);
+		else
+			result.append("<unset>");
 		result.append(", height: ");
-		if (heightESet) result.append(height); else result.append("<unset>");
+		if(heightESet)
+			result.append(height);
+		else
+			result.append("<unset>");
 		result.append(')');
 		return result.toString();
 	}
-
 } // DimensionImpl
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/impl/PointImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/impl/PointImpl.java
index 7fe2c4b2d05..afa45f079fb 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/impl/PointImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/impl/PointImpl.java
@@ -22,16 +22,15 @@ import org.eclipse.papyrus.dd.dc.DCPackage;
 import org.eclipse.papyrus.dd.dc.Point;
 
 /**
- * <!-- begin-user-doc --> An implementation of the model object '
- * <em><b>Point</b></em>'. <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object ' <em><b>Point</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.dd.dc.impl.PointImpl#getX <em>X</em>}</li>
- *   <li>{@link org.eclipse.papyrus.dd.dc.impl.PointImpl#getY <em>Y</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dc.impl.PointImpl#getX <em>X</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dc.impl.PointImpl#getY <em>Y</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class PointImpl extends MinimalEObjectImpl.Container implements Point {
@@ -60,6 +59,7 @@ public class PointImpl extends MinimalEObjectImpl.Container implements Point {
 	 * This is true if the X attribute has been set.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -89,6 +89,7 @@ public class PointImpl extends MinimalEObjectImpl.Container implements Point {
 	 * This is true if the Y attribute has been set.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -96,6 +97,7 @@ public class PointImpl extends MinimalEObjectImpl.Container implements Point {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected PointImpl() {
@@ -104,6 +106,7 @@ public class PointImpl extends MinimalEObjectImpl.Container implements Point {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -113,6 +116,7 @@ public class PointImpl extends MinimalEObjectImpl.Container implements Point {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public double getX() {
@@ -121,6 +125,7 @@ public class PointImpl extends MinimalEObjectImpl.Container implements Point {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setX(double newX) {
@@ -128,12 +133,13 @@ public class PointImpl extends MinimalEObjectImpl.Container implements Point {
 		x = newX;
 		boolean oldXESet = xESet;
 		xESet = true;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, DCPackage.POINT__X, oldX, x, !oldXESet));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void unsetX() {
@@ -141,12 +147,13 @@ public class PointImpl extends MinimalEObjectImpl.Container implements Point {
 		boolean oldXESet = xESet;
 		x = X_EDEFAULT;
 		xESet = false;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.UNSET, DCPackage.POINT__X, oldX, X_EDEFAULT, oldXESet));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetX() {
@@ -155,6 +162,7 @@ public class PointImpl extends MinimalEObjectImpl.Container implements Point {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public double getY() {
@@ -163,6 +171,7 @@ public class PointImpl extends MinimalEObjectImpl.Container implements Point {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setY(double newY) {
@@ -170,12 +179,13 @@ public class PointImpl extends MinimalEObjectImpl.Container implements Point {
 		y = newY;
 		boolean oldYESet = yESet;
 		yESet = true;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, DCPackage.POINT__Y, oldY, y, !oldYESet));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void unsetY() {
@@ -183,12 +193,13 @@ public class PointImpl extends MinimalEObjectImpl.Container implements Point {
 		boolean oldYESet = yESet;
 		y = Y_EDEFAULT;
 		yESet = false;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.UNSET, DCPackage.POINT__Y, oldY, Y_EDEFAULT, oldYESet));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetY() {
@@ -197,83 +208,93 @@ public class PointImpl extends MinimalEObjectImpl.Container implements Point {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case DCPackage.POINT__X:
-				return getX();
-			case DCPackage.POINT__Y:
-				return getY();
+		switch(featureID) {
+		case DCPackage.POINT__X:
+			return getX();
+		case DCPackage.POINT__Y:
+			return getY();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case DCPackage.POINT__X:
-				setX((Double)newValue);
-				return;
-			case DCPackage.POINT__Y:
-				setY((Double)newValue);
-				return;
+		switch(featureID) {
+		case DCPackage.POINT__X:
+			setX((Double)newValue);
+			return;
+		case DCPackage.POINT__Y:
+			setY((Double)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case DCPackage.POINT__X:
-				unsetX();
-				return;
-			case DCPackage.POINT__Y:
-				unsetY();
-				return;
+		switch(featureID) {
+		case DCPackage.POINT__X:
+			unsetX();
+			return;
+		case DCPackage.POINT__Y:
+			unsetY();
+			return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case DCPackage.POINT__X:
-				return isSetX();
-			case DCPackage.POINT__Y:
-				return isSetY();
+		switch(featureID) {
+		case DCPackage.POINT__X:
+			return isSetX();
+		case DCPackage.POINT__Y:
+			return isSetY();
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) return super.toString();
-
+		if(eIsProxy())
+			return super.toString();
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (x: ");
-		if (xESet) result.append(x); else result.append("<unset>");
+		if(xESet)
+			result.append(x);
+		else
+			result.append("<unset>");
 		result.append(", y: ");
-		if (yESet) result.append(y); else result.append("<unset>");
+		if(yESet)
+			result.append(y);
+		else
+			result.append("<unset>");
 		result.append(')');
 		return result.toString();
 	}
-
 } // PointImpl
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/util/DCAdapterFactory.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/util/DCAdapterFactory.java
index d971ef4cdf5..590817cf04b 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/util/DCAdapterFactory.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/util/DCAdapterFactory.java
@@ -24,6 +24,7 @@ import org.eclipse.papyrus.dd.dc.*;
  * <!-- begin-user-doc --> The <b>Adapter Factory</b> for the model. It provides
  * an adapter <code>createXXX</code> method for each class of the model. <!--
  * end-user-doc -->
+ * 
  * @see org.eclipse.papyrus.dd.dc.DCPackage
  * @generated
  */
@@ -32,6 +33,7 @@ public class DCAdapterFactory extends AdapterFactoryImpl {
 	/**
 	 * The cached model package.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected static DCPackage modelPackage;
@@ -40,10 +42,11 @@ public class DCAdapterFactory extends AdapterFactoryImpl {
 	 * Creates an instance of the adapter factory.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public DCAdapterFactory() {
-		if (modelPackage == null) {
+		if(modelPackage == null) {
 			modelPackage = DCPackage.eINSTANCE;
 		}
 	}
@@ -53,15 +56,16 @@ public class DCAdapterFactory extends AdapterFactoryImpl {
 	 * <!-- begin-user-doc --> This implementation returns <code>true</code> if
 	 * the object is either the model's package or is an instance object of the
 	 * model. <!-- end-user-doc -->
+	 * 
 	 * @return whether this factory is applicable for the type of the object.
 	 * @generated
 	 */
 	@Override
 	public boolean isFactoryForType(Object object) {
-		if (object == modelPackage) {
+		if(object == modelPackage) {
 			return true;
 		}
-		if (object instanceof EObject) {
+		if(object instanceof EObject) {
 			return ((EObject)object).eClass().getEPackage() == modelPackage;
 		}
 		return false;
@@ -74,29 +78,35 @@ public class DCAdapterFactory extends AdapterFactoryImpl {
 	 * @generated
 	 */
 	protected DCSwitch<Adapter> modelSwitch = new DCSwitch<Adapter>() {
-			@Override
-			public Adapter casePoint(Point object) {
-				return createPointAdapter();
-			}
-			@Override
-			public Adapter caseDimension(Dimension object) {
-				return createDimensionAdapter();
-			}
-			@Override
-			public Adapter caseBounds(Bounds object) {
-				return createBoundsAdapter();
-			}
-			@Override
-			public Adapter defaultCase(EObject object) {
-				return createEObjectAdapter();
-			}
-		};
+
+		@Override
+		public Adapter casePoint(Point object) {
+			return createPointAdapter();
+		}
+
+		@Override
+		public Adapter caseDimension(Dimension object) {
+			return createDimensionAdapter();
+		}
+
+		@Override
+		public Adapter caseBounds(Bounds object) {
+			return createBoundsAdapter();
+		}
+
+		@Override
+		public Adapter defaultCase(EObject object) {
+			return createEObjectAdapter();
+		}
+	};
 
 	/**
 	 * Creates an adapter for the <code>target</code>.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param target the object to adapt.
+	 * 
+	 * @param target
+	 *        the object to adapt.
 	 * @return the adapter for the <code>target</code>.
 	 * @generated
 	 */
@@ -106,8 +116,7 @@ public class DCAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '
-	 * {@link org.eclipse.papyrus.dd.dc.Point <em>Point</em>}'. <!--
+	 * Creates a new adapter for an object of class ' {@link org.eclipse.papyrus.dd.dc.Point <em>Point</em>}'. <!--
 	 * begin-user-doc --> This default implementation returns null so that we
 	 * can easily ignore cases; it's useful to ignore a case when inheritance
 	 * will catch all the cases anyway. <!-- end-user-doc -->
@@ -121,8 +130,7 @@ public class DCAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '
-	 * {@link org.eclipse.papyrus.dd.dc.Dimension <em>Dimension</em>}'. <!--
+	 * Creates a new adapter for an object of class ' {@link org.eclipse.papyrus.dd.dc.Dimension <em>Dimension</em>}'. <!--
 	 * begin-user-doc --> This default implementation returns null so that we
 	 * can easily ignore cases; it's useful to ignore a case when inheritance
 	 * will catch all the cases anyway. <!-- end-user-doc -->
@@ -136,8 +144,7 @@ public class DCAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '
-	 * {@link org.eclipse.papyrus.dd.dc.Bounds <em>Bounds</em>}'. <!--
+	 * Creates a new adapter for an object of class ' {@link org.eclipse.papyrus.dd.dc.Bounds <em>Bounds</em>}'. <!--
 	 * begin-user-doc --> This default implementation returns null so that we
 	 * can easily ignore cases; it's useful to ignore a case when inheritance
 	 * will catch all the cases anyway. <!-- end-user-doc -->
@@ -154,11 +161,11 @@ public class DCAdapterFactory extends AdapterFactoryImpl {
 	 * Creates a new adapter for the default case.
 	 * <!-- begin-user-doc --> This
 	 * default implementation returns null. <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @generated
 	 */
 	public Adapter createEObjectAdapter() {
 		return null;
 	}
-
 } // DCAdapterFactory
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/util/DCSwitch.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/util/DCSwitch.java
index b935c7caaf3..218fb09c7b9 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/util/DCSwitch.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/util/DCSwitch.java
@@ -20,11 +20,11 @@ import org.eclipse.papyrus.dd.dc.*;
 
 /**
  * <!-- begin-user-doc --> The <b>Switch</b> for the model's inheritance
- * hierarchy. It supports the call {@link #doSwitch(EObject) doSwitch(object)}
- * to invoke the <code>caseXXX</code> method for each class of the model,
+ * hierarchy. It supports the call {@link #doSwitch(EObject) doSwitch(object)} to invoke the <code>caseXXX</code> method for each class of the model,
  * starting with the actual class of the object and proceeding up the
  * inheritance hierarchy until a non-null result is returned, which is the
  * result of the switch. <!-- end-user-doc -->
+ * 
  * @see org.eclipse.papyrus.dd.dc.DCPackage
  * @generated
  */
@@ -33,6 +33,7 @@ public class DCSwitch<T> extends Switch<T> {
 	/**
 	 * The cached model package
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected static DCPackage modelPackage;
@@ -41,10 +42,11 @@ public class DCSwitch<T> extends Switch<T> {
 	 * Creates an instance of the switch.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public DCSwitch() {
-		if (modelPackage == null) {
+		if(modelPackage == null) {
 			modelPackage = DCPackage.eINSTANCE;
 		}
 	}
@@ -66,31 +68,39 @@ public class DCSwitch<T> extends Switch<T> {
 	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @return the first non-null result returned by a <code>caseXXX</code> call.
 	 * @generated
 	 */
 	@Override
 	protected T doSwitch(int classifierID, EObject theEObject) {
-		switch (classifierID) {
-			case DCPackage.POINT: {
-				Point point = (Point)theEObject;
-				T result = casePoint(point);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case DCPackage.DIMENSION: {
-				Dimension dimension = (Dimension)theEObject;
-				T result = caseDimension(dimension);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case DCPackage.BOUNDS: {
-				Bounds bounds = (Bounds)theEObject;
-				T result = caseBounds(bounds);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			default: return defaultCase(theEObject);
+		switch(classifierID) {
+		case DCPackage.POINT:
+		{
+			Point point = (Point)theEObject;
+			T result = casePoint(point);
+			if(result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case DCPackage.DIMENSION:
+		{
+			Dimension dimension = (Dimension)theEObject;
+			T result = caseDimension(dimension);
+			if(result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case DCPackage.BOUNDS:
+		{
+			Bounds bounds = (Bounds)theEObject;
+			T result = caseBounds(bounds);
+			if(result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		default:
+			return defaultCase(theEObject);
 		}
 	}
 
@@ -99,7 +109,9 @@ public class DCSwitch<T> extends Switch<T> {
 	 * <!-- begin-user-doc --> This implementation returns
 	 * null; returning a non-null result will terminate the switch. <!--
 	 * end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Point</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -113,7 +125,9 @@ public class DCSwitch<T> extends Switch<T> {
 	 * <!-- begin-user-doc --> This implementation returns
 	 * null; returning a non-null result will terminate the switch. <!--
 	 * end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Dimension</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -127,7 +141,9 @@ public class DCSwitch<T> extends Switch<T> {
 	 * <!-- begin-user-doc --> This implementation returns
 	 * null; returning a non-null result will terminate the switch. <!--
 	 * end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Bounds</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -141,7 +157,9 @@ public class DCSwitch<T> extends Switch<T> {
 	 * <!-- begin-user-doc --> This implementation returns
 	 * null; returning a non-null result will terminate the switch, but this is
 	 * the last case anyway. <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
 	 * @generated
@@ -150,5 +168,4 @@ public class DCSwitch<T> extends Switch<T> {
 	public T defaultCase(EObject object) {
 		return null;
 	}
-
 } // DCSwitch
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/util/DCValidator.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/util/DCValidator.java
index b0d99890cd8..afe2ddb0a13 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/util/DCValidator.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dc/util/DCValidator.java
@@ -39,13 +39,16 @@ public class DCValidator extends EObjectValidator {
 	/**
 	 * The cached model package
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static final DCValidator INSTANCE = new DCValidator();
 
 	/**
-	 * A constant for the {@link org.eclipse.emf.common.util.Diagnostic#getSource() source} of diagnostic {@link org.eclipse.emf.common.util.Diagnostic#getCode() codes} from this package.
+	 * A constant for the {@link org.eclipse.emf.common.util.Diagnostic#getSource() source} of diagnostic
+	 * {@link org.eclipse.emf.common.util.Diagnostic#getCode() codes} from this package.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.emf.common.util.Diagnostic#getSource()
 	 * @see org.eclipse.emf.common.util.Diagnostic#getCode()
 	 * @generated
@@ -56,6 +59,7 @@ public class DCValidator extends EObjectValidator {
 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Non Negative Width' of 'Dimension'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static final int DIMENSION__NON_NEGATIVE_WIDTH = 1;
@@ -64,6 +68,7 @@ public class DCValidator extends EObjectValidator {
 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Non Negative Height' of 'Dimension'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static final int DIMENSION__NON_NEGATIVE_HEIGHT = 2;
@@ -72,6 +77,7 @@ public class DCValidator extends EObjectValidator {
 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Non Negative Width' of 'Bounds'.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static final int BOUNDS__NON_NEGATIVE_WIDTH = 3;
@@ -80,6 +86,7 @@ public class DCValidator extends EObjectValidator {
 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Non Negative Height' of 'Bounds'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static final int BOUNDS__NON_NEGATIVE_HEIGHT = 4;
@@ -88,6 +95,7 @@ public class DCValidator extends EObjectValidator {
 	 * A constant with a fixed name that can be used as the base value for additional hand written constants.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private static final int GENERATED_DIAGNOSTIC_CODE_COUNT = 4;
@@ -96,6 +104,7 @@ public class DCValidator extends EObjectValidator {
 	 * A constant with a fixed name that can be used as the base value for additional hand written constants in a derived class.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected static final int DIAGNOSTIC_CODE_COUNT = GENERATED_DIAGNOSTIC_CODE_COUNT;
@@ -103,12 +112,10 @@ public class DCValidator extends EObjectValidator {
 	/**
 	 * Delegates evaluation of the given invariant expression against the object in the given context.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public static boolean validate(EClass eClass, EObject eObject,
-			DiagnosticChain diagnostics, Map<Object, Object> context,
-			String validationDelegate, EOperation invariant, String expression,
-			int severity, String source, int code) {
+	public static boolean validate(EClass eClass, EObject eObject, DiagnosticChain diagnostics, Map<Object, Object> context, String validationDelegate, EOperation invariant, String expression, int severity, String source, int code) {
 		return EObjectValidator.validate(eClass, eObject, diagnostics, context, validationDelegate, invariant, expression, severity, source, code);
 	}
 
@@ -116,6 +123,7 @@ public class DCValidator extends EObjectValidator {
 	 * Creates an instance of the switch.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public DCValidator() {
@@ -126,71 +134,82 @@ public class DCValidator extends EObjectValidator {
 	 * Returns the package of this validator switch.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	protected EPackage getEPackage() {
-	  return DCPackage.eINSTANCE;
+		return DCPackage.eINSTANCE;
 	}
 
 	/**
 	 * Calls <code>validateXXX</code> for the corresponding classifier of the model.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
-	protected boolean validate(int classifierID, Object value,
-			DiagnosticChain diagnostics, Map<Object, Object> context) {
-		switch (classifierID) {
-			case DCPackage.POINT:
-				return validatePoint((Point)value, diagnostics, context);
-			case DCPackage.DIMENSION:
-				return validateDimension((Dimension)value, diagnostics, context);
-			case DCPackage.BOUNDS:
-				return validateBounds((Bounds)value, diagnostics, context);
-			case DCPackage.KNOWN_COLOR:
-				return validateKnownColor((KnownColor)value, diagnostics, context);
-			case DCPackage.BOOLEAN:
-				return validateBoolean((Boolean)value, diagnostics, context);
-			case DCPackage.INTEGER:
-				return validateInteger((Integer)value, diagnostics, context);
-			case DCPackage.REAL:
-				return validateReal((Double)value, diagnostics, context);
-			case DCPackage.STRING:
-				return validateString((String)value, diagnostics, context);
-			case DCPackage.COLOR:
-				return validateColor((Color)value, diagnostics, context);
-			default:
-				return true;
+	protected boolean validate(int classifierID, Object value, DiagnosticChain diagnostics, Map<Object, Object> context) {
+		switch(classifierID) {
+		case DCPackage.POINT:
+			return validatePoint((Point)value, diagnostics, context);
+		case DCPackage.DIMENSION:
+			return validateDimension((Dimension)value, diagnostics, context);
+		case DCPackage.BOUNDS:
+			return validateBounds((Bounds)value, diagnostics, context);
+		case DCPackage.KNOWN_COLOR:
+			return validateKnownColor((KnownColor)value, diagnostics, context);
+		case DCPackage.BOOLEAN:
+			return validateBoolean((Boolean)value, diagnostics, context);
+		case DCPackage.INTEGER:
+			return validateInteger((Integer)value, diagnostics, context);
+		case DCPackage.REAL:
+			return validateReal((Double)value, diagnostics, context);
+		case DCPackage.STRING:
+			return validateString((String)value, diagnostics, context);
+		case DCPackage.COLOR:
+			return validateColor((Color)value, diagnostics, context);
+		default:
+			return true;
 		}
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public boolean validatePoint(Point point, DiagnosticChain diagnostics,
-			Map<Object, Object> context) {
+	public boolean validatePoint(Point point, DiagnosticChain diagnostics, Map<Object, Object> context) {
 		return validate_EveryDefaultConstraint(point, diagnostics, context);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public boolean validateDimension(Dimension dimension,
-			DiagnosticChain diagnostics, Map<Object, Object> context) {
-		if (!validate_NoCircularContainment(dimension, diagnostics, context)) return false;
+	public boolean validateDimension(Dimension dimension, DiagnosticChain diagnostics, Map<Object, Object> context) {
+		if(!validate_NoCircularContainment(dimension, diagnostics, context))
+			return false;
 		boolean result = validate_EveryMultiplicityConforms(dimension, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryDataValueConforms(dimension, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryReferenceIsContained(dimension, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryBidirectionalReferenceIsPaired(dimension, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryProxyResolves(dimension, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_UniqueID(dimension, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryKeyUnique(dimension, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryMapEntryUnique(dimension, diagnostics, context);
-		if (result || diagnostics != null) result &= validateDimension_nonNegativeWidth(dimension, diagnostics, context);
-		if (result || diagnostics != null) result &= validateDimension_nonNegativeHeight(dimension, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_EveryDataValueConforms(dimension, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_EveryReferenceIsContained(dimension, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_EveryBidirectionalReferenceIsPaired(dimension, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_EveryProxyResolves(dimension, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_UniqueID(dimension, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_EveryKeyUnique(dimension, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_EveryMapEntryUnique(dimension, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validateDimension_nonNegativeWidth(dimension, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validateDimension_nonNegativeHeight(dimension, diagnostics, context);
 		return result;
 	}
 
@@ -200,8 +219,7 @@ public class DCValidator extends EObjectValidator {
 	 * 
 	 * @generated
 	 */
-	public boolean validateDimension_nonNegativeWidth(Dimension dimension,
-			DiagnosticChain diagnostics, Map<Object, Object> context) {
+	public boolean validateDimension_nonNegativeWidth(Dimension dimension, DiagnosticChain diagnostics, Map<Object, Object> context) {
 		return dimension.nonNegativeWidth(diagnostics, context);
 	}
 
@@ -211,28 +229,37 @@ public class DCValidator extends EObjectValidator {
 	 * 
 	 * @generated
 	 */
-	public boolean validateDimension_nonNegativeHeight(Dimension dimension,
-			DiagnosticChain diagnostics, Map<Object, Object> context) {
+	public boolean validateDimension_nonNegativeHeight(Dimension dimension, DiagnosticChain diagnostics, Map<Object, Object> context) {
 		return dimension.nonNegativeHeight(diagnostics, context);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public boolean validateBounds(Bounds bounds, DiagnosticChain diagnostics,
-			Map<Object, Object> context) {
-		if (!validate_NoCircularContainment(bounds, diagnostics, context)) return false;
+	public boolean validateBounds(Bounds bounds, DiagnosticChain diagnostics, Map<Object, Object> context) {
+		if(!validate_NoCircularContainment(bounds, diagnostics, context))
+			return false;
 		boolean result = validate_EveryMultiplicityConforms(bounds, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryDataValueConforms(bounds, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryReferenceIsContained(bounds, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryBidirectionalReferenceIsPaired(bounds, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryProxyResolves(bounds, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_UniqueID(bounds, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryKeyUnique(bounds, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryMapEntryUnique(bounds, diagnostics, context);
-		if (result || diagnostics != null) result &= validateBounds_nonNegativeWidth(bounds, diagnostics, context);
-		if (result || diagnostics != null) result &= validateBounds_nonNegativeHeight(bounds, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_EveryDataValueConforms(bounds, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_EveryReferenceIsContained(bounds, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_EveryBidirectionalReferenceIsPaired(bounds, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_EveryProxyResolves(bounds, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_UniqueID(bounds, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_EveryKeyUnique(bounds, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_EveryMapEntryUnique(bounds, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validateBounds_nonNegativeWidth(bounds, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validateBounds_nonNegativeHeight(bounds, diagnostics, context);
 		return result;
 	}
 
@@ -242,8 +269,7 @@ public class DCValidator extends EObjectValidator {
 	 * 
 	 * @generated
 	 */
-	public boolean validateBounds_nonNegativeWidth(Bounds bounds,
-			DiagnosticChain diagnostics, Map<Object, Object> context) {
+	public boolean validateBounds_nonNegativeWidth(Bounds bounds, DiagnosticChain diagnostics, Map<Object, Object> context) {
 		return bounds.nonNegativeWidth(diagnostics, context);
 	}
 
@@ -253,68 +279,68 @@ public class DCValidator extends EObjectValidator {
 	 * 
 	 * @generated
 	 */
-	public boolean validateBounds_nonNegativeHeight(Bounds bounds,
-			DiagnosticChain diagnostics, Map<Object, Object> context) {
+	public boolean validateBounds_nonNegativeHeight(Bounds bounds, DiagnosticChain diagnostics, Map<Object, Object> context) {
 		return bounds.nonNegativeHeight(diagnostics, context);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public boolean validateKnownColor(KnownColor knownColor,
-			DiagnosticChain diagnostics, Map<Object, Object> context) {
+	public boolean validateKnownColor(KnownColor knownColor, DiagnosticChain diagnostics, Map<Object, Object> context) {
 		return true;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public boolean validateBoolean(boolean boolean_,
-			DiagnosticChain diagnostics, Map<Object, Object> context) {
+	public boolean validateBoolean(boolean boolean_, DiagnosticChain diagnostics, Map<Object, Object> context) {
 		return true;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public boolean validateInteger(int integer, DiagnosticChain diagnostics,
-			Map<Object, Object> context) {
+	public boolean validateInteger(int integer, DiagnosticChain diagnostics, Map<Object, Object> context) {
 		return true;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public boolean validateReal(double real, DiagnosticChain diagnostics,
-			Map<Object, Object> context) {
+	public boolean validateReal(double real, DiagnosticChain diagnostics, Map<Object, Object> context) {
 		return true;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public boolean validateString(String string, DiagnosticChain diagnostics,
-			Map<Object, Object> context) {
+	public boolean validateString(String string, DiagnosticChain diagnostics, Map<Object, Object> context) {
 		return true;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public boolean validateColor(Color color, DiagnosticChain diagnostics,
-			Map<Object, Object> context) {
+	public boolean validateColor(Color color, DiagnosticChain diagnostics, Map<Object, Object> context) {
 		return true;
 	}
 
 	/**
 	 * Returns the resource locator that will be used to fetch messages for this validator's diagnostics.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -324,5 +350,4 @@ public class DCValidator extends EObjectValidator {
 		// Ensure that you remove @generated or mark it @generated NOT
 		return super.getResourceLocator();
 	}
-
 } // DCValidator
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Canvas.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Canvas.java
index ab78f601e15..123b3b7c596 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Canvas.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Canvas.java
@@ -16,25 +16,25 @@ import org.eclipse.emf.common.util.DiagnosticChain;
 import org.eclipse.papyrus.dd.dc.Bounds;
 
 /**
- * <!-- begin-user-doc --> A representation of the model object '
- * <em><b>Canvas</b></em>'. <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object ' <em><b>Canvas</b></em>'. <!-- end-user-doc -->
+ * 
  * <!-- begin-model-doc -->
  * Canvas is a kind of group that has bounds.
  * <!-- end-model-doc -->
- *
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.dd.dg.Canvas#getBounds <em>Bounds</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.Canvas#getBounds <em>Bounds</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.dd.dg.DGPackage#getCanvas()
  * @model
  * @generated
  */
 public interface Canvas extends Group {
+
 	/**
 	 * Returns the value of the '<em><b>Bounds</b></em>' containment reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc --> <!-- begin-model-doc -->
@@ -53,7 +53,9 @@ public interface Canvas extends Group {
 	 * Sets the value of the '{@link org.eclipse.papyrus.dd.dg.Canvas#getBounds <em>Bounds</em>}' containment reference.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * @param value the new value of the '<em>Bounds</em>' containment reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Bounds</em>' containment reference.
 	 * @see #getBounds()
 	 * @generated
 	 */
@@ -63,15 +65,13 @@ public interface Canvas extends Group {
 	 * <!-- begin-user-doc --> <!-- end-user-doc --> <!-- begin-model-doc -->
 	 * 
 	 * @param diagnostics
-	 *            The chain of diagnostics to which problems are to be appended.
+	 *        The chain of diagnostics to which problems are to be appended.
 	 * @param context
-	 *            The cache of context-specific information. <!-- end-model-doc
-	 *            -->
+	 *        The cache of context-specific information. <!-- end-model-doc
+	 *        -->
 	 * @model annotation=
 	 *        "http://www.eclipse.org/emf/2002/Ecore/OCL body='transform->isEmpty()'"
 	 * @generated
 	 */
-	boolean canvasCannotHaveTransforms(DiagnosticChain diagnostics,
-			Map<Object, Object> context);
-
+	boolean canvasCannotHaveTransforms(DiagnosticChain diagnostics, Map<Object, Object> context);
 } // Canvas
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Circle.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Circle.java
index 683e928c72f..2edd294393a 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Circle.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Circle.java
@@ -18,26 +18,26 @@ import org.eclipse.emf.common.util.DiagnosticChain;
 import org.eclipse.papyrus.dd.dc.Point;
 
 /**
- * <!-- begin-user-doc --> A representation of the model object '
- * <em><b>Circle</b></em>'. <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object ' <em><b>Circle</b></em>'. <!-- end-user-doc -->
+ * 
  * <!-- begin-model-doc -->
  * Circle is a graphical element that defines a circular shape with a given center point and a radius.
  * <!-- end-model-doc -->
- *
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.dd.dg.Circle#getCenter <em>Center</em>}</li>
- *   <li>{@link org.eclipse.papyrus.dd.dg.Circle#getRadius <em>Radius</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.Circle#getCenter <em>Center</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.Circle#getRadius <em>Radius</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.dd.dg.DGPackage#getCircle()
  * @model
  * @generated
  */
 public interface Circle extends GraphicalElement {
+
 	/**
 	 * Returns the value of the '<em><b>Center</b></em>' containment reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc --> <!-- begin-model-doc -->
@@ -56,7 +56,9 @@ public interface Circle extends GraphicalElement {
 	 * Sets the value of the '{@link org.eclipse.papyrus.dd.dg.Circle#getCenter <em>Center</em>}' containment reference.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * @param value the new value of the '<em>Center</em>' containment reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Center</em>' containment reference.
 	 * @see #getCenter()
 	 * @generated
 	 */
@@ -69,6 +71,7 @@ public interface Circle extends GraphicalElement {
 	 * <!-- begin-model-doc -->
 	 * a real number (>=0) that represents the radius of the circle.
 	 * <!-- end-model-doc -->
+	 * 
 	 * @return the value of the '<em>Radius</em>' attribute.
 	 * @see #setRadius(double)
 	 * @see org.eclipse.papyrus.dd.dg.DGPackage#getCircle_Radius()
@@ -83,7 +86,7 @@ public interface Circle extends GraphicalElement {
 	 * -->
 	 * 
 	 * @param value
-	 *            the new value of the '<em>Radius</em>' attribute.
+	 *        the new value of the '<em>Radius</em>' attribute.
 	 * @see #getRadius()
 	 * @generated
 	 */
@@ -94,15 +97,13 @@ public interface Circle extends GraphicalElement {
 	 * The radius of a circle cannot be negative
 	 * 
 	 * @param diagnostics
-	 *            The chain of diagnostics to which problems are to be appended.
+	 *        The chain of diagnostics to which problems are to be appended.
 	 * @param context
-	 *            The cache of context-specific information. <!-- end-model-doc
-	 *            -->
+	 *        The cache of context-specific information. <!-- end-model-doc
+	 *        -->
 	 * @model annotation=
 	 *        "http://www.eclipse.org/emf/2002/Ecore/OCL body='radius >= 0'"
 	 * @generated
 	 */
-	boolean nonNegativeRadius(DiagnosticChain diagnostics,
-			Map<Object, Object> context);
-
+	boolean nonNegativeRadius(DiagnosticChain diagnostics, Map<Object, Object> context);
 } // Circle
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/ClipPath.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/ClipPath.java
index f09f470ffda..a31f90642a0 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/ClipPath.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/ClipPath.java
@@ -12,14 +12,13 @@
 package org.eclipse.papyrus.dd.dg;
 
 /**
- * <!-- begin-user-doc --> A representation of the model object '
- * <em><b>Clip Path</b></em>'. <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object ' <em><b>Clip Path</b></em>'. <!-- end-user-doc -->
+ * 
  * <!-- begin-model-doc -->
  * ClipPath is a kind of group whose members collectively define a painting mask for its referencing graphical elements.
  * <!-- end-model-doc -->
- *
- *
+ * 
+ * 
  * @see org.eclipse.papyrus.dd.dg.DGPackage#getClipPath()
  * @model
  * @generated
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/ClosePath.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/ClosePath.java
index f5c681d952c..8c20156fa63 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/ClosePath.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/ClosePath.java
@@ -12,14 +12,14 @@
 package org.eclipse.papyrus.dd.dg;
 
 /**
- * <!-- begin-user-doc --> A representation of the model object '
- * <em><b>Close Path</b></em>'. <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object ' <em><b>Close Path</b></em>'. <!-- end-user-doc -->
+ * 
  * <!-- begin-model-doc -->
- * ClosePath is a kind of path command that ends the current subpath and causes an automatic straight line to be drawn from the current point to the initial point of the current subpath.
+ * ClosePath is a kind of path command that ends the current subpath and causes an automatic straight line to be drawn from the current point to the
+ * initial point of the current subpath.
  * <!-- end-model-doc -->
- *
- *
+ * 
+ * 
  * @see org.eclipse.papyrus.dd.dg.DGPackage#getClosePath()
  * @model
  * @generated
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/CubicCurveTo.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/CubicCurveTo.java
index 0c596e65ce7..6a18347acea 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/CubicCurveTo.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/CubicCurveTo.java
@@ -14,30 +14,31 @@ package org.eclipse.papyrus.dd.dg;
 import org.eclipse.papyrus.dd.dc.Point;
 
 /**
- * <!-- begin-user-doc --> A representation of the model object '
- * <em><b>Cubic Curve To</b></em>'. <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object ' <em><b>Cubic Curve To</b></em>'. <!-- end-user-doc -->
+ * 
  * <!-- begin-model-doc -->
- * CubicCurveTo is a kind of path command that draws a cubic b?zier curve from the current point to a new point using a start and an end control points.
+ * CubicCurveTo is a kind of path command that draws a cubic b?zier curve from the current point to a new point using a start and an end control
+ * points.
  * Definitions nests definitions that are commonly referenced in the containing canvas. It can also nest an embedded stylesheet.
  * EllipticalArcTo is a kind of path command that draws an elliptical arc from the current point to a new point in the coordinate system.
  * QuadraticCurveTo is a kind of path command that draws a quadratic b?zier curve from the current point to a new point using a single control point.
  * <!-- end-model-doc -->
- *
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.dd.dg.CubicCurveTo#getStartControl <em>Start Control</em>}</li>
- *   <li>{@link org.eclipse.papyrus.dd.dg.CubicCurveTo#getEndControl <em>End Control</em>}</li>
- *   <li>{@link org.eclipse.papyrus.dd.dg.CubicCurveTo#getPoint <em>Point</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.CubicCurveTo#getStartControl <em>Start Control</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.CubicCurveTo#getEndControl <em>End Control</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.CubicCurveTo#getPoint <em>Point</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.dd.dg.DGPackage#getCubicCurveTo()
  * @model
  * @generated
  */
 public interface CubicCurveTo extends PathCommand {
+
 	/**
 	 * Returns the value of the '<em><b>Point</b></em>' containment reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc --> <!-- begin-model-doc --> a
@@ -55,7 +56,9 @@ public interface CubicCurveTo extends PathCommand {
 	/**
 	 * Sets the value of the '{@link org.eclipse.papyrus.dd.dg.CubicCurveTo#getPoint <em>Point</em>}' containment reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Point</em>' containment reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Point</em>' containment reference.
 	 * @see #getPoint()
 	 * @generated
 	 */
@@ -79,7 +82,9 @@ public interface CubicCurveTo extends PathCommand {
 	 * Sets the value of the '{@link org.eclipse.papyrus.dd.dg.CubicCurveTo#getStartControl <em>Start Control</em>}' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Start Control</em>' containment reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Start Control</em>' containment reference.
 	 * @see #getStartControl()
 	 * @generated
 	 */
@@ -103,10 +108,11 @@ public interface CubicCurveTo extends PathCommand {
 	 * Sets the value of the '{@link org.eclipse.papyrus.dd.dg.CubicCurveTo#getEndControl <em>End Control</em>}' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>End Control</em>' containment reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>End Control</em>' containment reference.
 	 * @see #getEndControl()
 	 * @generated
 	 */
 	void setEndControl(Point value);
-
 } // CubicCurveTo
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/DGFactory.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/DGFactory.java
index 11ecebd373e..cb87fd2037c 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/DGFactory.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/DGFactory.java
@@ -16,14 +16,17 @@ import org.eclipse.emf.ecore.EFactory;
 /**
  * <!-- begin-user-doc --> The <b>Factory</b> for the model. It provides a
  * create method for each non-abstract class of the model. <!-- end-user-doc -->
+ * 
  * @see org.eclipse.papyrus.dd.dg.DGPackage
  * @generated
  */
 public interface DGFactory extends EFactory {
+
 	/**
 	 * The singleton instance of the factory.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	DGFactory eINSTANCE = org.eclipse.papyrus.dd.dg.impl.DGFactoryImpl.init();
@@ -32,6 +35,7 @@ public interface DGFactory extends EFactory {
 	 * Returns a new object of class '<em>Canvas</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Canvas</em>'.
 	 * @generated
 	 */
@@ -41,6 +45,7 @@ public interface DGFactory extends EFactory {
 	 * Returns a new object of class '<em>Group</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Group</em>'.
 	 * @generated
 	 */
@@ -50,6 +55,7 @@ public interface DGFactory extends EFactory {
 	 * Returns a new object of class '<em>Move To</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Move To</em>'.
 	 * @generated
 	 */
@@ -59,6 +65,7 @@ public interface DGFactory extends EFactory {
 	 * Returns a new object of class '<em>Clip Path</em>'.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Clip Path</em>'.
 	 * @generated
 	 */
@@ -68,6 +75,7 @@ public interface DGFactory extends EFactory {
 	 * Returns a new object of class '<em>Style</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Style</em>'.
 	 * @generated
 	 */
@@ -77,6 +85,7 @@ public interface DGFactory extends EFactory {
 	 * Returns a new object of class '<em>Paint</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Paint</em>'.
 	 * @generated
 	 */
@@ -86,6 +95,7 @@ public interface DGFactory extends EFactory {
 	 * Returns a new object of class '<em>Circle</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Circle</em>'.
 	 * @generated
 	 */
@@ -95,6 +105,7 @@ public interface DGFactory extends EFactory {
 	 * Returns a new object of class '<em>Close Path</em>'.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Close Path</em>'.
 	 * @generated
 	 */
@@ -113,6 +124,7 @@ public interface DGFactory extends EFactory {
 	 * Returns a new object of class '<em>Definitions</em>'.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Definitions</em>'.
 	 * @generated
 	 */
@@ -122,6 +134,7 @@ public interface DGFactory extends EFactory {
 	 * Returns a new object of class '<em>Style Sheet</em>'.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Style Sheet</em>'.
 	 * @generated
 	 */
@@ -131,6 +144,7 @@ public interface DGFactory extends EFactory {
 	 * Returns a new object of class '<em>Style Rule</em>'.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Style Rule</em>'.
 	 * @generated
 	 */
@@ -149,6 +163,7 @@ public interface DGFactory extends EFactory {
 	 * Returns a new object of class '<em>Ellipse</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Ellipse</em>'.
 	 * @generated
 	 */
@@ -185,6 +200,7 @@ public interface DGFactory extends EFactory {
 	 * Returns a new object of class '<em>Image</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Image</em>'.
 	 * @generated
 	 */
@@ -194,6 +210,7 @@ public interface DGFactory extends EFactory {
 	 * Returns a new object of class '<em>Line</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Line</em>'.
 	 * @generated
 	 */
@@ -203,6 +220,7 @@ public interface DGFactory extends EFactory {
 	 * Returns a new object of class '<em>Marker</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Marker</em>'.
 	 * @generated
 	 */
@@ -221,6 +239,7 @@ public interface DGFactory extends EFactory {
 	 * Returns a new object of class '<em>Line To</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Line To</em>'.
 	 * @generated
 	 */
@@ -230,6 +249,7 @@ public interface DGFactory extends EFactory {
 	 * Returns a new object of class '<em>Matrix</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Matrix</em>'.
 	 * @generated
 	 */
@@ -239,6 +259,7 @@ public interface DGFactory extends EFactory {
 	 * Returns a new object of class '<em>Path</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Path</em>'.
 	 * @generated
 	 */
@@ -248,6 +269,7 @@ public interface DGFactory extends EFactory {
 	 * Returns a new object of class '<em>Pattern</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Pattern</em>'.
 	 * @generated
 	 */
@@ -257,6 +279,7 @@ public interface DGFactory extends EFactory {
 	 * Returns a new object of class '<em>Polygon</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Polygon</em>'.
 	 * @generated
 	 */
@@ -266,6 +289,7 @@ public interface DGFactory extends EFactory {
 	 * Returns a new object of class '<em>Polyline</em>'.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Polyline</em>'.
 	 * @generated
 	 */
@@ -284,6 +308,7 @@ public interface DGFactory extends EFactory {
 	 * Returns a new object of class '<em>Rectangle</em>'.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Rectangle</em>'.
 	 * @generated
 	 */
@@ -293,6 +318,7 @@ public interface DGFactory extends EFactory {
 	 * Returns a new object of class '<em>Root Canvas</em>'.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Root Canvas</em>'.
 	 * @generated
 	 */
@@ -302,6 +328,7 @@ public interface DGFactory extends EFactory {
 	 * Returns a new object of class '<em>Rotate</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Rotate</em>'.
 	 * @generated
 	 */
@@ -311,6 +338,7 @@ public interface DGFactory extends EFactory {
 	 * Returns a new object of class '<em>Scale</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Scale</em>'.
 	 * @generated
 	 */
@@ -320,6 +348,7 @@ public interface DGFactory extends EFactory {
 	 * Returns a new object of class '<em>Skew</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Skew</em>'.
 	 * @generated
 	 */
@@ -329,6 +358,7 @@ public interface DGFactory extends EFactory {
 	 * Returns a new object of class '<em>Text</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Text</em>'.
 	 * @generated
 	 */
@@ -338,6 +368,7 @@ public interface DGFactory extends EFactory {
 	 * Returns a new object of class '<em>Translate</em>'.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Translate</em>'.
 	 * @generated
 	 */
@@ -347,6 +378,7 @@ public interface DGFactory extends EFactory {
 	 * Returns a new object of class '<em>Use</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Use</em>'.
 	 * @generated
 	 */
@@ -356,9 +388,9 @@ public interface DGFactory extends EFactory {
 	 * Returns the package supported by this factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the package supported by this factory.
 	 * @generated
 	 */
 	DGPackage getDGPackage();
-
 } // DGFactory
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/DGPackage.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/DGPackage.java
index 3ed6eb2b538..40bd99c3e24 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/DGPackage.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/DGPackage.java
@@ -42,9 +42,11 @@ import org.eclipse.emf.ecore.EReference;
  * @generated
  */
 public interface DGPackage extends EPackage {
+
 	/**
 	 * The package name.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	String eNAME = "dg";
@@ -52,6 +54,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The package namespace URI.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	String eNS_URI = "http://www.omg.org/spec/DD/20110901/DG";
@@ -59,6 +62,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The package namespace name.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	String eNS_PREFIX = "dg";
@@ -67,6 +71,7 @@ public interface DGPackage extends EPackage {
 	 * The singleton instance of the package.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	DGPackage eINSTANCE = org.eclipse.papyrus.dd.dg.impl.DGPackageImpl.init();
@@ -74,6 +79,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The meta object id for the '{@link org.eclipse.papyrus.dd.dg.impl.DefinitionImpl <em>Definition</em>}' class.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.papyrus.dd.dg.impl.DefinitionImpl
 	 * @see org.eclipse.papyrus.dd.dg.impl.DGPackageImpl#getDefinition()
 	 * @generated
@@ -92,6 +98,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The number of structural features of the '<em>Definition</em>' class.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -119,6 +126,7 @@ public interface DGPackage extends EPackage {
 	 * The meta object id for the '{@link org.eclipse.papyrus.dd.dg.impl.GraphicalElementImpl <em>Graphical Element</em>}' class.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @see org.eclipse.papyrus.dd.dg.impl.GraphicalElementImpl
 	 * @see org.eclipse.papyrus.dd.dg.impl.DGPackageImpl#getGraphicalElement()
 	 * @generated
@@ -164,6 +172,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The feature id for the '<em><b>Style</b></em>' containment reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -172,6 +181,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The feature id for the '<em><b>Transform</b></em>' containment reference list.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -181,6 +191,7 @@ public interface DGPackage extends EPackage {
 	 * The feature id for the '<em><b>Layout Data</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -189,6 +200,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The number of structural features of the '<em>Graphical Element</em>' class.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -206,6 +218,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The operation id for the '<em>Referenced Clippath Has Id</em>' operation.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -223,6 +236,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The meta object id for the '{@link org.eclipse.papyrus.dd.dg.impl.GroupImpl <em>Group</em>}' class.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.papyrus.dd.dg.impl.GroupImpl
 	 * @see org.eclipse.papyrus.dd.dg.impl.DGPackageImpl#getGroup()
 	 * @generated
@@ -268,6 +282,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The feature id for the '<em><b>Style</b></em>' containment reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -276,6 +291,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The feature id for the '<em><b>Transform</b></em>' containment reference list.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -285,6 +301,7 @@ public interface DGPackage extends EPackage {
 	 * The feature id for the '<em><b>Layout Data</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -293,6 +310,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The feature id for the '<em><b>Member</b></em>' containment reference list.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -302,6 +320,7 @@ public interface DGPackage extends EPackage {
 	 * The feature id for the '<em><b>Layout</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -328,6 +347,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The operation id for the '<em>Referenced Clippath Has Id</em>' operation.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -345,6 +365,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The meta object id for the '{@link org.eclipse.papyrus.dd.dg.impl.CanvasImpl <em>Canvas</em>}' class.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.papyrus.dd.dg.impl.CanvasImpl
 	 * @see org.eclipse.papyrus.dd.dg.impl.DGPackageImpl#getCanvas()
 	 * @generated
@@ -390,6 +411,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The feature id for the '<em><b>Style</b></em>' containment reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -398,6 +420,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The feature id for the '<em><b>Transform</b></em>' containment reference list.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -407,6 +430,7 @@ public interface DGPackage extends EPackage {
 	 * The feature id for the '<em><b>Layout Data</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -415,6 +439,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The feature id for the '<em><b>Member</b></em>' containment reference list.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -424,6 +449,7 @@ public interface DGPackage extends EPackage {
 	 * The feature id for the '<em><b>Layout</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -432,6 +458,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The feature id for the '<em><b>Bounds</b></em>' containment reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -458,6 +485,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The operation id for the '<em>Referenced Clippath Has Id</em>' operation.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -466,6 +494,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The operation id for the '<em>Canvas Cannot Have Transforms</em>' operation.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -481,8 +510,7 @@ public interface DGPackage extends EPackage {
 	int CANVAS_OPERATION_COUNT = GROUP_OPERATION_COUNT + 1;
 
 	/**
-	 * The meta object id for the '
-	 * {@link org.eclipse.papyrus.dd.dg.impl.PathCommandImpl
+	 * The meta object id for the ' {@link org.eclipse.papyrus.dd.dg.impl.PathCommandImpl
 	 * <em>Path Command</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc
 	 * -->
 	 * 
@@ -504,6 +532,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The number of structural features of the '<em>Path Command</em>' class.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -521,6 +550,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The meta object id for the '{@link org.eclipse.papyrus.dd.dg.impl.MoveToImpl <em>Move To</em>}' class.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.papyrus.dd.dg.impl.MoveToImpl
 	 * @see org.eclipse.papyrus.dd.dg.impl.DGPackageImpl#getMoveTo()
 	 * @generated
@@ -539,6 +569,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The feature id for the '<em><b>Point</b></em>' containment reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -565,6 +596,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The meta object id for the '{@link org.eclipse.papyrus.dd.dg.impl.ClipPathImpl <em>Clip Path</em>}' class.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.papyrus.dd.dg.impl.ClipPathImpl
 	 * @see org.eclipse.papyrus.dd.dg.impl.DGPackageImpl#getClipPath()
 	 * @generated
@@ -610,6 +642,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The feature id for the '<em><b>Style</b></em>' containment reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -618,6 +651,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The feature id for the '<em><b>Transform</b></em>' containment reference list.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -627,6 +661,7 @@ public interface DGPackage extends EPackage {
 	 * The feature id for the '<em><b>Layout Data</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -635,6 +670,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The feature id for the '<em><b>Member</b></em>' containment reference list.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -644,6 +680,7 @@ public interface DGPackage extends EPackage {
 	 * The feature id for the '<em><b>Layout</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -670,6 +707,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The operation id for the '<em>Referenced Clippath Has Id</em>' operation.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -687,6 +725,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The meta object id for the '{@link org.eclipse.papyrus.dd.dg.impl.StyleImpl <em>Style</em>}' class.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.papyrus.dd.dg.impl.StyleImpl
 	 * @see org.eclipse.papyrus.dd.dg.impl.DGPackageImpl#getStyle()
 	 * @generated
@@ -714,6 +753,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The feature id for the '<em><b>Stroke</b></em>' containment reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -740,6 +780,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The feature id for the '<em><b>Stroke Dash Length</b></em>' attribute list.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -829,6 +870,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The operation id for the '<em>Valid Dash Length Size</em>' operation.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -855,6 +897,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The meta object id for the '{@link org.eclipse.papyrus.dd.dg.impl.PaintImpl <em>Paint</em>}' class.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.papyrus.dd.dg.impl.PaintImpl
 	 * @see org.eclipse.papyrus.dd.dg.impl.DGPackageImpl#getPaint()
 	 * @generated
@@ -891,6 +934,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The operation id for the '<em>Referenced Paint Server Has Id</em>' operation.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -906,8 +950,7 @@ public interface DGPackage extends EPackage {
 	int PAINT_OPERATION_COUNT = 1;
 
 	/**
-	 * The meta object id for the '
-	 * {@link org.eclipse.papyrus.dd.dg.impl.PaintServerImpl
+	 * The meta object id for the ' {@link org.eclipse.papyrus.dd.dg.impl.PaintServerImpl
 	 * <em>Paint Server</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc
 	 * -->
 	 * 
@@ -929,6 +972,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The feature id for the '<em><b>Transform</b></em>' containment reference list.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -937,6 +981,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The number of structural features of the '<em>Paint Server</em>' class.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -963,6 +1008,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The meta object id for the '{@link org.eclipse.papyrus.dd.dg.impl.TransformImpl <em>Transform</em>}' class.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.papyrus.dd.dg.impl.TransformImpl
 	 * @see org.eclipse.papyrus.dd.dg.impl.DGPackageImpl#getTransform()
 	 * @generated
@@ -990,6 +1036,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The meta object id for the '{@link org.eclipse.papyrus.dd.dg.impl.CircleImpl <em>Circle</em>}' class.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.papyrus.dd.dg.impl.CircleImpl
 	 * @see org.eclipse.papyrus.dd.dg.impl.DGPackageImpl#getCircle()
 	 * @generated
@@ -1035,6 +1082,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The feature id for the '<em><b>Style</b></em>' containment reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1043,6 +1091,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The feature id for the '<em><b>Transform</b></em>' containment reference list.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1052,6 +1101,7 @@ public interface DGPackage extends EPackage {
 	 * The feature id for the '<em><b>Layout Data</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1060,6 +1110,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The feature id for the '<em><b>Center</b></em>' containment reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1095,6 +1146,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The operation id for the '<em>Referenced Clippath Has Id</em>' operation.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1121,6 +1173,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The meta object id for the '{@link org.eclipse.papyrus.dd.dg.impl.ClosePathImpl <em>Close Path</em>}' class.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.papyrus.dd.dg.impl.ClosePathImpl
 	 * @see org.eclipse.papyrus.dd.dg.impl.DGPackageImpl#getClosePath()
 	 * @generated
@@ -1139,6 +1192,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The number of structural features of the '<em>Close Path</em>' class.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1157,6 +1211,7 @@ public interface DGPackage extends EPackage {
 	 * The meta object id for the '{@link org.eclipse.papyrus.dd.dg.impl.CubicCurveToImpl <em>Cubic Curve To</em>}' class.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @see org.eclipse.papyrus.dd.dg.impl.CubicCurveToImpl
 	 * @see org.eclipse.papyrus.dd.dg.impl.DGPackageImpl#getCubicCurveTo()
 	 * @generated
@@ -1175,6 +1230,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The feature id for the '<em><b>Start Control</b></em>' containment reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1183,6 +1239,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The feature id for the '<em><b>End Control</b></em>' containment reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1191,6 +1248,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The feature id for the '<em><b>Point</b></em>' containment reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1199,6 +1257,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The number of structural features of the '<em>Cubic Curve To</em>' class.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1214,8 +1273,7 @@ public interface DGPackage extends EPackage {
 	int CUBIC_CURVE_TO_OPERATION_COUNT = PATH_COMMAND_OPERATION_COUNT + 0;
 
 	/**
-	 * The meta object id for the '
-	 * {@link org.eclipse.papyrus.dd.dg.impl.DefinitionsImpl
+	 * The meta object id for the ' {@link org.eclipse.papyrus.dd.dg.impl.DefinitionsImpl
 	 * <em>Definitions</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc
 	 * -->
 	 * 
@@ -1228,6 +1286,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The feature id for the '<em><b>Defnition</b></em>' containment reference list.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1236,6 +1295,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The feature id for the '<em><b>Style Sheet</b></em>' containment reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1244,6 +1304,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The number of structural features of the '<em>Definitions</em>' class.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1259,8 +1320,7 @@ public interface DGPackage extends EPackage {
 	int DEFINITIONS_OPERATION_COUNT = 0;
 
 	/**
-	 * The meta object id for the '
-	 * {@link org.eclipse.papyrus.dd.dg.impl.StyleSheetImpl
+	 * The meta object id for the ' {@link org.eclipse.papyrus.dd.dg.impl.StyleSheetImpl
 	 * <em>Style Sheet</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc
 	 * -->
 	 * 
@@ -1273,6 +1333,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The feature id for the '<em><b>Rule</b></em>' containment reference list.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1281,6 +1342,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The number of structural features of the '<em>Style Sheet</em>' class.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1298,6 +1360,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The meta object id for the '{@link org.eclipse.papyrus.dd.dg.impl.StyleRuleImpl <em>Style Rule</em>}' class.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.papyrus.dd.dg.impl.StyleRuleImpl
 	 * @see org.eclipse.papyrus.dd.dg.impl.DGPackageImpl#getStyleRule()
 	 * @generated
@@ -1307,6 +1370,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The feature id for the '<em><b>Selector</b></em>' containment reference list.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1315,6 +1379,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The feature id for the '<em><b>Style</b></em>' containment reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1323,6 +1388,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The number of structural features of the '<em>Style Rule</em>' class.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1341,6 +1407,7 @@ public interface DGPackage extends EPackage {
 	 * The meta object id for the '{@link org.eclipse.papyrus.dd.dg.impl.StyleSelectorImpl <em>Style Selector</em>}' class.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @see org.eclipse.papyrus.dd.dg.impl.StyleSelectorImpl
 	 * @see org.eclipse.papyrus.dd.dg.impl.DGPackageImpl#getStyleSelector()
 	 * @generated
@@ -1368,6 +1435,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The number of structural features of the '<em>Style Selector</em>' class.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1385,6 +1453,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The meta object id for the '{@link org.eclipse.papyrus.dd.dg.impl.EllipseImpl <em>Ellipse</em>}' class.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.papyrus.dd.dg.impl.EllipseImpl
 	 * @see org.eclipse.papyrus.dd.dg.impl.DGPackageImpl#getEllipse()
 	 * @generated
@@ -1430,6 +1499,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The feature id for the '<em><b>Style</b></em>' containment reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1438,6 +1508,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The feature id for the '<em><b>Transform</b></em>' containment reference list.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1447,6 +1518,7 @@ public interface DGPackage extends EPackage {
 	 * The feature id for the '<em><b>Layout Data</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1455,6 +1527,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The feature id for the '<em><b>Center</b></em>' containment reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1463,6 +1536,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The feature id for the '<em><b>Radii</b></em>' containment reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1489,6 +1563,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The operation id for the '<em>Referenced Clippath Has Id</em>' operation.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1507,6 +1582,7 @@ public interface DGPackage extends EPackage {
 	 * The meta object id for the '{@link org.eclipse.papyrus.dd.dg.impl.EllipticalArcToImpl <em>Elliptical Arc To</em>}' class.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @see org.eclipse.papyrus.dd.dg.impl.EllipticalArcToImpl
 	 * @see org.eclipse.papyrus.dd.dg.impl.DGPackageImpl#getEllipticalArcTo()
 	 * @generated
@@ -1525,6 +1601,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The feature id for the '<em><b>Radii</b></em>' containment reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1560,6 +1637,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The feature id for the '<em><b>Point</b></em>' containment reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1568,6 +1646,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The number of structural features of the '<em>Elliptical Arc To</em>' class.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1586,6 +1665,7 @@ public interface DGPackage extends EPackage {
 	 * The meta object id for the '{@link org.eclipse.papyrus.dd.dg.impl.QuadraticCurveToImpl <em>Quadratic Curve To</em>}' class.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @see org.eclipse.papyrus.dd.dg.impl.QuadraticCurveToImpl
 	 * @see org.eclipse.papyrus.dd.dg.impl.DGPackageImpl#getQuadraticCurveTo()
 	 * @generated
@@ -1604,6 +1684,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The feature id for the '<em><b>Control</b></em>' containment reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1612,6 +1693,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The feature id for the '<em><b>Point</b></em>' containment reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1620,6 +1702,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The number of structural features of the '<em>Quadratic Curve To</em>' class.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1637,6 +1720,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The meta object id for the '{@link org.eclipse.papyrus.dd.dg.impl.GradientImpl <em>Gradient</em>}' class.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.papyrus.dd.dg.impl.GradientImpl
 	 * @see org.eclipse.papyrus.dd.dg.impl.DGPackageImpl#getGradient()
 	 * @generated
@@ -1655,6 +1739,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The feature id for the '<em><b>Transform</b></em>' containment reference list.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1663,6 +1748,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The feature id for the '<em><b>Stop</b></em>' containment reference list.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1696,8 +1782,7 @@ public interface DGPackage extends EPackage {
 	int GRADIENT_OPERATION_COUNT = PAINT_SERVER_OPERATION_COUNT + 0;
 
 	/**
-	 * The meta object id for the '
-	 * {@link org.eclipse.papyrus.dd.dg.impl.GradientStopImpl
+	 * The meta object id for the ' {@link org.eclipse.papyrus.dd.dg.impl.GradientStopImpl
 	 * <em>Gradient Stop</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc
 	 * -->
 	 * 
@@ -1737,6 +1822,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The number of structural features of the '<em>Gradient Stop</em>' class.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1772,6 +1858,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The meta object id for the '{@link org.eclipse.papyrus.dd.dg.impl.ImageImpl <em>Image</em>}' class.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.papyrus.dd.dg.impl.ImageImpl
 	 * @see org.eclipse.papyrus.dd.dg.impl.DGPackageImpl#getImage()
 	 * @generated
@@ -1817,6 +1904,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The feature id for the '<em><b>Style</b></em>' containment reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1825,6 +1913,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The feature id for the '<em><b>Transform</b></em>' containment reference list.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1834,6 +1923,7 @@ public interface DGPackage extends EPackage {
 	 * The feature id for the '<em><b>Layout Data</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1851,6 +1941,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The feature id for the '<em><b>Bounds</b></em>' containment reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1859,6 +1950,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The feature id for the '<em><b>Is Aspect Ratio Preserved</b></em>' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1885,6 +1977,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The operation id for the '<em>Referenced Clippath Has Id</em>' operation.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1893,6 +1986,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The operation id for the '<em>Source Cannot Be Empty</em>' operation.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1911,6 +2005,7 @@ public interface DGPackage extends EPackage {
 	 * The meta object id for the '{@link org.eclipse.papyrus.dd.dg.impl.MarkedElementImpl <em>Marked Element</em>}' class.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @see org.eclipse.papyrus.dd.dg.impl.MarkedElementImpl
 	 * @see org.eclipse.papyrus.dd.dg.impl.DGPackageImpl#getMarkedElement()
 	 * @generated
@@ -1956,6 +2051,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The feature id for the '<em><b>Style</b></em>' containment reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1964,6 +2060,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The feature id for the '<em><b>Transform</b></em>' containment reference list.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1973,6 +2070,7 @@ public interface DGPackage extends EPackage {
 	 * The feature id for the '<em><b>Layout Data</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -2008,6 +2106,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The number of structural features of the '<em>Marked Element</em>' class.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -2025,6 +2124,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The operation id for the '<em>Referenced Clippath Has Id</em>' operation.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -2033,6 +2133,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The operation id for the '<em>Referenced Start Marker Has Id</em>' operation.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -2041,6 +2142,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The operation id for the '<em>Referenced Mid Marker Has Id</em>' operation.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -2049,6 +2151,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The operation id for the '<em>Referenced End Marker Has Id</em>' operation.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -2066,6 +2169,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The meta object id for the '{@link org.eclipse.papyrus.dd.dg.impl.LineImpl <em>Line</em>}' class.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.papyrus.dd.dg.impl.LineImpl
 	 * @see org.eclipse.papyrus.dd.dg.impl.DGPackageImpl#getLine()
 	 * @generated
@@ -2111,6 +2215,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The feature id for the '<em><b>Style</b></em>' containment reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -2119,6 +2224,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The feature id for the '<em><b>Transform</b></em>' containment reference list.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -2128,6 +2234,7 @@ public interface DGPackage extends EPackage {
 	 * The feature id for the '<em><b>Layout Data</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -2163,6 +2270,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The feature id for the '<em><b>Start</b></em>' containment reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -2198,6 +2306,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The operation id for the '<em>Referenced Clippath Has Id</em>' operation.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -2206,6 +2315,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The operation id for the '<em>Referenced Start Marker Has Id</em>' operation.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -2214,6 +2324,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The operation id for the '<em>Referenced Mid Marker Has Id</em>' operation.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -2222,6 +2333,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The operation id for the '<em>Referenced End Marker Has Id</em>' operation.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -2239,6 +2351,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The meta object id for the '{@link org.eclipse.papyrus.dd.dg.impl.MarkerImpl <em>Marker</em>}' class.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.papyrus.dd.dg.impl.MarkerImpl
 	 * @see org.eclipse.papyrus.dd.dg.impl.DGPackageImpl#getMarker()
 	 * @generated
@@ -2284,6 +2397,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The feature id for the '<em><b>Style</b></em>' containment reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -2292,6 +2406,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The feature id for the '<em><b>Transform</b></em>' containment reference list.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -2301,6 +2416,7 @@ public interface DGPackage extends EPackage {
 	 * The feature id for the '<em><b>Layout Data</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -2309,6 +2425,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The feature id for the '<em><b>Member</b></em>' containment reference list.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -2318,6 +2435,7 @@ public interface DGPackage extends EPackage {
 	 * The feature id for the '<em><b>Layout</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -2335,6 +2453,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The feature id for the '<em><b>Reference</b></em>' containment reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -2361,6 +2480,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The operation id for the '<em>Referenced Clippath Has Id</em>' operation.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -2379,6 +2499,7 @@ public interface DGPackage extends EPackage {
 	 * The meta object id for the '{@link org.eclipse.papyrus.dd.dg.impl.LinearGradientImpl <em>Linear Gradient</em>}' class.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @see org.eclipse.papyrus.dd.dg.impl.LinearGradientImpl
 	 * @see org.eclipse.papyrus.dd.dg.impl.DGPackageImpl#getLinearGradient()
 	 * @generated
@@ -2397,6 +2518,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The feature id for the '<em><b>Transform</b></em>' containment reference list.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -2405,6 +2527,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The feature id for the '<em><b>Stop</b></em>' containment reference list.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -2413,6 +2536,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The feature id for the '<em><b>Start</b></em>' containment reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -2430,6 +2554,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The number of structural features of the '<em>Linear Gradient</em>' class.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -2465,6 +2590,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The meta object id for the '{@link org.eclipse.papyrus.dd.dg.impl.LineToImpl <em>Line To</em>}' class.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.papyrus.dd.dg.impl.LineToImpl
 	 * @see org.eclipse.papyrus.dd.dg.impl.DGPackageImpl#getLineTo()
 	 * @generated
@@ -2483,6 +2609,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The feature id for the '<em><b>Point</b></em>' containment reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -2509,6 +2636,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The meta object id for the '{@link org.eclipse.papyrus.dd.dg.impl.MatrixImpl <em>Matrix</em>}' class.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.papyrus.dd.dg.impl.MatrixImpl
 	 * @see org.eclipse.papyrus.dd.dg.impl.DGPackageImpl#getMatrix()
 	 * @generated
@@ -2519,6 +2647,7 @@ public interface DGPackage extends EPackage {
 	 * The feature id for the '<em><b>A</b></em>' attribute.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -2528,6 +2657,7 @@ public interface DGPackage extends EPackage {
 	 * The feature id for the '<em><b>B</b></em>' attribute.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -2537,6 +2667,7 @@ public interface DGPackage extends EPackage {
 	 * The feature id for the '<em><b>C</b></em>' attribute.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -2546,6 +2677,7 @@ public interface DGPackage extends EPackage {
 	 * The feature id for the '<em><b>D</b></em>' attribute.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -2555,6 +2687,7 @@ public interface DGPackage extends EPackage {
 	 * The feature id for the '<em><b>E</b></em>' attribute.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -2564,6 +2697,7 @@ public interface DGPackage extends EPackage {
 	 * The feature id for the '<em><b>F</b></em>' attribute.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -2590,6 +2724,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The meta object id for the '{@link org.eclipse.papyrus.dd.dg.impl.PathImpl <em>Path</em>}' class.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.papyrus.dd.dg.impl.PathImpl
 	 * @see org.eclipse.papyrus.dd.dg.impl.DGPackageImpl#getPath()
 	 * @generated
@@ -2635,6 +2770,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The feature id for the '<em><b>Style</b></em>' containment reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -2643,6 +2779,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The feature id for the '<em><b>Transform</b></em>' containment reference list.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -2652,6 +2789,7 @@ public interface DGPackage extends EPackage {
 	 * The feature id for the '<em><b>Layout Data</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -2687,6 +2825,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The feature id for the '<em><b>Command</b></em>' containment reference list.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -2713,6 +2852,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The operation id for the '<em>Referenced Clippath Has Id</em>' operation.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -2721,6 +2861,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The operation id for the '<em>Referenced Start Marker Has Id</em>' operation.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -2729,6 +2870,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The operation id for the '<em>Referenced Mid Marker Has Id</em>' operation.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -2737,6 +2879,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The operation id for the '<em>Referenced End Marker Has Id</em>' operation.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -2745,6 +2888,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The operation id for the '<em>First Command Must Be Move</em>' operation.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -2762,6 +2906,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The meta object id for the '{@link org.eclipse.papyrus.dd.dg.impl.PatternImpl <em>Pattern</em>}' class.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.papyrus.dd.dg.impl.PatternImpl
 	 * @see org.eclipse.papyrus.dd.dg.impl.DGPackageImpl#getPattern()
 	 * @generated
@@ -2780,6 +2925,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The feature id for the '<em><b>Transform</b></em>' containment reference list.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -2788,6 +2934,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The feature id for the '<em><b>Bounds</b></em>' containment reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -2832,6 +2979,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The meta object id for the '{@link org.eclipse.papyrus.dd.dg.impl.PolygonImpl <em>Polygon</em>}' class.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.papyrus.dd.dg.impl.PolygonImpl
 	 * @see org.eclipse.papyrus.dd.dg.impl.DGPackageImpl#getPolygon()
 	 * @generated
@@ -2877,6 +3025,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The feature id for the '<em><b>Style</b></em>' containment reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -2885,6 +3034,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The feature id for the '<em><b>Transform</b></em>' containment reference list.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -2894,6 +3044,7 @@ public interface DGPackage extends EPackage {
 	 * The feature id for the '<em><b>Layout Data</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -2929,6 +3080,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The feature id for the '<em><b>Point</b></em>' containment reference list.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -2955,6 +3107,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The operation id for the '<em>Referenced Clippath Has Id</em>' operation.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -2963,6 +3116,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The operation id for the '<em>Referenced Start Marker Has Id</em>' operation.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -2971,6 +3125,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The operation id for the '<em>Referenced Mid Marker Has Id</em>' operation.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -2979,6 +3134,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The operation id for the '<em>Referenced End Marker Has Id</em>' operation.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -2996,6 +3152,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The meta object id for the '{@link org.eclipse.papyrus.dd.dg.impl.PolylineImpl <em>Polyline</em>}' class.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.papyrus.dd.dg.impl.PolylineImpl
 	 * @see org.eclipse.papyrus.dd.dg.impl.DGPackageImpl#getPolyline()
 	 * @generated
@@ -3041,6 +3198,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The feature id for the '<em><b>Style</b></em>' containment reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -3049,6 +3207,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The feature id for the '<em><b>Transform</b></em>' containment reference list.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -3058,6 +3217,7 @@ public interface DGPackage extends EPackage {
 	 * The feature id for the '<em><b>Layout Data</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -3093,6 +3253,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The feature id for the '<em><b>Point</b></em>' containment reference list.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -3119,6 +3280,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The operation id for the '<em>Referenced Clippath Has Id</em>' operation.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -3127,6 +3289,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The operation id for the '<em>Referenced Start Marker Has Id</em>' operation.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -3135,6 +3298,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The operation id for the '<em>Referenced Mid Marker Has Id</em>' operation.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -3143,6 +3307,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The operation id for the '<em>Referenced End Marker Has Id</em>' operation.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -3161,6 +3326,7 @@ public interface DGPackage extends EPackage {
 	 * The meta object id for the '{@link org.eclipse.papyrus.dd.dg.impl.RadialGradientImpl <em>Radial Gradient</em>}' class.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @see org.eclipse.papyrus.dd.dg.impl.RadialGradientImpl
 	 * @see org.eclipse.papyrus.dd.dg.impl.DGPackageImpl#getRadialGradient()
 	 * @generated
@@ -3179,6 +3345,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The feature id for the '<em><b>Transform</b></em>' containment reference list.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -3187,6 +3354,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The feature id for the '<em><b>Stop</b></em>' containment reference list.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -3195,6 +3363,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The feature id for the '<em><b>Center</b></em>' containment reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -3203,6 +3372,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The feature id for the '<em><b>Focus</b></em>' containment reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -3220,6 +3390,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The number of structural features of the '<em>Radial Gradient</em>' class.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -3273,6 +3444,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The meta object id for the '{@link org.eclipse.papyrus.dd.dg.impl.RectangleImpl <em>Rectangle</em>}' class.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.papyrus.dd.dg.impl.RectangleImpl
 	 * @see org.eclipse.papyrus.dd.dg.impl.DGPackageImpl#getRectangle()
 	 * @generated
@@ -3318,6 +3490,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The feature id for the '<em><b>Style</b></em>' containment reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -3326,6 +3499,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The feature id for the '<em><b>Transform</b></em>' containment reference list.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -3335,6 +3509,7 @@ public interface DGPackage extends EPackage {
 	 * The feature id for the '<em><b>Layout Data</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -3343,6 +3518,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The feature id for the '<em><b>Bounds</b></em>' containment reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -3378,6 +3554,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The operation id for the '<em>Referenced Clippath Has Id</em>' operation.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -3386,6 +3563,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The operation id for the '<em>Non Negative Corner Radius</em>' operation.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -3401,8 +3579,7 @@ public interface DGPackage extends EPackage {
 	int RECTANGLE_OPERATION_COUNT = GRAPHICAL_ELEMENT_OPERATION_COUNT + 1;
 
 	/**
-	 * The meta object id for the '
-	 * {@link org.eclipse.papyrus.dd.dg.impl.RootCanvasImpl
+	 * The meta object id for the ' {@link org.eclipse.papyrus.dd.dg.impl.RootCanvasImpl
 	 * <em>Root Canvas</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc
 	 * -->
 	 * 
@@ -3451,6 +3628,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The feature id for the '<em><b>Style</b></em>' containment reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -3459,6 +3637,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The feature id for the '<em><b>Transform</b></em>' containment reference list.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -3468,6 +3647,7 @@ public interface DGPackage extends EPackage {
 	 * The feature id for the '<em><b>Layout Data</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -3476,6 +3656,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The feature id for the '<em><b>Member</b></em>' containment reference list.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -3485,6 +3666,7 @@ public interface DGPackage extends EPackage {
 	 * The feature id for the '<em><b>Layout</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -3493,6 +3675,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The feature id for the '<em><b>Bounds</b></em>' containment reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -3510,6 +3693,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The feature id for the '<em><b>Definitions</b></em>' containment reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -3518,6 +3702,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The feature id for the '<em><b>External Style Sheet</b></em>' reference list.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -3527,6 +3712,7 @@ public interface DGPackage extends EPackage {
 	 * The feature id for the '<em><b>Script</b></em>' attribute list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -3535,6 +3721,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The number of structural features of the '<em>Root Canvas</em>' class.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -3552,6 +3739,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The operation id for the '<em>Referenced Clippath Has Id</em>' operation.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -3560,6 +3748,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The operation id for the '<em>Canvas Cannot Have Transforms</em>' operation.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -3577,6 +3766,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The meta object id for the '{@link org.eclipse.papyrus.dd.dg.impl.RotateImpl <em>Rotate</em>}' class.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.papyrus.dd.dg.impl.RotateImpl
 	 * @see org.eclipse.papyrus.dd.dg.impl.DGPackageImpl#getRotate()
 	 * @generated
@@ -3595,6 +3785,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The feature id for the '<em><b>Center</b></em>' containment reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -3621,6 +3812,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The meta object id for the '{@link org.eclipse.papyrus.dd.dg.impl.ScaleImpl <em>Scale</em>}' class.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.papyrus.dd.dg.impl.ScaleImpl
 	 * @see org.eclipse.papyrus.dd.dg.impl.DGPackageImpl#getScale()
 	 * @generated
@@ -3675,6 +3867,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The meta object id for the '{@link org.eclipse.papyrus.dd.dg.impl.SkewImpl <em>Skew</em>}' class.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.papyrus.dd.dg.impl.SkewImpl
 	 * @see org.eclipse.papyrus.dd.dg.impl.DGPackageImpl#getSkew()
 	 * @generated
@@ -3720,6 +3913,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The meta object id for the '{@link org.eclipse.papyrus.dd.dg.impl.TextImpl <em>Text</em>}' class.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.papyrus.dd.dg.impl.TextImpl
 	 * @see org.eclipse.papyrus.dd.dg.impl.DGPackageImpl#getText()
 	 * @generated
@@ -3765,6 +3959,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The feature id for the '<em><b>Style</b></em>' containment reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -3773,6 +3968,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The feature id for the '<em><b>Transform</b></em>' containment reference list.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -3782,6 +3978,7 @@ public interface DGPackage extends EPackage {
 	 * The feature id for the '<em><b>Layout Data</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -3799,6 +3996,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The feature id for the '<em><b>Position</b></em>' containment reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -3808,6 +4006,7 @@ public interface DGPackage extends EPackage {
 	 * The feature id for the '<em><b>Anchor</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -3834,6 +4033,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The operation id for the '<em>Referenced Clippath Has Id</em>' operation.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -3860,6 +4060,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The meta object id for the '{@link org.eclipse.papyrus.dd.dg.impl.TranslateImpl <em>Translate</em>}' class.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.papyrus.dd.dg.impl.TranslateImpl
 	 * @see org.eclipse.papyrus.dd.dg.impl.DGPackageImpl#getTranslate()
 	 * @generated
@@ -3903,8 +4104,7 @@ public interface DGPackage extends EPackage {
 	int TRANSLATE_OPERATION_COUNT = TRANSFORM_OPERATION_COUNT + 0;
 
 	/**
-	 * The meta object id for the '
-	 * {@link org.eclipse.papyrus.dd.dg.impl.UseImpl <em>Use</em>}' class. <!--
+	 * The meta object id for the ' {@link org.eclipse.papyrus.dd.dg.impl.UseImpl <em>Use</em>}' class. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @see org.eclipse.papyrus.dd.dg.impl.UseImpl
@@ -3952,6 +4152,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The feature id for the '<em><b>Style</b></em>' containment reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -3960,6 +4161,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The feature id for the '<em><b>Transform</b></em>' containment reference list.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -3969,6 +4171,7 @@ public interface DGPackage extends EPackage {
 	 * The feature id for the '<em><b>Layout Data</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -3977,6 +4180,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The feature id for the '<em><b>Bounds</b></em>' containment reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -3985,6 +4189,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The feature id for the '<em><b>Referenced Element</b></em>' reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -4011,6 +4216,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The operation id for the '<em>Referenced Clippath Has Id</em>' operation.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -4019,6 +4225,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The operation id for the '<em>Referenced Element Has Id</em>' operation.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -4028,6 +4235,7 @@ public interface DGPackage extends EPackage {
 	 * The number of operations of the '<em>Use</em>' class.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -4036,6 +4244,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * The meta object id for the '{@link org.eclipse.papyrus.dd.dg.FontDecoration <em>Font Decoration</em>}' enum.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.papyrus.dd.dg.FontDecoration
 	 * @see org.eclipse.papyrus.dd.dg.impl.DGPackageImpl#getFontDecoration()
 	 * @generated
@@ -4057,6 +4266,7 @@ public interface DGPackage extends EPackage {
 	 * The meta object id for the '{@link org.eclipse.papyrus.dd.dg.TextAnchor <em>Text Anchor</em>}' enum.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.papyrus.dd.dg.TextAnchor
 	 * @see org.eclipse.papyrus.dd.dg.impl.DGPackageImpl#getTextAnchor()
 	 * @generated
@@ -4064,8 +4274,7 @@ public interface DGPackage extends EPackage {
 	int TEXT_ANCHOR = 45;
 
 	/**
-	 * Returns the meta object for class '
-	 * {@link org.eclipse.papyrus.dd.dg.Canvas <em>Canvas</em>}'. <!--
+	 * Returns the meta object for class ' {@link org.eclipse.papyrus.dd.dg.Canvas <em>Canvas</em>}'. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @return the meta object for class '<em>Canvas</em>'.
@@ -4075,8 +4284,7 @@ public interface DGPackage extends EPackage {
 	EClass getCanvas();
 
 	/**
-	 * Returns the meta object for the containment reference '
-	 * {@link org.eclipse.papyrus.dd.dg.Canvas#getBounds <em>Bounds</em>}'. <!--
+	 * Returns the meta object for the containment reference ' {@link org.eclipse.papyrus.dd.dg.Canvas#getBounds <em>Bounds</em>}'. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @return the meta object for the containment reference '<em>Bounds</em>'.
@@ -4087,9 +4295,12 @@ public interface DGPackage extends EPackage {
 	EReference getCanvas_Bounds();
 
 	/**
-	 * Returns the meta object for the '{@link org.eclipse.papyrus.dd.dg.Canvas#canvasCannotHaveTransforms(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Canvas Cannot Have Transforms</em>}' operation.
+	 * Returns the meta object for the '
+	 * {@link org.eclipse.papyrus.dd.dg.Canvas#canvasCannotHaveTransforms(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
+	 * <em>Canvas Cannot Have Transforms</em>}' operation.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the '<em>Canvas Cannot Have Transforms</em>' operation.
 	 * @see org.eclipse.papyrus.dd.dg.Canvas#canvasCannotHaveTransforms(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
 	 * @generated
@@ -4097,8 +4308,7 @@ public interface DGPackage extends EPackage {
 	EOperation getCanvas__CanvasCannotHaveTransforms__DiagnosticChain_Map();
 
 	/**
-	 * Returns the meta object for class '
-	 * {@link org.eclipse.papyrus.dd.dg.Group <em>Group</em>}'. <!--
+	 * Returns the meta object for class ' {@link org.eclipse.papyrus.dd.dg.Group <em>Group</em>}'. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @return the meta object for class '<em>Group</em>'.
@@ -4108,12 +4318,10 @@ public interface DGPackage extends EPackage {
 	EClass getGroup();
 
 	/**
-	 * Returns the meta object for the containment reference list '
-	 * {@link org.eclipse.papyrus.dd.dg.Group#getMembers <em>Member</em>}'. <!--
+	 * Returns the meta object for the containment reference list ' {@link org.eclipse.papyrus.dd.dg.Group#getMembers <em>Member</em>}'. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
-	 * @return the meta object for the containment reference list '
-	 *         <em>Member</em>'.
+	 * @return the meta object for the containment reference list ' <em>Member</em>'.
 	 * @see org.eclipse.papyrus.dd.dg.Group#getMembers()
 	 * @see #getGroup()
 	 * @generated
@@ -4124,6 +4332,7 @@ public interface DGPackage extends EPackage {
 	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.dd.dg.Group#getLayout <em>Layout</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Layout</em>'.
 	 * @see org.eclipse.papyrus.dd.dg.Group#getLayout()
 	 * @see #getGroup()
@@ -4132,8 +4341,7 @@ public interface DGPackage extends EPackage {
 	EAttribute getGroup_Layout();
 
 	/**
-	 * Returns the meta object for class '
-	 * {@link org.eclipse.papyrus.dd.dg.GraphicalElement
+	 * Returns the meta object for class ' {@link org.eclipse.papyrus.dd.dg.GraphicalElement
 	 * <em>Graphical Element</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
 	 * -->
 	 * 
@@ -4146,6 +4354,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.dd.dg.GraphicalElement#getClipPath <em>Clip Path</em>}'.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Clip Path</em>'.
 	 * @see org.eclipse.papyrus.dd.dg.GraphicalElement#getClipPath()
 	 * @see #getGraphicalElement()
@@ -4156,6 +4365,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * Returns the meta object for the container reference '{@link org.eclipse.papyrus.dd.dg.GraphicalElement#getGroup <em>Group</em>}'.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the container reference '<em>Group</em>'.
 	 * @see org.eclipse.papyrus.dd.dg.GraphicalElement#getGroup()
 	 * @see #getGraphicalElement()
@@ -4166,6 +4376,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * Returns the meta object for the attribute list '{@link org.eclipse.papyrus.dd.dg.GraphicalElement#getClasses <em>Class</em>}'.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute list '<em>Class</em>'.
 	 * @see org.eclipse.papyrus.dd.dg.GraphicalElement#getClasses()
 	 * @see #getGraphicalElement()
@@ -4176,6 +4387,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.dd.dg.GraphicalElement#getStyle <em>Style</em>}'.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference '<em>Style</em>'.
 	 * @see org.eclipse.papyrus.dd.dg.GraphicalElement#getStyle()
 	 * @see #getGraphicalElement()
@@ -4184,8 +4396,10 @@ public interface DGPackage extends EPackage {
 	EReference getGraphicalElement_Style();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.dd.dg.GraphicalElement#getTransforms <em>Transform</em>}'.
+	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.dd.dg.GraphicalElement#getTransforms <em>Transform</em>}
+	 * '.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Transform</em>'.
 	 * @see org.eclipse.papyrus.dd.dg.GraphicalElement#getTransforms()
 	 * @see #getGraphicalElement()
@@ -4197,6 +4411,7 @@ public interface DGPackage extends EPackage {
 	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.dd.dg.GraphicalElement#getLayoutData <em>Layout Data</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Layout Data</em>'.
 	 * @see org.eclipse.papyrus.dd.dg.GraphicalElement#getLayoutData()
 	 * @see #getGraphicalElement()
@@ -4205,9 +4420,12 @@ public interface DGPackage extends EPackage {
 	EAttribute getGraphicalElement_LayoutData();
 
 	/**
-	 * Returns the meta object for the '{@link org.eclipse.papyrus.dd.dg.GraphicalElement#referencedClippathHasId(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Referenced Clippath Has Id</em>}' operation.
+	 * Returns the meta object for the '
+	 * {@link org.eclipse.papyrus.dd.dg.GraphicalElement#referencedClippathHasId(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
+	 * <em>Referenced Clippath Has Id</em>}' operation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the '<em>Referenced Clippath Has Id</em>' operation.
 	 * @see org.eclipse.papyrus.dd.dg.GraphicalElement#referencedClippathHasId(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
 	 * @generated
@@ -4215,8 +4433,7 @@ public interface DGPackage extends EPackage {
 	EOperation getGraphicalElement__ReferencedClippathHasId__DiagnosticChain_Map();
 
 	/**
-	 * Returns the meta object for class '
-	 * {@link org.eclipse.papyrus.dd.dg.Definition <em>Definition</em>}'. <!--
+	 * Returns the meta object for class ' {@link org.eclipse.papyrus.dd.dg.Definition <em>Definition</em>}'. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @return the meta object for class '<em>Definition</em>'.
@@ -4226,8 +4443,7 @@ public interface DGPackage extends EPackage {
 	EClass getDefinition();
 
 	/**
-	 * Returns the meta object for the attribute '
-	 * {@link org.eclipse.papyrus.dd.dg.Definition#getId <em>Id</em>}'. <!--
+	 * Returns the meta object for the attribute ' {@link org.eclipse.papyrus.dd.dg.Definition#getId <em>Id</em>}'. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @return the meta object for the attribute '<em>Id</em>'.
@@ -4238,9 +4454,12 @@ public interface DGPackage extends EPackage {
 	EAttribute getDefinition_Id();
 
 	/**
-	 * Returns the meta object for the '{@link org.eclipse.papyrus.dd.dg.Definition#idCannotBeEmpty(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Id Cannot Be Empty</em>}' operation.
+	 * Returns the meta object for the '
+	 * {@link org.eclipse.papyrus.dd.dg.Definition#idCannotBeEmpty(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
+	 * <em>Id Cannot Be Empty</em>}' operation.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the '<em>Id Cannot Be Empty</em>' operation.
 	 * @see org.eclipse.papyrus.dd.dg.Definition#idCannotBeEmpty(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
 	 * @generated
@@ -4248,8 +4467,7 @@ public interface DGPackage extends EPackage {
 	EOperation getDefinition__IdCannotBeEmpty__DiagnosticChain_Map();
 
 	/**
-	 * Returns the meta object for class '
-	 * {@link org.eclipse.papyrus.dd.dg.MoveTo <em>Move To</em>}'. <!--
+	 * Returns the meta object for class ' {@link org.eclipse.papyrus.dd.dg.MoveTo <em>Move To</em>}'. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @return the meta object for class '<em>Move To</em>'.
@@ -4259,8 +4477,7 @@ public interface DGPackage extends EPackage {
 	EClass getMoveTo();
 
 	/**
-	 * Returns the meta object for the containment reference '
-	 * {@link org.eclipse.papyrus.dd.dg.MoveTo#getPoint <em>Point</em>}'. <!--
+	 * Returns the meta object for the containment reference ' {@link org.eclipse.papyrus.dd.dg.MoveTo#getPoint <em>Point</em>}'. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @return the meta object for the containment reference '<em>Point</em>'.
@@ -4273,6 +4490,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.dd.dg.PathCommand <em>Path Command</em>}'.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Path Command</em>'.
 	 * @see org.eclipse.papyrus.dd.dg.PathCommand
 	 * @generated
@@ -4282,6 +4500,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.dd.dg.PathCommand#isRelative <em>Is Relative</em>}'.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Is Relative</em>'.
 	 * @see org.eclipse.papyrus.dd.dg.PathCommand#isRelative()
 	 * @see #getPathCommand()
@@ -4290,8 +4509,7 @@ public interface DGPackage extends EPackage {
 	EAttribute getPathCommand_IsRelative();
 
 	/**
-	 * Returns the meta object for class '
-	 * {@link org.eclipse.papyrus.dd.dg.ClipPath <em>Clip Path</em>}'. <!--
+	 * Returns the meta object for class ' {@link org.eclipse.papyrus.dd.dg.ClipPath <em>Clip Path</em>}'. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @return the meta object for class '<em>Clip Path</em>'.
@@ -4301,8 +4519,7 @@ public interface DGPackage extends EPackage {
 	EClass getClipPath();
 
 	/**
-	 * Returns the meta object for class '
-	 * {@link org.eclipse.papyrus.dd.dg.Style <em>Style</em>}'. <!--
+	 * Returns the meta object for class ' {@link org.eclipse.papyrus.dd.dg.Style <em>Style</em>}'. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @return the meta object for class '<em>Style</em>'.
@@ -4312,8 +4529,7 @@ public interface DGPackage extends EPackage {
 	EClass getStyle();
 
 	/**
-	 * Returns the meta object for the containment reference '
-	 * {@link org.eclipse.papyrus.dd.dg.Style#getFill <em>Fill</em>}'. <!--
+	 * Returns the meta object for the containment reference ' {@link org.eclipse.papyrus.dd.dg.Style#getFill <em>Fill</em>}'. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @return the meta object for the containment reference '<em>Fill</em>'.
@@ -4326,6 +4542,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.dd.dg.Style#getFillOpacity <em>Fill Opacity</em>}'.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Fill Opacity</em>'.
 	 * @see org.eclipse.papyrus.dd.dg.Style#getFillOpacity()
 	 * @see #getStyle()
@@ -4334,8 +4551,7 @@ public interface DGPackage extends EPackage {
 	EAttribute getStyle_FillOpacity();
 
 	/**
-	 * Returns the meta object for the containment reference '
-	 * {@link org.eclipse.papyrus.dd.dg.Style#getStroke <em>Stroke</em>}'. <!--
+	 * Returns the meta object for the containment reference ' {@link org.eclipse.papyrus.dd.dg.Style#getStroke <em>Stroke</em>}'. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @return the meta object for the containment reference '<em>Stroke</em>'.
@@ -4348,6 +4564,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.dd.dg.Style#getStrokeWidth <em>Stroke Width</em>}'.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Stroke Width</em>'.
 	 * @see org.eclipse.papyrus.dd.dg.Style#getStrokeWidth()
 	 * @see #getStyle()
@@ -4358,6 +4575,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.dd.dg.Style#getStrokeOpacity <em>Stroke Opacity</em>}'.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Stroke Opacity</em>'.
 	 * @see org.eclipse.papyrus.dd.dg.Style#getStrokeOpacity()
 	 * @see #getStyle()
@@ -4366,13 +4584,11 @@ public interface DGPackage extends EPackage {
 	EAttribute getStyle_StrokeOpacity();
 
 	/**
-	 * Returns the meta object for the attribute list '
-	 * {@link org.eclipse.papyrus.dd.dg.Style#getStrokeDashLengths
+	 * Returns the meta object for the attribute list ' {@link org.eclipse.papyrus.dd.dg.Style#getStrokeDashLengths
 	 * <em>Stroke Dash Length</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
 	 * -->
 	 * 
-	 * @return the meta object for the attribute list '
-	 *         <em>Stroke Dash Length</em>'.
+	 * @return the meta object for the attribute list ' <em>Stroke Dash Length</em>'.
 	 * @see org.eclipse.papyrus.dd.dg.Style#getStrokeDashLengths()
 	 * @see #getStyle()
 	 * @generated
@@ -4382,6 +4598,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.dd.dg.Style#getFontSize <em>Font Size</em>}'.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Font Size</em>'.
 	 * @see org.eclipse.papyrus.dd.dg.Style#getFontSize()
 	 * @see #getStyle()
@@ -4392,6 +4609,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.dd.dg.Style#getFontName <em>Font Name</em>}'.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Font Name</em>'.
 	 * @see org.eclipse.papyrus.dd.dg.Style#getFontName()
 	 * @see #getStyle()
@@ -4402,6 +4620,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.dd.dg.Style#isFontItalic <em>Font Italic</em>}'.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Font Italic</em>'.
 	 * @see org.eclipse.papyrus.dd.dg.Style#isFontItalic()
 	 * @see #getStyle()
@@ -4412,6 +4631,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.dd.dg.Style#isFontBold <em>Font Bold</em>}'.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Font Bold</em>'.
 	 * @see org.eclipse.papyrus.dd.dg.Style#isFontBold()
 	 * @see #getStyle()
@@ -4422,6 +4642,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.dd.dg.Style#getFontDecoration <em>Font Decoration</em>}'.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Font Decoration</em>'.
 	 * @see org.eclipse.papyrus.dd.dg.Style#getFontDecoration()
 	 * @see #getStyle()
@@ -4430,9 +4651,12 @@ public interface DGPackage extends EPackage {
 	EAttribute getStyle_FontDecoration();
 
 	/**
-	 * Returns the meta object for the '{@link org.eclipse.papyrus.dd.dg.Style#validFontSize(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Valid Font Size</em>}' operation.
+	 * Returns the meta object for the '
+	 * {@link org.eclipse.papyrus.dd.dg.Style#validFontSize(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Valid Font Size</em>}'
+	 * operation.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the '<em>Valid Font Size</em>' operation.
 	 * @see org.eclipse.papyrus.dd.dg.Style#validFontSize(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
 	 * @generated
@@ -4440,9 +4664,12 @@ public interface DGPackage extends EPackage {
 	EOperation getStyle__ValidFontSize__DiagnosticChain_Map();
 
 	/**
-	 * Returns the meta object for the '{@link org.eclipse.papyrus.dd.dg.Style#validFillOpacity(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Valid Fill Opacity</em>}' operation.
+	 * Returns the meta object for the '
+	 * {@link org.eclipse.papyrus.dd.dg.Style#validFillOpacity(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
+	 * <em>Valid Fill Opacity</em>}' operation.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the '<em>Valid Fill Opacity</em>' operation.
 	 * @see org.eclipse.papyrus.dd.dg.Style#validFillOpacity(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
 	 * @generated
@@ -4450,9 +4677,12 @@ public interface DGPackage extends EPackage {
 	EOperation getStyle__ValidFillOpacity__DiagnosticChain_Map();
 
 	/**
-	 * Returns the meta object for the '{@link org.eclipse.papyrus.dd.dg.Style#validStrokeWidth(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Valid Stroke Width</em>}' operation.
+	 * Returns the meta object for the '
+	 * {@link org.eclipse.papyrus.dd.dg.Style#validStrokeWidth(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
+	 * <em>Valid Stroke Width</em>}' operation.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the '<em>Valid Stroke Width</em>' operation.
 	 * @see org.eclipse.papyrus.dd.dg.Style#validStrokeWidth(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
 	 * @generated
@@ -4460,9 +4690,12 @@ public interface DGPackage extends EPackage {
 	EOperation getStyle__ValidStrokeWidth__DiagnosticChain_Map();
 
 	/**
-	 * Returns the meta object for the '{@link org.eclipse.papyrus.dd.dg.Style#validDashLengthSize(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Valid Dash Length Size</em>}' operation.
+	 * Returns the meta object for the '
+	 * {@link org.eclipse.papyrus.dd.dg.Style#validDashLengthSize(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
+	 * <em>Valid Dash Length Size</em>}' operation.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the '<em>Valid Dash Length Size</em>' operation.
 	 * @see org.eclipse.papyrus.dd.dg.Style#validDashLengthSize(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
 	 * @generated
@@ -4470,9 +4703,12 @@ public interface DGPackage extends EPackage {
 	EOperation getStyle__ValidDashLengthSize__DiagnosticChain_Map();
 
 	/**
-	 * Returns the meta object for the '{@link org.eclipse.papyrus.dd.dg.Style#validStrokeOpacity(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Valid Stroke Opacity</em>}' operation.
+	 * Returns the meta object for the '
+	 * {@link org.eclipse.papyrus.dd.dg.Style#validStrokeOpacity(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
+	 * <em>Valid Stroke Opacity</em>}' operation.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the '<em>Valid Stroke Opacity</em>' operation.
 	 * @see org.eclipse.papyrus.dd.dg.Style#validStrokeOpacity(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
 	 * @generated
@@ -4480,8 +4716,7 @@ public interface DGPackage extends EPackage {
 	EOperation getStyle__ValidStrokeOpacity__DiagnosticChain_Map();
 
 	/**
-	 * Returns the meta object for class '
-	 * {@link org.eclipse.papyrus.dd.dg.Paint <em>Paint</em>}'. <!--
+	 * Returns the meta object for class ' {@link org.eclipse.papyrus.dd.dg.Paint <em>Paint</em>}'. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @return the meta object for class '<em>Paint</em>'.
@@ -4491,8 +4726,7 @@ public interface DGPackage extends EPackage {
 	EClass getPaint();
 
 	/**
-	 * Returns the meta object for the attribute '
-	 * {@link org.eclipse.papyrus.dd.dg.Paint#getColor <em>Color</em>}'. <!--
+	 * Returns the meta object for the attribute ' {@link org.eclipse.papyrus.dd.dg.Paint#getColor <em>Color</em>}'. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @return the meta object for the attribute '<em>Color</em>'.
@@ -4505,6 +4739,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.dd.dg.Paint#getPaintServer <em>Paint Server</em>}'.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Paint Server</em>'.
 	 * @see org.eclipse.papyrus.dd.dg.Paint#getPaintServer()
 	 * @see #getPaint()
@@ -4513,9 +4748,12 @@ public interface DGPackage extends EPackage {
 	EReference getPaint_PaintServer();
 
 	/**
-	 * Returns the meta object for the '{@link org.eclipse.papyrus.dd.dg.Paint#referencedPaintServerHasId(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Referenced Paint Server Has Id</em>}' operation.
+	 * Returns the meta object for the '
+	 * {@link org.eclipse.papyrus.dd.dg.Paint#referencedPaintServerHasId(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
+	 * <em>Referenced Paint Server Has Id</em>}' operation.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the '<em>Referenced Paint Server Has Id</em>' operation.
 	 * @see org.eclipse.papyrus.dd.dg.Paint#referencedPaintServerHasId(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
 	 * @generated
@@ -4525,6 +4763,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.dd.dg.PaintServer <em>Paint Server</em>}'.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Paint Server</em>'.
 	 * @see org.eclipse.papyrus.dd.dg.PaintServer
 	 * @generated
@@ -4534,6 +4773,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.dd.dg.PaintServer#getTransforms <em>Transform</em>}'.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Transform</em>'.
 	 * @see org.eclipse.papyrus.dd.dg.PaintServer#getTransforms()
 	 * @see #getPaintServer()
@@ -4542,8 +4782,7 @@ public interface DGPackage extends EPackage {
 	EReference getPaintServer_Transform();
 
 	/**
-	 * Returns the meta object for class '
-	 * {@link org.eclipse.papyrus.dd.dg.Transform <em>Transform</em>}'. <!--
+	 * Returns the meta object for class ' {@link org.eclipse.papyrus.dd.dg.Transform <em>Transform</em>}'. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @return the meta object for class '<em>Transform</em>'.
@@ -4553,8 +4792,7 @@ public interface DGPackage extends EPackage {
 	EClass getTransform();
 
 	/**
-	 * Returns the meta object for class '
-	 * {@link org.eclipse.papyrus.dd.dg.Circle <em>Circle</em>}'. <!--
+	 * Returns the meta object for class ' {@link org.eclipse.papyrus.dd.dg.Circle <em>Circle</em>}'. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @return the meta object for class '<em>Circle</em>'.
@@ -4564,8 +4802,7 @@ public interface DGPackage extends EPackage {
 	EClass getCircle();
 
 	/**
-	 * Returns the meta object for the containment reference '
-	 * {@link org.eclipse.papyrus.dd.dg.Circle#getCenter <em>Center</em>}'. <!--
+	 * Returns the meta object for the containment reference ' {@link org.eclipse.papyrus.dd.dg.Circle#getCenter <em>Center</em>}'. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @return the meta object for the containment reference '<em>Center</em>'.
@@ -4576,8 +4813,7 @@ public interface DGPackage extends EPackage {
 	EReference getCircle_Center();
 
 	/**
-	 * Returns the meta object for the attribute '
-	 * {@link org.eclipse.papyrus.dd.dg.Circle#getRadius <em>Radius</em>}'. <!--
+	 * Returns the meta object for the attribute ' {@link org.eclipse.papyrus.dd.dg.Circle#getRadius <em>Radius</em>}'. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @return the meta object for the attribute '<em>Radius</em>'.
@@ -4588,9 +4824,12 @@ public interface DGPackage extends EPackage {
 	EAttribute getCircle_Radius();
 
 	/**
-	 * Returns the meta object for the '{@link org.eclipse.papyrus.dd.dg.Circle#nonNegativeRadius(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Non Negative Radius</em>}' operation.
+	 * Returns the meta object for the '
+	 * {@link org.eclipse.papyrus.dd.dg.Circle#nonNegativeRadius(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
+	 * <em>Non Negative Radius</em>}' operation.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the '<em>Non Negative Radius</em>' operation.
 	 * @see org.eclipse.papyrus.dd.dg.Circle#nonNegativeRadius(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
 	 * @generated
@@ -4598,8 +4837,7 @@ public interface DGPackage extends EPackage {
 	EOperation getCircle__NonNegativeRadius__DiagnosticChain_Map();
 
 	/**
-	 * Returns the meta object for class '
-	 * {@link org.eclipse.papyrus.dd.dg.ClosePath <em>Close Path</em>}'. <!--
+	 * Returns the meta object for class ' {@link org.eclipse.papyrus.dd.dg.ClosePath <em>Close Path</em>}'. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @return the meta object for class '<em>Close Path</em>'.
@@ -4611,6 +4849,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.dd.dg.CubicCurveTo <em>Cubic Curve To</em>}'.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Cubic Curve To</em>'.
 	 * @see org.eclipse.papyrus.dd.dg.CubicCurveTo
 	 * @generated
@@ -4620,6 +4859,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.dd.dg.CubicCurveTo#getPoint <em>Point</em>}'.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference '<em>Point</em>'.
 	 * @see org.eclipse.papyrus.dd.dg.CubicCurveTo#getPoint()
 	 * @see #getCubicCurveTo()
@@ -4630,6 +4870,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.dd.dg.CubicCurveTo#getStartControl <em>Start Control</em>}'.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference '<em>Start Control</em>'.
 	 * @see org.eclipse.papyrus.dd.dg.CubicCurveTo#getStartControl()
 	 * @see #getCubicCurveTo()
@@ -4640,6 +4881,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.dd.dg.CubicCurveTo#getEndControl <em>End Control</em>}'.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference '<em>End Control</em>'.
 	 * @see org.eclipse.papyrus.dd.dg.CubicCurveTo#getEndControl()
 	 * @see #getCubicCurveTo()
@@ -4648,8 +4890,7 @@ public interface DGPackage extends EPackage {
 	EReference getCubicCurveTo_EndControl();
 
 	/**
-	 * Returns the meta object for class '
-	 * {@link org.eclipse.papyrus.dd.dg.Definitions <em>Definitions</em>}'. <!--
+	 * Returns the meta object for class ' {@link org.eclipse.papyrus.dd.dg.Definitions <em>Definitions</em>}'. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @return the meta object for class '<em>Definitions</em>'.
@@ -4661,6 +4902,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.dd.dg.Definitions#getDefnitions <em>Defnition</em>}'.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Defnition</em>'.
 	 * @see org.eclipse.papyrus.dd.dg.Definitions#getDefnitions()
 	 * @see #getDefinitions()
@@ -4671,6 +4913,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.dd.dg.Definitions#getStyleSheet <em>Style Sheet</em>}'.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference '<em>Style Sheet</em>'.
 	 * @see org.eclipse.papyrus.dd.dg.Definitions#getStyleSheet()
 	 * @see #getDefinitions()
@@ -4679,8 +4922,7 @@ public interface DGPackage extends EPackage {
 	EReference getDefinitions_StyleSheet();
 
 	/**
-	 * Returns the meta object for class '
-	 * {@link org.eclipse.papyrus.dd.dg.StyleSheet <em>Style Sheet</em>}'. <!--
+	 * Returns the meta object for class ' {@link org.eclipse.papyrus.dd.dg.StyleSheet <em>Style Sheet</em>}'. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @return the meta object for class '<em>Style Sheet</em>'.
@@ -4692,6 +4934,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.dd.dg.StyleSheet#getRules <em>Rule</em>}'.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Rule</em>'.
 	 * @see org.eclipse.papyrus.dd.dg.StyleSheet#getRules()
 	 * @see #getStyleSheet()
@@ -4700,8 +4943,7 @@ public interface DGPackage extends EPackage {
 	EReference getStyleSheet_Rule();
 
 	/**
-	 * Returns the meta object for class '
-	 * {@link org.eclipse.papyrus.dd.dg.StyleRule <em>Style Rule</em>}'. <!--
+	 * Returns the meta object for class ' {@link org.eclipse.papyrus.dd.dg.StyleRule <em>Style Rule</em>}'. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @return the meta object for class '<em>Style Rule</em>'.
@@ -4713,6 +4955,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.dd.dg.StyleRule#getSelectors <em>Selector</em>}'.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Selector</em>'.
 	 * @see org.eclipse.papyrus.dd.dg.StyleRule#getSelectors()
 	 * @see #getStyleRule()
@@ -4723,6 +4966,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.dd.dg.StyleRule#getStyle <em>Style</em>}'.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference '<em>Style</em>'.
 	 * @see org.eclipse.papyrus.dd.dg.StyleRule#getStyle()
 	 * @see #getStyleRule()
@@ -4733,6 +4977,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.dd.dg.StyleSelector <em>Style Selector</em>}'.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Style Selector</em>'.
 	 * @see org.eclipse.papyrus.dd.dg.StyleSelector
 	 * @generated
@@ -4742,6 +4987,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.dd.dg.StyleSelector#getKind <em>Kind</em>}'.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Kind</em>'.
 	 * @see org.eclipse.papyrus.dd.dg.StyleSelector#getKind()
 	 * @see #getStyleSelector()
@@ -4752,6 +4998,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * Returns the meta object for the attribute list '{@link org.eclipse.papyrus.dd.dg.StyleSelector#getClasses <em>Class</em>}'.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute list '<em>Class</em>'.
 	 * @see org.eclipse.papyrus.dd.dg.StyleSelector#getClasses()
 	 * @see #getStyleSelector()
@@ -4760,8 +5007,7 @@ public interface DGPackage extends EPackage {
 	EAttribute getStyleSelector_Class();
 
 	/**
-	 * Returns the meta object for class '
-	 * {@link org.eclipse.papyrus.dd.dg.Ellipse <em>Ellipse</em>}'. <!--
+	 * Returns the meta object for class ' {@link org.eclipse.papyrus.dd.dg.Ellipse <em>Ellipse</em>}'. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @return the meta object for class '<em>Ellipse</em>'.
@@ -4773,6 +5019,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.dd.dg.Ellipse#getCenter <em>Center</em>}'.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference '<em>Center</em>'.
 	 * @see org.eclipse.papyrus.dd.dg.Ellipse#getCenter()
 	 * @see #getEllipse()
@@ -4781,8 +5028,7 @@ public interface DGPackage extends EPackage {
 	EReference getEllipse_Center();
 
 	/**
-	 * Returns the meta object for the containment reference '
-	 * {@link org.eclipse.papyrus.dd.dg.Ellipse#getRadii <em>Radii</em>}'. <!--
+	 * Returns the meta object for the containment reference ' {@link org.eclipse.papyrus.dd.dg.Ellipse#getRadii <em>Radii</em>}'. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @return the meta object for the containment reference '<em>Radii</em>'.
@@ -4793,8 +5039,7 @@ public interface DGPackage extends EPackage {
 	EReference getEllipse_Radii();
 
 	/**
-	 * Returns the meta object for class '
-	 * {@link org.eclipse.papyrus.dd.dg.EllipticalArcTo
+	 * Returns the meta object for class ' {@link org.eclipse.papyrus.dd.dg.EllipticalArcTo
 	 * <em>Elliptical Arc To</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
 	 * -->
 	 * 
@@ -4807,6 +5052,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.dd.dg.EllipticalArcTo#getPoint <em>Point</em>}'.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference '<em>Point</em>'.
 	 * @see org.eclipse.papyrus.dd.dg.EllipticalArcTo#getPoint()
 	 * @see #getEllipticalArcTo()
@@ -4817,6 +5063,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.dd.dg.EllipticalArcTo#getRadii <em>Radii</em>}'.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference '<em>Radii</em>'.
 	 * @see org.eclipse.papyrus.dd.dg.EllipticalArcTo#getRadii()
 	 * @see #getEllipticalArcTo()
@@ -4827,6 +5074,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.dd.dg.EllipticalArcTo#getRotation <em>Rotation</em>}'.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Rotation</em>'.
 	 * @see org.eclipse.papyrus.dd.dg.EllipticalArcTo#getRotation()
 	 * @see #getEllipticalArcTo()
@@ -4837,6 +5085,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.dd.dg.EllipticalArcTo#isLargeArc <em>Is Large Arc</em>}'.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Is Large Arc</em>'.
 	 * @see org.eclipse.papyrus.dd.dg.EllipticalArcTo#isLargeArc()
 	 * @see #getEllipticalArcTo()
@@ -4847,6 +5096,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.dd.dg.EllipticalArcTo#isSweep <em>Is Sweep</em>}'.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Is Sweep</em>'.
 	 * @see org.eclipse.papyrus.dd.dg.EllipticalArcTo#isSweep()
 	 * @see #getEllipticalArcTo()
@@ -4855,8 +5105,7 @@ public interface DGPackage extends EPackage {
 	EAttribute getEllipticalArcTo_IsSweep();
 
 	/**
-	 * Returns the meta object for class '
-	 * {@link org.eclipse.papyrus.dd.dg.QuadraticCurveTo
+	 * Returns the meta object for class ' {@link org.eclipse.papyrus.dd.dg.QuadraticCurveTo
 	 * <em>Quadratic Curve To</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
 	 * -->
 	 * 
@@ -4869,6 +5118,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.dd.dg.QuadraticCurveTo#getPoint <em>Point</em>}'.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference '<em>Point</em>'.
 	 * @see org.eclipse.papyrus.dd.dg.QuadraticCurveTo#getPoint()
 	 * @see #getQuadraticCurveTo()
@@ -4879,6 +5129,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.dd.dg.QuadraticCurveTo#getControl <em>Control</em>}'.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference '<em>Control</em>'.
 	 * @see org.eclipse.papyrus.dd.dg.QuadraticCurveTo#getControl()
 	 * @see #getQuadraticCurveTo()
@@ -4887,8 +5138,7 @@ public interface DGPackage extends EPackage {
 	EReference getQuadraticCurveTo_Control();
 
 	/**
-	 * Returns the meta object for class '
-	 * {@link org.eclipse.papyrus.dd.dg.Gradient <em>Gradient</em>}'. <!--
+	 * Returns the meta object for class ' {@link org.eclipse.papyrus.dd.dg.Gradient <em>Gradient</em>}'. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @return the meta object for class '<em>Gradient</em>'.
@@ -4898,12 +5148,10 @@ public interface DGPackage extends EPackage {
 	EClass getGradient();
 
 	/**
-	 * Returns the meta object for the containment reference list '
-	 * {@link org.eclipse.papyrus.dd.dg.Gradient#getStops <em>Stop</em>}'. <!--
+	 * Returns the meta object for the containment reference list ' {@link org.eclipse.papyrus.dd.dg.Gradient#getStops <em>Stop</em>}'. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
-	 * @return the meta object for the containment reference list '<em>Stop</em>
-	 *         '.
+	 * @return the meta object for the containment reference list '<em>Stop</em> '.
 	 * @see org.eclipse.papyrus.dd.dg.Gradient#getStops()
 	 * @see #getGradient()
 	 * @generated
@@ -4913,6 +5161,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.dd.dg.GradientStop <em>Gradient Stop</em>}'.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Gradient Stop</em>'.
 	 * @see org.eclipse.papyrus.dd.dg.GradientStop
 	 * @generated
@@ -4922,6 +5171,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.dd.dg.GradientStop#getColor <em>Color</em>}'.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Color</em>'.
 	 * @see org.eclipse.papyrus.dd.dg.GradientStop#getColor()
 	 * @see #getGradientStop()
@@ -4932,6 +5182,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.dd.dg.GradientStop#getOffset <em>Offset</em>}'.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Offset</em>'.
 	 * @see org.eclipse.papyrus.dd.dg.GradientStop#getOffset()
 	 * @see #getGradientStop()
@@ -4942,6 +5193,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.dd.dg.GradientStop#getOpacity <em>Opacity</em>}'.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Opacity</em>'.
 	 * @see org.eclipse.papyrus.dd.dg.GradientStop#getOpacity()
 	 * @see #getGradientStop()
@@ -4950,9 +5202,12 @@ public interface DGPackage extends EPackage {
 	EAttribute getGradientStop_Opacity();
 
 	/**
-	 * Returns the meta object for the '{@link org.eclipse.papyrus.dd.dg.GradientStop#validOffset(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Valid Offset</em>}' operation.
+	 * Returns the meta object for the '
+	 * {@link org.eclipse.papyrus.dd.dg.GradientStop#validOffset(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Valid Offset</em>}'
+	 * operation.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the '<em>Valid Offset</em>' operation.
 	 * @see org.eclipse.papyrus.dd.dg.GradientStop#validOffset(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
 	 * @generated
@@ -4960,9 +5215,12 @@ public interface DGPackage extends EPackage {
 	EOperation getGradientStop__ValidOffset__DiagnosticChain_Map();
 
 	/**
-	 * Returns the meta object for the '{@link org.eclipse.papyrus.dd.dg.GradientStop#validOpacity(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Valid Opacity</em>}' operation.
+	 * Returns the meta object for the '
+	 * {@link org.eclipse.papyrus.dd.dg.GradientStop#validOpacity(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Valid Opacity</em>}'
+	 * operation.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the '<em>Valid Opacity</em>' operation.
 	 * @see org.eclipse.papyrus.dd.dg.GradientStop#validOpacity(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
 	 * @generated
@@ -4970,8 +5228,7 @@ public interface DGPackage extends EPackage {
 	EOperation getGradientStop__ValidOpacity__DiagnosticChain_Map();
 
 	/**
-	 * Returns the meta object for class '
-	 * {@link org.eclipse.papyrus.dd.dg.Image <em>Image</em>}'. <!--
+	 * Returns the meta object for class ' {@link org.eclipse.papyrus.dd.dg.Image <em>Image</em>}'. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @return the meta object for class '<em>Image</em>'.
@@ -4981,8 +5238,7 @@ public interface DGPackage extends EPackage {
 	EClass getImage();
 
 	/**
-	 * Returns the meta object for the attribute '
-	 * {@link org.eclipse.papyrus.dd.dg.Image#getSource <em>Source</em>}'. <!--
+	 * Returns the meta object for the attribute ' {@link org.eclipse.papyrus.dd.dg.Image#getSource <em>Source</em>}'. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @return the meta object for the attribute '<em>Source</em>'.
@@ -4993,8 +5249,7 @@ public interface DGPackage extends EPackage {
 	EAttribute getImage_Source();
 
 	/**
-	 * Returns the meta object for the containment reference '
-	 * {@link org.eclipse.papyrus.dd.dg.Image#getBounds <em>Bounds</em>}'. <!--
+	 * Returns the meta object for the containment reference ' {@link org.eclipse.papyrus.dd.dg.Image#getBounds <em>Bounds</em>}'. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @return the meta object for the containment reference '<em>Bounds</em>'.
@@ -5008,6 +5263,7 @@ public interface DGPackage extends EPackage {
 	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.dd.dg.Image#isAspectRatioPreserved <em>Is Aspect Ratio Preserved</em>}'.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Is Aspect Ratio Preserved</em>'.
 	 * @see org.eclipse.papyrus.dd.dg.Image#isAspectRatioPreserved()
 	 * @see #getImage()
@@ -5016,9 +5272,12 @@ public interface DGPackage extends EPackage {
 	EAttribute getImage_IsAspectRatioPreserved();
 
 	/**
-	 * Returns the meta object for the '{@link org.eclipse.papyrus.dd.dg.Image#sourceCannotBeEmpty(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Source Cannot Be Empty</em>}' operation.
+	 * Returns the meta object for the '
+	 * {@link org.eclipse.papyrus.dd.dg.Image#sourceCannotBeEmpty(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
+	 * <em>Source Cannot Be Empty</em>}' operation.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the '<em>Source Cannot Be Empty</em>' operation.
 	 * @see org.eclipse.papyrus.dd.dg.Image#sourceCannotBeEmpty(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
 	 * @generated
@@ -5028,6 +5287,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.dd.dg.Line <em>Line</em>}'.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Line</em>'.
 	 * @see org.eclipse.papyrus.dd.dg.Line
 	 * @generated
@@ -5035,8 +5295,7 @@ public interface DGPackage extends EPackage {
 	EClass getLine();
 
 	/**
-	 * Returns the meta object for the containment reference '
-	 * {@link org.eclipse.papyrus.dd.dg.Line#getStart <em>Start</em>}'. <!--
+	 * Returns the meta object for the containment reference ' {@link org.eclipse.papyrus.dd.dg.Line#getStart <em>Start</em>}'. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @return the meta object for the containment reference '<em>Start</em>'.
@@ -5047,8 +5306,7 @@ public interface DGPackage extends EPackage {
 	EReference getLine_Start();
 
 	/**
-	 * Returns the meta object for the containment reference '
-	 * {@link org.eclipse.papyrus.dd.dg.Line#getEnd <em>End</em>}'. <!--
+	 * Returns the meta object for the containment reference ' {@link org.eclipse.papyrus.dd.dg.Line#getEnd <em>End</em>}'. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @return the meta object for the containment reference '<em>End</em>'.
@@ -5061,6 +5319,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.dd.dg.MarkedElement <em>Marked Element</em>}'.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Marked Element</em>'.
 	 * @see org.eclipse.papyrus.dd.dg.MarkedElement
 	 * @generated
@@ -5070,6 +5329,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.dd.dg.MarkedElement#getEndMarker <em>End Marker</em>}'.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>End Marker</em>'.
 	 * @see org.eclipse.papyrus.dd.dg.MarkedElement#getEndMarker()
 	 * @see #getMarkedElement()
@@ -5080,6 +5340,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.dd.dg.MarkedElement#getMidMarker <em>Mid Marker</em>}'.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Mid Marker</em>'.
 	 * @see org.eclipse.papyrus.dd.dg.MarkedElement#getMidMarker()
 	 * @see #getMarkedElement()
@@ -5090,6 +5351,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.dd.dg.MarkedElement#getStartMarker <em>Start Marker</em>}'.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Start Marker</em>'.
 	 * @see org.eclipse.papyrus.dd.dg.MarkedElement#getStartMarker()
 	 * @see #getMarkedElement()
@@ -5098,9 +5360,12 @@ public interface DGPackage extends EPackage {
 	EReference getMarkedElement_StartMarker();
 
 	/**
-	 * Returns the meta object for the '{@link org.eclipse.papyrus.dd.dg.MarkedElement#referencedStartMarkerHasId(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Referenced Start Marker Has Id</em>}' operation.
+	 * Returns the meta object for the '
+	 * {@link org.eclipse.papyrus.dd.dg.MarkedElement#referencedStartMarkerHasId(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
+	 * <em>Referenced Start Marker Has Id</em>}' operation.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the '<em>Referenced Start Marker Has Id</em>' operation.
 	 * @see org.eclipse.papyrus.dd.dg.MarkedElement#referencedStartMarkerHasId(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
 	 * @generated
@@ -5108,9 +5373,12 @@ public interface DGPackage extends EPackage {
 	EOperation getMarkedElement__ReferencedStartMarkerHasId__DiagnosticChain_Map();
 
 	/**
-	 * Returns the meta object for the '{@link org.eclipse.papyrus.dd.dg.MarkedElement#referencedMidMarkerHasId(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Referenced Mid Marker Has Id</em>}' operation.
+	 * Returns the meta object for the '
+	 * {@link org.eclipse.papyrus.dd.dg.MarkedElement#referencedMidMarkerHasId(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
+	 * <em>Referenced Mid Marker Has Id</em>}' operation.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the '<em>Referenced Mid Marker Has Id</em>' operation.
 	 * @see org.eclipse.papyrus.dd.dg.MarkedElement#referencedMidMarkerHasId(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
 	 * @generated
@@ -5118,9 +5386,12 @@ public interface DGPackage extends EPackage {
 	EOperation getMarkedElement__ReferencedMidMarkerHasId__DiagnosticChain_Map();
 
 	/**
-	 * Returns the meta object for the '{@link org.eclipse.papyrus.dd.dg.MarkedElement#referencedEndMarkerHasId(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Referenced End Marker Has Id</em>}' operation.
+	 * Returns the meta object for the '
+	 * {@link org.eclipse.papyrus.dd.dg.MarkedElement#referencedEndMarkerHasId(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
+	 * <em>Referenced End Marker Has Id</em>}' operation.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the '<em>Referenced End Marker Has Id</em>' operation.
 	 * @see org.eclipse.papyrus.dd.dg.MarkedElement#referencedEndMarkerHasId(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
 	 * @generated
@@ -5128,8 +5399,7 @@ public interface DGPackage extends EPackage {
 	EOperation getMarkedElement__ReferencedEndMarkerHasId__DiagnosticChain_Map();
 
 	/**
-	 * Returns the meta object for class '
-	 * {@link org.eclipse.papyrus.dd.dg.Marker <em>Marker</em>}'. <!--
+	 * Returns the meta object for class ' {@link org.eclipse.papyrus.dd.dg.Marker <em>Marker</em>}'. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @return the meta object for class '<em>Marker</em>'.
@@ -5139,8 +5409,7 @@ public interface DGPackage extends EPackage {
 	EClass getMarker();
 
 	/**
-	 * Returns the meta object for the containment reference '
-	 * {@link org.eclipse.papyrus.dd.dg.Marker#getSize <em>Size</em>}'. <!--
+	 * Returns the meta object for the containment reference ' {@link org.eclipse.papyrus.dd.dg.Marker#getSize <em>Size</em>}'. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @return the meta object for the containment reference '<em>Size</em>'.
@@ -5153,6 +5422,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.dd.dg.Marker#getReference <em>Reference</em>}'.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference '<em>Reference</em>'.
 	 * @see org.eclipse.papyrus.dd.dg.Marker#getReference()
 	 * @see #getMarker()
@@ -5163,6 +5433,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.dd.dg.LinearGradient <em>Linear Gradient</em>}'.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Linear Gradient</em>'.
 	 * @see org.eclipse.papyrus.dd.dg.LinearGradient
 	 * @generated
@@ -5172,6 +5443,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.dd.dg.LinearGradient#getStart <em>Start</em>}'.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference '<em>Start</em>'.
 	 * @see org.eclipse.papyrus.dd.dg.LinearGradient#getStart()
 	 * @see #getLinearGradient()
@@ -5182,6 +5454,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.dd.dg.LinearGradient#getEnd <em>End</em>}'.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference '<em>End</em>'.
 	 * @see org.eclipse.papyrus.dd.dg.LinearGradient#getEnd()
 	 * @see #getLinearGradient()
@@ -5190,9 +5463,12 @@ public interface DGPackage extends EPackage {
 	EReference getLinearGradient_End();
 
 	/**
-	 * Returns the meta object for the '{@link org.eclipse.papyrus.dd.dg.LinearGradient#validGradientVector(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Valid Gradient Vector</em>}' operation.
+	 * Returns the meta object for the '
+	 * {@link org.eclipse.papyrus.dd.dg.LinearGradient#validGradientVector(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
+	 * <em>Valid Gradient Vector</em>}' operation.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the '<em>Valid Gradient Vector</em>' operation.
 	 * @see org.eclipse.papyrus.dd.dg.LinearGradient#validGradientVector(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
 	 * @generated
@@ -5200,8 +5476,7 @@ public interface DGPackage extends EPackage {
 	EOperation getLinearGradient__ValidGradientVector__DiagnosticChain_Map();
 
 	/**
-	 * Returns the meta object for class '
-	 * {@link org.eclipse.papyrus.dd.dg.LineTo <em>Line To</em>}'. <!--
+	 * Returns the meta object for class ' {@link org.eclipse.papyrus.dd.dg.LineTo <em>Line To</em>}'. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @return the meta object for class '<em>Line To</em>'.
@@ -5211,8 +5486,7 @@ public interface DGPackage extends EPackage {
 	EClass getLineTo();
 
 	/**
-	 * Returns the meta object for the containment reference '
-	 * {@link org.eclipse.papyrus.dd.dg.LineTo#getPoint <em>Point</em>}'. <!--
+	 * Returns the meta object for the containment reference ' {@link org.eclipse.papyrus.dd.dg.LineTo#getPoint <em>Point</em>}'. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @return the meta object for the containment reference '<em>Point</em>'.
@@ -5223,8 +5497,7 @@ public interface DGPackage extends EPackage {
 	EReference getLineTo_Point();
 
 	/**
-	 * Returns the meta object for class '
-	 * {@link org.eclipse.papyrus.dd.dg.Matrix <em>Matrix</em>}'. <!--
+	 * Returns the meta object for class ' {@link org.eclipse.papyrus.dd.dg.Matrix <em>Matrix</em>}'. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @return the meta object for class '<em>Matrix</em>'.
@@ -5234,8 +5507,7 @@ public interface DGPackage extends EPackage {
 	EClass getMatrix();
 
 	/**
-	 * Returns the meta object for the attribute '
-	 * {@link org.eclipse.papyrus.dd.dg.Matrix#getA <em>A</em>}'. <!--
+	 * Returns the meta object for the attribute ' {@link org.eclipse.papyrus.dd.dg.Matrix#getA <em>A</em>}'. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @return the meta object for the attribute '<em>A</em>'.
@@ -5246,8 +5518,7 @@ public interface DGPackage extends EPackage {
 	EAttribute getMatrix_A();
 
 	/**
-	 * Returns the meta object for the attribute '
-	 * {@link org.eclipse.papyrus.dd.dg.Matrix#getB <em>B</em>}'. <!--
+	 * Returns the meta object for the attribute ' {@link org.eclipse.papyrus.dd.dg.Matrix#getB <em>B</em>}'. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @return the meta object for the attribute '<em>B</em>'.
@@ -5258,8 +5529,7 @@ public interface DGPackage extends EPackage {
 	EAttribute getMatrix_B();
 
 	/**
-	 * Returns the meta object for the attribute '
-	 * {@link org.eclipse.papyrus.dd.dg.Matrix#getC <em>C</em>}'. <!--
+	 * Returns the meta object for the attribute ' {@link org.eclipse.papyrus.dd.dg.Matrix#getC <em>C</em>}'. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @return the meta object for the attribute '<em>C</em>'.
@@ -5270,8 +5540,7 @@ public interface DGPackage extends EPackage {
 	EAttribute getMatrix_C();
 
 	/**
-	 * Returns the meta object for the attribute '
-	 * {@link org.eclipse.papyrus.dd.dg.Matrix#getD <em>D</em>}'. <!--
+	 * Returns the meta object for the attribute ' {@link org.eclipse.papyrus.dd.dg.Matrix#getD <em>D</em>}'. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @return the meta object for the attribute '<em>D</em>'.
@@ -5282,8 +5551,7 @@ public interface DGPackage extends EPackage {
 	EAttribute getMatrix_D();
 
 	/**
-	 * Returns the meta object for the attribute '
-	 * {@link org.eclipse.papyrus.dd.dg.Matrix#getE <em>E</em>}'. <!--
+	 * Returns the meta object for the attribute ' {@link org.eclipse.papyrus.dd.dg.Matrix#getE <em>E</em>}'. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @return the meta object for the attribute '<em>E</em>'.
@@ -5294,8 +5562,7 @@ public interface DGPackage extends EPackage {
 	EAttribute getMatrix_E();
 
 	/**
-	 * Returns the meta object for the attribute '
-	 * {@link org.eclipse.papyrus.dd.dg.Matrix#getF <em>F</em>}'. <!--
+	 * Returns the meta object for the attribute ' {@link org.eclipse.papyrus.dd.dg.Matrix#getF <em>F</em>}'. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @return the meta object for the attribute '<em>F</em>'.
@@ -5308,6 +5575,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.dd.dg.Path <em>Path</em>}'.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Path</em>'.
 	 * @see org.eclipse.papyrus.dd.dg.Path
 	 * @generated
@@ -5317,6 +5585,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.dd.dg.Path#getCommands <em>Command</em>}'.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Command</em>'.
 	 * @see org.eclipse.papyrus.dd.dg.Path#getCommands()
 	 * @see #getPath()
@@ -5325,9 +5594,12 @@ public interface DGPackage extends EPackage {
 	EReference getPath_Command();
 
 	/**
-	 * Returns the meta object for the '{@link org.eclipse.papyrus.dd.dg.Path#firstCommandMustBeMove(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>First Command Must Be Move</em>}' operation.
+	 * Returns the meta object for the '
+	 * {@link org.eclipse.papyrus.dd.dg.Path#firstCommandMustBeMove(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
+	 * <em>First Command Must Be Move</em>}' operation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the '<em>First Command Must Be Move</em>' operation.
 	 * @see org.eclipse.papyrus.dd.dg.Path#firstCommandMustBeMove(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
 	 * @generated
@@ -5335,8 +5607,7 @@ public interface DGPackage extends EPackage {
 	EOperation getPath__FirstCommandMustBeMove__DiagnosticChain_Map();
 
 	/**
-	 * Returns the meta object for class '
-	 * {@link org.eclipse.papyrus.dd.dg.Pattern <em>Pattern</em>}'. <!--
+	 * Returns the meta object for class ' {@link org.eclipse.papyrus.dd.dg.Pattern <em>Pattern</em>}'. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @return the meta object for class '<em>Pattern</em>'.
@@ -5348,6 +5619,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.dd.dg.Pattern#getBounds <em>Bounds</em>}'.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference '<em>Bounds</em>'.
 	 * @see org.eclipse.papyrus.dd.dg.Pattern#getBounds()
 	 * @see #getPattern()
@@ -5356,8 +5628,7 @@ public interface DGPackage extends EPackage {
 	EReference getPattern_Bounds();
 
 	/**
-	 * Returns the meta object for the containment reference '
-	 * {@link org.eclipse.papyrus.dd.dg.Pattern#getTile <em>Tile</em>}'. <!--
+	 * Returns the meta object for the containment reference ' {@link org.eclipse.papyrus.dd.dg.Pattern#getTile <em>Tile</em>}'. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @return the meta object for the containment reference '<em>Tile</em>'.
@@ -5368,8 +5639,7 @@ public interface DGPackage extends EPackage {
 	EReference getPattern_Tile();
 
 	/**
-	 * Returns the meta object for class '
-	 * {@link org.eclipse.papyrus.dd.dg.Polygon <em>Polygon</em>}'. <!--
+	 * Returns the meta object for class ' {@link org.eclipse.papyrus.dd.dg.Polygon <em>Polygon</em>}'. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @return the meta object for class '<em>Polygon</em>'.
@@ -5379,12 +5649,10 @@ public interface DGPackage extends EPackage {
 	EClass getPolygon();
 
 	/**
-	 * Returns the meta object for the containment reference list '
-	 * {@link org.eclipse.papyrus.dd.dg.Polygon#getPoints <em>Point</em>}'. <!--
+	 * Returns the meta object for the containment reference list ' {@link org.eclipse.papyrus.dd.dg.Polygon#getPoints <em>Point</em>}'. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
-	 * @return the meta object for the containment reference list '
-	 *         <em>Point</em>'.
+	 * @return the meta object for the containment reference list ' <em>Point</em>'.
 	 * @see org.eclipse.papyrus.dd.dg.Polygon#getPoints()
 	 * @see #getPolygon()
 	 * @generated
@@ -5392,8 +5660,7 @@ public interface DGPackage extends EPackage {
 	EReference getPolygon_Point();
 
 	/**
-	 * Returns the meta object for class '
-	 * {@link org.eclipse.papyrus.dd.dg.Polyline <em>Polyline</em>}'. <!--
+	 * Returns the meta object for class ' {@link org.eclipse.papyrus.dd.dg.Polyline <em>Polyline</em>}'. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @return the meta object for class '<em>Polyline</em>'.
@@ -5405,6 +5672,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.dd.dg.Polyline#getPoints <em>Point</em>}'.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Point</em>'.
 	 * @see org.eclipse.papyrus.dd.dg.Polyline#getPoints()
 	 * @see #getPolyline()
@@ -5415,6 +5683,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.dd.dg.RadialGradient <em>Radial Gradient</em>}'.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Radial Gradient</em>'.
 	 * @see org.eclipse.papyrus.dd.dg.RadialGradient
 	 * @generated
@@ -5424,6 +5693,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.dd.dg.RadialGradient#getCenter <em>Center</em>}'.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference '<em>Center</em>'.
 	 * @see org.eclipse.papyrus.dd.dg.RadialGradient#getCenter()
 	 * @see #getRadialGradient()
@@ -5434,6 +5704,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.dd.dg.RadialGradient#getFocus <em>Focus</em>}'.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference '<em>Focus</em>'.
 	 * @see org.eclipse.papyrus.dd.dg.RadialGradient#getFocus()
 	 * @see #getRadialGradient()
@@ -5444,6 +5715,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.dd.dg.RadialGradient#getRadius <em>Radius</em>}'.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Radius</em>'.
 	 * @see org.eclipse.papyrus.dd.dg.RadialGradient#getRadius()
 	 * @see #getRadialGradient()
@@ -5452,9 +5724,12 @@ public interface DGPackage extends EPackage {
 	EAttribute getRadialGradient_Radius();
 
 	/**
-	 * Returns the meta object for the '{@link org.eclipse.papyrus.dd.dg.RadialGradient#validCenterPoint(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Valid Center Point</em>}' operation.
+	 * Returns the meta object for the '
+	 * {@link org.eclipse.papyrus.dd.dg.RadialGradient#validCenterPoint(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
+	 * <em>Valid Center Point</em>}' operation.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the '<em>Valid Center Point</em>' operation.
 	 * @see org.eclipse.papyrus.dd.dg.RadialGradient#validCenterPoint(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
 	 * @generated
@@ -5462,9 +5737,12 @@ public interface DGPackage extends EPackage {
 	EOperation getRadialGradient__ValidCenterPoint__DiagnosticChain_Map();
 
 	/**
-	 * Returns the meta object for the '{@link org.eclipse.papyrus.dd.dg.RadialGradient#validFocusPoint(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Valid Focus Point</em>}' operation.
+	 * Returns the meta object for the '
+	 * {@link org.eclipse.papyrus.dd.dg.RadialGradient#validFocusPoint(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
+	 * <em>Valid Focus Point</em>}' operation.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the '<em>Valid Focus Point</em>' operation.
 	 * @see org.eclipse.papyrus.dd.dg.RadialGradient#validFocusPoint(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
 	 * @generated
@@ -5472,9 +5750,12 @@ public interface DGPackage extends EPackage {
 	EOperation getRadialGradient__ValidFocusPoint__DiagnosticChain_Map();
 
 	/**
-	 * Returns the meta object for the '{@link org.eclipse.papyrus.dd.dg.RadialGradient#validRadius(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Valid Radius</em>}' operation.
+	 * Returns the meta object for the '
+	 * {@link org.eclipse.papyrus.dd.dg.RadialGradient#validRadius(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Valid Radius</em>}'
+	 * operation.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the '<em>Valid Radius</em>' operation.
 	 * @see org.eclipse.papyrus.dd.dg.RadialGradient#validRadius(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
 	 * @generated
@@ -5482,8 +5763,7 @@ public interface DGPackage extends EPackage {
 	EOperation getRadialGradient__ValidRadius__DiagnosticChain_Map();
 
 	/**
-	 * Returns the meta object for class '
-	 * {@link org.eclipse.papyrus.dd.dg.Rectangle <em>Rectangle</em>}'. <!--
+	 * Returns the meta object for class ' {@link org.eclipse.papyrus.dd.dg.Rectangle <em>Rectangle</em>}'. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @return the meta object for class '<em>Rectangle</em>'.
@@ -5495,6 +5775,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.dd.dg.Rectangle#getBounds <em>Bounds</em>}'.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference '<em>Bounds</em>'.
 	 * @see org.eclipse.papyrus.dd.dg.Rectangle#getBounds()
 	 * @see #getRectangle()
@@ -5505,6 +5786,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.dd.dg.Rectangle#getCornerRadius <em>Corner Radius</em>}'.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Corner Radius</em>'.
 	 * @see org.eclipse.papyrus.dd.dg.Rectangle#getCornerRadius()
 	 * @see #getRectangle()
@@ -5513,9 +5795,12 @@ public interface DGPackage extends EPackage {
 	EAttribute getRectangle_CornerRadius();
 
 	/**
-	 * Returns the meta object for the '{@link org.eclipse.papyrus.dd.dg.Rectangle#nonNegativeCornerRadius(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Non Negative Corner Radius</em>}' operation.
+	 * Returns the meta object for the '
+	 * {@link org.eclipse.papyrus.dd.dg.Rectangle#nonNegativeCornerRadius(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
+	 * <em>Non Negative Corner Radius</em>}' operation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the '<em>Non Negative Corner Radius</em>' operation.
 	 * @see org.eclipse.papyrus.dd.dg.Rectangle#nonNegativeCornerRadius(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
 	 * @generated
@@ -5523,8 +5808,7 @@ public interface DGPackage extends EPackage {
 	EOperation getRectangle__NonNegativeCornerRadius__DiagnosticChain_Map();
 
 	/**
-	 * Returns the meta object for class '
-	 * {@link org.eclipse.papyrus.dd.dg.RootCanvas <em>Root Canvas</em>}'. <!--
+	 * Returns the meta object for class ' {@link org.eclipse.papyrus.dd.dg.RootCanvas <em>Root Canvas</em>}'. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @return the meta object for class '<em>Root Canvas</em>'.
@@ -5534,8 +5818,7 @@ public interface DGPackage extends EPackage {
 	EClass getRootCanvas();
 
 	/**
-	 * Returns the meta object for the attribute '
-	 * {@link org.eclipse.papyrus.dd.dg.RootCanvas#getBackgroundColor
+	 * Returns the meta object for the attribute ' {@link org.eclipse.papyrus.dd.dg.RootCanvas#getBackgroundColor
 	 * <em>Background Color</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
 	 * -->
 	 * 
@@ -5549,6 +5832,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.dd.dg.RootCanvas#getDefinitions <em>Definitions</em>}'.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference '<em>Definitions</em>'.
 	 * @see org.eclipse.papyrus.dd.dg.RootCanvas#getDefinitions()
 	 * @see #getRootCanvas()
@@ -5557,9 +5841,11 @@ public interface DGPackage extends EPackage {
 	EReference getRootCanvas_Definitions();
 
 	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.dd.dg.RootCanvas#getExternalStyleSheets <em>External Style Sheet</em>}'.
+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.dd.dg.RootCanvas#getExternalStyleSheets
+	 * <em>External Style Sheet</em>}'.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the reference list '<em>External Style Sheet</em>'.
 	 * @see org.eclipse.papyrus.dd.dg.RootCanvas#getExternalStyleSheets()
 	 * @see #getRootCanvas()
@@ -5571,6 +5857,7 @@ public interface DGPackage extends EPackage {
 	 * Returns the meta object for the attribute list '{@link org.eclipse.papyrus.dd.dg.RootCanvas#getScripts <em>Script</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute list '<em>Script</em>'.
 	 * @see org.eclipse.papyrus.dd.dg.RootCanvas#getScripts()
 	 * @see #getRootCanvas()
@@ -5579,8 +5866,7 @@ public interface DGPackage extends EPackage {
 	EAttribute getRootCanvas_Script();
 
 	/**
-	 * Returns the meta object for class '
-	 * {@link org.eclipse.papyrus.dd.dg.Rotate <em>Rotate</em>}'. <!--
+	 * Returns the meta object for class ' {@link org.eclipse.papyrus.dd.dg.Rotate <em>Rotate</em>}'. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @return the meta object for class '<em>Rotate</em>'.
@@ -5590,8 +5876,7 @@ public interface DGPackage extends EPackage {
 	EClass getRotate();
 
 	/**
-	 * Returns the meta object for the attribute '
-	 * {@link org.eclipse.papyrus.dd.dg.Rotate#getAngle <em>Angle</em>}'. <!--
+	 * Returns the meta object for the attribute ' {@link org.eclipse.papyrus.dd.dg.Rotate#getAngle <em>Angle</em>}'. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @return the meta object for the attribute '<em>Angle</em>'.
@@ -5602,8 +5887,7 @@ public interface DGPackage extends EPackage {
 	EAttribute getRotate_Angle();
 
 	/**
-	 * Returns the meta object for the containment reference '
-	 * {@link org.eclipse.papyrus.dd.dg.Rotate#getCenter <em>Center</em>}'. <!--
+	 * Returns the meta object for the containment reference ' {@link org.eclipse.papyrus.dd.dg.Rotate#getCenter <em>Center</em>}'. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @return the meta object for the containment reference '<em>Center</em>'.
@@ -5614,8 +5898,7 @@ public interface DGPackage extends EPackage {
 	EReference getRotate_Center();
 
 	/**
-	 * Returns the meta object for class '
-	 * {@link org.eclipse.papyrus.dd.dg.Scale <em>Scale</em>}'. <!--
+	 * Returns the meta object for class ' {@link org.eclipse.papyrus.dd.dg.Scale <em>Scale</em>}'. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @return the meta object for class '<em>Scale</em>'.
@@ -5627,6 +5910,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.dd.dg.Scale#getFactorX <em>Factor X</em>}'.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Factor X</em>'.
 	 * @see org.eclipse.papyrus.dd.dg.Scale#getFactorX()
 	 * @see #getScale()
@@ -5637,6 +5921,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.dd.dg.Scale#getFactorY <em>Factor Y</em>}'.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Factor Y</em>'.
 	 * @see org.eclipse.papyrus.dd.dg.Scale#getFactorY()
 	 * @see #getScale()
@@ -5645,9 +5930,12 @@ public interface DGPackage extends EPackage {
 	EAttribute getScale_FactorY();
 
 	/**
-	 * Returns the meta object for the '{@link org.eclipse.papyrus.dd.dg.Scale#nonnegativescale(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Nonnegativescale</em>}' operation.
+	 * Returns the meta object for the '
+	 * {@link org.eclipse.papyrus.dd.dg.Scale#nonnegativescale(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Nonnegativescale</em>}'
+	 * operation.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the '<em>Nonnegativescale</em>' operation.
 	 * @see org.eclipse.papyrus.dd.dg.Scale#nonnegativescale(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
 	 * @generated
@@ -5657,6 +5945,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.dd.dg.Skew <em>Skew</em>}'.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Skew</em>'.
 	 * @see org.eclipse.papyrus.dd.dg.Skew
 	 * @generated
@@ -5664,8 +5953,7 @@ public interface DGPackage extends EPackage {
 	EClass getSkew();
 
 	/**
-	 * Returns the meta object for the attribute '
-	 * {@link org.eclipse.papyrus.dd.dg.Skew#getAngleX <em>Angle X</em>}'. <!--
+	 * Returns the meta object for the attribute ' {@link org.eclipse.papyrus.dd.dg.Skew#getAngleX <em>Angle X</em>}'. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @return the meta object for the attribute '<em>Angle X</em>'.
@@ -5676,8 +5964,7 @@ public interface DGPackage extends EPackage {
 	EAttribute getSkew_AngleX();
 
 	/**
-	 * Returns the meta object for the attribute '
-	 * {@link org.eclipse.papyrus.dd.dg.Skew#getAngleY <em>Angle Y</em>}'. <!--
+	 * Returns the meta object for the attribute ' {@link org.eclipse.papyrus.dd.dg.Skew#getAngleY <em>Angle Y</em>}'. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @return the meta object for the attribute '<em>Angle Y</em>'.
@@ -5690,6 +5977,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.dd.dg.Text <em>Text</em>}'.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Text</em>'.
 	 * @see org.eclipse.papyrus.dd.dg.Text
 	 * @generated
@@ -5697,8 +5985,7 @@ public interface DGPackage extends EPackage {
 	EClass getText();
 
 	/**
-	 * Returns the meta object for the attribute '
-	 * {@link org.eclipse.papyrus.dd.dg.Text#getData <em>Data</em>}'. <!--
+	 * Returns the meta object for the attribute ' {@link org.eclipse.papyrus.dd.dg.Text#getData <em>Data</em>}'. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @return the meta object for the attribute '<em>Data</em>'.
@@ -5711,6 +5998,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.dd.dg.Text#getPosition <em>Position</em>}'.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference '<em>Position</em>'.
 	 * @see org.eclipse.papyrus.dd.dg.Text#getPosition()
 	 * @see #getText()
@@ -5722,6 +6010,7 @@ public interface DGPackage extends EPackage {
 	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.dd.dg.Text#getAnchor <em>Anchor</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Anchor</em>'.
 	 * @see org.eclipse.papyrus.dd.dg.Text#getAnchor()
 	 * @see #getText()
@@ -5730,9 +6019,12 @@ public interface DGPackage extends EPackage {
 	EAttribute getText_Anchor();
 
 	/**
-	 * Returns the meta object for the '{@link org.eclipse.papyrus.dd.dg.Text#dataCannotBeEmpty(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Data Cannot Be Empty</em>}' operation.
+	 * Returns the meta object for the '
+	 * {@link org.eclipse.papyrus.dd.dg.Text#dataCannotBeEmpty(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
+	 * <em>Data Cannot Be Empty</em>}' operation.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @return the meta object for the '<em>Data Cannot Be Empty</em>' operation.
 	 * @see org.eclipse.papyrus.dd.dg.Text#dataCannotBeEmpty(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
 	 * @generated
@@ -5740,8 +6032,7 @@ public interface DGPackage extends EPackage {
 	EOperation getText__DataCannotBeEmpty__DiagnosticChain_Map();
 
 	/**
-	 * Returns the meta object for class '
-	 * {@link org.eclipse.papyrus.dd.dg.Translate <em>Translate</em>}'. <!--
+	 * Returns the meta object for class ' {@link org.eclipse.papyrus.dd.dg.Translate <em>Translate</em>}'. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @return the meta object for class '<em>Translate</em>'.
@@ -5753,6 +6044,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.dd.dg.Translate#getDeltaX <em>Delta X</em>}'.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Delta X</em>'.
 	 * @see org.eclipse.papyrus.dd.dg.Translate#getDeltaX()
 	 * @see #getTranslate()
@@ -5763,6 +6055,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.dd.dg.Translate#getDeltaY <em>Delta Y</em>}'.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Delta Y</em>'.
 	 * @see org.eclipse.papyrus.dd.dg.Translate#getDeltaY()
 	 * @see #getTranslate()
@@ -5773,6 +6066,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.dd.dg.Use <em>Use</em>}'.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Use</em>'.
 	 * @see org.eclipse.papyrus.dd.dg.Use
 	 * @generated
@@ -5780,8 +6074,7 @@ public interface DGPackage extends EPackage {
 	EClass getUse();
 
 	/**
-	 * Returns the meta object for the containment reference '
-	 * {@link org.eclipse.papyrus.dd.dg.Use#getBounds <em>Bounds</em>}'. <!--
+	 * Returns the meta object for the containment reference ' {@link org.eclipse.papyrus.dd.dg.Use#getBounds <em>Bounds</em>}'. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @return the meta object for the containment reference '<em>Bounds</em>'.
@@ -5792,8 +6085,7 @@ public interface DGPackage extends EPackage {
 	EReference getUse_Bounds();
 
 	/**
-	 * Returns the meta object for the reference '
-	 * {@link org.eclipse.papyrus.dd.dg.Use#getReferencedElement
+	 * Returns the meta object for the reference ' {@link org.eclipse.papyrus.dd.dg.Use#getReferencedElement
 	 * <em>Referenced Element</em>}'. <!-- begin-user-doc --> <!-- end-user-doc
 	 * -->
 	 * 
@@ -5805,9 +6097,12 @@ public interface DGPackage extends EPackage {
 	EReference getUse_ReferencedElement();
 
 	/**
-	 * Returns the meta object for the '{@link org.eclipse.papyrus.dd.dg.Use#referencedElementHasId(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Referenced Element Has Id</em>}' operation.
+	 * Returns the meta object for the '
+	 * {@link org.eclipse.papyrus.dd.dg.Use#referencedElementHasId(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
+	 * <em>Referenced Element Has Id</em>}' operation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the '<em>Referenced Element Has Id</em>' operation.
 	 * @see org.eclipse.papyrus.dd.dg.Use#referencedElementHasId(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
 	 * @generated
@@ -5817,6 +6112,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * Returns the meta object for enum '{@link org.eclipse.papyrus.dd.dg.FontDecoration <em>Font Decoration</em>}'.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for enum '<em>Font Decoration</em>'.
 	 * @see org.eclipse.papyrus.dd.dg.FontDecoration
 	 * @generated
@@ -5826,6 +6122,7 @@ public interface DGPackage extends EPackage {
 	/**
 	 * Returns the meta object for enum '{@link org.eclipse.papyrus.dd.dg.ElementKind <em>Element Kind</em>}'.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for enum '<em>Element Kind</em>'.
 	 * @see org.eclipse.papyrus.dd.dg.ElementKind
 	 * @generated
@@ -5836,6 +6133,7 @@ public interface DGPackage extends EPackage {
 	 * Returns the meta object for enum '{@link org.eclipse.papyrus.dd.dg.TextAnchor <em>Text Anchor</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for enum '<em>Text Anchor</em>'.
 	 * @see org.eclipse.papyrus.dd.dg.TextAnchor
 	 * @generated
@@ -5862,12 +6160,15 @@ public interface DGPackage extends EPackage {
 	 * <li>and each data type</li>
 	 * </ul>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	interface Literals {
+
 		/**
 		 * The meta object literal for the '{@link org.eclipse.papyrus.dd.dg.impl.CanvasImpl <em>Canvas</em>}' class.
 		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.dd.dg.impl.CanvasImpl
 		 * @see org.eclipse.papyrus.dd.dg.impl.DGPackageImpl#getCanvas()
 		 * @generated
@@ -5877,13 +6178,13 @@ public interface DGPackage extends EPackage {
 		/**
 		 * The meta object literal for the '<em><b>Bounds</b></em>' containment reference feature.
 		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference CANVAS__BOUNDS = eINSTANCE.getCanvas_Bounds();
 
 		/**
-		 * The meta object literal for the '
-		 * <em><b>Canvas Cannot Have Transforms</b></em>' operation. <!--
+		 * The meta object literal for the ' <em><b>Canvas Cannot Have Transforms</b></em>' operation. <!--
 		 * begin-user-doc --> <!-- end-user-doc -->
 		 * 
 		 * @generated
@@ -5893,6 +6194,7 @@ public interface DGPackage extends EPackage {
 		/**
 		 * The meta object literal for the '{@link org.eclipse.papyrus.dd.dg.impl.GroupImpl <em>Group</em>}' class.
 		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.dd.dg.impl.GroupImpl
 		 * @see org.eclipse.papyrus.dd.dg.impl.DGPackageImpl#getGroup()
 		 * @generated
@@ -5902,6 +6204,7 @@ public interface DGPackage extends EPackage {
 		/**
 		 * The meta object literal for the '<em><b>Member</b></em>' containment reference list feature.
 		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference GROUP__MEMBER = eINSTANCE.getGroup_Member();
@@ -5910,6 +6213,7 @@ public interface DGPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Layout</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute GROUP__LAYOUT = eINSTANCE.getGroup_Layout();
@@ -5918,6 +6222,7 @@ public interface DGPackage extends EPackage {
 		 * The meta object literal for the '{@link org.eclipse.papyrus.dd.dg.impl.GraphicalElementImpl <em>Graphical Element</em>}' class.
 		 * <!-- begin-user-doc --> <!--
 		 * end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.dd.dg.impl.GraphicalElementImpl
 		 * @see org.eclipse.papyrus.dd.dg.impl.DGPackageImpl#getGraphicalElement()
 		 * @generated
@@ -5927,6 +6232,7 @@ public interface DGPackage extends EPackage {
 		/**
 		 * The meta object literal for the '<em><b>Clip Path</b></em>' reference feature.
 		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference GRAPHICAL_ELEMENT__CLIP_PATH = eINSTANCE.getGraphicalElement_ClipPath();
@@ -5934,6 +6240,7 @@ public interface DGPackage extends EPackage {
 		/**
 		 * The meta object literal for the '<em><b>Group</b></em>' container reference feature.
 		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference GRAPHICAL_ELEMENT__GROUP = eINSTANCE.getGraphicalElement_Group();
@@ -5941,6 +6248,7 @@ public interface DGPackage extends EPackage {
 		/**
 		 * The meta object literal for the '<em><b>Class</b></em>' attribute list feature.
 		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute GRAPHICAL_ELEMENT__CLASS = eINSTANCE.getGraphicalElement_Class();
@@ -5948,6 +6256,7 @@ public interface DGPackage extends EPackage {
 		/**
 		 * The meta object literal for the '<em><b>Style</b></em>' containment reference feature.
 		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference GRAPHICAL_ELEMENT__STYLE = eINSTANCE.getGraphicalElement_Style();
@@ -5956,6 +6265,7 @@ public interface DGPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Transform</b></em>' containment reference list feature.
 		 * <!-- begin-user-doc --> <!--
 		 * end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference GRAPHICAL_ELEMENT__TRANSFORM = eINSTANCE.getGraphicalElement_Transform();
@@ -5964,13 +6274,13 @@ public interface DGPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Layout Data</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute GRAPHICAL_ELEMENT__LAYOUT_DATA = eINSTANCE.getGraphicalElement_LayoutData();
 
 		/**
-		 * The meta object literal for the '
-		 * <em><b>Referenced Clippath Has Id</b></em>' operation. <!--
+		 * The meta object literal for the ' <em><b>Referenced Clippath Has Id</b></em>' operation. <!--
 		 * begin-user-doc --> <!-- end-user-doc -->
 		 * 
 		 * @generated
@@ -5981,6 +6291,7 @@ public interface DGPackage extends EPackage {
 		 * The meta object literal for the '{@link org.eclipse.papyrus.dd.dg.impl.DefinitionImpl <em>Definition</em>}' class.
 		 * <!-- begin-user-doc --> <!--
 		 * end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.dd.dg.impl.DefinitionImpl
 		 * @see org.eclipse.papyrus.dd.dg.impl.DGPackageImpl#getDefinition()
 		 * @generated
@@ -5990,6 +6301,7 @@ public interface DGPackage extends EPackage {
 		/**
 		 * The meta object literal for the '<em><b>Id</b></em>' attribute feature.
 		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute DEFINITION__ID = eINSTANCE.getDefinition_Id();
@@ -5997,6 +6309,7 @@ public interface DGPackage extends EPackage {
 		/**
 		 * The meta object literal for the '<em><b>Id Cannot Be Empty</b></em>' operation.
 		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EOperation DEFINITION___ID_CANNOT_BE_EMPTY__DIAGNOSTICCHAIN_MAP = eINSTANCE.getDefinition__IdCannotBeEmpty__DiagnosticChain_Map();
@@ -6004,6 +6317,7 @@ public interface DGPackage extends EPackage {
 		/**
 		 * The meta object literal for the '{@link org.eclipse.papyrus.dd.dg.impl.MoveToImpl <em>Move To</em>}' class.
 		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.dd.dg.impl.MoveToImpl
 		 * @see org.eclipse.papyrus.dd.dg.impl.DGPackageImpl#getMoveTo()
 		 * @generated
@@ -6013,6 +6327,7 @@ public interface DGPackage extends EPackage {
 		/**
 		 * The meta object literal for the '<em><b>Point</b></em>' containment reference feature.
 		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference MOVE_TO__POINT = eINSTANCE.getMoveTo_Point();
@@ -6021,6 +6336,7 @@ public interface DGPackage extends EPackage {
 		 * The meta object literal for the '{@link org.eclipse.papyrus.dd.dg.impl.PathCommandImpl <em>Path Command</em>}' class.
 		 * <!-- begin-user-doc --> <!--
 		 * end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.dd.dg.impl.PathCommandImpl
 		 * @see org.eclipse.papyrus.dd.dg.impl.DGPackageImpl#getPathCommand()
 		 * @generated
@@ -6030,13 +6346,13 @@ public interface DGPackage extends EPackage {
 		/**
 		 * The meta object literal for the '<em><b>Is Relative</b></em>' attribute feature.
 		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute PATH_COMMAND__IS_RELATIVE = eINSTANCE.getPathCommand_IsRelative();
 
 		/**
-		 * The meta object literal for the '
-		 * {@link org.eclipse.papyrus.dd.dg.impl.ClipPathImpl
+		 * The meta object literal for the ' {@link org.eclipse.papyrus.dd.dg.impl.ClipPathImpl
 		 * <em>Clip Path</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc
 		 * -->
 		 * 
@@ -6049,6 +6365,7 @@ public interface DGPackage extends EPackage {
 		/**
 		 * The meta object literal for the '{@link org.eclipse.papyrus.dd.dg.impl.StyleImpl <em>Style</em>}' class.
 		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.dd.dg.impl.StyleImpl
 		 * @see org.eclipse.papyrus.dd.dg.impl.DGPackageImpl#getStyle()
 		 * @generated
@@ -6058,6 +6375,7 @@ public interface DGPackage extends EPackage {
 		/**
 		 * The meta object literal for the '<em><b>Fill</b></em>' containment reference feature.
 		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference STYLE__FILL = eINSTANCE.getStyle_Fill();
@@ -6065,6 +6383,7 @@ public interface DGPackage extends EPackage {
 		/**
 		 * The meta object literal for the '<em><b>Fill Opacity</b></em>' attribute feature.
 		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute STYLE__FILL_OPACITY = eINSTANCE.getStyle_FillOpacity();
@@ -6072,6 +6391,7 @@ public interface DGPackage extends EPackage {
 		/**
 		 * The meta object literal for the '<em><b>Stroke</b></em>' containment reference feature.
 		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference STYLE__STROKE = eINSTANCE.getStyle_Stroke();
@@ -6079,6 +6399,7 @@ public interface DGPackage extends EPackage {
 		/**
 		 * The meta object literal for the '<em><b>Stroke Width</b></em>' attribute feature.
 		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute STYLE__STROKE_WIDTH = eINSTANCE.getStyle_StrokeWidth();
@@ -6086,6 +6407,7 @@ public interface DGPackage extends EPackage {
 		/**
 		 * The meta object literal for the '<em><b>Stroke Opacity</b></em>' attribute feature.
 		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute STYLE__STROKE_OPACITY = eINSTANCE.getStyle_StrokeOpacity();
@@ -6093,6 +6415,7 @@ public interface DGPackage extends EPackage {
 		/**
 		 * The meta object literal for the '<em><b>Stroke Dash Length</b></em>' attribute list feature.
 		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute STYLE__STROKE_DASH_LENGTH = eINSTANCE.getStyle_StrokeDashLength();
@@ -6100,6 +6423,7 @@ public interface DGPackage extends EPackage {
 		/**
 		 * The meta object literal for the '<em><b>Font Size</b></em>' attribute feature.
 		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute STYLE__FONT_SIZE = eINSTANCE.getStyle_FontSize();
@@ -6107,6 +6431,7 @@ public interface DGPackage extends EPackage {
 		/**
 		 * The meta object literal for the '<em><b>Font Name</b></em>' attribute feature.
 		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute STYLE__FONT_NAME = eINSTANCE.getStyle_FontName();
@@ -6114,6 +6439,7 @@ public interface DGPackage extends EPackage {
 		/**
 		 * The meta object literal for the '<em><b>Font Italic</b></em>' attribute feature.
 		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute STYLE__FONT_ITALIC = eINSTANCE.getStyle_FontItalic();
@@ -6121,6 +6447,7 @@ public interface DGPackage extends EPackage {
 		/**
 		 * The meta object literal for the '<em><b>Font Bold</b></em>' attribute feature.
 		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute STYLE__FONT_BOLD = eINSTANCE.getStyle_FontBold();
@@ -6128,6 +6455,7 @@ public interface DGPackage extends EPackage {
 		/**
 		 * The meta object literal for the '<em><b>Font Decoration</b></em>' attribute feature.
 		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute STYLE__FONT_DECORATION = eINSTANCE.getStyle_FontDecoration();
@@ -6135,6 +6463,7 @@ public interface DGPackage extends EPackage {
 		/**
 		 * The meta object literal for the '<em><b>Valid Font Size</b></em>' operation.
 		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EOperation STYLE___VALID_FONT_SIZE__DIAGNOSTICCHAIN_MAP = eINSTANCE.getStyle__ValidFontSize__DiagnosticChain_Map();
@@ -6142,6 +6471,7 @@ public interface DGPackage extends EPackage {
 		/**
 		 * The meta object literal for the '<em><b>Valid Fill Opacity</b></em>' operation.
 		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EOperation STYLE___VALID_FILL_OPACITY__DIAGNOSTICCHAIN_MAP = eINSTANCE.getStyle__ValidFillOpacity__DiagnosticChain_Map();
@@ -6149,13 +6479,13 @@ public interface DGPackage extends EPackage {
 		/**
 		 * The meta object literal for the '<em><b>Valid Stroke Width</b></em>' operation.
 		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EOperation STYLE___VALID_STROKE_WIDTH__DIAGNOSTICCHAIN_MAP = eINSTANCE.getStyle__ValidStrokeWidth__DiagnosticChain_Map();
 
 		/**
-		 * The meta object literal for the '
-		 * <em><b>Valid Dash Length Size</b></em>' operation. <!--
+		 * The meta object literal for the ' <em><b>Valid Dash Length Size</b></em>' operation. <!--
 		 * begin-user-doc --> <!-- end-user-doc -->
 		 * 
 		 * @generated
@@ -6165,6 +6495,7 @@ public interface DGPackage extends EPackage {
 		/**
 		 * The meta object literal for the '<em><b>Valid Stroke Opacity</b></em>' operation.
 		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EOperation STYLE___VALID_STROKE_OPACITY__DIAGNOSTICCHAIN_MAP = eINSTANCE.getStyle__ValidStrokeOpacity__DiagnosticChain_Map();
@@ -6172,6 +6503,7 @@ public interface DGPackage extends EPackage {
 		/**
 		 * The meta object literal for the '{@link org.eclipse.papyrus.dd.dg.impl.PaintImpl <em>Paint</em>}' class.
 		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.dd.dg.impl.PaintImpl
 		 * @see org.eclipse.papyrus.dd.dg.impl.DGPackageImpl#getPaint()
 		 * @generated
@@ -6181,6 +6513,7 @@ public interface DGPackage extends EPackage {
 		/**
 		 * The meta object literal for the '<em><b>Color</b></em>' attribute feature.
 		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute PAINT__COLOR = eINSTANCE.getPaint_Color();
@@ -6188,13 +6521,13 @@ public interface DGPackage extends EPackage {
 		/**
 		 * The meta object literal for the '<em><b>Paint Server</b></em>' reference feature.
 		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference PAINT__PAINT_SERVER = eINSTANCE.getPaint_PaintServer();
 
 		/**
-		 * The meta object literal for the '
-		 * <em><b>Referenced Paint Server Has Id</b></em>' operation. <!--
+		 * The meta object literal for the ' <em><b>Referenced Paint Server Has Id</b></em>' operation. <!--
 		 * begin-user-doc --> <!-- end-user-doc -->
 		 * 
 		 * @generated
@@ -6205,6 +6538,7 @@ public interface DGPackage extends EPackage {
 		 * The meta object literal for the '{@link org.eclipse.papyrus.dd.dg.impl.PaintServerImpl <em>Paint Server</em>}' class.
 		 * <!-- begin-user-doc --> <!--
 		 * end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.dd.dg.impl.PaintServerImpl
 		 * @see org.eclipse.papyrus.dd.dg.impl.DGPackageImpl#getPaintServer()
 		 * @generated
@@ -6215,13 +6549,13 @@ public interface DGPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Transform</b></em>' containment reference list feature.
 		 * <!-- begin-user-doc --> <!--
 		 * end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference PAINT_SERVER__TRANSFORM = eINSTANCE.getPaintServer_Transform();
 
 		/**
-		 * The meta object literal for the '
-		 * {@link org.eclipse.papyrus.dd.dg.impl.TransformImpl
+		 * The meta object literal for the ' {@link org.eclipse.papyrus.dd.dg.impl.TransformImpl
 		 * <em>Transform</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc
 		 * -->
 		 * 
@@ -6234,6 +6568,7 @@ public interface DGPackage extends EPackage {
 		/**
 		 * The meta object literal for the '{@link org.eclipse.papyrus.dd.dg.impl.CircleImpl <em>Circle</em>}' class.
 		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.dd.dg.impl.CircleImpl
 		 * @see org.eclipse.papyrus.dd.dg.impl.DGPackageImpl#getCircle()
 		 * @generated
@@ -6243,6 +6578,7 @@ public interface DGPackage extends EPackage {
 		/**
 		 * The meta object literal for the '<em><b>Center</b></em>' containment reference feature.
 		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference CIRCLE__CENTER = eINSTANCE.getCircle_Center();
@@ -6250,6 +6586,7 @@ public interface DGPackage extends EPackage {
 		/**
 		 * The meta object literal for the '<em><b>Radius</b></em>' attribute feature.
 		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute CIRCLE__RADIUS = eINSTANCE.getCircle_Radius();
@@ -6257,6 +6594,7 @@ public interface DGPackage extends EPackage {
 		/**
 		 * The meta object literal for the '<em><b>Non Negative Radius</b></em>' operation.
 		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EOperation CIRCLE___NON_NEGATIVE_RADIUS__DIAGNOSTICCHAIN_MAP = eINSTANCE.getCircle__NonNegativeRadius__DiagnosticChain_Map();
@@ -6265,6 +6603,7 @@ public interface DGPackage extends EPackage {
 		 * The meta object literal for the '{@link org.eclipse.papyrus.dd.dg.impl.ClosePathImpl <em>Close Path</em>}' class.
 		 * <!-- begin-user-doc --> <!--
 		 * end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.dd.dg.impl.ClosePathImpl
 		 * @see org.eclipse.papyrus.dd.dg.impl.DGPackageImpl#getClosePath()
 		 * @generated
@@ -6275,6 +6614,7 @@ public interface DGPackage extends EPackage {
 		 * The meta object literal for the '{@link org.eclipse.papyrus.dd.dg.impl.CubicCurveToImpl <em>Cubic Curve To</em>}' class.
 		 * <!-- begin-user-doc --> <!--
 		 * end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.dd.dg.impl.CubicCurveToImpl
 		 * @see org.eclipse.papyrus.dd.dg.impl.DGPackageImpl#getCubicCurveTo()
 		 * @generated
@@ -6284,6 +6624,7 @@ public interface DGPackage extends EPackage {
 		/**
 		 * The meta object literal for the '<em><b>Point</b></em>' containment reference feature.
 		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference CUBIC_CURVE_TO__POINT = eINSTANCE.getCubicCurveTo_Point();
@@ -6292,6 +6633,7 @@ public interface DGPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Start Control</b></em>' containment reference feature.
 		 * <!-- begin-user-doc --> <!--
 		 * end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference CUBIC_CURVE_TO__START_CONTROL = eINSTANCE.getCubicCurveTo_StartControl();
@@ -6300,6 +6642,7 @@ public interface DGPackage extends EPackage {
 		 * The meta object literal for the '<em><b>End Control</b></em>' containment reference feature.
 		 * <!-- begin-user-doc --> <!--
 		 * end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference CUBIC_CURVE_TO__END_CONTROL = eINSTANCE.getCubicCurveTo_EndControl();
@@ -6308,6 +6651,7 @@ public interface DGPackage extends EPackage {
 		 * The meta object literal for the '{@link org.eclipse.papyrus.dd.dg.impl.DefinitionsImpl <em>Definitions</em>}' class.
 		 * <!-- begin-user-doc --> <!--
 		 * end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.dd.dg.impl.DefinitionsImpl
 		 * @see org.eclipse.papyrus.dd.dg.impl.DGPackageImpl#getDefinitions()
 		 * @generated
@@ -6318,6 +6662,7 @@ public interface DGPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Defnition</b></em>' containment reference list feature.
 		 * <!-- begin-user-doc --> <!--
 		 * end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference DEFINITIONS__DEFNITION = eINSTANCE.getDefinitions_Defnition();
@@ -6326,6 +6671,7 @@ public interface DGPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Style Sheet</b></em>' containment reference feature.
 		 * <!-- begin-user-doc --> <!--
 		 * end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference DEFINITIONS__STYLE_SHEET = eINSTANCE.getDefinitions_StyleSheet();
@@ -6334,6 +6680,7 @@ public interface DGPackage extends EPackage {
 		 * The meta object literal for the '{@link org.eclipse.papyrus.dd.dg.impl.StyleSheetImpl <em>Style Sheet</em>}' class.
 		 * <!-- begin-user-doc --> <!--
 		 * end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.dd.dg.impl.StyleSheetImpl
 		 * @see org.eclipse.papyrus.dd.dg.impl.DGPackageImpl#getStyleSheet()
 		 * @generated
@@ -6343,6 +6690,7 @@ public interface DGPackage extends EPackage {
 		/**
 		 * The meta object literal for the '<em><b>Rule</b></em>' containment reference list feature.
 		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference STYLE_SHEET__RULE = eINSTANCE.getStyleSheet_Rule();
@@ -6351,6 +6699,7 @@ public interface DGPackage extends EPackage {
 		 * The meta object literal for the '{@link org.eclipse.papyrus.dd.dg.impl.StyleRuleImpl <em>Style Rule</em>}' class.
 		 * <!-- begin-user-doc --> <!--
 		 * end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.dd.dg.impl.StyleRuleImpl
 		 * @see org.eclipse.papyrus.dd.dg.impl.DGPackageImpl#getStyleRule()
 		 * @generated
@@ -6361,6 +6710,7 @@ public interface DGPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Selector</b></em>' containment reference list feature.
 		 * <!-- begin-user-doc --> <!--
 		 * end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference STYLE_RULE__SELECTOR = eINSTANCE.getStyleRule_Selector();
@@ -6368,6 +6718,7 @@ public interface DGPackage extends EPackage {
 		/**
 		 * The meta object literal for the '<em><b>Style</b></em>' containment reference feature.
 		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference STYLE_RULE__STYLE = eINSTANCE.getStyleRule_Style();
@@ -6376,6 +6727,7 @@ public interface DGPackage extends EPackage {
 		 * The meta object literal for the '{@link org.eclipse.papyrus.dd.dg.impl.StyleSelectorImpl <em>Style Selector</em>}' class.
 		 * <!-- begin-user-doc --> <!--
 		 * end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.dd.dg.impl.StyleSelectorImpl
 		 * @see org.eclipse.papyrus.dd.dg.impl.DGPackageImpl#getStyleSelector()
 		 * @generated
@@ -6385,6 +6737,7 @@ public interface DGPackage extends EPackage {
 		/**
 		 * The meta object literal for the '<em><b>Kind</b></em>' attribute feature.
 		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute STYLE_SELECTOR__KIND = eINSTANCE.getStyleSelector_Kind();
@@ -6392,6 +6745,7 @@ public interface DGPackage extends EPackage {
 		/**
 		 * The meta object literal for the '<em><b>Class</b></em>' attribute list feature.
 		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute STYLE_SELECTOR__CLASS = eINSTANCE.getStyleSelector_Class();
@@ -6399,6 +6753,7 @@ public interface DGPackage extends EPackage {
 		/**
 		 * The meta object literal for the '{@link org.eclipse.papyrus.dd.dg.impl.EllipseImpl <em>Ellipse</em>}' class.
 		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.dd.dg.impl.EllipseImpl
 		 * @see org.eclipse.papyrus.dd.dg.impl.DGPackageImpl#getEllipse()
 		 * @generated
@@ -6408,6 +6763,7 @@ public interface DGPackage extends EPackage {
 		/**
 		 * The meta object literal for the '<em><b>Center</b></em>' containment reference feature.
 		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference ELLIPSE__CENTER = eINSTANCE.getEllipse_Center();
@@ -6415,6 +6771,7 @@ public interface DGPackage extends EPackage {
 		/**
 		 * The meta object literal for the '<em><b>Radii</b></em>' containment reference feature.
 		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference ELLIPSE__RADII = eINSTANCE.getEllipse_Radii();
@@ -6423,6 +6780,7 @@ public interface DGPackage extends EPackage {
 		 * The meta object literal for the '{@link org.eclipse.papyrus.dd.dg.impl.EllipticalArcToImpl <em>Elliptical Arc To</em>}' class.
 		 * <!-- begin-user-doc --> <!--
 		 * end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.dd.dg.impl.EllipticalArcToImpl
 		 * @see org.eclipse.papyrus.dd.dg.impl.DGPackageImpl#getEllipticalArcTo()
 		 * @generated
@@ -6432,6 +6790,7 @@ public interface DGPackage extends EPackage {
 		/**
 		 * The meta object literal for the '<em><b>Point</b></em>' containment reference feature.
 		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference ELLIPTICAL_ARC_TO__POINT = eINSTANCE.getEllipticalArcTo_Point();
@@ -6439,6 +6798,7 @@ public interface DGPackage extends EPackage {
 		/**
 		 * The meta object literal for the '<em><b>Radii</b></em>' containment reference feature.
 		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference ELLIPTICAL_ARC_TO__RADII = eINSTANCE.getEllipticalArcTo_Radii();
@@ -6446,6 +6806,7 @@ public interface DGPackage extends EPackage {
 		/**
 		 * The meta object literal for the '<em><b>Rotation</b></em>' attribute feature.
 		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute ELLIPTICAL_ARC_TO__ROTATION = eINSTANCE.getEllipticalArcTo_Rotation();
@@ -6453,6 +6814,7 @@ public interface DGPackage extends EPackage {
 		/**
 		 * The meta object literal for the '<em><b>Is Large Arc</b></em>' attribute feature.
 		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute ELLIPTICAL_ARC_TO__IS_LARGE_ARC = eINSTANCE.getEllipticalArcTo_IsLargeArc();
@@ -6460,6 +6822,7 @@ public interface DGPackage extends EPackage {
 		/**
 		 * The meta object literal for the '<em><b>Is Sweep</b></em>' attribute feature.
 		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute ELLIPTICAL_ARC_TO__IS_SWEEP = eINSTANCE.getEllipticalArcTo_IsSweep();
@@ -6468,6 +6831,7 @@ public interface DGPackage extends EPackage {
 		 * The meta object literal for the '{@link org.eclipse.papyrus.dd.dg.impl.QuadraticCurveToImpl <em>Quadratic Curve To</em>}' class.
 		 * <!-- begin-user-doc --> <!--
 		 * end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.dd.dg.impl.QuadraticCurveToImpl
 		 * @see org.eclipse.papyrus.dd.dg.impl.DGPackageImpl#getQuadraticCurveTo()
 		 * @generated
@@ -6477,6 +6841,7 @@ public interface DGPackage extends EPackage {
 		/**
 		 * The meta object literal for the '<em><b>Point</b></em>' containment reference feature.
 		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference QUADRATIC_CURVE_TO__POINT = eINSTANCE.getQuadraticCurveTo_Point();
@@ -6484,6 +6849,7 @@ public interface DGPackage extends EPackage {
 		/**
 		 * The meta object literal for the '<em><b>Control</b></em>' containment reference feature.
 		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference QUADRATIC_CURVE_TO__CONTROL = eINSTANCE.getQuadraticCurveTo_Control();
@@ -6491,6 +6857,7 @@ public interface DGPackage extends EPackage {
 		/**
 		 * The meta object literal for the '{@link org.eclipse.papyrus.dd.dg.impl.GradientImpl <em>Gradient</em>}' class.
 		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.dd.dg.impl.GradientImpl
 		 * @see org.eclipse.papyrus.dd.dg.impl.DGPackageImpl#getGradient()
 		 * @generated
@@ -6500,6 +6867,7 @@ public interface DGPackage extends EPackage {
 		/**
 		 * The meta object literal for the '<em><b>Stop</b></em>' containment reference list feature.
 		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference GRADIENT__STOP = eINSTANCE.getGradient_Stop();
@@ -6508,6 +6876,7 @@ public interface DGPackage extends EPackage {
 		 * The meta object literal for the '{@link org.eclipse.papyrus.dd.dg.impl.GradientStopImpl <em>Gradient Stop</em>}' class.
 		 * <!-- begin-user-doc --> <!--
 		 * end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.dd.dg.impl.GradientStopImpl
 		 * @see org.eclipse.papyrus.dd.dg.impl.DGPackageImpl#getGradientStop()
 		 * @generated
@@ -6517,6 +6886,7 @@ public interface DGPackage extends EPackage {
 		/**
 		 * The meta object literal for the '<em><b>Color</b></em>' attribute feature.
 		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute GRADIENT_STOP__COLOR = eINSTANCE.getGradientStop_Color();
@@ -6524,6 +6894,7 @@ public interface DGPackage extends EPackage {
 		/**
 		 * The meta object literal for the '<em><b>Offset</b></em>' attribute feature.
 		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute GRADIENT_STOP__OFFSET = eINSTANCE.getGradientStop_Offset();
@@ -6531,6 +6902,7 @@ public interface DGPackage extends EPackage {
 		/**
 		 * The meta object literal for the '<em><b>Opacity</b></em>' attribute feature.
 		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute GRADIENT_STOP__OPACITY = eINSTANCE.getGradientStop_Opacity();
@@ -6538,6 +6910,7 @@ public interface DGPackage extends EPackage {
 		/**
 		 * The meta object literal for the '<em><b>Valid Offset</b></em>' operation.
 		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EOperation GRADIENT_STOP___VALID_OFFSET__DIAGNOSTICCHAIN_MAP = eINSTANCE.getGradientStop__ValidOffset__DiagnosticChain_Map();
@@ -6545,6 +6918,7 @@ public interface DGPackage extends EPackage {
 		/**
 		 * The meta object literal for the '<em><b>Valid Opacity</b></em>' operation.
 		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EOperation GRADIENT_STOP___VALID_OPACITY__DIAGNOSTICCHAIN_MAP = eINSTANCE.getGradientStop__ValidOpacity__DiagnosticChain_Map();
@@ -6552,6 +6926,7 @@ public interface DGPackage extends EPackage {
 		/**
 		 * The meta object literal for the '{@link org.eclipse.papyrus.dd.dg.impl.ImageImpl <em>Image</em>}' class.
 		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.dd.dg.impl.ImageImpl
 		 * @see org.eclipse.papyrus.dd.dg.impl.DGPackageImpl#getImage()
 		 * @generated
@@ -6561,6 +6936,7 @@ public interface DGPackage extends EPackage {
 		/**
 		 * The meta object literal for the '<em><b>Source</b></em>' attribute feature.
 		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute IMAGE__SOURCE = eINSTANCE.getImage_Source();
@@ -6568,13 +6944,13 @@ public interface DGPackage extends EPackage {
 		/**
 		 * The meta object literal for the '<em><b>Bounds</b></em>' containment reference feature.
 		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference IMAGE__BOUNDS = eINSTANCE.getImage_Bounds();
 
 		/**
-		 * The meta object literal for the '
-		 * <em><b>Is Aspect Ratio Preserved</b></em>' attribute feature. <!--
+		 * The meta object literal for the ' <em><b>Is Aspect Ratio Preserved</b></em>' attribute feature. <!--
 		 * begin-user-doc --> <!-- end-user-doc -->
 		 * 
 		 * @generated
@@ -6582,8 +6958,7 @@ public interface DGPackage extends EPackage {
 		EAttribute IMAGE__IS_ASPECT_RATIO_PRESERVED = eINSTANCE.getImage_IsAspectRatioPreserved();
 
 		/**
-		 * The meta object literal for the '
-		 * <em><b>Source Cannot Be Empty</b></em>' operation. <!--
+		 * The meta object literal for the ' <em><b>Source Cannot Be Empty</b></em>' operation. <!--
 		 * begin-user-doc --> <!-- end-user-doc -->
 		 * 
 		 * @generated
@@ -6593,6 +6968,7 @@ public interface DGPackage extends EPackage {
 		/**
 		 * The meta object literal for the '{@link org.eclipse.papyrus.dd.dg.impl.LineImpl <em>Line</em>}' class.
 		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.dd.dg.impl.LineImpl
 		 * @see org.eclipse.papyrus.dd.dg.impl.DGPackageImpl#getLine()
 		 * @generated
@@ -6602,6 +6978,7 @@ public interface DGPackage extends EPackage {
 		/**
 		 * The meta object literal for the '<em><b>Start</b></em>' containment reference feature.
 		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference LINE__START = eINSTANCE.getLine_Start();
@@ -6609,6 +6986,7 @@ public interface DGPackage extends EPackage {
 		/**
 		 * The meta object literal for the '<em><b>End</b></em>' containment reference feature.
 		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference LINE__END = eINSTANCE.getLine_End();
@@ -6617,6 +6995,7 @@ public interface DGPackage extends EPackage {
 		 * The meta object literal for the '{@link org.eclipse.papyrus.dd.dg.impl.MarkedElementImpl <em>Marked Element</em>}' class.
 		 * <!-- begin-user-doc --> <!--
 		 * end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.dd.dg.impl.MarkedElementImpl
 		 * @see org.eclipse.papyrus.dd.dg.impl.DGPackageImpl#getMarkedElement()
 		 * @generated
@@ -6626,6 +7005,7 @@ public interface DGPackage extends EPackage {
 		/**
 		 * The meta object literal for the '<em><b>End Marker</b></em>' reference feature.
 		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference MARKED_ELEMENT__END_MARKER = eINSTANCE.getMarkedElement_EndMarker();
@@ -6633,6 +7013,7 @@ public interface DGPackage extends EPackage {
 		/**
 		 * The meta object literal for the '<em><b>Mid Marker</b></em>' reference feature.
 		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference MARKED_ELEMENT__MID_MARKER = eINSTANCE.getMarkedElement_MidMarker();
@@ -6640,13 +7021,13 @@ public interface DGPackage extends EPackage {
 		/**
 		 * The meta object literal for the '<em><b>Start Marker</b></em>' reference feature.
 		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference MARKED_ELEMENT__START_MARKER = eINSTANCE.getMarkedElement_StartMarker();
 
 		/**
-		 * The meta object literal for the '
-		 * <em><b>Referenced Start Marker Has Id</b></em>' operation. <!--
+		 * The meta object literal for the ' <em><b>Referenced Start Marker Has Id</b></em>' operation. <!--
 		 * begin-user-doc --> <!-- end-user-doc -->
 		 * 
 		 * @generated
@@ -6654,8 +7035,7 @@ public interface DGPackage extends EPackage {
 		EOperation MARKED_ELEMENT___REFERENCED_START_MARKER_HAS_ID__DIAGNOSTICCHAIN_MAP = eINSTANCE.getMarkedElement__ReferencedStartMarkerHasId__DiagnosticChain_Map();
 
 		/**
-		 * The meta object literal for the '
-		 * <em><b>Referenced Mid Marker Has Id</b></em>' operation. <!--
+		 * The meta object literal for the ' <em><b>Referenced Mid Marker Has Id</b></em>' operation. <!--
 		 * begin-user-doc --> <!-- end-user-doc -->
 		 * 
 		 * @generated
@@ -6663,8 +7043,7 @@ public interface DGPackage extends EPackage {
 		EOperation MARKED_ELEMENT___REFERENCED_MID_MARKER_HAS_ID__DIAGNOSTICCHAIN_MAP = eINSTANCE.getMarkedElement__ReferencedMidMarkerHasId__DiagnosticChain_Map();
 
 		/**
-		 * The meta object literal for the '
-		 * <em><b>Referenced End Marker Has Id</b></em>' operation. <!--
+		 * The meta object literal for the ' <em><b>Referenced End Marker Has Id</b></em>' operation. <!--
 		 * begin-user-doc --> <!-- end-user-doc -->
 		 * 
 		 * @generated
@@ -6674,6 +7053,7 @@ public interface DGPackage extends EPackage {
 		/**
 		 * The meta object literal for the '{@link org.eclipse.papyrus.dd.dg.impl.MarkerImpl <em>Marker</em>}' class.
 		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.dd.dg.impl.MarkerImpl
 		 * @see org.eclipse.papyrus.dd.dg.impl.DGPackageImpl#getMarker()
 		 * @generated
@@ -6683,6 +7063,7 @@ public interface DGPackage extends EPackage {
 		/**
 		 * The meta object literal for the '<em><b>Size</b></em>' containment reference feature.
 		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference MARKER__SIZE = eINSTANCE.getMarker_Size();
@@ -6691,6 +7072,7 @@ public interface DGPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Reference</b></em>' containment reference feature.
 		 * <!-- begin-user-doc --> <!--
 		 * end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference MARKER__REFERENCE = eINSTANCE.getMarker_Reference();
@@ -6699,6 +7081,7 @@ public interface DGPackage extends EPackage {
 		 * The meta object literal for the '{@link org.eclipse.papyrus.dd.dg.impl.LinearGradientImpl <em>Linear Gradient</em>}' class.
 		 * <!-- begin-user-doc --> <!--
 		 * end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.dd.dg.impl.LinearGradientImpl
 		 * @see org.eclipse.papyrus.dd.dg.impl.DGPackageImpl#getLinearGradient()
 		 * @generated
@@ -6708,6 +7091,7 @@ public interface DGPackage extends EPackage {
 		/**
 		 * The meta object literal for the '<em><b>Start</b></em>' containment reference feature.
 		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference LINEAR_GRADIENT__START = eINSTANCE.getLinearGradient_Start();
@@ -6715,6 +7099,7 @@ public interface DGPackage extends EPackage {
 		/**
 		 * The meta object literal for the '<em><b>End</b></em>' containment reference feature.
 		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference LINEAR_GRADIENT__END = eINSTANCE.getLinearGradient_End();
@@ -6723,6 +7108,7 @@ public interface DGPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Valid Gradient Vector</b></em>' operation.
 		 * <!-- begin-user-doc
 		 * --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EOperation LINEAR_GRADIENT___VALID_GRADIENT_VECTOR__DIAGNOSTICCHAIN_MAP = eINSTANCE.getLinearGradient__ValidGradientVector__DiagnosticChain_Map();
@@ -6730,6 +7116,7 @@ public interface DGPackage extends EPackage {
 		/**
 		 * The meta object literal for the '{@link org.eclipse.papyrus.dd.dg.impl.LineToImpl <em>Line To</em>}' class.
 		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.dd.dg.impl.LineToImpl
 		 * @see org.eclipse.papyrus.dd.dg.impl.DGPackageImpl#getLineTo()
 		 * @generated
@@ -6739,6 +7126,7 @@ public interface DGPackage extends EPackage {
 		/**
 		 * The meta object literal for the '<em><b>Point</b></em>' containment reference feature.
 		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference LINE_TO__POINT = eINSTANCE.getLineTo_Point();
@@ -6746,6 +7134,7 @@ public interface DGPackage extends EPackage {
 		/**
 		 * The meta object literal for the '{@link org.eclipse.papyrus.dd.dg.impl.MatrixImpl <em>Matrix</em>}' class.
 		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.dd.dg.impl.MatrixImpl
 		 * @see org.eclipse.papyrus.dd.dg.impl.DGPackageImpl#getMatrix()
 		 * @generated
@@ -6755,6 +7144,7 @@ public interface DGPackage extends EPackage {
 		/**
 		 * The meta object literal for the '<em><b>A</b></em>' attribute feature.
 		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute MATRIX__A = eINSTANCE.getMatrix_A();
@@ -6762,6 +7152,7 @@ public interface DGPackage extends EPackage {
 		/**
 		 * The meta object literal for the '<em><b>B</b></em>' attribute feature.
 		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute MATRIX__B = eINSTANCE.getMatrix_B();
@@ -6769,6 +7160,7 @@ public interface DGPackage extends EPackage {
 		/**
 		 * The meta object literal for the '<em><b>C</b></em>' attribute feature.
 		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute MATRIX__C = eINSTANCE.getMatrix_C();
@@ -6776,6 +7168,7 @@ public interface DGPackage extends EPackage {
 		/**
 		 * The meta object literal for the '<em><b>D</b></em>' attribute feature.
 		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute MATRIX__D = eINSTANCE.getMatrix_D();
@@ -6783,6 +7176,7 @@ public interface DGPackage extends EPackage {
 		/**
 		 * The meta object literal for the '<em><b>E</b></em>' attribute feature.
 		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute MATRIX__E = eINSTANCE.getMatrix_E();
@@ -6790,6 +7184,7 @@ public interface DGPackage extends EPackage {
 		/**
 		 * The meta object literal for the '<em><b>F</b></em>' attribute feature.
 		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute MATRIX__F = eINSTANCE.getMatrix_F();
@@ -6797,6 +7192,7 @@ public interface DGPackage extends EPackage {
 		/**
 		 * The meta object literal for the '{@link org.eclipse.papyrus.dd.dg.impl.PathImpl <em>Path</em>}' class.
 		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.dd.dg.impl.PathImpl
 		 * @see org.eclipse.papyrus.dd.dg.impl.DGPackageImpl#getPath()
 		 * @generated
@@ -6806,13 +7202,13 @@ public interface DGPackage extends EPackage {
 		/**
 		 * The meta object literal for the '<em><b>Command</b></em>' containment reference list feature.
 		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference PATH__COMMAND = eINSTANCE.getPath_Command();
 
 		/**
-		 * The meta object literal for the '
-		 * <em><b>First Command Must Be Move</b></em>' operation. <!--
+		 * The meta object literal for the ' <em><b>First Command Must Be Move</b></em>' operation. <!--
 		 * begin-user-doc --> <!-- end-user-doc -->
 		 * 
 		 * @generated
@@ -6822,6 +7218,7 @@ public interface DGPackage extends EPackage {
 		/**
 		 * The meta object literal for the '{@link org.eclipse.papyrus.dd.dg.impl.PatternImpl <em>Pattern</em>}' class.
 		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.dd.dg.impl.PatternImpl
 		 * @see org.eclipse.papyrus.dd.dg.impl.DGPackageImpl#getPattern()
 		 * @generated
@@ -6831,6 +7228,7 @@ public interface DGPackage extends EPackage {
 		/**
 		 * The meta object literal for the '<em><b>Bounds</b></em>' containment reference feature.
 		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference PATTERN__BOUNDS = eINSTANCE.getPattern_Bounds();
@@ -6838,6 +7236,7 @@ public interface DGPackage extends EPackage {
 		/**
 		 * The meta object literal for the '<em><b>Tile</b></em>' containment reference feature.
 		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference PATTERN__TILE = eINSTANCE.getPattern_Tile();
@@ -6845,6 +7244,7 @@ public interface DGPackage extends EPackage {
 		/**
 		 * The meta object literal for the '{@link org.eclipse.papyrus.dd.dg.impl.PolygonImpl <em>Polygon</em>}' class.
 		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.dd.dg.impl.PolygonImpl
 		 * @see org.eclipse.papyrus.dd.dg.impl.DGPackageImpl#getPolygon()
 		 * @generated
@@ -6854,6 +7254,7 @@ public interface DGPackage extends EPackage {
 		/**
 		 * The meta object literal for the '<em><b>Point</b></em>' containment reference list feature.
 		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference POLYGON__POINT = eINSTANCE.getPolygon_Point();
@@ -6861,6 +7262,7 @@ public interface DGPackage extends EPackage {
 		/**
 		 * The meta object literal for the '{@link org.eclipse.papyrus.dd.dg.impl.PolylineImpl <em>Polyline</em>}' class.
 		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.dd.dg.impl.PolylineImpl
 		 * @see org.eclipse.papyrus.dd.dg.impl.DGPackageImpl#getPolyline()
 		 * @generated
@@ -6870,6 +7272,7 @@ public interface DGPackage extends EPackage {
 		/**
 		 * The meta object literal for the '<em><b>Point</b></em>' containment reference list feature.
 		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference POLYLINE__POINT = eINSTANCE.getPolyline_Point();
@@ -6878,6 +7281,7 @@ public interface DGPackage extends EPackage {
 		 * The meta object literal for the '{@link org.eclipse.papyrus.dd.dg.impl.RadialGradientImpl <em>Radial Gradient</em>}' class.
 		 * <!-- begin-user-doc --> <!--
 		 * end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.dd.dg.impl.RadialGradientImpl
 		 * @see org.eclipse.papyrus.dd.dg.impl.DGPackageImpl#getRadialGradient()
 		 * @generated
@@ -6887,6 +7291,7 @@ public interface DGPackage extends EPackage {
 		/**
 		 * The meta object literal for the '<em><b>Center</b></em>' containment reference feature.
 		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference RADIAL_GRADIENT__CENTER = eINSTANCE.getRadialGradient_Center();
@@ -6894,6 +7299,7 @@ public interface DGPackage extends EPackage {
 		/**
 		 * The meta object literal for the '<em><b>Focus</b></em>' containment reference feature.
 		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference RADIAL_GRADIENT__FOCUS = eINSTANCE.getRadialGradient_Focus();
@@ -6901,6 +7307,7 @@ public interface DGPackage extends EPackage {
 		/**
 		 * The meta object literal for the '<em><b>Radius</b></em>' attribute feature.
 		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute RADIAL_GRADIENT__RADIUS = eINSTANCE.getRadialGradient_Radius();
@@ -6908,6 +7315,7 @@ public interface DGPackage extends EPackage {
 		/**
 		 * The meta object literal for the '<em><b>Valid Center Point</b></em>' operation.
 		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EOperation RADIAL_GRADIENT___VALID_CENTER_POINT__DIAGNOSTICCHAIN_MAP = eINSTANCE.getRadialGradient__ValidCenterPoint__DiagnosticChain_Map();
@@ -6915,6 +7323,7 @@ public interface DGPackage extends EPackage {
 		/**
 		 * The meta object literal for the '<em><b>Valid Focus Point</b></em>' operation.
 		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EOperation RADIAL_GRADIENT___VALID_FOCUS_POINT__DIAGNOSTICCHAIN_MAP = eINSTANCE.getRadialGradient__ValidFocusPoint__DiagnosticChain_Map();
@@ -6922,13 +7331,13 @@ public interface DGPackage extends EPackage {
 		/**
 		 * The meta object literal for the '<em><b>Valid Radius</b></em>' operation.
 		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EOperation RADIAL_GRADIENT___VALID_RADIUS__DIAGNOSTICCHAIN_MAP = eINSTANCE.getRadialGradient__ValidRadius__DiagnosticChain_Map();
 
 		/**
-		 * The meta object literal for the '
-		 * {@link org.eclipse.papyrus.dd.dg.impl.RectangleImpl
+		 * The meta object literal for the ' {@link org.eclipse.papyrus.dd.dg.impl.RectangleImpl
 		 * <em>Rectangle</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc
 		 * -->
 		 * 
@@ -6941,6 +7350,7 @@ public interface DGPackage extends EPackage {
 		/**
 		 * The meta object literal for the '<em><b>Bounds</b></em>' containment reference feature.
 		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference RECTANGLE__BOUNDS = eINSTANCE.getRectangle_Bounds();
@@ -6948,13 +7358,13 @@ public interface DGPackage extends EPackage {
 		/**
 		 * The meta object literal for the '<em><b>Corner Radius</b></em>' attribute feature.
 		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute RECTANGLE__CORNER_RADIUS = eINSTANCE.getRectangle_CornerRadius();
 
 		/**
-		 * The meta object literal for the '
-		 * <em><b>Non Negative Corner Radius</b></em>' operation. <!--
+		 * The meta object literal for the ' <em><b>Non Negative Corner Radius</b></em>' operation. <!--
 		 * begin-user-doc --> <!-- end-user-doc -->
 		 * 
 		 * @generated
@@ -6965,6 +7375,7 @@ public interface DGPackage extends EPackage {
 		 * The meta object literal for the '{@link org.eclipse.papyrus.dd.dg.impl.RootCanvasImpl <em>Root Canvas</em>}' class.
 		 * <!-- begin-user-doc --> <!--
 		 * end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.dd.dg.impl.RootCanvasImpl
 		 * @see org.eclipse.papyrus.dd.dg.impl.DGPackageImpl#getRootCanvas()
 		 * @generated
@@ -6974,6 +7385,7 @@ public interface DGPackage extends EPackage {
 		/**
 		 * The meta object literal for the '<em><b>Background Color</b></em>' attribute feature.
 		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute ROOT_CANVAS__BACKGROUND_COLOR = eINSTANCE.getRootCanvas_BackgroundColor();
@@ -6982,13 +7394,13 @@ public interface DGPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Definitions</b></em>' containment reference feature.
 		 * <!-- begin-user-doc --> <!--
 		 * end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference ROOT_CANVAS__DEFINITIONS = eINSTANCE.getRootCanvas_Definitions();
 
 		/**
-		 * The meta object literal for the '<em><b>External Style Sheet</b></em>
-		 * ' reference list feature. <!-- begin-user-doc --> <!-- end-user-doc
+		 * The meta object literal for the '<em><b>External Style Sheet</b></em> ' reference list feature. <!-- begin-user-doc --> <!-- end-user-doc
 		 * -->
 		 * 
 		 * @generated
@@ -6999,6 +7411,7 @@ public interface DGPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Script</b></em>' attribute list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute ROOT_CANVAS__SCRIPT = eINSTANCE.getRootCanvas_Script();
@@ -7006,6 +7419,7 @@ public interface DGPackage extends EPackage {
 		/**
 		 * The meta object literal for the '{@link org.eclipse.papyrus.dd.dg.impl.RotateImpl <em>Rotate</em>}' class.
 		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.dd.dg.impl.RotateImpl
 		 * @see org.eclipse.papyrus.dd.dg.impl.DGPackageImpl#getRotate()
 		 * @generated
@@ -7015,6 +7429,7 @@ public interface DGPackage extends EPackage {
 		/**
 		 * The meta object literal for the '<em><b>Angle</b></em>' attribute feature.
 		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute ROTATE__ANGLE = eINSTANCE.getRotate_Angle();
@@ -7022,6 +7437,7 @@ public interface DGPackage extends EPackage {
 		/**
 		 * The meta object literal for the '<em><b>Center</b></em>' containment reference feature.
 		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference ROTATE__CENTER = eINSTANCE.getRotate_Center();
@@ -7029,6 +7445,7 @@ public interface DGPackage extends EPackage {
 		/**
 		 * The meta object literal for the '{@link org.eclipse.papyrus.dd.dg.impl.ScaleImpl <em>Scale</em>}' class.
 		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.dd.dg.impl.ScaleImpl
 		 * @see org.eclipse.papyrus.dd.dg.impl.DGPackageImpl#getScale()
 		 * @generated
@@ -7038,6 +7455,7 @@ public interface DGPackage extends EPackage {
 		/**
 		 * The meta object literal for the '<em><b>Factor X</b></em>' attribute feature.
 		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute SCALE__FACTOR_X = eINSTANCE.getScale_FactorX();
@@ -7045,6 +7463,7 @@ public interface DGPackage extends EPackage {
 		/**
 		 * The meta object literal for the '<em><b>Factor Y</b></em>' attribute feature.
 		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute SCALE__FACTOR_Y = eINSTANCE.getScale_FactorY();
@@ -7052,6 +7471,7 @@ public interface DGPackage extends EPackage {
 		/**
 		 * The meta object literal for the '<em><b>Nonnegativescale</b></em>' operation.
 		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EOperation SCALE___NONNEGATIVESCALE__DIAGNOSTICCHAIN_MAP = eINSTANCE.getScale__Nonnegativescale__DiagnosticChain_Map();
@@ -7059,6 +7479,7 @@ public interface DGPackage extends EPackage {
 		/**
 		 * The meta object literal for the '{@link org.eclipse.papyrus.dd.dg.impl.SkewImpl <em>Skew</em>}' class.
 		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.dd.dg.impl.SkewImpl
 		 * @see org.eclipse.papyrus.dd.dg.impl.DGPackageImpl#getSkew()
 		 * @generated
@@ -7068,6 +7489,7 @@ public interface DGPackage extends EPackage {
 		/**
 		 * The meta object literal for the '<em><b>Angle X</b></em>' attribute feature.
 		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute SKEW__ANGLE_X = eINSTANCE.getSkew_AngleX();
@@ -7075,6 +7497,7 @@ public interface DGPackage extends EPackage {
 		/**
 		 * The meta object literal for the '<em><b>Angle Y</b></em>' attribute feature.
 		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute SKEW__ANGLE_Y = eINSTANCE.getSkew_AngleY();
@@ -7082,6 +7505,7 @@ public interface DGPackage extends EPackage {
 		/**
 		 * The meta object literal for the '{@link org.eclipse.papyrus.dd.dg.impl.TextImpl <em>Text</em>}' class.
 		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.dd.dg.impl.TextImpl
 		 * @see org.eclipse.papyrus.dd.dg.impl.DGPackageImpl#getText()
 		 * @generated
@@ -7091,6 +7515,7 @@ public interface DGPackage extends EPackage {
 		/**
 		 * The meta object literal for the '<em><b>Data</b></em>' attribute feature.
 		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute TEXT__DATA = eINSTANCE.getText_Data();
@@ -7099,6 +7524,7 @@ public interface DGPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Position</b></em>' containment reference feature.
 		 * <!-- begin-user-doc --> <!--
 		 * end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference TEXT__POSITION = eINSTANCE.getText_Position();
@@ -7107,6 +7533,7 @@ public interface DGPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Anchor</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute TEXT__ANCHOR = eINSTANCE.getText_Anchor();
@@ -7114,13 +7541,13 @@ public interface DGPackage extends EPackage {
 		/**
 		 * The meta object literal for the '<em><b>Data Cannot Be Empty</b></em>' operation.
 		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EOperation TEXT___DATA_CANNOT_BE_EMPTY__DIAGNOSTICCHAIN_MAP = eINSTANCE.getText__DataCannotBeEmpty__DiagnosticChain_Map();
 
 		/**
-		 * The meta object literal for the '
-		 * {@link org.eclipse.papyrus.dd.dg.impl.TranslateImpl
+		 * The meta object literal for the ' {@link org.eclipse.papyrus.dd.dg.impl.TranslateImpl
 		 * <em>Translate</em>}' class. <!-- begin-user-doc --> <!-- end-user-doc
 		 * -->
 		 * 
@@ -7133,6 +7560,7 @@ public interface DGPackage extends EPackage {
 		/**
 		 * The meta object literal for the '<em><b>Delta X</b></em>' attribute feature.
 		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute TRANSLATE__DELTA_X = eINSTANCE.getTranslate_DeltaX();
@@ -7140,6 +7568,7 @@ public interface DGPackage extends EPackage {
 		/**
 		 * The meta object literal for the '<em><b>Delta Y</b></em>' attribute feature.
 		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute TRANSLATE__DELTA_Y = eINSTANCE.getTranslate_DeltaY();
@@ -7147,6 +7576,7 @@ public interface DGPackage extends EPackage {
 		/**
 		 * The meta object literal for the '{@link org.eclipse.papyrus.dd.dg.impl.UseImpl <em>Use</em>}' class.
 		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.dd.dg.impl.UseImpl
 		 * @see org.eclipse.papyrus.dd.dg.impl.DGPackageImpl#getUse()
 		 * @generated
@@ -7156,6 +7586,7 @@ public interface DGPackage extends EPackage {
 		/**
 		 * The meta object literal for the '<em><b>Bounds</b></em>' containment reference feature.
 		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference USE__BOUNDS = eINSTANCE.getUse_Bounds();
@@ -7163,13 +7594,13 @@ public interface DGPackage extends EPackage {
 		/**
 		 * The meta object literal for the '<em><b>Referenced Element</b></em>' reference feature.
 		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference USE__REFERENCED_ELEMENT = eINSTANCE.getUse_ReferencedElement();
 
 		/**
-		 * The meta object literal for the '
-		 * <em><b>Referenced Element Has Id</b></em>' operation. <!--
+		 * The meta object literal for the ' <em><b>Referenced Element Has Id</b></em>' operation. <!--
 		 * begin-user-doc --> <!-- end-user-doc -->
 		 * 
 		 * @generated
@@ -7180,6 +7611,7 @@ public interface DGPackage extends EPackage {
 		 * The meta object literal for the '{@link org.eclipse.papyrus.dd.dg.FontDecoration <em>Font Decoration</em>}' enum.
 		 * <!-- begin-user-doc --> <!--
 		 * end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.dd.dg.FontDecoration
 		 * @see org.eclipse.papyrus.dd.dg.impl.DGPackageImpl#getFontDecoration()
 		 * @generated
@@ -7189,6 +7621,7 @@ public interface DGPackage extends EPackage {
 		/**
 		 * The meta object literal for the '{@link org.eclipse.papyrus.dd.dg.ElementKind <em>Element Kind</em>}' enum.
 		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.dd.dg.ElementKind
 		 * @see org.eclipse.papyrus.dd.dg.impl.DGPackageImpl#getElementKind()
 		 * @generated
@@ -7199,12 +7632,11 @@ public interface DGPackage extends EPackage {
 		 * The meta object literal for the '{@link org.eclipse.papyrus.dd.dg.TextAnchor <em>Text Anchor</em>}' enum.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.dd.dg.TextAnchor
 		 * @see org.eclipse.papyrus.dd.dg.impl.DGPackageImpl#getTextAnchor()
 		 * @generated
 		 */
 		EEnum TEXT_ANCHOR = eINSTANCE.getTextAnchor();
-
 	}
-
 } // DGPackage
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Definition.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Definition.java
index 2a025cbbb9b..de9e0e30222 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Definition.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Definition.java
@@ -16,21 +16,21 @@ import org.eclipse.emf.common.util.DiagnosticChain;
 import org.eclipse.emf.ecore.EObject;
 
 /**
- * <!-- begin-user-doc --> A representation of the model object '
- * <em><b>Definition</b></em>'. <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object ' <em><b>Definition</b></em>'. <!-- end-user-doc -->
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.dd.dg.Definition#getId <em>Id</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.Definition#getId <em>Id</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.dd.dg.DGPackage#getDefinition()
  * @model abstract="true"
  * @generated
  */
 public interface Definition extends EObject {
+
 	/**
 	 * Returns the value of the '<em><b>Id</b></em>' attribute. <!--
 	 * begin-user-doc --> <!-- end-user-doc --> <!-- begin-model-doc --> a point
@@ -48,7 +48,9 @@ public interface Definition extends EObject {
 	/**
 	 * Sets the value of the '{@link org.eclipse.papyrus.dd.dg.Definition#getId <em>Id</em>}' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Id</em>' attribute.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Id</em>' attribute.
 	 * @see #getId()
 	 * @generated
 	 */
@@ -58,15 +60,13 @@ public interface Definition extends EObject {
 	 * <!-- begin-user-doc --> <!-- end-user-doc --> <!-- begin-model-doc -->
 	 * 
 	 * @param diagnostics
-	 *            The chain of diagnostics to which problems are to be appended.
+	 *        The chain of diagnostics to which problems are to be appended.
 	 * @param context
-	 *            The cache of context-specific information. <!-- end-model-doc
-	 *            -->
+	 *        The cache of context-specific information. <!-- end-model-doc
+	 *        -->
 	 * @model annotation=
 	 *        "http://www.eclipse.org/emf/2002/Ecore/OCL body='id->notEmpty() implies id.size() > 0'"
 	 * @generated
 	 */
-	boolean idCannotBeEmpty(DiagnosticChain diagnostics,
-			Map<Object, Object> context);
-
+	boolean idCannotBeEmpty(DiagnosticChain diagnostics, Map<Object, Object> context);
 } // Definition
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Definitions.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Definitions.java
index af071d48561..9efd2ba5983 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Definitions.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Definitions.java
@@ -16,26 +16,25 @@ import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EObject;
 
 /**
- * <!-- begin-user-doc --> A representation of the model object '
- * <em><b>Definitions</b></em>'. <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object ' <em><b>Definitions</b></em>'. <!-- end-user-doc -->
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.dd.dg.Definitions#getDefnitions <em>Defnition</em>}</li>
- *   <li>{@link org.eclipse.papyrus.dd.dg.Definitions#getStyleSheet <em>Style Sheet</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.Definitions#getDefnitions <em>Defnition</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.Definitions#getStyleSheet <em>Style Sheet</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.dd.dg.DGPackage#getDefinitions()
  * @model
  * @generated
  */
 public interface Definitions extends EObject {
+
 	/**
 	 * Returns the value of the '<em><b>Defnition</b></em>' containment
-	 * reference list. The list contents are of type
-	 * {@link org.eclipse.papyrus.dd.dg.Definition}. <!-- begin-user-doc -->
+	 * reference list. The list contents are of type {@link org.eclipse.papyrus.dd.dg.Definition}. <!-- begin-user-doc -->
 	 * <!-- end-user-doc --> <!-- begin-model-doc --> A set of clip paths that
 	 * are referenced by graphical elements in the containing canvas. <!--
 	 * end-model-doc -->
@@ -65,10 +64,11 @@ public interface Definitions extends EObject {
 	 * Sets the value of the '{@link org.eclipse.papyrus.dd.dg.Definitions#getStyleSheet <em>Style Sheet</em>}' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Style Sheet</em>' containment reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Style Sheet</em>' containment reference.
 	 * @see #getStyleSheet()
 	 * @generated
 	 */
 	void setStyleSheet(StyleSheet value);
-
 } // Definitions
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/ElementKind.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/ElementKind.java
index a7c7fee32aa..3bfc506466f 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/ElementKind.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/ElementKind.java
@@ -18,9 +18,10 @@ import java.util.List;
 import org.eclipse.emf.common.util.Enumerator;
 
 /**
- * <!-- begin-user-doc --> A representation of the literals of the enumeration '
- * <em><b>Element Kind</b></em>', and utility methods for working with them.
+ * <!-- begin-user-doc --> A representation of the literals of the enumeration ' <em><b>Element Kind</b></em>', and utility methods for working with
+ * them.
  * <!-- end-user-doc -->
+ * 
  * @see org.eclipse.papyrus.dd.dg.DGPackage#getElementKind()
  * @model
  * @generated
@@ -30,136 +31,137 @@ public enum ElementKind implements Enumerator {
 	 * The '<em><b>Canvas</b></em>' literal object.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @see #CANVAS_VALUE
 	 * @generated
 	 * @ordered
 	 */
 	CANVAS(0, "canvas", "canvas"),
-
 	/**
 	 * The '<em><b>Circle</b></em>' literal object.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @see #CIRCLE_VALUE
 	 * @generated
 	 * @ordered
 	 */
 	CIRCLE(1, "circle", "circle"),
-
 	/**
 	 * The '<em><b>Clip Path</b></em>' literal object.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #CLIP_PATH_VALUE
 	 * @generated
 	 * @ordered
 	 */
 	CLIP_PATH(2, "clipPath", "clipPath"),
-
 	/**
 	 * The '<em><b>Ellipse</b></em>' literal object.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #ELLIPSE_VALUE
 	 * @generated
 	 * @ordered
 	 */
 	ELLIPSE(3, "ellipse", "ellipse"),
-
 	/**
 	 * The '<em><b>Group</b></em>' literal object.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @see #GROUP_VALUE
 	 * @generated
 	 * @ordered
 	 */
 	GROUP(4, "group", "group"),
-
 	/**
 	 * The '<em><b>Image</b></em>' literal object.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @see #IMAGE_VALUE
 	 * @generated
 	 * @ordered
 	 */
 	IMAGE(5, "image", "image"),
-
 	/**
 	 * The '<em><b>Line</b></em>' literal object.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @see #LINE_VALUE
 	 * @generated
 	 * @ordered
 	 */
 	LINE(6, "line", "line"),
-
 	/**
 	 * The '<em><b>Marker</b></em>' literal object.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @see #MARKER_VALUE
 	 * @generated
 	 * @ordered
 	 */
 	MARKER(7, "marker", "marker"),
-
 	/**
 	 * The '<em><b>Path</b></em>' literal object.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @see #PATH_VALUE
 	 * @generated
 	 * @ordered
 	 */
 	PATH(8, "path", "path"),
-
 	/**
 	 * The '<em><b>Polygon</b></em>' literal object.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #POLYGON_VALUE
 	 * @generated
 	 * @ordered
 	 */
 	POLYGON(9, "polygon", "polygon"),
-
 	/**
 	 * The '<em><b>Polyline</b></em>' literal object.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #POLYLINE_VALUE
 	 * @generated
 	 * @ordered
 	 */
 	POLYLINE(10, "polyline", "polyline"),
-
 	/**
 	 * The '<em><b>Rectangle</b></em>' literal object.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #RECTANGLE_VALUE
 	 * @generated
 	 * @ordered
 	 */
 	RECTANGLE(11, "rectangle", "rectangle"),
-
 	/**
 	 * The '<em><b>Text</b></em>' literal object.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @see #TEXT_VALUE
 	 * @generated
 	 * @ordered
 	 */
 	TEXT(12, "text", "text"),
-
 	/**
 	 * The '<em><b>Use</b></em>' literal object.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @see #USE_VALUE
 	 * @generated
 	 * @ordered
@@ -170,10 +172,10 @@ public enum ElementKind implements Enumerator {
 	 * The '<em><b>Canvas</b></em>' literal value.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of '<em><b>Canvas</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of '<em><b>Canvas</b></em>' literal object isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #CANVAS
 	 * @model name="canvas"
 	 * @generated
@@ -185,10 +187,10 @@ public enum ElementKind implements Enumerator {
 	 * The '<em><b>Circle</b></em>' literal value.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of '<em><b>Circle</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of '<em><b>Circle</b></em>' literal object isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #CIRCLE
 	 * @model name="circle"
 	 * @generated
@@ -200,10 +202,10 @@ public enum ElementKind implements Enumerator {
 	 * The '<em><b>Clip Path</b></em>' literal value.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of '<em><b>Clip Path</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of '<em><b>Clip Path</b></em>' literal object isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #CLIP_PATH
 	 * @model name="clipPath"
 	 * @generated
@@ -215,10 +217,10 @@ public enum ElementKind implements Enumerator {
 	 * The '<em><b>Ellipse</b></em>' literal value.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of '<em><b>Ellipse</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of '<em><b>Ellipse</b></em>' literal object isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #ELLIPSE
 	 * @model name="ellipse"
 	 * @generated
@@ -230,10 +232,10 @@ public enum ElementKind implements Enumerator {
 	 * The '<em><b>Group</b></em>' literal value.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of '<em><b>Group</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of '<em><b>Group</b></em>' literal object isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #GROUP
 	 * @model name="group"
 	 * @generated
@@ -245,10 +247,10 @@ public enum ElementKind implements Enumerator {
 	 * The '<em><b>Image</b></em>' literal value.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of '<em><b>Image</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of '<em><b>Image</b></em>' literal object isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #IMAGE
 	 * @model name="image"
 	 * @generated
@@ -260,10 +262,10 @@ public enum ElementKind implements Enumerator {
 	 * The '<em><b>Line</b></em>' literal value.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of '<em><b>Line</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of '<em><b>Line</b></em>' literal object isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #LINE
 	 * @model name="line"
 	 * @generated
@@ -275,10 +277,10 @@ public enum ElementKind implements Enumerator {
 	 * The '<em><b>Marker</b></em>' literal value.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of '<em><b>Marker</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of '<em><b>Marker</b></em>' literal object isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #MARKER
 	 * @model name="marker"
 	 * @generated
@@ -290,10 +292,10 @@ public enum ElementKind implements Enumerator {
 	 * The '<em><b>Path</b></em>' literal value.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of '<em><b>Path</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of '<em><b>Path</b></em>' literal object isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #PATH
 	 * @model name="path"
 	 * @generated
@@ -305,10 +307,10 @@ public enum ElementKind implements Enumerator {
 	 * The '<em><b>Polygon</b></em>' literal value.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of '<em><b>Polygon</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of '<em><b>Polygon</b></em>' literal object isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #POLYGON
 	 * @model name="polygon"
 	 * @generated
@@ -320,10 +322,10 @@ public enum ElementKind implements Enumerator {
 	 * The '<em><b>Polyline</b></em>' literal value.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of '<em><b>Polyline</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of '<em><b>Polyline</b></em>' literal object isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #POLYLINE
 	 * @model name="polyline"
 	 * @generated
@@ -335,10 +337,10 @@ public enum ElementKind implements Enumerator {
 	 * The '<em><b>Rectangle</b></em>' literal value.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of '<em><b>Rectangle</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of '<em><b>Rectangle</b></em>' literal object isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #RECTANGLE
 	 * @model name="rectangle"
 	 * @generated
@@ -350,10 +352,10 @@ public enum ElementKind implements Enumerator {
 	 * The '<em><b>Text</b></em>' literal value.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of '<em><b>Text</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of '<em><b>Text</b></em>' literal object isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #TEXT
 	 * @model name="text"
 	 * @generated
@@ -365,10 +367,10 @@ public enum ElementKind implements Enumerator {
 	 * The '<em><b>Use</b></em>' literal value.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of '<em><b>Use</b></em>' literal object isn't clear, there
-	 * really should be more of a description here...
+	 * If the meaning of '<em><b>Use</b></em>' literal object isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #USE
 	 * @model name="use"
 	 * @generated
@@ -382,26 +384,12 @@ public enum ElementKind implements Enumerator {
 	 * 
 	 * @generated
 	 */
-	private static final ElementKind[] VALUES_ARRAY = new ElementKind[] {
-			CANVAS,
-			CIRCLE,
-			CLIP_PATH,
-			ELLIPSE,
-			GROUP,
-			IMAGE,
-			LINE,
-			MARKER,
-			PATH,
-			POLYGON,
-			POLYLINE,
-			RECTANGLE,
-			TEXT,
-			USE,
-		};
+	private static final ElementKind[] VALUES_ARRAY = new ElementKind[]{ CANVAS, CIRCLE, CLIP_PATH, ELLIPSE, GROUP, IMAGE, LINE, MARKER, PATH, POLYGON, POLYLINE, RECTANGLE, TEXT, USE, };
 
 	/**
 	 * A public read-only list of all the '<em><b>Element Kind</b></em>' enumerators.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static final List<ElementKind> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
@@ -409,12 +397,13 @@ public enum ElementKind implements Enumerator {
 	/**
 	 * Returns the '<em><b>Element Kind</b></em>' literal with the specified literal value.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static ElementKind get(String literal) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+		for(int i = 0; i < VALUES_ARRAY.length; ++i) {
 			ElementKind result = VALUES_ARRAY[i];
-			if (result.toString().equals(literal)) {
+			if(result.toString().equals(literal)) {
 				return result;
 			}
 		}
@@ -424,12 +413,13 @@ public enum ElementKind implements Enumerator {
 	/**
 	 * Returns the '<em><b>Element Kind</b></em>' literal with the specified name.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static ElementKind getByName(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+		for(int i = 0; i < VALUES_ARRAY.length; ++i) {
 			ElementKind result = VALUES_ARRAY[i];
-			if (result.getName().equals(name)) {
+			if(result.getName().equals(name)) {
 				return result;
 			}
 		}
@@ -439,42 +429,60 @@ public enum ElementKind implements Enumerator {
 	/**
 	 * Returns the '<em><b>Element Kind</b></em>' literal with the specified integer value.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static ElementKind get(int value) {
-		switch (value) {
-			case CANVAS_VALUE: return CANVAS;
-			case CIRCLE_VALUE: return CIRCLE;
-			case CLIP_PATH_VALUE: return CLIP_PATH;
-			case ELLIPSE_VALUE: return ELLIPSE;
-			case GROUP_VALUE: return GROUP;
-			case IMAGE_VALUE: return IMAGE;
-			case LINE_VALUE: return LINE;
-			case MARKER_VALUE: return MARKER;
-			case PATH_VALUE: return PATH;
-			case POLYGON_VALUE: return POLYGON;
-			case POLYLINE_VALUE: return POLYLINE;
-			case RECTANGLE_VALUE: return RECTANGLE;
-			case TEXT_VALUE: return TEXT;
-			case USE_VALUE: return USE;
+		switch(value) {
+		case CANVAS_VALUE:
+			return CANVAS;
+		case CIRCLE_VALUE:
+			return CIRCLE;
+		case CLIP_PATH_VALUE:
+			return CLIP_PATH;
+		case ELLIPSE_VALUE:
+			return ELLIPSE;
+		case GROUP_VALUE:
+			return GROUP;
+		case IMAGE_VALUE:
+			return IMAGE;
+		case LINE_VALUE:
+			return LINE;
+		case MARKER_VALUE:
+			return MARKER;
+		case PATH_VALUE:
+			return PATH;
+		case POLYGON_VALUE:
+			return POLYGON;
+		case POLYLINE_VALUE:
+			return POLYLINE;
+		case RECTANGLE_VALUE:
+			return RECTANGLE;
+		case TEXT_VALUE:
+			return TEXT;
+		case USE_VALUE:
+			return USE;
 		}
 		return null;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private final int value;
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private final String name;
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private final String literal;
@@ -483,6 +491,7 @@ public enum ElementKind implements Enumerator {
 	 * Only this class can construct instances.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private ElementKind(int value, String name, String literal) {
@@ -493,36 +502,39 @@ public enum ElementKind implements Enumerator {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public int getValue() {
-	  return value;
+		return value;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getName() {
-	  return name;
+		return name;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getLiteral() {
-	  return literal;
+		return literal;
 	}
 
 	/**
 	 * Returns the literal value of the enumerator, which is its string representation.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
 		return literal;
 	}
-
 } // ElementKind
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Ellipse.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Ellipse.java
index f2c2876c13c..6cbc4b5f06f 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Ellipse.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Ellipse.java
@@ -15,26 +15,26 @@ import org.eclipse.papyrus.dd.dc.Dimension;
 import org.eclipse.papyrus.dd.dc.Point;
 
 /**
- * <!-- begin-user-doc --> A representation of the model object '
- * <em><b>Ellipse</b></em>'. <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object ' <em><b>Ellipse</b></em>'. <!-- end-user-doc -->
+ * 
  * <!-- begin-model-doc -->
  * Ellipse is a graphical element that defines an elliptical shape with a given center point and two radii on the x and y axes.
  * <!-- end-model-doc -->
- *
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.dd.dg.Ellipse#getCenter <em>Center</em>}</li>
- *   <li>{@link org.eclipse.papyrus.dd.dg.Ellipse#getRadii <em>Radii</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.Ellipse#getCenter <em>Center</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.Ellipse#getRadii <em>Radii</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.dd.dg.DGPackage#getEllipse()
  * @model
  * @generated
  */
 public interface Ellipse extends GraphicalElement {
+
 	/**
 	 * Returns the value of the '<em><b>Center</b></em>' containment reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc --> <!-- begin-model-doc -->
@@ -52,7 +52,9 @@ public interface Ellipse extends GraphicalElement {
 	/**
 	 * Sets the value of the '{@link org.eclipse.papyrus.dd.dg.Ellipse#getCenter <em>Center</em>}' containment reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Center</em>' containment reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Center</em>' containment reference.
 	 * @see #getCenter()
 	 * @generated
 	 */
@@ -76,10 +78,11 @@ public interface Ellipse extends GraphicalElement {
 	 * Sets the value of the '{@link org.eclipse.papyrus.dd.dg.Ellipse#getRadii <em>Radii</em>}' containment reference.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * @param value the new value of the '<em>Radii</em>' containment reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Radii</em>' containment reference.
 	 * @see #getRadii()
 	 * @generated
 	 */
 	void setRadii(Dimension value);
-
 } // Ellipse
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/EllipticalArcTo.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/EllipticalArcTo.java
index 0c1ebb98cb2..4080b89b868 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/EllipticalArcTo.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/EllipticalArcTo.java
@@ -15,25 +15,25 @@ import org.eclipse.papyrus.dd.dc.Dimension;
 import org.eclipse.papyrus.dd.dc.Point;
 
 /**
- * <!-- begin-user-doc --> A representation of the model object '
- * <em><b>Elliptical Arc To</b></em>'. <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object ' <em><b>Elliptical Arc To</b></em>'. <!-- end-user-doc -->
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.dd.dg.EllipticalArcTo#getRadii <em>Radii</em>}</li>
- *   <li>{@link org.eclipse.papyrus.dd.dg.EllipticalArcTo#getRotation <em>Rotation</em>}</li>
- *   <li>{@link org.eclipse.papyrus.dd.dg.EllipticalArcTo#isLargeArc <em>Is Large Arc</em>}</li>
- *   <li>{@link org.eclipse.papyrus.dd.dg.EllipticalArcTo#isSweep <em>Is Sweep</em>}</li>
- *   <li>{@link org.eclipse.papyrus.dd.dg.EllipticalArcTo#getPoint <em>Point</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.EllipticalArcTo#getRadii <em>Radii</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.EllipticalArcTo#getRotation <em>Rotation</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.EllipticalArcTo#isLargeArc <em>Is Large Arc</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.EllipticalArcTo#isSweep <em>Is Sweep</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.EllipticalArcTo#getPoint <em>Point</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.dd.dg.DGPackage#getEllipticalArcTo()
  * @model
  * @generated
  */
 public interface EllipticalArcTo extends PathCommand {
+
 	/**
 	 * Returns the value of the '<em><b>Radii</b></em>' containment reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc --> <!-- begin-model-doc -->
@@ -51,7 +51,9 @@ public interface EllipticalArcTo extends PathCommand {
 	/**
 	 * Sets the value of the '{@link org.eclipse.papyrus.dd.dg.EllipticalArcTo#getRadii <em>Radii</em>}' containment reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Radii</em>' containment reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Radii</em>' containment reference.
 	 * @see #getRadii()
 	 * @generated
 	 */
@@ -73,13 +75,12 @@ public interface EllipticalArcTo extends PathCommand {
 	double getRotation();
 
 	/**
-	 * Sets the value of the '
-	 * {@link org.eclipse.papyrus.dd.dg.EllipticalArcTo#getRotation
+	 * Sets the value of the ' {@link org.eclipse.papyrus.dd.dg.EllipticalArcTo#getRotation
 	 * <em>Rotation</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
 	 * -->
 	 * 
 	 * @param value
-	 *            the new value of the '<em>Rotation</em>' attribute.
+	 *        the new value of the '<em>Rotation</em>' attribute.
 	 * @see #getRotation()
 	 * @generated
 	 */
@@ -104,7 +105,9 @@ public interface EllipticalArcTo extends PathCommand {
 	 * Sets the value of the '{@link org.eclipse.papyrus.dd.dg.EllipticalArcTo#isLargeArc <em>Is Large Arc</em>}' attribute.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * @param value the new value of the '<em>Is Large Arc</em>' attribute.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Is Large Arc</em>' attribute.
 	 * @see #isLargeArc()
 	 * @generated
 	 */
@@ -125,13 +128,12 @@ public interface EllipticalArcTo extends PathCommand {
 	boolean isSweep();
 
 	/**
-	 * Sets the value of the '
-	 * {@link org.eclipse.papyrus.dd.dg.EllipticalArcTo#isSweep
+	 * Sets the value of the ' {@link org.eclipse.papyrus.dd.dg.EllipticalArcTo#isSweep
 	 * <em>Is Sweep</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
 	 * -->
 	 * 
 	 * @param value
-	 *            the new value of the '<em>Is Sweep</em>' attribute.
+	 *        the new value of the '<em>Is Sweep</em>' attribute.
 	 * @see #isSweep()
 	 * @generated
 	 */
@@ -154,10 +156,11 @@ public interface EllipticalArcTo extends PathCommand {
 	/**
 	 * Sets the value of the '{@link org.eclipse.papyrus.dd.dg.EllipticalArcTo#getPoint <em>Point</em>}' containment reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Point</em>' containment reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Point</em>' containment reference.
 	 * @see #getPoint()
 	 * @generated
 	 */
 	void setPoint(Point value);
-
 } // EllipticalArcTo
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/FontDecoration.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/FontDecoration.java
index 299a0162a7f..4e47d5b2c4c 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/FontDecoration.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/FontDecoration.java
@@ -18,9 +18,10 @@ import java.util.List;
 import org.eclipse.emf.common.util.Enumerator;
 
 /**
- * <!-- begin-user-doc --> A representation of the literals of the enumeration '
- * <em><b>Font Decoration</b></em>', and utility methods for working with them.
+ * <!-- begin-user-doc --> A representation of the literals of the enumeration ' <em><b>Font Decoration</b></em>', and utility methods for working
+ * with them.
  * <!-- end-user-doc -->
+ * 
  * @see org.eclipse.papyrus.dd.dg.DGPackage#getFontDecoration()
  * @model
  * @generated
@@ -30,26 +31,27 @@ public enum FontDecoration implements Enumerator {
 	 * The '<em><b>Underline</b></em>' literal object.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #UNDERLINE_VALUE
 	 * @generated
 	 * @ordered
 	 */
 	UNDERLINE(0, "underline", "underline"),
-
 	/**
 	 * The '<em><b>Overline</b></em>' literal object.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #OVERLINE_VALUE
 	 * @generated
 	 * @ordered
 	 */
 	OVERLINE(1, "overline", "overline"),
-
 	/**
 	 * The '<em><b>Line Through</b></em>' literal object.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @see #LINE_THROUGH_VALUE
 	 * @generated
 	 * @ordered
@@ -60,10 +62,10 @@ public enum FontDecoration implements Enumerator {
 	 * The '<em><b>Underline</b></em>' literal value.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of '<em><b>Underline</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of '<em><b>Underline</b></em>' literal object isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #UNDERLINE
 	 * @model name="underline"
 	 * @generated
@@ -75,10 +77,10 @@ public enum FontDecoration implements Enumerator {
 	 * The '<em><b>Overline</b></em>' literal value.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of '<em><b>Overline</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of '<em><b>Overline</b></em>' literal object isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #OVERLINE
 	 * @model name="overline"
 	 * @generated
@@ -90,10 +92,10 @@ public enum FontDecoration implements Enumerator {
 	 * The '<em><b>Line Through</b></em>' literal value.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of '<em><b>Line Through</b></em>' literal object isn't
-	 * clear, there really should be more of a description here...
+	 * If the meaning of '<em><b>Line Through</b></em>' literal object isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #LINE_THROUGH
 	 * @model name="lineThrough"
 	 * @generated
@@ -107,15 +109,12 @@ public enum FontDecoration implements Enumerator {
 	 * 
 	 * @generated
 	 */
-	private static final FontDecoration[] VALUES_ARRAY = new FontDecoration[] {
-			UNDERLINE,
-			OVERLINE,
-			LINE_THROUGH,
-		};
+	private static final FontDecoration[] VALUES_ARRAY = new FontDecoration[]{ UNDERLINE, OVERLINE, LINE_THROUGH, };
 
 	/**
 	 * A public read-only list of all the '<em><b>Font Decoration</b></em>' enumerators.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static final List<FontDecoration> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
@@ -123,12 +122,13 @@ public enum FontDecoration implements Enumerator {
 	/**
 	 * Returns the '<em><b>Font Decoration</b></em>' literal with the specified literal value.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static FontDecoration get(String literal) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+		for(int i = 0; i < VALUES_ARRAY.length; ++i) {
 			FontDecoration result = VALUES_ARRAY[i];
-			if (result.toString().equals(literal)) {
+			if(result.toString().equals(literal)) {
 				return result;
 			}
 		}
@@ -138,12 +138,13 @@ public enum FontDecoration implements Enumerator {
 	/**
 	 * Returns the '<em><b>Font Decoration</b></em>' literal with the specified name.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static FontDecoration getByName(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+		for(int i = 0; i < VALUES_ARRAY.length; ++i) {
 			FontDecoration result = VALUES_ARRAY[i];
-			if (result.getName().equals(name)) {
+			if(result.getName().equals(name)) {
 				return result;
 			}
 		}
@@ -153,31 +154,38 @@ public enum FontDecoration implements Enumerator {
 	/**
 	 * Returns the '<em><b>Font Decoration</b></em>' literal with the specified integer value.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static FontDecoration get(int value) {
-		switch (value) {
-			case UNDERLINE_VALUE: return UNDERLINE;
-			case OVERLINE_VALUE: return OVERLINE;
-			case LINE_THROUGH_VALUE: return LINE_THROUGH;
+		switch(value) {
+		case UNDERLINE_VALUE:
+			return UNDERLINE;
+		case OVERLINE_VALUE:
+			return OVERLINE;
+		case LINE_THROUGH_VALUE:
+			return LINE_THROUGH;
 		}
 		return null;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private final int value;
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private final String name;
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private final String literal;
@@ -186,6 +194,7 @@ public enum FontDecoration implements Enumerator {
 	 * Only this class can construct instances.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private FontDecoration(int value, String name, String literal) {
@@ -196,36 +205,39 @@ public enum FontDecoration implements Enumerator {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public int getValue() {
-	  return value;
+		return value;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getName() {
-	  return name;
+		return name;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getLiteral() {
-	  return literal;
+		return literal;
 	}
 
 	/**
 	 * Returns the literal value of the enumerator, which is its string representation.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
 		return literal;
 	}
-
 } // FontDecoration
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Gradient.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Gradient.java
index 84537aae231..c9aa789332b 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Gradient.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Gradient.java
@@ -14,29 +14,28 @@ package org.eclipse.papyrus.dd.dg;
 import org.eclipse.emf.common.util.EList;
 
 /**
- * <!-- begin-user-doc --> A representation of the model object '
- * <em><b>Gradient</b></em>'. <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object ' <em><b>Gradient</b></em>'. <!-- end-user-doc -->
+ * 
  * <!-- begin-model-doc -->
  * Gradient is a kind of paint server that serves a continuously smooth color transition along the gradient range from one color to the next.
  * <!-- end-model-doc -->
- *
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.dd.dg.Gradient#getStops <em>Stop</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.Gradient#getStops <em>Stop</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.dd.dg.DGPackage#getGradient()
  * @model abstract="true"
  * @generated
  */
 public interface Gradient extends PaintServer {
+
 	/**
 	 * Returns the value of the '<em><b>Stop</b></em>' containment reference
-	 * list. The list contents are of type
-	 * {@link org.eclipse.papyrus.dd.dg.GradientStop}. <!-- begin-user-doc -->
+	 * list. The list contents are of type {@link org.eclipse.papyrus.dd.dg.GradientStop}. <!-- begin-user-doc -->
 	 * <!-- end-user-doc --> <!-- begin-model-doc --> a list of two or more
 	 * gradient stops defining the color transitions of the gradient. <!--
 	 * end-model-doc -->
@@ -47,5 +46,4 @@ public interface Gradient extends PaintServer {
 	 * @generated
 	 */
 	EList<GradientStop> getStops();
-
 } // Gradient
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/GradientStop.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/GradientStop.java
index f69cedf130f..27dc4f31466 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/GradientStop.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/GradientStop.java
@@ -20,27 +20,27 @@ import org.eclipse.emf.common.util.DiagnosticChain;
 import org.eclipse.emf.ecore.EObject;
 
 /**
- * <!-- begin-user-doc --> A representation of the model object '
- * <em><b>Gradient Stop</b></em>'. <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object ' <em><b>Gradient Stop</b></em>'. <!-- end-user-doc -->
+ * 
  * <!-- begin-model-doc -->
  * GradientStop defines a color transition along the distance from a gradient's start to its end offsets.
  * <!-- end-model-doc -->
- *
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.dd.dg.GradientStop#getColor <em>Color</em>}</li>
- *   <li>{@link org.eclipse.papyrus.dd.dg.GradientStop#getOffset <em>Offset</em>}</li>
- *   <li>{@link org.eclipse.papyrus.dd.dg.GradientStop#getOpacity <em>Opacity</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.GradientStop#getColor <em>Color</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.GradientStop#getOffset <em>Offset</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.GradientStop#getOpacity <em>Opacity</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.dd.dg.DGPackage#getGradientStop()
  * @model
  * @generated
  */
 public interface GradientStop extends EObject {
+
 	/**
 	 * Returns the value of the '<em><b>Color</b></em>' attribute. <!--
 	 * begin-user-doc --> <!-- end-user-doc --> <!-- begin-model-doc --> the
@@ -60,7 +60,9 @@ public interface GradientStop extends EObject {
 	/**
 	 * Sets the value of the '{@link org.eclipse.papyrus.dd.dg.GradientStop#getColor <em>Color</em>}' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Color</em>' attribute.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Color</em>' attribute.
 	 * @see #isSetColor()
 	 * @see #unsetColor()
 	 * @see #getColor()
@@ -71,6 +73,7 @@ public interface GradientStop extends EObject {
 	/**
 	 * Unsets the value of the '{@link org.eclipse.papyrus.dd.dg.GradientStop#getColor <em>Color</em>}' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isSetColor()
 	 * @see #getColor()
 	 * @see #setColor(Color)
@@ -81,6 +84,7 @@ public interface GradientStop extends EObject {
 	/**
 	 * Returns whether the value of the '{@link org.eclipse.papyrus.dd.dg.GradientStop#getColor <em>Color</em>}' attribute is set.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return whether the value of the '<em>Color</em>' attribute is set.
 	 * @see #unsetColor()
 	 * @see #getColor()
@@ -110,7 +114,9 @@ public interface GradientStop extends EObject {
 	/**
 	 * Sets the value of the '{@link org.eclipse.papyrus.dd.dg.GradientStop#getOffset <em>Offset</em>}' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Offset</em>' attribute.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Offset</em>' attribute.
 	 * @see #isSetOffset()
 	 * @see #unsetOffset()
 	 * @see #getOffset()
@@ -121,6 +127,7 @@ public interface GradientStop extends EObject {
 	/**
 	 * Unsets the value of the '{@link org.eclipse.papyrus.dd.dg.GradientStop#getOffset <em>Offset</em>}' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isSetOffset()
 	 * @see #getOffset()
 	 * @see #setOffset(double)
@@ -131,6 +138,7 @@ public interface GradientStop extends EObject {
 	/**
 	 * Returns whether the value of the '{@link org.eclipse.papyrus.dd.dg.GradientStop#getOffset <em>Offset</em>}' attribute is set.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return whether the value of the '<em>Offset</em>' attribute is set.
 	 * @see #unsetOffset()
 	 * @see #getOffset()
@@ -158,13 +166,12 @@ public interface GradientStop extends EObject {
 	double getOpacity();
 
 	/**
-	 * Sets the value of the '
-	 * {@link org.eclipse.papyrus.dd.dg.GradientStop#getOpacity
+	 * Sets the value of the ' {@link org.eclipse.papyrus.dd.dg.GradientStop#getOpacity
 	 * <em>Opacity</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
 	 * -->
 	 * 
 	 * @param value
-	 *            the new value of the '<em>Opacity</em>' attribute.
+	 *        the new value of the '<em>Opacity</em>' attribute.
 	 * @see #isSetOpacity()
 	 * @see #unsetOpacity()
 	 * @see #getOpacity()
@@ -173,8 +180,7 @@ public interface GradientStop extends EObject {
 	void setOpacity(double value);
 
 	/**
-	 * Unsets the value of the '
-	 * {@link org.eclipse.papyrus.dd.dg.GradientStop#getOpacity
+	 * Unsets the value of the ' {@link org.eclipse.papyrus.dd.dg.GradientStop#getOpacity
 	 * <em>Opacity</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
 	 * -->
 	 * 
@@ -189,6 +195,7 @@ public interface GradientStop extends EObject {
 	 * Returns whether the value of the '{@link org.eclipse.papyrus.dd.dg.GradientStop#getOpacity <em>Opacity</em>}' attribute is set.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @return whether the value of the '<em>Opacity</em>' attribute is set.
 	 * @see #unsetOpacity()
 	 * @see #getOpacity()
@@ -202,10 +209,10 @@ public interface GradientStop extends EObject {
 	 * the offset must be between 0 and 1.
 	 * 
 	 * @param diagnostics
-	 *            The chain of diagnostics to which problems are to be appended.
+	 *        The chain of diagnostics to which problems are to be appended.
 	 * @param context
-	 *            The cache of context-specific information. <!-- end-model-doc
-	 *            -->
+	 *        The cache of context-specific information. <!-- end-model-doc
+	 *        -->
 	 * @model annotation=
 	 *        "http://www.eclipse.org/emf/2002/Ecore/OCL body='offset>=0 and offset<=1'"
 	 * @generated
@@ -217,15 +224,13 @@ public interface GradientStop extends EObject {
 	 * the opacity must be between 0 and 1.
 	 * 
 	 * @param diagnostics
-	 *            The chain of diagnostics to which problems are to be appended.
+	 *        The chain of diagnostics to which problems are to be appended.
 	 * @param context
-	 *            The cache of context-specific information. <!-- end-model-doc
-	 *            -->
+	 *        The cache of context-specific information. <!-- end-model-doc
+	 *        -->
 	 * @model annotation=
 	 *        "http://www.eclipse.org/emf/2002/Ecore/OCL body='opacity>=0 and opacity<=1'"
 	 * @generated
 	 */
-	boolean validOpacity(DiagnosticChain diagnostics,
-			Map<Object, Object> context);
-
+	boolean validOpacity(DiagnosticChain diagnostics, Map<Object, Object> context);
 } // GradientStop
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/GraphicalElement.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/GraphicalElement.java
index 70aa8145c66..773d6e7487d 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/GraphicalElement.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/GraphicalElement.java
@@ -16,30 +16,30 @@ import org.eclipse.emf.common.util.DiagnosticChain;
 import org.eclipse.emf.common.util.EList;
 
 /**
- * <!-- begin-user-doc --> A representation of the model object '
- * <em><b>Graphical Element</b></em>'. <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object ' <em><b>Graphical Element</b></em>'. <!-- end-user-doc -->
+ * 
  * <!-- begin-model-doc -->
  * GraphicalElement is the abstract superclass of all graphical elements that can be nested in a canvas.
  * <!-- end-model-doc -->
- *
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.dd.dg.GraphicalElement#getClipPath <em>Clip Path</em>}</li>
- *   <li>{@link org.eclipse.papyrus.dd.dg.GraphicalElement#getGroup <em>Group</em>}</li>
- *   <li>{@link org.eclipse.papyrus.dd.dg.GraphicalElement#getClasses <em>Class</em>}</li>
- *   <li>{@link org.eclipse.papyrus.dd.dg.GraphicalElement#getStyle <em>Style</em>}</li>
- *   <li>{@link org.eclipse.papyrus.dd.dg.GraphicalElement#getTransforms <em>Transform</em>}</li>
- *   <li>{@link org.eclipse.papyrus.dd.dg.GraphicalElement#getLayoutData <em>Layout Data</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.GraphicalElement#getClipPath <em>Clip Path</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.GraphicalElement#getGroup <em>Group</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.GraphicalElement#getClasses <em>Class</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.GraphicalElement#getStyle <em>Style</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.GraphicalElement#getTransforms <em>Transform</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.GraphicalElement#getLayoutData <em>Layout Data</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.dd.dg.DGPackage#getGraphicalElement()
  * @model abstract="true"
  * @generated
  */
 public interface GraphicalElement extends Definition {
+
 	/**
 	 * Returns the value of the '<em><b>Clip Path</b></em>' reference. <!--
 	 * begin-user-doc --> <!-- end-user-doc --> <!-- begin-model-doc --> A clip
@@ -55,13 +55,12 @@ public interface GraphicalElement extends Definition {
 	ClipPath getClipPath();
 
 	/**
-	 * Sets the value of the '
-	 * {@link org.eclipse.papyrus.dd.dg.GraphicalElement#getClipPath
+	 * Sets the value of the ' {@link org.eclipse.papyrus.dd.dg.GraphicalElement#getClipPath
 	 * <em>Clip Path</em>}' reference. <!-- begin-user-doc --> <!-- end-user-doc
 	 * -->
 	 * 
 	 * @param value
-	 *            the new value of the '<em>Clip Path</em>' reference.
+	 *        the new value of the '<em>Clip Path</em>' reference.
 	 * @see #getClipPath()
 	 * @generated
 	 */
@@ -69,8 +68,7 @@ public interface GraphicalElement extends Definition {
 
 	/**
 	 * Returns the value of the '<em><b>Group</b></em>' container reference. It
-	 * is bidirectional and its opposite is '
-	 * {@link org.eclipse.papyrus.dd.dg.Group#getMembers <em>Member</em>}'. <!--
+	 * is bidirectional and its opposite is ' {@link org.eclipse.papyrus.dd.dg.Group#getMembers <em>Member</em>}'. <!--
 	 * begin-user-doc --> <!-- end-user-doc --> <!-- begin-model-doc --> The
 	 * group that owns this graphical element. <!-- end-model-doc -->
 	 * 
@@ -87,7 +85,9 @@ public interface GraphicalElement extends Definition {
 	 * Sets the value of the '{@link org.eclipse.papyrus.dd.dg.GraphicalElement#getGroup <em>Group</em>}' container reference.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * @param value the new value of the '<em>Group</em>' container reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Group</em>' container reference.
 	 * @see #getGroup()
 	 * @generated
 	 */
@@ -124,7 +124,9 @@ public interface GraphicalElement extends Definition {
 	 * Sets the value of the '{@link org.eclipse.papyrus.dd.dg.GraphicalElement#getStyle <em>Style</em>}' containment reference.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * @param value the new value of the '<em>Style</em>' containment reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Style</em>' containment reference.
 	 * @see #getStyle()
 	 * @generated
 	 */
@@ -132,8 +134,7 @@ public interface GraphicalElement extends Definition {
 
 	/**
 	 * Returns the value of the '<em><b>Transform</b></em>' containment
-	 * reference list. The list contents are of type
-	 * {@link org.eclipse.papyrus.dd.dg.Transform}. <!-- begin-user-doc --> <!--
+	 * reference list. The list contents are of type {@link org.eclipse.papyrus.dd.dg.Transform}. <!-- begin-user-doc --> <!--
 	 * end-user-doc --> <!-- begin-model-doc --> A list of transforms that apply
 	 * to this graphical element. <!-- end-model-doc -->
 	 * 
@@ -148,10 +149,10 @@ public interface GraphicalElement extends Definition {
 	 * Returns the value of the '<em><b>Layout Data</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Layout Data</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Layout Data</em>' attribute isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Layout Data</em>' attribute.
 	 * @see #setLayoutData(String)
 	 * @see org.eclipse.papyrus.dd.dg.DGPackage#getGraphicalElement_LayoutData()
@@ -164,7 +165,9 @@ public interface GraphicalElement extends Definition {
 	 * Sets the value of the '{@link org.eclipse.papyrus.dd.dg.GraphicalElement#getLayoutData <em>Layout Data</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Layout Data</em>' attribute.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Layout Data</em>' attribute.
 	 * @see #getLayoutData()
 	 * @generated
 	 */
@@ -174,15 +177,13 @@ public interface GraphicalElement extends Definition {
 	 * <!-- begin-user-doc --> <!-- end-user-doc --> <!-- begin-model-doc -->
 	 * 
 	 * @param diagnostics
-	 *            The chain of diagnostics to which problems are to be appended.
+	 *        The chain of diagnostics to which problems are to be appended.
 	 * @param context
-	 *            The cache of context-specific information. <!-- end-model-doc
-	 *            -->
+	 *        The cache of context-specific information. <!-- end-model-doc
+	 *        -->
 	 * @model annotation=
 	 *        "http://www.eclipse.org/emf/2002/Ecore/OCL body='clipPath->notEmpty() implies clipPath.id->notEmpty()'"
 	 * @generated
 	 */
-	boolean referencedClippathHasId(DiagnosticChain diagnostics,
-			Map<Object, Object> context);
-
+	boolean referencedClippathHasId(DiagnosticChain diagnostics, Map<Object, Object> context);
 } // GraphicalElement
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Group.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Group.java
index f246ef20689..6fdf8626a07 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Group.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Group.java
@@ -14,32 +14,30 @@ package org.eclipse.papyrus.dd.dg;
 import org.eclipse.emf.common.util.EList;
 
 /**
- * <!-- begin-user-doc --> A representation of the model object '
- * <em><b>Group</b></em>'. <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object ' <em><b>Group</b></em>'. <!-- end-user-doc -->
+ * 
  * <!-- begin-model-doc -->
  * Group defines a group of graphical elements that can be styled, clipped and/or transformed together.
  * <!-- end-model-doc -->
- *
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.dd.dg.Group#getMembers <em>Member</em>}</li>
- *   <li>{@link org.eclipse.papyrus.dd.dg.Group#getLayout <em>Layout</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.Group#getMembers <em>Member</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.Group#getLayout <em>Layout</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.dd.dg.DGPackage#getGroup()
  * @model
  * @generated
  */
 public interface Group extends GraphicalElement {
+
 	/**
 	 * Returns the value of the '<em><b>Member</b></em>' containment reference
-	 * list. The list contents are of type
-	 * {@link org.eclipse.papyrus.dd.dg.GraphicalElement}. It is bidirectional
-	 * and its opposite is '
-	 * {@link org.eclipse.papyrus.dd.dg.GraphicalElement#getGroup
+	 * list. The list contents are of type {@link org.eclipse.papyrus.dd.dg.GraphicalElement}. It is bidirectional
+	 * and its opposite is ' {@link org.eclipse.papyrus.dd.dg.GraphicalElement#getGroup
 	 * <em>Group</em>}'. <!-- begin-user-doc --> <!-- end-user-doc --> <!--
 	 * begin-model-doc --> A list of graphical elements that are members of this
 	 * group. <!-- end-model-doc -->
@@ -56,10 +54,10 @@ public interface Group extends GraphicalElement {
 	 * Returns the value of the '<em><b>Layout</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Layout</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Layout</em>' attribute isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Layout</em>' attribute.
 	 * @see #setLayout(String)
 	 * @see org.eclipse.papyrus.dd.dg.DGPackage#getGroup_Layout()
@@ -72,10 +70,11 @@ public interface Group extends GraphicalElement {
 	 * Sets the value of the '{@link org.eclipse.papyrus.dd.dg.Group#getLayout <em>Layout</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Layout</em>' attribute.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Layout</em>' attribute.
 	 * @see #getLayout()
 	 * @generated
 	 */
 	void setLayout(String value);
-
 } // Group
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Image.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Image.java
index 1e47addbf8f..1f458d97cd7 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Image.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Image.java
@@ -16,27 +16,27 @@ import org.eclipse.emf.common.util.DiagnosticChain;
 import org.eclipse.papyrus.dd.dc.Bounds;
 
 /**
- * <!-- begin-user-doc --> A representation of the model object '
- * <em><b>Image</b></em>'. <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object ' <em><b>Image</b></em>'. <!-- end-user-doc -->
+ * 
  * <!-- begin-model-doc -->
  * Image is a graphical element that defines a shape that paints an image with a given URL within given bounds.
  * <!-- end-model-doc -->
- *
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.dd.dg.Image#getSource <em>Source</em>}</li>
- *   <li>{@link org.eclipse.papyrus.dd.dg.Image#getBounds <em>Bounds</em>}</li>
- *   <li>{@link org.eclipse.papyrus.dd.dg.Image#isAspectRatioPreserved <em>Is Aspect Ratio Preserved</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.Image#getSource <em>Source</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.Image#getBounds <em>Bounds</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.Image#isAspectRatioPreserved <em>Is Aspect Ratio Preserved</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.dd.dg.DGPackage#getImage()
  * @model
  * @generated
  */
 public interface Image extends GraphicalElement {
+
 	/**
 	 * Returns the value of the '<em><b>Source</b></em>' attribute. <!--
 	 * begin-user-doc --> <!-- end-user-doc --> <!-- begin-model-doc --> the URL
@@ -57,7 +57,7 @@ public interface Image extends GraphicalElement {
 	 * -->
 	 * 
 	 * @param value
-	 *            the new value of the '<em>Source</em>' attribute.
+	 *        the new value of the '<em>Source</em>' attribute.
 	 * @see #getSource()
 	 * @generated
 	 */
@@ -80,7 +80,9 @@ public interface Image extends GraphicalElement {
 	 * Sets the value of the '{@link org.eclipse.papyrus.dd.dg.Image#getBounds <em>Bounds</em>}' containment reference.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * @param value the new value of the '<em>Bounds</em>' containment reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Bounds</em>' containment reference.
 	 * @see #getBounds()
 	 * @generated
 	 */
@@ -106,7 +108,9 @@ public interface Image extends GraphicalElement {
 	 * Sets the value of the '{@link org.eclipse.papyrus.dd.dg.Image#isAspectRatioPreserved <em>Is Aspect Ratio Preserved</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Is Aspect Ratio Preserved</em>' attribute.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Is Aspect Ratio Preserved</em>' attribute.
 	 * @see #isAspectRatioPreserved()
 	 * @generated
 	 */
@@ -116,15 +120,13 @@ public interface Image extends GraphicalElement {
 	 * <!-- begin-user-doc --> <!-- end-user-doc --> <!-- begin-model-doc -->
 	 * 
 	 * @param diagnostics
-	 *            The chain of diagnostics to which problems are to be appended.
+	 *        The chain of diagnostics to which problems are to be appended.
 	 * @param context
-	 *            The cache of context-specific information. <!-- end-model-doc
-	 *            -->
+	 *        The cache of context-specific information. <!-- end-model-doc
+	 *        -->
 	 * @model annotation=
 	 *        "http://www.eclipse.org/emf/2002/Ecore/OCL body='source->notEmpty() implies source.size() > 0'"
 	 * @generated
 	 */
-	boolean sourceCannotBeEmpty(DiagnosticChain diagnostics,
-			Map<Object, Object> context);
-
+	boolean sourceCannotBeEmpty(DiagnosticChain diagnostics, Map<Object, Object> context);
 } // Image
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Line.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Line.java
index 814b2539d74..3e4b7026888 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Line.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Line.java
@@ -14,26 +14,26 @@ package org.eclipse.papyrus.dd.dg;
 import org.eclipse.papyrus.dd.dc.Point;
 
 /**
- * <!-- begin-user-doc --> A representation of the model object '
- * <em><b>Line</b></em>'. <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object ' <em><b>Line</b></em>'. <!-- end-user-doc -->
+ * 
  * <!-- begin-model-doc -->
  * Line is a marked element that defines a shape consisting of one straight line between two points.
  * <!-- end-model-doc -->
- *
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.dd.dg.Line#getStart <em>Start</em>}</li>
- *   <li>{@link org.eclipse.papyrus.dd.dg.Line#getEnd <em>End</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.Line#getStart <em>Start</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.Line#getEnd <em>End</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.dd.dg.DGPackage#getLine()
  * @model
  * @generated
  */
 public interface Line extends MarkedElement {
+
 	/**
 	 * Returns the value of the '<em><b>Start</b></em>' containment reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc --> <!-- begin-model-doc -->
@@ -52,7 +52,9 @@ public interface Line extends MarkedElement {
 	 * Sets the value of the '{@link org.eclipse.papyrus.dd.dg.Line#getStart <em>Start</em>}' containment reference.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * @param value the new value of the '<em>Start</em>' containment reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Start</em>' containment reference.
 	 * @see #getStart()
 	 * @generated
 	 */
@@ -76,10 +78,11 @@ public interface Line extends MarkedElement {
 	 * Sets the value of the '{@link org.eclipse.papyrus.dd.dg.Line#getEnd <em>End</em>}' containment reference.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * @param value the new value of the '<em>End</em>' containment reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>End</em>' containment reference.
 	 * @see #getEnd()
 	 * @generated
 	 */
 	void setEnd(Point value);
-
 } // Line
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/LineTo.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/LineTo.java
index fcbfe9275e7..d6de42feda5 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/LineTo.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/LineTo.java
@@ -14,25 +14,25 @@ package org.eclipse.papyrus.dd.dg;
 import org.eclipse.papyrus.dd.dc.Point;
 
 /**
- * <!-- begin-user-doc --> A representation of the model object '
- * <em><b>Line To</b></em>'. <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object ' <em><b>Line To</b></em>'. <!-- end-user-doc -->
+ * 
  * <!-- begin-model-doc -->
  * LineTo is a kind of path command that draw a straight line from the current point to a new point.
  * <!-- end-model-doc -->
- *
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.dd.dg.LineTo#getPoint <em>Point</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.LineTo#getPoint <em>Point</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.dd.dg.DGPackage#getLineTo()
  * @model
  * @generated
  */
 public interface LineTo extends PathCommand {
+
 	/**
 	 * Returns the value of the '<em><b>Point</b></em>' containment reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc --> <!-- begin-model-doc --> a
@@ -51,10 +51,11 @@ public interface LineTo extends PathCommand {
 	 * Sets the value of the '{@link org.eclipse.papyrus.dd.dg.LineTo#getPoint <em>Point</em>}' containment reference.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * @param value the new value of the '<em>Point</em>' containment reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Point</em>' containment reference.
 	 * @see #getPoint()
 	 * @generated
 	 */
 	void setPoint(Point value);
-
 } // LineTo
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/LinearGradient.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/LinearGradient.java
index 05c6bb31153..764463552d0 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/LinearGradient.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/LinearGradient.java
@@ -17,26 +17,26 @@ import org.eclipse.emf.common.util.DiagnosticChain;
 import org.eclipse.papyrus.dd.dc.Point;
 
 /**
- * <!-- begin-user-doc --> A representation of the model object '
- * <em><b>Linear Gradient</b></em>'. <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object ' <em><b>Linear Gradient</b></em>'. <!-- end-user-doc -->
+ * 
  * <!-- begin-model-doc -->
  * LinearGradient is a kind of gradient that fills a graphical element by smoothly changing color values along a vector.
  * <!-- end-model-doc -->
- *
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.dd.dg.LinearGradient#getStart <em>Start</em>}</li>
- *   <li>{@link org.eclipse.papyrus.dd.dg.LinearGradient#getEnd <em>End</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.LinearGradient#getStart <em>Start</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.LinearGradient#getEnd <em>End</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.dd.dg.DGPackage#getLinearGradient()
  * @model
  * @generated
  */
 public interface LinearGradient extends Gradient {
+
 	/**
 	 * Returns the value of the '<em><b>Start</b></em>' containment reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc --> <!-- begin-model-doc --> a
@@ -54,7 +54,9 @@ public interface LinearGradient extends Gradient {
 	/**
 	 * Sets the value of the '{@link org.eclipse.papyrus.dd.dg.LinearGradient#getStart <em>Start</em>}' containment reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Start</em>' containment reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Start</em>' containment reference.
 	 * @see #getStart()
 	 * @generated
 	 */
@@ -77,7 +79,9 @@ public interface LinearGradient extends Gradient {
 	/**
 	 * Sets the value of the '{@link org.eclipse.papyrus.dd.dg.LinearGradient#getEnd <em>End</em>}' containment reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @param value the new value of the '<em>End</em>' containment reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>End</em>' containment reference.
 	 * @see #getEnd()
 	 * @generated
 	 */
@@ -88,15 +92,13 @@ public interface LinearGradient extends Gradient {
 	 * all the components of the gradient vector must be between 0 and 1.
 	 * 
 	 * @param diagnostics
-	 *            The chain of diagnostics to which problems are to be appended.
+	 *        The chain of diagnostics to which problems are to be appended.
 	 * @param context
-	 *            The cache of context-specific information. <!-- end-model-doc
-	 *            -->
+	 *        The cache of context-specific information. <!-- end-model-doc
+	 *        -->
 	 * @model annotation=
 	 *        "http://www.eclipse.org/emf/2002/Ecore/OCL body='start.x>=0 and start.x<=1 and end.x>=0 and end.x<=1 and start.y>=0 and start.y<=1 and end.y>=0 and end.y<=1'"
 	 * @generated
 	 */
-	boolean validGradientVector(DiagnosticChain diagnostics,
-			Map<Object, Object> context);
-
+	boolean validGradientVector(DiagnosticChain diagnostics, Map<Object, Object> context);
 } // LinearGradient
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/MarkedElement.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/MarkedElement.java
index ef53179ec9a..5c8832c9561 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/MarkedElement.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/MarkedElement.java
@@ -15,27 +15,27 @@ import java.util.Map;
 import org.eclipse.emf.common.util.DiagnosticChain;
 
 /**
- * <!-- begin-user-doc --> A representation of the model object '
- * <em><b>Marked Element</b></em>'. <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object ' <em><b>Marked Element</b></em>'. <!-- end-user-doc -->
+ * 
  * <!-- begin-model-doc -->
  * MarkedElement is a graphic element that can be decorated at its vertices with markers (e.g. arrowheads).
  * <!-- end-model-doc -->
- *
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.dd.dg.MarkedElement#getEndMarker <em>End Marker</em>}</li>
- *   <li>{@link org.eclipse.papyrus.dd.dg.MarkedElement#getMidMarker <em>Mid Marker</em>}</li>
- *   <li>{@link org.eclipse.papyrus.dd.dg.MarkedElement#getStartMarker <em>Start Marker</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.MarkedElement#getEndMarker <em>End Marker</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.MarkedElement#getMidMarker <em>Mid Marker</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.MarkedElement#getStartMarker <em>Start Marker</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.dd.dg.DGPackage#getMarkedElement()
  * @model abstract="true"
  * @generated
  */
 public interface MarkedElement extends GraphicalElement {
+
 	/**
 	 * Returns the value of the '<em><b>End Marker</b></em>' reference. <!--
 	 * begin-user-doc --> <!-- end-user-doc --> <!-- begin-model-doc --> an
@@ -54,7 +54,9 @@ public interface MarkedElement extends GraphicalElement {
 	 * Sets the value of the '{@link org.eclipse.papyrus.dd.dg.MarkedElement#getEndMarker <em>End Marker</em>}' reference.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * @param value the new value of the '<em>End Marker</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>End Marker</em>' reference.
 	 * @see #getEndMarker()
 	 * @generated
 	 */
@@ -78,7 +80,9 @@ public interface MarkedElement extends GraphicalElement {
 	 * Sets the value of the '{@link org.eclipse.papyrus.dd.dg.MarkedElement#getMidMarker <em>Mid Marker</em>}' reference.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * @param value the new value of the '<em>Mid Marker</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Mid Marker</em>' reference.
 	 * @see #getMidMarker()
 	 * @generated
 	 */
@@ -102,7 +106,9 @@ public interface MarkedElement extends GraphicalElement {
 	 * Sets the value of the '{@link org.eclipse.papyrus.dd.dg.MarkedElement#getStartMarker <em>Start Marker</em>}' reference.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * @param value the new value of the '<em>Start Marker</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Start Marker</em>' reference.
 	 * @see #getStartMarker()
 	 * @generated
 	 */
@@ -112,45 +118,41 @@ public interface MarkedElement extends GraphicalElement {
 	 * <!-- begin-user-doc --> <!-- end-user-doc --> <!-- begin-model-doc -->
 	 * 
 	 * @param diagnostics
-	 *            The chain of diagnostics to which problems are to be appended.
+	 *        The chain of diagnostics to which problems are to be appended.
 	 * @param context
-	 *            The cache of context-specific information. <!-- end-model-doc
-	 *            -->
+	 *        The cache of context-specific information. <!-- end-model-doc
+	 *        -->
 	 * @model annotation=
 	 *        "http://www.eclipse.org/emf/2002/Ecore/OCL body='startMarker->notEmpty() implies startMarker.id->notEmpty()'"
 	 * @generated
 	 */
-	boolean referencedStartMarkerHasId(DiagnosticChain diagnostics,
-			Map<Object, Object> context);
+	boolean referencedStartMarkerHasId(DiagnosticChain diagnostics, Map<Object, Object> context);
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc --> <!-- begin-model-doc -->
 	 * 
 	 * @param diagnostics
-	 *            The chain of diagnostics to which problems are to be appended.
+	 *        The chain of diagnostics to which problems are to be appended.
 	 * @param context
-	 *            The cache of context-specific information. <!-- end-model-doc
-	 *            -->
+	 *        The cache of context-specific information. <!-- end-model-doc
+	 *        -->
 	 * @model annotation=
 	 *        "http://www.eclipse.org/emf/2002/Ecore/OCL body='midMarker->notEmpty() implies midMarker.id->notEmpty()'"
 	 * @generated
 	 */
-	boolean referencedMidMarkerHasId(DiagnosticChain diagnostics,
-			Map<Object, Object> context);
+	boolean referencedMidMarkerHasId(DiagnosticChain diagnostics, Map<Object, Object> context);
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc --> <!-- begin-model-doc -->
 	 * 
 	 * @param diagnostics
-	 *            The chain of diagnostics to which problems are to be appended.
+	 *        The chain of diagnostics to which problems are to be appended.
 	 * @param context
-	 *            The cache of context-specific information. <!-- end-model-doc
-	 *            -->
+	 *        The cache of context-specific information. <!-- end-model-doc
+	 *        -->
 	 * @model annotation=
 	 *        "http://www.eclipse.org/emf/2002/Ecore/OCL body='endMarker->notEmpty() implies endMarker.id->notEmpty()'"
 	 * @generated
 	 */
-	boolean referencedEndMarkerHasId(DiagnosticChain diagnostics,
-			Map<Object, Object> context);
-
+	boolean referencedEndMarkerHasId(DiagnosticChain diagnostics, Map<Object, Object> context);
 } // MarkedElement
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Marker.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Marker.java
index 110efb53345..f3dd7e66eda 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Marker.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Marker.java
@@ -15,26 +15,26 @@ import org.eclipse.papyrus.dd.dc.Dimension;
 import org.eclipse.papyrus.dd.dc.Point;
 
 /**
- * <!-- begin-user-doc --> A representation of the model object '
- * <em><b>Marker</b></em>'. <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object ' <em><b>Marker</b></em>'. <!-- end-user-doc -->
+ * 
  * <!-- begin-model-doc -->
  * Marker is a kind of group that is used as a decoration (e.g. an arrowhead) for the vertices of a marked graphical element.
  * <!-- end-model-doc -->
- *
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.dd.dg.Marker#getSize <em>Size</em>}</li>
- *   <li>{@link org.eclipse.papyrus.dd.dg.Marker#getReference <em>Reference</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.Marker#getSize <em>Size</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.Marker#getReference <em>Reference</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.dd.dg.DGPackage#getMarker()
  * @model
  * @generated
  */
 public interface Marker extends Group {
+
 	/**
 	 * Returns the value of the '<em><b>Size</b></em>' containment reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc --> <!-- begin-model-doc -->
@@ -52,7 +52,9 @@ public interface Marker extends Group {
 	 * Sets the value of the '{@link org.eclipse.papyrus.dd.dg.Marker#getSize <em>Size</em>}' containment reference.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * @param value the new value of the '<em>Size</em>' containment reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Size</em>' containment reference.
 	 * @see #getSize()
 	 * @generated
 	 */
@@ -75,10 +77,11 @@ public interface Marker extends Group {
 	/**
 	 * Sets the value of the '{@link org.eclipse.papyrus.dd.dg.Marker#getReference <em>Reference</em>}' containment reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Reference</em>' containment reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Reference</em>' containment reference.
 	 * @see #getReference()
 	 * @generated
 	 */
 	void setReference(Point value);
-
 } // Marker
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Matrix.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Matrix.java
index 0e82b8dee1f..70d4a3b9841 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Matrix.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Matrix.java
@@ -12,30 +12,30 @@
 package org.eclipse.papyrus.dd.dg;
 
 /**
- * <!-- begin-user-doc --> A representation of the model object '
- * <em><b>Matrix</b></em>'. <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object ' <em><b>Matrix</b></em>'. <!-- end-user-doc -->
+ * 
  * <!-- begin-model-doc -->
  * Matrix is a kind of transform that represents any transform operation with a 3x3 transformation matrix.
  * <!-- end-model-doc -->
- *
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.dd.dg.Matrix#getA <em>A</em>}</li>
- *   <li>{@link org.eclipse.papyrus.dd.dg.Matrix#getB <em>B</em>}</li>
- *   <li>{@link org.eclipse.papyrus.dd.dg.Matrix#getC <em>C</em>}</li>
- *   <li>{@link org.eclipse.papyrus.dd.dg.Matrix#getD <em>D</em>}</li>
- *   <li>{@link org.eclipse.papyrus.dd.dg.Matrix#getE <em>E</em>}</li>
- *   <li>{@link org.eclipse.papyrus.dd.dg.Matrix#getF <em>F</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.Matrix#getA <em>A</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.Matrix#getB <em>B</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.Matrix#getC <em>C</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.Matrix#getD <em>D</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.Matrix#getE <em>E</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.Matrix#getF <em>F</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.dd.dg.DGPackage#getMatrix()
  * @model
  * @generated
  */
 public interface Matrix extends Transform {
+
 	/**
 	 * Returns the value of the '<em><b>A</b></em>' attribute. <!--
 	 * begin-user-doc --> <!-- end-user-doc --> <!-- begin-model-doc --> the a
@@ -53,7 +53,9 @@ public interface Matrix extends Transform {
 	/**
 	 * Sets the value of the '{@link org.eclipse.papyrus.dd.dg.Matrix#getA <em>A</em>}' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @param value the new value of the '<em>A</em>' attribute.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>A</em>' attribute.
 	 * @see #getA()
 	 * @generated
 	 */
@@ -76,7 +78,9 @@ public interface Matrix extends Transform {
 	/**
 	 * Sets the value of the '{@link org.eclipse.papyrus.dd.dg.Matrix#getB <em>B</em>}' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @param value the new value of the '<em>B</em>' attribute.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>B</em>' attribute.
 	 * @see #getB()
 	 * @generated
 	 */
@@ -99,7 +103,9 @@ public interface Matrix extends Transform {
 	/**
 	 * Sets the value of the '{@link org.eclipse.papyrus.dd.dg.Matrix#getC <em>C</em>}' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @param value the new value of the '<em>C</em>' attribute.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>C</em>' attribute.
 	 * @see #getC()
 	 * @generated
 	 */
@@ -122,7 +128,9 @@ public interface Matrix extends Transform {
 	/**
 	 * Sets the value of the '{@link org.eclipse.papyrus.dd.dg.Matrix#getD <em>D</em>}' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @param value the new value of the '<em>D</em>' attribute.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>D</em>' attribute.
 	 * @see #getD()
 	 * @generated
 	 */
@@ -145,7 +153,9 @@ public interface Matrix extends Transform {
 	/**
 	 * Sets the value of the '{@link org.eclipse.papyrus.dd.dg.Matrix#getE <em>E</em>}' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @param value the new value of the '<em>E</em>' attribute.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>E</em>' attribute.
 	 * @see #getE()
 	 * @generated
 	 */
@@ -168,10 +178,11 @@ public interface Matrix extends Transform {
 	/**
 	 * Sets the value of the '{@link org.eclipse.papyrus.dd.dg.Matrix#getF <em>F</em>}' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @param value the new value of the '<em>F</em>' attribute.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>F</em>' attribute.
 	 * @see #getF()
 	 * @generated
 	 */
 	void setF(double value);
-
 } // Matrix
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/MoveTo.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/MoveTo.java
index 9f4187499b4..918db56321f 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/MoveTo.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/MoveTo.java
@@ -14,26 +14,26 @@ package org.eclipse.papyrus.dd.dg;
 import org.eclipse.papyrus.dd.dc.Point;
 
 /**
- * <!-- begin-user-doc --> A representation of the model object '
- * <em><b>Move To</b></em>'. <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object ' <em><b>Move To</b></em>'. <!-- end-user-doc -->
+ * 
  * <!-- begin-model-doc -->
  * MoveTo is a kind of path command that establishes a new current point in the coordinate system.
  * Definition is an object with an id that can be nested under Definitions.
  * <!-- end-model-doc -->
- *
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.dd.dg.MoveTo#getPoint <em>Point</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.MoveTo#getPoint <em>Point</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.dd.dg.DGPackage#getMoveTo()
  * @model
  * @generated
  */
 public interface MoveTo extends PathCommand {
+
 	/**
 	 * Returns the value of the '<em><b>Point</b></em>' containment reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc --> <!-- begin-model-doc --> a
@@ -51,10 +51,11 @@ public interface MoveTo extends PathCommand {
 	 * Sets the value of the '{@link org.eclipse.papyrus.dd.dg.MoveTo#getPoint <em>Point</em>}' containment reference.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * @param value the new value of the '<em>Point</em>' containment reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Point</em>' containment reference.
 	 * @see #getPoint()
 	 * @generated
 	 */
 	void setPoint(Point value);
-
 } // MoveTo
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Paint.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Paint.java
index cace5f08b11..2f2bca8437e 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Paint.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Paint.java
@@ -18,22 +18,22 @@ import org.eclipse.emf.common.util.DiagnosticChain;
 import org.eclipse.emf.ecore.EObject;
 
 /**
- * <!-- begin-user-doc --> A representation of the model object '
- * <em><b>Paint</b></em>'. <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object ' <em><b>Paint</b></em>'. <!-- end-user-doc -->
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.dd.dg.Paint#getColor <em>Color</em>}</li>
- *   <li>{@link org.eclipse.papyrus.dd.dg.Paint#getPaintServer <em>Paint Server</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.Paint#getColor <em>Color</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.Paint#getPaintServer <em>Paint Server</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.dd.dg.DGPackage#getPaint()
  * @model
  * @generated
  */
 public interface Paint extends EObject {
+
 	/**
 	 * Returns the value of the '<em><b>Color</b></em>' attribute. <!--
 	 * begin-user-doc --> <!-- end-user-doc --> <!-- begin-model-doc --> A solid
@@ -50,7 +50,9 @@ public interface Paint extends EObject {
 	/**
 	 * Sets the value of the '{@link org.eclipse.papyrus.dd.dg.Paint#getColor <em>Color</em>}' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Color</em>' attribute.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Color</em>' attribute.
 	 * @see #getColor()
 	 * @generated
 	 */
@@ -73,7 +75,9 @@ public interface Paint extends EObject {
 	 * Sets the value of the '{@link org.eclipse.papyrus.dd.dg.Paint#getPaintServer <em>Paint Server</em>}' reference.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * @param value the new value of the '<em>Paint Server</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Paint Server</em>' reference.
 	 * @see #getPaintServer()
 	 * @generated
 	 */
@@ -83,15 +87,13 @@ public interface Paint extends EObject {
 	 * <!-- begin-user-doc --> <!-- end-user-doc --> <!-- begin-model-doc -->
 	 * 
 	 * @param diagnostics
-	 *            The chain of diagnostics to which problems are to be appended.
+	 *        The chain of diagnostics to which problems are to be appended.
 	 * @param context
-	 *            The cache of context-specific information. <!-- end-model-doc
-	 *            -->
+	 *        The cache of context-specific information. <!-- end-model-doc
+	 *        -->
 	 * @model annotation=
 	 *        "http://www.eclipse.org/emf/2002/Ecore/OCL body='paintServer->notEmpty() implies paintServer.id->notEmpty()'"
 	 * @generated
 	 */
-	boolean referencedPaintServerHasId(DiagnosticChain diagnostics,
-			Map<Object, Object> context);
-
+	boolean referencedPaintServerHasId(DiagnosticChain diagnostics, Map<Object, Object> context);
 } // Paint
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/PaintServer.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/PaintServer.java
index ebd68ff5fe8..c9c301a34f6 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/PaintServer.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/PaintServer.java
@@ -14,29 +14,28 @@ package org.eclipse.papyrus.dd.dg;
 import org.eclipse.emf.common.util.EList;
 
 /**
- * <!-- begin-user-doc --> A representation of the model object '
- * <em><b>Paint Server</b></em>'. <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object ' <em><b>Paint Server</b></em>'. <!-- end-user-doc -->
+ * 
  * <!-- begin-model-doc -->
  * PaintServer is the abstract super class of all paint servers, like gradients and patterns
  * <!-- end-model-doc -->
- *
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.dd.dg.PaintServer#getTransforms <em>Transform</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.PaintServer#getTransforms <em>Transform</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.dd.dg.DGPackage#getPaintServer()
  * @model abstract="true"
  * @generated
  */
 public interface PaintServer extends Definition {
+
 	/**
 	 * Returns the value of the '<em><b>Transform</b></em>' containment
-	 * reference list. The list contents are of type
-	 * {@link org.eclipse.papyrus.dd.dg.Transform}. <!-- begin-user-doc --> <!--
+	 * reference list. The list contents are of type {@link org.eclipse.papyrus.dd.dg.Transform}. <!-- begin-user-doc --> <!--
 	 * end-user-doc --> <!-- begin-model-doc --> A set of transforms that apply
 	 * to this paint server. <!-- end-model-doc -->
 	 * 
@@ -46,5 +45,4 @@ public interface PaintServer extends Definition {
 	 * @generated
 	 */
 	EList<Transform> getTransforms();
-
 } // PaintServer
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Path.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Path.java
index 8ae2a3e004d..dc1738a1658 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Path.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Path.java
@@ -16,29 +16,28 @@ import org.eclipse.emf.common.util.DiagnosticChain;
 import org.eclipse.emf.common.util.EList;
 
 /**
- * <!-- begin-user-doc --> A representation of the model object '
- * <em><b>Path</b></em>'. <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object ' <em><b>Path</b></em>'. <!-- end-user-doc -->
+ * 
  * <!-- begin-model-doc -->
  * Path is a marked element that defines a custom shape whose geometry is specified with a sequence of path commands.
  * <!-- end-model-doc -->
- *
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.dd.dg.Path#getCommands <em>Command</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.Path#getCommands <em>Command</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.dd.dg.DGPackage#getPath()
  * @model
  * @generated
  */
 public interface Path extends MarkedElement {
+
 	/**
 	 * Returns the value of the '<em><b>Command</b></em>' containment reference
-	 * list. The list contents are of type
-	 * {@link org.eclipse.papyrus.dd.dg.PathCommand}. <!-- begin-user-doc -->
+	 * list. The list contents are of type {@link org.eclipse.papyrus.dd.dg.PathCommand}. <!-- begin-user-doc -->
 	 * <!-- end-user-doc --> <!-- begin-model-doc --> a list of path commands
 	 * that define the geometry of the custom shape. <!-- end-model-doc -->
 	 * 
@@ -53,15 +52,13 @@ public interface Path extends MarkedElement {
 	 * <!-- begin-user-doc --> <!-- end-user-doc --> <!-- begin-model-doc -->
 	 * 
 	 * @param diagnostics
-	 *            The chain of diagnostics to which problems are to be appended.
+	 *        The chain of diagnostics to which problems are to be appended.
 	 * @param context
-	 *            The cache of context-specific information. <!-- end-model-doc
-	 *            -->
+	 *        The cache of context-specific information. <!-- end-model-doc
+	 *        -->
 	 * @model annotation=
 	 *        "http://www.eclipse.org/emf/2002/Ecore/OCL body='command->first().oclIsKindOf(MoveTo)'"
 	 * @generated
 	 */
-	boolean firstCommandMustBeMove(DiagnosticChain diagnostics,
-			Map<Object, Object> context);
-
+	boolean firstCommandMustBeMove(DiagnosticChain diagnostics, Map<Object, Object> context);
 } // Path
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/PathCommand.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/PathCommand.java
index 48d86483823..7f81dce0212 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/PathCommand.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/PathCommand.java
@@ -14,25 +14,25 @@ package org.eclipse.papyrus.dd.dg;
 import org.eclipse.emf.ecore.EObject;
 
 /**
- * <!-- begin-user-doc --> A representation of the model object '
- * <em><b>Path Command</b></em>'. <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object ' <em><b>Path Command</b></em>'. <!-- end-user-doc -->
+ * 
  * <!-- begin-model-doc -->
  * PathCommand is the abstract super type of all commands that participate in specifying a path element.
  * <!-- end-model-doc -->
- *
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.dd.dg.PathCommand#isRelative <em>Is Relative</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.PathCommand#isRelative <em>Is Relative</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.dd.dg.DGPackage#getPathCommand()
  * @model abstract="true"
  * @generated
  */
 public interface PathCommand extends EObject {
+
 	/**
 	 * Returns the value of the '<em><b>Is Relative</b></em>' attribute. The
 	 * default value is <code>"false"</code>. <!-- begin-user-doc --> <!--
@@ -54,10 +54,11 @@ public interface PathCommand extends EObject {
 	 * Sets the value of the '{@link org.eclipse.papyrus.dd.dg.PathCommand#isRelative <em>Is Relative</em>}' attribute.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * @param value the new value of the '<em>Is Relative</em>' attribute.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Is Relative</em>' attribute.
 	 * @see #isRelative()
 	 * @generated
 	 */
 	void setIsRelative(boolean value);
-
 } // PathCommand
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Pattern.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Pattern.java
index ca3b91c8dd1..a271047e70e 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Pattern.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Pattern.java
@@ -14,26 +14,27 @@ package org.eclipse.papyrus.dd.dg;
 import org.eclipse.papyrus.dd.dc.Bounds;
 
 /**
- * <!-- begin-user-doc --> A representation of the model object '
- * <em><b>Pattern</b></em>'. <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object ' <em><b>Pattern</b></em>'. <!-- end-user-doc -->
+ * 
  * <!-- begin-model-doc -->
- * Pattern is a kind of paint server that paints a graphical element (a tile) repeatedly at fixed intervals in x and y axes to cover the areas to be filled.
+ * Pattern is a kind of paint server that paints a graphical element (a tile) repeatedly at fixed intervals in x and y axes to cover the areas to be
+ * filled.
  * <!-- end-model-doc -->
- *
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.dd.dg.Pattern#getBounds <em>Bounds</em>}</li>
- *   <li>{@link org.eclipse.papyrus.dd.dg.Pattern#getTile <em>Tile</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.Pattern#getBounds <em>Bounds</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.Pattern#getTile <em>Tile</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.dd.dg.DGPackage#getPattern()
  * @model
  * @generated
  */
 public interface Pattern extends PaintServer {
+
 	/**
 	 * Returns the value of the '<em><b>Bounds</b></em>' containment reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc --> <!-- begin-model-doc -->
@@ -51,7 +52,9 @@ public interface Pattern extends PaintServer {
 	/**
 	 * Sets the value of the '{@link org.eclipse.papyrus.dd.dg.Pattern#getBounds <em>Bounds</em>}' containment reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Bounds</em>' containment reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Bounds</em>' containment reference.
 	 * @see #getBounds()
 	 * @generated
 	 */
@@ -76,10 +79,11 @@ public interface Pattern extends PaintServer {
 	 * Sets the value of the '{@link org.eclipse.papyrus.dd.dg.Pattern#getTile <em>Tile</em>}' containment reference.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * @param value the new value of the '<em>Tile</em>' containment reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Tile</em>' containment reference.
 	 * @see #getTile()
 	 * @generated
 	 */
 	void setTile(GraphicalElement value);
-
 } // Pattern
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Polygon.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Polygon.java
index 986e0604b0c..7e07e589451 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Polygon.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Polygon.java
@@ -16,29 +16,28 @@ import org.eclipse.emf.common.util.EList;
 import org.eclipse.papyrus.dd.dc.Point;
 
 /**
- * <!-- begin-user-doc --> A representation of the model object '
- * <em><b>Polygon</b></em>'. <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object ' <em><b>Polygon</b></em>'. <!-- end-user-doc -->
+ * 
  * <!-- begin-model-doc -->
  * Polygon is a marked element that defines a closed shape consisting of a sequence of connected straight line segments.
  * <!-- end-model-doc -->
- *
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.dd.dg.Polygon#getPoints <em>Point</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.Polygon#getPoints <em>Point</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.dd.dg.DGPackage#getPolygon()
  * @model
  * @generated
  */
 public interface Polygon extends MarkedElement {
+
 	/**
 	 * Returns the value of the '<em><b>Point</b></em>' containment reference
-	 * list. The list contents are of type
-	 * {@link org.eclipse.papyrus.dd.dc.Point}. <!-- begin-user-doc --> <!--
+	 * list. The list contents are of type {@link org.eclipse.papyrus.dd.dc.Point}. <!-- begin-user-doc --> <!--
 	 * end-user-doc --> <!-- begin-model-doc --> a list of 3 or more points
 	 * making up the polygon. <!-- end-model-doc -->
 	 * 
@@ -48,5 +47,4 @@ public interface Polygon extends MarkedElement {
 	 * @generated
 	 */
 	EList<Point> getPoints();
-
 } // Polygon
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Polyline.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Polyline.java
index c0ca83a2bcf..904b6f7b66d 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Polyline.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Polyline.java
@@ -16,29 +16,28 @@ import org.eclipse.emf.common.util.EList;
 import org.eclipse.papyrus.dd.dc.Point;
 
 /**
- * <!-- begin-user-doc --> A representation of the model object '
- * <em><b>Polyline</b></em>'. <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object ' <em><b>Polyline</b></em>'. <!-- end-user-doc -->
+ * 
  * <!-- begin-model-doc -->
  * Polyline is a marked element that defines a shape consisting of a sequence of connected straight line segments.
  * <!-- end-model-doc -->
- *
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.dd.dg.Polyline#getPoints <em>Point</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.Polyline#getPoints <em>Point</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.dd.dg.DGPackage#getPolyline()
  * @model
  * @generated
  */
 public interface Polyline extends MarkedElement {
+
 	/**
 	 * Returns the value of the '<em><b>Point</b></em>' containment reference
-	 * list. The list contents are of type
-	 * {@link org.eclipse.papyrus.dd.dc.Point}. <!-- begin-user-doc --> <!--
+	 * list. The list contents are of type {@link org.eclipse.papyrus.dd.dc.Point}. <!-- begin-user-doc --> <!--
 	 * end-user-doc --> <!-- begin-model-doc --> a list of 2 or more points
 	 * making up the polyline. <!-- end-model-doc -->
 	 * 
@@ -48,5 +47,4 @@ public interface Polyline extends MarkedElement {
 	 * @generated
 	 */
 	EList<Point> getPoints();
-
 } // Polyline
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/QuadraticCurveTo.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/QuadraticCurveTo.java
index 1f418823585..44304aedeae 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/QuadraticCurveTo.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/QuadraticCurveTo.java
@@ -14,27 +14,27 @@ package org.eclipse.papyrus.dd.dg;
 import org.eclipse.papyrus.dd.dc.Point;
 
 /**
- * <!-- begin-user-doc --> A representation of the model object '
- * <em><b>Quadratic Curve To</b></em>'. <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object ' <em><b>Quadratic Curve To</b></em>'. <!-- end-user-doc -->
+ * 
  * <!-- begin-model-doc -->
  * QuadraticCurveTo is a kind of path command that draws a quadratic b?zier curve from the current point to a new point using a single control point.
  * EllipticalArcTo is a kind of path command that draws an elliptical arc from the current point to a new point in the coordinate system.
  * <!-- end-model-doc -->
- *
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.dd.dg.QuadraticCurveTo#getControl <em>Control</em>}</li>
- *   <li>{@link org.eclipse.papyrus.dd.dg.QuadraticCurveTo#getPoint <em>Point</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.QuadraticCurveTo#getControl <em>Control</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.QuadraticCurveTo#getPoint <em>Point</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.dd.dg.DGPackage#getQuadraticCurveTo()
  * @model
  * @generated
  */
 public interface QuadraticCurveTo extends PathCommand {
+
 	/**
 	 * Returns the value of the '<em><b>Point</b></em>' containment reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc --> <!-- begin-model-doc --> a
@@ -53,7 +53,9 @@ public interface QuadraticCurveTo extends PathCommand {
 	 * Sets the value of the '{@link org.eclipse.papyrus.dd.dg.QuadraticCurveTo#getPoint <em>Point</em>}' containment reference.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * @param value the new value of the '<em>Point</em>' containment reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Point</em>' containment reference.
 	 * @see #getPoint()
 	 * @generated
 	 */
@@ -76,10 +78,11 @@ public interface QuadraticCurveTo extends PathCommand {
 	 * Sets the value of the '{@link org.eclipse.papyrus.dd.dg.QuadraticCurveTo#getControl <em>Control</em>}' containment reference.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * @param value the new value of the '<em>Control</em>' containment reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Control</em>' containment reference.
 	 * @see #getControl()
 	 * @generated
 	 */
 	void setControl(Point value);
-
 } // QuadraticCurveTo
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/RadialGradient.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/RadialGradient.java
index 35235e9d073..fe0ad803429 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/RadialGradient.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/RadialGradient.java
@@ -17,27 +17,27 @@ import org.eclipse.emf.common.util.DiagnosticChain;
 import org.eclipse.papyrus.dd.dc.Point;
 
 /**
- * <!-- begin-user-doc --> A representation of the model object '
- * <em><b>Radial Gradient</b></em>'. <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object ' <em><b>Radial Gradient</b></em>'. <!-- end-user-doc -->
+ * 
  * <!-- begin-model-doc -->
  * RadialGradient is a kind of gradient that fills a graphical element by smoothly changing color values in a circle.
  * <!-- end-model-doc -->
- *
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.dd.dg.RadialGradient#getCenter <em>Center</em>}</li>
- *   <li>{@link org.eclipse.papyrus.dd.dg.RadialGradient#getFocus <em>Focus</em>}</li>
- *   <li>{@link org.eclipse.papyrus.dd.dg.RadialGradient#getRadius <em>Radius</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.RadialGradient#getCenter <em>Center</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.RadialGradient#getFocus <em>Focus</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.RadialGradient#getRadius <em>Radius</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.dd.dg.DGPackage#getRadialGradient()
  * @model
  * @generated
  */
 public interface RadialGradient extends Gradient {
+
 	/**
 	 * Returns the value of the '<em><b>Center</b></em>' containment reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc --> <!-- begin-model-doc --> a
@@ -56,7 +56,9 @@ public interface RadialGradient extends Gradient {
 	 * Sets the value of the '{@link org.eclipse.papyrus.dd.dg.RadialGradient#getCenter <em>Center</em>}' containment reference.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * @param value the new value of the '<em>Center</em>' containment reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Center</em>' containment reference.
 	 * @see #getCenter()
 	 * @generated
 	 */
@@ -79,7 +81,9 @@ public interface RadialGradient extends Gradient {
 	/**
 	 * Sets the value of the '{@link org.eclipse.papyrus.dd.dg.RadialGradient#getFocus <em>Focus</em>}' containment reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Focus</em>' containment reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Focus</em>' containment reference.
 	 * @see #getFocus()
 	 * @generated
 	 */
@@ -102,13 +106,12 @@ public interface RadialGradient extends Gradient {
 	double getRadius();
 
 	/**
-	 * Sets the value of the '
-	 * {@link org.eclipse.papyrus.dd.dg.RadialGradient#getRadius
+	 * Sets the value of the ' {@link org.eclipse.papyrus.dd.dg.RadialGradient#getRadius
 	 * <em>Radius</em>}' attribute. <!-- begin-user-doc --> <!-- end-user-doc
 	 * -->
 	 * 
 	 * @param value
-	 *            the new value of the '<em>Radius</em>' attribute.
+	 *        the new value of the '<em>Radius</em>' attribute.
 	 * @see #getRadius()
 	 * @generated
 	 */
@@ -119,46 +122,43 @@ public interface RadialGradient extends Gradient {
 	 * the center point coordinates must be between 0 and 1
 	 * 
 	 * @param diagnostics
-	 *            The chain of diagnostics to which problems are to be appended.
+	 *        The chain of diagnostics to which problems are to be appended.
 	 * @param context
-	 *            The cache of context-specific information. <!-- end-model-doc
-	 *            -->
+	 *        The cache of context-specific information. <!-- end-model-doc
+	 *        -->
 	 * @model annotation=
 	 *        "http://www.eclipse.org/emf/2002/Ecore/OCL body='centerX>=0 and centerX<=1 and centerY>=0 and centerY<=1'"
 	 * @generated
 	 */
-	boolean validCenterPoint(DiagnosticChain diagnostics,
-			Map<Object, Object> context);
+	boolean validCenterPoint(DiagnosticChain diagnostics, Map<Object, Object> context);
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc --> <!-- begin-model-doc -->
 	 * the focus point coordinates must be between 0 and 1
 	 * 
 	 * @param diagnostics
-	 *            The chain of diagnostics to which problems are to be appended.
+	 *        The chain of diagnostics to which problems are to be appended.
 	 * @param context
-	 *            The cache of context-specific information. <!-- end-model-doc
-	 *            -->
+	 *        The cache of context-specific information. <!-- end-model-doc
+	 *        -->
 	 * @model annotation=
 	 *        "http://www.eclipse.org/emf/2002/Ecore/OCL body='focusX>=0 and focusX<=1 and focusY>=0 and focusY<=1'"
 	 * @generated
 	 */
-	boolean validFocusPoint(DiagnosticChain diagnostics,
-			Map<Object, Object> context);
+	boolean validFocusPoint(DiagnosticChain diagnostics, Map<Object, Object> context);
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc --> <!-- begin-model-doc -->
 	 * the radius must be between 0 and 1
 	 * 
 	 * @param diagnostics
-	 *            The chain of diagnostics to which problems are to be appended.
+	 *        The chain of diagnostics to which problems are to be appended.
 	 * @param context
-	 *            The cache of context-specific information. <!-- end-model-doc
-	 *            -->
+	 *        The cache of context-specific information. <!-- end-model-doc
+	 *        -->
 	 * @model annotation=
 	 *        "http://www.eclipse.org/emf/2002/Ecore/OCL body='radius>=0 and radius<=1'"
 	 * @generated
 	 */
 	boolean validRadius(DiagnosticChain diagnostics, Map<Object, Object> context);
-
 } // RadialGradient
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Rectangle.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Rectangle.java
index 572c9619502..b3b412ba71f 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Rectangle.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Rectangle.java
@@ -16,26 +16,27 @@ import org.eclipse.emf.common.util.DiagnosticChain;
 import org.eclipse.papyrus.dd.dc.Bounds;
 
 /**
- * <!-- begin-user-doc --> A representation of the model object '
- * <em><b>Rectangle</b></em>'. <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object ' <em><b>Rectangle</b></em>'. <!-- end-user-doc -->
+ * 
  * <!-- begin-model-doc -->
- * Rectangle is a graphical element that defines a rectangular shape with given bounds. A rectangle may be given rounded corners by setting its corner radius.
+ * Rectangle is a graphical element that defines a rectangular shape with given bounds. A rectangle may be given rounded corners by setting its corner
+ * radius.
  * <!-- end-model-doc -->
- *
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.dd.dg.Rectangle#getBounds <em>Bounds</em>}</li>
- *   <li>{@link org.eclipse.papyrus.dd.dg.Rectangle#getCornerRadius <em>Corner Radius</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.Rectangle#getBounds <em>Bounds</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.Rectangle#getCornerRadius <em>Corner Radius</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.dd.dg.DGPackage#getRectangle()
  * @model
  * @generated
  */
 public interface Rectangle extends GraphicalElement {
+
 	/**
 	 * Returns the value of the '<em><b>Bounds</b></em>' containment reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc --> <!-- begin-model-doc -->
@@ -53,7 +54,9 @@ public interface Rectangle extends GraphicalElement {
 	/**
 	 * Sets the value of the '{@link org.eclipse.papyrus.dd.dg.Rectangle#getBounds <em>Bounds</em>}' containment reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Bounds</em>' containment reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Bounds</em>' containment reference.
 	 * @see #getBounds()
 	 * @generated
 	 */
@@ -81,7 +84,9 @@ public interface Rectangle extends GraphicalElement {
 	 * Sets the value of the '{@link org.eclipse.papyrus.dd.dg.Rectangle#getCornerRadius <em>Corner Radius</em>}' attribute.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * @param value the new value of the '<em>Corner Radius</em>' attribute.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Corner Radius</em>' attribute.
 	 * @see #isSetCornerRadius()
 	 * @see #unsetCornerRadius()
 	 * @see #getCornerRadius()
@@ -93,6 +98,7 @@ public interface Rectangle extends GraphicalElement {
 	 * Unsets the value of the '{@link org.eclipse.papyrus.dd.dg.Rectangle#getCornerRadius <em>Corner Radius</em>}' attribute.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @see #isSetCornerRadius()
 	 * @see #getCornerRadius()
 	 * @see #setCornerRadius(double)
@@ -104,6 +110,7 @@ public interface Rectangle extends GraphicalElement {
 	 * Returns whether the value of the '{@link org.eclipse.papyrus.dd.dg.Rectangle#getCornerRadius <em>Corner Radius</em>}' attribute is set.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @return whether the value of the '<em>Corner Radius</em>' attribute is set.
 	 * @see #unsetCornerRadius()
 	 * @see #getCornerRadius()
@@ -116,15 +123,13 @@ public interface Rectangle extends GraphicalElement {
 	 * <!-- begin-user-doc --> <!-- end-user-doc --> <!-- begin-model-doc -->
 	 * 
 	 * @param diagnostics
-	 *            The chain of diagnostics to which problems are to be appended.
+	 *        The chain of diagnostics to which problems are to be appended.
 	 * @param context
-	 *            The cache of context-specific information. <!-- end-model-doc
-	 *            -->
+	 *        The cache of context-specific information. <!-- end-model-doc
+	 *        -->
 	 * @model annotation=
 	 *        "http://www.eclipse.org/emf/2002/Ecore/OCL body='cornerRadius >= 0'"
 	 * @generated
 	 */
-	boolean nonNegativeCornerRadius(DiagnosticChain diagnostics,
-			Map<Object, Object> context);
-
+	boolean nonNegativeCornerRadius(DiagnosticChain diagnostics, Map<Object, Object> context);
 } // Rectangle
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/RootCanvas.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/RootCanvas.java
index 5b71af0777c..0cf91942d45 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/RootCanvas.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/RootCanvas.java
@@ -16,28 +16,28 @@ import java.awt.Color;
 import org.eclipse.emf.common.util.EList;
 
 /**
- * <!-- begin-user-doc --> A representation of the model object '
- * <em><b>Root Canvas</b></em>'. <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object ' <em><b>Root Canvas</b></em>'. <!-- end-user-doc -->
+ * 
  * <!-- begin-model-doc -->
  * RootCanvas is a kind of canvas that represents the root of containment for all graphical elements that render together.
  * <!-- end-model-doc -->
- *
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.dd.dg.RootCanvas#getBackgroundColor <em>Background Color</em>}</li>
- *   <li>{@link org.eclipse.papyrus.dd.dg.RootCanvas#getDefinitions <em>Definitions</em>}</li>
- *   <li>{@link org.eclipse.papyrus.dd.dg.RootCanvas#getExternalStyleSheets <em>External Style Sheet</em>}</li>
- *   <li>{@link org.eclipse.papyrus.dd.dg.RootCanvas#getScripts <em>Script</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.RootCanvas#getBackgroundColor <em>Background Color</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.RootCanvas#getDefinitions <em>Definitions</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.RootCanvas#getExternalStyleSheets <em>External Style Sheet</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.RootCanvas#getScripts <em>Script</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.dd.dg.DGPackage#getRootCanvas()
  * @model
  * @generated
  */
 public interface RootCanvas extends Canvas {
+
 	/**
 	 * Returns the value of the '<em><b>Background Color</b></em>' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc --> <!-- begin-model-doc --> An
@@ -58,7 +58,9 @@ public interface RootCanvas extends Canvas {
 	 * Sets the value of the '{@link org.eclipse.papyrus.dd.dg.RootCanvas#getBackgroundColor <em>Background Color</em>}' attribute.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * @param value the new value of the '<em>Background Color</em>' attribute.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Background Color</em>' attribute.
 	 * @see #isSetBackgroundColor()
 	 * @see #unsetBackgroundColor()
 	 * @see #getBackgroundColor()
@@ -70,6 +72,7 @@ public interface RootCanvas extends Canvas {
 	 * Unsets the value of the '{@link org.eclipse.papyrus.dd.dg.RootCanvas#getBackgroundColor <em>Background Color</em>}' attribute.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @see #isSetBackgroundColor()
 	 * @see #getBackgroundColor()
 	 * @see #setBackgroundColor(Color)
@@ -81,6 +84,7 @@ public interface RootCanvas extends Canvas {
 	 * Returns whether the value of the '{@link org.eclipse.papyrus.dd.dg.RootCanvas#getBackgroundColor <em>Background Color</em>}' attribute is set.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return whether the value of the '<em>Background Color</em>' attribute is set.
 	 * @see #unsetBackgroundColor()
 	 * @see #getBackgroundColor()
@@ -107,7 +111,9 @@ public interface RootCanvas extends Canvas {
 	 * Sets the value of the '{@link org.eclipse.papyrus.dd.dg.RootCanvas#getDefinitions <em>Definitions</em>}' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Definitions</em>' containment reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Definitions</em>' containment reference.
 	 * @see #getDefinitions()
 	 * @generated
 	 */
@@ -115,8 +121,7 @@ public interface RootCanvas extends Canvas {
 
 	/**
 	 * Returns the value of the '<em><b>External Style Sheet</b></em>' reference
-	 * list. The list contents are of type
-	 * {@link org.eclipse.papyrus.dd.dg.StyleSheet}. <!-- begin-user-doc -->
+	 * list. The list contents are of type {@link org.eclipse.papyrus.dd.dg.StyleSheet}. <!-- begin-user-doc -->
 	 * <!-- end-user-doc --> <!-- begin-model-doc --> A list of external style
 	 * sheets that are imported by the canvas. <!-- end-model-doc -->
 	 * 
@@ -132,15 +137,14 @@ public interface RootCanvas extends Canvas {
 	 * The list contents are of type {@link java.lang.String}.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Script</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Script</em>' attribute list isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Script</em>' attribute list.
 	 * @see org.eclipse.papyrus.dd.dg.DGPackage#getRootCanvas_Script()
 	 * @model dataType="org.eclipse.papyrus.dd.dc.String" ordered="false"
 	 * @generated
 	 */
 	EList<String> getScripts();
-
 } // RootCanvas
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Rotate.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Rotate.java
index aad9b1186f8..fc3fc1b3657 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Rotate.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Rotate.java
@@ -14,26 +14,26 @@ package org.eclipse.papyrus.dd.dg;
 import org.eclipse.papyrus.dd.dc.Point;
 
 /**
- * <!-- begin-user-doc --> A representation of the model object '
- * <em><b>Rotate</b></em>'. <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object ' <em><b>Rotate</b></em>'. <!-- end-user-doc -->
+ * 
  * <!-- begin-model-doc -->
  * Rotate is a kind of transform that rotates a graphical element by a given angle about a given center point in the x-y coordinate system.
  * <!-- end-model-doc -->
- *
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.dd.dg.Rotate#getAngle <em>Angle</em>}</li>
- *   <li>{@link org.eclipse.papyrus.dd.dg.Rotate#getCenter <em>Center</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.Rotate#getAngle <em>Angle</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.Rotate#getCenter <em>Center</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.dd.dg.DGPackage#getRotate()
  * @model
  * @generated
  */
 public interface Rotate extends Transform {
+
 	/**
 	 * Returns the value of the '<em><b>Angle</b></em>' attribute. <!--
 	 * begin-user-doc --> <!-- end-user-doc --> <!-- begin-model-doc --> a real
@@ -53,7 +53,9 @@ public interface Rotate extends Transform {
 	/**
 	 * Sets the value of the '{@link org.eclipse.papyrus.dd.dg.Rotate#getAngle <em>Angle</em>}' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Angle</em>' attribute.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Angle</em>' attribute.
 	 * @see #getAngle()
 	 * @generated
 	 */
@@ -78,10 +80,11 @@ public interface Rotate extends Transform {
 	 * Sets the value of the '{@link org.eclipse.papyrus.dd.dg.Rotate#getCenter <em>Center</em>}' containment reference.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * @param value the new value of the '<em>Center</em>' containment reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Center</em>' containment reference.
 	 * @see #getCenter()
 	 * @generated
 	 */
 	void setCenter(Point value);
-
 } // Rotate
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Scale.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Scale.java
index e5672f85a5a..52c66e1ca63 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Scale.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Scale.java
@@ -16,26 +16,26 @@ import java.util.Map;
 import org.eclipse.emf.common.util.DiagnosticChain;
 
 /**
- * <!-- begin-user-doc --> A representation of the model object '
- * <em><b>Scale</b></em>'. <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object ' <em><b>Scale</b></em>'. <!-- end-user-doc -->
+ * 
  * <!-- begin-model-doc -->
  * Scale is a kind of transform that scales (resizes) a graphical element by a given factor in the x-y coordinate system.
  * <!-- end-model-doc -->
- *
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.dd.dg.Scale#getFactorX <em>Factor X</em>}</li>
- *   <li>{@link org.eclipse.papyrus.dd.dg.Scale#getFactorY <em>Factor Y</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.Scale#getFactorX <em>Factor X</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.Scale#getFactorY <em>Factor Y</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.dd.dg.DGPackage#getScale()
  * @model
  * @generated
  */
 public interface Scale extends Transform {
+
 	/**
 	 * Returns the value of the '<em><b>Factor X</b></em>' attribute. <!--
 	 * begin-user-doc --> <!-- end-user-doc --> <!-- begin-model-doc --> a real
@@ -57,7 +57,7 @@ public interface Scale extends Transform {
 	 * -->
 	 * 
 	 * @param value
-	 *            the new value of the '<em>Factor X</em>' attribute.
+	 *        the new value of the '<em>Factor X</em>' attribute.
 	 * @see #getFactorX()
 	 * @generated
 	 */
@@ -84,7 +84,7 @@ public interface Scale extends Transform {
 	 * -->
 	 * 
 	 * @param value
-	 *            the new value of the '<em>Factor Y</em>' attribute.
+	 *        the new value of the '<em>Factor Y</em>' attribute.
 	 * @see #getFactorY()
 	 * @generated
 	 */
@@ -95,15 +95,13 @@ public interface Scale extends Transform {
 	 * scale factors cannot be negative.
 	 * 
 	 * @param diagnostics
-	 *            The chain of diagnostics to which problems are to be appended.
+	 *        The chain of diagnostics to which problems are to be appended.
 	 * @param context
-	 *            The cache of context-specific information. <!-- end-model-doc
-	 *            -->
+	 *        The cache of context-specific information. <!-- end-model-doc
+	 *        -->
 	 * @model annotation=
 	 *        "http://www.eclipse.org/emf/2002/Ecore/OCL body='factorX>=0 and factorY>=0'"
 	 * @generated
 	 */
-	boolean nonnegativescale(DiagnosticChain diagnostics,
-			Map<Object, Object> context);
-
+	boolean nonnegativescale(DiagnosticChain diagnostics, Map<Object, Object> context);
 } // Scale
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Skew.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Skew.java
index d668d312e18..8abc5a53b98 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Skew.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Skew.java
@@ -12,26 +12,26 @@
 package org.eclipse.papyrus.dd.dg;
 
 /**
- * <!-- begin-user-doc --> A representation of the model object '
- * <em><b>Skew</b></em>'. <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object ' <em><b>Skew</b></em>'. <!-- end-user-doc -->
+ * 
  * <!-- begin-model-doc -->
  * Skew is a kind of transform that skews (deforms) a graphical element by given angles in the x-y coordinate system.
  * <!-- end-model-doc -->
- *
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.dd.dg.Skew#getAngleX <em>Angle X</em>}</li>
- *   <li>{@link org.eclipse.papyrus.dd.dg.Skew#getAngleY <em>Angle Y</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.Skew#getAngleX <em>Angle X</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.Skew#getAngleY <em>Angle Y</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.dd.dg.DGPackage#getSkew()
  * @model
  * @generated
  */
 public interface Skew extends Transform {
+
 	/**
 	 * Returns the value of the '<em><b>Angle X</b></em>' attribute. <!--
 	 * begin-user-doc --> <!-- end-user-doc --> <!-- begin-model-doc --> a real
@@ -54,7 +54,7 @@ public interface Skew extends Transform {
 	 * -->
 	 * 
 	 * @param value
-	 *            the new value of the '<em>Angle X</em>' attribute.
+	 *        the new value of the '<em>Angle X</em>' attribute.
 	 * @see #getAngleX()
 	 * @generated
 	 */
@@ -82,10 +82,9 @@ public interface Skew extends Transform {
 	 * -->
 	 * 
 	 * @param value
-	 *            the new value of the '<em>Angle Y</em>' attribute.
+	 *        the new value of the '<em>Angle Y</em>' attribute.
 	 * @see #getAngleY()
 	 * @generated
 	 */
 	void setAngleY(double value);
-
 } // Skew
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Style.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Style.java
index d2d9873e08e..1c71c79bc7a 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Style.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Style.java
@@ -19,35 +19,35 @@ import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EObject;
 
 /**
- * <!-- begin-user-doc --> A representation of the model object '
- * <em><b>Style</b></em>'. <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object ' <em><b>Style</b></em>'. <!-- end-user-doc -->
+ * 
  * <!-- begin-model-doc -->
  * Style contains formatting properties that affect the appearance or style of graphical elements.
  * <!-- end-model-doc -->
- *
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.dd.dg.Style#getFill <em>Fill</em>}</li>
- *   <li>{@link org.eclipse.papyrus.dd.dg.Style#getFillOpacity <em>Fill Opacity</em>}</li>
- *   <li>{@link org.eclipse.papyrus.dd.dg.Style#getStroke <em>Stroke</em>}</li>
- *   <li>{@link org.eclipse.papyrus.dd.dg.Style#getStrokeWidth <em>Stroke Width</em>}</li>
- *   <li>{@link org.eclipse.papyrus.dd.dg.Style#getStrokeOpacity <em>Stroke Opacity</em>}</li>
- *   <li>{@link org.eclipse.papyrus.dd.dg.Style#getStrokeDashLengths <em>Stroke Dash Length</em>}</li>
- *   <li>{@link org.eclipse.papyrus.dd.dg.Style#getFontSize <em>Font Size</em>}</li>
- *   <li>{@link org.eclipse.papyrus.dd.dg.Style#getFontName <em>Font Name</em>}</li>
- *   <li>{@link org.eclipse.papyrus.dd.dg.Style#isFontItalic <em>Font Italic</em>}</li>
- *   <li>{@link org.eclipse.papyrus.dd.dg.Style#isFontBold <em>Font Bold</em>}</li>
- *   <li>{@link org.eclipse.papyrus.dd.dg.Style#getFontDecoration <em>Font Decoration</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.Style#getFill <em>Fill</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.Style#getFillOpacity <em>Fill Opacity</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.Style#getStroke <em>Stroke</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.Style#getStrokeWidth <em>Stroke Width</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.Style#getStrokeOpacity <em>Stroke Opacity</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.Style#getStrokeDashLengths <em>Stroke Dash Length</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.Style#getFontSize <em>Font Size</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.Style#getFontName <em>Font Name</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.Style#isFontItalic <em>Font Italic</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.Style#isFontBold <em>Font Bold</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.Style#getFontDecoration <em>Font Decoration</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.dd.dg.DGPackage#getStyle()
  * @model
  * @generated
  */
 public interface Style extends EObject {
+
 	/**
 	 * Returns the value of the '<em><b>Fill</b></em>' containment reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc --> <!-- begin-model-doc --> A
@@ -68,7 +68,9 @@ public interface Style extends EObject {
 	 * Sets the value of the '{@link org.eclipse.papyrus.dd.dg.Style#getFill <em>Fill</em>}' containment reference.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * @param value the new value of the '<em>Fill</em>' containment reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Fill</em>' containment reference.
 	 * @see #isSetFill()
 	 * @see #unsetFill()
 	 * @see #getFill()
@@ -80,6 +82,7 @@ public interface Style extends EObject {
 	 * Unsets the value of the '{@link org.eclipse.papyrus.dd.dg.Style#getFill <em>Fill</em>}' containment reference.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @see #isSetFill()
 	 * @see #getFill()
 	 * @see #setFill(Paint)
@@ -88,8 +91,7 @@ public interface Style extends EObject {
 	void unsetFill();
 
 	/**
-	 * Returns whether the value of the '
-	 * {@link org.eclipse.papyrus.dd.dg.Style#getFill <em>Fill</em>}'
+	 * Returns whether the value of the ' {@link org.eclipse.papyrus.dd.dg.Style#getFill <em>Fill</em>}'
 	 * containment reference is set. <!-- begin-user-doc --> <!-- end-user-doc
 	 * -->
 	 * 
@@ -124,7 +126,9 @@ public interface Style extends EObject {
 	 * Sets the value of the '{@link org.eclipse.papyrus.dd.dg.Style#getFillOpacity <em>Fill Opacity</em>}' attribute.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * @param value the new value of the '<em>Fill Opacity</em>' attribute.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Fill Opacity</em>' attribute.
 	 * @see #isSetFillOpacity()
 	 * @see #unsetFillOpacity()
 	 * @see #getFillOpacity()
@@ -136,6 +140,7 @@ public interface Style extends EObject {
 	 * Unsets the value of the '{@link org.eclipse.papyrus.dd.dg.Style#getFillOpacity <em>Fill Opacity</em>}' attribute.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @see #isSetFillOpacity()
 	 * @see #getFillOpacity()
 	 * @see #setFillOpacity(double)
@@ -147,6 +152,7 @@ public interface Style extends EObject {
 	 * Returns whether the value of the '{@link org.eclipse.papyrus.dd.dg.Style#getFillOpacity <em>Fill Opacity</em>}' attribute is set.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @return whether the value of the '<em>Fill Opacity</em>' attribute is set.
 	 * @see #unsetFillOpacity()
 	 * @see #getFillOpacity()
@@ -175,7 +181,9 @@ public interface Style extends EObject {
 	 * Sets the value of the '{@link org.eclipse.papyrus.dd.dg.Style#getStroke <em>Stroke</em>}' containment reference.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * @param value the new value of the '<em>Stroke</em>' containment reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Stroke</em>' containment reference.
 	 * @see #isSetStroke()
 	 * @see #unsetStroke()
 	 * @see #getStroke()
@@ -186,6 +194,7 @@ public interface Style extends EObject {
 	/**
 	 * Unsets the value of the '{@link org.eclipse.papyrus.dd.dg.Style#getStroke <em>Stroke</em>}' containment reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isSetStroke()
 	 * @see #getStroke()
 	 * @see #setStroke(Paint)
@@ -194,8 +203,7 @@ public interface Style extends EObject {
 	void unsetStroke();
 
 	/**
-	 * Returns whether the value of the '
-	 * {@link org.eclipse.papyrus.dd.dg.Style#getStroke <em>Stroke</em>}'
+	 * Returns whether the value of the ' {@link org.eclipse.papyrus.dd.dg.Style#getStroke <em>Stroke</em>}'
 	 * containment reference is set. <!-- begin-user-doc --> <!-- end-user-doc
 	 * -->
 	 * 
@@ -230,7 +238,9 @@ public interface Style extends EObject {
 	 * Sets the value of the '{@link org.eclipse.papyrus.dd.dg.Style#getStrokeWidth <em>Stroke Width</em>}' attribute.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * @param value the new value of the '<em>Stroke Width</em>' attribute.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Stroke Width</em>' attribute.
 	 * @see #isSetStrokeWidth()
 	 * @see #unsetStrokeWidth()
 	 * @see #getStrokeWidth()
@@ -242,6 +252,7 @@ public interface Style extends EObject {
 	 * Unsets the value of the '{@link org.eclipse.papyrus.dd.dg.Style#getStrokeWidth <em>Stroke Width</em>}' attribute.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @see #isSetStrokeWidth()
 	 * @see #getStrokeWidth()
 	 * @see #setStrokeWidth(double)
@@ -253,6 +264,7 @@ public interface Style extends EObject {
 	 * Returns whether the value of the '{@link org.eclipse.papyrus.dd.dg.Style#getStrokeWidth <em>Stroke Width</em>}' attribute is set.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @return whether the value of the '<em>Stroke Width</em>' attribute is set.
 	 * @see #unsetStrokeWidth()
 	 * @see #getStrokeWidth()
@@ -283,7 +295,9 @@ public interface Style extends EObject {
 	 * Sets the value of the '{@link org.eclipse.papyrus.dd.dg.Style#getStrokeOpacity <em>Stroke Opacity</em>}' attribute.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * @param value the new value of the '<em>Stroke Opacity</em>' attribute.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Stroke Opacity</em>' attribute.
 	 * @see #isSetStrokeOpacity()
 	 * @see #unsetStrokeOpacity()
 	 * @see #getStrokeOpacity()
@@ -295,6 +309,7 @@ public interface Style extends EObject {
 	 * Unsets the value of the '{@link org.eclipse.papyrus.dd.dg.Style#getStrokeOpacity <em>Stroke Opacity</em>}' attribute.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @see #isSetStrokeOpacity()
 	 * @see #getStrokeOpacity()
 	 * @see #setStrokeOpacity(double)
@@ -306,6 +321,7 @@ public interface Style extends EObject {
 	 * Returns whether the value of the '{@link org.eclipse.papyrus.dd.dg.Style#getStrokeOpacity <em>Stroke Opacity</em>}' attribute is set.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @return whether the value of the '<em>Stroke Opacity</em>' attribute is set.
 	 * @see #unsetStrokeOpacity()
 	 * @see #getStrokeOpacity()
@@ -338,6 +354,7 @@ public interface Style extends EObject {
 	 * Unsets the value of the '{@link org.eclipse.papyrus.dd.dg.Style#getStrokeDashLengths <em>Stroke Dash Length</em>}' attribute list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #isSetStrokeDashLengths()
 	 * @see #getStrokeDashLengths()
 	 * @generated
@@ -345,9 +362,11 @@ public interface Style extends EObject {
 	void unsetStrokeDashLengths();
 
 	/**
-	 * Returns whether the value of the '{@link org.eclipse.papyrus.dd.dg.Style#getStrokeDashLengths <em>Stroke Dash Length</em>}' attribute list is set.
+	 * Returns whether the value of the '{@link org.eclipse.papyrus.dd.dg.Style#getStrokeDashLengths <em>Stroke Dash Length</em>}' attribute list is
+	 * set.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @return whether the value of the '<em>Stroke Dash Length</em>' attribute list is set.
 	 * @see #unsetStrokeDashLengths()
 	 * @see #getStrokeDashLengths()
@@ -375,7 +394,9 @@ public interface Style extends EObject {
 	/**
 	 * Sets the value of the '{@link org.eclipse.papyrus.dd.dg.Style#getFontSize <em>Font Size</em>}' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Font Size</em>' attribute.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Font Size</em>' attribute.
 	 * @see #isSetFontSize()
 	 * @see #unsetFontSize()
 	 * @see #getFontSize()
@@ -386,6 +407,7 @@ public interface Style extends EObject {
 	/**
 	 * Unsets the value of the '{@link org.eclipse.papyrus.dd.dg.Style#getFontSize <em>Font Size</em>}' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isSetFontSize()
 	 * @see #getFontSize()
 	 * @see #setFontSize(double)
@@ -396,6 +418,7 @@ public interface Style extends EObject {
 	/**
 	 * Returns whether the value of the '{@link org.eclipse.papyrus.dd.dg.Style#getFontSize <em>Font Size</em>}' attribute is set.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return whether the value of the '<em>Font Size</em>' attribute is set.
 	 * @see #unsetFontSize()
 	 * @see #getFontSize()
@@ -424,7 +447,9 @@ public interface Style extends EObject {
 	/**
 	 * Sets the value of the '{@link org.eclipse.papyrus.dd.dg.Style#getFontName <em>Font Name</em>}' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Font Name</em>' attribute.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Font Name</em>' attribute.
 	 * @see #isSetFontName()
 	 * @see #unsetFontName()
 	 * @see #getFontName()
@@ -435,6 +460,7 @@ public interface Style extends EObject {
 	/**
 	 * Unsets the value of the '{@link org.eclipse.papyrus.dd.dg.Style#getFontName <em>Font Name</em>}' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isSetFontName()
 	 * @see #getFontName()
 	 * @see #setFontName(String)
@@ -445,6 +471,7 @@ public interface Style extends EObject {
 	/**
 	 * Returns whether the value of the '{@link org.eclipse.papyrus.dd.dg.Style#getFontName <em>Font Name</em>}' attribute is set.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return whether the value of the '<em>Font Name</em>' attribute is set.
 	 * @see #unsetFontName()
 	 * @see #getFontName()
@@ -473,7 +500,9 @@ public interface Style extends EObject {
 	/**
 	 * Sets the value of the '{@link org.eclipse.papyrus.dd.dg.Style#isFontItalic <em>Font Italic</em>}' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Font Italic</em>' attribute.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Font Italic</em>' attribute.
 	 * @see #isSetFontItalic()
 	 * @see #unsetFontItalic()
 	 * @see #isFontItalic()
@@ -484,6 +513,7 @@ public interface Style extends EObject {
 	/**
 	 * Unsets the value of the '{@link org.eclipse.papyrus.dd.dg.Style#isFontItalic <em>Font Italic</em>}' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isSetFontItalic()
 	 * @see #isFontItalic()
 	 * @see #setFontItalic(boolean)
@@ -494,6 +524,7 @@ public interface Style extends EObject {
 	/**
 	 * Returns whether the value of the '{@link org.eclipse.papyrus.dd.dg.Style#isFontItalic <em>Font Italic</em>}' attribute is set.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return whether the value of the '<em>Font Italic</em>' attribute is set.
 	 * @see #unsetFontItalic()
 	 * @see #isFontItalic()
@@ -525,7 +556,7 @@ public interface Style extends EObject {
 	 * -->
 	 * 
 	 * @param value
-	 *            the new value of the '<em>Font Bold</em>' attribute.
+	 *        the new value of the '<em>Font Bold</em>' attribute.
 	 * @see #isSetFontBold()
 	 * @see #unsetFontBold()
 	 * @see #isFontBold()
@@ -536,6 +567,7 @@ public interface Style extends EObject {
 	/**
 	 * Unsets the value of the '{@link org.eclipse.papyrus.dd.dg.Style#isFontBold <em>Font Bold</em>}' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isSetFontBold()
 	 * @see #isFontBold()
 	 * @see #setFontBold(boolean)
@@ -546,6 +578,7 @@ public interface Style extends EObject {
 	/**
 	 * Returns whether the value of the '{@link org.eclipse.papyrus.dd.dg.Style#isFontBold <em>Font Bold</em>}' attribute is set.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return whether the value of the '<em>Font Bold</em>' attribute is set.
 	 * @see #unsetFontBold()
 	 * @see #isFontBold()
@@ -556,8 +589,7 @@ public interface Style extends EObject {
 
 	/**
 	 * Returns the value of the '<em><b>Font Decoration</b></em>' attribute. The
-	 * literals are from the enumeration
-	 * {@link org.eclipse.papyrus.dd.dg.FontDecoration}. <!-- begin-user-doc -->
+	 * literals are from the enumeration {@link org.eclipse.papyrus.dd.dg.FontDecoration}. <!-- begin-user-doc -->
 	 * <!-- end-user-doc --> <!-- begin-model-doc --> The decoration of the font
 	 * used to render a text element. The default is no decoration. <!--
 	 * end-model-doc -->
@@ -577,7 +609,9 @@ public interface Style extends EObject {
 	 * Sets the value of the '{@link org.eclipse.papyrus.dd.dg.Style#getFontDecoration <em>Font Decoration</em>}' attribute.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * @param value the new value of the '<em>Font Decoration</em>' attribute.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Font Decoration</em>' attribute.
 	 * @see org.eclipse.papyrus.dd.dg.FontDecoration
 	 * @see #isSetFontDecoration()
 	 * @see #unsetFontDecoration()
@@ -590,6 +624,7 @@ public interface Style extends EObject {
 	 * Unsets the value of the '{@link org.eclipse.papyrus.dd.dg.Style#getFontDecoration <em>Font Decoration</em>}' attribute.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @see #isSetFontDecoration()
 	 * @see #getFontDecoration()
 	 * @see #setFontDecoration(FontDecoration)
@@ -601,6 +636,7 @@ public interface Style extends EObject {
 	 * Returns whether the value of the '{@link org.eclipse.papyrus.dd.dg.Style#getFontDecoration <em>Font Decoration</em>}' attribute is set.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @return whether the value of the '<em>Font Decoration</em>' attribute is set.
 	 * @see #unsetFontDecoration()
 	 * @see #getFontDecoration()
@@ -614,79 +650,73 @@ public interface Style extends EObject {
 	 * the font size is non-negative
 	 * 
 	 * @param diagnostics
-	 *            The chain of diagnostics to which problems are to be appended.
+	 *        The chain of diagnostics to which problems are to be appended.
 	 * @param context
-	 *            The cache of context-specific information. <!-- end-model-doc
-	 *            -->
+	 *        The cache of context-specific information. <!-- end-model-doc
+	 *        -->
 	 * @model annotation=
 	 *        "http://www.eclipse.org/emf/2002/Ecore/OCL body='fontSize >=  0'"
 	 * @generated
 	 */
-	boolean validFontSize(DiagnosticChain diagnostics,
-			Map<Object, Object> context);
+	boolean validFontSize(DiagnosticChain diagnostics, Map<Object, Object> context);
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc --> <!-- begin-model-doc -->
 	 * the stroke width is non-negative
 	 * 
 	 * @param diagnostics
-	 *            The chain of diagnostics to which problems are to be appended.
+	 *        The chain of diagnostics to which problems are to be appended.
 	 * @param context
-	 *            The cache of context-specific information. <!-- end-model-doc
-	 *            -->
+	 *        The cache of context-specific information. <!-- end-model-doc
+	 *        -->
 	 * @model annotation=
 	 *        "http://www.eclipse.org/emf/2002/Ecore/OCL body='fillOpacity >=  0 and fillOpacity <=1'"
 	 * @generated
 	 */
-	boolean validFillOpacity(DiagnosticChain diagnostics,
-			Map<Object, Object> context);
+	boolean validFillOpacity(DiagnosticChain diagnostics, Map<Object, Object> context);
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc --> <!-- begin-model-doc -->
 	 * the stroke width is non-negative
 	 * 
 	 * @param diagnostics
-	 *            The chain of diagnostics to which problems are to be appended.
+	 *        The chain of diagnostics to which problems are to be appended.
 	 * @param context
-	 *            The cache of context-specific information. <!-- end-model-doc
-	 *            -->
+	 *        The cache of context-specific information. <!-- end-model-doc
+	 *        -->
 	 * @model annotation=
 	 *        "http://www.eclipse.org/emf/2002/Ecore/OCL body='strokeWidth >=  0'"
 	 * @generated
 	 */
-	boolean validStrokeWidth(DiagnosticChain diagnostics,
-			Map<Object, Object> context);
+	boolean validStrokeWidth(DiagnosticChain diagnostics, Map<Object, Object> context);
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc --> <!-- begin-model-doc -->
 	 * the size of the stroke dash length list must be even.
 	 * 
 	 * @param diagnostics
-	 *            The chain of diagnostics to which problems are to be appended.
+	 *        The chain of diagnostics to which problems are to be appended.
 	 * @param context
-	 *            The cache of context-specific information. <!-- end-model-doc
-	 *            -->
+	 *        The cache of context-specific information. <!-- end-model-doc
+	 *        -->
 	 * @model annotation=
 	 *        "http://www.eclipse.org/emf/2002/Ecore/OCL body='strokeDashLength->size().mod(2) = 0'"
 	 * @generated
 	 */
-	boolean validDashLengthSize(DiagnosticChain diagnostics,
-			Map<Object, Object> context);
+	boolean validDashLengthSize(DiagnosticChain diagnostics, Map<Object, Object> context);
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc --> <!-- begin-model-doc -->
 	 * the opacity of the fill is non-negative
 	 * 
 	 * @param diagnostics
-	 *            The chain of diagnostics to which problems are to be appended.
+	 *        The chain of diagnostics to which problems are to be appended.
 	 * @param context
-	 *            The cache of context-specific information. <!-- end-model-doc
-	 *            -->
+	 *        The cache of context-specific information. <!-- end-model-doc
+	 *        -->
 	 * @model annotation=
 	 *        "http://www.eclipse.org/emf/2002/Ecore/OCL body='strokeOpacity >=  0 and strokeOpacity <=1'"
 	 * @generated
 	 */
-	boolean validStrokeOpacity(DiagnosticChain diagnostics,
-			Map<Object, Object> context);
-
+	boolean validStrokeOpacity(DiagnosticChain diagnostics, Map<Object, Object> context);
 } // Style
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/StyleRule.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/StyleRule.java
index 640bb279691..856ce088b49 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/StyleRule.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/StyleRule.java
@@ -16,26 +16,25 @@ import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EObject;
 
 /**
- * <!-- begin-user-doc --> A representation of the model object '
- * <em><b>Style Rule</b></em>'. <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object ' <em><b>Style Rule</b></em>'. <!-- end-user-doc -->
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.dd.dg.StyleRule#getSelectors <em>Selector</em>}</li>
- *   <li>{@link org.eclipse.papyrus.dd.dg.StyleRule#getStyle <em>Style</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.StyleRule#getSelectors <em>Selector</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.StyleRule#getStyle <em>Style</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.dd.dg.DGPackage#getStyleRule()
  * @model
  * @generated
  */
 public interface StyleRule extends EObject {
+
 	/**
 	 * Returns the value of the '<em><b>Selector</b></em>' containment reference
-	 * list. The list contents are of type
-	 * {@link org.eclipse.papyrus.dd.dg.StyleSelector}. <!-- begin-user-doc -->
+	 * list. The list contents are of type {@link org.eclipse.papyrus.dd.dg.StyleSelector}. <!-- begin-user-doc -->
 	 * <!-- end-user-doc --> <!-- begin-model-doc --> A set of selectors for
 	 * graphical elements to apply the rule to. <!-- end-model-doc -->
 	 * 
@@ -63,10 +62,11 @@ public interface StyleRule extends EObject {
 	/**
 	 * Sets the value of the '{@link org.eclipse.papyrus.dd.dg.StyleRule#getStyle <em>Style</em>}' containment reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Style</em>' containment reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Style</em>' containment reference.
 	 * @see #getStyle()
 	 * @generated
 	 */
 	void setStyle(Style value);
-
 } // StyleRule
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/StyleSelector.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/StyleSelector.java
index 5a7cf3ab67b..087b644f465 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/StyleSelector.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/StyleSelector.java
@@ -15,22 +15,22 @@ import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EObject;
 
 /**
- * <!-- begin-user-doc --> A representation of the model object '
- * <em><b>Style Selector</b></em>'. <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object ' <em><b>Style Selector</b></em>'. <!-- end-user-doc -->
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.dd.dg.StyleSelector#getKind <em>Kind</em>}</li>
- *   <li>{@link org.eclipse.papyrus.dd.dg.StyleSelector#getClasses <em>Class</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.StyleSelector#getKind <em>Kind</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.StyleSelector#getClasses <em>Class</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.dd.dg.DGPackage#getStyleSelector()
  * @model
  * @generated
  */
 public interface StyleSelector extends EObject {
+
 	/**
 	 * Returns the value of the '<em><b>Kind</b></em>' attribute. The literals
 	 * are from the enumeration {@link org.eclipse.papyrus.dd.dg.ElementKind}.
@@ -51,7 +51,9 @@ public interface StyleSelector extends EObject {
 	/**
 	 * Sets the value of the '{@link org.eclipse.papyrus.dd.dg.StyleSelector#getKind <em>Kind</em>}' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Kind</em>' attribute.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Kind</em>' attribute.
 	 * @see org.eclipse.papyrus.dd.dg.ElementKind
 	 * @see #isSetKind()
 	 * @see #unsetKind()
@@ -63,6 +65,7 @@ public interface StyleSelector extends EObject {
 	/**
 	 * Unsets the value of the '{@link org.eclipse.papyrus.dd.dg.StyleSelector#getKind <em>Kind</em>}' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isSetKind()
 	 * @see #getKind()
 	 * @see #setKind(ElementKind)
@@ -73,6 +76,7 @@ public interface StyleSelector extends EObject {
 	/**
 	 * Returns whether the value of the '{@link org.eclipse.papyrus.dd.dg.StyleSelector#getKind <em>Kind</em>}' attribute is set.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return whether the value of the '<em>Kind</em>' attribute is set.
 	 * @see #unsetKind()
 	 * @see #getKind()
@@ -94,5 +98,4 @@ public interface StyleSelector extends EObject {
 	 * @generated
 	 */
 	EList<String> getClasses();
-
 } // StyleSelector
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/StyleSheet.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/StyleSheet.java
index 8e39b4e46bc..01a04265a99 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/StyleSheet.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/StyleSheet.java
@@ -16,25 +16,24 @@ import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EObject;
 
 /**
- * <!-- begin-user-doc --> A representation of the model object '
- * <em><b>Style Sheet</b></em>'. <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object ' <em><b>Style Sheet</b></em>'. <!-- end-user-doc -->
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.dd.dg.StyleSheet#getRules <em>Rule</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.StyleSheet#getRules <em>Rule</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.dd.dg.DGPackage#getStyleSheet()
  * @model
  * @generated
  */
 public interface StyleSheet extends EObject {
+
 	/**
 	 * Returns the value of the '<em><b>Rule</b></em>' containment reference
-	 * list. The list contents are of type
-	 * {@link org.eclipse.papyrus.dd.dg.StyleRule}. <!-- begin-user-doc --> <!--
+	 * list. The list contents are of type {@link org.eclipse.papyrus.dd.dg.StyleRule}. <!-- begin-user-doc --> <!--
 	 * end-user-doc --> <!-- begin-model-doc --> A list of style rules that
 	 * apply to graphical elements. <!-- end-model-doc -->
 	 * 
@@ -44,5 +43,4 @@ public interface StyleSheet extends EObject {
 	 * @generated
 	 */
 	EList<StyleRule> getRules();
-
 } // StyleSheet
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Text.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Text.java
index bf497e3bd3a..ab23ca15edd 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Text.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Text.java
@@ -16,27 +16,27 @@ import org.eclipse.emf.common.util.DiagnosticChain;
 import org.eclipse.papyrus.dd.dc.Point;
 
 /**
- * <!-- begin-user-doc --> A representation of the model object '
- * <em><b>Text</b></em>'. <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object ' <em><b>Text</b></em>'. <!-- end-user-doc -->
+ * 
  * <!-- begin-model-doc -->
  * Text is a graphical element that defines a shape that renders a character string at a given position.
  * <!-- end-model-doc -->
- *
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.dd.dg.Text#getData <em>Data</em>}</li>
- *   <li>{@link org.eclipse.papyrus.dd.dg.Text#getPosition <em>Position</em>}</li>
- *   <li>{@link org.eclipse.papyrus.dd.dg.Text#getAnchor <em>Anchor</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.Text#getData <em>Data</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.Text#getPosition <em>Position</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.Text#getAnchor <em>Anchor</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.dd.dg.DGPackage#getText()
  * @model
  * @generated
  */
 public interface Text extends GraphicalElement {
+
 	/**
 	 * Returns the value of the '<em><b>Data</b></em>' attribute. <!--
 	 * begin-user-doc --> <!-- end-user-doc --> <!-- begin-model-doc --> the
@@ -54,7 +54,9 @@ public interface Text extends GraphicalElement {
 	/**
 	 * Sets the value of the '{@link org.eclipse.papyrus.dd.dg.Text#getData <em>Data</em>}' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Data</em>' attribute.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Data</em>' attribute.
 	 * @see #getData()
 	 * @generated
 	 */
@@ -78,7 +80,9 @@ public interface Text extends GraphicalElement {
 	 * Sets the value of the '{@link org.eclipse.papyrus.dd.dg.Text#getPosition <em>Position</em>}' containment reference.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * @param value the new value of the '<em>Position</em>' containment reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Position</em>' containment reference.
 	 * @see #getPosition()
 	 * @generated
 	 */
@@ -89,10 +93,10 @@ public interface Text extends GraphicalElement {
 	 * The literals are from the enumeration {@link org.eclipse.papyrus.dd.dg.TextAnchor}.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Anchor</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Anchor</em>' attribute isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Anchor</em>' attribute.
 	 * @see org.eclipse.papyrus.dd.dg.TextAnchor
 	 * @see #setAnchor(TextAnchor)
@@ -106,7 +110,9 @@ public interface Text extends GraphicalElement {
 	 * Sets the value of the '{@link org.eclipse.papyrus.dd.dg.Text#getAnchor <em>Anchor</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Anchor</em>' attribute.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Anchor</em>' attribute.
 	 * @see org.eclipse.papyrus.dd.dg.TextAnchor
 	 * @see #getAnchor()
 	 * @generated
@@ -117,15 +123,13 @@ public interface Text extends GraphicalElement {
 	 * <!-- begin-user-doc --> <!-- end-user-doc --> <!-- begin-model-doc -->
 	 * 
 	 * @param diagnostics
-	 *            The chain of diagnostics to which problems are to be appended.
+	 *        The chain of diagnostics to which problems are to be appended.
 	 * @param context
-	 *            The cache of context-specific information. <!-- end-model-doc
-	 *            -->
+	 *        The cache of context-specific information. <!-- end-model-doc
+	 *        -->
 	 * @model annotation=
 	 *        "http://www.eclipse.org/emf/2002/Ecore/OCL body='data->notEmpty() implies data.size() > 0'"
 	 * @generated
 	 */
-	boolean dataCannotBeEmpty(DiagnosticChain diagnostics,
-			Map<Object, Object> context);
-
+	boolean dataCannotBeEmpty(DiagnosticChain diagnostics, Map<Object, Object> context);
 } // Text
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/TextAnchor.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/TextAnchor.java
index 80ea8836dc6..11d5d3a06a4 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/TextAnchor.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/TextAnchor.java
@@ -22,6 +22,7 @@ import org.eclipse.emf.common.util.Enumerator;
  * A representation of the literals of the enumeration '<em><b>Text Anchor</b></em>',
  * and utility methods for working with them.
  * <!-- end-user-doc -->
+ * 
  * @see org.eclipse.papyrus.dd.dg.DGPackage#getTextAnchor()
  * @model
  * @generated
@@ -31,26 +32,27 @@ public enum TextAnchor implements Enumerator {
 	 * The '<em><b>Start</b></em>' literal object.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #START_VALUE
 	 * @generated
 	 * @ordered
 	 */
 	START(0, "start", "start"),
-
 	/**
 	 * The '<em><b>Middle</b></em>' literal object.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #MIDDLE_VALUE
 	 * @generated
 	 * @ordered
 	 */
 	MIDDLE(1, "middle", "middle"),
-
 	/**
 	 * The '<em><b>End</b></em>' literal object.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #END_VALUE
 	 * @generated
 	 * @ordered
@@ -61,10 +63,10 @@ public enum TextAnchor implements Enumerator {
 	 * The '<em><b>Start</b></em>' literal value.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of '<em><b>Start</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of '<em><b>Start</b></em>' literal object isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #START
 	 * @model name="start"
 	 * @generated
@@ -76,10 +78,10 @@ public enum TextAnchor implements Enumerator {
 	 * The '<em><b>Middle</b></em>' literal value.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of '<em><b>Middle</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of '<em><b>Middle</b></em>' literal object isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #MIDDLE
 	 * @model name="middle"
 	 * @generated
@@ -91,10 +93,10 @@ public enum TextAnchor implements Enumerator {
 	 * The '<em><b>End</b></em>' literal value.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of '<em><b>End</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of '<em><b>End</b></em>' literal object isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #END
 	 * @model name="end"
 	 * @generated
@@ -106,19 +108,16 @@ public enum TextAnchor implements Enumerator {
 	 * An array of all the '<em><b>Text Anchor</b></em>' enumerators.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	private static final TextAnchor[] VALUES_ARRAY =
-		new TextAnchor[] {
-			START,
-			MIDDLE,
-			END,
-		};
+	private static final TextAnchor[] VALUES_ARRAY = new TextAnchor[]{ START, MIDDLE, END, };
 
 	/**
 	 * A public read-only list of all the '<em><b>Text Anchor</b></em>' enumerators.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static final List<TextAnchor> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
@@ -127,12 +126,13 @@ public enum TextAnchor implements Enumerator {
 	 * Returns the '<em><b>Text Anchor</b></em>' literal with the specified literal value.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static TextAnchor get(String literal) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+		for(int i = 0; i < VALUES_ARRAY.length; ++i) {
 			TextAnchor result = VALUES_ARRAY[i];
-			if (result.toString().equals(literal)) {
+			if(result.toString().equals(literal)) {
 				return result;
 			}
 		}
@@ -143,12 +143,13 @@ public enum TextAnchor implements Enumerator {
 	 * Returns the '<em><b>Text Anchor</b></em>' literal with the specified name.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static TextAnchor getByName(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+		for(int i = 0; i < VALUES_ARRAY.length; ++i) {
 			TextAnchor result = VALUES_ARRAY[i];
-			if (result.getName().equals(name)) {
+			if(result.getName().equals(name)) {
 				return result;
 			}
 		}
@@ -159,13 +160,17 @@ public enum TextAnchor implements Enumerator {
 	 * Returns the '<em><b>Text Anchor</b></em>' literal with the specified integer value.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static TextAnchor get(int value) {
-		switch (value) {
-			case START_VALUE: return START;
-			case MIDDLE_VALUE: return MIDDLE;
-			case END_VALUE: return END;
+		switch(value) {
+		case START_VALUE:
+			return START;
+		case MIDDLE_VALUE:
+			return MIDDLE;
+		case END_VALUE:
+			return END;
 		}
 		return null;
 	}
@@ -173,6 +178,7 @@ public enum TextAnchor implements Enumerator {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private final int value;
@@ -180,6 +186,7 @@ public enum TextAnchor implements Enumerator {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private final String name;
@@ -187,6 +194,7 @@ public enum TextAnchor implements Enumerator {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private final String literal;
@@ -195,6 +203,7 @@ public enum TextAnchor implements Enumerator {
 	 * Only this class can construct instances.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private TextAnchor(int value, String name, String literal) {
@@ -206,39 +215,42 @@ public enum TextAnchor implements Enumerator {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public int getValue() {
-	  return value;
+		return value;
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getName() {
-	  return name;
+		return name;
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getLiteral() {
-	  return literal;
+		return literal;
 	}
 
 	/**
 	 * Returns the literal value of the enumerator, which is its string representation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
 		return literal;
 	}
-	
 } //TextAnchor
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Transform.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Transform.java
index c712a7ab3eb..b89df55ca5e 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Transform.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Transform.java
@@ -14,14 +14,13 @@ package org.eclipse.papyrus.dd.dg;
 import org.eclipse.emf.ecore.EObject;
 
 /**
- * <!-- begin-user-doc --> A representation of the model object '
- * <em><b>Transform</b></em>'. <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object ' <em><b>Transform</b></em>'. <!-- end-user-doc -->
+ * 
  * <!-- begin-model-doc -->
  * Transform defines an operation that changes the geometry of a graphical element in a specific way.
  * <!-- end-model-doc -->
- *
- *
+ * 
+ * 
  * @see org.eclipse.papyrus.dd.dg.DGPackage#getTransform()
  * @model abstract="true"
  * @generated
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Translate.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Translate.java
index 33a079abb93..00a00ccdd53 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Translate.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Translate.java
@@ -12,26 +12,26 @@
 package org.eclipse.papyrus.dd.dg;
 
 /**
- * <!-- begin-user-doc --> A representation of the model object '
- * <em><b>Translate</b></em>'. <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object ' <em><b>Translate</b></em>'. <!-- end-user-doc -->
+ * 
  * <!-- begin-model-doc -->
  * Translate is a kind of transform that translates (moves) a graphical element by a given delta along the x-y coordinate system.
  * <!-- end-model-doc -->
- *
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.dd.dg.Translate#getDeltaX <em>Delta X</em>}</li>
- *   <li>{@link org.eclipse.papyrus.dd.dg.Translate#getDeltaY <em>Delta Y</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.Translate#getDeltaX <em>Delta X</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.Translate#getDeltaY <em>Delta Y</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.dd.dg.DGPackage#getTranslate()
  * @model
  * @generated
  */
 public interface Translate extends Transform {
+
 	/**
 	 * Returns the value of the '<em><b>Delta X</b></em>' attribute. <!--
 	 * begin-user-doc --> <!-- end-user-doc --> <!-- begin-model-doc --> a real
@@ -50,7 +50,9 @@ public interface Translate extends Transform {
 	/**
 	 * Sets the value of the '{@link org.eclipse.papyrus.dd.dg.Translate#getDeltaX <em>Delta X</em>}' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Delta X</em>' attribute.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Delta X</em>' attribute.
 	 * @see #getDeltaX()
 	 * @generated
 	 */
@@ -74,10 +76,11 @@ public interface Translate extends Transform {
 	/**
 	 * Sets the value of the '{@link org.eclipse.papyrus.dd.dg.Translate#getDeltaY <em>Delta Y</em>}' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Delta Y</em>' attribute.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Delta Y</em>' attribute.
 	 * @see #getDeltaY()
 	 * @generated
 	 */
 	void setDeltaY(double value);
-
 } // Translate
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Use.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Use.java
index 58391c1294d..46da3204bec 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Use.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/Use.java
@@ -16,26 +16,27 @@ import org.eclipse.emf.common.util.DiagnosticChain;
 import org.eclipse.papyrus.dd.dc.Bounds;
 
 /**
- * <!-- begin-user-doc --> A representation of the model object '
- * <em><b>Use</b></em>'. <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object ' <em><b>Use</b></em>'. <!-- end-user-doc -->
+ * 
  * <!-- begin-model-doc -->
- * Rectangle is a graphical element that defines a rectangular shape with given bounds. A rectangle may be given rounded corners by setting its corner radius.
+ * Rectangle is a graphical element that defines a rectangular shape with given bounds. A rectangle may be given rounded corners by setting its corner
+ * radius.
  * <!-- end-model-doc -->
- *
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.dd.dg.Use#getBounds <em>Bounds</em>}</li>
- *   <li>{@link org.eclipse.papyrus.dd.dg.Use#getReferencedElement <em>Referenced Element</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.Use#getBounds <em>Bounds</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.Use#getReferencedElement <em>Referenced Element</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.dd.dg.DGPackage#getUse()
  * @model
  * @generated
  */
 public interface Use extends GraphicalElement {
+
 	/**
 	 * Returns the value of the '<em><b>Bounds</b></em>' containment reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc --> <!-- begin-model-doc -->
@@ -54,7 +55,9 @@ public interface Use extends GraphicalElement {
 	 * Sets the value of the '{@link org.eclipse.papyrus.dd.dg.Use#getBounds <em>Bounds</em>}' containment reference.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * @param value the new value of the '<em>Bounds</em>' containment reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Bounds</em>' containment reference.
 	 * @see #getBounds()
 	 * @generated
 	 */
@@ -78,7 +81,9 @@ public interface Use extends GraphicalElement {
 	 * Sets the value of the '{@link org.eclipse.papyrus.dd.dg.Use#getReferencedElement <em>Referenced Element</em>}' reference.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * @param value the new value of the '<em>Referenced Element</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Referenced Element</em>' reference.
 	 * @see #getReferencedElement()
 	 * @generated
 	 */
@@ -88,15 +93,13 @@ public interface Use extends GraphicalElement {
 	 * <!-- begin-user-doc --> <!-- end-user-doc --> <!-- begin-model-doc -->
 	 * 
 	 * @param diagnostics
-	 *            The chain of diagnostics to which problems are to be appended.
+	 *        The chain of diagnostics to which problems are to be appended.
 	 * @param context
-	 *            The cache of context-specific information. <!-- end-model-doc
-	 *            -->
+	 *        The cache of context-specific information. <!-- end-model-doc
+	 *        -->
 	 * @model annotation=
 	 *        "http://www.eclipse.org/emf/2002/Ecore/OCL body='referencedElement->notEmpty() implies referencedElement.id->notEmpty()'"
 	 * @generated
 	 */
-	boolean referencedElementHasId(DiagnosticChain diagnostics,
-			Map<Object, Object> context);
-
+	boolean referencedElementHasId(DiagnosticChain diagnostics, Map<Object, Object> context);
 } // Use
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/CanvasImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/CanvasImpl.java
index 1b1fa05944f..cd2c9394617 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/CanvasImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/CanvasImpl.java
@@ -31,21 +31,22 @@ import org.eclipse.papyrus.dd.dg.DGPackage;
 import org.eclipse.papyrus.dd.dg.util.DGValidator;
 
 /**
- * <!-- begin-user-doc --> An implementation of the model object '
- * <em><b>Canvas</b></em>'. <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object ' <em><b>Canvas</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.dd.dg.impl.CanvasImpl#getBounds <em>Bounds</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.impl.CanvasImpl#getBounds <em>Bounds</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class CanvasImpl extends GroupImpl implements Canvas {
+
 	/**
 	 * The cached value of the '{@link #getBounds() <em>Bounds</em>}' containment reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getBounds()
 	 * @generated
 	 * @ordered
@@ -54,6 +55,7 @@ public class CanvasImpl extends GroupImpl implements Canvas {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected CanvasImpl() {
@@ -62,6 +64,7 @@ public class CanvasImpl extends GroupImpl implements Canvas {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -71,6 +74,7 @@ public class CanvasImpl extends GroupImpl implements Canvas {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Bounds getBounds() {
@@ -79,45 +83,47 @@ public class CanvasImpl extends GroupImpl implements Canvas {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public NotificationChain basicSetBounds(Bounds newBounds,
-			NotificationChain msgs) {
+	public NotificationChain basicSetBounds(Bounds newBounds, NotificationChain msgs) {
 		Bounds oldBounds = bounds;
 		bounds = newBounds;
-		if (eNotificationRequired()) {
+		if(eNotificationRequired()) {
 			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, DGPackage.CANVAS__BOUNDS, oldBounds, newBounds);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
+			if(msgs == null)
+				msgs = notification;
+			else
+				msgs.add(notification);
 		}
 		return msgs;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setBounds(Bounds newBounds) {
-		if (newBounds != bounds) {
+		if(newBounds != bounds) {
 			NotificationChain msgs = null;
-			if (bounds != null)
+			if(bounds != null)
 				msgs = ((InternalEObject)bounds).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - DGPackage.CANVAS__BOUNDS, null, msgs);
-			if (newBounds != null)
+			if(newBounds != null)
 				msgs = ((InternalEObject)newBounds).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - DGPackage.CANVAS__BOUNDS, null, msgs);
 			msgs = basicSetBounds(newBounds, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
+			if(msgs != null)
+				msgs.dispatch();
+		} else if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.CANVAS__BOUNDS, newBounds, newBounds));
 	}
 
 	/**
-	 * The cached validation expression for the '
-	 * {@link #canvasCannotHaveTransforms(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
+	 * The cached validation expression for the ' {@link #canvasCannotHaveTransforms(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
 	 * <em>Canvas Cannot Have Transforms</em>}' invariant operation. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
-	 * @see #canvasCannotHaveTransforms(org.eclipse.emf.common.util.DiagnosticChain,
-	 *      java.util.Map)
+	 * @see #canvasCannotHaveTransforms(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
 	 * @generated
 	 * @ordered
 	 */
@@ -125,105 +131,97 @@ public class CanvasImpl extends GroupImpl implements Canvas {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public boolean canvasCannotHaveTransforms(DiagnosticChain diagnostics,
-			Map<Object, Object> context) {
-		return
-			DGValidator.validate
-				(DGPackage.Literals.CANVAS,
-				 this,
-				 diagnostics,
-				 context,
-				 "http://www.eclipse.org/emf/2002/Ecore/OCL",
-				 DGPackage.Literals.CANVAS___CANVAS_CANNOT_HAVE_TRANSFORMS__DIAGNOSTICCHAIN_MAP,
-				 CANVAS_CANNOT_HAVE_TRANSFORMS_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION,
-				 Diagnostic.ERROR,
-				 DGValidator.DIAGNOSTIC_SOURCE,
-				 DGValidator.CANVAS__CANVAS_CANNOT_HAVE_TRANSFORMS);
+	public boolean canvasCannotHaveTransforms(DiagnosticChain diagnostics, Map<Object, Object> context) {
+		return DGValidator.validate(DGPackage.Literals.CANVAS, this, diagnostics, context, "http://www.eclipse.org/emf/2002/Ecore/OCL", DGPackage.Literals.CANVAS___CANVAS_CANNOT_HAVE_TRANSFORMS__DIAGNOSTICCHAIN_MAP, CANVAS_CANNOT_HAVE_TRANSFORMS_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION, Diagnostic.ERROR, DGValidator.DIAGNOSTIC_SOURCE, DGValidator.CANVAS__CANVAS_CANNOT_HAVE_TRANSFORMS);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd,
-			int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case DGPackage.CANVAS__BOUNDS:
-				return basicSetBounds(null, msgs);
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch(featureID) {
+		case DGPackage.CANVAS__BOUNDS:
+			return basicSetBounds(null, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case DGPackage.CANVAS__BOUNDS:
-				return getBounds();
+		switch(featureID) {
+		case DGPackage.CANVAS__BOUNDS:
+			return getBounds();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case DGPackage.CANVAS__BOUNDS:
-				setBounds((Bounds)newValue);
-				return;
+		switch(featureID) {
+		case DGPackage.CANVAS__BOUNDS:
+			setBounds((Bounds)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case DGPackage.CANVAS__BOUNDS:
-				setBounds((Bounds)null);
-				return;
+		switch(featureID) {
+		case DGPackage.CANVAS__BOUNDS:
+			setBounds((Bounds)null);
+			return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case DGPackage.CANVAS__BOUNDS:
-				return bounds != null;
+		switch(featureID) {
+		case DGPackage.CANVAS__BOUNDS:
+			return bounds != null;
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	@SuppressWarnings("unchecked")
-	public Object eInvoke(int operationID, EList<?> arguments)
-			throws InvocationTargetException {
-		switch (operationID) {
-			case DGPackage.CANVAS___CANVAS_CANNOT_HAVE_TRANSFORMS__DIAGNOSTICCHAIN_MAP:
-				return canvasCannotHaveTransforms((DiagnosticChain)arguments.get(0), (Map<Object, Object>)arguments.get(1));
+	public Object eInvoke(int operationID, EList<?> arguments) throws InvocationTargetException {
+		switch(operationID) {
+		case DGPackage.CANVAS___CANVAS_CANNOT_HAVE_TRANSFORMS__DIAGNOSTICCHAIN_MAP:
+			return canvasCannotHaveTransforms((DiagnosticChain)arguments.get(0), (Map<Object, Object>)arguments.get(1));
 		}
 		return super.eInvoke(operationID, arguments);
 	}
-
 } // CanvasImpl
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/CircleImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/CircleImpl.java
index 3b066dec347..0a49a22e38d 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/CircleImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/CircleImpl.java
@@ -35,22 +35,23 @@ import org.eclipse.papyrus.dd.dg.DGPackage;
 import org.eclipse.papyrus.dd.dg.util.DGValidator;
 
 /**
- * <!-- begin-user-doc --> An implementation of the model object '
- * <em><b>Circle</b></em>'. <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object ' <em><b>Circle</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.dd.dg.impl.CircleImpl#getCenter <em>Center</em>}</li>
- *   <li>{@link org.eclipse.papyrus.dd.dg.impl.CircleImpl#getRadius <em>Radius</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.impl.CircleImpl#getCenter <em>Center</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.impl.CircleImpl#getRadius <em>Radius</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class CircleImpl extends GraphicalElementImpl implements Circle {
+
 	/**
 	 * The cached value of the '{@link #getCenter() <em>Center</em>}' containment reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getCenter()
 	 * @generated
 	 * @ordered
@@ -60,6 +61,7 @@ public class CircleImpl extends GraphicalElementImpl implements Circle {
 	/**
 	 * The default value of the '{@link #getRadius() <em>Radius</em>}' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getRadius()
 	 * @generated
 	 * @ordered
@@ -69,6 +71,7 @@ public class CircleImpl extends GraphicalElementImpl implements Circle {
 	/**
 	 * The cached value of the '{@link #getRadius() <em>Radius</em>}' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getRadius()
 	 * @generated
 	 * @ordered
@@ -77,6 +80,7 @@ public class CircleImpl extends GraphicalElementImpl implements Circle {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected CircleImpl() {
@@ -85,6 +89,7 @@ public class CircleImpl extends GraphicalElementImpl implements Circle {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -94,6 +99,7 @@ public class CircleImpl extends GraphicalElementImpl implements Circle {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Point getCenter() {
@@ -102,39 +108,44 @@ public class CircleImpl extends GraphicalElementImpl implements Circle {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public NotificationChain basicSetCenter(Point newCenter,
-			NotificationChain msgs) {
+	public NotificationChain basicSetCenter(Point newCenter, NotificationChain msgs) {
 		Point oldCenter = center;
 		center = newCenter;
-		if (eNotificationRequired()) {
+		if(eNotificationRequired()) {
 			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, DGPackage.CIRCLE__CENTER, oldCenter, newCenter);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
+			if(msgs == null)
+				msgs = notification;
+			else
+				msgs.add(notification);
 		}
 		return msgs;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setCenter(Point newCenter) {
-		if (newCenter != center) {
+		if(newCenter != center) {
 			NotificationChain msgs = null;
-			if (center != null)
+			if(center != null)
 				msgs = ((InternalEObject)center).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - DGPackage.CIRCLE__CENTER, null, msgs);
-			if (newCenter != null)
+			if(newCenter != null)
 				msgs = ((InternalEObject)newCenter).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - DGPackage.CIRCLE__CENTER, null, msgs);
 			msgs = basicSetCenter(newCenter, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
+			if(msgs != null)
+				msgs.dispatch();
+		} else if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.CIRCLE__CENTER, newCenter, newCenter));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public double getRadius() {
@@ -143,19 +154,22 @@ public class CircleImpl extends GraphicalElementImpl implements Circle {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setRadius(double newRadius) {
 		double oldRadius = radius;
 		radius = newRadius;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.CIRCLE__RADIUS, oldRadius, radius));
 	}
 
 	/**
-	 * The cached validation expression for the '{@link #nonNegativeRadius(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Non Negative Radius</em>}' invariant operation.
+	 * The cached validation expression for the '{@link #nonNegativeRadius(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
+	 * <em>Non Negative Radius</em>}' invariant operation.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @see #nonNegativeRadius(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
 	 * @generated
 	 * @ordered
@@ -164,130 +178,123 @@ public class CircleImpl extends GraphicalElementImpl implements Circle {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public boolean nonNegativeRadius(DiagnosticChain diagnostics,
-			Map<Object, Object> context) {
-		return
-			DGValidator.validate
-				(DGPackage.Literals.CIRCLE,
-				 this,
-				 diagnostics,
-				 context,
-				 "http://www.eclipse.org/emf/2002/Ecore/OCL",
-				 DGPackage.Literals.CIRCLE___NON_NEGATIVE_RADIUS__DIAGNOSTICCHAIN_MAP,
-				 NON_NEGATIVE_RADIUS_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION,
-				 Diagnostic.ERROR,
-				 DGValidator.DIAGNOSTIC_SOURCE,
-				 DGValidator.CIRCLE__NON_NEGATIVE_RADIUS);
+	public boolean nonNegativeRadius(DiagnosticChain diagnostics, Map<Object, Object> context) {
+		return DGValidator.validate(DGPackage.Literals.CIRCLE, this, diagnostics, context, "http://www.eclipse.org/emf/2002/Ecore/OCL", DGPackage.Literals.CIRCLE___NON_NEGATIVE_RADIUS__DIAGNOSTICCHAIN_MAP, NON_NEGATIVE_RADIUS_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION, Diagnostic.ERROR, DGValidator.DIAGNOSTIC_SOURCE, DGValidator.CIRCLE__NON_NEGATIVE_RADIUS);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd,
-			int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case DGPackage.CIRCLE__CENTER:
-				return basicSetCenter(null, msgs);
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch(featureID) {
+		case DGPackage.CIRCLE__CENTER:
+			return basicSetCenter(null, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case DGPackage.CIRCLE__CENTER:
-				return getCenter();
-			case DGPackage.CIRCLE__RADIUS:
-				return getRadius();
+		switch(featureID) {
+		case DGPackage.CIRCLE__CENTER:
+			return getCenter();
+		case DGPackage.CIRCLE__RADIUS:
+			return getRadius();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case DGPackage.CIRCLE__CENTER:
-				setCenter((Point)newValue);
-				return;
-			case DGPackage.CIRCLE__RADIUS:
-				setRadius((Double)newValue);
-				return;
+		switch(featureID) {
+		case DGPackage.CIRCLE__CENTER:
+			setCenter((Point)newValue);
+			return;
+		case DGPackage.CIRCLE__RADIUS:
+			setRadius((Double)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case DGPackage.CIRCLE__CENTER:
-				setCenter((Point)null);
-				return;
-			case DGPackage.CIRCLE__RADIUS:
-				setRadius(RADIUS_EDEFAULT);
-				return;
+		switch(featureID) {
+		case DGPackage.CIRCLE__CENTER:
+			setCenter((Point)null);
+			return;
+		case DGPackage.CIRCLE__RADIUS:
+			setRadius(RADIUS_EDEFAULT);
+			return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case DGPackage.CIRCLE__CENTER:
-				return center != null;
-			case DGPackage.CIRCLE__RADIUS:
-				return radius != RADIUS_EDEFAULT;
+		switch(featureID) {
+		case DGPackage.CIRCLE__CENTER:
+			return center != null;
+		case DGPackage.CIRCLE__RADIUS:
+			return radius != RADIUS_EDEFAULT;
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	@SuppressWarnings("unchecked")
-	public Object eInvoke(int operationID, EList<?> arguments)
-			throws InvocationTargetException {
-		switch (operationID) {
-			case DGPackage.CIRCLE___NON_NEGATIVE_RADIUS__DIAGNOSTICCHAIN_MAP:
-				return nonNegativeRadius((DiagnosticChain)arguments.get(0), (Map<Object, Object>)arguments.get(1));
+	public Object eInvoke(int operationID, EList<?> arguments) throws InvocationTargetException {
+		switch(operationID) {
+		case DGPackage.CIRCLE___NON_NEGATIVE_RADIUS__DIAGNOSTICCHAIN_MAP:
+			return nonNegativeRadius((DiagnosticChain)arguments.get(0), (Map<Object, Object>)arguments.get(1));
 		}
 		return super.eInvoke(operationID, arguments);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) return super.toString();
-
+		if(eIsProxy())
+			return super.toString();
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (radius: ");
 		result.append(radius);
 		result.append(')');
 		return result.toString();
 	}
-
 } // CircleImpl
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/ClipPathImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/ClipPathImpl.java
index 025dbcd2ad2..7074d3ffb1d 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/ClipPathImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/ClipPathImpl.java
@@ -17,16 +17,17 @@ import org.eclipse.papyrus.dd.dg.ClipPath;
 import org.eclipse.papyrus.dd.dg.DGPackage;
 
 /**
- * <!-- begin-user-doc --> An implementation of the model object '
- * <em><b>Clip Path</b></em>'. <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object ' <em><b>Clip Path</b></em>'. <!-- end-user-doc -->
  * <p>
  * </p>
- *
+ * 
  * @generated
  */
 public class ClipPathImpl extends GroupImpl implements ClipPath {
+
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected ClipPathImpl() {
@@ -35,11 +36,11 @@ public class ClipPathImpl extends GroupImpl implements ClipPath {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	protected EClass eStaticClass() {
 		return DGPackage.Literals.CLIP_PATH;
 	}
-
 } // ClipPathImpl
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/ClosePathImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/ClosePathImpl.java
index b1e6ecc5bc3..887067420be 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/ClosePathImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/ClosePathImpl.java
@@ -17,16 +17,17 @@ import org.eclipse.papyrus.dd.dg.ClosePath;
 import org.eclipse.papyrus.dd.dg.DGPackage;
 
 /**
- * <!-- begin-user-doc --> An implementation of the model object '
- * <em><b>Close Path</b></em>'. <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object ' <em><b>Close Path</b></em>'. <!-- end-user-doc -->
  * <p>
  * </p>
- *
+ * 
  * @generated
  */
 public class ClosePathImpl extends PathCommandImpl implements ClosePath {
+
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected ClosePathImpl() {
@@ -35,11 +36,11 @@ public class ClosePathImpl extends PathCommandImpl implements ClosePath {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	protected EClass eStaticClass() {
 		return DGPackage.Literals.CLOSE_PATH;
 	}
-
 } // ClosePathImpl
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/CubicCurveToImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/CubicCurveToImpl.java
index f868e1aa819..ccde5bb263e 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/CubicCurveToImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/CubicCurveToImpl.java
@@ -25,24 +25,25 @@ import org.eclipse.papyrus.dd.dg.CubicCurveTo;
 import org.eclipse.papyrus.dd.dg.DGPackage;
 
 /**
- * <!-- begin-user-doc --> An implementation of the model object '
- * <em><b>Cubic Curve To</b></em>'. <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object ' <em><b>Cubic Curve To</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.dd.dg.impl.CubicCurveToImpl#getStartControl <em>Start Control</em>}</li>
- *   <li>{@link org.eclipse.papyrus.dd.dg.impl.CubicCurveToImpl#getEndControl <em>End Control</em>}</li>
- *   <li>{@link org.eclipse.papyrus.dd.dg.impl.CubicCurveToImpl#getPoint <em>Point</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.impl.CubicCurveToImpl#getStartControl <em>Start Control</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.impl.CubicCurveToImpl#getEndControl <em>End Control</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.impl.CubicCurveToImpl#getPoint <em>Point</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class CubicCurveToImpl extends PathCommandImpl implements CubicCurveTo {
+
 	/**
 	 * The cached value of the '{@link #getStartControl() <em>Start Control</em>}' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getStartControl()
 	 * @generated
 	 * @ordered
@@ -52,6 +53,7 @@ public class CubicCurveToImpl extends PathCommandImpl implements CubicCurveTo {
 	/**
 	 * The cached value of the '{@link #getEndControl() <em>End Control</em>}' containment reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getEndControl()
 	 * @generated
 	 * @ordered
@@ -61,6 +63,7 @@ public class CubicCurveToImpl extends PathCommandImpl implements CubicCurveTo {
 	/**
 	 * The cached value of the '{@link #getPoint() <em>Point</em>}' containment reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getPoint()
 	 * @generated
 	 * @ordered
@@ -69,6 +72,7 @@ public class CubicCurveToImpl extends PathCommandImpl implements CubicCurveTo {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected CubicCurveToImpl() {
@@ -77,6 +81,7 @@ public class CubicCurveToImpl extends PathCommandImpl implements CubicCurveTo {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -86,6 +91,7 @@ public class CubicCurveToImpl extends PathCommandImpl implements CubicCurveTo {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Point getPoint() {
@@ -94,39 +100,44 @@ public class CubicCurveToImpl extends PathCommandImpl implements CubicCurveTo {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public NotificationChain basicSetPoint(Point newPoint,
-			NotificationChain msgs) {
+	public NotificationChain basicSetPoint(Point newPoint, NotificationChain msgs) {
 		Point oldPoint = point;
 		point = newPoint;
-		if (eNotificationRequired()) {
+		if(eNotificationRequired()) {
 			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, DGPackage.CUBIC_CURVE_TO__POINT, oldPoint, newPoint);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
+			if(msgs == null)
+				msgs = notification;
+			else
+				msgs.add(notification);
 		}
 		return msgs;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setPoint(Point newPoint) {
-		if (newPoint != point) {
+		if(newPoint != point) {
 			NotificationChain msgs = null;
-			if (point != null)
+			if(point != null)
 				msgs = ((InternalEObject)point).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - DGPackage.CUBIC_CURVE_TO__POINT, null, msgs);
-			if (newPoint != null)
+			if(newPoint != null)
 				msgs = ((InternalEObject)newPoint).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - DGPackage.CUBIC_CURVE_TO__POINT, null, msgs);
 			msgs = basicSetPoint(newPoint, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
+			if(msgs != null)
+				msgs.dispatch();
+		} else if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.CUBIC_CURVE_TO__POINT, newPoint, newPoint));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Point getStartControl() {
@@ -135,39 +146,44 @@ public class CubicCurveToImpl extends PathCommandImpl implements CubicCurveTo {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public NotificationChain basicSetStartControl(Point newStartControl,
-			NotificationChain msgs) {
+	public NotificationChain basicSetStartControl(Point newStartControl, NotificationChain msgs) {
 		Point oldStartControl = startControl;
 		startControl = newStartControl;
-		if (eNotificationRequired()) {
+		if(eNotificationRequired()) {
 			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, DGPackage.CUBIC_CURVE_TO__START_CONTROL, oldStartControl, newStartControl);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
+			if(msgs == null)
+				msgs = notification;
+			else
+				msgs.add(notification);
 		}
 		return msgs;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setStartControl(Point newStartControl) {
-		if (newStartControl != startControl) {
+		if(newStartControl != startControl) {
 			NotificationChain msgs = null;
-			if (startControl != null)
+			if(startControl != null)
 				msgs = ((InternalEObject)startControl).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - DGPackage.CUBIC_CURVE_TO__START_CONTROL, null, msgs);
-			if (newStartControl != null)
+			if(newStartControl != null)
 				msgs = ((InternalEObject)newStartControl).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - DGPackage.CUBIC_CURVE_TO__START_CONTROL, null, msgs);
 			msgs = basicSetStartControl(newStartControl, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
+			if(msgs != null)
+				msgs.dispatch();
+		} else if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.CUBIC_CURVE_TO__START_CONTROL, newStartControl, newStartControl));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Point getEndControl() {
@@ -176,127 +192,134 @@ public class CubicCurveToImpl extends PathCommandImpl implements CubicCurveTo {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public NotificationChain basicSetEndControl(Point newEndControl,
-			NotificationChain msgs) {
+	public NotificationChain basicSetEndControl(Point newEndControl, NotificationChain msgs) {
 		Point oldEndControl = endControl;
 		endControl = newEndControl;
-		if (eNotificationRequired()) {
+		if(eNotificationRequired()) {
 			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, DGPackage.CUBIC_CURVE_TO__END_CONTROL, oldEndControl, newEndControl);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
+			if(msgs == null)
+				msgs = notification;
+			else
+				msgs.add(notification);
 		}
 		return msgs;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setEndControl(Point newEndControl) {
-		if (newEndControl != endControl) {
+		if(newEndControl != endControl) {
 			NotificationChain msgs = null;
-			if (endControl != null)
+			if(endControl != null)
 				msgs = ((InternalEObject)endControl).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - DGPackage.CUBIC_CURVE_TO__END_CONTROL, null, msgs);
-			if (newEndControl != null)
+			if(newEndControl != null)
 				msgs = ((InternalEObject)newEndControl).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - DGPackage.CUBIC_CURVE_TO__END_CONTROL, null, msgs);
 			msgs = basicSetEndControl(newEndControl, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
+			if(msgs != null)
+				msgs.dispatch();
+		} else if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.CUBIC_CURVE_TO__END_CONTROL, newEndControl, newEndControl));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd,
-			int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case DGPackage.CUBIC_CURVE_TO__START_CONTROL:
-				return basicSetStartControl(null, msgs);
-			case DGPackage.CUBIC_CURVE_TO__END_CONTROL:
-				return basicSetEndControl(null, msgs);
-			case DGPackage.CUBIC_CURVE_TO__POINT:
-				return basicSetPoint(null, msgs);
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch(featureID) {
+		case DGPackage.CUBIC_CURVE_TO__START_CONTROL:
+			return basicSetStartControl(null, msgs);
+		case DGPackage.CUBIC_CURVE_TO__END_CONTROL:
+			return basicSetEndControl(null, msgs);
+		case DGPackage.CUBIC_CURVE_TO__POINT:
+			return basicSetPoint(null, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case DGPackage.CUBIC_CURVE_TO__START_CONTROL:
-				return getStartControl();
-			case DGPackage.CUBIC_CURVE_TO__END_CONTROL:
-				return getEndControl();
-			case DGPackage.CUBIC_CURVE_TO__POINT:
-				return getPoint();
+		switch(featureID) {
+		case DGPackage.CUBIC_CURVE_TO__START_CONTROL:
+			return getStartControl();
+		case DGPackage.CUBIC_CURVE_TO__END_CONTROL:
+			return getEndControl();
+		case DGPackage.CUBIC_CURVE_TO__POINT:
+			return getPoint();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case DGPackage.CUBIC_CURVE_TO__START_CONTROL:
-				setStartControl((Point)newValue);
-				return;
-			case DGPackage.CUBIC_CURVE_TO__END_CONTROL:
-				setEndControl((Point)newValue);
-				return;
-			case DGPackage.CUBIC_CURVE_TO__POINT:
-				setPoint((Point)newValue);
-				return;
+		switch(featureID) {
+		case DGPackage.CUBIC_CURVE_TO__START_CONTROL:
+			setStartControl((Point)newValue);
+			return;
+		case DGPackage.CUBIC_CURVE_TO__END_CONTROL:
+			setEndControl((Point)newValue);
+			return;
+		case DGPackage.CUBIC_CURVE_TO__POINT:
+			setPoint((Point)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case DGPackage.CUBIC_CURVE_TO__START_CONTROL:
-				setStartControl((Point)null);
-				return;
-			case DGPackage.CUBIC_CURVE_TO__END_CONTROL:
-				setEndControl((Point)null);
-				return;
-			case DGPackage.CUBIC_CURVE_TO__POINT:
-				setPoint((Point)null);
-				return;
+		switch(featureID) {
+		case DGPackage.CUBIC_CURVE_TO__START_CONTROL:
+			setStartControl((Point)null);
+			return;
+		case DGPackage.CUBIC_CURVE_TO__END_CONTROL:
+			setEndControl((Point)null);
+			return;
+		case DGPackage.CUBIC_CURVE_TO__POINT:
+			setPoint((Point)null);
+			return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case DGPackage.CUBIC_CURVE_TO__START_CONTROL:
-				return startControl != null;
-			case DGPackage.CUBIC_CURVE_TO__END_CONTROL:
-				return endControl != null;
-			case DGPackage.CUBIC_CURVE_TO__POINT:
-				return point != null;
+		switch(featureID) {
+		case DGPackage.CUBIC_CURVE_TO__START_CONTROL:
+			return startControl != null;
+		case DGPackage.CUBIC_CURVE_TO__END_CONTROL:
+			return endControl != null;
+		case DGPackage.CUBIC_CURVE_TO__POINT:
+			return point != null;
 		}
 		return super.eIsSet(featureID);
 	}
-
 } // CubicCurveToImpl
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/DGFactoryImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/DGFactoryImpl.java
index ec605409f3c..e7d5295255e 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/DGFactoryImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/DGFactoryImpl.java
@@ -25,23 +25,25 @@ import org.eclipse.papyrus.dd.dg.*;
 /**
  * <!-- begin-user-doc --> An implementation of the model <b>Factory</b>. <!--
  * end-user-doc -->
+ * 
  * @generated
  */
 public class DGFactoryImpl extends EFactoryImpl implements DGFactory {
+
 	/**
 	 * Creates the default factory implementation.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static DGFactory init() {
 		try {
 			DGFactory theDGFactory = (DGFactory)EPackage.Registry.INSTANCE.getEFactory(DGPackage.eNS_URI);
-			if (theDGFactory != null) {
+			if(theDGFactory != null) {
 				return theDGFactory;
 			}
-		}
-		catch (Exception exception) {
+		} catch (Exception exception) {
 			EcorePlugin.INSTANCE.log(exception);
 		}
 		return new DGFactoryImpl();
@@ -51,6 +53,7 @@ public class DGFactoryImpl extends EFactoryImpl implements DGFactory {
 	 * Creates an instance of the factory.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public DGFactoryImpl() {
@@ -59,90 +62,130 @@ public class DGFactoryImpl extends EFactoryImpl implements DGFactory {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public EObject create(EClass eClass) {
-		switch (eClass.getClassifierID()) {
-			case DGPackage.CANVAS: return createCanvas();
-			case DGPackage.GROUP: return createGroup();
-			case DGPackage.MOVE_TO: return createMoveTo();
-			case DGPackage.CLIP_PATH: return createClipPath();
-			case DGPackage.STYLE: return createStyle();
-			case DGPackage.PAINT: return createPaint();
-			case DGPackage.CIRCLE: return createCircle();
-			case DGPackage.CLOSE_PATH: return createClosePath();
-			case DGPackage.CUBIC_CURVE_TO: return createCubicCurveTo();
-			case DGPackage.DEFINITIONS: return createDefinitions();
-			case DGPackage.STYLE_SHEET: return createStyleSheet();
-			case DGPackage.STYLE_RULE: return createStyleRule();
-			case DGPackage.STYLE_SELECTOR: return createStyleSelector();
-			case DGPackage.ELLIPSE: return createEllipse();
-			case DGPackage.ELLIPTICAL_ARC_TO: return createEllipticalArcTo();
-			case DGPackage.QUADRATIC_CURVE_TO: return createQuadraticCurveTo();
-			case DGPackage.GRADIENT_STOP: return createGradientStop();
-			case DGPackage.IMAGE: return createImage();
-			case DGPackage.LINE: return createLine();
-			case DGPackage.MARKER: return createMarker();
-			case DGPackage.LINEAR_GRADIENT: return createLinearGradient();
-			case DGPackage.LINE_TO: return createLineTo();
-			case DGPackage.MATRIX: return createMatrix();
-			case DGPackage.PATH: return createPath();
-			case DGPackage.PATTERN: return createPattern();
-			case DGPackage.POLYGON: return createPolygon();
-			case DGPackage.POLYLINE: return createPolyline();
-			case DGPackage.RADIAL_GRADIENT: return createRadialGradient();
-			case DGPackage.RECTANGLE: return createRectangle();
-			case DGPackage.ROOT_CANVAS: return createRootCanvas();
-			case DGPackage.ROTATE: return createRotate();
-			case DGPackage.SCALE: return createScale();
-			case DGPackage.SKEW: return createSkew();
-			case DGPackage.TEXT: return createText();
-			case DGPackage.TRANSLATE: return createTranslate();
-			case DGPackage.USE: return createUse();
-			default:
-				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
+		switch(eClass.getClassifierID()) {
+		case DGPackage.CANVAS:
+			return createCanvas();
+		case DGPackage.GROUP:
+			return createGroup();
+		case DGPackage.MOVE_TO:
+			return createMoveTo();
+		case DGPackage.CLIP_PATH:
+			return createClipPath();
+		case DGPackage.STYLE:
+			return createStyle();
+		case DGPackage.PAINT:
+			return createPaint();
+		case DGPackage.CIRCLE:
+			return createCircle();
+		case DGPackage.CLOSE_PATH:
+			return createClosePath();
+		case DGPackage.CUBIC_CURVE_TO:
+			return createCubicCurveTo();
+		case DGPackage.DEFINITIONS:
+			return createDefinitions();
+		case DGPackage.STYLE_SHEET:
+			return createStyleSheet();
+		case DGPackage.STYLE_RULE:
+			return createStyleRule();
+		case DGPackage.STYLE_SELECTOR:
+			return createStyleSelector();
+		case DGPackage.ELLIPSE:
+			return createEllipse();
+		case DGPackage.ELLIPTICAL_ARC_TO:
+			return createEllipticalArcTo();
+		case DGPackage.QUADRATIC_CURVE_TO:
+			return createQuadraticCurveTo();
+		case DGPackage.GRADIENT_STOP:
+			return createGradientStop();
+		case DGPackage.IMAGE:
+			return createImage();
+		case DGPackage.LINE:
+			return createLine();
+		case DGPackage.MARKER:
+			return createMarker();
+		case DGPackage.LINEAR_GRADIENT:
+			return createLinearGradient();
+		case DGPackage.LINE_TO:
+			return createLineTo();
+		case DGPackage.MATRIX:
+			return createMatrix();
+		case DGPackage.PATH:
+			return createPath();
+		case DGPackage.PATTERN:
+			return createPattern();
+		case DGPackage.POLYGON:
+			return createPolygon();
+		case DGPackage.POLYLINE:
+			return createPolyline();
+		case DGPackage.RADIAL_GRADIENT:
+			return createRadialGradient();
+		case DGPackage.RECTANGLE:
+			return createRectangle();
+		case DGPackage.ROOT_CANVAS:
+			return createRootCanvas();
+		case DGPackage.ROTATE:
+			return createRotate();
+		case DGPackage.SCALE:
+			return createScale();
+		case DGPackage.SKEW:
+			return createSkew();
+		case DGPackage.TEXT:
+			return createText();
+		case DGPackage.TRANSLATE:
+			return createTranslate();
+		case DGPackage.USE:
+			return createUse();
+		default:
+			throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
 		}
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object createFromString(EDataType eDataType, String initialValue) {
-		switch (eDataType.getClassifierID()) {
-			case DGPackage.FONT_DECORATION:
-				return createFontDecorationFromString(eDataType, initialValue);
-			case DGPackage.ELEMENT_KIND:
-				return createElementKindFromString(eDataType, initialValue);
-			case DGPackage.TEXT_ANCHOR:
-				return createTextAnchorFromString(eDataType, initialValue);
-			default:
-				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
+		switch(eDataType.getClassifierID()) {
+		case DGPackage.FONT_DECORATION:
+			return createFontDecorationFromString(eDataType, initialValue);
+		case DGPackage.ELEMENT_KIND:
+			return createElementKindFromString(eDataType, initialValue);
+		case DGPackage.TEXT_ANCHOR:
+			return createTextAnchorFromString(eDataType, initialValue);
+		default:
+			throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
 		}
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String convertToString(EDataType eDataType, Object instanceValue) {
-		switch (eDataType.getClassifierID()) {
-			case DGPackage.FONT_DECORATION:
-				return convertFontDecorationToString(eDataType, instanceValue);
-			case DGPackage.ELEMENT_KIND:
-				return convertElementKindToString(eDataType, instanceValue);
-			case DGPackage.TEXT_ANCHOR:
-				return convertTextAnchorToString(eDataType, instanceValue);
-			default:
-				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
+		switch(eDataType.getClassifierID()) {
+		case DGPackage.FONT_DECORATION:
+			return convertFontDecorationToString(eDataType, instanceValue);
+		case DGPackage.ELEMENT_KIND:
+			return convertElementKindToString(eDataType, instanceValue);
+		case DGPackage.TEXT_ANCHOR:
+			return convertTextAnchorToString(eDataType, instanceValue);
+		default:
+			throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
 		}
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Canvas createCanvas() {
@@ -152,6 +195,7 @@ public class DGFactoryImpl extends EFactoryImpl implements DGFactory {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Group createGroup() {
@@ -161,6 +205,7 @@ public class DGFactoryImpl extends EFactoryImpl implements DGFactory {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public MoveTo createMoveTo() {
@@ -170,6 +215,7 @@ public class DGFactoryImpl extends EFactoryImpl implements DGFactory {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public ClipPath createClipPath() {
@@ -179,6 +225,7 @@ public class DGFactoryImpl extends EFactoryImpl implements DGFactory {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Style createStyle() {
@@ -188,6 +235,7 @@ public class DGFactoryImpl extends EFactoryImpl implements DGFactory {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Paint createPaint() {
@@ -197,6 +245,7 @@ public class DGFactoryImpl extends EFactoryImpl implements DGFactory {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Circle createCircle() {
@@ -206,6 +255,7 @@ public class DGFactoryImpl extends EFactoryImpl implements DGFactory {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public ClosePath createClosePath() {
@@ -215,6 +265,7 @@ public class DGFactoryImpl extends EFactoryImpl implements DGFactory {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public CubicCurveTo createCubicCurveTo() {
@@ -224,6 +275,7 @@ public class DGFactoryImpl extends EFactoryImpl implements DGFactory {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Definitions createDefinitions() {
@@ -233,6 +285,7 @@ public class DGFactoryImpl extends EFactoryImpl implements DGFactory {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public StyleSheet createStyleSheet() {
@@ -242,6 +295,7 @@ public class DGFactoryImpl extends EFactoryImpl implements DGFactory {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public StyleRule createStyleRule() {
@@ -251,6 +305,7 @@ public class DGFactoryImpl extends EFactoryImpl implements DGFactory {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public StyleSelector createStyleSelector() {
@@ -260,6 +315,7 @@ public class DGFactoryImpl extends EFactoryImpl implements DGFactory {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Ellipse createEllipse() {
@@ -269,6 +325,7 @@ public class DGFactoryImpl extends EFactoryImpl implements DGFactory {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EllipticalArcTo createEllipticalArcTo() {
@@ -278,6 +335,7 @@ public class DGFactoryImpl extends EFactoryImpl implements DGFactory {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public QuadraticCurveTo createQuadraticCurveTo() {
@@ -287,6 +345,7 @@ public class DGFactoryImpl extends EFactoryImpl implements DGFactory {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public GradientStop createGradientStop() {
@@ -296,6 +355,7 @@ public class DGFactoryImpl extends EFactoryImpl implements DGFactory {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Image createImage() {
@@ -305,6 +365,7 @@ public class DGFactoryImpl extends EFactoryImpl implements DGFactory {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Line createLine() {
@@ -314,6 +375,7 @@ public class DGFactoryImpl extends EFactoryImpl implements DGFactory {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Marker createMarker() {
@@ -323,6 +385,7 @@ public class DGFactoryImpl extends EFactoryImpl implements DGFactory {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public LinearGradient createLinearGradient() {
@@ -332,6 +395,7 @@ public class DGFactoryImpl extends EFactoryImpl implements DGFactory {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public LineTo createLineTo() {
@@ -341,6 +405,7 @@ public class DGFactoryImpl extends EFactoryImpl implements DGFactory {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Matrix createMatrix() {
@@ -350,6 +415,7 @@ public class DGFactoryImpl extends EFactoryImpl implements DGFactory {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Path createPath() {
@@ -359,6 +425,7 @@ public class DGFactoryImpl extends EFactoryImpl implements DGFactory {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Pattern createPattern() {
@@ -368,6 +435,7 @@ public class DGFactoryImpl extends EFactoryImpl implements DGFactory {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Polygon createPolygon() {
@@ -377,6 +445,7 @@ public class DGFactoryImpl extends EFactoryImpl implements DGFactory {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Polyline createPolyline() {
@@ -386,6 +455,7 @@ public class DGFactoryImpl extends EFactoryImpl implements DGFactory {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public RadialGradient createRadialGradient() {
@@ -395,6 +465,7 @@ public class DGFactoryImpl extends EFactoryImpl implements DGFactory {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Rectangle createRectangle() {
@@ -404,6 +475,7 @@ public class DGFactoryImpl extends EFactoryImpl implements DGFactory {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public RootCanvas createRootCanvas() {
@@ -413,6 +485,7 @@ public class DGFactoryImpl extends EFactoryImpl implements DGFactory {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Rotate createRotate() {
@@ -422,6 +495,7 @@ public class DGFactoryImpl extends EFactoryImpl implements DGFactory {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Scale createScale() {
@@ -431,6 +505,7 @@ public class DGFactoryImpl extends EFactoryImpl implements DGFactory {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Skew createSkew() {
@@ -440,6 +515,7 @@ public class DGFactoryImpl extends EFactoryImpl implements DGFactory {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Text createText() {
@@ -449,6 +525,7 @@ public class DGFactoryImpl extends EFactoryImpl implements DGFactory {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Translate createTranslate() {
@@ -458,6 +535,7 @@ public class DGFactoryImpl extends EFactoryImpl implements DGFactory {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Use createUse() {
@@ -467,58 +545,63 @@ public class DGFactoryImpl extends EFactoryImpl implements DGFactory {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public FontDecoration createFontDecorationFromString(EDataType eDataType,
-			String initialValue) {
+	public FontDecoration createFontDecorationFromString(EDataType eDataType, String initialValue) {
 		FontDecoration result = FontDecoration.get(initialValue);
-		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
+		if(result == null)
+			throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
 		return result;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public String convertFontDecorationToString(EDataType eDataType,
-			Object instanceValue) {
+	public String convertFontDecorationToString(EDataType eDataType, Object instanceValue) {
 		return instanceValue == null ? null : instanceValue.toString();
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public ElementKind createElementKindFromString(EDataType eDataType,
-			String initialValue) {
+	public ElementKind createElementKindFromString(EDataType eDataType, String initialValue) {
 		ElementKind result = ElementKind.get(initialValue);
-		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
+		if(result == null)
+			throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
 		return result;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public String convertElementKindToString(EDataType eDataType,
-			Object instanceValue) {
+	public String convertElementKindToString(EDataType eDataType, Object instanceValue) {
 		return instanceValue == null ? null : instanceValue.toString();
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public TextAnchor createTextAnchorFromString(EDataType eDataType, String initialValue) {
 		TextAnchor result = TextAnchor.get(initialValue);
-		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
+		if(result == null)
+			throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
 		return result;
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String convertTextAnchorToString(EDataType eDataType, Object instanceValue) {
@@ -527,6 +610,7 @@ public class DGFactoryImpl extends EFactoryImpl implements DGFactory {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public DGPackage getDGPackage() {
@@ -535,6 +619,7 @@ public class DGFactoryImpl extends EFactoryImpl implements DGFactory {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @deprecated
 	 * @generated
 	 */
@@ -542,5 +627,4 @@ public class DGFactoryImpl extends EFactoryImpl implements DGFactory {
 	public static DGPackage getPackage() {
 		return DGPackage.eINSTANCE;
 	}
-
 } // DGFactoryImpl
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/DGPackageImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/DGPackageImpl.java
index 5fb7e8090a1..af87a817a71 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/DGPackageImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/DGPackageImpl.java
@@ -74,275 +74,322 @@ import org.eclipse.papyrus.dd.dg.util.DGValidator;
 /**
  * <!-- begin-user-doc --> An implementation of the model <b>Package</b>. <!--
  * end-user-doc -->
+ * 
  * @generated
  */
 public class DGPackageImpl extends EPackageImpl implements DGPackage {
+
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass canvasEClass = null;
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass groupEClass = null;
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass graphicalElementEClass = null;
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass definitionEClass = null;
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass moveToEClass = null;
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass pathCommandEClass = null;
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass clipPathEClass = null;
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass styleEClass = null;
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass paintEClass = null;
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass paintServerEClass = null;
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass transformEClass = null;
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass circleEClass = null;
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass closePathEClass = null;
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass cubicCurveToEClass = null;
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass definitionsEClass = null;
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass styleSheetEClass = null;
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass styleRuleEClass = null;
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass styleSelectorEClass = null;
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass ellipseEClass = null;
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass ellipticalArcToEClass = null;
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass quadraticCurveToEClass = null;
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass gradientEClass = null;
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass gradientStopEClass = null;
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass imageEClass = null;
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass lineEClass = null;
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass markedElementEClass = null;
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass markerEClass = null;
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass linearGradientEClass = null;
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass lineToEClass = null;
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass matrixEClass = null;
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass pathEClass = null;
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass patternEClass = null;
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass polygonEClass = null;
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass polylineEClass = null;
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass radialGradientEClass = null;
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass rectangleEClass = null;
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass rootCanvasEClass = null;
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass rotateEClass = null;
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass scaleEClass = null;
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass skewEClass = null;
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass textEClass = null;
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass translateEClass = null;
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass useEClass = null;
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EEnum fontDecorationEEnum = null;
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EEnum elementKindEEnum = null;
@@ -350,19 +397,17 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EEnum textAnchorEEnum = null;
 
 	/**
-	 * Creates an instance of the model <b>Package</b>, registered with
-	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the
+	 * Creates an instance of the model <b>Package</b>, registered with {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the
 	 * package package URI value.
 	 * <p>
-	 * Note: the correct way to create the package is via the static factory
-	 * method {@link #init init()}, which also performs initialization of the
-	 * package, or returns the registered package, if one already exists. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
+	 * Note: the correct way to create the package is via the static factory method {@link #init init()}, which also performs initialization of the
+	 * package, or returns the registered package, if one already exists. <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @see org.eclipse.emf.ecore.EPackage.Registry
 	 * @see org.eclipse.papyrus.dd.dg.DGPackage#eNS_URI
@@ -375,6 +420,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private static boolean isInited = false;
@@ -384,10 +430,8 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 	 * and for any others upon which it depends.
 	 * 
 	 * <p>
-	 * This method is used to initialize {@link DGPackage#eINSTANCE} when that
-	 * field is accessed. Clients should not invoke it directly. Instead, they
-	 * should simply access that field to obtain the package. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
+	 * This method is used to initialize {@link DGPackage#eINSTANCE} when that field is accessed. Clients should not invoke it directly. Instead, they
+	 * should simply access that field to obtain the package. <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @see #eNS_URI
 	 * @see #createPackageContents()
@@ -395,35 +439,26 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 	 * @generated
 	 */
 	public static DGPackage init() {
-		if (isInited) return (DGPackage)EPackage.Registry.INSTANCE.getEPackage(DGPackage.eNS_URI);
-
+		if(isInited)
+			return (DGPackage)EPackage.Registry.INSTANCE.getEPackage(DGPackage.eNS_URI);
 		// Obtain or create and register package
 		DGPackageImpl theDGPackage = (DGPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof DGPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new DGPackageImpl());
-
 		isInited = true;
-
 		// Initialize simple dependencies
 		DCPackage.eINSTANCE.eClass();
-
 		// Create package meta-data objects
 		theDGPackage.createPackageContents();
-
 		// Initialize created meta-data
 		theDGPackage.initializePackageContents();
-
 		// Register package validator
-		EValidator.Registry.INSTANCE.put
-			(theDGPackage, 
-			 new EValidator.Descriptor() {
-				 public EValidator getEValidator() {
-					 return DGValidator.INSTANCE;
-				 }
-			 });
+		EValidator.Registry.INSTANCE.put(theDGPackage, new EValidator.Descriptor() {
 
+			public EValidator getEValidator() {
+				return DGValidator.INSTANCE;
+			}
+		});
 		// Mark meta-data to indicate it can't be changed
 		theDGPackage.freeze();
-
-  
 		// Update the registry and return the package
 		EPackage.Registry.INSTANCE.put(DGPackage.eNS_URI, theDGPackage);
 		return theDGPackage;
@@ -431,6 +466,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getCanvas() {
@@ -439,6 +475,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getCanvas_Bounds() {
@@ -447,6 +484,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EOperation getCanvas__CanvasCannotHaveTransforms__DiagnosticChain_Map() {
@@ -455,6 +493,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getGroup() {
@@ -463,6 +502,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getGroup_Member() {
@@ -472,6 +512,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getGroup_Layout() {
@@ -480,6 +521,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getGraphicalElement() {
@@ -488,6 +530,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getGraphicalElement_ClipPath() {
@@ -496,6 +539,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getGraphicalElement_Group() {
@@ -504,6 +548,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getGraphicalElement_Class() {
@@ -512,6 +557,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getGraphicalElement_Style() {
@@ -520,6 +566,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getGraphicalElement_Transform() {
@@ -529,6 +576,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getGraphicalElement_LayoutData() {
@@ -537,6 +585,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EOperation getGraphicalElement__ReferencedClippathHasId__DiagnosticChain_Map() {
@@ -545,6 +594,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getDefinition() {
@@ -553,6 +603,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getDefinition_Id() {
@@ -561,6 +612,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EOperation getDefinition__IdCannotBeEmpty__DiagnosticChain_Map() {
@@ -569,6 +621,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getMoveTo() {
@@ -577,6 +630,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getMoveTo_Point() {
@@ -585,6 +639,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getPathCommand() {
@@ -593,6 +648,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getPathCommand_IsRelative() {
@@ -601,6 +657,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getClipPath() {
@@ -609,6 +666,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getStyle() {
@@ -617,6 +675,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getStyle_Fill() {
@@ -625,6 +684,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getStyle_FillOpacity() {
@@ -633,6 +693,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getStyle_Stroke() {
@@ -641,6 +702,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getStyle_StrokeWidth() {
@@ -649,6 +711,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getStyle_StrokeOpacity() {
@@ -657,6 +720,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getStyle_StrokeDashLength() {
@@ -665,6 +729,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getStyle_FontSize() {
@@ -673,6 +738,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getStyle_FontName() {
@@ -681,6 +747,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getStyle_FontItalic() {
@@ -689,6 +756,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getStyle_FontBold() {
@@ -697,6 +765,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getStyle_FontDecoration() {
@@ -705,6 +774,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EOperation getStyle__ValidFontSize__DiagnosticChain_Map() {
@@ -713,6 +783,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EOperation getStyle__ValidFillOpacity__DiagnosticChain_Map() {
@@ -721,6 +792,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EOperation getStyle__ValidStrokeWidth__DiagnosticChain_Map() {
@@ -729,6 +801,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EOperation getStyle__ValidDashLengthSize__DiagnosticChain_Map() {
@@ -737,6 +810,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EOperation getStyle__ValidStrokeOpacity__DiagnosticChain_Map() {
@@ -745,6 +819,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getPaint() {
@@ -753,6 +828,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getPaint_Color() {
@@ -761,6 +837,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getPaint_PaintServer() {
@@ -769,6 +846,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EOperation getPaint__ReferencedPaintServerHasId__DiagnosticChain_Map() {
@@ -777,6 +855,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getPaintServer() {
@@ -785,6 +864,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getPaintServer_Transform() {
@@ -793,6 +873,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getTransform() {
@@ -801,6 +882,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getCircle() {
@@ -809,6 +891,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getCircle_Center() {
@@ -817,6 +900,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getCircle_Radius() {
@@ -825,6 +909,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EOperation getCircle__NonNegativeRadius__DiagnosticChain_Map() {
@@ -833,6 +918,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getClosePath() {
@@ -841,6 +927,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getCubicCurveTo() {
@@ -849,6 +936,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getCubicCurveTo_Point() {
@@ -857,6 +945,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getCubicCurveTo_StartControl() {
@@ -865,6 +954,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getCubicCurveTo_EndControl() {
@@ -873,6 +963,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getDefinitions() {
@@ -881,6 +972,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getDefinitions_Defnition() {
@@ -889,6 +981,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getDefinitions_StyleSheet() {
@@ -897,6 +990,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getStyleSheet() {
@@ -905,6 +999,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getStyleSheet_Rule() {
@@ -913,6 +1008,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getStyleRule() {
@@ -921,6 +1017,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getStyleRule_Selector() {
@@ -929,6 +1026,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getStyleRule_Style() {
@@ -937,6 +1035,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getStyleSelector() {
@@ -945,6 +1044,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getStyleSelector_Kind() {
@@ -953,6 +1053,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getStyleSelector_Class() {
@@ -961,6 +1062,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getEllipse() {
@@ -969,6 +1071,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getEllipse_Center() {
@@ -977,6 +1080,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getEllipse_Radii() {
@@ -985,6 +1089,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getEllipticalArcTo() {
@@ -993,6 +1098,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getEllipticalArcTo_Point() {
@@ -1001,6 +1107,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getEllipticalArcTo_Radii() {
@@ -1009,6 +1116,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getEllipticalArcTo_Rotation() {
@@ -1017,6 +1125,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getEllipticalArcTo_IsLargeArc() {
@@ -1025,6 +1134,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getEllipticalArcTo_IsSweep() {
@@ -1033,6 +1143,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getQuadraticCurveTo() {
@@ -1041,6 +1152,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getQuadraticCurveTo_Point() {
@@ -1049,6 +1161,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getQuadraticCurveTo_Control() {
@@ -1057,6 +1170,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getGradient() {
@@ -1065,6 +1179,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getGradient_Stop() {
@@ -1073,6 +1188,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getGradientStop() {
@@ -1081,6 +1197,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getGradientStop_Color() {
@@ -1089,6 +1206,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getGradientStop_Offset() {
@@ -1097,6 +1215,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getGradientStop_Opacity() {
@@ -1105,6 +1224,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EOperation getGradientStop__ValidOffset__DiagnosticChain_Map() {
@@ -1113,6 +1233,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EOperation getGradientStop__ValidOpacity__DiagnosticChain_Map() {
@@ -1121,6 +1242,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getImage() {
@@ -1129,6 +1251,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getImage_Source() {
@@ -1137,6 +1260,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getImage_Bounds() {
@@ -1145,6 +1269,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getImage_IsAspectRatioPreserved() {
@@ -1153,6 +1278,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EOperation getImage__SourceCannotBeEmpty__DiagnosticChain_Map() {
@@ -1161,6 +1287,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getLine() {
@@ -1169,6 +1296,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getLine_Start() {
@@ -1177,6 +1305,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getLine_End() {
@@ -1185,6 +1314,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getMarkedElement() {
@@ -1193,6 +1323,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getMarkedElement_EndMarker() {
@@ -1201,6 +1332,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getMarkedElement_MidMarker() {
@@ -1209,6 +1341,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getMarkedElement_StartMarker() {
@@ -1217,6 +1350,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EOperation getMarkedElement__ReferencedStartMarkerHasId__DiagnosticChain_Map() {
@@ -1225,6 +1359,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EOperation getMarkedElement__ReferencedMidMarkerHasId__DiagnosticChain_Map() {
@@ -1233,6 +1368,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EOperation getMarkedElement__ReferencedEndMarkerHasId__DiagnosticChain_Map() {
@@ -1241,6 +1377,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getMarker() {
@@ -1249,6 +1386,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getMarker_Size() {
@@ -1257,6 +1395,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getMarker_Reference() {
@@ -1265,6 +1404,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getLinearGradient() {
@@ -1273,6 +1413,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getLinearGradient_Start() {
@@ -1281,6 +1422,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getLinearGradient_End() {
@@ -1289,6 +1431,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EOperation getLinearGradient__ValidGradientVector__DiagnosticChain_Map() {
@@ -1297,6 +1440,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getLineTo() {
@@ -1305,6 +1449,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getLineTo_Point() {
@@ -1313,6 +1458,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getMatrix() {
@@ -1321,6 +1467,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getMatrix_A() {
@@ -1329,6 +1476,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getMatrix_B() {
@@ -1337,6 +1485,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getMatrix_C() {
@@ -1345,6 +1494,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getMatrix_D() {
@@ -1353,6 +1503,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getMatrix_E() {
@@ -1361,6 +1512,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getMatrix_F() {
@@ -1369,6 +1521,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getPath() {
@@ -1377,6 +1530,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getPath_Command() {
@@ -1385,6 +1539,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EOperation getPath__FirstCommandMustBeMove__DiagnosticChain_Map() {
@@ -1393,6 +1548,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getPattern() {
@@ -1401,6 +1557,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getPattern_Bounds() {
@@ -1409,6 +1566,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getPattern_Tile() {
@@ -1417,6 +1575,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getPolygon() {
@@ -1425,6 +1584,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getPolygon_Point() {
@@ -1433,6 +1593,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getPolyline() {
@@ -1441,6 +1602,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getPolyline_Point() {
@@ -1449,6 +1611,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getRadialGradient() {
@@ -1457,6 +1620,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getRadialGradient_Center() {
@@ -1465,6 +1629,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getRadialGradient_Focus() {
@@ -1473,6 +1638,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getRadialGradient_Radius() {
@@ -1481,6 +1647,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EOperation getRadialGradient__ValidCenterPoint__DiagnosticChain_Map() {
@@ -1489,6 +1656,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EOperation getRadialGradient__ValidFocusPoint__DiagnosticChain_Map() {
@@ -1497,6 +1665,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EOperation getRadialGradient__ValidRadius__DiagnosticChain_Map() {
@@ -1505,6 +1674,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getRectangle() {
@@ -1513,6 +1683,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getRectangle_Bounds() {
@@ -1521,6 +1692,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getRectangle_CornerRadius() {
@@ -1529,6 +1701,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EOperation getRectangle__NonNegativeCornerRadius__DiagnosticChain_Map() {
@@ -1537,6 +1710,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getRootCanvas() {
@@ -1545,6 +1719,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getRootCanvas_BackgroundColor() {
@@ -1553,6 +1728,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getRootCanvas_Definitions() {
@@ -1561,6 +1737,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getRootCanvas_ExternalStyleSheet() {
@@ -1570,6 +1747,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getRootCanvas_Script() {
@@ -1578,6 +1756,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getRotate() {
@@ -1586,6 +1765,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getRotate_Angle() {
@@ -1594,6 +1774,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getRotate_Center() {
@@ -1602,6 +1783,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getScale() {
@@ -1610,6 +1792,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getScale_FactorX() {
@@ -1618,6 +1801,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getScale_FactorY() {
@@ -1626,6 +1810,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EOperation getScale__Nonnegativescale__DiagnosticChain_Map() {
@@ -1634,6 +1819,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getSkew() {
@@ -1642,6 +1828,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getSkew_AngleX() {
@@ -1650,6 +1837,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getSkew_AngleY() {
@@ -1658,6 +1846,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getText() {
@@ -1666,6 +1855,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getText_Data() {
@@ -1674,6 +1864,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getText_Position() {
@@ -1683,6 +1874,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getText_Anchor() {
@@ -1691,6 +1883,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EOperation getText__DataCannotBeEmpty__DiagnosticChain_Map() {
@@ -1699,6 +1892,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getTranslate() {
@@ -1707,6 +1901,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getTranslate_DeltaX() {
@@ -1715,6 +1910,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getTranslate_DeltaY() {
@@ -1723,6 +1919,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getUse() {
@@ -1731,6 +1928,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getUse_Bounds() {
@@ -1739,6 +1937,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getUse_ReferencedElement() {
@@ -1747,6 +1946,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EOperation getUse__ReferencedElementHasId__DiagnosticChain_Map() {
@@ -1755,6 +1955,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EEnum getFontDecoration() {
@@ -1763,6 +1964,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EEnum getElementKind() {
@@ -1772,6 +1974,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EEnum getTextAnchor() {
@@ -1780,6 +1983,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public DGFactory getDGFactory() {
@@ -1788,30 +1992,30 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private boolean isCreated = false;
 
 	/**
-	 * Creates the meta-model objects for the package.  This method is
+	 * Creates the meta-model objects for the package. This method is
 	 * guarded to have no affect on any invocation but its first.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void createPackageContents() {
-		if (isCreated) return;
+		if(isCreated)
+			return;
 		isCreated = true;
-
 		// Create classes and their features
 		canvasEClass = createEClass(CANVAS);
 		createEReference(canvasEClass, CANVAS__BOUNDS);
 		createEOperation(canvasEClass, CANVAS___CANVAS_CANNOT_HAVE_TRANSFORMS__DIAGNOSTICCHAIN_MAP);
-
 		groupEClass = createEClass(GROUP);
 		createEReference(groupEClass, GROUP__MEMBER);
 		createEAttribute(groupEClass, GROUP__LAYOUT);
-
 		graphicalElementEClass = createEClass(GRAPHICAL_ELEMENT);
 		createEReference(graphicalElementEClass, GRAPHICAL_ELEMENT__CLIP_PATH);
 		createEReference(graphicalElementEClass, GRAPHICAL_ELEMENT__GROUP);
@@ -1820,19 +2024,14 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 		createEReference(graphicalElementEClass, GRAPHICAL_ELEMENT__TRANSFORM);
 		createEAttribute(graphicalElementEClass, GRAPHICAL_ELEMENT__LAYOUT_DATA);
 		createEOperation(graphicalElementEClass, GRAPHICAL_ELEMENT___REFERENCED_CLIPPATH_HAS_ID__DIAGNOSTICCHAIN_MAP);
-
 		definitionEClass = createEClass(DEFINITION);
 		createEAttribute(definitionEClass, DEFINITION__ID);
 		createEOperation(definitionEClass, DEFINITION___ID_CANNOT_BE_EMPTY__DIAGNOSTICCHAIN_MAP);
-
 		moveToEClass = createEClass(MOVE_TO);
 		createEReference(moveToEClass, MOVE_TO__POINT);
-
 		pathCommandEClass = createEClass(PATH_COMMAND);
 		createEAttribute(pathCommandEClass, PATH_COMMAND__IS_RELATIVE);
-
 		clipPathEClass = createEClass(CLIP_PATH);
-
 		styleEClass = createEClass(STYLE);
 		createEReference(styleEClass, STYLE__FILL);
 		createEAttribute(styleEClass, STYLE__FILL_OPACITY);
@@ -1850,79 +2049,61 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 		createEOperation(styleEClass, STYLE___VALID_STROKE_WIDTH__DIAGNOSTICCHAIN_MAP);
 		createEOperation(styleEClass, STYLE___VALID_DASH_LENGTH_SIZE__DIAGNOSTICCHAIN_MAP);
 		createEOperation(styleEClass, STYLE___VALID_STROKE_OPACITY__DIAGNOSTICCHAIN_MAP);
-
 		paintEClass = createEClass(PAINT);
 		createEAttribute(paintEClass, PAINT__COLOR);
 		createEReference(paintEClass, PAINT__PAINT_SERVER);
 		createEOperation(paintEClass, PAINT___REFERENCED_PAINT_SERVER_HAS_ID__DIAGNOSTICCHAIN_MAP);
-
 		paintServerEClass = createEClass(PAINT_SERVER);
 		createEReference(paintServerEClass, PAINT_SERVER__TRANSFORM);
-
 		transformEClass = createEClass(TRANSFORM);
-
 		circleEClass = createEClass(CIRCLE);
 		createEReference(circleEClass, CIRCLE__CENTER);
 		createEAttribute(circleEClass, CIRCLE__RADIUS);
 		createEOperation(circleEClass, CIRCLE___NON_NEGATIVE_RADIUS__DIAGNOSTICCHAIN_MAP);
-
 		closePathEClass = createEClass(CLOSE_PATH);
-
 		cubicCurveToEClass = createEClass(CUBIC_CURVE_TO);
 		createEReference(cubicCurveToEClass, CUBIC_CURVE_TO__START_CONTROL);
 		createEReference(cubicCurveToEClass, CUBIC_CURVE_TO__END_CONTROL);
 		createEReference(cubicCurveToEClass, CUBIC_CURVE_TO__POINT);
-
 		definitionsEClass = createEClass(DEFINITIONS);
 		createEReference(definitionsEClass, DEFINITIONS__DEFNITION);
 		createEReference(definitionsEClass, DEFINITIONS__STYLE_SHEET);
-
 		styleSheetEClass = createEClass(STYLE_SHEET);
 		createEReference(styleSheetEClass, STYLE_SHEET__RULE);
-
 		styleRuleEClass = createEClass(STYLE_RULE);
 		createEReference(styleRuleEClass, STYLE_RULE__SELECTOR);
 		createEReference(styleRuleEClass, STYLE_RULE__STYLE);
-
 		styleSelectorEClass = createEClass(STYLE_SELECTOR);
 		createEAttribute(styleSelectorEClass, STYLE_SELECTOR__KIND);
 		createEAttribute(styleSelectorEClass, STYLE_SELECTOR__CLASS);
-
 		ellipseEClass = createEClass(ELLIPSE);
 		createEReference(ellipseEClass, ELLIPSE__CENTER);
 		createEReference(ellipseEClass, ELLIPSE__RADII);
-
 		ellipticalArcToEClass = createEClass(ELLIPTICAL_ARC_TO);
 		createEReference(ellipticalArcToEClass, ELLIPTICAL_ARC_TO__RADII);
 		createEAttribute(ellipticalArcToEClass, ELLIPTICAL_ARC_TO__ROTATION);
 		createEAttribute(ellipticalArcToEClass, ELLIPTICAL_ARC_TO__IS_LARGE_ARC);
 		createEAttribute(ellipticalArcToEClass, ELLIPTICAL_ARC_TO__IS_SWEEP);
 		createEReference(ellipticalArcToEClass, ELLIPTICAL_ARC_TO__POINT);
-
 		quadraticCurveToEClass = createEClass(QUADRATIC_CURVE_TO);
 		createEReference(quadraticCurveToEClass, QUADRATIC_CURVE_TO__CONTROL);
 		createEReference(quadraticCurveToEClass, QUADRATIC_CURVE_TO__POINT);
-
 		gradientEClass = createEClass(GRADIENT);
 		createEReference(gradientEClass, GRADIENT__STOP);
-
 		gradientStopEClass = createEClass(GRADIENT_STOP);
 		createEAttribute(gradientStopEClass, GRADIENT_STOP__COLOR);
 		createEAttribute(gradientStopEClass, GRADIENT_STOP__OFFSET);
 		createEAttribute(gradientStopEClass, GRADIENT_STOP__OPACITY);
 		createEOperation(gradientStopEClass, GRADIENT_STOP___VALID_OFFSET__DIAGNOSTICCHAIN_MAP);
 		createEOperation(gradientStopEClass, GRADIENT_STOP___VALID_OPACITY__DIAGNOSTICCHAIN_MAP);
-
 		imageEClass = createEClass(IMAGE);
 		createEAttribute(imageEClass, IMAGE__SOURCE);
 		createEReference(imageEClass, IMAGE__BOUNDS);
 		createEAttribute(imageEClass, IMAGE__IS_ASPECT_RATIO_PRESERVED);
 		createEOperation(imageEClass, IMAGE___SOURCE_CANNOT_BE_EMPTY__DIAGNOSTICCHAIN_MAP);
-
 		lineEClass = createEClass(LINE);
 		createEReference(lineEClass, LINE__START);
 		createEReference(lineEClass, LINE__END);
-
 		markedElementEClass = createEClass(MARKED_ELEMENT);
 		createEReference(markedElementEClass, MARKED_ELEMENT__END_MARKER);
 		createEReference(markedElementEClass, MARKED_ELEMENT__MID_MARKER);
@@ -1930,19 +2111,15 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 		createEOperation(markedElementEClass, MARKED_ELEMENT___REFERENCED_START_MARKER_HAS_ID__DIAGNOSTICCHAIN_MAP);
 		createEOperation(markedElementEClass, MARKED_ELEMENT___REFERENCED_MID_MARKER_HAS_ID__DIAGNOSTICCHAIN_MAP);
 		createEOperation(markedElementEClass, MARKED_ELEMENT___REFERENCED_END_MARKER_HAS_ID__DIAGNOSTICCHAIN_MAP);
-
 		markerEClass = createEClass(MARKER);
 		createEReference(markerEClass, MARKER__SIZE);
 		createEReference(markerEClass, MARKER__REFERENCE);
-
 		linearGradientEClass = createEClass(LINEAR_GRADIENT);
 		createEReference(linearGradientEClass, LINEAR_GRADIENT__START);
 		createEReference(linearGradientEClass, LINEAR_GRADIENT__END);
 		createEOperation(linearGradientEClass, LINEAR_GRADIENT___VALID_GRADIENT_VECTOR__DIAGNOSTICCHAIN_MAP);
-
 		lineToEClass = createEClass(LINE_TO);
 		createEReference(lineToEClass, LINE_TO__POINT);
-
 		matrixEClass = createEClass(MATRIX);
 		createEAttribute(matrixEClass, MATRIX__A);
 		createEAttribute(matrixEClass, MATRIX__B);
@@ -1950,21 +2127,16 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 		createEAttribute(matrixEClass, MATRIX__D);
 		createEAttribute(matrixEClass, MATRIX__E);
 		createEAttribute(matrixEClass, MATRIX__F);
-
 		pathEClass = createEClass(PATH);
 		createEReference(pathEClass, PATH__COMMAND);
 		createEOperation(pathEClass, PATH___FIRST_COMMAND_MUST_BE_MOVE__DIAGNOSTICCHAIN_MAP);
-
 		patternEClass = createEClass(PATTERN);
 		createEReference(patternEClass, PATTERN__BOUNDS);
 		createEReference(patternEClass, PATTERN__TILE);
-
 		polygonEClass = createEClass(POLYGON);
 		createEReference(polygonEClass, POLYGON__POINT);
-
 		polylineEClass = createEClass(POLYLINE);
 		createEReference(polylineEClass, POLYLINE__POINT);
-
 		radialGradientEClass = createEClass(RADIAL_GRADIENT);
 		createEReference(radialGradientEClass, RADIAL_GRADIENT__CENTER);
 		createEReference(radialGradientEClass, RADIAL_GRADIENT__FOCUS);
@@ -1972,46 +2144,37 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 		createEOperation(radialGradientEClass, RADIAL_GRADIENT___VALID_CENTER_POINT__DIAGNOSTICCHAIN_MAP);
 		createEOperation(radialGradientEClass, RADIAL_GRADIENT___VALID_FOCUS_POINT__DIAGNOSTICCHAIN_MAP);
 		createEOperation(radialGradientEClass, RADIAL_GRADIENT___VALID_RADIUS__DIAGNOSTICCHAIN_MAP);
-
 		rectangleEClass = createEClass(RECTANGLE);
 		createEReference(rectangleEClass, RECTANGLE__BOUNDS);
 		createEAttribute(rectangleEClass, RECTANGLE__CORNER_RADIUS);
 		createEOperation(rectangleEClass, RECTANGLE___NON_NEGATIVE_CORNER_RADIUS__DIAGNOSTICCHAIN_MAP);
-
 		rootCanvasEClass = createEClass(ROOT_CANVAS);
 		createEAttribute(rootCanvasEClass, ROOT_CANVAS__BACKGROUND_COLOR);
 		createEReference(rootCanvasEClass, ROOT_CANVAS__DEFINITIONS);
 		createEReference(rootCanvasEClass, ROOT_CANVAS__EXTERNAL_STYLE_SHEET);
 		createEAttribute(rootCanvasEClass, ROOT_CANVAS__SCRIPT);
-
 		rotateEClass = createEClass(ROTATE);
 		createEAttribute(rotateEClass, ROTATE__ANGLE);
 		createEReference(rotateEClass, ROTATE__CENTER);
-
 		scaleEClass = createEClass(SCALE);
 		createEAttribute(scaleEClass, SCALE__FACTOR_X);
 		createEAttribute(scaleEClass, SCALE__FACTOR_Y);
 		createEOperation(scaleEClass, SCALE___NONNEGATIVESCALE__DIAGNOSTICCHAIN_MAP);
-
 		skewEClass = createEClass(SKEW);
 		createEAttribute(skewEClass, SKEW__ANGLE_X);
 		createEAttribute(skewEClass, SKEW__ANGLE_Y);
-
 		textEClass = createEClass(TEXT);
 		createEAttribute(textEClass, TEXT__DATA);
 		createEReference(textEClass, TEXT__POSITION);
 		createEAttribute(textEClass, TEXT__ANCHOR);
 		createEOperation(textEClass, TEXT___DATA_CANNOT_BE_EMPTY__DIAGNOSTICCHAIN_MAP);
-
 		translateEClass = createEClass(TRANSLATE);
 		createEAttribute(translateEClass, TRANSLATE__DELTA_X);
 		createEAttribute(translateEClass, TRANSLATE__DELTA_Y);
-
 		useEClass = createEClass(USE);
 		createEReference(useEClass, USE__BOUNDS);
 		createEReference(useEClass, USE__REFERENCED_ELEMENT);
 		createEOperation(useEClass, USE___REFERENCED_ELEMENT_HAS_ID__DIAGNOSTICCHAIN_MAP);
-
 		// Create enums
 		fontDecorationEEnum = createEEnum(FONT_DECORATION);
 		elementKindEEnum = createEEnum(ELEMENT_KIND);
@@ -2020,6 +2183,7 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private boolean isInitialized = false;
@@ -2032,21 +2196,17 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 	 * @generated
 	 */
 	public void initializePackageContents() {
-		if (isInitialized) return;
+		if(isInitialized)
+			return;
 		isInitialized = true;
-
 		// Initialize package
 		setName(eNAME);
 		setNsPrefix(eNS_PREFIX);
 		setNsURI(eNS_URI);
-
 		// Obtain other dependent packages
 		DCPackage theDCPackage = (DCPackage)EPackage.Registry.INSTANCE.getEPackage(DCPackage.eNS_URI);
-
 		// Create type parameters
-
 		// Set bounds for type parameters
-
 		// Add supertypes to classes
 		canvasEClass.getESuperTypes().add(this.getGroup());
 		groupEClass.getESuperTypes().add(this.getGraphicalElement());
@@ -2081,11 +2241,9 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 		textEClass.getESuperTypes().add(this.getGraphicalElement());
 		translateEClass.getESuperTypes().add(this.getTransform());
 		useEClass.getESuperTypes().add(this.getGraphicalElement());
-
 		// Initialize classes, features, and operations; add parameters
 		initEClass(canvasEClass, Canvas.class, "Canvas", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEReference(getCanvas_Bounds(), theDCPackage.getBounds(), null, "bounds", null, 0, 1, Canvas.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-
 		EOperation op = initEOperation(getCanvas__CanvasCannotHaveTransforms__DiagnosticChain_Map(), ecorePackage.getEBoolean(), "canvasCannotHaveTransforms", 0, 1, IS_UNIQUE, IS_ORDERED);
 		addEParameter(op, ecorePackage.getEDiagnosticChain(), "diagnostics", 0, 1, IS_UNIQUE, IS_ORDERED);
 		EGenericType g1 = createEGenericType(ecorePackage.getEMap());
@@ -2094,11 +2252,9 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 		g2 = createEGenericType(ecorePackage.getEJavaObject());
 		g1.getETypeArguments().add(g2);
 		addEParameter(op, g1, "context", 0, 1, IS_UNIQUE, IS_ORDERED);
-
 		initEClass(groupEClass, Group.class, "Group", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEReference(getGroup_Member(), this.getGraphicalElement(), this.getGraphicalElement_Group(), "member", null, 0, -1, Group.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEAttribute(getGroup_Layout(), theDCPackage.getString(), "layout", null, 0, 1, Group.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-
 		initEClass(graphicalElementEClass, GraphicalElement.class, "GraphicalElement", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEReference(getGraphicalElement_ClipPath(), this.getClipPath(), null, "clipPath", null, 0, 1, GraphicalElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
 		initEReference(getGraphicalElement_Group(), this.getGroup(), this.getGroup_Member(), "group", null, 0, 1, GraphicalElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
@@ -2106,7 +2262,6 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 		initEReference(getGraphicalElement_Style(), this.getStyle(), null, "style", null, 0, 1, GraphicalElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEReference(getGraphicalElement_Transform(), this.getTransform(), null, "transform", null, 0, -1, GraphicalElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEAttribute(getGraphicalElement_LayoutData(), theDCPackage.getString(), "layoutData", null, 0, 1, GraphicalElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-
 		op = initEOperation(getGraphicalElement__ReferencedClippathHasId__DiagnosticChain_Map(), ecorePackage.getEBoolean(), "referencedClippathHasId", 0, 1, IS_UNIQUE, IS_ORDERED);
 		addEParameter(op, ecorePackage.getEDiagnosticChain(), "diagnostics", 0, 1, IS_UNIQUE, IS_ORDERED);
 		g1 = createEGenericType(ecorePackage.getEMap());
@@ -2115,10 +2270,8 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 		g2 = createEGenericType(ecorePackage.getEJavaObject());
 		g1.getETypeArguments().add(g2);
 		addEParameter(op, g1, "context", 0, 1, IS_UNIQUE, IS_ORDERED);
-
 		initEClass(definitionEClass, Definition.class, "Definition", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEAttribute(getDefinition_Id(), theDCPackage.getString(), "id", null, 0, 1, Definition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-
 		op = initEOperation(getDefinition__IdCannotBeEmpty__DiagnosticChain_Map(), ecorePackage.getEBoolean(), "idCannotBeEmpty", 0, 1, IS_UNIQUE, IS_ORDERED);
 		addEParameter(op, ecorePackage.getEDiagnosticChain(), "diagnostics", 0, 1, IS_UNIQUE, IS_ORDERED);
 		g1 = createEGenericType(ecorePackage.getEMap());
@@ -2127,15 +2280,11 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 		g2 = createEGenericType(ecorePackage.getEJavaObject());
 		g1.getETypeArguments().add(g2);
 		addEParameter(op, g1, "context", 0, 1, IS_UNIQUE, IS_ORDERED);
-
 		initEClass(moveToEClass, MoveTo.class, "MoveTo", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEReference(getMoveTo_Point(), theDCPackage.getPoint(), null, "point", null, 1, 1, MoveTo.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-
 		initEClass(pathCommandEClass, PathCommand.class, "PathCommand", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEAttribute(getPathCommand_IsRelative(), theDCPackage.getBoolean(), "isRelative", "false", 1, 1, PathCommand.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-
 		initEClass(clipPathEClass, ClipPath.class, "ClipPath", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
 		initEClass(styleEClass, Style.class, "Style", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEReference(getStyle_Fill(), this.getPaint(), null, "fill", null, 0, 1, Style.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
 		initEAttribute(getStyle_FillOpacity(), theDCPackage.getReal(), "fillOpacity", null, 0, 1, Style.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
@@ -2148,7 +2297,6 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 		initEAttribute(getStyle_FontItalic(), theDCPackage.getBoolean(), "fontItalic", null, 0, 1, Style.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
 		initEAttribute(getStyle_FontBold(), theDCPackage.getBoolean(), "fontBold", null, 0, 1, Style.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
 		initEAttribute(getStyle_FontDecoration(), this.getFontDecoration(), "fontDecoration", null, 0, 1, Style.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-
 		op = initEOperation(getStyle__ValidFontSize__DiagnosticChain_Map(), ecorePackage.getEBoolean(), "validFontSize", 0, 1, IS_UNIQUE, IS_ORDERED);
 		addEParameter(op, ecorePackage.getEDiagnosticChain(), "diagnostics", 0, 1, IS_UNIQUE, IS_ORDERED);
 		g1 = createEGenericType(ecorePackage.getEMap());
@@ -2157,7 +2305,6 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 		g2 = createEGenericType(ecorePackage.getEJavaObject());
 		g1.getETypeArguments().add(g2);
 		addEParameter(op, g1, "context", 0, 1, IS_UNIQUE, IS_ORDERED);
-
 		op = initEOperation(getStyle__ValidFillOpacity__DiagnosticChain_Map(), ecorePackage.getEBoolean(), "validFillOpacity", 0, 1, IS_UNIQUE, IS_ORDERED);
 		addEParameter(op, ecorePackage.getEDiagnosticChain(), "diagnostics", 0, 1, IS_UNIQUE, IS_ORDERED);
 		g1 = createEGenericType(ecorePackage.getEMap());
@@ -2166,7 +2313,6 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 		g2 = createEGenericType(ecorePackage.getEJavaObject());
 		g1.getETypeArguments().add(g2);
 		addEParameter(op, g1, "context", 0, 1, IS_UNIQUE, IS_ORDERED);
-
 		op = initEOperation(getStyle__ValidStrokeWidth__DiagnosticChain_Map(), ecorePackage.getEBoolean(), "validStrokeWidth", 0, 1, IS_UNIQUE, IS_ORDERED);
 		addEParameter(op, ecorePackage.getEDiagnosticChain(), "diagnostics", 0, 1, IS_UNIQUE, IS_ORDERED);
 		g1 = createEGenericType(ecorePackage.getEMap());
@@ -2175,7 +2321,6 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 		g2 = createEGenericType(ecorePackage.getEJavaObject());
 		g1.getETypeArguments().add(g2);
 		addEParameter(op, g1, "context", 0, 1, IS_UNIQUE, IS_ORDERED);
-
 		op = initEOperation(getStyle__ValidDashLengthSize__DiagnosticChain_Map(), ecorePackage.getEBoolean(), "validDashLengthSize", 0, 1, IS_UNIQUE, IS_ORDERED);
 		addEParameter(op, ecorePackage.getEDiagnosticChain(), "diagnostics", 0, 1, IS_UNIQUE, IS_ORDERED);
 		g1 = createEGenericType(ecorePackage.getEMap());
@@ -2184,7 +2329,6 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 		g2 = createEGenericType(ecorePackage.getEJavaObject());
 		g1.getETypeArguments().add(g2);
 		addEParameter(op, g1, "context", 0, 1, IS_UNIQUE, IS_ORDERED);
-
 		op = initEOperation(getStyle__ValidStrokeOpacity__DiagnosticChain_Map(), ecorePackage.getEBoolean(), "validStrokeOpacity", 0, 1, IS_UNIQUE, IS_ORDERED);
 		addEParameter(op, ecorePackage.getEDiagnosticChain(), "diagnostics", 0, 1, IS_UNIQUE, IS_ORDERED);
 		g1 = createEGenericType(ecorePackage.getEMap());
@@ -2193,11 +2337,9 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 		g2 = createEGenericType(ecorePackage.getEJavaObject());
 		g1.getETypeArguments().add(g2);
 		addEParameter(op, g1, "context", 0, 1, IS_UNIQUE, IS_ORDERED);
-
 		initEClass(paintEClass, Paint.class, "Paint", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEAttribute(getPaint_Color(), theDCPackage.getColor(), "color", null, 0, 1, Paint.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
 		initEReference(getPaint_PaintServer(), this.getPaintServer(), null, "paintServer", null, 0, 1, Paint.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-
 		op = initEOperation(getPaint__ReferencedPaintServerHasId__DiagnosticChain_Map(), ecorePackage.getEBoolean(), "referencedPaintServerHasId", 0, 1, IS_UNIQUE, IS_ORDERED);
 		addEParameter(op, ecorePackage.getEDiagnosticChain(), "diagnostics", 0, 1, IS_UNIQUE, IS_ORDERED);
 		g1 = createEGenericType(ecorePackage.getEMap());
@@ -2206,16 +2348,12 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 		g2 = createEGenericType(ecorePackage.getEJavaObject());
 		g1.getETypeArguments().add(g2);
 		addEParameter(op, g1, "context", 0, 1, IS_UNIQUE, IS_ORDERED);
-
 		initEClass(paintServerEClass, PaintServer.class, "PaintServer", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEReference(getPaintServer_Transform(), this.getTransform(), null, "transform", null, 0, -1, PaintServer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
 		initEClass(transformEClass, Transform.class, "Transform", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
 		initEClass(circleEClass, Circle.class, "Circle", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEReference(getCircle_Center(), theDCPackage.getPoint(), null, "center", null, 1, 1, Circle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
 		initEAttribute(getCircle_Radius(), theDCPackage.getReal(), "radius", "0", 1, 1, Circle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-
 		op = initEOperation(getCircle__NonNegativeRadius__DiagnosticChain_Map(), ecorePackage.getEBoolean(), "nonNegativeRadius", 0, 1, IS_UNIQUE, IS_ORDERED);
 		addEParameter(op, ecorePackage.getEDiagnosticChain(), "diagnostics", 0, 1, IS_UNIQUE, IS_ORDERED);
 		g1 = createEGenericType(ecorePackage.getEMap());
@@ -2224,52 +2362,40 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 		g2 = createEGenericType(ecorePackage.getEJavaObject());
 		g1.getETypeArguments().add(g2);
 		addEParameter(op, g1, "context", 0, 1, IS_UNIQUE, IS_ORDERED);
-
 		initEClass(closePathEClass, ClosePath.class, "ClosePath", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
 		initEClass(cubicCurveToEClass, CubicCurveTo.class, "CubicCurveTo", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEReference(getCubicCurveTo_StartControl(), theDCPackage.getPoint(), null, "startControl", null, 1, 1, CubicCurveTo.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
 		initEReference(getCubicCurveTo_EndControl(), theDCPackage.getPoint(), null, "endControl", null, 1, 1, CubicCurveTo.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
 		initEReference(getCubicCurveTo_Point(), theDCPackage.getPoint(), null, "point", null, 1, 1, CubicCurveTo.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-
 		initEClass(definitionsEClass, Definitions.class, "Definitions", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEReference(getDefinitions_Defnition(), this.getDefinition(), null, "defnition", null, 0, -1, Definitions.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEReference(getDefinitions_StyleSheet(), this.getStyleSheet(), null, "styleSheet", null, 0, 1, Definitions.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-
 		initEClass(styleSheetEClass, StyleSheet.class, "StyleSheet", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEReference(getStyleSheet_Rule(), this.getStyleRule(), null, "rule", null, 0, -1, StyleSheet.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
 		initEClass(styleRuleEClass, StyleRule.class, "StyleRule", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEReference(getStyleRule_Selector(), this.getStyleSelector(), null, "selector", null, 1, -1, StyleRule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEReference(getStyleRule_Style(), this.getStyle(), null, "style", null, 1, 1, StyleRule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-
 		initEClass(styleSelectorEClass, StyleSelector.class, "StyleSelector", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEAttribute(getStyleSelector_Kind(), this.getElementKind(), "kind", null, 0, 1, StyleSelector.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
 		initEAttribute(getStyleSelector_Class(), theDCPackage.getString(), "class", null, 0, -1, StyleSelector.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
 		initEClass(ellipseEClass, Ellipse.class, "Ellipse", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEReference(getEllipse_Center(), theDCPackage.getPoint(), null, "center", null, 1, 1, Ellipse.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
 		initEReference(getEllipse_Radii(), theDCPackage.getDimension(), null, "radii", null, 1, 1, Ellipse.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-
 		initEClass(ellipticalArcToEClass, EllipticalArcTo.class, "EllipticalArcTo", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEReference(getEllipticalArcTo_Radii(), theDCPackage.getDimension(), null, "radii", null, 1, 1, EllipticalArcTo.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
 		initEAttribute(getEllipticalArcTo_Rotation(), theDCPackage.getReal(), "rotation", null, 1, 1, EllipticalArcTo.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
 		initEAttribute(getEllipticalArcTo_IsLargeArc(), theDCPackage.getBoolean(), "isLargeArc", null, 1, 1, EllipticalArcTo.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
 		initEAttribute(getEllipticalArcTo_IsSweep(), theDCPackage.getBoolean(), "isSweep", null, 1, 1, EllipticalArcTo.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
 		initEReference(getEllipticalArcTo_Point(), theDCPackage.getPoint(), null, "point", null, 1, 1, EllipticalArcTo.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-
 		initEClass(quadraticCurveToEClass, QuadraticCurveTo.class, "QuadraticCurveTo", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEReference(getQuadraticCurveTo_Control(), theDCPackage.getPoint(), null, "control", null, 1, 1, QuadraticCurveTo.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
 		initEReference(getQuadraticCurveTo_Point(), theDCPackage.getPoint(), null, "point", null, 1, 1, QuadraticCurveTo.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-
 		initEClass(gradientEClass, Gradient.class, "Gradient", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEReference(getGradient_Stop(), this.getGradientStop(), null, "stop", null, 2, -1, Gradient.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
 		initEClass(gradientStopEClass, GradientStop.class, "GradientStop", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEAttribute(getGradientStop_Color(), theDCPackage.getColor(), "color", null, 0, 1, GradientStop.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
 		initEAttribute(getGradientStop_Offset(), theDCPackage.getReal(), "offset", null, 0, 1, GradientStop.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
 		initEAttribute(getGradientStop_Opacity(), theDCPackage.getReal(), "opacity", null, 0, 1, GradientStop.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-
 		op = initEOperation(getGradientStop__ValidOffset__DiagnosticChain_Map(), ecorePackage.getEBoolean(), "validOffset", 0, 1, IS_UNIQUE, IS_ORDERED);
 		addEParameter(op, ecorePackage.getEDiagnosticChain(), "diagnostics", 0, 1, IS_UNIQUE, IS_ORDERED);
 		g1 = createEGenericType(ecorePackage.getEMap());
@@ -2278,7 +2404,6 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 		g2 = createEGenericType(ecorePackage.getEJavaObject());
 		g1.getETypeArguments().add(g2);
 		addEParameter(op, g1, "context", 0, 1, IS_UNIQUE, IS_ORDERED);
-
 		op = initEOperation(getGradientStop__ValidOpacity__DiagnosticChain_Map(), ecorePackage.getEBoolean(), "validOpacity", 0, 1, IS_UNIQUE, IS_ORDERED);
 		addEParameter(op, ecorePackage.getEDiagnosticChain(), "diagnostics", 0, 1, IS_UNIQUE, IS_ORDERED);
 		g1 = createEGenericType(ecorePackage.getEMap());
@@ -2287,12 +2412,10 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 		g2 = createEGenericType(ecorePackage.getEJavaObject());
 		g1.getETypeArguments().add(g2);
 		addEParameter(op, g1, "context", 0, 1, IS_UNIQUE, IS_ORDERED);
-
 		initEClass(imageEClass, Image.class, "Image", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEAttribute(getImage_Source(), theDCPackage.getString(), "source", null, 1, 1, Image.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
 		initEReference(getImage_Bounds(), theDCPackage.getBounds(), null, "bounds", null, 1, 1, Image.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
 		initEAttribute(getImage_IsAspectRatioPreserved(), theDCPackage.getBoolean(), "isAspectRatioPreserved", "false", 1, 1, Image.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-
 		op = initEOperation(getImage__SourceCannotBeEmpty__DiagnosticChain_Map(), ecorePackage.getEBoolean(), "sourceCannotBeEmpty", 0, 1, IS_UNIQUE, IS_ORDERED);
 		addEParameter(op, ecorePackage.getEDiagnosticChain(), "diagnostics", 0, 1, IS_UNIQUE, IS_ORDERED);
 		g1 = createEGenericType(ecorePackage.getEMap());
@@ -2301,16 +2424,13 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 		g2 = createEGenericType(ecorePackage.getEJavaObject());
 		g1.getETypeArguments().add(g2);
 		addEParameter(op, g1, "context", 0, 1, IS_UNIQUE, IS_ORDERED);
-
 		initEClass(lineEClass, Line.class, "Line", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEReference(getLine_Start(), theDCPackage.getPoint(), null, "start", null, 1, 1, Line.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
 		initEReference(getLine_End(), theDCPackage.getPoint(), null, "end", null, 1, 1, Line.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-
 		initEClass(markedElementEClass, MarkedElement.class, "MarkedElement", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEReference(getMarkedElement_EndMarker(), this.getMarker(), null, "endMarker", null, 0, 1, MarkedElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
 		initEReference(getMarkedElement_MidMarker(), this.getMarker(), null, "midMarker", null, 0, 1, MarkedElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
 		initEReference(getMarkedElement_StartMarker(), this.getMarker(), null, "startMarker", null, 0, 1, MarkedElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-
 		op = initEOperation(getMarkedElement__ReferencedStartMarkerHasId__DiagnosticChain_Map(), ecorePackage.getEBoolean(), "referencedStartMarkerHasId", 0, 1, IS_UNIQUE, IS_ORDERED);
 		addEParameter(op, ecorePackage.getEDiagnosticChain(), "diagnostics", 0, 1, IS_UNIQUE, IS_ORDERED);
 		g1 = createEGenericType(ecorePackage.getEMap());
@@ -2319,7 +2439,6 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 		g2 = createEGenericType(ecorePackage.getEJavaObject());
 		g1.getETypeArguments().add(g2);
 		addEParameter(op, g1, "context", 0, 1, IS_UNIQUE, IS_ORDERED);
-
 		op = initEOperation(getMarkedElement__ReferencedMidMarkerHasId__DiagnosticChain_Map(), ecorePackage.getEBoolean(), "referencedMidMarkerHasId", 0, 1, IS_UNIQUE, IS_ORDERED);
 		addEParameter(op, ecorePackage.getEDiagnosticChain(), "diagnostics", 0, 1, IS_UNIQUE, IS_ORDERED);
 		g1 = createEGenericType(ecorePackage.getEMap());
@@ -2328,7 +2447,6 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 		g2 = createEGenericType(ecorePackage.getEJavaObject());
 		g1.getETypeArguments().add(g2);
 		addEParameter(op, g1, "context", 0, 1, IS_UNIQUE, IS_ORDERED);
-
 		op = initEOperation(getMarkedElement__ReferencedEndMarkerHasId__DiagnosticChain_Map(), ecorePackage.getEBoolean(), "referencedEndMarkerHasId", 0, 1, IS_UNIQUE, IS_ORDERED);
 		addEParameter(op, ecorePackage.getEDiagnosticChain(), "diagnostics", 0, 1, IS_UNIQUE, IS_ORDERED);
 		g1 = createEGenericType(ecorePackage.getEMap());
@@ -2337,15 +2455,12 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 		g2 = createEGenericType(ecorePackage.getEJavaObject());
 		g1.getETypeArguments().add(g2);
 		addEParameter(op, g1, "context", 0, 1, IS_UNIQUE, IS_ORDERED);
-
 		initEClass(markerEClass, Marker.class, "Marker", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEReference(getMarker_Size(), theDCPackage.getDimension(), null, "size", null, 1, 1, Marker.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
 		initEReference(getMarker_Reference(), theDCPackage.getPoint(), null, "reference", null, 1, 1, Marker.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-
 		initEClass(linearGradientEClass, LinearGradient.class, "LinearGradient", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEReference(getLinearGradient_Start(), theDCPackage.getPoint(), null, "start", null, 1, 1, LinearGradient.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
 		initEReference(getLinearGradient_End(), theDCPackage.getPoint(), null, "end", null, 1, 1, LinearGradient.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-
 		op = initEOperation(getLinearGradient__ValidGradientVector__DiagnosticChain_Map(), ecorePackage.getEBoolean(), "validGradientVector", 0, 1, IS_UNIQUE, IS_ORDERED);
 		addEParameter(op, ecorePackage.getEDiagnosticChain(), "diagnostics", 0, 1, IS_UNIQUE, IS_ORDERED);
 		g1 = createEGenericType(ecorePackage.getEMap());
@@ -2354,10 +2469,8 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 		g2 = createEGenericType(ecorePackage.getEJavaObject());
 		g1.getETypeArguments().add(g2);
 		addEParameter(op, g1, "context", 0, 1, IS_UNIQUE, IS_ORDERED);
-
 		initEClass(lineToEClass, LineTo.class, "LineTo", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEReference(getLineTo_Point(), theDCPackage.getPoint(), null, "point", null, 1, 1, LineTo.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-
 		initEClass(matrixEClass, Matrix.class, "Matrix", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEAttribute(getMatrix_A(), theDCPackage.getReal(), "a", null, 1, 1, Matrix.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
 		initEAttribute(getMatrix_B(), theDCPackage.getReal(), "b", null, 1, 1, Matrix.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
@@ -2365,10 +2478,8 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 		initEAttribute(getMatrix_D(), theDCPackage.getReal(), "d", null, 1, 1, Matrix.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
 		initEAttribute(getMatrix_E(), theDCPackage.getReal(), "e", null, 1, 1, Matrix.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
 		initEAttribute(getMatrix_F(), theDCPackage.getReal(), "f", null, 1, 1, Matrix.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-
 		initEClass(pathEClass, Path.class, "Path", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEReference(getPath_Command(), this.getPathCommand(), null, "command", null, 1, -1, Path.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
 		op = initEOperation(getPath__FirstCommandMustBeMove__DiagnosticChain_Map(), ecorePackage.getEBoolean(), "firstCommandMustBeMove", 0, 1, IS_UNIQUE, IS_ORDERED);
 		addEParameter(op, ecorePackage.getEDiagnosticChain(), "diagnostics", 0, 1, IS_UNIQUE, IS_ORDERED);
 		g1 = createEGenericType(ecorePackage.getEMap());
@@ -2377,22 +2488,17 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 		g2 = createEGenericType(ecorePackage.getEJavaObject());
 		g1.getETypeArguments().add(g2);
 		addEParameter(op, g1, "context", 0, 1, IS_UNIQUE, IS_ORDERED);
-
 		initEClass(patternEClass, Pattern.class, "Pattern", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEReference(getPattern_Bounds(), theDCPackage.getBounds(), null, "bounds", null, 1, 1, Pattern.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
 		initEReference(getPattern_Tile(), this.getGraphicalElement(), null, "tile", null, 1, 1, Pattern.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-
 		initEClass(polygonEClass, Polygon.class, "Polygon", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEReference(getPolygon_Point(), theDCPackage.getPoint(), null, "point", null, 3, -1, Polygon.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
 		initEClass(polylineEClass, Polyline.class, "Polyline", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEReference(getPolyline_Point(), theDCPackage.getPoint(), null, "point", null, 2, -1, Polyline.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
 		initEClass(radialGradientEClass, RadialGradient.class, "RadialGradient", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEReference(getRadialGradient_Center(), theDCPackage.getPoint(), null, "center", null, 1, 1, RadialGradient.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
 		initEReference(getRadialGradient_Focus(), theDCPackage.getPoint(), null, "focus", null, 1, 1, RadialGradient.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
 		initEAttribute(getRadialGradient_Radius(), theDCPackage.getReal(), "radius", "0.5", 1, 1, RadialGradient.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-
 		op = initEOperation(getRadialGradient__ValidCenterPoint__DiagnosticChain_Map(), ecorePackage.getEBoolean(), "validCenterPoint", 0, 1, IS_UNIQUE, IS_ORDERED);
 		addEParameter(op, ecorePackage.getEDiagnosticChain(), "diagnostics", 0, 1, IS_UNIQUE, IS_ORDERED);
 		g1 = createEGenericType(ecorePackage.getEMap());
@@ -2401,7 +2507,6 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 		g2 = createEGenericType(ecorePackage.getEJavaObject());
 		g1.getETypeArguments().add(g2);
 		addEParameter(op, g1, "context", 0, 1, IS_UNIQUE, IS_ORDERED);
-
 		op = initEOperation(getRadialGradient__ValidFocusPoint__DiagnosticChain_Map(), ecorePackage.getEBoolean(), "validFocusPoint", 0, 1, IS_UNIQUE, IS_ORDERED);
 		addEParameter(op, ecorePackage.getEDiagnosticChain(), "diagnostics", 0, 1, IS_UNIQUE, IS_ORDERED);
 		g1 = createEGenericType(ecorePackage.getEMap());
@@ -2410,7 +2515,6 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 		g2 = createEGenericType(ecorePackage.getEJavaObject());
 		g1.getETypeArguments().add(g2);
 		addEParameter(op, g1, "context", 0, 1, IS_UNIQUE, IS_ORDERED);
-
 		op = initEOperation(getRadialGradient__ValidRadius__DiagnosticChain_Map(), ecorePackage.getEBoolean(), "validRadius", 0, 1, IS_UNIQUE, IS_ORDERED);
 		addEParameter(op, ecorePackage.getEDiagnosticChain(), "diagnostics", 0, 1, IS_UNIQUE, IS_ORDERED);
 		g1 = createEGenericType(ecorePackage.getEMap());
@@ -2419,11 +2523,9 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 		g2 = createEGenericType(ecorePackage.getEJavaObject());
 		g1.getETypeArguments().add(g2);
 		addEParameter(op, g1, "context", 0, 1, IS_UNIQUE, IS_ORDERED);
-
 		initEClass(rectangleEClass, Rectangle.class, "Rectangle", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEReference(getRectangle_Bounds(), theDCPackage.getBounds(), null, "bounds", null, 1, 1, Rectangle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
 		initEAttribute(getRectangle_CornerRadius(), theDCPackage.getReal(), "cornerRadius", "0", 0, 1, Rectangle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-
 		op = initEOperation(getRectangle__NonNegativeCornerRadius__DiagnosticChain_Map(), ecorePackage.getEBoolean(), "nonNegativeCornerRadius", 0, 1, IS_UNIQUE, IS_ORDERED);
 		addEParameter(op, ecorePackage.getEDiagnosticChain(), "diagnostics", 0, 1, IS_UNIQUE, IS_ORDERED);
 		g1 = createEGenericType(ecorePackage.getEMap());
@@ -2432,21 +2534,17 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 		g2 = createEGenericType(ecorePackage.getEJavaObject());
 		g1.getETypeArguments().add(g2);
 		addEParameter(op, g1, "context", 0, 1, IS_UNIQUE, IS_ORDERED);
-
 		initEClass(rootCanvasEClass, RootCanvas.class, "RootCanvas", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEAttribute(getRootCanvas_BackgroundColor(), theDCPackage.getColor(), "backgroundColor", null, 0, 1, RootCanvas.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
 		initEReference(getRootCanvas_Definitions(), this.getDefinitions(), null, "definitions", null, 0, 1, RootCanvas.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEReference(getRootCanvas_ExternalStyleSheet(), this.getStyleSheet(), null, "externalStyleSheet", null, 0, -1, RootCanvas.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEAttribute(getRootCanvas_Script(), theDCPackage.getString(), "script", null, 0, -1, RootCanvas.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-
 		initEClass(rotateEClass, Rotate.class, "Rotate", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEAttribute(getRotate_Angle(), theDCPackage.getReal(), "angle", null, 1, 1, Rotate.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
 		initEReference(getRotate_Center(), theDCPackage.getPoint(), null, "center", null, 0, 1, Rotate.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-
 		initEClass(scaleEClass, Scale.class, "Scale", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEAttribute(getScale_FactorX(), theDCPackage.getReal(), "factorX", null, 1, 1, Scale.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
 		initEAttribute(getScale_FactorY(), theDCPackage.getReal(), "factorY", null, 1, 1, Scale.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-
 		op = initEOperation(getScale__Nonnegativescale__DiagnosticChain_Map(), ecorePackage.getEBoolean(), "nonnegativescale", 0, 1, IS_UNIQUE, IS_ORDERED);
 		addEParameter(op, ecorePackage.getEDiagnosticChain(), "diagnostics", 0, 1, IS_UNIQUE, IS_ORDERED);
 		g1 = createEGenericType(ecorePackage.getEMap());
@@ -2455,16 +2553,13 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 		g2 = createEGenericType(ecorePackage.getEJavaObject());
 		g1.getETypeArguments().add(g2);
 		addEParameter(op, g1, "context", 0, 1, IS_UNIQUE, IS_ORDERED);
-
 		initEClass(skewEClass, Skew.class, "Skew", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEAttribute(getSkew_AngleX(), theDCPackage.getReal(), "angleX", null, 1, 1, Skew.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
 		initEAttribute(getSkew_AngleY(), theDCPackage.getReal(), "angleY", null, 1, 1, Skew.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-
 		initEClass(textEClass, Text.class, "Text", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEAttribute(getText_Data(), theDCPackage.getString(), "data", null, 1, 1, Text.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
 		initEReference(getText_Position(), theDCPackage.getPoint(), null, "position", null, 1, 1, Text.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
 		initEAttribute(getText_Anchor(), this.getTextAnchor(), "anchor", null, 0, 1, Text.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-
 		op = initEOperation(getText__DataCannotBeEmpty__DiagnosticChain_Map(), ecorePackage.getEBoolean(), "dataCannotBeEmpty", 0, 1, IS_UNIQUE, IS_ORDERED);
 		addEParameter(op, ecorePackage.getEDiagnosticChain(), "diagnostics", 0, 1, IS_UNIQUE, IS_ORDERED);
 		g1 = createEGenericType(ecorePackage.getEMap());
@@ -2473,15 +2568,12 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 		g2 = createEGenericType(ecorePackage.getEJavaObject());
 		g1.getETypeArguments().add(g2);
 		addEParameter(op, g1, "context", 0, 1, IS_UNIQUE, IS_ORDERED);
-
 		initEClass(translateEClass, Translate.class, "Translate", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEAttribute(getTranslate_DeltaX(), theDCPackage.getReal(), "deltaX", null, 1, 1, Translate.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
 		initEAttribute(getTranslate_DeltaY(), theDCPackage.getReal(), "deltaY", null, 1, 1, Translate.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-
 		initEClass(useEClass, Use.class, "Use", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEReference(getUse_Bounds(), theDCPackage.getBounds(), null, "bounds", null, 0, 1, Use.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
 		initEReference(getUse_ReferencedElement(), this.getGraphicalElement(), null, "referencedElement", null, 1, 1, Use.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
 		op = initEOperation(getUse__ReferencedElementHasId__DiagnosticChain_Map(), ecorePackage.getEBoolean(), "referencedElementHasId", 0, 1, IS_UNIQUE, IS_ORDERED);
 		addEParameter(op, ecorePackage.getEDiagnosticChain(), "diagnostics", 0, 1, IS_UNIQUE, IS_ORDERED);
 		g1 = createEGenericType(ecorePackage.getEMap());
@@ -2490,13 +2582,11 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 		g2 = createEGenericType(ecorePackage.getEJavaObject());
 		g1.getETypeArguments().add(g2);
 		addEParameter(op, g1, "context", 0, 1, IS_UNIQUE, IS_ORDERED);
-
 		// Initialize enums and add enum literals
 		initEEnum(fontDecorationEEnum, FontDecoration.class, "FontDecoration");
 		addEEnumLiteral(fontDecorationEEnum, FontDecoration.UNDERLINE);
 		addEEnumLiteral(fontDecorationEEnum, FontDecoration.OVERLINE);
 		addEEnumLiteral(fontDecorationEEnum, FontDecoration.LINE_THROUGH);
-
 		initEEnum(elementKindEEnum, ElementKind.class, "ElementKind");
 		addEEnumLiteral(elementKindEEnum, ElementKind.CANVAS);
 		addEEnumLiteral(elementKindEEnum, ElementKind.CIRCLE);
@@ -2512,15 +2602,12 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 		addEEnumLiteral(elementKindEEnum, ElementKind.RECTANGLE);
 		addEEnumLiteral(elementKindEEnum, ElementKind.TEXT);
 		addEEnumLiteral(elementKindEEnum, ElementKind.USE);
-
 		initEEnum(textAnchorEEnum, TextAnchor.class, "TextAnchor");
 		addEEnumLiteral(textAnchorEEnum, TextAnchor.START);
 		addEEnumLiteral(textAnchorEEnum, TextAnchor.MIDDLE);
 		addEEnumLiteral(textAnchorEEnum, TextAnchor.END);
-
 		// Create resource
 		createResource(eNS_URI);
-
 		// Create annotations
 		// http://www.eclipse.org/emf/2002/Ecore
 		createEcoreAnnotations();
@@ -2532,176 +2619,47 @@ public class DGPackageImpl extends EPackageImpl implements DGPackage {
 	 * Initializes the annotations for <b>http://www.eclipse.org/emf/2002/Ecore</b>.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void createEcoreAnnotations() {
-		String source = "http://www.eclipse.org/emf/2002/Ecore";			
-		addAnnotation
-		  (this, 
-		   source, 
-		   new String[] {
-			 "validationDelegates", "http://www.eclipse.org/emf/2002/Ecore/OCL"
-		   });																																																																																																																																																																																																																									
+		String source = "http://www.eclipse.org/emf/2002/Ecore";
+		addAnnotation(this, source, new String[]{ "validationDelegates", "http://www.eclipse.org/emf/2002/Ecore/OCL" });
 	}
 
 	/**
 	 * Initializes the annotations for <b>http://www.eclipse.org/emf/2002/Ecore/OCL</b>.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void createOCLAnnotations() {
-		String source = "http://www.eclipse.org/emf/2002/Ecore/OCL";					
-		addAnnotation
-		  (getCanvas__CanvasCannotHaveTransforms__DiagnosticChain_Map(), 
-		   source, 
-		   new String[] {
-			 "body", "transform->isEmpty()"
-		   });								
-		addAnnotation
-		  (getGraphicalElement__ReferencedClippathHasId__DiagnosticChain_Map(), 
-		   source, 
-		   new String[] {
-			 "body", "clipPath->notEmpty() implies clipPath.id->notEmpty()"
-		   });									
-		addAnnotation
-		  (getDefinition__IdCannotBeEmpty__DiagnosticChain_Map(), 
-		   source, 
-		   new String[] {
-			 "body", "id->notEmpty() implies id.size() > 0"
-		   });											
-		addAnnotation
-		  (getStyle__ValidFontSize__DiagnosticChain_Map(), 
-		   source, 
-		   new String[] {
-			 "body", "fontSize >=  0"
-		   });					
-		addAnnotation
-		  (getStyle__ValidFillOpacity__DiagnosticChain_Map(), 
-		   source, 
-		   new String[] {
-			 "body", "fillOpacity >=  0 and fillOpacity <=1"
-		   });					
-		addAnnotation
-		  (getStyle__ValidStrokeWidth__DiagnosticChain_Map(), 
-		   source, 
-		   new String[] {
-			 "body", "strokeWidth >=  0"
-		   });					
-		addAnnotation
-		  (getStyle__ValidDashLengthSize__DiagnosticChain_Map(), 
-		   source, 
-		   new String[] {
-			 "body", "strokeDashLength->size().mod(2) = 0"
-		   });					
-		addAnnotation
-		  (getStyle__ValidStrokeOpacity__DiagnosticChain_Map(), 
-		   source, 
-		   new String[] {
-			 "body", "strokeOpacity >=  0 and strokeOpacity <=1"
-		   });																
-		addAnnotation
-		  (getPaint__ReferencedPaintServerHasId__DiagnosticChain_Map(), 
-		   source, 
-		   new String[] {
-			 "body", "paintServer->notEmpty() implies paintServer.id->notEmpty()"
-		   });										
-		addAnnotation
-		  (getCircle__NonNegativeRadius__DiagnosticChain_Map(), 
-		   source, 
-		   new String[] {
-			 "body", "radius >= 0"
-		   });																																	
-		addAnnotation
-		  (getGradientStop__ValidOffset__DiagnosticChain_Map(), 
-		   source, 
-		   new String[] {
-			 "body", "offset>=0 and offset<=1"
-		   });					
-		addAnnotation
-		  (getGradientStop__ValidOpacity__DiagnosticChain_Map(), 
-		   source, 
-		   new String[] {
-			 "body", "opacity>=0 and opacity<=1"
-		   });									
-		addAnnotation
-		  (getImage__SourceCannotBeEmpty__DiagnosticChain_Map(), 
-		   source, 
-		   new String[] {
-			 "body", "source->notEmpty() implies source.size() > 0"
-		   });											
-		addAnnotation
-		  (getMarkedElement__ReferencedStartMarkerHasId__DiagnosticChain_Map(), 
-		   source, 
-		   new String[] {
-			 "body", "startMarker->notEmpty() implies startMarker.id->notEmpty()"
-		   });				
-		addAnnotation
-		  (getMarkedElement__ReferencedMidMarkerHasId__DiagnosticChain_Map(), 
-		   source, 
-		   new String[] {
-			 "body", "midMarker->notEmpty() implies midMarker.id->notEmpty()"
-		   });				
-		addAnnotation
-		  (getMarkedElement__ReferencedEndMarkerHasId__DiagnosticChain_Map(), 
-		   source, 
-		   new String[] {
-			 "body", "endMarker->notEmpty() implies endMarker.id->notEmpty()"
-		   });											
-		addAnnotation
-		  (getLinearGradient__ValidGradientVector__DiagnosticChain_Map(), 
-		   source, 
-		   new String[] {
-			 "body", "start.x>=0 and start.x<=1 and end.x>=0 and end.x<=1 and start.y>=0 and start.y<=1 and end.y>=0 and end.y<=1"
-		   });																	
-		addAnnotation
-		  (getPath__FirstCommandMustBeMove__DiagnosticChain_Map(), 
-		   source, 
-		   new String[] {
-			 "body", "command->first().oclIsKindOf(MoveTo)"
-		   });													
-		addAnnotation
-		  (getRadialGradient__ValidCenterPoint__DiagnosticChain_Map(), 
-		   source, 
-		   new String[] {
-			 "body", "centerX>=0 and centerX<=1 and centerY>=0 and centerY<=1"
-		   });					
-		addAnnotation
-		  (getRadialGradient__ValidFocusPoint__DiagnosticChain_Map(), 
-		   source, 
-		   new String[] {
-			 "body", "focusX>=0 and focusX<=1 and focusY>=0 and focusY<=1"
-		   });					
-		addAnnotation
-		  (getRadialGradient__ValidRadius__DiagnosticChain_Map(), 
-		   source, 
-		   new String[] {
-			 "body", "radius>=0 and radius<=1"
-		   });									
-		addAnnotation
-		  (getRectangle__NonNegativeCornerRadius__DiagnosticChain_Map(), 
-		   source, 
-		   new String[] {
-			 "body", "cornerRadius >= 0"
-		   });														
-		addAnnotation
-		  (getScale__Nonnegativescale__DiagnosticChain_Map(), 
-		   source, 
-		   new String[] {
-			 "body", "factorX>=0 and factorY>=0"
-		   });											
-		addAnnotation
-		  (getText__DataCannotBeEmpty__DiagnosticChain_Map(), 
-		   source, 
-		   new String[] {
-			 "body", "data->notEmpty() implies data.size() > 0"
-		   });										
-		addAnnotation
-		  (getUse__ReferencedElementHasId__DiagnosticChain_Map(), 
-		   source, 
-		   new String[] {
-			 "body", "referencedElement->notEmpty() implies referencedElement.id->notEmpty()"
-		   });				
+		String source = "http://www.eclipse.org/emf/2002/Ecore/OCL";
+		addAnnotation(getCanvas__CanvasCannotHaveTransforms__DiagnosticChain_Map(), source, new String[]{ "body", "transform->isEmpty()" });
+		addAnnotation(getGraphicalElement__ReferencedClippathHasId__DiagnosticChain_Map(), source, new String[]{ "body", "clipPath->notEmpty() implies clipPath.id->notEmpty()" });
+		addAnnotation(getDefinition__IdCannotBeEmpty__DiagnosticChain_Map(), source, new String[]{ "body", "id->notEmpty() implies id.size() > 0" });
+		addAnnotation(getStyle__ValidFontSize__DiagnosticChain_Map(), source, new String[]{ "body", "fontSize >=  0" });
+		addAnnotation(getStyle__ValidFillOpacity__DiagnosticChain_Map(), source, new String[]{ "body", "fillOpacity >=  0 and fillOpacity <=1" });
+		addAnnotation(getStyle__ValidStrokeWidth__DiagnosticChain_Map(), source, new String[]{ "body", "strokeWidth >=  0" });
+		addAnnotation(getStyle__ValidDashLengthSize__DiagnosticChain_Map(), source, new String[]{ "body", "strokeDashLength->size().mod(2) = 0" });
+		addAnnotation(getStyle__ValidStrokeOpacity__DiagnosticChain_Map(), source, new String[]{ "body", "strokeOpacity >=  0 and strokeOpacity <=1" });
+		addAnnotation(getPaint__ReferencedPaintServerHasId__DiagnosticChain_Map(), source, new String[]{ "body", "paintServer->notEmpty() implies paintServer.id->notEmpty()" });
+		addAnnotation(getCircle__NonNegativeRadius__DiagnosticChain_Map(), source, new String[]{ "body", "radius >= 0" });
+		addAnnotation(getGradientStop__ValidOffset__DiagnosticChain_Map(), source, new String[]{ "body", "offset>=0 and offset<=1" });
+		addAnnotation(getGradientStop__ValidOpacity__DiagnosticChain_Map(), source, new String[]{ "body", "opacity>=0 and opacity<=1" });
+		addAnnotation(getImage__SourceCannotBeEmpty__DiagnosticChain_Map(), source, new String[]{ "body", "source->notEmpty() implies source.size() > 0" });
+		addAnnotation(getMarkedElement__ReferencedStartMarkerHasId__DiagnosticChain_Map(), source, new String[]{ "body", "startMarker->notEmpty() implies startMarker.id->notEmpty()" });
+		addAnnotation(getMarkedElement__ReferencedMidMarkerHasId__DiagnosticChain_Map(), source, new String[]{ "body", "midMarker->notEmpty() implies midMarker.id->notEmpty()" });
+		addAnnotation(getMarkedElement__ReferencedEndMarkerHasId__DiagnosticChain_Map(), source, new String[]{ "body", "endMarker->notEmpty() implies endMarker.id->notEmpty()" });
+		addAnnotation(getLinearGradient__ValidGradientVector__DiagnosticChain_Map(), source, new String[]{ "body", "start.x>=0 and start.x<=1 and end.x>=0 and end.x<=1 and start.y>=0 and start.y<=1 and end.y>=0 and end.y<=1" });
+		addAnnotation(getPath__FirstCommandMustBeMove__DiagnosticChain_Map(), source, new String[]{ "body", "command->first().oclIsKindOf(MoveTo)" });
+		addAnnotation(getRadialGradient__ValidCenterPoint__DiagnosticChain_Map(), source, new String[]{ "body", "centerX>=0 and centerX<=1 and centerY>=0 and centerY<=1" });
+		addAnnotation(getRadialGradient__ValidFocusPoint__DiagnosticChain_Map(), source, new String[]{ "body", "focusX>=0 and focusX<=1 and focusY>=0 and focusY<=1" });
+		addAnnotation(getRadialGradient__ValidRadius__DiagnosticChain_Map(), source, new String[]{ "body", "radius>=0 and radius<=1" });
+		addAnnotation(getRectangle__NonNegativeCornerRadius__DiagnosticChain_Map(), source, new String[]{ "body", "cornerRadius >= 0" });
+		addAnnotation(getScale__Nonnegativescale__DiagnosticChain_Map(), source, new String[]{ "body", "factorX>=0 and factorY>=0" });
+		addAnnotation(getText__DataCannotBeEmpty__DiagnosticChain_Map(), source, new String[]{ "body", "data->notEmpty() implies data.size() > 0" });
+		addAnnotation(getUse__ReferencedElementHasId__DiagnosticChain_Map(), source, new String[]{ "body", "referencedElement->notEmpty() implies referencedElement.id->notEmpty()" });
 	}
-
 } // DGPackageImpl
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/DefinitionImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/DefinitionImpl.java
index 1cd36f5d448..5eb9fbcc900 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/DefinitionImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/DefinitionImpl.java
@@ -28,19 +28,18 @@ import org.eclipse.papyrus.dd.dg.Definition;
 import org.eclipse.papyrus.dd.dg.util.DGValidator;
 
 /**
- * <!-- begin-user-doc --> An implementation of the model object '
- * <em><b>Definition</b></em>'. <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object ' <em><b>Definition</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.dd.dg.impl.DefinitionImpl#getId <em>Id</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.impl.DefinitionImpl#getId <em>Id</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
-public abstract class DefinitionImpl extends MinimalEObjectImpl.Container
-		implements Definition {
+public abstract class DefinitionImpl extends MinimalEObjectImpl.Container implements Definition {
+
 	/**
 	 * The default value of the '{@link #getId() <em>Id</em>}' attribute. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
@@ -63,6 +62,7 @@ public abstract class DefinitionImpl extends MinimalEObjectImpl.Container
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected DefinitionImpl() {
@@ -71,6 +71,7 @@ public abstract class DefinitionImpl extends MinimalEObjectImpl.Container
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -80,6 +81,7 @@ public abstract class DefinitionImpl extends MinimalEObjectImpl.Container
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getId() {
@@ -88,19 +90,22 @@ public abstract class DefinitionImpl extends MinimalEObjectImpl.Container
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setId(String newId) {
 		String oldId = id;
 		id = newId;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.DEFINITION__ID, oldId, id));
 	}
 
 	/**
-	 * The cached validation expression for the '{@link #idCannotBeEmpty(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Id Cannot Be Empty</em>}' invariant operation.
+	 * The cached validation expression for the '{@link #idCannotBeEmpty(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
+	 * <em>Id Cannot Be Empty</em>}' invariant operation.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @see #idCannotBeEmpty(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
 	 * @generated
 	 * @ordered
@@ -109,106 +114,99 @@ public abstract class DefinitionImpl extends MinimalEObjectImpl.Container
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public boolean idCannotBeEmpty(DiagnosticChain diagnostics,
-			Map<Object, Object> context) {
-		return
-			DGValidator.validate
-				(DGPackage.Literals.DEFINITION,
-				 this,
-				 diagnostics,
-				 context,
-				 "http://www.eclipse.org/emf/2002/Ecore/OCL",
-				 DGPackage.Literals.DEFINITION___ID_CANNOT_BE_EMPTY__DIAGNOSTICCHAIN_MAP,
-				 ID_CANNOT_BE_EMPTY_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION,
-				 Diagnostic.ERROR,
-				 DGValidator.DIAGNOSTIC_SOURCE,
-				 DGValidator.DEFINITION__ID_CANNOT_BE_EMPTY);
+	public boolean idCannotBeEmpty(DiagnosticChain diagnostics, Map<Object, Object> context) {
+		return DGValidator.validate(DGPackage.Literals.DEFINITION, this, diagnostics, context, "http://www.eclipse.org/emf/2002/Ecore/OCL", DGPackage.Literals.DEFINITION___ID_CANNOT_BE_EMPTY__DIAGNOSTICCHAIN_MAP, ID_CANNOT_BE_EMPTY_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION, Diagnostic.ERROR, DGValidator.DIAGNOSTIC_SOURCE, DGValidator.DEFINITION__ID_CANNOT_BE_EMPTY);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case DGPackage.DEFINITION__ID:
-				return getId();
+		switch(featureID) {
+		case DGPackage.DEFINITION__ID:
+			return getId();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case DGPackage.DEFINITION__ID:
-				setId((String)newValue);
-				return;
+		switch(featureID) {
+		case DGPackage.DEFINITION__ID:
+			setId((String)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case DGPackage.DEFINITION__ID:
-				setId(ID_EDEFAULT);
-				return;
+		switch(featureID) {
+		case DGPackage.DEFINITION__ID:
+			setId(ID_EDEFAULT);
+			return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case DGPackage.DEFINITION__ID:
-				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
+		switch(featureID) {
+		case DGPackage.DEFINITION__ID:
+			return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	@SuppressWarnings("unchecked")
-	public Object eInvoke(int operationID, EList<?> arguments)
-			throws InvocationTargetException {
-		switch (operationID) {
-			case DGPackage.DEFINITION___ID_CANNOT_BE_EMPTY__DIAGNOSTICCHAIN_MAP:
-				return idCannotBeEmpty((DiagnosticChain)arguments.get(0), (Map<Object, Object>)arguments.get(1));
+	public Object eInvoke(int operationID, EList<?> arguments) throws InvocationTargetException {
+		switch(operationID) {
+		case DGPackage.DEFINITION___ID_CANNOT_BE_EMPTY__DIAGNOSTICCHAIN_MAP:
+			return idCannotBeEmpty((DiagnosticChain)arguments.get(0), (Map<Object, Object>)arguments.get(1));
 		}
 		return super.eInvoke(operationID, arguments);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) return super.toString();
-
+		if(eIsProxy())
+			return super.toString();
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (id: ");
 		result.append(id);
 		result.append(')');
 		return result.toString();
 	}
-
 } // DefinitionImpl
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/DefinitionsImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/DefinitionsImpl.java
index b3521d2d9f5..bfac34be121 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/DefinitionsImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/DefinitionsImpl.java
@@ -33,23 +33,23 @@ import org.eclipse.papyrus.dd.dg.Definitions;
 import org.eclipse.papyrus.dd.dg.StyleSheet;
 
 /**
- * <!-- begin-user-doc --> An implementation of the model object '
- * <em><b>Definitions</b></em>'. <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object ' <em><b>Definitions</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.dd.dg.impl.DefinitionsImpl#getDefnitions <em>Defnition</em>}</li>
- *   <li>{@link org.eclipse.papyrus.dd.dg.impl.DefinitionsImpl#getStyleSheet <em>Style Sheet</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.impl.DefinitionsImpl#getDefnitions <em>Defnition</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.impl.DefinitionsImpl#getStyleSheet <em>Style Sheet</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
-public class DefinitionsImpl extends MinimalEObjectImpl.Container implements
-		Definitions {
+public class DefinitionsImpl extends MinimalEObjectImpl.Container implements Definitions {
+
 	/**
 	 * The cached value of the '{@link #getDefnitions() <em>Defnition</em>}' containment reference list.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getDefnitions()
 	 * @generated
 	 * @ordered
@@ -59,6 +59,7 @@ public class DefinitionsImpl extends MinimalEObjectImpl.Container implements
 	/**
 	 * The cached value of the '{@link #getStyleSheet() <em>Style Sheet</em>}' containment reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getStyleSheet()
 	 * @generated
 	 * @ordered
@@ -67,6 +68,7 @@ public class DefinitionsImpl extends MinimalEObjectImpl.Container implements
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected DefinitionsImpl() {
@@ -75,6 +77,7 @@ public class DefinitionsImpl extends MinimalEObjectImpl.Container implements
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -84,10 +87,11 @@ public class DefinitionsImpl extends MinimalEObjectImpl.Container implements
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<Definition> getDefnitions() {
-		if (defnitions == null) {
+		if(defnitions == null) {
 			defnitions = new EObjectContainmentEList<Definition>(Definition.class, this, DGPackage.DEFINITIONS__DEFNITION);
 		}
 		return defnitions;
@@ -95,6 +99,7 @@ public class DefinitionsImpl extends MinimalEObjectImpl.Container implements
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public StyleSheet getStyleSheet() {
@@ -103,117 +108,124 @@ public class DefinitionsImpl extends MinimalEObjectImpl.Container implements
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public NotificationChain basicSetStyleSheet(StyleSheet newStyleSheet,
-			NotificationChain msgs) {
+	public NotificationChain basicSetStyleSheet(StyleSheet newStyleSheet, NotificationChain msgs) {
 		StyleSheet oldStyleSheet = styleSheet;
 		styleSheet = newStyleSheet;
-		if (eNotificationRequired()) {
+		if(eNotificationRequired()) {
 			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, DGPackage.DEFINITIONS__STYLE_SHEET, oldStyleSheet, newStyleSheet);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
+			if(msgs == null)
+				msgs = notification;
+			else
+				msgs.add(notification);
 		}
 		return msgs;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setStyleSheet(StyleSheet newStyleSheet) {
-		if (newStyleSheet != styleSheet) {
+		if(newStyleSheet != styleSheet) {
 			NotificationChain msgs = null;
-			if (styleSheet != null)
+			if(styleSheet != null)
 				msgs = ((InternalEObject)styleSheet).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - DGPackage.DEFINITIONS__STYLE_SHEET, null, msgs);
-			if (newStyleSheet != null)
+			if(newStyleSheet != null)
 				msgs = ((InternalEObject)newStyleSheet).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - DGPackage.DEFINITIONS__STYLE_SHEET, null, msgs);
 			msgs = basicSetStyleSheet(newStyleSheet, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
+			if(msgs != null)
+				msgs.dispatch();
+		} else if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.DEFINITIONS__STYLE_SHEET, newStyleSheet, newStyleSheet));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd,
-			int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case DGPackage.DEFINITIONS__DEFNITION:
-				return ((InternalEList<?>)getDefnitions()).basicRemove(otherEnd, msgs);
-			case DGPackage.DEFINITIONS__STYLE_SHEET:
-				return basicSetStyleSheet(null, msgs);
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch(featureID) {
+		case DGPackage.DEFINITIONS__DEFNITION:
+			return ((InternalEList<?>)getDefnitions()).basicRemove(otherEnd, msgs);
+		case DGPackage.DEFINITIONS__STYLE_SHEET:
+			return basicSetStyleSheet(null, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case DGPackage.DEFINITIONS__DEFNITION:
-				return getDefnitions();
-			case DGPackage.DEFINITIONS__STYLE_SHEET:
-				return getStyleSheet();
+		switch(featureID) {
+		case DGPackage.DEFINITIONS__DEFNITION:
+			return getDefnitions();
+		case DGPackage.DEFINITIONS__STYLE_SHEET:
+			return getStyleSheet();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case DGPackage.DEFINITIONS__DEFNITION:
-				getDefnitions().clear();
-				getDefnitions().addAll((Collection<? extends Definition>)newValue);
-				return;
-			case DGPackage.DEFINITIONS__STYLE_SHEET:
-				setStyleSheet((StyleSheet)newValue);
-				return;
+		switch(featureID) {
+		case DGPackage.DEFINITIONS__DEFNITION:
+			getDefnitions().clear();
+			getDefnitions().addAll((Collection<? extends Definition>)newValue);
+			return;
+		case DGPackage.DEFINITIONS__STYLE_SHEET:
+			setStyleSheet((StyleSheet)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case DGPackage.DEFINITIONS__DEFNITION:
-				getDefnitions().clear();
-				return;
-			case DGPackage.DEFINITIONS__STYLE_SHEET:
-				setStyleSheet((StyleSheet)null);
-				return;
+		switch(featureID) {
+		case DGPackage.DEFINITIONS__DEFNITION:
+			getDefnitions().clear();
+			return;
+		case DGPackage.DEFINITIONS__STYLE_SHEET:
+			setStyleSheet((StyleSheet)null);
+			return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case DGPackage.DEFINITIONS__DEFNITION:
-				return defnitions != null && !defnitions.isEmpty();
-			case DGPackage.DEFINITIONS__STYLE_SHEET:
-				return styleSheet != null;
+		switch(featureID) {
+		case DGPackage.DEFINITIONS__DEFNITION:
+			return defnitions != null && !defnitions.isEmpty();
+		case DGPackage.DEFINITIONS__STYLE_SHEET:
+			return styleSheet != null;
 		}
 		return super.eIsSet(featureID);
 	}
-
 } // DefinitionsImpl
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/EllipseImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/EllipseImpl.java
index 9254b23df08..195bdc70816 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/EllipseImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/EllipseImpl.java
@@ -26,22 +26,23 @@ import org.eclipse.papyrus.dd.dg.DGPackage;
 import org.eclipse.papyrus.dd.dg.Ellipse;
 
 /**
- * <!-- begin-user-doc --> An implementation of the model object '
- * <em><b>Ellipse</b></em>'. <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object ' <em><b>Ellipse</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.dd.dg.impl.EllipseImpl#getCenter <em>Center</em>}</li>
- *   <li>{@link org.eclipse.papyrus.dd.dg.impl.EllipseImpl#getRadii <em>Radii</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.impl.EllipseImpl#getCenter <em>Center</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.impl.EllipseImpl#getRadii <em>Radii</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class EllipseImpl extends GraphicalElementImpl implements Ellipse {
+
 	/**
 	 * The cached value of the '{@link #getCenter() <em>Center</em>}' containment reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getCenter()
 	 * @generated
 	 * @ordered
@@ -51,6 +52,7 @@ public class EllipseImpl extends GraphicalElementImpl implements Ellipse {
 	/**
 	 * The cached value of the '{@link #getRadii() <em>Radii</em>}' containment reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getRadii()
 	 * @generated
 	 * @ordered
@@ -59,6 +61,7 @@ public class EllipseImpl extends GraphicalElementImpl implements Ellipse {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected EllipseImpl() {
@@ -67,6 +70,7 @@ public class EllipseImpl extends GraphicalElementImpl implements Ellipse {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -76,6 +80,7 @@ public class EllipseImpl extends GraphicalElementImpl implements Ellipse {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Point getCenter() {
@@ -84,39 +89,44 @@ public class EllipseImpl extends GraphicalElementImpl implements Ellipse {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public NotificationChain basicSetCenter(Point newCenter,
-			NotificationChain msgs) {
+	public NotificationChain basicSetCenter(Point newCenter, NotificationChain msgs) {
 		Point oldCenter = center;
 		center = newCenter;
-		if (eNotificationRequired()) {
+		if(eNotificationRequired()) {
 			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, DGPackage.ELLIPSE__CENTER, oldCenter, newCenter);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
+			if(msgs == null)
+				msgs = notification;
+			else
+				msgs.add(notification);
 		}
 		return msgs;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setCenter(Point newCenter) {
-		if (newCenter != center) {
+		if(newCenter != center) {
 			NotificationChain msgs = null;
-			if (center != null)
+			if(center != null)
 				msgs = ((InternalEObject)center).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - DGPackage.ELLIPSE__CENTER, null, msgs);
-			if (newCenter != null)
+			if(newCenter != null)
 				msgs = ((InternalEObject)newCenter).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - DGPackage.ELLIPSE__CENTER, null, msgs);
 			msgs = basicSetCenter(newCenter, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
+			if(msgs != null)
+				msgs.dispatch();
+		} else if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.ELLIPSE__CENTER, newCenter, newCenter));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Dimension getRadii() {
@@ -125,115 +135,122 @@ public class EllipseImpl extends GraphicalElementImpl implements Ellipse {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public NotificationChain basicSetRadii(Dimension newRadii,
-			NotificationChain msgs) {
+	public NotificationChain basicSetRadii(Dimension newRadii, NotificationChain msgs) {
 		Dimension oldRadii = radii;
 		radii = newRadii;
-		if (eNotificationRequired()) {
+		if(eNotificationRequired()) {
 			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, DGPackage.ELLIPSE__RADII, oldRadii, newRadii);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
+			if(msgs == null)
+				msgs = notification;
+			else
+				msgs.add(notification);
 		}
 		return msgs;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setRadii(Dimension newRadii) {
-		if (newRadii != radii) {
+		if(newRadii != radii) {
 			NotificationChain msgs = null;
-			if (radii != null)
+			if(radii != null)
 				msgs = ((InternalEObject)radii).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - DGPackage.ELLIPSE__RADII, null, msgs);
-			if (newRadii != null)
+			if(newRadii != null)
 				msgs = ((InternalEObject)newRadii).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - DGPackage.ELLIPSE__RADII, null, msgs);
 			msgs = basicSetRadii(newRadii, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
+			if(msgs != null)
+				msgs.dispatch();
+		} else if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.ELLIPSE__RADII, newRadii, newRadii));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd,
-			int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case DGPackage.ELLIPSE__CENTER:
-				return basicSetCenter(null, msgs);
-			case DGPackage.ELLIPSE__RADII:
-				return basicSetRadii(null, msgs);
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch(featureID) {
+		case DGPackage.ELLIPSE__CENTER:
+			return basicSetCenter(null, msgs);
+		case DGPackage.ELLIPSE__RADII:
+			return basicSetRadii(null, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case DGPackage.ELLIPSE__CENTER:
-				return getCenter();
-			case DGPackage.ELLIPSE__RADII:
-				return getRadii();
+		switch(featureID) {
+		case DGPackage.ELLIPSE__CENTER:
+			return getCenter();
+		case DGPackage.ELLIPSE__RADII:
+			return getRadii();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case DGPackage.ELLIPSE__CENTER:
-				setCenter((Point)newValue);
-				return;
-			case DGPackage.ELLIPSE__RADII:
-				setRadii((Dimension)newValue);
-				return;
+		switch(featureID) {
+		case DGPackage.ELLIPSE__CENTER:
+			setCenter((Point)newValue);
+			return;
+		case DGPackage.ELLIPSE__RADII:
+			setRadii((Dimension)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case DGPackage.ELLIPSE__CENTER:
-				setCenter((Point)null);
-				return;
-			case DGPackage.ELLIPSE__RADII:
-				setRadii((Dimension)null);
-				return;
+		switch(featureID) {
+		case DGPackage.ELLIPSE__CENTER:
+			setCenter((Point)null);
+			return;
+		case DGPackage.ELLIPSE__RADII:
+			setRadii((Dimension)null);
+			return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case DGPackage.ELLIPSE__CENTER:
-				return center != null;
-			case DGPackage.ELLIPSE__RADII:
-				return radii != null;
+		switch(featureID) {
+		case DGPackage.ELLIPSE__CENTER:
+			return center != null;
+		case DGPackage.ELLIPSE__RADII:
+			return radii != null;
 		}
 		return super.eIsSet(featureID);
 	}
-
 } // EllipseImpl
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/EllipticalArcToImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/EllipticalArcToImpl.java
index 370a3280fda..c6ea2508cd7 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/EllipticalArcToImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/EllipticalArcToImpl.java
@@ -26,26 +26,26 @@ import org.eclipse.papyrus.dd.dg.DGPackage;
 import org.eclipse.papyrus.dd.dg.EllipticalArcTo;
 
 /**
- * <!-- begin-user-doc --> An implementation of the model object '
- * <em><b>Elliptical Arc To</b></em>'. <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object ' <em><b>Elliptical Arc To</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.dd.dg.impl.EllipticalArcToImpl#getRadii <em>Radii</em>}</li>
- *   <li>{@link org.eclipse.papyrus.dd.dg.impl.EllipticalArcToImpl#getRotation <em>Rotation</em>}</li>
- *   <li>{@link org.eclipse.papyrus.dd.dg.impl.EllipticalArcToImpl#isLargeArc <em>Is Large Arc</em>}</li>
- *   <li>{@link org.eclipse.papyrus.dd.dg.impl.EllipticalArcToImpl#isSweep <em>Is Sweep</em>}</li>
- *   <li>{@link org.eclipse.papyrus.dd.dg.impl.EllipticalArcToImpl#getPoint <em>Point</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.impl.EllipticalArcToImpl#getRadii <em>Radii</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.impl.EllipticalArcToImpl#getRotation <em>Rotation</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.impl.EllipticalArcToImpl#isLargeArc <em>Is Large Arc</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.impl.EllipticalArcToImpl#isSweep <em>Is Sweep</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.impl.EllipticalArcToImpl#getPoint <em>Point</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
-public class EllipticalArcToImpl extends PathCommandImpl implements
-		EllipticalArcTo {
+public class EllipticalArcToImpl extends PathCommandImpl implements EllipticalArcTo {
+
 	/**
 	 * The cached value of the '{@link #getRadii() <em>Radii</em>}' containment reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getRadii()
 	 * @generated
 	 * @ordered
@@ -55,6 +55,7 @@ public class EllipticalArcToImpl extends PathCommandImpl implements
 	/**
 	 * The default value of the '{@link #getRotation() <em>Rotation</em>}' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getRotation()
 	 * @generated
 	 * @ordered
@@ -64,6 +65,7 @@ public class EllipticalArcToImpl extends PathCommandImpl implements
 	/**
 	 * The cached value of the '{@link #getRotation() <em>Rotation</em>}' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getRotation()
 	 * @generated
 	 * @ordered
@@ -73,6 +75,7 @@ public class EllipticalArcToImpl extends PathCommandImpl implements
 	/**
 	 * The default value of the '{@link #isLargeArc() <em>Is Large Arc</em>}' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isLargeArc()
 	 * @generated
 	 * @ordered
@@ -82,6 +85,7 @@ public class EllipticalArcToImpl extends PathCommandImpl implements
 	/**
 	 * The cached value of the '{@link #isLargeArc() <em>Is Large Arc</em>}' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isLargeArc()
 	 * @generated
 	 * @ordered
@@ -91,6 +95,7 @@ public class EllipticalArcToImpl extends PathCommandImpl implements
 	/**
 	 * The default value of the '{@link #isSweep() <em>Is Sweep</em>}' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isSweep()
 	 * @generated
 	 * @ordered
@@ -100,6 +105,7 @@ public class EllipticalArcToImpl extends PathCommandImpl implements
 	/**
 	 * The cached value of the '{@link #isSweep() <em>Is Sweep</em>}' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isSweep()
 	 * @generated
 	 * @ordered
@@ -109,6 +115,7 @@ public class EllipticalArcToImpl extends PathCommandImpl implements
 	/**
 	 * The cached value of the '{@link #getPoint() <em>Point</em>}' containment reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getPoint()
 	 * @generated
 	 * @ordered
@@ -117,6 +124,7 @@ public class EllipticalArcToImpl extends PathCommandImpl implements
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected EllipticalArcToImpl() {
@@ -125,6 +133,7 @@ public class EllipticalArcToImpl extends PathCommandImpl implements
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -134,6 +143,7 @@ public class EllipticalArcToImpl extends PathCommandImpl implements
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Dimension getRadii() {
@@ -142,39 +152,44 @@ public class EllipticalArcToImpl extends PathCommandImpl implements
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public NotificationChain basicSetRadii(Dimension newRadii,
-			NotificationChain msgs) {
+	public NotificationChain basicSetRadii(Dimension newRadii, NotificationChain msgs) {
 		Dimension oldRadii = radii;
 		radii = newRadii;
-		if (eNotificationRequired()) {
+		if(eNotificationRequired()) {
 			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, DGPackage.ELLIPTICAL_ARC_TO__RADII, oldRadii, newRadii);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
+			if(msgs == null)
+				msgs = notification;
+			else
+				msgs.add(notification);
 		}
 		return msgs;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setRadii(Dimension newRadii) {
-		if (newRadii != radii) {
+		if(newRadii != radii) {
 			NotificationChain msgs = null;
-			if (radii != null)
+			if(radii != null)
 				msgs = ((InternalEObject)radii).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - DGPackage.ELLIPTICAL_ARC_TO__RADII, null, msgs);
-			if (newRadii != null)
+			if(newRadii != null)
 				msgs = ((InternalEObject)newRadii).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - DGPackage.ELLIPTICAL_ARC_TO__RADII, null, msgs);
 			msgs = basicSetRadii(newRadii, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
+			if(msgs != null)
+				msgs.dispatch();
+		} else if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.ELLIPTICAL_ARC_TO__RADII, newRadii, newRadii));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public double getRotation() {
@@ -183,17 +198,19 @@ public class EllipticalArcToImpl extends PathCommandImpl implements
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setRotation(double newRotation) {
 		double oldRotation = rotation;
 		rotation = newRotation;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.ELLIPTICAL_ARC_TO__ROTATION, oldRotation, rotation));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isLargeArc() {
@@ -202,17 +219,19 @@ public class EllipticalArcToImpl extends PathCommandImpl implements
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setIsLargeArc(boolean newIsLargeArc) {
 		boolean oldIsLargeArc = isLargeArc;
 		isLargeArc = newIsLargeArc;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.ELLIPTICAL_ARC_TO__IS_LARGE_ARC, oldIsLargeArc, isLargeArc));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSweep() {
@@ -221,17 +240,19 @@ public class EllipticalArcToImpl extends PathCommandImpl implements
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setIsSweep(boolean newIsSweep) {
 		boolean oldIsSweep = isSweep;
 		isSweep = newIsSweep;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.ELLIPTICAL_ARC_TO__IS_SWEEP, oldIsSweep, isSweep));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Point getPoint() {
@@ -240,155 +261,164 @@ public class EllipticalArcToImpl extends PathCommandImpl implements
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public NotificationChain basicSetPoint(Point newPoint,
-			NotificationChain msgs) {
+	public NotificationChain basicSetPoint(Point newPoint, NotificationChain msgs) {
 		Point oldPoint = point;
 		point = newPoint;
-		if (eNotificationRequired()) {
+		if(eNotificationRequired()) {
 			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, DGPackage.ELLIPTICAL_ARC_TO__POINT, oldPoint, newPoint);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
+			if(msgs == null)
+				msgs = notification;
+			else
+				msgs.add(notification);
 		}
 		return msgs;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setPoint(Point newPoint) {
-		if (newPoint != point) {
+		if(newPoint != point) {
 			NotificationChain msgs = null;
-			if (point != null)
+			if(point != null)
 				msgs = ((InternalEObject)point).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - DGPackage.ELLIPTICAL_ARC_TO__POINT, null, msgs);
-			if (newPoint != null)
+			if(newPoint != null)
 				msgs = ((InternalEObject)newPoint).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - DGPackage.ELLIPTICAL_ARC_TO__POINT, null, msgs);
 			msgs = basicSetPoint(newPoint, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
+			if(msgs != null)
+				msgs.dispatch();
+		} else if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.ELLIPTICAL_ARC_TO__POINT, newPoint, newPoint));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd,
-			int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case DGPackage.ELLIPTICAL_ARC_TO__RADII:
-				return basicSetRadii(null, msgs);
-			case DGPackage.ELLIPTICAL_ARC_TO__POINT:
-				return basicSetPoint(null, msgs);
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch(featureID) {
+		case DGPackage.ELLIPTICAL_ARC_TO__RADII:
+			return basicSetRadii(null, msgs);
+		case DGPackage.ELLIPTICAL_ARC_TO__POINT:
+			return basicSetPoint(null, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case DGPackage.ELLIPTICAL_ARC_TO__RADII:
-				return getRadii();
-			case DGPackage.ELLIPTICAL_ARC_TO__ROTATION:
-				return getRotation();
-			case DGPackage.ELLIPTICAL_ARC_TO__IS_LARGE_ARC:
-				return isLargeArc();
-			case DGPackage.ELLIPTICAL_ARC_TO__IS_SWEEP:
-				return isSweep();
-			case DGPackage.ELLIPTICAL_ARC_TO__POINT:
-				return getPoint();
+		switch(featureID) {
+		case DGPackage.ELLIPTICAL_ARC_TO__RADII:
+			return getRadii();
+		case DGPackage.ELLIPTICAL_ARC_TO__ROTATION:
+			return getRotation();
+		case DGPackage.ELLIPTICAL_ARC_TO__IS_LARGE_ARC:
+			return isLargeArc();
+		case DGPackage.ELLIPTICAL_ARC_TO__IS_SWEEP:
+			return isSweep();
+		case DGPackage.ELLIPTICAL_ARC_TO__POINT:
+			return getPoint();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case DGPackage.ELLIPTICAL_ARC_TO__RADII:
-				setRadii((Dimension)newValue);
-				return;
-			case DGPackage.ELLIPTICAL_ARC_TO__ROTATION:
-				setRotation((Double)newValue);
-				return;
-			case DGPackage.ELLIPTICAL_ARC_TO__IS_LARGE_ARC:
-				setIsLargeArc((Boolean)newValue);
-				return;
-			case DGPackage.ELLIPTICAL_ARC_TO__IS_SWEEP:
-				setIsSweep((Boolean)newValue);
-				return;
-			case DGPackage.ELLIPTICAL_ARC_TO__POINT:
-				setPoint((Point)newValue);
-				return;
+		switch(featureID) {
+		case DGPackage.ELLIPTICAL_ARC_TO__RADII:
+			setRadii((Dimension)newValue);
+			return;
+		case DGPackage.ELLIPTICAL_ARC_TO__ROTATION:
+			setRotation((Double)newValue);
+			return;
+		case DGPackage.ELLIPTICAL_ARC_TO__IS_LARGE_ARC:
+			setIsLargeArc((Boolean)newValue);
+			return;
+		case DGPackage.ELLIPTICAL_ARC_TO__IS_SWEEP:
+			setIsSweep((Boolean)newValue);
+			return;
+		case DGPackage.ELLIPTICAL_ARC_TO__POINT:
+			setPoint((Point)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case DGPackage.ELLIPTICAL_ARC_TO__RADII:
-				setRadii((Dimension)null);
-				return;
-			case DGPackage.ELLIPTICAL_ARC_TO__ROTATION:
-				setRotation(ROTATION_EDEFAULT);
-				return;
-			case DGPackage.ELLIPTICAL_ARC_TO__IS_LARGE_ARC:
-				setIsLargeArc(IS_LARGE_ARC_EDEFAULT);
-				return;
-			case DGPackage.ELLIPTICAL_ARC_TO__IS_SWEEP:
-				setIsSweep(IS_SWEEP_EDEFAULT);
-				return;
-			case DGPackage.ELLIPTICAL_ARC_TO__POINT:
-				setPoint((Point)null);
-				return;
+		switch(featureID) {
+		case DGPackage.ELLIPTICAL_ARC_TO__RADII:
+			setRadii((Dimension)null);
+			return;
+		case DGPackage.ELLIPTICAL_ARC_TO__ROTATION:
+			setRotation(ROTATION_EDEFAULT);
+			return;
+		case DGPackage.ELLIPTICAL_ARC_TO__IS_LARGE_ARC:
+			setIsLargeArc(IS_LARGE_ARC_EDEFAULT);
+			return;
+		case DGPackage.ELLIPTICAL_ARC_TO__IS_SWEEP:
+			setIsSweep(IS_SWEEP_EDEFAULT);
+			return;
+		case DGPackage.ELLIPTICAL_ARC_TO__POINT:
+			setPoint((Point)null);
+			return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case DGPackage.ELLIPTICAL_ARC_TO__RADII:
-				return radii != null;
-			case DGPackage.ELLIPTICAL_ARC_TO__ROTATION:
-				return rotation != ROTATION_EDEFAULT;
-			case DGPackage.ELLIPTICAL_ARC_TO__IS_LARGE_ARC:
-				return isLargeArc != IS_LARGE_ARC_EDEFAULT;
-			case DGPackage.ELLIPTICAL_ARC_TO__IS_SWEEP:
-				return isSweep != IS_SWEEP_EDEFAULT;
-			case DGPackage.ELLIPTICAL_ARC_TO__POINT:
-				return point != null;
+		switch(featureID) {
+		case DGPackage.ELLIPTICAL_ARC_TO__RADII:
+			return radii != null;
+		case DGPackage.ELLIPTICAL_ARC_TO__ROTATION:
+			return rotation != ROTATION_EDEFAULT;
+		case DGPackage.ELLIPTICAL_ARC_TO__IS_LARGE_ARC:
+			return isLargeArc != IS_LARGE_ARC_EDEFAULT;
+		case DGPackage.ELLIPTICAL_ARC_TO__IS_SWEEP:
+			return isSweep != IS_SWEEP_EDEFAULT;
+		case DGPackage.ELLIPTICAL_ARC_TO__POINT:
+			return point != null;
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) return super.toString();
-
+		if(eIsProxy())
+			return super.toString();
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (rotation: ");
 		result.append(rotation);
@@ -399,5 +429,4 @@ public class EllipticalArcToImpl extends PathCommandImpl implements
 		result.append(')');
 		return result.toString();
 	}
-
 } // EllipticalArcToImpl
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/GradientImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/GradientImpl.java
index 353f8df6168..0f2950bc5ee 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/GradientImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/GradientImpl.java
@@ -23,21 +23,22 @@ import org.eclipse.papyrus.dd.dg.Gradient;
 import org.eclipse.papyrus.dd.dg.GradientStop;
 
 /**
- * <!-- begin-user-doc --> An implementation of the model object '
- * <em><b>Gradient</b></em>'. <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object ' <em><b>Gradient</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.dd.dg.impl.GradientImpl#getStops <em>Stop</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.impl.GradientImpl#getStops <em>Stop</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public abstract class GradientImpl extends PaintServerImpl implements Gradient {
+
 	/**
 	 * The cached value of the '{@link #getStops() <em>Stop</em>}' containment reference list.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getStops()
 	 * @generated
 	 * @ordered
@@ -46,6 +47,7 @@ public abstract class GradientImpl extends PaintServerImpl implements Gradient {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected GradientImpl() {
@@ -54,6 +56,7 @@ public abstract class GradientImpl extends PaintServerImpl implements Gradient {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -63,10 +66,11 @@ public abstract class GradientImpl extends PaintServerImpl implements Gradient {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<GradientStop> getStops() {
-		if (stops == null) {
+		if(stops == null) {
 			stops = new EObjectContainmentEList<GradientStop>(GradientStop.class, this, DGPackage.GRADIENT__STOP);
 		}
 		return stops;
@@ -74,72 +78,75 @@ public abstract class GradientImpl extends PaintServerImpl implements Gradient {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd,
-			int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case DGPackage.GRADIENT__STOP:
-				return ((InternalEList<?>)getStops()).basicRemove(otherEnd, msgs);
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch(featureID) {
+		case DGPackage.GRADIENT__STOP:
+			return ((InternalEList<?>)getStops()).basicRemove(otherEnd, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case DGPackage.GRADIENT__STOP:
-				return getStops();
+		switch(featureID) {
+		case DGPackage.GRADIENT__STOP:
+			return getStops();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case DGPackage.GRADIENT__STOP:
-				getStops().clear();
-				getStops().addAll((Collection<? extends GradientStop>)newValue);
-				return;
+		switch(featureID) {
+		case DGPackage.GRADIENT__STOP:
+			getStops().clear();
+			getStops().addAll((Collection<? extends GradientStop>)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case DGPackage.GRADIENT__STOP:
-				getStops().clear();
-				return;
+		switch(featureID) {
+		case DGPackage.GRADIENT__STOP:
+			getStops().clear();
+			return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case DGPackage.GRADIENT__STOP:
-				return stops != null && !stops.isEmpty();
+		switch(featureID) {
+		case DGPackage.GRADIENT__STOP:
+			return stops != null && !stops.isEmpty();
 		}
 		return super.eIsSet(featureID);
 	}
-
 } // GradientImpl
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/GradientStopImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/GradientStopImpl.java
index c14b62e8ece..e19c6aa1c58 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/GradientStopImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/GradientStopImpl.java
@@ -34,24 +34,24 @@ import org.eclipse.papyrus.dd.dg.GradientStop;
 import org.eclipse.papyrus.dd.dg.util.DGValidator;
 
 /**
- * <!-- begin-user-doc --> An implementation of the model object '
- * <em><b>Gradient Stop</b></em>'. <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object ' <em><b>Gradient Stop</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.dd.dg.impl.GradientStopImpl#getColor <em>Color</em>}</li>
- *   <li>{@link org.eclipse.papyrus.dd.dg.impl.GradientStopImpl#getOffset <em>Offset</em>}</li>
- *   <li>{@link org.eclipse.papyrus.dd.dg.impl.GradientStopImpl#getOpacity <em>Opacity</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.impl.GradientStopImpl#getColor <em>Color</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.impl.GradientStopImpl#getOffset <em>Offset</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.impl.GradientStopImpl#getOpacity <em>Opacity</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
-public class GradientStopImpl extends MinimalEObjectImpl.Container implements
-		GradientStop {
+public class GradientStopImpl extends MinimalEObjectImpl.Container implements GradientStop {
+
 	/**
 	 * The default value of the '{@link #getColor() <em>Color</em>}' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getColor()
 	 * @generated
 	 * @ordered
@@ -61,6 +61,7 @@ public class GradientStopImpl extends MinimalEObjectImpl.Container implements
 	/**
 	 * The cached value of the '{@link #getColor() <em>Color</em>}' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getColor()
 	 * @generated
 	 * @ordered
@@ -71,6 +72,7 @@ public class GradientStopImpl extends MinimalEObjectImpl.Container implements
 	 * This is true if the Color attribute has been set.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -79,6 +81,7 @@ public class GradientStopImpl extends MinimalEObjectImpl.Container implements
 	/**
 	 * The default value of the '{@link #getOffset() <em>Offset</em>}' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getOffset()
 	 * @generated
 	 * @ordered
@@ -88,6 +91,7 @@ public class GradientStopImpl extends MinimalEObjectImpl.Container implements
 	/**
 	 * The cached value of the '{@link #getOffset() <em>Offset</em>}' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getOffset()
 	 * @generated
 	 * @ordered
@@ -98,6 +102,7 @@ public class GradientStopImpl extends MinimalEObjectImpl.Container implements
 	 * This is true if the Offset attribute has been set.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -106,6 +111,7 @@ public class GradientStopImpl extends MinimalEObjectImpl.Container implements
 	/**
 	 * The default value of the '{@link #getOpacity() <em>Opacity</em>}' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getOpacity()
 	 * @generated
 	 * @ordered
@@ -115,6 +121,7 @@ public class GradientStopImpl extends MinimalEObjectImpl.Container implements
 	/**
 	 * The cached value of the '{@link #getOpacity() <em>Opacity</em>}' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getOpacity()
 	 * @generated
 	 * @ordered
@@ -125,6 +132,7 @@ public class GradientStopImpl extends MinimalEObjectImpl.Container implements
 	 * This is true if the Opacity attribute has been set.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -132,6 +140,7 @@ public class GradientStopImpl extends MinimalEObjectImpl.Container implements
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected GradientStopImpl() {
@@ -140,6 +149,7 @@ public class GradientStopImpl extends MinimalEObjectImpl.Container implements
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -149,6 +159,7 @@ public class GradientStopImpl extends MinimalEObjectImpl.Container implements
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Color getColor() {
@@ -157,6 +168,7 @@ public class GradientStopImpl extends MinimalEObjectImpl.Container implements
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setColor(Color newColor) {
@@ -164,12 +176,13 @@ public class GradientStopImpl extends MinimalEObjectImpl.Container implements
 		color = newColor;
 		boolean oldColorESet = colorESet;
 		colorESet = true;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.GRADIENT_STOP__COLOR, oldColor, color, !oldColorESet));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void unsetColor() {
@@ -177,12 +190,13 @@ public class GradientStopImpl extends MinimalEObjectImpl.Container implements
 		boolean oldColorESet = colorESet;
 		color = COLOR_EDEFAULT;
 		colorESet = false;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.UNSET, DGPackage.GRADIENT_STOP__COLOR, oldColor, COLOR_EDEFAULT, oldColorESet));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetColor() {
@@ -191,6 +205,7 @@ public class GradientStopImpl extends MinimalEObjectImpl.Container implements
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public double getOffset() {
@@ -199,6 +214,7 @@ public class GradientStopImpl extends MinimalEObjectImpl.Container implements
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setOffset(double newOffset) {
@@ -206,12 +222,13 @@ public class GradientStopImpl extends MinimalEObjectImpl.Container implements
 		offset = newOffset;
 		boolean oldOffsetESet = offsetESet;
 		offsetESet = true;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.GRADIENT_STOP__OFFSET, oldOffset, offset, !oldOffsetESet));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void unsetOffset() {
@@ -219,12 +236,13 @@ public class GradientStopImpl extends MinimalEObjectImpl.Container implements
 		boolean oldOffsetESet = offsetESet;
 		offset = OFFSET_EDEFAULT;
 		offsetESet = false;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.UNSET, DGPackage.GRADIENT_STOP__OFFSET, oldOffset, OFFSET_EDEFAULT, oldOffsetESet));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetOffset() {
@@ -233,6 +251,7 @@ public class GradientStopImpl extends MinimalEObjectImpl.Container implements
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public double getOpacity() {
@@ -241,6 +260,7 @@ public class GradientStopImpl extends MinimalEObjectImpl.Container implements
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setOpacity(double newOpacity) {
@@ -248,12 +268,13 @@ public class GradientStopImpl extends MinimalEObjectImpl.Container implements
 		opacity = newOpacity;
 		boolean oldOpacityESet = opacityESet;
 		opacityESet = true;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.GRADIENT_STOP__OPACITY, oldOpacity, opacity, !oldOpacityESet));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void unsetOpacity() {
@@ -261,12 +282,13 @@ public class GradientStopImpl extends MinimalEObjectImpl.Container implements
 		boolean oldOpacityESet = opacityESet;
 		opacity = OPACITY_EDEFAULT;
 		opacityESet = false;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.UNSET, DGPackage.GRADIENT_STOP__OPACITY, oldOpacity, OPACITY_EDEFAULT, oldOpacityESet));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetOpacity() {
@@ -274,9 +296,11 @@ public class GradientStopImpl extends MinimalEObjectImpl.Container implements
 	}
 
 	/**
-	 * The cached validation expression for the '{@link #validOffset(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Valid Offset</em>}' invariant operation.
+	 * The cached validation expression for the '{@link #validOffset(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
+	 * <em>Valid Offset</em>}' invariant operation.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @see #validOffset(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
 	 * @generated
 	 * @ordered
@@ -285,28 +309,19 @@ public class GradientStopImpl extends MinimalEObjectImpl.Container implements
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public boolean validOffset(DiagnosticChain diagnostics,
-			Map<Object, Object> context) {
-		return
-			DGValidator.validate
-				(DGPackage.Literals.GRADIENT_STOP,
-				 this,
-				 diagnostics,
-				 context,
-				 "http://www.eclipse.org/emf/2002/Ecore/OCL",
-				 DGPackage.Literals.GRADIENT_STOP___VALID_OFFSET__DIAGNOSTICCHAIN_MAP,
-				 VALID_OFFSET_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION,
-				 Diagnostic.ERROR,
-				 DGValidator.DIAGNOSTIC_SOURCE,
-				 DGValidator.GRADIENT_STOP__VALID_OFFSET);
+	public boolean validOffset(DiagnosticChain diagnostics, Map<Object, Object> context) {
+		return DGValidator.validate(DGPackage.Literals.GRADIENT_STOP, this, diagnostics, context, "http://www.eclipse.org/emf/2002/Ecore/OCL", DGPackage.Literals.GRADIENT_STOP___VALID_OFFSET__DIAGNOSTICCHAIN_MAP, VALID_OFFSET_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION, Diagnostic.ERROR, DGValidator.DIAGNOSTIC_SOURCE, DGValidator.GRADIENT_STOP__VALID_OFFSET);
 	}
 
 	/**
-	 * The cached validation expression for the '{@link #validOpacity(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Valid Opacity</em>}' invariant operation.
+	 * The cached validation expression for the '{@link #validOpacity(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
+	 * <em>Valid Opacity</em>}' invariant operation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #validOpacity(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
 	 * @generated
 	 * @ordered
@@ -315,132 +330,134 @@ public class GradientStopImpl extends MinimalEObjectImpl.Container implements
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public boolean validOpacity(DiagnosticChain diagnostics,
-			Map<Object, Object> context) {
-		return
-			DGValidator.validate
-				(DGPackage.Literals.GRADIENT_STOP,
-				 this,
-				 diagnostics,
-				 context,
-				 "http://www.eclipse.org/emf/2002/Ecore/OCL",
-				 DGPackage.Literals.GRADIENT_STOP___VALID_OPACITY__DIAGNOSTICCHAIN_MAP,
-				 VALID_OPACITY_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION,
-				 Diagnostic.ERROR,
-				 DGValidator.DIAGNOSTIC_SOURCE,
-				 DGValidator.GRADIENT_STOP__VALID_OPACITY);
+	public boolean validOpacity(DiagnosticChain diagnostics, Map<Object, Object> context) {
+		return DGValidator.validate(DGPackage.Literals.GRADIENT_STOP, this, diagnostics, context, "http://www.eclipse.org/emf/2002/Ecore/OCL", DGPackage.Literals.GRADIENT_STOP___VALID_OPACITY__DIAGNOSTICCHAIN_MAP, VALID_OPACITY_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION, Diagnostic.ERROR, DGValidator.DIAGNOSTIC_SOURCE, DGValidator.GRADIENT_STOP__VALID_OPACITY);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case DGPackage.GRADIENT_STOP__COLOR:
-				return getColor();
-			case DGPackage.GRADIENT_STOP__OFFSET:
-				return getOffset();
-			case DGPackage.GRADIENT_STOP__OPACITY:
-				return getOpacity();
+		switch(featureID) {
+		case DGPackage.GRADIENT_STOP__COLOR:
+			return getColor();
+		case DGPackage.GRADIENT_STOP__OFFSET:
+			return getOffset();
+		case DGPackage.GRADIENT_STOP__OPACITY:
+			return getOpacity();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case DGPackage.GRADIENT_STOP__COLOR:
-				setColor((Color)newValue);
-				return;
-			case DGPackage.GRADIENT_STOP__OFFSET:
-				setOffset((Double)newValue);
-				return;
-			case DGPackage.GRADIENT_STOP__OPACITY:
-				setOpacity((Double)newValue);
-				return;
+		switch(featureID) {
+		case DGPackage.GRADIENT_STOP__COLOR:
+			setColor((Color)newValue);
+			return;
+		case DGPackage.GRADIENT_STOP__OFFSET:
+			setOffset((Double)newValue);
+			return;
+		case DGPackage.GRADIENT_STOP__OPACITY:
+			setOpacity((Double)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case DGPackage.GRADIENT_STOP__COLOR:
-				unsetColor();
-				return;
-			case DGPackage.GRADIENT_STOP__OFFSET:
-				unsetOffset();
-				return;
-			case DGPackage.GRADIENT_STOP__OPACITY:
-				unsetOpacity();
-				return;
+		switch(featureID) {
+		case DGPackage.GRADIENT_STOP__COLOR:
+			unsetColor();
+			return;
+		case DGPackage.GRADIENT_STOP__OFFSET:
+			unsetOffset();
+			return;
+		case DGPackage.GRADIENT_STOP__OPACITY:
+			unsetOpacity();
+			return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case DGPackage.GRADIENT_STOP__COLOR:
-				return isSetColor();
-			case DGPackage.GRADIENT_STOP__OFFSET:
-				return isSetOffset();
-			case DGPackage.GRADIENT_STOP__OPACITY:
-				return isSetOpacity();
+		switch(featureID) {
+		case DGPackage.GRADIENT_STOP__COLOR:
+			return isSetColor();
+		case DGPackage.GRADIENT_STOP__OFFSET:
+			return isSetOffset();
+		case DGPackage.GRADIENT_STOP__OPACITY:
+			return isSetOpacity();
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	@SuppressWarnings("unchecked")
-	public Object eInvoke(int operationID, EList<?> arguments)
-			throws InvocationTargetException {
-		switch (operationID) {
-			case DGPackage.GRADIENT_STOP___VALID_OFFSET__DIAGNOSTICCHAIN_MAP:
-				return validOffset((DiagnosticChain)arguments.get(0), (Map<Object, Object>)arguments.get(1));
-			case DGPackage.GRADIENT_STOP___VALID_OPACITY__DIAGNOSTICCHAIN_MAP:
-				return validOpacity((DiagnosticChain)arguments.get(0), (Map<Object, Object>)arguments.get(1));
+	public Object eInvoke(int operationID, EList<?> arguments) throws InvocationTargetException {
+		switch(operationID) {
+		case DGPackage.GRADIENT_STOP___VALID_OFFSET__DIAGNOSTICCHAIN_MAP:
+			return validOffset((DiagnosticChain)arguments.get(0), (Map<Object, Object>)arguments.get(1));
+		case DGPackage.GRADIENT_STOP___VALID_OPACITY__DIAGNOSTICCHAIN_MAP:
+			return validOpacity((DiagnosticChain)arguments.get(0), (Map<Object, Object>)arguments.get(1));
 		}
 		return super.eInvoke(operationID, arguments);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) return super.toString();
-
+		if(eIsProxy())
+			return super.toString();
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (color: ");
-		if (colorESet) result.append(color); else result.append("<unset>");
+		if(colorESet)
+			result.append(color);
+		else
+			result.append("<unset>");
 		result.append(", offset: ");
-		if (offsetESet) result.append(offset); else result.append("<unset>");
+		if(offsetESet)
+			result.append(offset);
+		else
+			result.append("<unset>");
 		result.append(", opacity: ");
-		if (opacityESet) result.append(opacity); else result.append("<unset>");
+		if(opacityESet)
+			result.append(opacity);
+		else
+			result.append("<unset>");
 		result.append(')');
 		return result.toString();
 	}
-
 } // GradientStopImpl
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/GraphicalElementImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/GraphicalElementImpl.java
index 3caa2723f71..f3a4b42f8cb 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/GraphicalElementImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/GraphicalElementImpl.java
@@ -35,27 +35,27 @@ import org.eclipse.papyrus.dd.dg.Transform;
 import org.eclipse.papyrus.dd.dg.util.DGValidator;
 
 /**
- * <!-- begin-user-doc --> An implementation of the model object '
- * <em><b>Graphical Element</b></em>'. <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object ' <em><b>Graphical Element</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.dd.dg.impl.GraphicalElementImpl#getClipPath <em>Clip Path</em>}</li>
- *   <li>{@link org.eclipse.papyrus.dd.dg.impl.GraphicalElementImpl#getGroup <em>Group</em>}</li>
- *   <li>{@link org.eclipse.papyrus.dd.dg.impl.GraphicalElementImpl#getClasses <em>Class</em>}</li>
- *   <li>{@link org.eclipse.papyrus.dd.dg.impl.GraphicalElementImpl#getStyle <em>Style</em>}</li>
- *   <li>{@link org.eclipse.papyrus.dd.dg.impl.GraphicalElementImpl#getTransforms <em>Transform</em>}</li>
- *   <li>{@link org.eclipse.papyrus.dd.dg.impl.GraphicalElementImpl#getLayoutData <em>Layout Data</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.impl.GraphicalElementImpl#getClipPath <em>Clip Path</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.impl.GraphicalElementImpl#getGroup <em>Group</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.impl.GraphicalElementImpl#getClasses <em>Class</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.impl.GraphicalElementImpl#getStyle <em>Style</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.impl.GraphicalElementImpl#getTransforms <em>Transform</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.impl.GraphicalElementImpl#getLayoutData <em>Layout Data</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
-public abstract class GraphicalElementImpl extends DefinitionImpl implements
-		GraphicalElement {
+public abstract class GraphicalElementImpl extends DefinitionImpl implements GraphicalElement {
+
 	/**
 	 * The cached value of the '{@link #getClipPath() <em>Clip Path</em>}' reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getClipPath()
 	 * @generated
 	 * @ordered
@@ -65,6 +65,7 @@ public abstract class GraphicalElementImpl extends DefinitionImpl implements
 	/**
 	 * The cached value of the '{@link #getClasses() <em>Class</em>}' attribute list.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getClasses()
 	 * @generated
 	 * @ordered
@@ -74,6 +75,7 @@ public abstract class GraphicalElementImpl extends DefinitionImpl implements
 	/**
 	 * The cached value of the '{@link #getStyle() <em>Style</em>}' containment reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getStyle()
 	 * @generated
 	 * @ordered
@@ -83,6 +85,7 @@ public abstract class GraphicalElementImpl extends DefinitionImpl implements
 	/**
 	 * The cached value of the '{@link #getTransforms() <em>Transform</em>}' containment reference list.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getTransforms()
 	 * @generated
 	 * @ordered
@@ -93,6 +96,7 @@ public abstract class GraphicalElementImpl extends DefinitionImpl implements
 	 * The default value of the '{@link #getLayoutData() <em>Layout Data</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getLayoutData()
 	 * @generated
 	 * @ordered
@@ -103,6 +107,7 @@ public abstract class GraphicalElementImpl extends DefinitionImpl implements
 	 * The cached value of the '{@link #getLayoutData() <em>Layout Data</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getLayoutData()
 	 * @generated
 	 * @ordered
@@ -111,6 +116,7 @@ public abstract class GraphicalElementImpl extends DefinitionImpl implements
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected GraphicalElementImpl() {
@@ -119,6 +125,7 @@ public abstract class GraphicalElementImpl extends DefinitionImpl implements
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -128,14 +135,15 @@ public abstract class GraphicalElementImpl extends DefinitionImpl implements
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public ClipPath getClipPath() {
-		if (clipPath != null && clipPath.eIsProxy()) {
+		if(clipPath != null && clipPath.eIsProxy()) {
 			InternalEObject oldClipPath = (InternalEObject)clipPath;
 			clipPath = (ClipPath)eResolveProxy(oldClipPath);
-			if (clipPath != oldClipPath) {
-				if (eNotificationRequired())
+			if(clipPath != oldClipPath) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, DGPackage.GRAPHICAL_ELEMENT__CLIP_PATH, oldClipPath, clipPath));
 			}
 		}
@@ -144,6 +152,7 @@ public abstract class GraphicalElementImpl extends DefinitionImpl implements
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public ClipPath basicGetClipPath() {
@@ -152,60 +161,65 @@ public abstract class GraphicalElementImpl extends DefinitionImpl implements
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setClipPath(ClipPath newClipPath) {
 		ClipPath oldClipPath = clipPath;
 		clipPath = newClipPath;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.GRAPHICAL_ELEMENT__CLIP_PATH, oldClipPath, clipPath));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Group getGroup() {
-		if (eContainerFeatureID() != DGPackage.GRAPHICAL_ELEMENT__GROUP) return null;
+		if(eContainerFeatureID() != DGPackage.GRAPHICAL_ELEMENT__GROUP)
+			return null;
 		return (Group)eInternalContainer();
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public NotificationChain basicSetGroup(Group newGroup,
-			NotificationChain msgs) {
+	public NotificationChain basicSetGroup(Group newGroup, NotificationChain msgs) {
 		msgs = eBasicSetContainer((InternalEObject)newGroup, DGPackage.GRAPHICAL_ELEMENT__GROUP, msgs);
 		return msgs;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setGroup(Group newGroup) {
-		if (newGroup != eInternalContainer() || (eContainerFeatureID() != DGPackage.GRAPHICAL_ELEMENT__GROUP && newGroup != null)) {
-			if (EcoreUtil.isAncestor(this, newGroup))
+		if(newGroup != eInternalContainer() || (eContainerFeatureID() != DGPackage.GRAPHICAL_ELEMENT__GROUP && newGroup != null)) {
+			if(EcoreUtil.isAncestor(this, newGroup))
 				throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
 			NotificationChain msgs = null;
-			if (eInternalContainer() != null)
+			if(eInternalContainer() != null)
 				msgs = eBasicRemoveFromContainer(msgs);
-			if (newGroup != null)
+			if(newGroup != null)
 				msgs = ((InternalEObject)newGroup).eInverseAdd(this, DGPackage.GROUP__MEMBER, Group.class, msgs);
 			msgs = basicSetGroup(newGroup, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
+			if(msgs != null)
+				msgs.dispatch();
+		} else if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.GRAPHICAL_ELEMENT__GROUP, newGroup, newGroup));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<String> getClasses() {
-		if (classes == null) {
+		if(classes == null) {
 			classes = new EDataTypeUniqueEList<String>(String.class, this, DGPackage.GRAPHICAL_ELEMENT__CLASS);
 		}
 		return classes;
@@ -213,6 +227,7 @@ public abstract class GraphicalElementImpl extends DefinitionImpl implements
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Style getStyle() {
@@ -221,43 +236,48 @@ public abstract class GraphicalElementImpl extends DefinitionImpl implements
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public NotificationChain basicSetStyle(Style newStyle,
-			NotificationChain msgs) {
+	public NotificationChain basicSetStyle(Style newStyle, NotificationChain msgs) {
 		Style oldStyle = style;
 		style = newStyle;
-		if (eNotificationRequired()) {
+		if(eNotificationRequired()) {
 			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, DGPackage.GRAPHICAL_ELEMENT__STYLE, oldStyle, newStyle);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
+			if(msgs == null)
+				msgs = notification;
+			else
+				msgs.add(notification);
 		}
 		return msgs;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setStyle(Style newStyle) {
-		if (newStyle != style) {
+		if(newStyle != style) {
 			NotificationChain msgs = null;
-			if (style != null)
+			if(style != null)
 				msgs = ((InternalEObject)style).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - DGPackage.GRAPHICAL_ELEMENT__STYLE, null, msgs);
-			if (newStyle != null)
+			if(newStyle != null)
 				msgs = ((InternalEObject)newStyle).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - DGPackage.GRAPHICAL_ELEMENT__STYLE, null, msgs);
 			msgs = basicSetStyle(newStyle, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
+			if(msgs != null)
+				msgs.dispatch();
+		} else if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.GRAPHICAL_ELEMENT__STYLE, newStyle, newStyle));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<Transform> getTransforms() {
-		if (transforms == null) {
+		if(transforms == null) {
 			transforms = new EObjectContainmentEList<Transform>(Transform.class, this, DGPackage.GRAPHICAL_ELEMENT__TRANSFORM);
 		}
 		return transforms;
@@ -266,6 +286,7 @@ public abstract class GraphicalElementImpl extends DefinitionImpl implements
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getLayoutData() {
@@ -275,23 +296,22 @@ public abstract class GraphicalElementImpl extends DefinitionImpl implements
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setLayoutData(String newLayoutData) {
 		String oldLayoutData = layoutData;
 		layoutData = newLayoutData;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.GRAPHICAL_ELEMENT__LAYOUT_DATA, oldLayoutData, layoutData));
 	}
 
 	/**
-	 * The cached validation expression for the '
-	 * {@link #referencedClippathHasId(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
+	 * The cached validation expression for the ' {@link #referencedClippathHasId(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
 	 * <em>Referenced Clippath Has Id</em>}' invariant operation. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
-	 * @see #referencedClippathHasId(org.eclipse.emf.common.util.DiagnosticChain,
-	 *      java.util.Map)
+	 * @see #referencedClippathHasId(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
 	 * @generated
 	 * @ordered
 	 */
@@ -299,203 +319,198 @@ public abstract class GraphicalElementImpl extends DefinitionImpl implements
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public boolean referencedClippathHasId(DiagnosticChain diagnostics,
-			Map<Object, Object> context) {
-		return
-			DGValidator.validate
-				(DGPackage.Literals.GRAPHICAL_ELEMENT,
-				 this,
-				 diagnostics,
-				 context,
-				 "http://www.eclipse.org/emf/2002/Ecore/OCL",
-				 DGPackage.Literals.GRAPHICAL_ELEMENT___REFERENCED_CLIPPATH_HAS_ID__DIAGNOSTICCHAIN_MAP,
-				 REFERENCED_CLIPPATH_HAS_ID_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION,
-				 Diagnostic.ERROR,
-				 DGValidator.DIAGNOSTIC_SOURCE,
-				 DGValidator.GRAPHICAL_ELEMENT__REFERENCED_CLIPPATH_HAS_ID);
+	public boolean referencedClippathHasId(DiagnosticChain diagnostics, Map<Object, Object> context) {
+		return DGValidator.validate(DGPackage.Literals.GRAPHICAL_ELEMENT, this, diagnostics, context, "http://www.eclipse.org/emf/2002/Ecore/OCL", DGPackage.Literals.GRAPHICAL_ELEMENT___REFERENCED_CLIPPATH_HAS_ID__DIAGNOSTICCHAIN_MAP, REFERENCED_CLIPPATH_HAS_ID_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION, Diagnostic.ERROR, DGValidator.DIAGNOSTIC_SOURCE, DGValidator.GRAPHICAL_ELEMENT__REFERENCED_CLIPPATH_HAS_ID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
-	public NotificationChain eInverseAdd(InternalEObject otherEnd,
-			int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case DGPackage.GRAPHICAL_ELEMENT__GROUP:
-				if (eInternalContainer() != null)
-					msgs = eBasicRemoveFromContainer(msgs);
-				return basicSetGroup((Group)otherEnd, msgs);
+	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch(featureID) {
+		case DGPackage.GRAPHICAL_ELEMENT__GROUP:
+			if(eInternalContainer() != null)
+				msgs = eBasicRemoveFromContainer(msgs);
+			return basicSetGroup((Group)otherEnd, msgs);
 		}
 		return super.eInverseAdd(otherEnd, featureID, msgs);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd,
-			int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case DGPackage.GRAPHICAL_ELEMENT__GROUP:
-				return basicSetGroup(null, msgs);
-			case DGPackage.GRAPHICAL_ELEMENT__STYLE:
-				return basicSetStyle(null, msgs);
-			case DGPackage.GRAPHICAL_ELEMENT__TRANSFORM:
-				return ((InternalEList<?>)getTransforms()).basicRemove(otherEnd, msgs);
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch(featureID) {
+		case DGPackage.GRAPHICAL_ELEMENT__GROUP:
+			return basicSetGroup(null, msgs);
+		case DGPackage.GRAPHICAL_ELEMENT__STYLE:
+			return basicSetStyle(null, msgs);
+		case DGPackage.GRAPHICAL_ELEMENT__TRANSFORM:
+			return ((InternalEList<?>)getTransforms()).basicRemove(otherEnd, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
-	public NotificationChain eBasicRemoveFromContainerFeature(
-			NotificationChain msgs) {
-		switch (eContainerFeatureID()) {
-			case DGPackage.GRAPHICAL_ELEMENT__GROUP:
-				return eInternalContainer().eInverseRemove(this, DGPackage.GROUP__MEMBER, Group.class, msgs);
+	public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs) {
+		switch(eContainerFeatureID()) {
+		case DGPackage.GRAPHICAL_ELEMENT__GROUP:
+			return eInternalContainer().eInverseRemove(this, DGPackage.GROUP__MEMBER, Group.class, msgs);
 		}
 		return super.eBasicRemoveFromContainerFeature(msgs);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case DGPackage.GRAPHICAL_ELEMENT__CLIP_PATH:
-				if (resolve) return getClipPath();
-				return basicGetClipPath();
-			case DGPackage.GRAPHICAL_ELEMENT__GROUP:
-				return getGroup();
-			case DGPackage.GRAPHICAL_ELEMENT__CLASS:
-				return getClasses();
-			case DGPackage.GRAPHICAL_ELEMENT__STYLE:
-				return getStyle();
-			case DGPackage.GRAPHICAL_ELEMENT__TRANSFORM:
-				return getTransforms();
-			case DGPackage.GRAPHICAL_ELEMENT__LAYOUT_DATA:
-				return getLayoutData();
+		switch(featureID) {
+		case DGPackage.GRAPHICAL_ELEMENT__CLIP_PATH:
+			if(resolve)
+				return getClipPath();
+			return basicGetClipPath();
+		case DGPackage.GRAPHICAL_ELEMENT__GROUP:
+			return getGroup();
+		case DGPackage.GRAPHICAL_ELEMENT__CLASS:
+			return getClasses();
+		case DGPackage.GRAPHICAL_ELEMENT__STYLE:
+			return getStyle();
+		case DGPackage.GRAPHICAL_ELEMENT__TRANSFORM:
+			return getTransforms();
+		case DGPackage.GRAPHICAL_ELEMENT__LAYOUT_DATA:
+			return getLayoutData();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case DGPackage.GRAPHICAL_ELEMENT__CLIP_PATH:
-				setClipPath((ClipPath)newValue);
-				return;
-			case DGPackage.GRAPHICAL_ELEMENT__GROUP:
-				setGroup((Group)newValue);
-				return;
-			case DGPackage.GRAPHICAL_ELEMENT__CLASS:
-				getClasses().clear();
-				getClasses().addAll((Collection<? extends String>)newValue);
-				return;
-			case DGPackage.GRAPHICAL_ELEMENT__STYLE:
-				setStyle((Style)newValue);
-				return;
-			case DGPackage.GRAPHICAL_ELEMENT__TRANSFORM:
-				getTransforms().clear();
-				getTransforms().addAll((Collection<? extends Transform>)newValue);
-				return;
-			case DGPackage.GRAPHICAL_ELEMENT__LAYOUT_DATA:
-				setLayoutData((String)newValue);
-				return;
+		switch(featureID) {
+		case DGPackage.GRAPHICAL_ELEMENT__CLIP_PATH:
+			setClipPath((ClipPath)newValue);
+			return;
+		case DGPackage.GRAPHICAL_ELEMENT__GROUP:
+			setGroup((Group)newValue);
+			return;
+		case DGPackage.GRAPHICAL_ELEMENT__CLASS:
+			getClasses().clear();
+			getClasses().addAll((Collection<? extends String>)newValue);
+			return;
+		case DGPackage.GRAPHICAL_ELEMENT__STYLE:
+			setStyle((Style)newValue);
+			return;
+		case DGPackage.GRAPHICAL_ELEMENT__TRANSFORM:
+			getTransforms().clear();
+			getTransforms().addAll((Collection<? extends Transform>)newValue);
+			return;
+		case DGPackage.GRAPHICAL_ELEMENT__LAYOUT_DATA:
+			setLayoutData((String)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case DGPackage.GRAPHICAL_ELEMENT__CLIP_PATH:
-				setClipPath((ClipPath)null);
-				return;
-			case DGPackage.GRAPHICAL_ELEMENT__GROUP:
-				setGroup((Group)null);
-				return;
-			case DGPackage.GRAPHICAL_ELEMENT__CLASS:
-				getClasses().clear();
-				return;
-			case DGPackage.GRAPHICAL_ELEMENT__STYLE:
-				setStyle((Style)null);
-				return;
-			case DGPackage.GRAPHICAL_ELEMENT__TRANSFORM:
-				getTransforms().clear();
-				return;
-			case DGPackage.GRAPHICAL_ELEMENT__LAYOUT_DATA:
-				setLayoutData(LAYOUT_DATA_EDEFAULT);
-				return;
+		switch(featureID) {
+		case DGPackage.GRAPHICAL_ELEMENT__CLIP_PATH:
+			setClipPath((ClipPath)null);
+			return;
+		case DGPackage.GRAPHICAL_ELEMENT__GROUP:
+			setGroup((Group)null);
+			return;
+		case DGPackage.GRAPHICAL_ELEMENT__CLASS:
+			getClasses().clear();
+			return;
+		case DGPackage.GRAPHICAL_ELEMENT__STYLE:
+			setStyle((Style)null);
+			return;
+		case DGPackage.GRAPHICAL_ELEMENT__TRANSFORM:
+			getTransforms().clear();
+			return;
+		case DGPackage.GRAPHICAL_ELEMENT__LAYOUT_DATA:
+			setLayoutData(LAYOUT_DATA_EDEFAULT);
+			return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case DGPackage.GRAPHICAL_ELEMENT__CLIP_PATH:
-				return clipPath != null;
-			case DGPackage.GRAPHICAL_ELEMENT__GROUP:
-				return getGroup() != null;
-			case DGPackage.GRAPHICAL_ELEMENT__CLASS:
-				return classes != null && !classes.isEmpty();
-			case DGPackage.GRAPHICAL_ELEMENT__STYLE:
-				return style != null;
-			case DGPackage.GRAPHICAL_ELEMENT__TRANSFORM:
-				return transforms != null && !transforms.isEmpty();
-			case DGPackage.GRAPHICAL_ELEMENT__LAYOUT_DATA:
-				return LAYOUT_DATA_EDEFAULT == null ? layoutData != null : !LAYOUT_DATA_EDEFAULT.equals(layoutData);
+		switch(featureID) {
+		case DGPackage.GRAPHICAL_ELEMENT__CLIP_PATH:
+			return clipPath != null;
+		case DGPackage.GRAPHICAL_ELEMENT__GROUP:
+			return getGroup() != null;
+		case DGPackage.GRAPHICAL_ELEMENT__CLASS:
+			return classes != null && !classes.isEmpty();
+		case DGPackage.GRAPHICAL_ELEMENT__STYLE:
+			return style != null;
+		case DGPackage.GRAPHICAL_ELEMENT__TRANSFORM:
+			return transforms != null && !transforms.isEmpty();
+		case DGPackage.GRAPHICAL_ELEMENT__LAYOUT_DATA:
+			return LAYOUT_DATA_EDEFAULT == null ? layoutData != null : !LAYOUT_DATA_EDEFAULT.equals(layoutData);
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	@SuppressWarnings("unchecked")
-	public Object eInvoke(int operationID, EList<?> arguments)
-			throws InvocationTargetException {
-		switch (operationID) {
-			case DGPackage.GRAPHICAL_ELEMENT___REFERENCED_CLIPPATH_HAS_ID__DIAGNOSTICCHAIN_MAP:
-				return referencedClippathHasId((DiagnosticChain)arguments.get(0), (Map<Object, Object>)arguments.get(1));
+	public Object eInvoke(int operationID, EList<?> arguments) throws InvocationTargetException {
+		switch(operationID) {
+		case DGPackage.GRAPHICAL_ELEMENT___REFERENCED_CLIPPATH_HAS_ID__DIAGNOSTICCHAIN_MAP:
+			return referencedClippathHasId((DiagnosticChain)arguments.get(0), (Map<Object, Object>)arguments.get(1));
 		}
 		return super.eInvoke(operationID, arguments);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) return super.toString();
-
+		if(eIsProxy())
+			return super.toString();
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (class: ");
 		result.append(classes);
@@ -504,5 +519,4 @@ public abstract class GraphicalElementImpl extends DefinitionImpl implements
 		result.append(')');
 		return result.toString();
 	}
-
 } // GraphicalElementImpl
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/GroupImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/GroupImpl.java
index 4755db93311..09a5f1e3b6e 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/GroupImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/GroupImpl.java
@@ -30,22 +30,23 @@ import org.eclipse.papyrus.dd.dg.GraphicalElement;
 import org.eclipse.papyrus.dd.dg.Group;
 
 /**
- * <!-- begin-user-doc --> An implementation of the model object '
- * <em><b>Group</b></em>'. <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object ' <em><b>Group</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.dd.dg.impl.GroupImpl#getMembers <em>Member</em>}</li>
- *   <li>{@link org.eclipse.papyrus.dd.dg.impl.GroupImpl#getLayout <em>Layout</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.impl.GroupImpl#getMembers <em>Member</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.impl.GroupImpl#getLayout <em>Layout</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class GroupImpl extends GraphicalElementImpl implements Group {
+
 	/**
 	 * The cached value of the '{@link #getMembers() <em>Member</em>}' containment reference list.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getMembers()
 	 * @generated
 	 * @ordered
@@ -56,15 +57,18 @@ public class GroupImpl extends GraphicalElementImpl implements Group {
 	 * The default value of the '{@link #getLayout() <em>Layout</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getLayout()
 	 * @generated
 	 * @ordered
 	 */
 	protected static final String LAYOUT_EDEFAULT = null;
+
 	/**
 	 * The cached value of the '{@link #getLayout() <em>Layout</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getLayout()
 	 * @generated
 	 * @ordered
@@ -73,6 +77,7 @@ public class GroupImpl extends GraphicalElementImpl implements Group {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected GroupImpl() {
@@ -81,6 +86,7 @@ public class GroupImpl extends GraphicalElementImpl implements Group {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -90,10 +96,11 @@ public class GroupImpl extends GraphicalElementImpl implements Group {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<GraphicalElement> getMembers() {
-		if (members == null) {
+		if(members == null) {
 			members = new EObjectContainmentWithInverseEList<GraphicalElement>(GraphicalElement.class, this, DGPackage.GROUP__MEMBER, DGPackage.GRAPHICAL_ELEMENT__GROUP);
 		}
 		return members;
@@ -102,6 +109,7 @@ public class GroupImpl extends GraphicalElementImpl implements Group {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getLayout() {
@@ -111,106 +119,111 @@ public class GroupImpl extends GraphicalElementImpl implements Group {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setLayout(String newLayout) {
 		String oldLayout = layout;
 		layout = newLayout;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.GROUP__LAYOUT, oldLayout, layout));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
-	public NotificationChain eInverseAdd(InternalEObject otherEnd,
-			int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case DGPackage.GROUP__MEMBER:
-				return ((InternalEList<InternalEObject>)(InternalEList<?>)getMembers()).basicAdd(otherEnd, msgs);
+	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch(featureID) {
+		case DGPackage.GROUP__MEMBER:
+			return ((InternalEList<InternalEObject>)(InternalEList<?>)getMembers()).basicAdd(otherEnd, msgs);
 		}
 		return super.eInverseAdd(otherEnd, featureID, msgs);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd,
-			int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case DGPackage.GROUP__MEMBER:
-				return ((InternalEList<?>)getMembers()).basicRemove(otherEnd, msgs);
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch(featureID) {
+		case DGPackage.GROUP__MEMBER:
+			return ((InternalEList<?>)getMembers()).basicRemove(otherEnd, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case DGPackage.GROUP__MEMBER:
-				return getMembers();
-			case DGPackage.GROUP__LAYOUT:
-				return getLayout();
+		switch(featureID) {
+		case DGPackage.GROUP__MEMBER:
+			return getMembers();
+		case DGPackage.GROUP__LAYOUT:
+			return getLayout();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case DGPackage.GROUP__MEMBER:
-				getMembers().clear();
-				getMembers().addAll((Collection<? extends GraphicalElement>)newValue);
-				return;
-			case DGPackage.GROUP__LAYOUT:
-				setLayout((String)newValue);
-				return;
+		switch(featureID) {
+		case DGPackage.GROUP__MEMBER:
+			getMembers().clear();
+			getMembers().addAll((Collection<? extends GraphicalElement>)newValue);
+			return;
+		case DGPackage.GROUP__LAYOUT:
+			setLayout((String)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case DGPackage.GROUP__MEMBER:
-				getMembers().clear();
-				return;
-			case DGPackage.GROUP__LAYOUT:
-				setLayout(LAYOUT_EDEFAULT);
-				return;
+		switch(featureID) {
+		case DGPackage.GROUP__MEMBER:
+			getMembers().clear();
+			return;
+		case DGPackage.GROUP__LAYOUT:
+			setLayout(LAYOUT_EDEFAULT);
+			return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case DGPackage.GROUP__MEMBER:
-				return members != null && !members.isEmpty();
-			case DGPackage.GROUP__LAYOUT:
-				return LAYOUT_EDEFAULT == null ? layout != null : !LAYOUT_EDEFAULT.equals(layout);
+		switch(featureID) {
+		case DGPackage.GROUP__MEMBER:
+			return members != null && !members.isEmpty();
+		case DGPackage.GROUP__LAYOUT:
+			return LAYOUT_EDEFAULT == null ? layout != null : !LAYOUT_EDEFAULT.equals(layout);
 		}
 		return super.eIsSet(featureID);
 	}
@@ -218,17 +231,17 @@ public class GroupImpl extends GraphicalElementImpl implements Group {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) return super.toString();
-
+		if(eIsProxy())
+			return super.toString();
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (layout: ");
 		result.append(layout);
 		result.append(')');
 		return result.toString();
 	}
-
 } // GroupImpl
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/ImageImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/ImageImpl.java
index 6a96621ee0d..c6dfe6a924f 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/ImageImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/ImageImpl.java
@@ -31,23 +31,24 @@ import org.eclipse.papyrus.dd.dg.Image;
 import org.eclipse.papyrus.dd.dg.util.DGValidator;
 
 /**
- * <!-- begin-user-doc --> An implementation of the model object '
- * <em><b>Image</b></em>'. <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object ' <em><b>Image</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.dd.dg.impl.ImageImpl#getSource <em>Source</em>}</li>
- *   <li>{@link org.eclipse.papyrus.dd.dg.impl.ImageImpl#getBounds <em>Bounds</em>}</li>
- *   <li>{@link org.eclipse.papyrus.dd.dg.impl.ImageImpl#isAspectRatioPreserved <em>Is Aspect Ratio Preserved</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.impl.ImageImpl#getSource <em>Source</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.impl.ImageImpl#getBounds <em>Bounds</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.impl.ImageImpl#isAspectRatioPreserved <em>Is Aspect Ratio Preserved</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class ImageImpl extends GraphicalElementImpl implements Image {
+
 	/**
 	 * The default value of the '{@link #getSource() <em>Source</em>}' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getSource()
 	 * @generated
 	 * @ordered
@@ -57,6 +58,7 @@ public class ImageImpl extends GraphicalElementImpl implements Image {
 	/**
 	 * The cached value of the '{@link #getSource() <em>Source</em>}' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getSource()
 	 * @generated
 	 * @ordered
@@ -66,6 +68,7 @@ public class ImageImpl extends GraphicalElementImpl implements Image {
 	/**
 	 * The cached value of the '{@link #getBounds() <em>Bounds</em>}' containment reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getBounds()
 	 * @generated
 	 * @ordered
@@ -76,6 +79,7 @@ public class ImageImpl extends GraphicalElementImpl implements Image {
 	 * The default value of the '{@link #isAspectRatioPreserved() <em>Is Aspect Ratio Preserved</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #isAspectRatioPreserved()
 	 * @generated
 	 * @ordered
@@ -86,6 +90,7 @@ public class ImageImpl extends GraphicalElementImpl implements Image {
 	 * The cached value of the '{@link #isAspectRatioPreserved() <em>Is Aspect Ratio Preserved</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #isAspectRatioPreserved()
 	 * @generated
 	 * @ordered
@@ -94,6 +99,7 @@ public class ImageImpl extends GraphicalElementImpl implements Image {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected ImageImpl() {
@@ -102,6 +108,7 @@ public class ImageImpl extends GraphicalElementImpl implements Image {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -111,6 +118,7 @@ public class ImageImpl extends GraphicalElementImpl implements Image {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getSource() {
@@ -119,17 +127,19 @@ public class ImageImpl extends GraphicalElementImpl implements Image {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setSource(String newSource) {
 		String oldSource = source;
 		source = newSource;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.IMAGE__SOURCE, oldSource, source));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Bounds getBounds() {
@@ -138,39 +148,44 @@ public class ImageImpl extends GraphicalElementImpl implements Image {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public NotificationChain basicSetBounds(Bounds newBounds,
-			NotificationChain msgs) {
+	public NotificationChain basicSetBounds(Bounds newBounds, NotificationChain msgs) {
 		Bounds oldBounds = bounds;
 		bounds = newBounds;
-		if (eNotificationRequired()) {
+		if(eNotificationRequired()) {
 			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, DGPackage.IMAGE__BOUNDS, oldBounds, newBounds);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
+			if(msgs == null)
+				msgs = notification;
+			else
+				msgs.add(notification);
 		}
 		return msgs;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setBounds(Bounds newBounds) {
-		if (newBounds != bounds) {
+		if(newBounds != bounds) {
 			NotificationChain msgs = null;
-			if (bounds != null)
+			if(bounds != null)
 				msgs = ((InternalEObject)bounds).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - DGPackage.IMAGE__BOUNDS, null, msgs);
-			if (newBounds != null)
+			if(newBounds != null)
 				msgs = ((InternalEObject)newBounds).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - DGPackage.IMAGE__BOUNDS, null, msgs);
 			msgs = basicSetBounds(newBounds, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
+			if(msgs != null)
+				msgs.dispatch();
+		} else if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.IMAGE__BOUNDS, newBounds, newBounds));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isAspectRatioPreserved() {
@@ -179,23 +194,22 @@ public class ImageImpl extends GraphicalElementImpl implements Image {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setIsAspectRatioPreserved(boolean newIsAspectRatioPreserved) {
 		boolean oldIsAspectRatioPreserved = isAspectRatioPreserved;
 		isAspectRatioPreserved = newIsAspectRatioPreserved;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.IMAGE__IS_ASPECT_RATIO_PRESERVED, oldIsAspectRatioPreserved, isAspectRatioPreserved));
 	}
 
 	/**
-	 * The cached validation expression for the '
-	 * {@link #sourceCannotBeEmpty(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
+	 * The cached validation expression for the ' {@link #sourceCannotBeEmpty(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
 	 * <em>Source Cannot Be Empty</em>}' invariant operation. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
-	 * @see #sourceCannotBeEmpty(org.eclipse.emf.common.util.DiagnosticChain,
-	 *      java.util.Map)
+	 * @see #sourceCannotBeEmpty(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
 	 * @generated
 	 * @ordered
 	 */
@@ -203,135 +217,129 @@ public class ImageImpl extends GraphicalElementImpl implements Image {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public boolean sourceCannotBeEmpty(DiagnosticChain diagnostics,
-			Map<Object, Object> context) {
-		return
-			DGValidator.validate
-				(DGPackage.Literals.IMAGE,
-				 this,
-				 diagnostics,
-				 context,
-				 "http://www.eclipse.org/emf/2002/Ecore/OCL",
-				 DGPackage.Literals.IMAGE___SOURCE_CANNOT_BE_EMPTY__DIAGNOSTICCHAIN_MAP,
-				 SOURCE_CANNOT_BE_EMPTY_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION,
-				 Diagnostic.ERROR,
-				 DGValidator.DIAGNOSTIC_SOURCE,
-				 DGValidator.IMAGE__SOURCE_CANNOT_BE_EMPTY);
+	public boolean sourceCannotBeEmpty(DiagnosticChain diagnostics, Map<Object, Object> context) {
+		return DGValidator.validate(DGPackage.Literals.IMAGE, this, diagnostics, context, "http://www.eclipse.org/emf/2002/Ecore/OCL", DGPackage.Literals.IMAGE___SOURCE_CANNOT_BE_EMPTY__DIAGNOSTICCHAIN_MAP, SOURCE_CANNOT_BE_EMPTY_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION, Diagnostic.ERROR, DGValidator.DIAGNOSTIC_SOURCE, DGValidator.IMAGE__SOURCE_CANNOT_BE_EMPTY);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd,
-			int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case DGPackage.IMAGE__BOUNDS:
-				return basicSetBounds(null, msgs);
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch(featureID) {
+		case DGPackage.IMAGE__BOUNDS:
+			return basicSetBounds(null, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case DGPackage.IMAGE__SOURCE:
-				return getSource();
-			case DGPackage.IMAGE__BOUNDS:
-				return getBounds();
-			case DGPackage.IMAGE__IS_ASPECT_RATIO_PRESERVED:
-				return isAspectRatioPreserved();
+		switch(featureID) {
+		case DGPackage.IMAGE__SOURCE:
+			return getSource();
+		case DGPackage.IMAGE__BOUNDS:
+			return getBounds();
+		case DGPackage.IMAGE__IS_ASPECT_RATIO_PRESERVED:
+			return isAspectRatioPreserved();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case DGPackage.IMAGE__SOURCE:
-				setSource((String)newValue);
-				return;
-			case DGPackage.IMAGE__BOUNDS:
-				setBounds((Bounds)newValue);
-				return;
-			case DGPackage.IMAGE__IS_ASPECT_RATIO_PRESERVED:
-				setIsAspectRatioPreserved((Boolean)newValue);
-				return;
+		switch(featureID) {
+		case DGPackage.IMAGE__SOURCE:
+			setSource((String)newValue);
+			return;
+		case DGPackage.IMAGE__BOUNDS:
+			setBounds((Bounds)newValue);
+			return;
+		case DGPackage.IMAGE__IS_ASPECT_RATIO_PRESERVED:
+			setIsAspectRatioPreserved((Boolean)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case DGPackage.IMAGE__SOURCE:
-				setSource(SOURCE_EDEFAULT);
-				return;
-			case DGPackage.IMAGE__BOUNDS:
-				setBounds((Bounds)null);
-				return;
-			case DGPackage.IMAGE__IS_ASPECT_RATIO_PRESERVED:
-				setIsAspectRatioPreserved(IS_ASPECT_RATIO_PRESERVED_EDEFAULT);
-				return;
+		switch(featureID) {
+		case DGPackage.IMAGE__SOURCE:
+			setSource(SOURCE_EDEFAULT);
+			return;
+		case DGPackage.IMAGE__BOUNDS:
+			setBounds((Bounds)null);
+			return;
+		case DGPackage.IMAGE__IS_ASPECT_RATIO_PRESERVED:
+			setIsAspectRatioPreserved(IS_ASPECT_RATIO_PRESERVED_EDEFAULT);
+			return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case DGPackage.IMAGE__SOURCE:
-				return SOURCE_EDEFAULT == null ? source != null : !SOURCE_EDEFAULT.equals(source);
-			case DGPackage.IMAGE__BOUNDS:
-				return bounds != null;
-			case DGPackage.IMAGE__IS_ASPECT_RATIO_PRESERVED:
-				return isAspectRatioPreserved != IS_ASPECT_RATIO_PRESERVED_EDEFAULT;
+		switch(featureID) {
+		case DGPackage.IMAGE__SOURCE:
+			return SOURCE_EDEFAULT == null ? source != null : !SOURCE_EDEFAULT.equals(source);
+		case DGPackage.IMAGE__BOUNDS:
+			return bounds != null;
+		case DGPackage.IMAGE__IS_ASPECT_RATIO_PRESERVED:
+			return isAspectRatioPreserved != IS_ASPECT_RATIO_PRESERVED_EDEFAULT;
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	@SuppressWarnings("unchecked")
-	public Object eInvoke(int operationID, EList<?> arguments)
-			throws InvocationTargetException {
-		switch (operationID) {
-			case DGPackage.IMAGE___SOURCE_CANNOT_BE_EMPTY__DIAGNOSTICCHAIN_MAP:
-				return sourceCannotBeEmpty((DiagnosticChain)arguments.get(0), (Map<Object, Object>)arguments.get(1));
+	public Object eInvoke(int operationID, EList<?> arguments) throws InvocationTargetException {
+		switch(operationID) {
+		case DGPackage.IMAGE___SOURCE_CANNOT_BE_EMPTY__DIAGNOSTICCHAIN_MAP:
+			return sourceCannotBeEmpty((DiagnosticChain)arguments.get(0), (Map<Object, Object>)arguments.get(1));
 		}
 		return super.eInvoke(operationID, arguments);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) return super.toString();
-
+		if(eIsProxy())
+			return super.toString();
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (source: ");
 		result.append(source);
@@ -340,5 +348,4 @@ public class ImageImpl extends GraphicalElementImpl implements Image {
 		result.append(')');
 		return result.toString();
 	}
-
 } // ImageImpl
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/LineImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/LineImpl.java
index 229f39924a8..35d341944fa 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/LineImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/LineImpl.java
@@ -25,22 +25,23 @@ import org.eclipse.papyrus.dd.dg.DGPackage;
 import org.eclipse.papyrus.dd.dg.Line;
 
 /**
- * <!-- begin-user-doc --> An implementation of the model object '
- * <em><b>Line</b></em>'. <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object ' <em><b>Line</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.dd.dg.impl.LineImpl#getStart <em>Start</em>}</li>
- *   <li>{@link org.eclipse.papyrus.dd.dg.impl.LineImpl#getEnd <em>End</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.impl.LineImpl#getStart <em>Start</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.impl.LineImpl#getEnd <em>End</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class LineImpl extends MarkedElementImpl implements Line {
+
 	/**
 	 * The cached value of the '{@link #getStart() <em>Start</em>}' containment reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getStart()
 	 * @generated
 	 * @ordered
@@ -50,6 +51,7 @@ public class LineImpl extends MarkedElementImpl implements Line {
 	/**
 	 * The cached value of the '{@link #getEnd() <em>End</em>}' containment reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getEnd()
 	 * @generated
 	 * @ordered
@@ -58,6 +60,7 @@ public class LineImpl extends MarkedElementImpl implements Line {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected LineImpl() {
@@ -66,6 +69,7 @@ public class LineImpl extends MarkedElementImpl implements Line {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -75,6 +79,7 @@ public class LineImpl extends MarkedElementImpl implements Line {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Point getStart() {
@@ -83,39 +88,44 @@ public class LineImpl extends MarkedElementImpl implements Line {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public NotificationChain basicSetStart(Point newStart,
-			NotificationChain msgs) {
+	public NotificationChain basicSetStart(Point newStart, NotificationChain msgs) {
 		Point oldStart = start;
 		start = newStart;
-		if (eNotificationRequired()) {
+		if(eNotificationRequired()) {
 			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, DGPackage.LINE__START, oldStart, newStart);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
+			if(msgs == null)
+				msgs = notification;
+			else
+				msgs.add(notification);
 		}
 		return msgs;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setStart(Point newStart) {
-		if (newStart != start) {
+		if(newStart != start) {
 			NotificationChain msgs = null;
-			if (start != null)
+			if(start != null)
 				msgs = ((InternalEObject)start).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - DGPackage.LINE__START, null, msgs);
-			if (newStart != null)
+			if(newStart != null)
 				msgs = ((InternalEObject)newStart).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - DGPackage.LINE__START, null, msgs);
 			msgs = basicSetStart(newStart, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
+			if(msgs != null)
+				msgs.dispatch();
+		} else if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.LINE__START, newStart, newStart));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Point getEnd() {
@@ -124,114 +134,122 @@ public class LineImpl extends MarkedElementImpl implements Line {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NotificationChain basicSetEnd(Point newEnd, NotificationChain msgs) {
 		Point oldEnd = end;
 		end = newEnd;
-		if (eNotificationRequired()) {
+		if(eNotificationRequired()) {
 			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, DGPackage.LINE__END, oldEnd, newEnd);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
+			if(msgs == null)
+				msgs = notification;
+			else
+				msgs.add(notification);
 		}
 		return msgs;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setEnd(Point newEnd) {
-		if (newEnd != end) {
+		if(newEnd != end) {
 			NotificationChain msgs = null;
-			if (end != null)
+			if(end != null)
 				msgs = ((InternalEObject)end).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - DGPackage.LINE__END, null, msgs);
-			if (newEnd != null)
+			if(newEnd != null)
 				msgs = ((InternalEObject)newEnd).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - DGPackage.LINE__END, null, msgs);
 			msgs = basicSetEnd(newEnd, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
+			if(msgs != null)
+				msgs.dispatch();
+		} else if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.LINE__END, newEnd, newEnd));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd,
-			int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case DGPackage.LINE__START:
-				return basicSetStart(null, msgs);
-			case DGPackage.LINE__END:
-				return basicSetEnd(null, msgs);
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch(featureID) {
+		case DGPackage.LINE__START:
+			return basicSetStart(null, msgs);
+		case DGPackage.LINE__END:
+			return basicSetEnd(null, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case DGPackage.LINE__START:
-				return getStart();
-			case DGPackage.LINE__END:
-				return getEnd();
+		switch(featureID) {
+		case DGPackage.LINE__START:
+			return getStart();
+		case DGPackage.LINE__END:
+			return getEnd();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case DGPackage.LINE__START:
-				setStart((Point)newValue);
-				return;
-			case DGPackage.LINE__END:
-				setEnd((Point)newValue);
-				return;
+		switch(featureID) {
+		case DGPackage.LINE__START:
+			setStart((Point)newValue);
+			return;
+		case DGPackage.LINE__END:
+			setEnd((Point)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case DGPackage.LINE__START:
-				setStart((Point)null);
-				return;
-			case DGPackage.LINE__END:
-				setEnd((Point)null);
-				return;
+		switch(featureID) {
+		case DGPackage.LINE__START:
+			setStart((Point)null);
+			return;
+		case DGPackage.LINE__END:
+			setEnd((Point)null);
+			return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case DGPackage.LINE__START:
-				return start != null;
-			case DGPackage.LINE__END:
-				return end != null;
+		switch(featureID) {
+		case DGPackage.LINE__START:
+			return start != null;
+		case DGPackage.LINE__END:
+			return end != null;
 		}
 		return super.eIsSet(featureID);
 	}
-
 } // LineImpl
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/LineToImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/LineToImpl.java
index 9194837e80d..84cd8374e4f 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/LineToImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/LineToImpl.java
@@ -25,21 +25,22 @@ import org.eclipse.papyrus.dd.dg.DGPackage;
 import org.eclipse.papyrus.dd.dg.LineTo;
 
 /**
- * <!-- begin-user-doc --> An implementation of the model object '
- * <em><b>Line To</b></em>'. <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object ' <em><b>Line To</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.dd.dg.impl.LineToImpl#getPoint <em>Point</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.impl.LineToImpl#getPoint <em>Point</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class LineToImpl extends PathCommandImpl implements LineTo {
+
 	/**
 	 * The cached value of the '{@link #getPoint() <em>Point</em>}' containment reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getPoint()
 	 * @generated
 	 * @ordered
@@ -48,6 +49,7 @@ public class LineToImpl extends PathCommandImpl implements LineTo {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected LineToImpl() {
@@ -56,6 +58,7 @@ public class LineToImpl extends PathCommandImpl implements LineTo {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -65,6 +68,7 @@ public class LineToImpl extends PathCommandImpl implements LineTo {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Point getPoint() {
@@ -73,103 +77,110 @@ public class LineToImpl extends PathCommandImpl implements LineTo {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public NotificationChain basicSetPoint(Point newPoint,
-			NotificationChain msgs) {
+	public NotificationChain basicSetPoint(Point newPoint, NotificationChain msgs) {
 		Point oldPoint = point;
 		point = newPoint;
-		if (eNotificationRequired()) {
+		if(eNotificationRequired()) {
 			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, DGPackage.LINE_TO__POINT, oldPoint, newPoint);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
+			if(msgs == null)
+				msgs = notification;
+			else
+				msgs.add(notification);
 		}
 		return msgs;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setPoint(Point newPoint) {
-		if (newPoint != point) {
+		if(newPoint != point) {
 			NotificationChain msgs = null;
-			if (point != null)
+			if(point != null)
 				msgs = ((InternalEObject)point).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - DGPackage.LINE_TO__POINT, null, msgs);
-			if (newPoint != null)
+			if(newPoint != null)
 				msgs = ((InternalEObject)newPoint).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - DGPackage.LINE_TO__POINT, null, msgs);
 			msgs = basicSetPoint(newPoint, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
+			if(msgs != null)
+				msgs.dispatch();
+		} else if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.LINE_TO__POINT, newPoint, newPoint));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd,
-			int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case DGPackage.LINE_TO__POINT:
-				return basicSetPoint(null, msgs);
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch(featureID) {
+		case DGPackage.LINE_TO__POINT:
+			return basicSetPoint(null, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case DGPackage.LINE_TO__POINT:
-				return getPoint();
+		switch(featureID) {
+		case DGPackage.LINE_TO__POINT:
+			return getPoint();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case DGPackage.LINE_TO__POINT:
-				setPoint((Point)newValue);
-				return;
+		switch(featureID) {
+		case DGPackage.LINE_TO__POINT:
+			setPoint((Point)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case DGPackage.LINE_TO__POINT:
-				setPoint((Point)null);
-				return;
+		switch(featureID) {
+		case DGPackage.LINE_TO__POINT:
+			setPoint((Point)null);
+			return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case DGPackage.LINE_TO__POINT:
-				return point != null;
+		switch(featureID) {
+		case DGPackage.LINE_TO__POINT:
+			return point != null;
 		}
 		return super.eIsSet(featureID);
 	}
-
 } // LineToImpl
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/LinearGradientImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/LinearGradientImpl.java
index 68c03105a5c..4650dfb4313 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/LinearGradientImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/LinearGradientImpl.java
@@ -34,22 +34,23 @@ import org.eclipse.papyrus.dd.dg.LinearGradient;
 import org.eclipse.papyrus.dd.dg.util.DGValidator;
 
 /**
- * <!-- begin-user-doc --> An implementation of the model object '
- * <em><b>Linear Gradient</b></em>'. <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object ' <em><b>Linear Gradient</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.dd.dg.impl.LinearGradientImpl#getStart <em>Start</em>}</li>
- *   <li>{@link org.eclipse.papyrus.dd.dg.impl.LinearGradientImpl#getEnd <em>End</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.impl.LinearGradientImpl#getStart <em>Start</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.impl.LinearGradientImpl#getEnd <em>End</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class LinearGradientImpl extends GradientImpl implements LinearGradient {
+
 	/**
 	 * The cached value of the '{@link #getStart() <em>Start</em>}' containment reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getStart()
 	 * @generated
 	 * @ordered
@@ -59,6 +60,7 @@ public class LinearGradientImpl extends GradientImpl implements LinearGradient {
 	/**
 	 * The cached value of the '{@link #getEnd() <em>End</em>}' containment reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getEnd()
 	 * @generated
 	 * @ordered
@@ -67,6 +69,7 @@ public class LinearGradientImpl extends GradientImpl implements LinearGradient {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected LinearGradientImpl() {
@@ -75,6 +78,7 @@ public class LinearGradientImpl extends GradientImpl implements LinearGradient {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -84,6 +88,7 @@ public class LinearGradientImpl extends GradientImpl implements LinearGradient {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Point getStart() {
@@ -92,39 +97,44 @@ public class LinearGradientImpl extends GradientImpl implements LinearGradient {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public NotificationChain basicSetStart(Point newStart,
-			NotificationChain msgs) {
+	public NotificationChain basicSetStart(Point newStart, NotificationChain msgs) {
 		Point oldStart = start;
 		start = newStart;
-		if (eNotificationRequired()) {
+		if(eNotificationRequired()) {
 			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, DGPackage.LINEAR_GRADIENT__START, oldStart, newStart);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
+			if(msgs == null)
+				msgs = notification;
+			else
+				msgs.add(notification);
 		}
 		return msgs;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setStart(Point newStart) {
-		if (newStart != start) {
+		if(newStart != start) {
 			NotificationChain msgs = null;
-			if (start != null)
+			if(start != null)
 				msgs = ((InternalEObject)start).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - DGPackage.LINEAR_GRADIENT__START, null, msgs);
-			if (newStart != null)
+			if(newStart != null)
 				msgs = ((InternalEObject)newStart).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - DGPackage.LINEAR_GRADIENT__START, null, msgs);
 			msgs = basicSetStart(newStart, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
+			if(msgs != null)
+				msgs.dispatch();
+		} else if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.LINEAR_GRADIENT__START, newStart, newStart));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Point getEnd() {
@@ -133,40 +143,47 @@ public class LinearGradientImpl extends GradientImpl implements LinearGradient {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NotificationChain basicSetEnd(Point newEnd, NotificationChain msgs) {
 		Point oldEnd = end;
 		end = newEnd;
-		if (eNotificationRequired()) {
+		if(eNotificationRequired()) {
 			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, DGPackage.LINEAR_GRADIENT__END, oldEnd, newEnd);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
+			if(msgs == null)
+				msgs = notification;
+			else
+				msgs.add(notification);
 		}
 		return msgs;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setEnd(Point newEnd) {
-		if (newEnd != end) {
+		if(newEnd != end) {
 			NotificationChain msgs = null;
-			if (end != null)
+			if(end != null)
 				msgs = ((InternalEObject)end).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - DGPackage.LINEAR_GRADIENT__END, null, msgs);
-			if (newEnd != null)
+			if(newEnd != null)
 				msgs = ((InternalEObject)newEnd).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - DGPackage.LINEAR_GRADIENT__END, null, msgs);
 			msgs = basicSetEnd(newEnd, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
+			if(msgs != null)
+				msgs.dispatch();
+		} else if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.LINEAR_GRADIENT__END, newEnd, newEnd));
 	}
 
 	/**
-	 * The cached validation expression for the '{@link #validGradientVector(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Valid Gradient Vector</em>}' invariant operation.
+	 * The cached validation expression for the '{@link #validGradientVector(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
+	 * <em>Valid Gradient Vector</em>}' invariant operation.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @see #validGradientVector(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
 	 * @generated
 	 * @ordered
@@ -175,117 +192,109 @@ public class LinearGradientImpl extends GradientImpl implements LinearGradient {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public boolean validGradientVector(DiagnosticChain diagnostics,
-			Map<Object, Object> context) {
-		return
-			DGValidator.validate
-				(DGPackage.Literals.LINEAR_GRADIENT,
-				 this,
-				 diagnostics,
-				 context,
-				 "http://www.eclipse.org/emf/2002/Ecore/OCL",
-				 DGPackage.Literals.LINEAR_GRADIENT___VALID_GRADIENT_VECTOR__DIAGNOSTICCHAIN_MAP,
-				 VALID_GRADIENT_VECTOR_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION,
-				 Diagnostic.ERROR,
-				 DGValidator.DIAGNOSTIC_SOURCE,
-				 DGValidator.LINEAR_GRADIENT__VALID_GRADIENT_VECTOR);
+	public boolean validGradientVector(DiagnosticChain diagnostics, Map<Object, Object> context) {
+		return DGValidator.validate(DGPackage.Literals.LINEAR_GRADIENT, this, diagnostics, context, "http://www.eclipse.org/emf/2002/Ecore/OCL", DGPackage.Literals.LINEAR_GRADIENT___VALID_GRADIENT_VECTOR__DIAGNOSTICCHAIN_MAP, VALID_GRADIENT_VECTOR_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION, Diagnostic.ERROR, DGValidator.DIAGNOSTIC_SOURCE, DGValidator.LINEAR_GRADIENT__VALID_GRADIENT_VECTOR);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd,
-			int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case DGPackage.LINEAR_GRADIENT__START:
-				return basicSetStart(null, msgs);
-			case DGPackage.LINEAR_GRADIENT__END:
-				return basicSetEnd(null, msgs);
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch(featureID) {
+		case DGPackage.LINEAR_GRADIENT__START:
+			return basicSetStart(null, msgs);
+		case DGPackage.LINEAR_GRADIENT__END:
+			return basicSetEnd(null, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case DGPackage.LINEAR_GRADIENT__START:
-				return getStart();
-			case DGPackage.LINEAR_GRADIENT__END:
-				return getEnd();
+		switch(featureID) {
+		case DGPackage.LINEAR_GRADIENT__START:
+			return getStart();
+		case DGPackage.LINEAR_GRADIENT__END:
+			return getEnd();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case DGPackage.LINEAR_GRADIENT__START:
-				setStart((Point)newValue);
-				return;
-			case DGPackage.LINEAR_GRADIENT__END:
-				setEnd((Point)newValue);
-				return;
+		switch(featureID) {
+		case DGPackage.LINEAR_GRADIENT__START:
+			setStart((Point)newValue);
+			return;
+		case DGPackage.LINEAR_GRADIENT__END:
+			setEnd((Point)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case DGPackage.LINEAR_GRADIENT__START:
-				setStart((Point)null);
-				return;
-			case DGPackage.LINEAR_GRADIENT__END:
-				setEnd((Point)null);
-				return;
+		switch(featureID) {
+		case DGPackage.LINEAR_GRADIENT__START:
+			setStart((Point)null);
+			return;
+		case DGPackage.LINEAR_GRADIENT__END:
+			setEnd((Point)null);
+			return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case DGPackage.LINEAR_GRADIENT__START:
-				return start != null;
-			case DGPackage.LINEAR_GRADIENT__END:
-				return end != null;
+		switch(featureID) {
+		case DGPackage.LINEAR_GRADIENT__START:
+			return start != null;
+		case DGPackage.LINEAR_GRADIENT__END:
+			return end != null;
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	@SuppressWarnings("unchecked")
-	public Object eInvoke(int operationID, EList<?> arguments)
-			throws InvocationTargetException {
-		switch (operationID) {
-			case DGPackage.LINEAR_GRADIENT___VALID_GRADIENT_VECTOR__DIAGNOSTICCHAIN_MAP:
-				return validGradientVector((DiagnosticChain)arguments.get(0), (Map<Object, Object>)arguments.get(1));
+	public Object eInvoke(int operationID, EList<?> arguments) throws InvocationTargetException {
+		switch(operationID) {
+		case DGPackage.LINEAR_GRADIENT___VALID_GRADIENT_VECTOR__DIAGNOSTICCHAIN_MAP:
+			return validGradientVector((DiagnosticChain)arguments.get(0), (Map<Object, Object>)arguments.get(1));
 		}
 		return super.eInvoke(operationID, arguments);
 	}
-
 } // LinearGradientImpl
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/MarkedElementImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/MarkedElementImpl.java
index ac595fdf9ab..c60f3e58ce1 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/MarkedElementImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/MarkedElementImpl.java
@@ -29,24 +29,24 @@ import org.eclipse.papyrus.dd.dg.Marker;
 import org.eclipse.papyrus.dd.dg.util.DGValidator;
 
 /**
- * <!-- begin-user-doc --> An implementation of the model object '
- * <em><b>Marked Element</b></em>'. <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object ' <em><b>Marked Element</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.dd.dg.impl.MarkedElementImpl#getEndMarker <em>End Marker</em>}</li>
- *   <li>{@link org.eclipse.papyrus.dd.dg.impl.MarkedElementImpl#getMidMarker <em>Mid Marker</em>}</li>
- *   <li>{@link org.eclipse.papyrus.dd.dg.impl.MarkedElementImpl#getStartMarker <em>Start Marker</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.impl.MarkedElementImpl#getEndMarker <em>End Marker</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.impl.MarkedElementImpl#getMidMarker <em>Mid Marker</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.impl.MarkedElementImpl#getStartMarker <em>Start Marker</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
-public abstract class MarkedElementImpl extends GraphicalElementImpl implements
-		MarkedElement {
+public abstract class MarkedElementImpl extends GraphicalElementImpl implements MarkedElement {
+
 	/**
 	 * The cached value of the '{@link #getEndMarker() <em>End Marker</em>}' reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getEndMarker()
 	 * @generated
 	 * @ordered
@@ -56,6 +56,7 @@ public abstract class MarkedElementImpl extends GraphicalElementImpl implements
 	/**
 	 * The cached value of the '{@link #getMidMarker() <em>Mid Marker</em>}' reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getMidMarker()
 	 * @generated
 	 * @ordered
@@ -65,6 +66,7 @@ public abstract class MarkedElementImpl extends GraphicalElementImpl implements
 	/**
 	 * The cached value of the '{@link #getStartMarker() <em>Start Marker</em>}' reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getStartMarker()
 	 * @generated
 	 * @ordered
@@ -73,6 +75,7 @@ public abstract class MarkedElementImpl extends GraphicalElementImpl implements
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected MarkedElementImpl() {
@@ -81,6 +84,7 @@ public abstract class MarkedElementImpl extends GraphicalElementImpl implements
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -90,14 +94,15 @@ public abstract class MarkedElementImpl extends GraphicalElementImpl implements
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Marker getEndMarker() {
-		if (endMarker != null && endMarker.eIsProxy()) {
+		if(endMarker != null && endMarker.eIsProxy()) {
 			InternalEObject oldEndMarker = (InternalEObject)endMarker;
 			endMarker = (Marker)eResolveProxy(oldEndMarker);
-			if (endMarker != oldEndMarker) {
-				if (eNotificationRequired())
+			if(endMarker != oldEndMarker) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, DGPackage.MARKED_ELEMENT__END_MARKER, oldEndMarker, endMarker));
 			}
 		}
@@ -106,6 +111,7 @@ public abstract class MarkedElementImpl extends GraphicalElementImpl implements
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Marker basicGetEndMarker() {
@@ -114,25 +120,27 @@ public abstract class MarkedElementImpl extends GraphicalElementImpl implements
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setEndMarker(Marker newEndMarker) {
 		Marker oldEndMarker = endMarker;
 		endMarker = newEndMarker;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.MARKED_ELEMENT__END_MARKER, oldEndMarker, endMarker));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Marker getMidMarker() {
-		if (midMarker != null && midMarker.eIsProxy()) {
+		if(midMarker != null && midMarker.eIsProxy()) {
 			InternalEObject oldMidMarker = (InternalEObject)midMarker;
 			midMarker = (Marker)eResolveProxy(oldMidMarker);
-			if (midMarker != oldMidMarker) {
-				if (eNotificationRequired())
+			if(midMarker != oldMidMarker) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, DGPackage.MARKED_ELEMENT__MID_MARKER, oldMidMarker, midMarker));
 			}
 		}
@@ -141,6 +149,7 @@ public abstract class MarkedElementImpl extends GraphicalElementImpl implements
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Marker basicGetMidMarker() {
@@ -149,25 +158,27 @@ public abstract class MarkedElementImpl extends GraphicalElementImpl implements
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setMidMarker(Marker newMidMarker) {
 		Marker oldMidMarker = midMarker;
 		midMarker = newMidMarker;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.MARKED_ELEMENT__MID_MARKER, oldMidMarker, midMarker));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Marker getStartMarker() {
-		if (startMarker != null && startMarker.eIsProxy()) {
+		if(startMarker != null && startMarker.eIsProxy()) {
 			InternalEObject oldStartMarker = (InternalEObject)startMarker;
 			startMarker = (Marker)eResolveProxy(oldStartMarker);
-			if (startMarker != oldStartMarker) {
-				if (eNotificationRequired())
+			if(startMarker != oldStartMarker) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, DGPackage.MARKED_ELEMENT__START_MARKER, oldStartMarker, startMarker));
 			}
 		}
@@ -176,6 +187,7 @@ public abstract class MarkedElementImpl extends GraphicalElementImpl implements
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Marker basicGetStartMarker() {
@@ -184,23 +196,22 @@ public abstract class MarkedElementImpl extends GraphicalElementImpl implements
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setStartMarker(Marker newStartMarker) {
 		Marker oldStartMarker = startMarker;
 		startMarker = newStartMarker;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.MARKED_ELEMENT__START_MARKER, oldStartMarker, startMarker));
 	}
 
 	/**
-	 * The cached validation expression for the '
-	 * {@link #referencedStartMarkerHasId(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
+	 * The cached validation expression for the ' {@link #referencedStartMarkerHasId(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
 	 * <em>Referenced Start Marker Has Id</em>}' invariant operation. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
-	 * @see #referencedStartMarkerHasId(org.eclipse.emf.common.util.DiagnosticChain,
-	 *      java.util.Map)
+	 * @see #referencedStartMarkerHasId(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
 	 * @generated
 	 * @ordered
 	 */
@@ -208,32 +219,19 @@ public abstract class MarkedElementImpl extends GraphicalElementImpl implements
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public boolean referencedStartMarkerHasId(DiagnosticChain diagnostics,
-			Map<Object, Object> context) {
-		return
-			DGValidator.validate
-				(DGPackage.Literals.MARKED_ELEMENT,
-				 this,
-				 diagnostics,
-				 context,
-				 "http://www.eclipse.org/emf/2002/Ecore/OCL",
-				 DGPackage.Literals.MARKED_ELEMENT___REFERENCED_START_MARKER_HAS_ID__DIAGNOSTICCHAIN_MAP,
-				 REFERENCED_START_MARKER_HAS_ID_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION,
-				 Diagnostic.ERROR,
-				 DGValidator.DIAGNOSTIC_SOURCE,
-				 DGValidator.MARKED_ELEMENT__REFERENCED_START_MARKER_HAS_ID);
+	public boolean referencedStartMarkerHasId(DiagnosticChain diagnostics, Map<Object, Object> context) {
+		return DGValidator.validate(DGPackage.Literals.MARKED_ELEMENT, this, diagnostics, context, "http://www.eclipse.org/emf/2002/Ecore/OCL", DGPackage.Literals.MARKED_ELEMENT___REFERENCED_START_MARKER_HAS_ID__DIAGNOSTICCHAIN_MAP, REFERENCED_START_MARKER_HAS_ID_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION, Diagnostic.ERROR, DGValidator.DIAGNOSTIC_SOURCE, DGValidator.MARKED_ELEMENT__REFERENCED_START_MARKER_HAS_ID);
 	}
 
 	/**
-	 * The cached validation expression for the '
-	 * {@link #referencedMidMarkerHasId(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
+	 * The cached validation expression for the ' {@link #referencedMidMarkerHasId(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
 	 * <em>Referenced Mid Marker Has Id</em>}' invariant operation. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
-	 * @see #referencedMidMarkerHasId(org.eclipse.emf.common.util.DiagnosticChain,
-	 *      java.util.Map)
+	 * @see #referencedMidMarkerHasId(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
 	 * @generated
 	 * @ordered
 	 */
@@ -241,32 +239,19 @@ public abstract class MarkedElementImpl extends GraphicalElementImpl implements
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public boolean referencedMidMarkerHasId(DiagnosticChain diagnostics,
-			Map<Object, Object> context) {
-		return
-			DGValidator.validate
-				(DGPackage.Literals.MARKED_ELEMENT,
-				 this,
-				 diagnostics,
-				 context,
-				 "http://www.eclipse.org/emf/2002/Ecore/OCL",
-				 DGPackage.Literals.MARKED_ELEMENT___REFERENCED_MID_MARKER_HAS_ID__DIAGNOSTICCHAIN_MAP,
-				 REFERENCED_MID_MARKER_HAS_ID_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION,
-				 Diagnostic.ERROR,
-				 DGValidator.DIAGNOSTIC_SOURCE,
-				 DGValidator.MARKED_ELEMENT__REFERENCED_MID_MARKER_HAS_ID);
+	public boolean referencedMidMarkerHasId(DiagnosticChain diagnostics, Map<Object, Object> context) {
+		return DGValidator.validate(DGPackage.Literals.MARKED_ELEMENT, this, diagnostics, context, "http://www.eclipse.org/emf/2002/Ecore/OCL", DGPackage.Literals.MARKED_ELEMENT___REFERENCED_MID_MARKER_HAS_ID__DIAGNOSTICCHAIN_MAP, REFERENCED_MID_MARKER_HAS_ID_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION, Diagnostic.ERROR, DGValidator.DIAGNOSTIC_SOURCE, DGValidator.MARKED_ELEMENT__REFERENCED_MID_MARKER_HAS_ID);
 	}
 
 	/**
-	 * The cached validation expression for the '
-	 * {@link #referencedEndMarkerHasId(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
+	 * The cached validation expression for the ' {@link #referencedEndMarkerHasId(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
 	 * <em>Referenced End Marker Has Id</em>}' invariant operation. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
-	 * @see #referencedEndMarkerHasId(org.eclipse.emf.common.util.DiagnosticChain,
-	 *      java.util.Map)
+	 * @see #referencedEndMarkerHasId(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
 	 * @generated
 	 * @ordered
 	 */
@@ -274,118 +259,113 @@ public abstract class MarkedElementImpl extends GraphicalElementImpl implements
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public boolean referencedEndMarkerHasId(DiagnosticChain diagnostics,
-			Map<Object, Object> context) {
-		return
-			DGValidator.validate
-				(DGPackage.Literals.MARKED_ELEMENT,
-				 this,
-				 diagnostics,
-				 context,
-				 "http://www.eclipse.org/emf/2002/Ecore/OCL",
-				 DGPackage.Literals.MARKED_ELEMENT___REFERENCED_END_MARKER_HAS_ID__DIAGNOSTICCHAIN_MAP,
-				 REFERENCED_END_MARKER_HAS_ID_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION,
-				 Diagnostic.ERROR,
-				 DGValidator.DIAGNOSTIC_SOURCE,
-				 DGValidator.MARKED_ELEMENT__REFERENCED_END_MARKER_HAS_ID);
+	public boolean referencedEndMarkerHasId(DiagnosticChain diagnostics, Map<Object, Object> context) {
+		return DGValidator.validate(DGPackage.Literals.MARKED_ELEMENT, this, diagnostics, context, "http://www.eclipse.org/emf/2002/Ecore/OCL", DGPackage.Literals.MARKED_ELEMENT___REFERENCED_END_MARKER_HAS_ID__DIAGNOSTICCHAIN_MAP, REFERENCED_END_MARKER_HAS_ID_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION, Diagnostic.ERROR, DGValidator.DIAGNOSTIC_SOURCE, DGValidator.MARKED_ELEMENT__REFERENCED_END_MARKER_HAS_ID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case DGPackage.MARKED_ELEMENT__END_MARKER:
-				if (resolve) return getEndMarker();
-				return basicGetEndMarker();
-			case DGPackage.MARKED_ELEMENT__MID_MARKER:
-				if (resolve) return getMidMarker();
-				return basicGetMidMarker();
-			case DGPackage.MARKED_ELEMENT__START_MARKER:
-				if (resolve) return getStartMarker();
-				return basicGetStartMarker();
+		switch(featureID) {
+		case DGPackage.MARKED_ELEMENT__END_MARKER:
+			if(resolve)
+				return getEndMarker();
+			return basicGetEndMarker();
+		case DGPackage.MARKED_ELEMENT__MID_MARKER:
+			if(resolve)
+				return getMidMarker();
+			return basicGetMidMarker();
+		case DGPackage.MARKED_ELEMENT__START_MARKER:
+			if(resolve)
+				return getStartMarker();
+			return basicGetStartMarker();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case DGPackage.MARKED_ELEMENT__END_MARKER:
-				setEndMarker((Marker)newValue);
-				return;
-			case DGPackage.MARKED_ELEMENT__MID_MARKER:
-				setMidMarker((Marker)newValue);
-				return;
-			case DGPackage.MARKED_ELEMENT__START_MARKER:
-				setStartMarker((Marker)newValue);
-				return;
+		switch(featureID) {
+		case DGPackage.MARKED_ELEMENT__END_MARKER:
+			setEndMarker((Marker)newValue);
+			return;
+		case DGPackage.MARKED_ELEMENT__MID_MARKER:
+			setMidMarker((Marker)newValue);
+			return;
+		case DGPackage.MARKED_ELEMENT__START_MARKER:
+			setStartMarker((Marker)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case DGPackage.MARKED_ELEMENT__END_MARKER:
-				setEndMarker((Marker)null);
-				return;
-			case DGPackage.MARKED_ELEMENT__MID_MARKER:
-				setMidMarker((Marker)null);
-				return;
-			case DGPackage.MARKED_ELEMENT__START_MARKER:
-				setStartMarker((Marker)null);
-				return;
+		switch(featureID) {
+		case DGPackage.MARKED_ELEMENT__END_MARKER:
+			setEndMarker((Marker)null);
+			return;
+		case DGPackage.MARKED_ELEMENT__MID_MARKER:
+			setMidMarker((Marker)null);
+			return;
+		case DGPackage.MARKED_ELEMENT__START_MARKER:
+			setStartMarker((Marker)null);
+			return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case DGPackage.MARKED_ELEMENT__END_MARKER:
-				return endMarker != null;
-			case DGPackage.MARKED_ELEMENT__MID_MARKER:
-				return midMarker != null;
-			case DGPackage.MARKED_ELEMENT__START_MARKER:
-				return startMarker != null;
+		switch(featureID) {
+		case DGPackage.MARKED_ELEMENT__END_MARKER:
+			return endMarker != null;
+		case DGPackage.MARKED_ELEMENT__MID_MARKER:
+			return midMarker != null;
+		case DGPackage.MARKED_ELEMENT__START_MARKER:
+			return startMarker != null;
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	@SuppressWarnings("unchecked")
-	public Object eInvoke(int operationID, EList<?> arguments)
-			throws InvocationTargetException {
-		switch (operationID) {
-			case DGPackage.MARKED_ELEMENT___REFERENCED_START_MARKER_HAS_ID__DIAGNOSTICCHAIN_MAP:
-				return referencedStartMarkerHasId((DiagnosticChain)arguments.get(0), (Map<Object, Object>)arguments.get(1));
-			case DGPackage.MARKED_ELEMENT___REFERENCED_MID_MARKER_HAS_ID__DIAGNOSTICCHAIN_MAP:
-				return referencedMidMarkerHasId((DiagnosticChain)arguments.get(0), (Map<Object, Object>)arguments.get(1));
-			case DGPackage.MARKED_ELEMENT___REFERENCED_END_MARKER_HAS_ID__DIAGNOSTICCHAIN_MAP:
-				return referencedEndMarkerHasId((DiagnosticChain)arguments.get(0), (Map<Object, Object>)arguments.get(1));
+	public Object eInvoke(int operationID, EList<?> arguments) throws InvocationTargetException {
+		switch(operationID) {
+		case DGPackage.MARKED_ELEMENT___REFERENCED_START_MARKER_HAS_ID__DIAGNOSTICCHAIN_MAP:
+			return referencedStartMarkerHasId((DiagnosticChain)arguments.get(0), (Map<Object, Object>)arguments.get(1));
+		case DGPackage.MARKED_ELEMENT___REFERENCED_MID_MARKER_HAS_ID__DIAGNOSTICCHAIN_MAP:
+			return referencedMidMarkerHasId((DiagnosticChain)arguments.get(0), (Map<Object, Object>)arguments.get(1));
+		case DGPackage.MARKED_ELEMENT___REFERENCED_END_MARKER_HAS_ID__DIAGNOSTICCHAIN_MAP:
+			return referencedEndMarkerHasId((DiagnosticChain)arguments.get(0), (Map<Object, Object>)arguments.get(1));
 		}
 		return super.eInvoke(operationID, arguments);
 	}
-
 } // MarkedElementImpl
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/MarkerImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/MarkerImpl.java
index 8f99c1e14dc..29754c44181 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/MarkerImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/MarkerImpl.java
@@ -26,22 +26,23 @@ import org.eclipse.papyrus.dd.dg.DGPackage;
 import org.eclipse.papyrus.dd.dg.Marker;
 
 /**
- * <!-- begin-user-doc --> An implementation of the model object '
- * <em><b>Marker</b></em>'. <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object ' <em><b>Marker</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.dd.dg.impl.MarkerImpl#getSize <em>Size</em>}</li>
- *   <li>{@link org.eclipse.papyrus.dd.dg.impl.MarkerImpl#getReference <em>Reference</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.impl.MarkerImpl#getSize <em>Size</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.impl.MarkerImpl#getReference <em>Reference</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class MarkerImpl extends GroupImpl implements Marker {
+
 	/**
 	 * The cached value of the '{@link #getSize() <em>Size</em>}' containment reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getSize()
 	 * @generated
 	 * @ordered
@@ -51,6 +52,7 @@ public class MarkerImpl extends GroupImpl implements Marker {
 	/**
 	 * The cached value of the '{@link #getReference() <em>Reference</em>}' containment reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getReference()
 	 * @generated
 	 * @ordered
@@ -59,6 +61,7 @@ public class MarkerImpl extends GroupImpl implements Marker {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected MarkerImpl() {
@@ -67,6 +70,7 @@ public class MarkerImpl extends GroupImpl implements Marker {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -76,6 +80,7 @@ public class MarkerImpl extends GroupImpl implements Marker {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Dimension getSize() {
@@ -84,39 +89,44 @@ public class MarkerImpl extends GroupImpl implements Marker {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public NotificationChain basicSetSize(Dimension newSize,
-			NotificationChain msgs) {
+	public NotificationChain basicSetSize(Dimension newSize, NotificationChain msgs) {
 		Dimension oldSize = size;
 		size = newSize;
-		if (eNotificationRequired()) {
+		if(eNotificationRequired()) {
 			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, DGPackage.MARKER__SIZE, oldSize, newSize);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
+			if(msgs == null)
+				msgs = notification;
+			else
+				msgs.add(notification);
 		}
 		return msgs;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setSize(Dimension newSize) {
-		if (newSize != size) {
+		if(newSize != size) {
 			NotificationChain msgs = null;
-			if (size != null)
+			if(size != null)
 				msgs = ((InternalEObject)size).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - DGPackage.MARKER__SIZE, null, msgs);
-			if (newSize != null)
+			if(newSize != null)
 				msgs = ((InternalEObject)newSize).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - DGPackage.MARKER__SIZE, null, msgs);
 			msgs = basicSetSize(newSize, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
+			if(msgs != null)
+				msgs.dispatch();
+		} else if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.MARKER__SIZE, newSize, newSize));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Point getReference() {
@@ -125,115 +135,122 @@ public class MarkerImpl extends GroupImpl implements Marker {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public NotificationChain basicSetReference(Point newReference,
-			NotificationChain msgs) {
+	public NotificationChain basicSetReference(Point newReference, NotificationChain msgs) {
 		Point oldReference = reference;
 		reference = newReference;
-		if (eNotificationRequired()) {
+		if(eNotificationRequired()) {
 			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, DGPackage.MARKER__REFERENCE, oldReference, newReference);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
+			if(msgs == null)
+				msgs = notification;
+			else
+				msgs.add(notification);
 		}
 		return msgs;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setReference(Point newReference) {
-		if (newReference != reference) {
+		if(newReference != reference) {
 			NotificationChain msgs = null;
-			if (reference != null)
+			if(reference != null)
 				msgs = ((InternalEObject)reference).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - DGPackage.MARKER__REFERENCE, null, msgs);
-			if (newReference != null)
+			if(newReference != null)
 				msgs = ((InternalEObject)newReference).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - DGPackage.MARKER__REFERENCE, null, msgs);
 			msgs = basicSetReference(newReference, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
+			if(msgs != null)
+				msgs.dispatch();
+		} else if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.MARKER__REFERENCE, newReference, newReference));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd,
-			int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case DGPackage.MARKER__SIZE:
-				return basicSetSize(null, msgs);
-			case DGPackage.MARKER__REFERENCE:
-				return basicSetReference(null, msgs);
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch(featureID) {
+		case DGPackage.MARKER__SIZE:
+			return basicSetSize(null, msgs);
+		case DGPackage.MARKER__REFERENCE:
+			return basicSetReference(null, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case DGPackage.MARKER__SIZE:
-				return getSize();
-			case DGPackage.MARKER__REFERENCE:
-				return getReference();
+		switch(featureID) {
+		case DGPackage.MARKER__SIZE:
+			return getSize();
+		case DGPackage.MARKER__REFERENCE:
+			return getReference();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case DGPackage.MARKER__SIZE:
-				setSize((Dimension)newValue);
-				return;
-			case DGPackage.MARKER__REFERENCE:
-				setReference((Point)newValue);
-				return;
+		switch(featureID) {
+		case DGPackage.MARKER__SIZE:
+			setSize((Dimension)newValue);
+			return;
+		case DGPackage.MARKER__REFERENCE:
+			setReference((Point)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case DGPackage.MARKER__SIZE:
-				setSize((Dimension)null);
-				return;
-			case DGPackage.MARKER__REFERENCE:
-				setReference((Point)null);
-				return;
+		switch(featureID) {
+		case DGPackage.MARKER__SIZE:
+			setSize((Dimension)null);
+			return;
+		case DGPackage.MARKER__REFERENCE:
+			setReference((Point)null);
+			return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case DGPackage.MARKER__SIZE:
-				return size != null;
-			case DGPackage.MARKER__REFERENCE:
-				return reference != null;
+		switch(featureID) {
+		case DGPackage.MARKER__SIZE:
+			return size != null;
+		case DGPackage.MARKER__REFERENCE:
+			return reference != null;
 		}
 		return super.eIsSet(featureID);
 	}
-
 } // MarkerImpl
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/MatrixImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/MatrixImpl.java
index ea01fdcb707..eb623a0a1e0 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/MatrixImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/MatrixImpl.java
@@ -21,23 +21,23 @@ import org.eclipse.papyrus.dd.dg.DGPackage;
 import org.eclipse.papyrus.dd.dg.Matrix;
 
 /**
- * <!-- begin-user-doc --> An implementation of the model object '
- * <em><b>Matrix</b></em>'. <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object ' <em><b>Matrix</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.dd.dg.impl.MatrixImpl#getA <em>A</em>}</li>
- *   <li>{@link org.eclipse.papyrus.dd.dg.impl.MatrixImpl#getB <em>B</em>}</li>
- *   <li>{@link org.eclipse.papyrus.dd.dg.impl.MatrixImpl#getC <em>C</em>}</li>
- *   <li>{@link org.eclipse.papyrus.dd.dg.impl.MatrixImpl#getD <em>D</em>}</li>
- *   <li>{@link org.eclipse.papyrus.dd.dg.impl.MatrixImpl#getE <em>E</em>}</li>
- *   <li>{@link org.eclipse.papyrus.dd.dg.impl.MatrixImpl#getF <em>F</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.impl.MatrixImpl#getA <em>A</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.impl.MatrixImpl#getB <em>B</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.impl.MatrixImpl#getC <em>C</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.impl.MatrixImpl#getD <em>D</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.impl.MatrixImpl#getE <em>E</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.impl.MatrixImpl#getF <em>F</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class MatrixImpl extends TransformImpl implements Matrix {
+
 	/**
 	 * The default value of the '{@link #getA() <em>A</em>}' attribute. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
@@ -160,6 +160,7 @@ public class MatrixImpl extends TransformImpl implements Matrix {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected MatrixImpl() {
@@ -168,6 +169,7 @@ public class MatrixImpl extends TransformImpl implements Matrix {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -177,6 +179,7 @@ public class MatrixImpl extends TransformImpl implements Matrix {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public double getA() {
@@ -185,17 +188,19 @@ public class MatrixImpl extends TransformImpl implements Matrix {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setA(double newA) {
 		double oldA = a;
 		a = newA;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.MATRIX__A, oldA, a));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public double getB() {
@@ -204,17 +209,19 @@ public class MatrixImpl extends TransformImpl implements Matrix {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setB(double newB) {
 		double oldB = b;
 		b = newB;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.MATRIX__B, oldB, b));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public double getC() {
@@ -223,17 +230,19 @@ public class MatrixImpl extends TransformImpl implements Matrix {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setC(double newC) {
 		double oldC = c;
 		c = newC;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.MATRIX__C, oldC, c));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public double getD() {
@@ -242,17 +251,19 @@ public class MatrixImpl extends TransformImpl implements Matrix {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setD(double newD) {
 		double oldD = d;
 		d = newD;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.MATRIX__D, oldD, d));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public double getE() {
@@ -261,17 +272,19 @@ public class MatrixImpl extends TransformImpl implements Matrix {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setE(double newE) {
 		double oldE = e;
 		e = newE;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.MATRIX__E, oldE, e));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public double getF() {
@@ -280,127 +293,133 @@ public class MatrixImpl extends TransformImpl implements Matrix {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setF(double newF) {
 		double oldF = f;
 		f = newF;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.MATRIX__F, oldF, f));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case DGPackage.MATRIX__A:
-				return getA();
-			case DGPackage.MATRIX__B:
-				return getB();
-			case DGPackage.MATRIX__C:
-				return getC();
-			case DGPackage.MATRIX__D:
-				return getD();
-			case DGPackage.MATRIX__E:
-				return getE();
-			case DGPackage.MATRIX__F:
-				return getF();
+		switch(featureID) {
+		case DGPackage.MATRIX__A:
+			return getA();
+		case DGPackage.MATRIX__B:
+			return getB();
+		case DGPackage.MATRIX__C:
+			return getC();
+		case DGPackage.MATRIX__D:
+			return getD();
+		case DGPackage.MATRIX__E:
+			return getE();
+		case DGPackage.MATRIX__F:
+			return getF();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case DGPackage.MATRIX__A:
-				setA((Double)newValue);
-				return;
-			case DGPackage.MATRIX__B:
-				setB((Double)newValue);
-				return;
-			case DGPackage.MATRIX__C:
-				setC((Double)newValue);
-				return;
-			case DGPackage.MATRIX__D:
-				setD((Double)newValue);
-				return;
-			case DGPackage.MATRIX__E:
-				setE((Double)newValue);
-				return;
-			case DGPackage.MATRIX__F:
-				setF((Double)newValue);
-				return;
+		switch(featureID) {
+		case DGPackage.MATRIX__A:
+			setA((Double)newValue);
+			return;
+		case DGPackage.MATRIX__B:
+			setB((Double)newValue);
+			return;
+		case DGPackage.MATRIX__C:
+			setC((Double)newValue);
+			return;
+		case DGPackage.MATRIX__D:
+			setD((Double)newValue);
+			return;
+		case DGPackage.MATRIX__E:
+			setE((Double)newValue);
+			return;
+		case DGPackage.MATRIX__F:
+			setF((Double)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case DGPackage.MATRIX__A:
-				setA(A_EDEFAULT);
-				return;
-			case DGPackage.MATRIX__B:
-				setB(B_EDEFAULT);
-				return;
-			case DGPackage.MATRIX__C:
-				setC(C_EDEFAULT);
-				return;
-			case DGPackage.MATRIX__D:
-				setD(D_EDEFAULT);
-				return;
-			case DGPackage.MATRIX__E:
-				setE(E_EDEFAULT);
-				return;
-			case DGPackage.MATRIX__F:
-				setF(F_EDEFAULT);
-				return;
+		switch(featureID) {
+		case DGPackage.MATRIX__A:
+			setA(A_EDEFAULT);
+			return;
+		case DGPackage.MATRIX__B:
+			setB(B_EDEFAULT);
+			return;
+		case DGPackage.MATRIX__C:
+			setC(C_EDEFAULT);
+			return;
+		case DGPackage.MATRIX__D:
+			setD(D_EDEFAULT);
+			return;
+		case DGPackage.MATRIX__E:
+			setE(E_EDEFAULT);
+			return;
+		case DGPackage.MATRIX__F:
+			setF(F_EDEFAULT);
+			return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case DGPackage.MATRIX__A:
-				return a != A_EDEFAULT;
-			case DGPackage.MATRIX__B:
-				return b != B_EDEFAULT;
-			case DGPackage.MATRIX__C:
-				return c != C_EDEFAULT;
-			case DGPackage.MATRIX__D:
-				return d != D_EDEFAULT;
-			case DGPackage.MATRIX__E:
-				return e != E_EDEFAULT;
-			case DGPackage.MATRIX__F:
-				return f != F_EDEFAULT;
+		switch(featureID) {
+		case DGPackage.MATRIX__A:
+			return a != A_EDEFAULT;
+		case DGPackage.MATRIX__B:
+			return b != B_EDEFAULT;
+		case DGPackage.MATRIX__C:
+			return c != C_EDEFAULT;
+		case DGPackage.MATRIX__D:
+			return d != D_EDEFAULT;
+		case DGPackage.MATRIX__E:
+			return e != E_EDEFAULT;
+		case DGPackage.MATRIX__F:
+			return f != F_EDEFAULT;
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) return super.toString();
-
+		if(eIsProxy())
+			return super.toString();
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (a: ");
 		result.append(a);
@@ -417,5 +436,4 @@ public class MatrixImpl extends TransformImpl implements Matrix {
 		result.append(')');
 		return result.toString();
 	}
-
 } // MatrixImpl
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/MoveToImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/MoveToImpl.java
index 8f37118cc3f..3f8d534833e 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/MoveToImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/MoveToImpl.java
@@ -25,21 +25,22 @@ import org.eclipse.papyrus.dd.dg.DGPackage;
 import org.eclipse.papyrus.dd.dg.MoveTo;
 
 /**
- * <!-- begin-user-doc --> An implementation of the model object '
- * <em><b>Move To</b></em>'. <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object ' <em><b>Move To</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.dd.dg.impl.MoveToImpl#getPoint <em>Point</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.impl.MoveToImpl#getPoint <em>Point</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class MoveToImpl extends PathCommandImpl implements MoveTo {
+
 	/**
 	 * The cached value of the '{@link #getPoint() <em>Point</em>}' containment reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getPoint()
 	 * @generated
 	 * @ordered
@@ -48,6 +49,7 @@ public class MoveToImpl extends PathCommandImpl implements MoveTo {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected MoveToImpl() {
@@ -56,6 +58,7 @@ public class MoveToImpl extends PathCommandImpl implements MoveTo {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -65,6 +68,7 @@ public class MoveToImpl extends PathCommandImpl implements MoveTo {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Point getPoint() {
@@ -73,103 +77,110 @@ public class MoveToImpl extends PathCommandImpl implements MoveTo {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public NotificationChain basicSetPoint(Point newPoint,
-			NotificationChain msgs) {
+	public NotificationChain basicSetPoint(Point newPoint, NotificationChain msgs) {
 		Point oldPoint = point;
 		point = newPoint;
-		if (eNotificationRequired()) {
+		if(eNotificationRequired()) {
 			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, DGPackage.MOVE_TO__POINT, oldPoint, newPoint);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
+			if(msgs == null)
+				msgs = notification;
+			else
+				msgs.add(notification);
 		}
 		return msgs;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setPoint(Point newPoint) {
-		if (newPoint != point) {
+		if(newPoint != point) {
 			NotificationChain msgs = null;
-			if (point != null)
+			if(point != null)
 				msgs = ((InternalEObject)point).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - DGPackage.MOVE_TO__POINT, null, msgs);
-			if (newPoint != null)
+			if(newPoint != null)
 				msgs = ((InternalEObject)newPoint).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - DGPackage.MOVE_TO__POINT, null, msgs);
 			msgs = basicSetPoint(newPoint, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
+			if(msgs != null)
+				msgs.dispatch();
+		} else if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.MOVE_TO__POINT, newPoint, newPoint));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd,
-			int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case DGPackage.MOVE_TO__POINT:
-				return basicSetPoint(null, msgs);
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch(featureID) {
+		case DGPackage.MOVE_TO__POINT:
+			return basicSetPoint(null, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case DGPackage.MOVE_TO__POINT:
-				return getPoint();
+		switch(featureID) {
+		case DGPackage.MOVE_TO__POINT:
+			return getPoint();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case DGPackage.MOVE_TO__POINT:
-				setPoint((Point)newValue);
-				return;
+		switch(featureID) {
+		case DGPackage.MOVE_TO__POINT:
+			setPoint((Point)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case DGPackage.MOVE_TO__POINT:
-				setPoint((Point)null);
-				return;
+		switch(featureID) {
+		case DGPackage.MOVE_TO__POINT:
+			setPoint((Point)null);
+			return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case DGPackage.MOVE_TO__POINT:
-				return point != null;
+		switch(featureID) {
+		case DGPackage.MOVE_TO__POINT:
+			return point != null;
 		}
 		return super.eIsSet(featureID);
 	}
-
 } // MoveToImpl
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/PaintImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/PaintImpl.java
index d39d471fac8..343aa5cca61 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/PaintImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/PaintImpl.java
@@ -32,22 +32,23 @@ import org.eclipse.papyrus.dd.dg.PaintServer;
 import org.eclipse.papyrus.dd.dg.util.DGValidator;
 
 /**
- * <!-- begin-user-doc --> An implementation of the model object '
- * <em><b>Paint</b></em>'. <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object ' <em><b>Paint</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.dd.dg.impl.PaintImpl#getColor <em>Color</em>}</li>
- *   <li>{@link org.eclipse.papyrus.dd.dg.impl.PaintImpl#getPaintServer <em>Paint Server</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.impl.PaintImpl#getColor <em>Color</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.impl.PaintImpl#getPaintServer <em>Paint Server</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class PaintImpl extends MinimalEObjectImpl.Container implements Paint {
+
 	/**
 	 * The default value of the '{@link #getColor() <em>Color</em>}' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getColor()
 	 * @generated
 	 * @ordered
@@ -57,6 +58,7 @@ public class PaintImpl extends MinimalEObjectImpl.Container implements Paint {
 	/**
 	 * The cached value of the '{@link #getColor() <em>Color</em>}' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getColor()
 	 * @generated
 	 * @ordered
@@ -66,6 +68,7 @@ public class PaintImpl extends MinimalEObjectImpl.Container implements Paint {
 	/**
 	 * The cached value of the '{@link #getPaintServer() <em>Paint Server</em>}' reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getPaintServer()
 	 * @generated
 	 * @ordered
@@ -74,6 +77,7 @@ public class PaintImpl extends MinimalEObjectImpl.Container implements Paint {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected PaintImpl() {
@@ -82,6 +86,7 @@ public class PaintImpl extends MinimalEObjectImpl.Container implements Paint {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -91,6 +96,7 @@ public class PaintImpl extends MinimalEObjectImpl.Container implements Paint {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Color getColor() {
@@ -99,25 +105,27 @@ public class PaintImpl extends MinimalEObjectImpl.Container implements Paint {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setColor(Color newColor) {
 		Color oldColor = color;
 		color = newColor;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.PAINT__COLOR, oldColor, color));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public PaintServer getPaintServer() {
-		if (paintServer != null && paintServer.eIsProxy()) {
+		if(paintServer != null && paintServer.eIsProxy()) {
 			InternalEObject oldPaintServer = (InternalEObject)paintServer;
 			paintServer = (PaintServer)eResolveProxy(oldPaintServer);
-			if (paintServer != oldPaintServer) {
-				if (eNotificationRequired())
+			if(paintServer != oldPaintServer) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, DGPackage.PAINT__PAINT_SERVER, oldPaintServer, paintServer));
 			}
 		}
@@ -126,6 +134,7 @@ public class PaintImpl extends MinimalEObjectImpl.Container implements Paint {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public PaintServer basicGetPaintServer() {
@@ -134,23 +143,22 @@ public class PaintImpl extends MinimalEObjectImpl.Container implements Paint {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setPaintServer(PaintServer newPaintServer) {
 		PaintServer oldPaintServer = paintServer;
 		paintServer = newPaintServer;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.PAINT__PAINT_SERVER, oldPaintServer, paintServer));
 	}
 
 	/**
-	 * The cached validation expression for the '
-	 * {@link #referencedPaintServerHasId(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
+	 * The cached validation expression for the ' {@link #referencedPaintServerHasId(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
 	 * <em>Referenced Paint Server Has Id</em>}' invariant operation. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
-	 * @see #referencedPaintServerHasId(org.eclipse.emf.common.util.DiagnosticChain,
-	 *      java.util.Map)
+	 * @see #referencedPaintServerHasId(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
 	 * @generated
 	 * @ordered
 	 */
@@ -158,117 +166,111 @@ public class PaintImpl extends MinimalEObjectImpl.Container implements Paint {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public boolean referencedPaintServerHasId(DiagnosticChain diagnostics,
-			Map<Object, Object> context) {
-		return
-			DGValidator.validate
-				(DGPackage.Literals.PAINT,
-				 this,
-				 diagnostics,
-				 context,
-				 "http://www.eclipse.org/emf/2002/Ecore/OCL",
-				 DGPackage.Literals.PAINT___REFERENCED_PAINT_SERVER_HAS_ID__DIAGNOSTICCHAIN_MAP,
-				 REFERENCED_PAINT_SERVER_HAS_ID_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION,
-				 Diagnostic.ERROR,
-				 DGValidator.DIAGNOSTIC_SOURCE,
-				 DGValidator.PAINT__REFERENCED_PAINT_SERVER_HAS_ID);
+	public boolean referencedPaintServerHasId(DiagnosticChain diagnostics, Map<Object, Object> context) {
+		return DGValidator.validate(DGPackage.Literals.PAINT, this, diagnostics, context, "http://www.eclipse.org/emf/2002/Ecore/OCL", DGPackage.Literals.PAINT___REFERENCED_PAINT_SERVER_HAS_ID__DIAGNOSTICCHAIN_MAP, REFERENCED_PAINT_SERVER_HAS_ID_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION, Diagnostic.ERROR, DGValidator.DIAGNOSTIC_SOURCE, DGValidator.PAINT__REFERENCED_PAINT_SERVER_HAS_ID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case DGPackage.PAINT__COLOR:
-				return getColor();
-			case DGPackage.PAINT__PAINT_SERVER:
-				if (resolve) return getPaintServer();
-				return basicGetPaintServer();
+		switch(featureID) {
+		case DGPackage.PAINT__COLOR:
+			return getColor();
+		case DGPackage.PAINT__PAINT_SERVER:
+			if(resolve)
+				return getPaintServer();
+			return basicGetPaintServer();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case DGPackage.PAINT__COLOR:
-				setColor((Color)newValue);
-				return;
-			case DGPackage.PAINT__PAINT_SERVER:
-				setPaintServer((PaintServer)newValue);
-				return;
+		switch(featureID) {
+		case DGPackage.PAINT__COLOR:
+			setColor((Color)newValue);
+			return;
+		case DGPackage.PAINT__PAINT_SERVER:
+			setPaintServer((PaintServer)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case DGPackage.PAINT__COLOR:
-				setColor(COLOR_EDEFAULT);
-				return;
-			case DGPackage.PAINT__PAINT_SERVER:
-				setPaintServer((PaintServer)null);
-				return;
+		switch(featureID) {
+		case DGPackage.PAINT__COLOR:
+			setColor(COLOR_EDEFAULT);
+			return;
+		case DGPackage.PAINT__PAINT_SERVER:
+			setPaintServer((PaintServer)null);
+			return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case DGPackage.PAINT__COLOR:
-				return COLOR_EDEFAULT == null ? color != null : !COLOR_EDEFAULT.equals(color);
-			case DGPackage.PAINT__PAINT_SERVER:
-				return paintServer != null;
+		switch(featureID) {
+		case DGPackage.PAINT__COLOR:
+			return COLOR_EDEFAULT == null ? color != null : !COLOR_EDEFAULT.equals(color);
+		case DGPackage.PAINT__PAINT_SERVER:
+			return paintServer != null;
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	@SuppressWarnings("unchecked")
-	public Object eInvoke(int operationID, EList<?> arguments)
-			throws InvocationTargetException {
-		switch (operationID) {
-			case DGPackage.PAINT___REFERENCED_PAINT_SERVER_HAS_ID__DIAGNOSTICCHAIN_MAP:
-				return referencedPaintServerHasId((DiagnosticChain)arguments.get(0), (Map<Object, Object>)arguments.get(1));
+	public Object eInvoke(int operationID, EList<?> arguments) throws InvocationTargetException {
+		switch(operationID) {
+		case DGPackage.PAINT___REFERENCED_PAINT_SERVER_HAS_ID__DIAGNOSTICCHAIN_MAP:
+			return referencedPaintServerHasId((DiagnosticChain)arguments.get(0), (Map<Object, Object>)arguments.get(1));
 		}
 		return super.eInvoke(operationID, arguments);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) return super.toString();
-
+		if(eIsProxy())
+			return super.toString();
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (color: ");
 		result.append(color);
 		result.append(')');
 		return result.toString();
 	}
-
 } // PaintImpl
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/PaintServerImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/PaintServerImpl.java
index 3c4af5ba7f1..cf7f84f36d5 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/PaintServerImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/PaintServerImpl.java
@@ -28,22 +28,22 @@ import org.eclipse.papyrus.dd.dg.PaintServer;
 import org.eclipse.papyrus.dd.dg.Transform;
 
 /**
- * <!-- begin-user-doc --> An implementation of the model object '
- * <em><b>Paint Server</b></em>'. <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object ' <em><b>Paint Server</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.dd.dg.impl.PaintServerImpl#getTransforms <em>Transform</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.impl.PaintServerImpl#getTransforms <em>Transform</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
-public abstract class PaintServerImpl extends DefinitionImpl implements
-		PaintServer {
+public abstract class PaintServerImpl extends DefinitionImpl implements PaintServer {
+
 	/**
 	 * The cached value of the '{@link #getTransforms() <em>Transform</em>}' containment reference list.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getTransforms()
 	 * @generated
 	 * @ordered
@@ -52,6 +52,7 @@ public abstract class PaintServerImpl extends DefinitionImpl implements
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected PaintServerImpl() {
@@ -60,6 +61,7 @@ public abstract class PaintServerImpl extends DefinitionImpl implements
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -69,10 +71,11 @@ public abstract class PaintServerImpl extends DefinitionImpl implements
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<Transform> getTransforms() {
-		if (transforms == null) {
+		if(transforms == null) {
 			transforms = new EObjectContainmentEList<Transform>(Transform.class, this, DGPackage.PAINT_SERVER__TRANSFORM);
 		}
 		return transforms;
@@ -80,72 +83,75 @@ public abstract class PaintServerImpl extends DefinitionImpl implements
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd,
-			int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case DGPackage.PAINT_SERVER__TRANSFORM:
-				return ((InternalEList<?>)getTransforms()).basicRemove(otherEnd, msgs);
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch(featureID) {
+		case DGPackage.PAINT_SERVER__TRANSFORM:
+			return ((InternalEList<?>)getTransforms()).basicRemove(otherEnd, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case DGPackage.PAINT_SERVER__TRANSFORM:
-				return getTransforms();
+		switch(featureID) {
+		case DGPackage.PAINT_SERVER__TRANSFORM:
+			return getTransforms();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case DGPackage.PAINT_SERVER__TRANSFORM:
-				getTransforms().clear();
-				getTransforms().addAll((Collection<? extends Transform>)newValue);
-				return;
+		switch(featureID) {
+		case DGPackage.PAINT_SERVER__TRANSFORM:
+			getTransforms().clear();
+			getTransforms().addAll((Collection<? extends Transform>)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case DGPackage.PAINT_SERVER__TRANSFORM:
-				getTransforms().clear();
-				return;
+		switch(featureID) {
+		case DGPackage.PAINT_SERVER__TRANSFORM:
+			getTransforms().clear();
+			return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case DGPackage.PAINT_SERVER__TRANSFORM:
-				return transforms != null && !transforms.isEmpty();
+		switch(featureID) {
+		case DGPackage.PAINT_SERVER__TRANSFORM:
+			return transforms != null && !transforms.isEmpty();
 		}
 		return super.eIsSet(featureID);
 	}
-
 } // PaintServerImpl
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/PathCommandImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/PathCommandImpl.java
index 9486a5a582c..7c6fcba70a8 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/PathCommandImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/PathCommandImpl.java
@@ -22,22 +22,22 @@ import org.eclipse.papyrus.dd.dg.DGPackage;
 import org.eclipse.papyrus.dd.dg.PathCommand;
 
 /**
- * <!-- begin-user-doc --> An implementation of the model object '
- * <em><b>Path Command</b></em>'. <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object ' <em><b>Path Command</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.dd.dg.impl.PathCommandImpl#isRelative <em>Is Relative</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.impl.PathCommandImpl#isRelative <em>Is Relative</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
-public abstract class PathCommandImpl extends MinimalEObjectImpl.Container
-		implements PathCommand {
+public abstract class PathCommandImpl extends MinimalEObjectImpl.Container implements PathCommand {
+
 	/**
 	 * The default value of the '{@link #isRelative() <em>Is Relative</em>}' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isRelative()
 	 * @generated
 	 * @ordered
@@ -47,6 +47,7 @@ public abstract class PathCommandImpl extends MinimalEObjectImpl.Container
 	/**
 	 * The cached value of the '{@link #isRelative() <em>Is Relative</em>}' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isRelative()
 	 * @generated
 	 * @ordered
@@ -55,6 +56,7 @@ public abstract class PathCommandImpl extends MinimalEObjectImpl.Container
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected PathCommandImpl() {
@@ -63,6 +65,7 @@ public abstract class PathCommandImpl extends MinimalEObjectImpl.Container
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -72,6 +75,7 @@ public abstract class PathCommandImpl extends MinimalEObjectImpl.Container
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isRelative() {
@@ -80,82 +84,87 @@ public abstract class PathCommandImpl extends MinimalEObjectImpl.Container
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setIsRelative(boolean newIsRelative) {
 		boolean oldIsRelative = isRelative;
 		isRelative = newIsRelative;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.PATH_COMMAND__IS_RELATIVE, oldIsRelative, isRelative));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case DGPackage.PATH_COMMAND__IS_RELATIVE:
-				return isRelative();
+		switch(featureID) {
+		case DGPackage.PATH_COMMAND__IS_RELATIVE:
+			return isRelative();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case DGPackage.PATH_COMMAND__IS_RELATIVE:
-				setIsRelative((Boolean)newValue);
-				return;
+		switch(featureID) {
+		case DGPackage.PATH_COMMAND__IS_RELATIVE:
+			setIsRelative((Boolean)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case DGPackage.PATH_COMMAND__IS_RELATIVE:
-				setIsRelative(IS_RELATIVE_EDEFAULT);
-				return;
+		switch(featureID) {
+		case DGPackage.PATH_COMMAND__IS_RELATIVE:
+			setIsRelative(IS_RELATIVE_EDEFAULT);
+			return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case DGPackage.PATH_COMMAND__IS_RELATIVE:
-				return isRelative != IS_RELATIVE_EDEFAULT;
+		switch(featureID) {
+		case DGPackage.PATH_COMMAND__IS_RELATIVE:
+			return isRelative != IS_RELATIVE_EDEFAULT;
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) return super.toString();
-
+		if(eIsProxy())
+			return super.toString();
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (isRelative: ");
 		result.append(isRelative);
 		result.append(')');
 		return result.toString();
 	}
-
 } // PathCommandImpl
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/PathImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/PathImpl.java
index ab4eb4d1583..00e20a7b339 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/PathImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/PathImpl.java
@@ -33,21 +33,22 @@ import org.eclipse.papyrus.dd.dg.PathCommand;
 import org.eclipse.papyrus.dd.dg.util.DGValidator;
 
 /**
- * <!-- begin-user-doc --> An implementation of the model object '
- * <em><b>Path</b></em>'. <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object ' <em><b>Path</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.dd.dg.impl.PathImpl#getCommands <em>Command</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.impl.PathImpl#getCommands <em>Command</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class PathImpl extends MarkedElementImpl implements Path {
+
 	/**
 	 * The cached value of the '{@link #getCommands() <em>Command</em>}' containment reference list.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getCommands()
 	 * @generated
 	 * @ordered
@@ -56,6 +57,7 @@ public class PathImpl extends MarkedElementImpl implements Path {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected PathImpl() {
@@ -64,6 +66,7 @@ public class PathImpl extends MarkedElementImpl implements Path {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -73,23 +76,22 @@ public class PathImpl extends MarkedElementImpl implements Path {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<PathCommand> getCommands() {
-		if (commands == null) {
+		if(commands == null) {
 			commands = new EObjectContainmentEList<PathCommand>(PathCommand.class, this, DGPackage.PATH__COMMAND);
 		}
 		return commands;
 	}
 
 	/**
-	 * The cached validation expression for the '
-	 * {@link #firstCommandMustBeMove(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
+	 * The cached validation expression for the ' {@link #firstCommandMustBeMove(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
 	 * <em>First Command Must Be Move</em>}' invariant operation. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
-	 * @see #firstCommandMustBeMove(org.eclipse.emf.common.util.DiagnosticChain,
-	 *      java.util.Map)
+	 * @see #firstCommandMustBeMove(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
 	 * @generated
 	 * @ordered
 	 */
@@ -97,107 +99,99 @@ public class PathImpl extends MarkedElementImpl implements Path {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public boolean firstCommandMustBeMove(DiagnosticChain diagnostics,
-			Map<Object, Object> context) {
-		return
-			DGValidator.validate
-				(DGPackage.Literals.PATH,
-				 this,
-				 diagnostics,
-				 context,
-				 "http://www.eclipse.org/emf/2002/Ecore/OCL",
-				 DGPackage.Literals.PATH___FIRST_COMMAND_MUST_BE_MOVE__DIAGNOSTICCHAIN_MAP,
-				 FIRST_COMMAND_MUST_BE_MOVE_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION,
-				 Diagnostic.ERROR,
-				 DGValidator.DIAGNOSTIC_SOURCE,
-				 DGValidator.PATH__FIRST_COMMAND_MUST_BE_MOVE);
+	public boolean firstCommandMustBeMove(DiagnosticChain diagnostics, Map<Object, Object> context) {
+		return DGValidator.validate(DGPackage.Literals.PATH, this, diagnostics, context, "http://www.eclipse.org/emf/2002/Ecore/OCL", DGPackage.Literals.PATH___FIRST_COMMAND_MUST_BE_MOVE__DIAGNOSTICCHAIN_MAP, FIRST_COMMAND_MUST_BE_MOVE_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION, Diagnostic.ERROR, DGValidator.DIAGNOSTIC_SOURCE, DGValidator.PATH__FIRST_COMMAND_MUST_BE_MOVE);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd,
-			int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case DGPackage.PATH__COMMAND:
-				return ((InternalEList<?>)getCommands()).basicRemove(otherEnd, msgs);
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch(featureID) {
+		case DGPackage.PATH__COMMAND:
+			return ((InternalEList<?>)getCommands()).basicRemove(otherEnd, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case DGPackage.PATH__COMMAND:
-				return getCommands();
+		switch(featureID) {
+		case DGPackage.PATH__COMMAND:
+			return getCommands();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case DGPackage.PATH__COMMAND:
-				getCommands().clear();
-				getCommands().addAll((Collection<? extends PathCommand>)newValue);
-				return;
+		switch(featureID) {
+		case DGPackage.PATH__COMMAND:
+			getCommands().clear();
+			getCommands().addAll((Collection<? extends PathCommand>)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case DGPackage.PATH__COMMAND:
-				getCommands().clear();
-				return;
+		switch(featureID) {
+		case DGPackage.PATH__COMMAND:
+			getCommands().clear();
+			return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case DGPackage.PATH__COMMAND:
-				return commands != null && !commands.isEmpty();
+		switch(featureID) {
+		case DGPackage.PATH__COMMAND:
+			return commands != null && !commands.isEmpty();
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	@SuppressWarnings("unchecked")
-	public Object eInvoke(int operationID, EList<?> arguments)
-			throws InvocationTargetException {
-		switch (operationID) {
-			case DGPackage.PATH___FIRST_COMMAND_MUST_BE_MOVE__DIAGNOSTICCHAIN_MAP:
-				return firstCommandMustBeMove((DiagnosticChain)arguments.get(0), (Map<Object, Object>)arguments.get(1));
+	public Object eInvoke(int operationID, EList<?> arguments) throws InvocationTargetException {
+		switch(operationID) {
+		case DGPackage.PATH___FIRST_COMMAND_MUST_BE_MOVE__DIAGNOSTICCHAIN_MAP:
+			return firstCommandMustBeMove((DiagnosticChain)arguments.get(0), (Map<Object, Object>)arguments.get(1));
 		}
 		return super.eInvoke(operationID, arguments);
 	}
-
 } // PathImpl
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/PatternImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/PatternImpl.java
index 5c5ce1126c7..ad0e76dddc9 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/PatternImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/PatternImpl.java
@@ -26,22 +26,23 @@ import org.eclipse.papyrus.dd.dg.GraphicalElement;
 import org.eclipse.papyrus.dd.dg.Pattern;
 
 /**
- * <!-- begin-user-doc --> An implementation of the model object '
- * <em><b>Pattern</b></em>'. <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object ' <em><b>Pattern</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.dd.dg.impl.PatternImpl#getBounds <em>Bounds</em>}</li>
- *   <li>{@link org.eclipse.papyrus.dd.dg.impl.PatternImpl#getTile <em>Tile</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.impl.PatternImpl#getBounds <em>Bounds</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.impl.PatternImpl#getTile <em>Tile</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class PatternImpl extends PaintServerImpl implements Pattern {
+
 	/**
 	 * The cached value of the '{@link #getBounds() <em>Bounds</em>}' containment reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getBounds()
 	 * @generated
 	 * @ordered
@@ -51,6 +52,7 @@ public class PatternImpl extends PaintServerImpl implements Pattern {
 	/**
 	 * The cached value of the '{@link #getTile() <em>Tile</em>}' containment reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getTile()
 	 * @generated
 	 * @ordered
@@ -59,6 +61,7 @@ public class PatternImpl extends PaintServerImpl implements Pattern {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected PatternImpl() {
@@ -67,6 +70,7 @@ public class PatternImpl extends PaintServerImpl implements Pattern {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -76,6 +80,7 @@ public class PatternImpl extends PaintServerImpl implements Pattern {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Bounds getBounds() {
@@ -84,39 +89,44 @@ public class PatternImpl extends PaintServerImpl implements Pattern {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public NotificationChain basicSetBounds(Bounds newBounds,
-			NotificationChain msgs) {
+	public NotificationChain basicSetBounds(Bounds newBounds, NotificationChain msgs) {
 		Bounds oldBounds = bounds;
 		bounds = newBounds;
-		if (eNotificationRequired()) {
+		if(eNotificationRequired()) {
 			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, DGPackage.PATTERN__BOUNDS, oldBounds, newBounds);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
+			if(msgs == null)
+				msgs = notification;
+			else
+				msgs.add(notification);
 		}
 		return msgs;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setBounds(Bounds newBounds) {
-		if (newBounds != bounds) {
+		if(newBounds != bounds) {
 			NotificationChain msgs = null;
-			if (bounds != null)
+			if(bounds != null)
 				msgs = ((InternalEObject)bounds).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - DGPackage.PATTERN__BOUNDS, null, msgs);
-			if (newBounds != null)
+			if(newBounds != null)
 				msgs = ((InternalEObject)newBounds).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - DGPackage.PATTERN__BOUNDS, null, msgs);
 			msgs = basicSetBounds(newBounds, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
+			if(msgs != null)
+				msgs.dispatch();
+		} else if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.PATTERN__BOUNDS, newBounds, newBounds));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public GraphicalElement getTile() {
@@ -125,115 +135,122 @@ public class PatternImpl extends PaintServerImpl implements Pattern {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public NotificationChain basicSetTile(GraphicalElement newTile,
-			NotificationChain msgs) {
+	public NotificationChain basicSetTile(GraphicalElement newTile, NotificationChain msgs) {
 		GraphicalElement oldTile = tile;
 		tile = newTile;
-		if (eNotificationRequired()) {
+		if(eNotificationRequired()) {
 			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, DGPackage.PATTERN__TILE, oldTile, newTile);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
+			if(msgs == null)
+				msgs = notification;
+			else
+				msgs.add(notification);
 		}
 		return msgs;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setTile(GraphicalElement newTile) {
-		if (newTile != tile) {
+		if(newTile != tile) {
 			NotificationChain msgs = null;
-			if (tile != null)
+			if(tile != null)
 				msgs = ((InternalEObject)tile).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - DGPackage.PATTERN__TILE, null, msgs);
-			if (newTile != null)
+			if(newTile != null)
 				msgs = ((InternalEObject)newTile).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - DGPackage.PATTERN__TILE, null, msgs);
 			msgs = basicSetTile(newTile, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
+			if(msgs != null)
+				msgs.dispatch();
+		} else if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.PATTERN__TILE, newTile, newTile));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd,
-			int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case DGPackage.PATTERN__BOUNDS:
-				return basicSetBounds(null, msgs);
-			case DGPackage.PATTERN__TILE:
-				return basicSetTile(null, msgs);
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch(featureID) {
+		case DGPackage.PATTERN__BOUNDS:
+			return basicSetBounds(null, msgs);
+		case DGPackage.PATTERN__TILE:
+			return basicSetTile(null, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case DGPackage.PATTERN__BOUNDS:
-				return getBounds();
-			case DGPackage.PATTERN__TILE:
-				return getTile();
+		switch(featureID) {
+		case DGPackage.PATTERN__BOUNDS:
+			return getBounds();
+		case DGPackage.PATTERN__TILE:
+			return getTile();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case DGPackage.PATTERN__BOUNDS:
-				setBounds((Bounds)newValue);
-				return;
-			case DGPackage.PATTERN__TILE:
-				setTile((GraphicalElement)newValue);
-				return;
+		switch(featureID) {
+		case DGPackage.PATTERN__BOUNDS:
+			setBounds((Bounds)newValue);
+			return;
+		case DGPackage.PATTERN__TILE:
+			setTile((GraphicalElement)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case DGPackage.PATTERN__BOUNDS:
-				setBounds((Bounds)null);
-				return;
-			case DGPackage.PATTERN__TILE:
-				setTile((GraphicalElement)null);
-				return;
+		switch(featureID) {
+		case DGPackage.PATTERN__BOUNDS:
+			setBounds((Bounds)null);
+			return;
+		case DGPackage.PATTERN__TILE:
+			setTile((GraphicalElement)null);
+			return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case DGPackage.PATTERN__BOUNDS:
-				return bounds != null;
-			case DGPackage.PATTERN__TILE:
-				return tile != null;
+		switch(featureID) {
+		case DGPackage.PATTERN__BOUNDS:
+			return bounds != null;
+		case DGPackage.PATTERN__TILE:
+			return tile != null;
 		}
 		return super.eIsSet(featureID);
 	}
-
 } // PatternImpl
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/PolygonImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/PolygonImpl.java
index 0074d113279..83b04657ef0 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/PolygonImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/PolygonImpl.java
@@ -29,21 +29,22 @@ import org.eclipse.papyrus.dd.dg.DGPackage;
 import org.eclipse.papyrus.dd.dg.Polygon;
 
 /**
- * <!-- begin-user-doc --> An implementation of the model object '
- * <em><b>Polygon</b></em>'. <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object ' <em><b>Polygon</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.dd.dg.impl.PolygonImpl#getPoints <em>Point</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.impl.PolygonImpl#getPoints <em>Point</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class PolygonImpl extends MarkedElementImpl implements Polygon {
+
 	/**
 	 * The cached value of the '{@link #getPoints() <em>Point</em>}' containment reference list.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getPoints()
 	 * @generated
 	 * @ordered
@@ -52,6 +53,7 @@ public class PolygonImpl extends MarkedElementImpl implements Polygon {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected PolygonImpl() {
@@ -60,6 +62,7 @@ public class PolygonImpl extends MarkedElementImpl implements Polygon {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -69,10 +72,11 @@ public class PolygonImpl extends MarkedElementImpl implements Polygon {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<Point> getPoints() {
-		if (points == null) {
+		if(points == null) {
 			points = new EObjectContainmentEList<Point>(Point.class, this, DGPackage.POLYGON__POINT);
 		}
 		return points;
@@ -80,72 +84,75 @@ public class PolygonImpl extends MarkedElementImpl implements Polygon {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd,
-			int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case DGPackage.POLYGON__POINT:
-				return ((InternalEList<?>)getPoints()).basicRemove(otherEnd, msgs);
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch(featureID) {
+		case DGPackage.POLYGON__POINT:
+			return ((InternalEList<?>)getPoints()).basicRemove(otherEnd, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case DGPackage.POLYGON__POINT:
-				return getPoints();
+		switch(featureID) {
+		case DGPackage.POLYGON__POINT:
+			return getPoints();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case DGPackage.POLYGON__POINT:
-				getPoints().clear();
-				getPoints().addAll((Collection<? extends Point>)newValue);
-				return;
+		switch(featureID) {
+		case DGPackage.POLYGON__POINT:
+			getPoints().clear();
+			getPoints().addAll((Collection<? extends Point>)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case DGPackage.POLYGON__POINT:
-				getPoints().clear();
-				return;
+		switch(featureID) {
+		case DGPackage.POLYGON__POINT:
+			getPoints().clear();
+			return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case DGPackage.POLYGON__POINT:
-				return points != null && !points.isEmpty();
+		switch(featureID) {
+		case DGPackage.POLYGON__POINT:
+			return points != null && !points.isEmpty();
 		}
 		return super.eIsSet(featureID);
 	}
-
 } // PolygonImpl
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/PolylineImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/PolylineImpl.java
index 090c4835bed..2982f7c3df3 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/PolylineImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/PolylineImpl.java
@@ -29,21 +29,22 @@ import org.eclipse.papyrus.dd.dg.DGPackage;
 import org.eclipse.papyrus.dd.dg.Polyline;
 
 /**
- * <!-- begin-user-doc --> An implementation of the model object '
- * <em><b>Polyline</b></em>'. <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object ' <em><b>Polyline</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.dd.dg.impl.PolylineImpl#getPoints <em>Point</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.impl.PolylineImpl#getPoints <em>Point</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class PolylineImpl extends MarkedElementImpl implements Polyline {
+
 	/**
 	 * The cached value of the '{@link #getPoints() <em>Point</em>}' containment reference list.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getPoints()
 	 * @generated
 	 * @ordered
@@ -52,6 +53,7 @@ public class PolylineImpl extends MarkedElementImpl implements Polyline {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected PolylineImpl() {
@@ -60,6 +62,7 @@ public class PolylineImpl extends MarkedElementImpl implements Polyline {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -69,10 +72,11 @@ public class PolylineImpl extends MarkedElementImpl implements Polyline {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<Point> getPoints() {
-		if (points == null) {
+		if(points == null) {
 			points = new EObjectContainmentEList<Point>(Point.class, this, DGPackage.POLYLINE__POINT);
 		}
 		return points;
@@ -80,72 +84,75 @@ public class PolylineImpl extends MarkedElementImpl implements Polyline {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd,
-			int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case DGPackage.POLYLINE__POINT:
-				return ((InternalEList<?>)getPoints()).basicRemove(otherEnd, msgs);
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch(featureID) {
+		case DGPackage.POLYLINE__POINT:
+			return ((InternalEList<?>)getPoints()).basicRemove(otherEnd, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case DGPackage.POLYLINE__POINT:
-				return getPoints();
+		switch(featureID) {
+		case DGPackage.POLYLINE__POINT:
+			return getPoints();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case DGPackage.POLYLINE__POINT:
-				getPoints().clear();
-				getPoints().addAll((Collection<? extends Point>)newValue);
-				return;
+		switch(featureID) {
+		case DGPackage.POLYLINE__POINT:
+			getPoints().clear();
+			getPoints().addAll((Collection<? extends Point>)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case DGPackage.POLYLINE__POINT:
-				getPoints().clear();
-				return;
+		switch(featureID) {
+		case DGPackage.POLYLINE__POINT:
+			getPoints().clear();
+			return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case DGPackage.POLYLINE__POINT:
-				return points != null && !points.isEmpty();
+		switch(featureID) {
+		case DGPackage.POLYLINE__POINT:
+			return points != null && !points.isEmpty();
 		}
 		return super.eIsSet(featureID);
 	}
-
 } // PolylineImpl
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/QuadraticCurveToImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/QuadraticCurveToImpl.java
index 83b7784bf49..bea452eeef7 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/QuadraticCurveToImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/QuadraticCurveToImpl.java
@@ -25,23 +25,23 @@ import org.eclipse.papyrus.dd.dg.DGPackage;
 import org.eclipse.papyrus.dd.dg.QuadraticCurveTo;
 
 /**
- * <!-- begin-user-doc --> An implementation of the model object '
- * <em><b>Quadratic Curve To</b></em>'. <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object ' <em><b>Quadratic Curve To</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.dd.dg.impl.QuadraticCurveToImpl#getControl <em>Control</em>}</li>
- *   <li>{@link org.eclipse.papyrus.dd.dg.impl.QuadraticCurveToImpl#getPoint <em>Point</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.impl.QuadraticCurveToImpl#getControl <em>Control</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.impl.QuadraticCurveToImpl#getPoint <em>Point</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
-public class QuadraticCurveToImpl extends PathCommandImpl implements
-		QuadraticCurveTo {
+public class QuadraticCurveToImpl extends PathCommandImpl implements QuadraticCurveTo {
+
 	/**
 	 * The cached value of the '{@link #getControl() <em>Control</em>}' containment reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getControl()
 	 * @generated
 	 * @ordered
@@ -51,6 +51,7 @@ public class QuadraticCurveToImpl extends PathCommandImpl implements
 	/**
 	 * The cached value of the '{@link #getPoint() <em>Point</em>}' containment reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getPoint()
 	 * @generated
 	 * @ordered
@@ -59,6 +60,7 @@ public class QuadraticCurveToImpl extends PathCommandImpl implements
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected QuadraticCurveToImpl() {
@@ -67,6 +69,7 @@ public class QuadraticCurveToImpl extends PathCommandImpl implements
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -76,6 +79,7 @@ public class QuadraticCurveToImpl extends PathCommandImpl implements
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Point getPoint() {
@@ -84,39 +88,44 @@ public class QuadraticCurveToImpl extends PathCommandImpl implements
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public NotificationChain basicSetPoint(Point newPoint,
-			NotificationChain msgs) {
+	public NotificationChain basicSetPoint(Point newPoint, NotificationChain msgs) {
 		Point oldPoint = point;
 		point = newPoint;
-		if (eNotificationRequired()) {
+		if(eNotificationRequired()) {
 			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, DGPackage.QUADRATIC_CURVE_TO__POINT, oldPoint, newPoint);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
+			if(msgs == null)
+				msgs = notification;
+			else
+				msgs.add(notification);
 		}
 		return msgs;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setPoint(Point newPoint) {
-		if (newPoint != point) {
+		if(newPoint != point) {
 			NotificationChain msgs = null;
-			if (point != null)
+			if(point != null)
 				msgs = ((InternalEObject)point).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - DGPackage.QUADRATIC_CURVE_TO__POINT, null, msgs);
-			if (newPoint != null)
+			if(newPoint != null)
 				msgs = ((InternalEObject)newPoint).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - DGPackage.QUADRATIC_CURVE_TO__POINT, null, msgs);
 			msgs = basicSetPoint(newPoint, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
+			if(msgs != null)
+				msgs.dispatch();
+		} else if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.QUADRATIC_CURVE_TO__POINT, newPoint, newPoint));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Point getControl() {
@@ -125,115 +134,122 @@ public class QuadraticCurveToImpl extends PathCommandImpl implements
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public NotificationChain basicSetControl(Point newControl,
-			NotificationChain msgs) {
+	public NotificationChain basicSetControl(Point newControl, NotificationChain msgs) {
 		Point oldControl = control;
 		control = newControl;
-		if (eNotificationRequired()) {
+		if(eNotificationRequired()) {
 			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, DGPackage.QUADRATIC_CURVE_TO__CONTROL, oldControl, newControl);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
+			if(msgs == null)
+				msgs = notification;
+			else
+				msgs.add(notification);
 		}
 		return msgs;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setControl(Point newControl) {
-		if (newControl != control) {
+		if(newControl != control) {
 			NotificationChain msgs = null;
-			if (control != null)
+			if(control != null)
 				msgs = ((InternalEObject)control).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - DGPackage.QUADRATIC_CURVE_TO__CONTROL, null, msgs);
-			if (newControl != null)
+			if(newControl != null)
 				msgs = ((InternalEObject)newControl).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - DGPackage.QUADRATIC_CURVE_TO__CONTROL, null, msgs);
 			msgs = basicSetControl(newControl, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
+			if(msgs != null)
+				msgs.dispatch();
+		} else if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.QUADRATIC_CURVE_TO__CONTROL, newControl, newControl));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd,
-			int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case DGPackage.QUADRATIC_CURVE_TO__CONTROL:
-				return basicSetControl(null, msgs);
-			case DGPackage.QUADRATIC_CURVE_TO__POINT:
-				return basicSetPoint(null, msgs);
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch(featureID) {
+		case DGPackage.QUADRATIC_CURVE_TO__CONTROL:
+			return basicSetControl(null, msgs);
+		case DGPackage.QUADRATIC_CURVE_TO__POINT:
+			return basicSetPoint(null, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case DGPackage.QUADRATIC_CURVE_TO__CONTROL:
-				return getControl();
-			case DGPackage.QUADRATIC_CURVE_TO__POINT:
-				return getPoint();
+		switch(featureID) {
+		case DGPackage.QUADRATIC_CURVE_TO__CONTROL:
+			return getControl();
+		case DGPackage.QUADRATIC_CURVE_TO__POINT:
+			return getPoint();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case DGPackage.QUADRATIC_CURVE_TO__CONTROL:
-				setControl((Point)newValue);
-				return;
-			case DGPackage.QUADRATIC_CURVE_TO__POINT:
-				setPoint((Point)newValue);
-				return;
+		switch(featureID) {
+		case DGPackage.QUADRATIC_CURVE_TO__CONTROL:
+			setControl((Point)newValue);
+			return;
+		case DGPackage.QUADRATIC_CURVE_TO__POINT:
+			setPoint((Point)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case DGPackage.QUADRATIC_CURVE_TO__CONTROL:
-				setControl((Point)null);
-				return;
-			case DGPackage.QUADRATIC_CURVE_TO__POINT:
-				setPoint((Point)null);
-				return;
+		switch(featureID) {
+		case DGPackage.QUADRATIC_CURVE_TO__CONTROL:
+			setControl((Point)null);
+			return;
+		case DGPackage.QUADRATIC_CURVE_TO__POINT:
+			setPoint((Point)null);
+			return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case DGPackage.QUADRATIC_CURVE_TO__CONTROL:
-				return control != null;
-			case DGPackage.QUADRATIC_CURVE_TO__POINT:
-				return point != null;
+		switch(featureID) {
+		case DGPackage.QUADRATIC_CURVE_TO__CONTROL:
+			return control != null;
+		case DGPackage.QUADRATIC_CURVE_TO__POINT:
+			return point != null;
 		}
 		return super.eIsSet(featureID);
 	}
-
 } // QuadraticCurveToImpl
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/RadialGradientImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/RadialGradientImpl.java
index cbce0df2967..7c41637a645 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/RadialGradientImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/RadialGradientImpl.java
@@ -34,23 +34,24 @@ import org.eclipse.papyrus.dd.dg.RadialGradient;
 import org.eclipse.papyrus.dd.dg.util.DGValidator;
 
 /**
- * <!-- begin-user-doc --> An implementation of the model object '
- * <em><b>Radial Gradient</b></em>'. <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object ' <em><b>Radial Gradient</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.dd.dg.impl.RadialGradientImpl#getCenter <em>Center</em>}</li>
- *   <li>{@link org.eclipse.papyrus.dd.dg.impl.RadialGradientImpl#getFocus <em>Focus</em>}</li>
- *   <li>{@link org.eclipse.papyrus.dd.dg.impl.RadialGradientImpl#getRadius <em>Radius</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.impl.RadialGradientImpl#getCenter <em>Center</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.impl.RadialGradientImpl#getFocus <em>Focus</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.impl.RadialGradientImpl#getRadius <em>Radius</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class RadialGradientImpl extends GradientImpl implements RadialGradient {
+
 	/**
 	 * The cached value of the '{@link #getCenter() <em>Center</em>}' containment reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getCenter()
 	 * @generated
 	 * @ordered
@@ -60,6 +61,7 @@ public class RadialGradientImpl extends GradientImpl implements RadialGradient {
 	/**
 	 * The cached value of the '{@link #getFocus() <em>Focus</em>}' containment reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getFocus()
 	 * @generated
 	 * @ordered
@@ -69,6 +71,7 @@ public class RadialGradientImpl extends GradientImpl implements RadialGradient {
 	/**
 	 * The default value of the '{@link #getRadius() <em>Radius</em>}' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getRadius()
 	 * @generated
 	 * @ordered
@@ -78,6 +81,7 @@ public class RadialGradientImpl extends GradientImpl implements RadialGradient {
 	/**
 	 * The cached value of the '{@link #getRadius() <em>Radius</em>}' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getRadius()
 	 * @generated
 	 * @ordered
@@ -86,6 +90,7 @@ public class RadialGradientImpl extends GradientImpl implements RadialGradient {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected RadialGradientImpl() {
@@ -94,6 +99,7 @@ public class RadialGradientImpl extends GradientImpl implements RadialGradient {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -103,6 +109,7 @@ public class RadialGradientImpl extends GradientImpl implements RadialGradient {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Point getCenter() {
@@ -111,39 +118,44 @@ public class RadialGradientImpl extends GradientImpl implements RadialGradient {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public NotificationChain basicSetCenter(Point newCenter,
-			NotificationChain msgs) {
+	public NotificationChain basicSetCenter(Point newCenter, NotificationChain msgs) {
 		Point oldCenter = center;
 		center = newCenter;
-		if (eNotificationRequired()) {
+		if(eNotificationRequired()) {
 			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, DGPackage.RADIAL_GRADIENT__CENTER, oldCenter, newCenter);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
+			if(msgs == null)
+				msgs = notification;
+			else
+				msgs.add(notification);
 		}
 		return msgs;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setCenter(Point newCenter) {
-		if (newCenter != center) {
+		if(newCenter != center) {
 			NotificationChain msgs = null;
-			if (center != null)
+			if(center != null)
 				msgs = ((InternalEObject)center).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - DGPackage.RADIAL_GRADIENT__CENTER, null, msgs);
-			if (newCenter != null)
+			if(newCenter != null)
 				msgs = ((InternalEObject)newCenter).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - DGPackage.RADIAL_GRADIENT__CENTER, null, msgs);
 			msgs = basicSetCenter(newCenter, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
+			if(msgs != null)
+				msgs.dispatch();
+		} else if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.RADIAL_GRADIENT__CENTER, newCenter, newCenter));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Point getFocus() {
@@ -152,39 +164,44 @@ public class RadialGradientImpl extends GradientImpl implements RadialGradient {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public NotificationChain basicSetFocus(Point newFocus,
-			NotificationChain msgs) {
+	public NotificationChain basicSetFocus(Point newFocus, NotificationChain msgs) {
 		Point oldFocus = focus;
 		focus = newFocus;
-		if (eNotificationRequired()) {
+		if(eNotificationRequired()) {
 			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, DGPackage.RADIAL_GRADIENT__FOCUS, oldFocus, newFocus);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
+			if(msgs == null)
+				msgs = notification;
+			else
+				msgs.add(notification);
 		}
 		return msgs;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setFocus(Point newFocus) {
-		if (newFocus != focus) {
+		if(newFocus != focus) {
 			NotificationChain msgs = null;
-			if (focus != null)
+			if(focus != null)
 				msgs = ((InternalEObject)focus).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - DGPackage.RADIAL_GRADIENT__FOCUS, null, msgs);
-			if (newFocus != null)
+			if(newFocus != null)
 				msgs = ((InternalEObject)newFocus).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - DGPackage.RADIAL_GRADIENT__FOCUS, null, msgs);
 			msgs = basicSetFocus(newFocus, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
+			if(msgs != null)
+				msgs.dispatch();
+		} else if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.RADIAL_GRADIENT__FOCUS, newFocus, newFocus));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public double getRadius() {
@@ -193,19 +210,22 @@ public class RadialGradientImpl extends GradientImpl implements RadialGradient {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setRadius(double newRadius) {
 		double oldRadius = radius;
 		radius = newRadius;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.RADIAL_GRADIENT__RADIUS, oldRadius, radius));
 	}
 
 	/**
-	 * The cached validation expression for the '{@link #validCenterPoint(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Valid Center Point</em>}' invariant operation.
+	 * The cached validation expression for the '{@link #validCenterPoint(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
+	 * <em>Valid Center Point</em>}' invariant operation.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @see #validCenterPoint(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
 	 * @generated
 	 * @ordered
@@ -214,28 +234,19 @@ public class RadialGradientImpl extends GradientImpl implements RadialGradient {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public boolean validCenterPoint(DiagnosticChain diagnostics,
-			Map<Object, Object> context) {
-		return
-			DGValidator.validate
-				(DGPackage.Literals.RADIAL_GRADIENT,
-				 this,
-				 diagnostics,
-				 context,
-				 "http://www.eclipse.org/emf/2002/Ecore/OCL",
-				 DGPackage.Literals.RADIAL_GRADIENT___VALID_CENTER_POINT__DIAGNOSTICCHAIN_MAP,
-				 VALID_CENTER_POINT_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION,
-				 Diagnostic.ERROR,
-				 DGValidator.DIAGNOSTIC_SOURCE,
-				 DGValidator.RADIAL_GRADIENT__VALID_CENTER_POINT);
+	public boolean validCenterPoint(DiagnosticChain diagnostics, Map<Object, Object> context) {
+		return DGValidator.validate(DGPackage.Literals.RADIAL_GRADIENT, this, diagnostics, context, "http://www.eclipse.org/emf/2002/Ecore/OCL", DGPackage.Literals.RADIAL_GRADIENT___VALID_CENTER_POINT__DIAGNOSTICCHAIN_MAP, VALID_CENTER_POINT_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION, Diagnostic.ERROR, DGValidator.DIAGNOSTIC_SOURCE, DGValidator.RADIAL_GRADIENT__VALID_CENTER_POINT);
 	}
 
 	/**
-	 * The cached validation expression for the '{@link #validFocusPoint(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Valid Focus Point</em>}' invariant operation.
+	 * The cached validation expression for the '{@link #validFocusPoint(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
+	 * <em>Valid Focus Point</em>}' invariant operation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #validFocusPoint(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
 	 * @generated
 	 * @ordered
@@ -244,28 +255,19 @@ public class RadialGradientImpl extends GradientImpl implements RadialGradient {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public boolean validFocusPoint(DiagnosticChain diagnostics,
-			Map<Object, Object> context) {
-		return
-			DGValidator.validate
-				(DGPackage.Literals.RADIAL_GRADIENT,
-				 this,
-				 diagnostics,
-				 context,
-				 "http://www.eclipse.org/emf/2002/Ecore/OCL",
-				 DGPackage.Literals.RADIAL_GRADIENT___VALID_FOCUS_POINT__DIAGNOSTICCHAIN_MAP,
-				 VALID_FOCUS_POINT_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION,
-				 Diagnostic.ERROR,
-				 DGValidator.DIAGNOSTIC_SOURCE,
-				 DGValidator.RADIAL_GRADIENT__VALID_FOCUS_POINT);
+	public boolean validFocusPoint(DiagnosticChain diagnostics, Map<Object, Object> context) {
+		return DGValidator.validate(DGPackage.Literals.RADIAL_GRADIENT, this, diagnostics, context, "http://www.eclipse.org/emf/2002/Ecore/OCL", DGPackage.Literals.RADIAL_GRADIENT___VALID_FOCUS_POINT__DIAGNOSTICCHAIN_MAP, VALID_FOCUS_POINT_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION, Diagnostic.ERROR, DGValidator.DIAGNOSTIC_SOURCE, DGValidator.RADIAL_GRADIENT__VALID_FOCUS_POINT);
 	}
 
 	/**
-	 * The cached validation expression for the '{@link #validRadius(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Valid Radius</em>}' invariant operation.
+	 * The cached validation expression for the '{@link #validRadius(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
+	 * <em>Valid Radius</em>}' invariant operation.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @see #validRadius(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
 	 * @generated
 	 * @ordered
@@ -274,146 +276,139 @@ public class RadialGradientImpl extends GradientImpl implements RadialGradient {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public boolean validRadius(DiagnosticChain diagnostics,
-			Map<Object, Object> context) {
-		return
-			DGValidator.validate
-				(DGPackage.Literals.RADIAL_GRADIENT,
-				 this,
-				 diagnostics,
-				 context,
-				 "http://www.eclipse.org/emf/2002/Ecore/OCL",
-				 DGPackage.Literals.RADIAL_GRADIENT___VALID_RADIUS__DIAGNOSTICCHAIN_MAP,
-				 VALID_RADIUS_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION,
-				 Diagnostic.ERROR,
-				 DGValidator.DIAGNOSTIC_SOURCE,
-				 DGValidator.RADIAL_GRADIENT__VALID_RADIUS);
+	public boolean validRadius(DiagnosticChain diagnostics, Map<Object, Object> context) {
+		return DGValidator.validate(DGPackage.Literals.RADIAL_GRADIENT, this, diagnostics, context, "http://www.eclipse.org/emf/2002/Ecore/OCL", DGPackage.Literals.RADIAL_GRADIENT___VALID_RADIUS__DIAGNOSTICCHAIN_MAP, VALID_RADIUS_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION, Diagnostic.ERROR, DGValidator.DIAGNOSTIC_SOURCE, DGValidator.RADIAL_GRADIENT__VALID_RADIUS);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd,
-			int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case DGPackage.RADIAL_GRADIENT__CENTER:
-				return basicSetCenter(null, msgs);
-			case DGPackage.RADIAL_GRADIENT__FOCUS:
-				return basicSetFocus(null, msgs);
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch(featureID) {
+		case DGPackage.RADIAL_GRADIENT__CENTER:
+			return basicSetCenter(null, msgs);
+		case DGPackage.RADIAL_GRADIENT__FOCUS:
+			return basicSetFocus(null, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case DGPackage.RADIAL_GRADIENT__CENTER:
-				return getCenter();
-			case DGPackage.RADIAL_GRADIENT__FOCUS:
-				return getFocus();
-			case DGPackage.RADIAL_GRADIENT__RADIUS:
-				return getRadius();
+		switch(featureID) {
+		case DGPackage.RADIAL_GRADIENT__CENTER:
+			return getCenter();
+		case DGPackage.RADIAL_GRADIENT__FOCUS:
+			return getFocus();
+		case DGPackage.RADIAL_GRADIENT__RADIUS:
+			return getRadius();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case DGPackage.RADIAL_GRADIENT__CENTER:
-				setCenter((Point)newValue);
-				return;
-			case DGPackage.RADIAL_GRADIENT__FOCUS:
-				setFocus((Point)newValue);
-				return;
-			case DGPackage.RADIAL_GRADIENT__RADIUS:
-				setRadius((Double)newValue);
-				return;
+		switch(featureID) {
+		case DGPackage.RADIAL_GRADIENT__CENTER:
+			setCenter((Point)newValue);
+			return;
+		case DGPackage.RADIAL_GRADIENT__FOCUS:
+			setFocus((Point)newValue);
+			return;
+		case DGPackage.RADIAL_GRADIENT__RADIUS:
+			setRadius((Double)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case DGPackage.RADIAL_GRADIENT__CENTER:
-				setCenter((Point)null);
-				return;
-			case DGPackage.RADIAL_GRADIENT__FOCUS:
-				setFocus((Point)null);
-				return;
-			case DGPackage.RADIAL_GRADIENT__RADIUS:
-				setRadius(RADIUS_EDEFAULT);
-				return;
+		switch(featureID) {
+		case DGPackage.RADIAL_GRADIENT__CENTER:
+			setCenter((Point)null);
+			return;
+		case DGPackage.RADIAL_GRADIENT__FOCUS:
+			setFocus((Point)null);
+			return;
+		case DGPackage.RADIAL_GRADIENT__RADIUS:
+			setRadius(RADIUS_EDEFAULT);
+			return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case DGPackage.RADIAL_GRADIENT__CENTER:
-				return center != null;
-			case DGPackage.RADIAL_GRADIENT__FOCUS:
-				return focus != null;
-			case DGPackage.RADIAL_GRADIENT__RADIUS:
-				return radius != RADIUS_EDEFAULT;
+		switch(featureID) {
+		case DGPackage.RADIAL_GRADIENT__CENTER:
+			return center != null;
+		case DGPackage.RADIAL_GRADIENT__FOCUS:
+			return focus != null;
+		case DGPackage.RADIAL_GRADIENT__RADIUS:
+			return radius != RADIUS_EDEFAULT;
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	@SuppressWarnings("unchecked")
-	public Object eInvoke(int operationID, EList<?> arguments)
-			throws InvocationTargetException {
-		switch (operationID) {
-			case DGPackage.RADIAL_GRADIENT___VALID_CENTER_POINT__DIAGNOSTICCHAIN_MAP:
-				return validCenterPoint((DiagnosticChain)arguments.get(0), (Map<Object, Object>)arguments.get(1));
-			case DGPackage.RADIAL_GRADIENT___VALID_FOCUS_POINT__DIAGNOSTICCHAIN_MAP:
-				return validFocusPoint((DiagnosticChain)arguments.get(0), (Map<Object, Object>)arguments.get(1));
-			case DGPackage.RADIAL_GRADIENT___VALID_RADIUS__DIAGNOSTICCHAIN_MAP:
-				return validRadius((DiagnosticChain)arguments.get(0), (Map<Object, Object>)arguments.get(1));
+	public Object eInvoke(int operationID, EList<?> arguments) throws InvocationTargetException {
+		switch(operationID) {
+		case DGPackage.RADIAL_GRADIENT___VALID_CENTER_POINT__DIAGNOSTICCHAIN_MAP:
+			return validCenterPoint((DiagnosticChain)arguments.get(0), (Map<Object, Object>)arguments.get(1));
+		case DGPackage.RADIAL_GRADIENT___VALID_FOCUS_POINT__DIAGNOSTICCHAIN_MAP:
+			return validFocusPoint((DiagnosticChain)arguments.get(0), (Map<Object, Object>)arguments.get(1));
+		case DGPackage.RADIAL_GRADIENT___VALID_RADIUS__DIAGNOSTICCHAIN_MAP:
+			return validRadius((DiagnosticChain)arguments.get(0), (Map<Object, Object>)arguments.get(1));
 		}
 		return super.eInvoke(operationID, arguments);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) return super.toString();
-
+		if(eIsProxy())
+			return super.toString();
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (radius: ");
 		result.append(radius);
 		result.append(')');
 		return result.toString();
 	}
-
 } // RadialGradientImpl
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/RectangleImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/RectangleImpl.java
index bee3afab487..e3b47e01f24 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/RectangleImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/RectangleImpl.java
@@ -31,22 +31,23 @@ import org.eclipse.papyrus.dd.dg.Rectangle;
 import org.eclipse.papyrus.dd.dg.util.DGValidator;
 
 /**
- * <!-- begin-user-doc --> An implementation of the model object '
- * <em><b>Rectangle</b></em>'. <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object ' <em><b>Rectangle</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.dd.dg.impl.RectangleImpl#getBounds <em>Bounds</em>}</li>
- *   <li>{@link org.eclipse.papyrus.dd.dg.impl.RectangleImpl#getCornerRadius <em>Corner Radius</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.impl.RectangleImpl#getBounds <em>Bounds</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.impl.RectangleImpl#getCornerRadius <em>Corner Radius</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class RectangleImpl extends GraphicalElementImpl implements Rectangle {
+
 	/**
 	 * The cached value of the '{@link #getBounds() <em>Bounds</em>}' containment reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getBounds()
 	 * @generated
 	 * @ordered
@@ -57,6 +58,7 @@ public class RectangleImpl extends GraphicalElementImpl implements Rectangle {
 	 * The default value of the '{@link #getCornerRadius() <em>Corner Radius</em>}' attribute.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @see #getCornerRadius()
 	 * @generated
 	 * @ordered
@@ -67,6 +69,7 @@ public class RectangleImpl extends GraphicalElementImpl implements Rectangle {
 	 * The cached value of the '{@link #getCornerRadius() <em>Corner Radius</em>}' attribute.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @see #getCornerRadius()
 	 * @generated
 	 * @ordered
@@ -84,6 +87,7 @@ public class RectangleImpl extends GraphicalElementImpl implements Rectangle {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected RectangleImpl() {
@@ -92,6 +96,7 @@ public class RectangleImpl extends GraphicalElementImpl implements Rectangle {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -101,6 +106,7 @@ public class RectangleImpl extends GraphicalElementImpl implements Rectangle {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Bounds getBounds() {
@@ -109,39 +115,44 @@ public class RectangleImpl extends GraphicalElementImpl implements Rectangle {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public NotificationChain basicSetBounds(Bounds newBounds,
-			NotificationChain msgs) {
+	public NotificationChain basicSetBounds(Bounds newBounds, NotificationChain msgs) {
 		Bounds oldBounds = bounds;
 		bounds = newBounds;
-		if (eNotificationRequired()) {
+		if(eNotificationRequired()) {
 			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, DGPackage.RECTANGLE__BOUNDS, oldBounds, newBounds);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
+			if(msgs == null)
+				msgs = notification;
+			else
+				msgs.add(notification);
 		}
 		return msgs;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setBounds(Bounds newBounds) {
-		if (newBounds != bounds) {
+		if(newBounds != bounds) {
 			NotificationChain msgs = null;
-			if (bounds != null)
+			if(bounds != null)
 				msgs = ((InternalEObject)bounds).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - DGPackage.RECTANGLE__BOUNDS, null, msgs);
-			if (newBounds != null)
+			if(newBounds != null)
 				msgs = ((InternalEObject)newBounds).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - DGPackage.RECTANGLE__BOUNDS, null, msgs);
 			msgs = basicSetBounds(newBounds, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
+			if(msgs != null)
+				msgs.dispatch();
+		} else if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.RECTANGLE__BOUNDS, newBounds, newBounds));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public double getCornerRadius() {
@@ -150,6 +161,7 @@ public class RectangleImpl extends GraphicalElementImpl implements Rectangle {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setCornerRadius(double newCornerRadius) {
@@ -157,12 +169,13 @@ public class RectangleImpl extends GraphicalElementImpl implements Rectangle {
 		cornerRadius = newCornerRadius;
 		boolean oldCornerRadiusESet = cornerRadiusESet;
 		cornerRadiusESet = true;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.RECTANGLE__CORNER_RADIUS, oldCornerRadius, cornerRadius, !oldCornerRadiusESet));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void unsetCornerRadius() {
@@ -170,12 +183,13 @@ public class RectangleImpl extends GraphicalElementImpl implements Rectangle {
 		boolean oldCornerRadiusESet = cornerRadiusESet;
 		cornerRadius = CORNER_RADIUS_EDEFAULT;
 		cornerRadiusESet = false;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.UNSET, DGPackage.RECTANGLE__CORNER_RADIUS, oldCornerRadius, CORNER_RADIUS_EDEFAULT, oldCornerRadiusESet));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetCornerRadius() {
@@ -183,13 +197,11 @@ public class RectangleImpl extends GraphicalElementImpl implements Rectangle {
 	}
 
 	/**
-	 * The cached validation expression for the '
-	 * {@link #nonNegativeCornerRadius(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
+	 * The cached validation expression for the ' {@link #nonNegativeCornerRadius(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
 	 * <em>Non Negative Corner Radius</em>}' invariant operation. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
-	 * @see #nonNegativeCornerRadius(org.eclipse.emf.common.util.DiagnosticChain,
-	 *      java.util.Map)
+	 * @see #nonNegativeCornerRadius(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
 	 * @generated
 	 * @ordered
 	 */
@@ -197,130 +209,126 @@ public class RectangleImpl extends GraphicalElementImpl implements Rectangle {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public boolean nonNegativeCornerRadius(DiagnosticChain diagnostics,
-			Map<Object, Object> context) {
-		return
-			DGValidator.validate
-				(DGPackage.Literals.RECTANGLE,
-				 this,
-				 diagnostics,
-				 context,
-				 "http://www.eclipse.org/emf/2002/Ecore/OCL",
-				 DGPackage.Literals.RECTANGLE___NON_NEGATIVE_CORNER_RADIUS__DIAGNOSTICCHAIN_MAP,
-				 NON_NEGATIVE_CORNER_RADIUS_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION,
-				 Diagnostic.ERROR,
-				 DGValidator.DIAGNOSTIC_SOURCE,
-				 DGValidator.RECTANGLE__NON_NEGATIVE_CORNER_RADIUS);
+	public boolean nonNegativeCornerRadius(DiagnosticChain diagnostics, Map<Object, Object> context) {
+		return DGValidator.validate(DGPackage.Literals.RECTANGLE, this, diagnostics, context, "http://www.eclipse.org/emf/2002/Ecore/OCL", DGPackage.Literals.RECTANGLE___NON_NEGATIVE_CORNER_RADIUS__DIAGNOSTICCHAIN_MAP, NON_NEGATIVE_CORNER_RADIUS_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION, Diagnostic.ERROR, DGValidator.DIAGNOSTIC_SOURCE, DGValidator.RECTANGLE__NON_NEGATIVE_CORNER_RADIUS);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd,
-			int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case DGPackage.RECTANGLE__BOUNDS:
-				return basicSetBounds(null, msgs);
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch(featureID) {
+		case DGPackage.RECTANGLE__BOUNDS:
+			return basicSetBounds(null, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case DGPackage.RECTANGLE__BOUNDS:
-				return getBounds();
-			case DGPackage.RECTANGLE__CORNER_RADIUS:
-				return getCornerRadius();
+		switch(featureID) {
+		case DGPackage.RECTANGLE__BOUNDS:
+			return getBounds();
+		case DGPackage.RECTANGLE__CORNER_RADIUS:
+			return getCornerRadius();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case DGPackage.RECTANGLE__BOUNDS:
-				setBounds((Bounds)newValue);
-				return;
-			case DGPackage.RECTANGLE__CORNER_RADIUS:
-				setCornerRadius((Double)newValue);
-				return;
+		switch(featureID) {
+		case DGPackage.RECTANGLE__BOUNDS:
+			setBounds((Bounds)newValue);
+			return;
+		case DGPackage.RECTANGLE__CORNER_RADIUS:
+			setCornerRadius((Double)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case DGPackage.RECTANGLE__BOUNDS:
-				setBounds((Bounds)null);
-				return;
-			case DGPackage.RECTANGLE__CORNER_RADIUS:
-				unsetCornerRadius();
-				return;
+		switch(featureID) {
+		case DGPackage.RECTANGLE__BOUNDS:
+			setBounds((Bounds)null);
+			return;
+		case DGPackage.RECTANGLE__CORNER_RADIUS:
+			unsetCornerRadius();
+			return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case DGPackage.RECTANGLE__BOUNDS:
-				return bounds != null;
-			case DGPackage.RECTANGLE__CORNER_RADIUS:
-				return isSetCornerRadius();
+		switch(featureID) {
+		case DGPackage.RECTANGLE__BOUNDS:
+			return bounds != null;
+		case DGPackage.RECTANGLE__CORNER_RADIUS:
+			return isSetCornerRadius();
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	@SuppressWarnings("unchecked")
-	public Object eInvoke(int operationID, EList<?> arguments)
-			throws InvocationTargetException {
-		switch (operationID) {
-			case DGPackage.RECTANGLE___NON_NEGATIVE_CORNER_RADIUS__DIAGNOSTICCHAIN_MAP:
-				return nonNegativeCornerRadius((DiagnosticChain)arguments.get(0), (Map<Object, Object>)arguments.get(1));
+	public Object eInvoke(int operationID, EList<?> arguments) throws InvocationTargetException {
+		switch(operationID) {
+		case DGPackage.RECTANGLE___NON_NEGATIVE_CORNER_RADIUS__DIAGNOSTICCHAIN_MAP:
+			return nonNegativeCornerRadius((DiagnosticChain)arguments.get(0), (Map<Object, Object>)arguments.get(1));
 		}
 		return super.eInvoke(operationID, arguments);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) return super.toString();
-
+		if(eIsProxy())
+			return super.toString();
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (cornerRadius: ");
-		if (cornerRadiusESet) result.append(cornerRadius); else result.append("<unset>");
+		if(cornerRadiusESet)
+			result.append(cornerRadius);
+		else
+			result.append("<unset>");
 		result.append(')');
 		return result.toString();
 	}
-
 } // RectangleImpl
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/RootCanvasImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/RootCanvasImpl.java
index 7919199c12a..b94b60325f4 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/RootCanvasImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/RootCanvasImpl.java
@@ -34,25 +34,26 @@ import org.eclipse.papyrus.dd.dg.RootCanvas;
 import org.eclipse.papyrus.dd.dg.StyleSheet;
 
 /**
- * <!-- begin-user-doc --> An implementation of the model object '
- * <em><b>Root Canvas</b></em>'. <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object ' <em><b>Root Canvas</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.dd.dg.impl.RootCanvasImpl#getBackgroundColor <em>Background Color</em>}</li>
- *   <li>{@link org.eclipse.papyrus.dd.dg.impl.RootCanvasImpl#getDefinitions <em>Definitions</em>}</li>
- *   <li>{@link org.eclipse.papyrus.dd.dg.impl.RootCanvasImpl#getExternalStyleSheets <em>External Style Sheet</em>}</li>
- *   <li>{@link org.eclipse.papyrus.dd.dg.impl.RootCanvasImpl#getScripts <em>Script</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.impl.RootCanvasImpl#getBackgroundColor <em>Background Color</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.impl.RootCanvasImpl#getDefinitions <em>Definitions</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.impl.RootCanvasImpl#getExternalStyleSheets <em>External Style Sheet</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.impl.RootCanvasImpl#getScripts <em>Script</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class RootCanvasImpl extends CanvasImpl implements RootCanvas {
+
 	/**
 	 * The default value of the '{@link #getBackgroundColor() <em>Background Color</em>}' attribute.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @see #getBackgroundColor()
 	 * @generated
 	 * @ordered
@@ -63,6 +64,7 @@ public class RootCanvasImpl extends CanvasImpl implements RootCanvas {
 	 * The cached value of the '{@link #getBackgroundColor() <em>Background Color</em>}' attribute.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @see #getBackgroundColor()
 	 * @generated
 	 * @ordered
@@ -81,6 +83,7 @@ public class RootCanvasImpl extends CanvasImpl implements RootCanvas {
 	/**
 	 * The cached value of the '{@link #getDefinitions() <em>Definitions</em>}' containment reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getDefinitions()
 	 * @generated
 	 * @ordered
@@ -91,6 +94,7 @@ public class RootCanvasImpl extends CanvasImpl implements RootCanvas {
 	 * The cached value of the '{@link #getExternalStyleSheets() <em>External Style Sheet</em>}' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getExternalStyleSheets()
 	 * @generated
 	 * @ordered
@@ -101,6 +105,7 @@ public class RootCanvasImpl extends CanvasImpl implements RootCanvas {
 	 * The cached value of the '{@link #getScripts() <em>Script</em>}' attribute list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getScripts()
 	 * @generated
 	 * @ordered
@@ -109,6 +114,7 @@ public class RootCanvasImpl extends CanvasImpl implements RootCanvas {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected RootCanvasImpl() {
@@ -117,6 +123,7 @@ public class RootCanvasImpl extends CanvasImpl implements RootCanvas {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -126,6 +133,7 @@ public class RootCanvasImpl extends CanvasImpl implements RootCanvas {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Color getBackgroundColor() {
@@ -134,6 +142,7 @@ public class RootCanvasImpl extends CanvasImpl implements RootCanvas {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setBackgroundColor(Color newBackgroundColor) {
@@ -141,12 +150,13 @@ public class RootCanvasImpl extends CanvasImpl implements RootCanvas {
 		backgroundColor = newBackgroundColor;
 		boolean oldBackgroundColorESet = backgroundColorESet;
 		backgroundColorESet = true;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.ROOT_CANVAS__BACKGROUND_COLOR, oldBackgroundColor, backgroundColor, !oldBackgroundColorESet));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void unsetBackgroundColor() {
@@ -154,12 +164,13 @@ public class RootCanvasImpl extends CanvasImpl implements RootCanvas {
 		boolean oldBackgroundColorESet = backgroundColorESet;
 		backgroundColor = BACKGROUND_COLOR_EDEFAULT;
 		backgroundColorESet = false;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.UNSET, DGPackage.ROOT_CANVAS__BACKGROUND_COLOR, oldBackgroundColor, BACKGROUND_COLOR_EDEFAULT, oldBackgroundColorESet));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetBackgroundColor() {
@@ -168,6 +179,7 @@ public class RootCanvasImpl extends CanvasImpl implements RootCanvas {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Definitions getDefinitions() {
@@ -176,43 +188,48 @@ public class RootCanvasImpl extends CanvasImpl implements RootCanvas {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public NotificationChain basicSetDefinitions(Definitions newDefinitions,
-			NotificationChain msgs) {
+	public NotificationChain basicSetDefinitions(Definitions newDefinitions, NotificationChain msgs) {
 		Definitions oldDefinitions = definitions;
 		definitions = newDefinitions;
-		if (eNotificationRequired()) {
+		if(eNotificationRequired()) {
 			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, DGPackage.ROOT_CANVAS__DEFINITIONS, oldDefinitions, newDefinitions);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
+			if(msgs == null)
+				msgs = notification;
+			else
+				msgs.add(notification);
 		}
 		return msgs;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setDefinitions(Definitions newDefinitions) {
-		if (newDefinitions != definitions) {
+		if(newDefinitions != definitions) {
 			NotificationChain msgs = null;
-			if (definitions != null)
+			if(definitions != null)
 				msgs = ((InternalEObject)definitions).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - DGPackage.ROOT_CANVAS__DEFINITIONS, null, msgs);
-			if (newDefinitions != null)
+			if(newDefinitions != null)
 				msgs = ((InternalEObject)newDefinitions).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - DGPackage.ROOT_CANVAS__DEFINITIONS, null, msgs);
 			msgs = basicSetDefinitions(newDefinitions, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
+			if(msgs != null)
+				msgs.dispatch();
+		} else if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.ROOT_CANVAS__DEFINITIONS, newDefinitions, newDefinitions));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<StyleSheet> getExternalStyleSheets() {
-		if (externalStyleSheets == null) {
+		if(externalStyleSheets == null) {
 			externalStyleSheets = new EObjectResolvingEList<StyleSheet>(StyleSheet.class, this, DGPackage.ROOT_CANVAS__EXTERNAL_STYLE_SHEET);
 		}
 		return externalStyleSheets;
@@ -221,10 +238,11 @@ public class RootCanvasImpl extends CanvasImpl implements RootCanvas {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<String> getScripts() {
-		if (scripts == null) {
+		if(scripts == null) {
 			scripts = new EDataTypeUniqueEList<String>(String.class, this, DGPackage.ROOT_CANVAS__SCRIPT);
 		}
 		return scripts;
@@ -232,120 +250,127 @@ public class RootCanvasImpl extends CanvasImpl implements RootCanvas {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd,
-			int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case DGPackage.ROOT_CANVAS__DEFINITIONS:
-				return basicSetDefinitions(null, msgs);
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch(featureID) {
+		case DGPackage.ROOT_CANVAS__DEFINITIONS:
+			return basicSetDefinitions(null, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case DGPackage.ROOT_CANVAS__BACKGROUND_COLOR:
-				return getBackgroundColor();
-			case DGPackage.ROOT_CANVAS__DEFINITIONS:
-				return getDefinitions();
-			case DGPackage.ROOT_CANVAS__EXTERNAL_STYLE_SHEET:
-				return getExternalStyleSheets();
-			case DGPackage.ROOT_CANVAS__SCRIPT:
-				return getScripts();
+		switch(featureID) {
+		case DGPackage.ROOT_CANVAS__BACKGROUND_COLOR:
+			return getBackgroundColor();
+		case DGPackage.ROOT_CANVAS__DEFINITIONS:
+			return getDefinitions();
+		case DGPackage.ROOT_CANVAS__EXTERNAL_STYLE_SHEET:
+			return getExternalStyleSheets();
+		case DGPackage.ROOT_CANVAS__SCRIPT:
+			return getScripts();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case DGPackage.ROOT_CANVAS__BACKGROUND_COLOR:
-				setBackgroundColor((Color)newValue);
-				return;
-			case DGPackage.ROOT_CANVAS__DEFINITIONS:
-				setDefinitions((Definitions)newValue);
-				return;
-			case DGPackage.ROOT_CANVAS__EXTERNAL_STYLE_SHEET:
-				getExternalStyleSheets().clear();
-				getExternalStyleSheets().addAll((Collection<? extends StyleSheet>)newValue);
-				return;
-			case DGPackage.ROOT_CANVAS__SCRIPT:
-				getScripts().clear();
-				getScripts().addAll((Collection<? extends String>)newValue);
-				return;
+		switch(featureID) {
+		case DGPackage.ROOT_CANVAS__BACKGROUND_COLOR:
+			setBackgroundColor((Color)newValue);
+			return;
+		case DGPackage.ROOT_CANVAS__DEFINITIONS:
+			setDefinitions((Definitions)newValue);
+			return;
+		case DGPackage.ROOT_CANVAS__EXTERNAL_STYLE_SHEET:
+			getExternalStyleSheets().clear();
+			getExternalStyleSheets().addAll((Collection<? extends StyleSheet>)newValue);
+			return;
+		case DGPackage.ROOT_CANVAS__SCRIPT:
+			getScripts().clear();
+			getScripts().addAll((Collection<? extends String>)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case DGPackage.ROOT_CANVAS__BACKGROUND_COLOR:
-				unsetBackgroundColor();
-				return;
-			case DGPackage.ROOT_CANVAS__DEFINITIONS:
-				setDefinitions((Definitions)null);
-				return;
-			case DGPackage.ROOT_CANVAS__EXTERNAL_STYLE_SHEET:
-				getExternalStyleSheets().clear();
-				return;
-			case DGPackage.ROOT_CANVAS__SCRIPT:
-				getScripts().clear();
-				return;
+		switch(featureID) {
+		case DGPackage.ROOT_CANVAS__BACKGROUND_COLOR:
+			unsetBackgroundColor();
+			return;
+		case DGPackage.ROOT_CANVAS__DEFINITIONS:
+			setDefinitions((Definitions)null);
+			return;
+		case DGPackage.ROOT_CANVAS__EXTERNAL_STYLE_SHEET:
+			getExternalStyleSheets().clear();
+			return;
+		case DGPackage.ROOT_CANVAS__SCRIPT:
+			getScripts().clear();
+			return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case DGPackage.ROOT_CANVAS__BACKGROUND_COLOR:
-				return isSetBackgroundColor();
-			case DGPackage.ROOT_CANVAS__DEFINITIONS:
-				return definitions != null;
-			case DGPackage.ROOT_CANVAS__EXTERNAL_STYLE_SHEET:
-				return externalStyleSheets != null && !externalStyleSheets.isEmpty();
-			case DGPackage.ROOT_CANVAS__SCRIPT:
-				return scripts != null && !scripts.isEmpty();
+		switch(featureID) {
+		case DGPackage.ROOT_CANVAS__BACKGROUND_COLOR:
+			return isSetBackgroundColor();
+		case DGPackage.ROOT_CANVAS__DEFINITIONS:
+			return definitions != null;
+		case DGPackage.ROOT_CANVAS__EXTERNAL_STYLE_SHEET:
+			return externalStyleSheets != null && !externalStyleSheets.isEmpty();
+		case DGPackage.ROOT_CANVAS__SCRIPT:
+			return scripts != null && !scripts.isEmpty();
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) return super.toString();
-
+		if(eIsProxy())
+			return super.toString();
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (backgroundColor: ");
-		if (backgroundColorESet) result.append(backgroundColor); else result.append("<unset>");
+		if(backgroundColorESet)
+			result.append(backgroundColor);
+		else
+			result.append("<unset>");
 		result.append(", script: ");
 		result.append(scripts);
 		result.append(')');
 		return result.toString();
 	}
-
 } // RootCanvasImpl
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/RotateImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/RotateImpl.java
index efced33cc57..87a2d5cb3f3 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/RotateImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/RotateImpl.java
@@ -25,22 +25,23 @@ import org.eclipse.papyrus.dd.dg.DGPackage;
 import org.eclipse.papyrus.dd.dg.Rotate;
 
 /**
- * <!-- begin-user-doc --> An implementation of the model object '
- * <em><b>Rotate</b></em>'. <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object ' <em><b>Rotate</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.dd.dg.impl.RotateImpl#getAngle <em>Angle</em>}</li>
- *   <li>{@link org.eclipse.papyrus.dd.dg.impl.RotateImpl#getCenter <em>Center</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.impl.RotateImpl#getAngle <em>Angle</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.impl.RotateImpl#getCenter <em>Center</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class RotateImpl extends TransformImpl implements Rotate {
+
 	/**
 	 * The default value of the '{@link #getAngle() <em>Angle</em>}' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getAngle()
 	 * @generated
 	 * @ordered
@@ -50,6 +51,7 @@ public class RotateImpl extends TransformImpl implements Rotate {
 	/**
 	 * The cached value of the '{@link #getAngle() <em>Angle</em>}' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getAngle()
 	 * @generated
 	 * @ordered
@@ -59,6 +61,7 @@ public class RotateImpl extends TransformImpl implements Rotate {
 	/**
 	 * The cached value of the '{@link #getCenter() <em>Center</em>}' containment reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getCenter()
 	 * @generated
 	 * @ordered
@@ -67,6 +70,7 @@ public class RotateImpl extends TransformImpl implements Rotate {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected RotateImpl() {
@@ -75,6 +79,7 @@ public class RotateImpl extends TransformImpl implements Rotate {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -84,6 +89,7 @@ public class RotateImpl extends TransformImpl implements Rotate {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public double getAngle() {
@@ -92,17 +98,19 @@ public class RotateImpl extends TransformImpl implements Rotate {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setAngle(double newAngle) {
 		double oldAngle = angle;
 		angle = newAngle;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.ROTATE__ANGLE, oldAngle, angle));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Point getCenter() {
@@ -111,128 +119,136 @@ public class RotateImpl extends TransformImpl implements Rotate {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public NotificationChain basicSetCenter(Point newCenter,
-			NotificationChain msgs) {
+	public NotificationChain basicSetCenter(Point newCenter, NotificationChain msgs) {
 		Point oldCenter = center;
 		center = newCenter;
-		if (eNotificationRequired()) {
+		if(eNotificationRequired()) {
 			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, DGPackage.ROTATE__CENTER, oldCenter, newCenter);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
+			if(msgs == null)
+				msgs = notification;
+			else
+				msgs.add(notification);
 		}
 		return msgs;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setCenter(Point newCenter) {
-		if (newCenter != center) {
+		if(newCenter != center) {
 			NotificationChain msgs = null;
-			if (center != null)
+			if(center != null)
 				msgs = ((InternalEObject)center).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - DGPackage.ROTATE__CENTER, null, msgs);
-			if (newCenter != null)
+			if(newCenter != null)
 				msgs = ((InternalEObject)newCenter).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - DGPackage.ROTATE__CENTER, null, msgs);
 			msgs = basicSetCenter(newCenter, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
+			if(msgs != null)
+				msgs.dispatch();
+		} else if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.ROTATE__CENTER, newCenter, newCenter));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd,
-			int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case DGPackage.ROTATE__CENTER:
-				return basicSetCenter(null, msgs);
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch(featureID) {
+		case DGPackage.ROTATE__CENTER:
+			return basicSetCenter(null, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case DGPackage.ROTATE__ANGLE:
-				return getAngle();
-			case DGPackage.ROTATE__CENTER:
-				return getCenter();
+		switch(featureID) {
+		case DGPackage.ROTATE__ANGLE:
+			return getAngle();
+		case DGPackage.ROTATE__CENTER:
+			return getCenter();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case DGPackage.ROTATE__ANGLE:
-				setAngle((Double)newValue);
-				return;
-			case DGPackage.ROTATE__CENTER:
-				setCenter((Point)newValue);
-				return;
+		switch(featureID) {
+		case DGPackage.ROTATE__ANGLE:
+			setAngle((Double)newValue);
+			return;
+		case DGPackage.ROTATE__CENTER:
+			setCenter((Point)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case DGPackage.ROTATE__ANGLE:
-				setAngle(ANGLE_EDEFAULT);
-				return;
-			case DGPackage.ROTATE__CENTER:
-				setCenter((Point)null);
-				return;
+		switch(featureID) {
+		case DGPackage.ROTATE__ANGLE:
+			setAngle(ANGLE_EDEFAULT);
+			return;
+		case DGPackage.ROTATE__CENTER:
+			setCenter((Point)null);
+			return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case DGPackage.ROTATE__ANGLE:
-				return angle != ANGLE_EDEFAULT;
-			case DGPackage.ROTATE__CENTER:
-				return center != null;
+		switch(featureID) {
+		case DGPackage.ROTATE__ANGLE:
+			return angle != ANGLE_EDEFAULT;
+		case DGPackage.ROTATE__CENTER:
+			return center != null;
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) return super.toString();
-
+		if(eIsProxy())
+			return super.toString();
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (angle: ");
 		result.append(angle);
 		result.append(')');
 		return result.toString();
 	}
-
 } // RotateImpl
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/ScaleImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/ScaleImpl.java
index fdfb690e5b5..f4a996c2e02 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/ScaleImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/ScaleImpl.java
@@ -31,22 +31,23 @@ import org.eclipse.papyrus.dd.dg.Scale;
 import org.eclipse.papyrus.dd.dg.util.DGValidator;
 
 /**
- * <!-- begin-user-doc --> An implementation of the model object '
- * <em><b>Scale</b></em>'. <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object ' <em><b>Scale</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.dd.dg.impl.ScaleImpl#getFactorX <em>Factor X</em>}</li>
- *   <li>{@link org.eclipse.papyrus.dd.dg.impl.ScaleImpl#getFactorY <em>Factor Y</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.impl.ScaleImpl#getFactorX <em>Factor X</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.impl.ScaleImpl#getFactorY <em>Factor Y</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class ScaleImpl extends TransformImpl implements Scale {
+
 	/**
 	 * The default value of the '{@link #getFactorX() <em>Factor X</em>}' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getFactorX()
 	 * @generated
 	 * @ordered
@@ -56,6 +57,7 @@ public class ScaleImpl extends TransformImpl implements Scale {
 	/**
 	 * The cached value of the '{@link #getFactorX() <em>Factor X</em>}' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getFactorX()
 	 * @generated
 	 * @ordered
@@ -65,6 +67,7 @@ public class ScaleImpl extends TransformImpl implements Scale {
 	/**
 	 * The default value of the '{@link #getFactorY() <em>Factor Y</em>}' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getFactorY()
 	 * @generated
 	 * @ordered
@@ -74,6 +77,7 @@ public class ScaleImpl extends TransformImpl implements Scale {
 	/**
 	 * The cached value of the '{@link #getFactorY() <em>Factor Y</em>}' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getFactorY()
 	 * @generated
 	 * @ordered
@@ -82,6 +86,7 @@ public class ScaleImpl extends TransformImpl implements Scale {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected ScaleImpl() {
@@ -90,6 +95,7 @@ public class ScaleImpl extends TransformImpl implements Scale {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -99,6 +105,7 @@ public class ScaleImpl extends TransformImpl implements Scale {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public double getFactorX() {
@@ -107,17 +114,19 @@ public class ScaleImpl extends TransformImpl implements Scale {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setFactorX(double newFactorX) {
 		double oldFactorX = factorX;
 		factorX = newFactorX;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.SCALE__FACTOR_X, oldFactorX, factorX));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public double getFactorY() {
@@ -126,19 +135,22 @@ public class ScaleImpl extends TransformImpl implements Scale {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setFactorY(double newFactorY) {
 		double oldFactorY = factorY;
 		factorY = newFactorY;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.SCALE__FACTOR_Y, oldFactorY, factorY));
 	}
 
 	/**
-	 * The cached validation expression for the '{@link #nonnegativescale(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Nonnegativescale</em>}' invariant operation.
+	 * The cached validation expression for the '{@link #nonnegativescale(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
+	 * <em>Nonnegativescale</em>}' invariant operation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #nonnegativescale(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
 	 * @generated
 	 * @ordered
@@ -147,111 +159,105 @@ public class ScaleImpl extends TransformImpl implements Scale {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public boolean nonnegativescale(DiagnosticChain diagnostics,
-			Map<Object, Object> context) {
-		return
-			DGValidator.validate
-				(DGPackage.Literals.SCALE,
-				 this,
-				 diagnostics,
-				 context,
-				 "http://www.eclipse.org/emf/2002/Ecore/OCL",
-				 DGPackage.Literals.SCALE___NONNEGATIVESCALE__DIAGNOSTICCHAIN_MAP,
-				 NONNEGATIVESCALE_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION,
-				 Diagnostic.ERROR,
-				 DGValidator.DIAGNOSTIC_SOURCE,
-				 DGValidator.SCALE__NONNEGATIVESCALE);
+	public boolean nonnegativescale(DiagnosticChain diagnostics, Map<Object, Object> context) {
+		return DGValidator.validate(DGPackage.Literals.SCALE, this, diagnostics, context, "http://www.eclipse.org/emf/2002/Ecore/OCL", DGPackage.Literals.SCALE___NONNEGATIVESCALE__DIAGNOSTICCHAIN_MAP, NONNEGATIVESCALE_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION, Diagnostic.ERROR, DGValidator.DIAGNOSTIC_SOURCE, DGValidator.SCALE__NONNEGATIVESCALE);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case DGPackage.SCALE__FACTOR_X:
-				return getFactorX();
-			case DGPackage.SCALE__FACTOR_Y:
-				return getFactorY();
+		switch(featureID) {
+		case DGPackage.SCALE__FACTOR_X:
+			return getFactorX();
+		case DGPackage.SCALE__FACTOR_Y:
+			return getFactorY();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case DGPackage.SCALE__FACTOR_X:
-				setFactorX((Double)newValue);
-				return;
-			case DGPackage.SCALE__FACTOR_Y:
-				setFactorY((Double)newValue);
-				return;
+		switch(featureID) {
+		case DGPackage.SCALE__FACTOR_X:
+			setFactorX((Double)newValue);
+			return;
+		case DGPackage.SCALE__FACTOR_Y:
+			setFactorY((Double)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case DGPackage.SCALE__FACTOR_X:
-				setFactorX(FACTOR_X_EDEFAULT);
-				return;
-			case DGPackage.SCALE__FACTOR_Y:
-				setFactorY(FACTOR_Y_EDEFAULT);
-				return;
+		switch(featureID) {
+		case DGPackage.SCALE__FACTOR_X:
+			setFactorX(FACTOR_X_EDEFAULT);
+			return;
+		case DGPackage.SCALE__FACTOR_Y:
+			setFactorY(FACTOR_Y_EDEFAULT);
+			return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case DGPackage.SCALE__FACTOR_X:
-				return factorX != FACTOR_X_EDEFAULT;
-			case DGPackage.SCALE__FACTOR_Y:
-				return factorY != FACTOR_Y_EDEFAULT;
+		switch(featureID) {
+		case DGPackage.SCALE__FACTOR_X:
+			return factorX != FACTOR_X_EDEFAULT;
+		case DGPackage.SCALE__FACTOR_Y:
+			return factorY != FACTOR_Y_EDEFAULT;
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	@SuppressWarnings("unchecked")
-	public Object eInvoke(int operationID, EList<?> arguments)
-			throws InvocationTargetException {
-		switch (operationID) {
-			case DGPackage.SCALE___NONNEGATIVESCALE__DIAGNOSTICCHAIN_MAP:
-				return nonnegativescale((DiagnosticChain)arguments.get(0), (Map<Object, Object>)arguments.get(1));
+	public Object eInvoke(int operationID, EList<?> arguments) throws InvocationTargetException {
+		switch(operationID) {
+		case DGPackage.SCALE___NONNEGATIVESCALE__DIAGNOSTICCHAIN_MAP:
+			return nonnegativescale((DiagnosticChain)arguments.get(0), (Map<Object, Object>)arguments.get(1));
 		}
 		return super.eInvoke(operationID, arguments);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) return super.toString();
-
+		if(eIsProxy())
+			return super.toString();
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (factorX: ");
 		result.append(factorX);
@@ -260,5 +266,4 @@ public class ScaleImpl extends TransformImpl implements Scale {
 		result.append(')');
 		return result.toString();
 	}
-
 } // ScaleImpl
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/SkewImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/SkewImpl.java
index 08eeb65152b..13ea8501753 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/SkewImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/SkewImpl.java
@@ -21,22 +21,23 @@ import org.eclipse.papyrus.dd.dg.DGPackage;
 import org.eclipse.papyrus.dd.dg.Skew;
 
 /**
- * <!-- begin-user-doc --> An implementation of the model object '
- * <em><b>Skew</b></em>'. <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object ' <em><b>Skew</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.dd.dg.impl.SkewImpl#getAngleX <em>Angle X</em>}</li>
- *   <li>{@link org.eclipse.papyrus.dd.dg.impl.SkewImpl#getAngleY <em>Angle Y</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.impl.SkewImpl#getAngleX <em>Angle X</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.impl.SkewImpl#getAngleY <em>Angle Y</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class SkewImpl extends TransformImpl implements Skew {
+
 	/**
 	 * The default value of the '{@link #getAngleX() <em>Angle X</em>}' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getAngleX()
 	 * @generated
 	 * @ordered
@@ -46,6 +47,7 @@ public class SkewImpl extends TransformImpl implements Skew {
 	/**
 	 * The cached value of the '{@link #getAngleX() <em>Angle X</em>}' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getAngleX()
 	 * @generated
 	 * @ordered
@@ -55,6 +57,7 @@ public class SkewImpl extends TransformImpl implements Skew {
 	/**
 	 * The default value of the '{@link #getAngleY() <em>Angle Y</em>}' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getAngleY()
 	 * @generated
 	 * @ordered
@@ -64,6 +67,7 @@ public class SkewImpl extends TransformImpl implements Skew {
 	/**
 	 * The cached value of the '{@link #getAngleY() <em>Angle Y</em>}' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getAngleY()
 	 * @generated
 	 * @ordered
@@ -72,6 +76,7 @@ public class SkewImpl extends TransformImpl implements Skew {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected SkewImpl() {
@@ -80,6 +85,7 @@ public class SkewImpl extends TransformImpl implements Skew {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -89,6 +95,7 @@ public class SkewImpl extends TransformImpl implements Skew {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public double getAngleX() {
@@ -97,17 +104,19 @@ public class SkewImpl extends TransformImpl implements Skew {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setAngleX(double newAngleX) {
 		double oldAngleX = angleX;
 		angleX = newAngleX;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.SKEW__ANGLE_X, oldAngleX, angleX));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public double getAngleY() {
@@ -116,87 +125,93 @@ public class SkewImpl extends TransformImpl implements Skew {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setAngleY(double newAngleY) {
 		double oldAngleY = angleY;
 		angleY = newAngleY;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.SKEW__ANGLE_Y, oldAngleY, angleY));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case DGPackage.SKEW__ANGLE_X:
-				return getAngleX();
-			case DGPackage.SKEW__ANGLE_Y:
-				return getAngleY();
+		switch(featureID) {
+		case DGPackage.SKEW__ANGLE_X:
+			return getAngleX();
+		case DGPackage.SKEW__ANGLE_Y:
+			return getAngleY();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case DGPackage.SKEW__ANGLE_X:
-				setAngleX((Double)newValue);
-				return;
-			case DGPackage.SKEW__ANGLE_Y:
-				setAngleY((Double)newValue);
-				return;
+		switch(featureID) {
+		case DGPackage.SKEW__ANGLE_X:
+			setAngleX((Double)newValue);
+			return;
+		case DGPackage.SKEW__ANGLE_Y:
+			setAngleY((Double)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case DGPackage.SKEW__ANGLE_X:
-				setAngleX(ANGLE_X_EDEFAULT);
-				return;
-			case DGPackage.SKEW__ANGLE_Y:
-				setAngleY(ANGLE_Y_EDEFAULT);
-				return;
+		switch(featureID) {
+		case DGPackage.SKEW__ANGLE_X:
+			setAngleX(ANGLE_X_EDEFAULT);
+			return;
+		case DGPackage.SKEW__ANGLE_Y:
+			setAngleY(ANGLE_Y_EDEFAULT);
+			return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case DGPackage.SKEW__ANGLE_X:
-				return angleX != ANGLE_X_EDEFAULT;
-			case DGPackage.SKEW__ANGLE_Y:
-				return angleY != ANGLE_Y_EDEFAULT;
+		switch(featureID) {
+		case DGPackage.SKEW__ANGLE_X:
+			return angleX != ANGLE_X_EDEFAULT;
+		case DGPackage.SKEW__ANGLE_Y:
+			return angleY != ANGLE_Y_EDEFAULT;
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) return super.toString();
-
+		if(eIsProxy())
+			return super.toString();
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (angleX: ");
 		result.append(angleX);
@@ -205,5 +220,4 @@ public class SkewImpl extends TransformImpl implements Skew {
 		result.append(')');
 		return result.toString();
 	}
-
 } // SkewImpl
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/StyleImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/StyleImpl.java
index 022c74814bf..6b3405f0121 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/StyleImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/StyleImpl.java
@@ -40,31 +40,32 @@ import org.eclipse.papyrus.dd.dg.Style;
 import org.eclipse.papyrus.dd.dg.util.DGValidator;
 
 /**
- * <!-- begin-user-doc --> An implementation of the model object '
- * <em><b>Style</b></em>'. <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object ' <em><b>Style</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.dd.dg.impl.StyleImpl#getFill <em>Fill</em>}</li>
- *   <li>{@link org.eclipse.papyrus.dd.dg.impl.StyleImpl#getFillOpacity <em>Fill Opacity</em>}</li>
- *   <li>{@link org.eclipse.papyrus.dd.dg.impl.StyleImpl#getStroke <em>Stroke</em>}</li>
- *   <li>{@link org.eclipse.papyrus.dd.dg.impl.StyleImpl#getStrokeWidth <em>Stroke Width</em>}</li>
- *   <li>{@link org.eclipse.papyrus.dd.dg.impl.StyleImpl#getStrokeOpacity <em>Stroke Opacity</em>}</li>
- *   <li>{@link org.eclipse.papyrus.dd.dg.impl.StyleImpl#getStrokeDashLengths <em>Stroke Dash Length</em>}</li>
- *   <li>{@link org.eclipse.papyrus.dd.dg.impl.StyleImpl#getFontSize <em>Font Size</em>}</li>
- *   <li>{@link org.eclipse.papyrus.dd.dg.impl.StyleImpl#getFontName <em>Font Name</em>}</li>
- *   <li>{@link org.eclipse.papyrus.dd.dg.impl.StyleImpl#isFontItalic <em>Font Italic</em>}</li>
- *   <li>{@link org.eclipse.papyrus.dd.dg.impl.StyleImpl#isFontBold <em>Font Bold</em>}</li>
- *   <li>{@link org.eclipse.papyrus.dd.dg.impl.StyleImpl#getFontDecoration <em>Font Decoration</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.impl.StyleImpl#getFill <em>Fill</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.impl.StyleImpl#getFillOpacity <em>Fill Opacity</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.impl.StyleImpl#getStroke <em>Stroke</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.impl.StyleImpl#getStrokeWidth <em>Stroke Width</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.impl.StyleImpl#getStrokeOpacity <em>Stroke Opacity</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.impl.StyleImpl#getStrokeDashLengths <em>Stroke Dash Length</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.impl.StyleImpl#getFontSize <em>Font Size</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.impl.StyleImpl#getFontName <em>Font Name</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.impl.StyleImpl#isFontItalic <em>Font Italic</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.impl.StyleImpl#isFontBold <em>Font Bold</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.impl.StyleImpl#getFontDecoration <em>Font Decoration</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class StyleImpl extends MinimalEObjectImpl.Container implements Style {
+
 	/**
 	 * The cached value of the '{@link #getFill() <em>Fill</em>}' containment reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getFill()
 	 * @generated
 	 * @ordered
@@ -83,6 +84,7 @@ public class StyleImpl extends MinimalEObjectImpl.Container implements Style {
 	/**
 	 * The default value of the '{@link #getFillOpacity() <em>Fill Opacity</em>}' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getFillOpacity()
 	 * @generated
 	 * @ordered
@@ -92,6 +94,7 @@ public class StyleImpl extends MinimalEObjectImpl.Container implements Style {
 	/**
 	 * The cached value of the '{@link #getFillOpacity() <em>Fill Opacity</em>}' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getFillOpacity()
 	 * @generated
 	 * @ordered
@@ -110,6 +113,7 @@ public class StyleImpl extends MinimalEObjectImpl.Container implements Style {
 	/**
 	 * The cached value of the '{@link #getStroke() <em>Stroke</em>}' containment reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getStroke()
 	 * @generated
 	 * @ordered
@@ -128,6 +132,7 @@ public class StyleImpl extends MinimalEObjectImpl.Container implements Style {
 	/**
 	 * The default value of the '{@link #getStrokeWidth() <em>Stroke Width</em>}' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getStrokeWidth()
 	 * @generated
 	 * @ordered
@@ -137,6 +142,7 @@ public class StyleImpl extends MinimalEObjectImpl.Container implements Style {
 	/**
 	 * The cached value of the '{@link #getStrokeWidth() <em>Stroke Width</em>}' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getStrokeWidth()
 	 * @generated
 	 * @ordered
@@ -156,6 +162,7 @@ public class StyleImpl extends MinimalEObjectImpl.Container implements Style {
 	 * The default value of the '{@link #getStrokeOpacity() <em>Stroke Opacity</em>}' attribute.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @see #getStrokeOpacity()
 	 * @generated
 	 * @ordered
@@ -166,6 +173,7 @@ public class StyleImpl extends MinimalEObjectImpl.Container implements Style {
 	 * The cached value of the '{@link #getStrokeOpacity() <em>Stroke Opacity</em>}' attribute.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @see #getStrokeOpacity()
 	 * @generated
 	 * @ordered
@@ -185,6 +193,7 @@ public class StyleImpl extends MinimalEObjectImpl.Container implements Style {
 	 * The cached value of the '{@link #getStrokeDashLengths() <em>Stroke Dash Length</em>}' attribute list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getStrokeDashLengths()
 	 * @generated
 	 * @ordered
@@ -194,6 +203,7 @@ public class StyleImpl extends MinimalEObjectImpl.Container implements Style {
 	/**
 	 * The default value of the '{@link #getFontSize() <em>Font Size</em>}' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getFontSize()
 	 * @generated
 	 * @ordered
@@ -203,6 +213,7 @@ public class StyleImpl extends MinimalEObjectImpl.Container implements Style {
 	/**
 	 * The cached value of the '{@link #getFontSize() <em>Font Size</em>}' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getFontSize()
 	 * @generated
 	 * @ordered
@@ -213,6 +224,7 @@ public class StyleImpl extends MinimalEObjectImpl.Container implements Style {
 	 * This is true if the Font Size attribute has been set.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -221,6 +233,7 @@ public class StyleImpl extends MinimalEObjectImpl.Container implements Style {
 	/**
 	 * The default value of the '{@link #getFontName() <em>Font Name</em>}' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getFontName()
 	 * @generated
 	 * @ordered
@@ -230,6 +243,7 @@ public class StyleImpl extends MinimalEObjectImpl.Container implements Style {
 	/**
 	 * The cached value of the '{@link #getFontName() <em>Font Name</em>}' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getFontName()
 	 * @generated
 	 * @ordered
@@ -240,6 +254,7 @@ public class StyleImpl extends MinimalEObjectImpl.Container implements Style {
 	 * This is true if the Font Name attribute has been set.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -248,6 +263,7 @@ public class StyleImpl extends MinimalEObjectImpl.Container implements Style {
 	/**
 	 * The default value of the '{@link #isFontItalic() <em>Font Italic</em>}' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isFontItalic()
 	 * @generated
 	 * @ordered
@@ -257,6 +273,7 @@ public class StyleImpl extends MinimalEObjectImpl.Container implements Style {
 	/**
 	 * The cached value of the '{@link #isFontItalic() <em>Font Italic</em>}' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isFontItalic()
 	 * @generated
 	 * @ordered
@@ -275,6 +292,7 @@ public class StyleImpl extends MinimalEObjectImpl.Container implements Style {
 	/**
 	 * The default value of the '{@link #isFontBold() <em>Font Bold</em>}' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isFontBold()
 	 * @generated
 	 * @ordered
@@ -284,6 +302,7 @@ public class StyleImpl extends MinimalEObjectImpl.Container implements Style {
 	/**
 	 * The cached value of the '{@link #isFontBold() <em>Font Bold</em>}' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #isFontBold()
 	 * @generated
 	 * @ordered
@@ -294,6 +313,7 @@ public class StyleImpl extends MinimalEObjectImpl.Container implements Style {
 	 * This is true if the Font Bold attribute has been set.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -303,6 +323,7 @@ public class StyleImpl extends MinimalEObjectImpl.Container implements Style {
 	 * The default value of the '{@link #getFontDecoration() <em>Font Decoration</em>}' attribute.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @see #getFontDecoration()
 	 * @generated
 	 * @ordered
@@ -313,6 +334,7 @@ public class StyleImpl extends MinimalEObjectImpl.Container implements Style {
 	 * The cached value of the '{@link #getFontDecoration() <em>Font Decoration</em>}' attribute.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @see #getFontDecoration()
 	 * @generated
 	 * @ordered
@@ -330,6 +352,7 @@ public class StyleImpl extends MinimalEObjectImpl.Container implements Style {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected StyleImpl() {
@@ -338,6 +361,7 @@ public class StyleImpl extends MinimalEObjectImpl.Container implements Style {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -347,6 +371,7 @@ public class StyleImpl extends MinimalEObjectImpl.Container implements Style {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Paint getFill() {
@@ -355,6 +380,7 @@ public class StyleImpl extends MinimalEObjectImpl.Container implements Style {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NotificationChain basicSetFill(Paint newFill, NotificationChain msgs) {
@@ -362,37 +388,42 @@ public class StyleImpl extends MinimalEObjectImpl.Container implements Style {
 		fill = newFill;
 		boolean oldFillESet = fillESet;
 		fillESet = true;
-		if (eNotificationRequired()) {
+		if(eNotificationRequired()) {
 			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, DGPackage.STYLE__FILL, oldFill, newFill, !oldFillESet);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
+			if(msgs == null)
+				msgs = notification;
+			else
+				msgs.add(notification);
 		}
 		return msgs;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setFill(Paint newFill) {
-		if (newFill != fill) {
+		if(newFill != fill) {
 			NotificationChain msgs = null;
-			if (fill != null)
+			if(fill != null)
 				msgs = ((InternalEObject)fill).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - DGPackage.STYLE__FILL, null, msgs);
-			if (newFill != null)
+			if(newFill != null)
 				msgs = ((InternalEObject)newFill).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - DGPackage.STYLE__FILL, null, msgs);
 			msgs = basicSetFill(newFill, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else {
+			if(msgs != null)
+				msgs.dispatch();
+		} else {
 			boolean oldFillESet = fillESet;
 			fillESet = true;
-			if (eNotificationRequired())
+			if(eNotificationRequired())
 				eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.STYLE__FILL, newFill, newFill, !oldFillESet));
 		}
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NotificationChain basicUnsetFill(NotificationChain msgs) {
@@ -400,34 +431,39 @@ public class StyleImpl extends MinimalEObjectImpl.Container implements Style {
 		fill = null;
 		boolean oldFillESet = fillESet;
 		fillESet = false;
-		if (eNotificationRequired()) {
+		if(eNotificationRequired()) {
 			ENotificationImpl notification = new ENotificationImpl(this, Notification.UNSET, DGPackage.STYLE__FILL, oldFill, null, oldFillESet);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
+			if(msgs == null)
+				msgs = notification;
+			else
+				msgs.add(notification);
 		}
 		return msgs;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void unsetFill() {
-		if (fill != null) {
+		if(fill != null) {
 			NotificationChain msgs = null;
 			msgs = ((InternalEObject)fill).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - DGPackage.STYLE__FILL, null, msgs);
 			msgs = basicUnsetFill(msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else {
+			if(msgs != null)
+				msgs.dispatch();
+		} else {
 			boolean oldFillESet = fillESet;
 			fillESet = false;
-			if (eNotificationRequired())
+			if(eNotificationRequired())
 				eNotify(new ENotificationImpl(this, Notification.UNSET, DGPackage.STYLE__FILL, null, null, oldFillESet));
 		}
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetFill() {
@@ -436,6 +472,7 @@ public class StyleImpl extends MinimalEObjectImpl.Container implements Style {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public double getFillOpacity() {
@@ -444,6 +481,7 @@ public class StyleImpl extends MinimalEObjectImpl.Container implements Style {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setFillOpacity(double newFillOpacity) {
@@ -451,12 +489,13 @@ public class StyleImpl extends MinimalEObjectImpl.Container implements Style {
 		fillOpacity = newFillOpacity;
 		boolean oldFillOpacityESet = fillOpacityESet;
 		fillOpacityESet = true;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.STYLE__FILL_OPACITY, oldFillOpacity, fillOpacity, !oldFillOpacityESet));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void unsetFillOpacity() {
@@ -464,12 +503,13 @@ public class StyleImpl extends MinimalEObjectImpl.Container implements Style {
 		boolean oldFillOpacityESet = fillOpacityESet;
 		fillOpacity = FILL_OPACITY_EDEFAULT;
 		fillOpacityESet = false;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.UNSET, DGPackage.STYLE__FILL_OPACITY, oldFillOpacity, FILL_OPACITY_EDEFAULT, oldFillOpacityESet));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetFillOpacity() {
@@ -478,6 +518,7 @@ public class StyleImpl extends MinimalEObjectImpl.Container implements Style {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Paint getStroke() {
@@ -486,45 +527,50 @@ public class StyleImpl extends MinimalEObjectImpl.Container implements Style {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public NotificationChain basicSetStroke(Paint newStroke,
-			NotificationChain msgs) {
+	public NotificationChain basicSetStroke(Paint newStroke, NotificationChain msgs) {
 		Paint oldStroke = stroke;
 		stroke = newStroke;
 		boolean oldStrokeESet = strokeESet;
 		strokeESet = true;
-		if (eNotificationRequired()) {
+		if(eNotificationRequired()) {
 			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, DGPackage.STYLE__STROKE, oldStroke, newStroke, !oldStrokeESet);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
+			if(msgs == null)
+				msgs = notification;
+			else
+				msgs.add(notification);
 		}
 		return msgs;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setStroke(Paint newStroke) {
-		if (newStroke != stroke) {
+		if(newStroke != stroke) {
 			NotificationChain msgs = null;
-			if (stroke != null)
+			if(stroke != null)
 				msgs = ((InternalEObject)stroke).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - DGPackage.STYLE__STROKE, null, msgs);
-			if (newStroke != null)
+			if(newStroke != null)
 				msgs = ((InternalEObject)newStroke).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - DGPackage.STYLE__STROKE, null, msgs);
 			msgs = basicSetStroke(newStroke, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else {
+			if(msgs != null)
+				msgs.dispatch();
+		} else {
 			boolean oldStrokeESet = strokeESet;
 			strokeESet = true;
-			if (eNotificationRequired())
+			if(eNotificationRequired())
 				eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.STYLE__STROKE, newStroke, newStroke, !oldStrokeESet));
 		}
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NotificationChain basicUnsetStroke(NotificationChain msgs) {
@@ -532,34 +578,39 @@ public class StyleImpl extends MinimalEObjectImpl.Container implements Style {
 		stroke = null;
 		boolean oldStrokeESet = strokeESet;
 		strokeESet = false;
-		if (eNotificationRequired()) {
+		if(eNotificationRequired()) {
 			ENotificationImpl notification = new ENotificationImpl(this, Notification.UNSET, DGPackage.STYLE__STROKE, oldStroke, null, oldStrokeESet);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
+			if(msgs == null)
+				msgs = notification;
+			else
+				msgs.add(notification);
 		}
 		return msgs;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void unsetStroke() {
-		if (stroke != null) {
+		if(stroke != null) {
 			NotificationChain msgs = null;
 			msgs = ((InternalEObject)stroke).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - DGPackage.STYLE__STROKE, null, msgs);
 			msgs = basicUnsetStroke(msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else {
+			if(msgs != null)
+				msgs.dispatch();
+		} else {
 			boolean oldStrokeESet = strokeESet;
 			strokeESet = false;
-			if (eNotificationRequired())
+			if(eNotificationRequired())
 				eNotify(new ENotificationImpl(this, Notification.UNSET, DGPackage.STYLE__STROKE, null, null, oldStrokeESet));
 		}
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetStroke() {
@@ -568,6 +619,7 @@ public class StyleImpl extends MinimalEObjectImpl.Container implements Style {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public double getStrokeWidth() {
@@ -576,6 +628,7 @@ public class StyleImpl extends MinimalEObjectImpl.Container implements Style {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setStrokeWidth(double newStrokeWidth) {
@@ -583,12 +636,13 @@ public class StyleImpl extends MinimalEObjectImpl.Container implements Style {
 		strokeWidth = newStrokeWidth;
 		boolean oldStrokeWidthESet = strokeWidthESet;
 		strokeWidthESet = true;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.STYLE__STROKE_WIDTH, oldStrokeWidth, strokeWidth, !oldStrokeWidthESet));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void unsetStrokeWidth() {
@@ -596,12 +650,13 @@ public class StyleImpl extends MinimalEObjectImpl.Container implements Style {
 		boolean oldStrokeWidthESet = strokeWidthESet;
 		strokeWidth = STROKE_WIDTH_EDEFAULT;
 		strokeWidthESet = false;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.UNSET, DGPackage.STYLE__STROKE_WIDTH, oldStrokeWidth, STROKE_WIDTH_EDEFAULT, oldStrokeWidthESet));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetStrokeWidth() {
@@ -610,6 +665,7 @@ public class StyleImpl extends MinimalEObjectImpl.Container implements Style {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public double getStrokeOpacity() {
@@ -618,6 +674,7 @@ public class StyleImpl extends MinimalEObjectImpl.Container implements Style {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setStrokeOpacity(double newStrokeOpacity) {
@@ -625,12 +682,13 @@ public class StyleImpl extends MinimalEObjectImpl.Container implements Style {
 		strokeOpacity = newStrokeOpacity;
 		boolean oldStrokeOpacityESet = strokeOpacityESet;
 		strokeOpacityESet = true;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.STYLE__STROKE_OPACITY, oldStrokeOpacity, strokeOpacity, !oldStrokeOpacityESet));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void unsetStrokeOpacity() {
@@ -638,12 +696,13 @@ public class StyleImpl extends MinimalEObjectImpl.Container implements Style {
 		boolean oldStrokeOpacityESet = strokeOpacityESet;
 		strokeOpacity = STROKE_OPACITY_EDEFAULT;
 		strokeOpacityESet = false;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.UNSET, DGPackage.STYLE__STROKE_OPACITY, oldStrokeOpacity, STROKE_OPACITY_EDEFAULT, oldStrokeOpacityESet));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetStrokeOpacity() {
@@ -652,10 +711,11 @@ public class StyleImpl extends MinimalEObjectImpl.Container implements Style {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<Double> getStrokeDashLengths() {
-		if (strokeDashLengths == null) {
+		if(strokeDashLengths == null) {
 			strokeDashLengths = new EDataTypeEList.Unsettable<Double>(Double.class, this, DGPackage.STYLE__STROKE_DASH_LENGTH);
 		}
 		return strokeDashLengths;
@@ -663,14 +723,17 @@ public class StyleImpl extends MinimalEObjectImpl.Container implements Style {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void unsetStrokeDashLengths() {
-		if (strokeDashLengths != null) ((InternalEList.Unsettable<?>)strokeDashLengths).unset();
+		if(strokeDashLengths != null)
+			((InternalEList.Unsettable<?>)strokeDashLengths).unset();
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetStrokeDashLengths() {
@@ -679,6 +742,7 @@ public class StyleImpl extends MinimalEObjectImpl.Container implements Style {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public double getFontSize() {
@@ -687,6 +751,7 @@ public class StyleImpl extends MinimalEObjectImpl.Container implements Style {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setFontSize(double newFontSize) {
@@ -694,12 +759,13 @@ public class StyleImpl extends MinimalEObjectImpl.Container implements Style {
 		fontSize = newFontSize;
 		boolean oldFontSizeESet = fontSizeESet;
 		fontSizeESet = true;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.STYLE__FONT_SIZE, oldFontSize, fontSize, !oldFontSizeESet));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void unsetFontSize() {
@@ -707,12 +773,13 @@ public class StyleImpl extends MinimalEObjectImpl.Container implements Style {
 		boolean oldFontSizeESet = fontSizeESet;
 		fontSize = FONT_SIZE_EDEFAULT;
 		fontSizeESet = false;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.UNSET, DGPackage.STYLE__FONT_SIZE, oldFontSize, FONT_SIZE_EDEFAULT, oldFontSizeESet));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetFontSize() {
@@ -721,6 +788,7 @@ public class StyleImpl extends MinimalEObjectImpl.Container implements Style {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getFontName() {
@@ -729,6 +797,7 @@ public class StyleImpl extends MinimalEObjectImpl.Container implements Style {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setFontName(String newFontName) {
@@ -736,12 +805,13 @@ public class StyleImpl extends MinimalEObjectImpl.Container implements Style {
 		fontName = newFontName;
 		boolean oldFontNameESet = fontNameESet;
 		fontNameESet = true;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.STYLE__FONT_NAME, oldFontName, fontName, !oldFontNameESet));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void unsetFontName() {
@@ -749,12 +819,13 @@ public class StyleImpl extends MinimalEObjectImpl.Container implements Style {
 		boolean oldFontNameESet = fontNameESet;
 		fontName = FONT_NAME_EDEFAULT;
 		fontNameESet = false;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.UNSET, DGPackage.STYLE__FONT_NAME, oldFontName, FONT_NAME_EDEFAULT, oldFontNameESet));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetFontName() {
@@ -763,6 +834,7 @@ public class StyleImpl extends MinimalEObjectImpl.Container implements Style {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isFontItalic() {
@@ -771,6 +843,7 @@ public class StyleImpl extends MinimalEObjectImpl.Container implements Style {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setFontItalic(boolean newFontItalic) {
@@ -778,12 +851,13 @@ public class StyleImpl extends MinimalEObjectImpl.Container implements Style {
 		fontItalic = newFontItalic;
 		boolean oldFontItalicESet = fontItalicESet;
 		fontItalicESet = true;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.STYLE__FONT_ITALIC, oldFontItalic, fontItalic, !oldFontItalicESet));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void unsetFontItalic() {
@@ -791,12 +865,13 @@ public class StyleImpl extends MinimalEObjectImpl.Container implements Style {
 		boolean oldFontItalicESet = fontItalicESet;
 		fontItalic = FONT_ITALIC_EDEFAULT;
 		fontItalicESet = false;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.UNSET, DGPackage.STYLE__FONT_ITALIC, oldFontItalic, FONT_ITALIC_EDEFAULT, oldFontItalicESet));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetFontItalic() {
@@ -805,6 +880,7 @@ public class StyleImpl extends MinimalEObjectImpl.Container implements Style {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isFontBold() {
@@ -813,6 +889,7 @@ public class StyleImpl extends MinimalEObjectImpl.Container implements Style {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setFontBold(boolean newFontBold) {
@@ -820,12 +897,13 @@ public class StyleImpl extends MinimalEObjectImpl.Container implements Style {
 		fontBold = newFontBold;
 		boolean oldFontBoldESet = fontBoldESet;
 		fontBoldESet = true;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.STYLE__FONT_BOLD, oldFontBold, fontBold, !oldFontBoldESet));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void unsetFontBold() {
@@ -833,12 +911,13 @@ public class StyleImpl extends MinimalEObjectImpl.Container implements Style {
 		boolean oldFontBoldESet = fontBoldESet;
 		fontBold = FONT_BOLD_EDEFAULT;
 		fontBoldESet = false;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.UNSET, DGPackage.STYLE__FONT_BOLD, oldFontBold, FONT_BOLD_EDEFAULT, oldFontBoldESet));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetFontBold() {
@@ -847,6 +926,7 @@ public class StyleImpl extends MinimalEObjectImpl.Container implements Style {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public FontDecoration getFontDecoration() {
@@ -855,6 +935,7 @@ public class StyleImpl extends MinimalEObjectImpl.Container implements Style {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setFontDecoration(FontDecoration newFontDecoration) {
@@ -862,12 +943,13 @@ public class StyleImpl extends MinimalEObjectImpl.Container implements Style {
 		fontDecoration = newFontDecoration == null ? FONT_DECORATION_EDEFAULT : newFontDecoration;
 		boolean oldFontDecorationESet = fontDecorationESet;
 		fontDecorationESet = true;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.STYLE__FONT_DECORATION, oldFontDecoration, fontDecoration, !oldFontDecorationESet));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void unsetFontDecoration() {
@@ -875,12 +957,13 @@ public class StyleImpl extends MinimalEObjectImpl.Container implements Style {
 		boolean oldFontDecorationESet = fontDecorationESet;
 		fontDecoration = FONT_DECORATION_EDEFAULT;
 		fontDecorationESet = false;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.UNSET, DGPackage.STYLE__FONT_DECORATION, oldFontDecoration, FONT_DECORATION_EDEFAULT, oldFontDecorationESet));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetFontDecoration() {
@@ -888,9 +971,11 @@ public class StyleImpl extends MinimalEObjectImpl.Container implements Style {
 	}
 
 	/**
-	 * The cached validation expression for the '{@link #validFontSize(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Valid Font Size</em>}' invariant operation.
+	 * The cached validation expression for the '{@link #validFontSize(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
+	 * <em>Valid Font Size</em>}' invariant operation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #validFontSize(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
 	 * @generated
 	 * @ordered
@@ -899,28 +984,19 @@ public class StyleImpl extends MinimalEObjectImpl.Container implements Style {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public boolean validFontSize(DiagnosticChain diagnostics,
-			Map<Object, Object> context) {
-		return
-			DGValidator.validate
-				(DGPackage.Literals.STYLE,
-				 this,
-				 diagnostics,
-				 context,
-				 "http://www.eclipse.org/emf/2002/Ecore/OCL",
-				 DGPackage.Literals.STYLE___VALID_FONT_SIZE__DIAGNOSTICCHAIN_MAP,
-				 VALID_FONT_SIZE_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION,
-				 Diagnostic.ERROR,
-				 DGValidator.DIAGNOSTIC_SOURCE,
-				 DGValidator.STYLE__VALID_FONT_SIZE);
+	public boolean validFontSize(DiagnosticChain diagnostics, Map<Object, Object> context) {
+		return DGValidator.validate(DGPackage.Literals.STYLE, this, diagnostics, context, "http://www.eclipse.org/emf/2002/Ecore/OCL", DGPackage.Literals.STYLE___VALID_FONT_SIZE__DIAGNOSTICCHAIN_MAP, VALID_FONT_SIZE_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION, Diagnostic.ERROR, DGValidator.DIAGNOSTIC_SOURCE, DGValidator.STYLE__VALID_FONT_SIZE);
 	}
 
 	/**
-	 * The cached validation expression for the '{@link #validFillOpacity(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Valid Fill Opacity</em>}' invariant operation.
+	 * The cached validation expression for the '{@link #validFillOpacity(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
+	 * <em>Valid Fill Opacity</em>}' invariant operation.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @see #validFillOpacity(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
 	 * @generated
 	 * @ordered
@@ -929,28 +1005,19 @@ public class StyleImpl extends MinimalEObjectImpl.Container implements Style {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public boolean validFillOpacity(DiagnosticChain diagnostics,
-			Map<Object, Object> context) {
-		return
-			DGValidator.validate
-				(DGPackage.Literals.STYLE,
-				 this,
-				 diagnostics,
-				 context,
-				 "http://www.eclipse.org/emf/2002/Ecore/OCL",
-				 DGPackage.Literals.STYLE___VALID_FILL_OPACITY__DIAGNOSTICCHAIN_MAP,
-				 VALID_FILL_OPACITY_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION,
-				 Diagnostic.ERROR,
-				 DGValidator.DIAGNOSTIC_SOURCE,
-				 DGValidator.STYLE__VALID_FILL_OPACITY);
+	public boolean validFillOpacity(DiagnosticChain diagnostics, Map<Object, Object> context) {
+		return DGValidator.validate(DGPackage.Literals.STYLE, this, diagnostics, context, "http://www.eclipse.org/emf/2002/Ecore/OCL", DGPackage.Literals.STYLE___VALID_FILL_OPACITY__DIAGNOSTICCHAIN_MAP, VALID_FILL_OPACITY_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION, Diagnostic.ERROR, DGValidator.DIAGNOSTIC_SOURCE, DGValidator.STYLE__VALID_FILL_OPACITY);
 	}
 
 	/**
-	 * The cached validation expression for the '{@link #validStrokeWidth(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Valid Stroke Width</em>}' invariant operation.
+	 * The cached validation expression for the '{@link #validStrokeWidth(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
+	 * <em>Valid Stroke Width</em>}' invariant operation.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @see #validStrokeWidth(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
 	 * @generated
 	 * @ordered
@@ -959,32 +1026,19 @@ public class StyleImpl extends MinimalEObjectImpl.Container implements Style {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public boolean validStrokeWidth(DiagnosticChain diagnostics,
-			Map<Object, Object> context) {
-		return
-			DGValidator.validate
-				(DGPackage.Literals.STYLE,
-				 this,
-				 diagnostics,
-				 context,
-				 "http://www.eclipse.org/emf/2002/Ecore/OCL",
-				 DGPackage.Literals.STYLE___VALID_STROKE_WIDTH__DIAGNOSTICCHAIN_MAP,
-				 VALID_STROKE_WIDTH_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION,
-				 Diagnostic.ERROR,
-				 DGValidator.DIAGNOSTIC_SOURCE,
-				 DGValidator.STYLE__VALID_STROKE_WIDTH);
+	public boolean validStrokeWidth(DiagnosticChain diagnostics, Map<Object, Object> context) {
+		return DGValidator.validate(DGPackage.Literals.STYLE, this, diagnostics, context, "http://www.eclipse.org/emf/2002/Ecore/OCL", DGPackage.Literals.STYLE___VALID_STROKE_WIDTH__DIAGNOSTICCHAIN_MAP, VALID_STROKE_WIDTH_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION, Diagnostic.ERROR, DGValidator.DIAGNOSTIC_SOURCE, DGValidator.STYLE__VALID_STROKE_WIDTH);
 	}
 
 	/**
-	 * The cached validation expression for the '
-	 * {@link #validDashLengthSize(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
+	 * The cached validation expression for the ' {@link #validDashLengthSize(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
 	 * <em>Valid Dash Length Size</em>}' invariant operation. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
-	 * @see #validDashLengthSize(org.eclipse.emf.common.util.DiagnosticChain,
-	 *      java.util.Map)
+	 * @see #validDashLengthSize(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
 	 * @generated
 	 * @ordered
 	 */
@@ -992,28 +1046,19 @@ public class StyleImpl extends MinimalEObjectImpl.Container implements Style {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public boolean validDashLengthSize(DiagnosticChain diagnostics,
-			Map<Object, Object> context) {
-		return
-			DGValidator.validate
-				(DGPackage.Literals.STYLE,
-				 this,
-				 diagnostics,
-				 context,
-				 "http://www.eclipse.org/emf/2002/Ecore/OCL",
-				 DGPackage.Literals.STYLE___VALID_DASH_LENGTH_SIZE__DIAGNOSTICCHAIN_MAP,
-				 VALID_DASH_LENGTH_SIZE_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION,
-				 Diagnostic.ERROR,
-				 DGValidator.DIAGNOSTIC_SOURCE,
-				 DGValidator.STYLE__VALID_DASH_LENGTH_SIZE);
+	public boolean validDashLengthSize(DiagnosticChain diagnostics, Map<Object, Object> context) {
+		return DGValidator.validate(DGPackage.Literals.STYLE, this, diagnostics, context, "http://www.eclipse.org/emf/2002/Ecore/OCL", DGPackage.Literals.STYLE___VALID_DASH_LENGTH_SIZE__DIAGNOSTICCHAIN_MAP, VALID_DASH_LENGTH_SIZE_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION, Diagnostic.ERROR, DGValidator.DIAGNOSTIC_SOURCE, DGValidator.STYLE__VALID_DASH_LENGTH_SIZE);
 	}
 
 	/**
-	 * The cached validation expression for the '{@link #validStrokeOpacity(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Valid Stroke Opacity</em>}' invariant operation.
+	 * The cached validation expression for the '{@link #validStrokeOpacity(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
+	 * <em>Valid Stroke Opacity</em>}' invariant operation.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @see #validStrokeOpacity(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
 	 * @generated
 	 * @ordered
@@ -1022,248 +1067,265 @@ public class StyleImpl extends MinimalEObjectImpl.Container implements Style {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public boolean validStrokeOpacity(DiagnosticChain diagnostics,
-			Map<Object, Object> context) {
-		return
-			DGValidator.validate
-				(DGPackage.Literals.STYLE,
-				 this,
-				 diagnostics,
-				 context,
-				 "http://www.eclipse.org/emf/2002/Ecore/OCL",
-				 DGPackage.Literals.STYLE___VALID_STROKE_OPACITY__DIAGNOSTICCHAIN_MAP,
-				 VALID_STROKE_OPACITY_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION,
-				 Diagnostic.ERROR,
-				 DGValidator.DIAGNOSTIC_SOURCE,
-				 DGValidator.STYLE__VALID_STROKE_OPACITY);
+	public boolean validStrokeOpacity(DiagnosticChain diagnostics, Map<Object, Object> context) {
+		return DGValidator.validate(DGPackage.Literals.STYLE, this, diagnostics, context, "http://www.eclipse.org/emf/2002/Ecore/OCL", DGPackage.Literals.STYLE___VALID_STROKE_OPACITY__DIAGNOSTICCHAIN_MAP, VALID_STROKE_OPACITY_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION, Diagnostic.ERROR, DGValidator.DIAGNOSTIC_SOURCE, DGValidator.STYLE__VALID_STROKE_OPACITY);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd,
-			int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case DGPackage.STYLE__FILL:
-				return basicUnsetFill(msgs);
-			case DGPackage.STYLE__STROKE:
-				return basicUnsetStroke(msgs);
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch(featureID) {
+		case DGPackage.STYLE__FILL:
+			return basicUnsetFill(msgs);
+		case DGPackage.STYLE__STROKE:
+			return basicUnsetStroke(msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case DGPackage.STYLE__FILL:
-				return getFill();
-			case DGPackage.STYLE__FILL_OPACITY:
-				return getFillOpacity();
-			case DGPackage.STYLE__STROKE:
-				return getStroke();
-			case DGPackage.STYLE__STROKE_WIDTH:
-				return getStrokeWidth();
-			case DGPackage.STYLE__STROKE_OPACITY:
-				return getStrokeOpacity();
-			case DGPackage.STYLE__STROKE_DASH_LENGTH:
-				return getStrokeDashLengths();
-			case DGPackage.STYLE__FONT_SIZE:
-				return getFontSize();
-			case DGPackage.STYLE__FONT_NAME:
-				return getFontName();
-			case DGPackage.STYLE__FONT_ITALIC:
-				return isFontItalic();
-			case DGPackage.STYLE__FONT_BOLD:
-				return isFontBold();
-			case DGPackage.STYLE__FONT_DECORATION:
-				return getFontDecoration();
+		switch(featureID) {
+		case DGPackage.STYLE__FILL:
+			return getFill();
+		case DGPackage.STYLE__FILL_OPACITY:
+			return getFillOpacity();
+		case DGPackage.STYLE__STROKE:
+			return getStroke();
+		case DGPackage.STYLE__STROKE_WIDTH:
+			return getStrokeWidth();
+		case DGPackage.STYLE__STROKE_OPACITY:
+			return getStrokeOpacity();
+		case DGPackage.STYLE__STROKE_DASH_LENGTH:
+			return getStrokeDashLengths();
+		case DGPackage.STYLE__FONT_SIZE:
+			return getFontSize();
+		case DGPackage.STYLE__FONT_NAME:
+			return getFontName();
+		case DGPackage.STYLE__FONT_ITALIC:
+			return isFontItalic();
+		case DGPackage.STYLE__FONT_BOLD:
+			return isFontBold();
+		case DGPackage.STYLE__FONT_DECORATION:
+			return getFontDecoration();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case DGPackage.STYLE__FILL:
-				setFill((Paint)newValue);
-				return;
-			case DGPackage.STYLE__FILL_OPACITY:
-				setFillOpacity((Double)newValue);
-				return;
-			case DGPackage.STYLE__STROKE:
-				setStroke((Paint)newValue);
-				return;
-			case DGPackage.STYLE__STROKE_WIDTH:
-				setStrokeWidth((Double)newValue);
-				return;
-			case DGPackage.STYLE__STROKE_OPACITY:
-				setStrokeOpacity((Double)newValue);
-				return;
-			case DGPackage.STYLE__STROKE_DASH_LENGTH:
-				getStrokeDashLengths().clear();
-				getStrokeDashLengths().addAll((Collection<? extends Double>)newValue);
-				return;
-			case DGPackage.STYLE__FONT_SIZE:
-				setFontSize((Double)newValue);
-				return;
-			case DGPackage.STYLE__FONT_NAME:
-				setFontName((String)newValue);
-				return;
-			case DGPackage.STYLE__FONT_ITALIC:
-				setFontItalic((Boolean)newValue);
-				return;
-			case DGPackage.STYLE__FONT_BOLD:
-				setFontBold((Boolean)newValue);
-				return;
-			case DGPackage.STYLE__FONT_DECORATION:
-				setFontDecoration((FontDecoration)newValue);
-				return;
+		switch(featureID) {
+		case DGPackage.STYLE__FILL:
+			setFill((Paint)newValue);
+			return;
+		case DGPackage.STYLE__FILL_OPACITY:
+			setFillOpacity((Double)newValue);
+			return;
+		case DGPackage.STYLE__STROKE:
+			setStroke((Paint)newValue);
+			return;
+		case DGPackage.STYLE__STROKE_WIDTH:
+			setStrokeWidth((Double)newValue);
+			return;
+		case DGPackage.STYLE__STROKE_OPACITY:
+			setStrokeOpacity((Double)newValue);
+			return;
+		case DGPackage.STYLE__STROKE_DASH_LENGTH:
+			getStrokeDashLengths().clear();
+			getStrokeDashLengths().addAll((Collection<? extends Double>)newValue);
+			return;
+		case DGPackage.STYLE__FONT_SIZE:
+			setFontSize((Double)newValue);
+			return;
+		case DGPackage.STYLE__FONT_NAME:
+			setFontName((String)newValue);
+			return;
+		case DGPackage.STYLE__FONT_ITALIC:
+			setFontItalic((Boolean)newValue);
+			return;
+		case DGPackage.STYLE__FONT_BOLD:
+			setFontBold((Boolean)newValue);
+			return;
+		case DGPackage.STYLE__FONT_DECORATION:
+			setFontDecoration((FontDecoration)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case DGPackage.STYLE__FILL:
-				unsetFill();
-				return;
-			case DGPackage.STYLE__FILL_OPACITY:
-				unsetFillOpacity();
-				return;
-			case DGPackage.STYLE__STROKE:
-				unsetStroke();
-				return;
-			case DGPackage.STYLE__STROKE_WIDTH:
-				unsetStrokeWidth();
-				return;
-			case DGPackage.STYLE__STROKE_OPACITY:
-				unsetStrokeOpacity();
-				return;
-			case DGPackage.STYLE__STROKE_DASH_LENGTH:
-				unsetStrokeDashLengths();
-				return;
-			case DGPackage.STYLE__FONT_SIZE:
-				unsetFontSize();
-				return;
-			case DGPackage.STYLE__FONT_NAME:
-				unsetFontName();
-				return;
-			case DGPackage.STYLE__FONT_ITALIC:
-				unsetFontItalic();
-				return;
-			case DGPackage.STYLE__FONT_BOLD:
-				unsetFontBold();
-				return;
-			case DGPackage.STYLE__FONT_DECORATION:
-				unsetFontDecoration();
-				return;
+		switch(featureID) {
+		case DGPackage.STYLE__FILL:
+			unsetFill();
+			return;
+		case DGPackage.STYLE__FILL_OPACITY:
+			unsetFillOpacity();
+			return;
+		case DGPackage.STYLE__STROKE:
+			unsetStroke();
+			return;
+		case DGPackage.STYLE__STROKE_WIDTH:
+			unsetStrokeWidth();
+			return;
+		case DGPackage.STYLE__STROKE_OPACITY:
+			unsetStrokeOpacity();
+			return;
+		case DGPackage.STYLE__STROKE_DASH_LENGTH:
+			unsetStrokeDashLengths();
+			return;
+		case DGPackage.STYLE__FONT_SIZE:
+			unsetFontSize();
+			return;
+		case DGPackage.STYLE__FONT_NAME:
+			unsetFontName();
+			return;
+		case DGPackage.STYLE__FONT_ITALIC:
+			unsetFontItalic();
+			return;
+		case DGPackage.STYLE__FONT_BOLD:
+			unsetFontBold();
+			return;
+		case DGPackage.STYLE__FONT_DECORATION:
+			unsetFontDecoration();
+			return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case DGPackage.STYLE__FILL:
-				return isSetFill();
-			case DGPackage.STYLE__FILL_OPACITY:
-				return isSetFillOpacity();
-			case DGPackage.STYLE__STROKE:
-				return isSetStroke();
-			case DGPackage.STYLE__STROKE_WIDTH:
-				return isSetStrokeWidth();
-			case DGPackage.STYLE__STROKE_OPACITY:
-				return isSetStrokeOpacity();
-			case DGPackage.STYLE__STROKE_DASH_LENGTH:
-				return isSetStrokeDashLengths();
-			case DGPackage.STYLE__FONT_SIZE:
-				return isSetFontSize();
-			case DGPackage.STYLE__FONT_NAME:
-				return isSetFontName();
-			case DGPackage.STYLE__FONT_ITALIC:
-				return isSetFontItalic();
-			case DGPackage.STYLE__FONT_BOLD:
-				return isSetFontBold();
-			case DGPackage.STYLE__FONT_DECORATION:
-				return isSetFontDecoration();
+		switch(featureID) {
+		case DGPackage.STYLE__FILL:
+			return isSetFill();
+		case DGPackage.STYLE__FILL_OPACITY:
+			return isSetFillOpacity();
+		case DGPackage.STYLE__STROKE:
+			return isSetStroke();
+		case DGPackage.STYLE__STROKE_WIDTH:
+			return isSetStrokeWidth();
+		case DGPackage.STYLE__STROKE_OPACITY:
+			return isSetStrokeOpacity();
+		case DGPackage.STYLE__STROKE_DASH_LENGTH:
+			return isSetStrokeDashLengths();
+		case DGPackage.STYLE__FONT_SIZE:
+			return isSetFontSize();
+		case DGPackage.STYLE__FONT_NAME:
+			return isSetFontName();
+		case DGPackage.STYLE__FONT_ITALIC:
+			return isSetFontItalic();
+		case DGPackage.STYLE__FONT_BOLD:
+			return isSetFontBold();
+		case DGPackage.STYLE__FONT_DECORATION:
+			return isSetFontDecoration();
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	@SuppressWarnings("unchecked")
-	public Object eInvoke(int operationID, EList<?> arguments)
-			throws InvocationTargetException {
-		switch (operationID) {
-			case DGPackage.STYLE___VALID_FONT_SIZE__DIAGNOSTICCHAIN_MAP:
-				return validFontSize((DiagnosticChain)arguments.get(0), (Map<Object, Object>)arguments.get(1));
-			case DGPackage.STYLE___VALID_FILL_OPACITY__DIAGNOSTICCHAIN_MAP:
-				return validFillOpacity((DiagnosticChain)arguments.get(0), (Map<Object, Object>)arguments.get(1));
-			case DGPackage.STYLE___VALID_STROKE_WIDTH__DIAGNOSTICCHAIN_MAP:
-				return validStrokeWidth((DiagnosticChain)arguments.get(0), (Map<Object, Object>)arguments.get(1));
-			case DGPackage.STYLE___VALID_DASH_LENGTH_SIZE__DIAGNOSTICCHAIN_MAP:
-				return validDashLengthSize((DiagnosticChain)arguments.get(0), (Map<Object, Object>)arguments.get(1));
-			case DGPackage.STYLE___VALID_STROKE_OPACITY__DIAGNOSTICCHAIN_MAP:
-				return validStrokeOpacity((DiagnosticChain)arguments.get(0), (Map<Object, Object>)arguments.get(1));
+	public Object eInvoke(int operationID, EList<?> arguments) throws InvocationTargetException {
+		switch(operationID) {
+		case DGPackage.STYLE___VALID_FONT_SIZE__DIAGNOSTICCHAIN_MAP:
+			return validFontSize((DiagnosticChain)arguments.get(0), (Map<Object, Object>)arguments.get(1));
+		case DGPackage.STYLE___VALID_FILL_OPACITY__DIAGNOSTICCHAIN_MAP:
+			return validFillOpacity((DiagnosticChain)arguments.get(0), (Map<Object, Object>)arguments.get(1));
+		case DGPackage.STYLE___VALID_STROKE_WIDTH__DIAGNOSTICCHAIN_MAP:
+			return validStrokeWidth((DiagnosticChain)arguments.get(0), (Map<Object, Object>)arguments.get(1));
+		case DGPackage.STYLE___VALID_DASH_LENGTH_SIZE__DIAGNOSTICCHAIN_MAP:
+			return validDashLengthSize((DiagnosticChain)arguments.get(0), (Map<Object, Object>)arguments.get(1));
+		case DGPackage.STYLE___VALID_STROKE_OPACITY__DIAGNOSTICCHAIN_MAP:
+			return validStrokeOpacity((DiagnosticChain)arguments.get(0), (Map<Object, Object>)arguments.get(1));
 		}
 		return super.eInvoke(operationID, arguments);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) return super.toString();
-
+		if(eIsProxy())
+			return super.toString();
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (fillOpacity: ");
-		if (fillOpacityESet) result.append(fillOpacity); else result.append("<unset>");
+		if(fillOpacityESet)
+			result.append(fillOpacity);
+		else
+			result.append("<unset>");
 		result.append(", strokeWidth: ");
-		if (strokeWidthESet) result.append(strokeWidth); else result.append("<unset>");
+		if(strokeWidthESet)
+			result.append(strokeWidth);
+		else
+			result.append("<unset>");
 		result.append(", strokeOpacity: ");
-		if (strokeOpacityESet) result.append(strokeOpacity); else result.append("<unset>");
+		if(strokeOpacityESet)
+			result.append(strokeOpacity);
+		else
+			result.append("<unset>");
 		result.append(", strokeDashLength: ");
 		result.append(strokeDashLengths);
 		result.append(", fontSize: ");
-		if (fontSizeESet) result.append(fontSize); else result.append("<unset>");
+		if(fontSizeESet)
+			result.append(fontSize);
+		else
+			result.append("<unset>");
 		result.append(", fontName: ");
-		if (fontNameESet) result.append(fontName); else result.append("<unset>");
+		if(fontNameESet)
+			result.append(fontName);
+		else
+			result.append("<unset>");
 		result.append(", fontItalic: ");
-		if (fontItalicESet) result.append(fontItalic); else result.append("<unset>");
+		if(fontItalicESet)
+			result.append(fontItalic);
+		else
+			result.append("<unset>");
 		result.append(", fontBold: ");
-		if (fontBoldESet) result.append(fontBold); else result.append("<unset>");
+		if(fontBoldESet)
+			result.append(fontBold);
+		else
+			result.append("<unset>");
 		result.append(", fontDecoration: ");
-		if (fontDecorationESet) result.append(fontDecoration); else result.append("<unset>");
+		if(fontDecorationESet)
+			result.append(fontDecoration);
+		else
+			result.append("<unset>");
 		result.append(')');
 		return result.toString();
 	}
-
 } // StyleImpl
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/StyleRuleImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/StyleRuleImpl.java
index 0f091e8875d..a091e6bd91f 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/StyleRuleImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/StyleRuleImpl.java
@@ -33,23 +33,23 @@ import org.eclipse.papyrus.dd.dg.StyleRule;
 import org.eclipse.papyrus.dd.dg.StyleSelector;
 
 /**
- * <!-- begin-user-doc --> An implementation of the model object '
- * <em><b>Style Rule</b></em>'. <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object ' <em><b>Style Rule</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.dd.dg.impl.StyleRuleImpl#getSelectors <em>Selector</em>}</li>
- *   <li>{@link org.eclipse.papyrus.dd.dg.impl.StyleRuleImpl#getStyle <em>Style</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.impl.StyleRuleImpl#getSelectors <em>Selector</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.impl.StyleRuleImpl#getStyle <em>Style</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
-public class StyleRuleImpl extends MinimalEObjectImpl.Container implements
-		StyleRule {
+public class StyleRuleImpl extends MinimalEObjectImpl.Container implements StyleRule {
+
 	/**
 	 * The cached value of the '{@link #getSelectors() <em>Selector</em>}' containment reference list.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getSelectors()
 	 * @generated
 	 * @ordered
@@ -59,6 +59,7 @@ public class StyleRuleImpl extends MinimalEObjectImpl.Container implements
 	/**
 	 * The cached value of the '{@link #getStyle() <em>Style</em>}' containment reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getStyle()
 	 * @generated
 	 * @ordered
@@ -67,6 +68,7 @@ public class StyleRuleImpl extends MinimalEObjectImpl.Container implements
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected StyleRuleImpl() {
@@ -75,6 +77,7 @@ public class StyleRuleImpl extends MinimalEObjectImpl.Container implements
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -84,10 +87,11 @@ public class StyleRuleImpl extends MinimalEObjectImpl.Container implements
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<StyleSelector> getSelectors() {
-		if (selectors == null) {
+		if(selectors == null) {
 			selectors = new EObjectContainmentEList<StyleSelector>(StyleSelector.class, this, DGPackage.STYLE_RULE__SELECTOR);
 		}
 		return selectors;
@@ -95,6 +99,7 @@ public class StyleRuleImpl extends MinimalEObjectImpl.Container implements
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Style getStyle() {
@@ -103,117 +108,124 @@ public class StyleRuleImpl extends MinimalEObjectImpl.Container implements
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public NotificationChain basicSetStyle(Style newStyle,
-			NotificationChain msgs) {
+	public NotificationChain basicSetStyle(Style newStyle, NotificationChain msgs) {
 		Style oldStyle = style;
 		style = newStyle;
-		if (eNotificationRequired()) {
+		if(eNotificationRequired()) {
 			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, DGPackage.STYLE_RULE__STYLE, oldStyle, newStyle);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
+			if(msgs == null)
+				msgs = notification;
+			else
+				msgs.add(notification);
 		}
 		return msgs;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setStyle(Style newStyle) {
-		if (newStyle != style) {
+		if(newStyle != style) {
 			NotificationChain msgs = null;
-			if (style != null)
+			if(style != null)
 				msgs = ((InternalEObject)style).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - DGPackage.STYLE_RULE__STYLE, null, msgs);
-			if (newStyle != null)
+			if(newStyle != null)
 				msgs = ((InternalEObject)newStyle).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - DGPackage.STYLE_RULE__STYLE, null, msgs);
 			msgs = basicSetStyle(newStyle, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
+			if(msgs != null)
+				msgs.dispatch();
+		} else if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.STYLE_RULE__STYLE, newStyle, newStyle));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd,
-			int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case DGPackage.STYLE_RULE__SELECTOR:
-				return ((InternalEList<?>)getSelectors()).basicRemove(otherEnd, msgs);
-			case DGPackage.STYLE_RULE__STYLE:
-				return basicSetStyle(null, msgs);
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch(featureID) {
+		case DGPackage.STYLE_RULE__SELECTOR:
+			return ((InternalEList<?>)getSelectors()).basicRemove(otherEnd, msgs);
+		case DGPackage.STYLE_RULE__STYLE:
+			return basicSetStyle(null, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case DGPackage.STYLE_RULE__SELECTOR:
-				return getSelectors();
-			case DGPackage.STYLE_RULE__STYLE:
-				return getStyle();
+		switch(featureID) {
+		case DGPackage.STYLE_RULE__SELECTOR:
+			return getSelectors();
+		case DGPackage.STYLE_RULE__STYLE:
+			return getStyle();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case DGPackage.STYLE_RULE__SELECTOR:
-				getSelectors().clear();
-				getSelectors().addAll((Collection<? extends StyleSelector>)newValue);
-				return;
-			case DGPackage.STYLE_RULE__STYLE:
-				setStyle((Style)newValue);
-				return;
+		switch(featureID) {
+		case DGPackage.STYLE_RULE__SELECTOR:
+			getSelectors().clear();
+			getSelectors().addAll((Collection<? extends StyleSelector>)newValue);
+			return;
+		case DGPackage.STYLE_RULE__STYLE:
+			setStyle((Style)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case DGPackage.STYLE_RULE__SELECTOR:
-				getSelectors().clear();
-				return;
-			case DGPackage.STYLE_RULE__STYLE:
-				setStyle((Style)null);
-				return;
+		switch(featureID) {
+		case DGPackage.STYLE_RULE__SELECTOR:
+			getSelectors().clear();
+			return;
+		case DGPackage.STYLE_RULE__STYLE:
+			setStyle((Style)null);
+			return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case DGPackage.STYLE_RULE__SELECTOR:
-				return selectors != null && !selectors.isEmpty();
-			case DGPackage.STYLE_RULE__STYLE:
-				return style != null;
+		switch(featureID) {
+		case DGPackage.STYLE_RULE__SELECTOR:
+			return selectors != null && !selectors.isEmpty();
+		case DGPackage.STYLE_RULE__STYLE:
+			return style != null;
 		}
 		return super.eIsSet(featureID);
 	}
-
 } // StyleRuleImpl
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/StyleSelectorImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/StyleSelectorImpl.java
index 598e6a0ede6..cddd3122278 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/StyleSelectorImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/StyleSelectorImpl.java
@@ -23,23 +23,23 @@ import org.eclipse.papyrus.dd.dg.ElementKind;
 import org.eclipse.papyrus.dd.dg.StyleSelector;
 
 /**
- * <!-- begin-user-doc --> An implementation of the model object '
- * <em><b>Style Selector</b></em>'. <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object ' <em><b>Style Selector</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.dd.dg.impl.StyleSelectorImpl#getKind <em>Kind</em>}</li>
- *   <li>{@link org.eclipse.papyrus.dd.dg.impl.StyleSelectorImpl#getClasses <em>Class</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.impl.StyleSelectorImpl#getKind <em>Kind</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.impl.StyleSelectorImpl#getClasses <em>Class</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
-public class StyleSelectorImpl extends MinimalEObjectImpl.Container implements
-		StyleSelector {
+public class StyleSelectorImpl extends MinimalEObjectImpl.Container implements StyleSelector {
+
 	/**
 	 * The default value of the '{@link #getKind() <em>Kind</em>}' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getKind()
 	 * @generated
 	 * @ordered
@@ -49,6 +49,7 @@ public class StyleSelectorImpl extends MinimalEObjectImpl.Container implements
 	/**
 	 * The cached value of the '{@link #getKind() <em>Kind</em>}' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getKind()
 	 * @generated
 	 * @ordered
@@ -59,6 +60,7 @@ public class StyleSelectorImpl extends MinimalEObjectImpl.Container implements
 	 * This is true if the Kind attribute has been set.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -67,6 +69,7 @@ public class StyleSelectorImpl extends MinimalEObjectImpl.Container implements
 	/**
 	 * The cached value of the '{@link #getClasses() <em>Class</em>}' attribute list.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getClasses()
 	 * @generated
 	 * @ordered
@@ -75,6 +78,7 @@ public class StyleSelectorImpl extends MinimalEObjectImpl.Container implements
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected StyleSelectorImpl() {
@@ -83,6 +87,7 @@ public class StyleSelectorImpl extends MinimalEObjectImpl.Container implements
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -92,6 +97,7 @@ public class StyleSelectorImpl extends MinimalEObjectImpl.Container implements
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public ElementKind getKind() {
@@ -100,6 +106,7 @@ public class StyleSelectorImpl extends MinimalEObjectImpl.Container implements
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setKind(ElementKind newKind) {
@@ -107,12 +114,13 @@ public class StyleSelectorImpl extends MinimalEObjectImpl.Container implements
 		kind = newKind == null ? KIND_EDEFAULT : newKind;
 		boolean oldKindESet = kindESet;
 		kindESet = true;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.STYLE_SELECTOR__KIND, oldKind, kind, !oldKindESet));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void unsetKind() {
@@ -120,12 +128,13 @@ public class StyleSelectorImpl extends MinimalEObjectImpl.Container implements
 		boolean oldKindESet = kindESet;
 		kind = KIND_EDEFAULT;
 		kindESet = false;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.UNSET, DGPackage.STYLE_SELECTOR__KIND, oldKind, KIND_EDEFAULT, oldKindESet));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetKind() {
@@ -134,10 +143,11 @@ public class StyleSelectorImpl extends MinimalEObjectImpl.Container implements
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<String> getClasses() {
-		if (classes == null) {
+		if(classes == null) {
 			classes = new EDataTypeUniqueEList<String>(String.class, this, DGPackage.STYLE_SELECTOR__CLASS);
 		}
 		return classes;
@@ -145,85 +155,92 @@ public class StyleSelectorImpl extends MinimalEObjectImpl.Container implements
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case DGPackage.STYLE_SELECTOR__KIND:
-				return getKind();
-			case DGPackage.STYLE_SELECTOR__CLASS:
-				return getClasses();
+		switch(featureID) {
+		case DGPackage.STYLE_SELECTOR__KIND:
+			return getKind();
+		case DGPackage.STYLE_SELECTOR__CLASS:
+			return getClasses();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case DGPackage.STYLE_SELECTOR__KIND:
-				setKind((ElementKind)newValue);
-				return;
-			case DGPackage.STYLE_SELECTOR__CLASS:
-				getClasses().clear();
-				getClasses().addAll((Collection<? extends String>)newValue);
-				return;
+		switch(featureID) {
+		case DGPackage.STYLE_SELECTOR__KIND:
+			setKind((ElementKind)newValue);
+			return;
+		case DGPackage.STYLE_SELECTOR__CLASS:
+			getClasses().clear();
+			getClasses().addAll((Collection<? extends String>)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case DGPackage.STYLE_SELECTOR__KIND:
-				unsetKind();
-				return;
-			case DGPackage.STYLE_SELECTOR__CLASS:
-				getClasses().clear();
-				return;
+		switch(featureID) {
+		case DGPackage.STYLE_SELECTOR__KIND:
+			unsetKind();
+			return;
+		case DGPackage.STYLE_SELECTOR__CLASS:
+			getClasses().clear();
+			return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case DGPackage.STYLE_SELECTOR__KIND:
-				return isSetKind();
-			case DGPackage.STYLE_SELECTOR__CLASS:
-				return classes != null && !classes.isEmpty();
+		switch(featureID) {
+		case DGPackage.STYLE_SELECTOR__KIND:
+			return isSetKind();
+		case DGPackage.STYLE_SELECTOR__CLASS:
+			return classes != null && !classes.isEmpty();
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) return super.toString();
-
+		if(eIsProxy())
+			return super.toString();
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (kind: ");
-		if (kindESet) result.append(kind); else result.append("<unset>");
+		if(kindESet)
+			result.append(kind);
+		else
+			result.append("<unset>");
 		result.append(", class: ");
 		result.append(classes);
 		result.append(')');
 		return result.toString();
 	}
-
 } // StyleSelectorImpl
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/StyleSheetImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/StyleSheetImpl.java
index ecf34924eca..f441f5ad489 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/StyleSheetImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/StyleSheetImpl.java
@@ -30,22 +30,22 @@ import org.eclipse.papyrus.dd.dg.StyleRule;
 import org.eclipse.papyrus.dd.dg.StyleSheet;
 
 /**
- * <!-- begin-user-doc --> An implementation of the model object '
- * <em><b>Style Sheet</b></em>'. <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object ' <em><b>Style Sheet</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.dd.dg.impl.StyleSheetImpl#getRules <em>Rule</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.impl.StyleSheetImpl#getRules <em>Rule</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
-public class StyleSheetImpl extends MinimalEObjectImpl.Container implements
-		StyleSheet {
+public class StyleSheetImpl extends MinimalEObjectImpl.Container implements StyleSheet {
+
 	/**
 	 * The cached value of the '{@link #getRules() <em>Rule</em>}' containment reference list.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getRules()
 	 * @generated
 	 * @ordered
@@ -54,6 +54,7 @@ public class StyleSheetImpl extends MinimalEObjectImpl.Container implements
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected StyleSheetImpl() {
@@ -62,6 +63,7 @@ public class StyleSheetImpl extends MinimalEObjectImpl.Container implements
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -71,10 +73,11 @@ public class StyleSheetImpl extends MinimalEObjectImpl.Container implements
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<StyleRule> getRules() {
-		if (rules == null) {
+		if(rules == null) {
 			rules = new EObjectContainmentEList<StyleRule>(StyleRule.class, this, DGPackage.STYLE_SHEET__RULE);
 		}
 		return rules;
@@ -82,72 +85,75 @@ public class StyleSheetImpl extends MinimalEObjectImpl.Container implements
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd,
-			int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case DGPackage.STYLE_SHEET__RULE:
-				return ((InternalEList<?>)getRules()).basicRemove(otherEnd, msgs);
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch(featureID) {
+		case DGPackage.STYLE_SHEET__RULE:
+			return ((InternalEList<?>)getRules()).basicRemove(otherEnd, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case DGPackage.STYLE_SHEET__RULE:
-				return getRules();
+		switch(featureID) {
+		case DGPackage.STYLE_SHEET__RULE:
+			return getRules();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case DGPackage.STYLE_SHEET__RULE:
-				getRules().clear();
-				getRules().addAll((Collection<? extends StyleRule>)newValue);
-				return;
+		switch(featureID) {
+		case DGPackage.STYLE_SHEET__RULE:
+			getRules().clear();
+			getRules().addAll((Collection<? extends StyleRule>)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case DGPackage.STYLE_SHEET__RULE:
-				getRules().clear();
-				return;
+		switch(featureID) {
+		case DGPackage.STYLE_SHEET__RULE:
+			getRules().clear();
+			return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case DGPackage.STYLE_SHEET__RULE:
-				return rules != null && !rules.isEmpty();
+		switch(featureID) {
+		case DGPackage.STYLE_SHEET__RULE:
+			return rules != null && !rules.isEmpty();
 		}
 		return super.eIsSet(featureID);
 	}
-
 } // StyleSheetImpl
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/TextImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/TextImpl.java
index 8a71bf61ec6..c7bb8ef0b5a 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/TextImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/TextImpl.java
@@ -32,23 +32,24 @@ import org.eclipse.papyrus.dd.dg.TextAnchor;
 import org.eclipse.papyrus.dd.dg.util.DGValidator;
 
 /**
- * <!-- begin-user-doc --> An implementation of the model object '
- * <em><b>Text</b></em>'. <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object ' <em><b>Text</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.dd.dg.impl.TextImpl#getData <em>Data</em>}</li>
- *   <li>{@link org.eclipse.papyrus.dd.dg.impl.TextImpl#getPosition <em>Position</em>}</li>
- *   <li>{@link org.eclipse.papyrus.dd.dg.impl.TextImpl#getAnchor <em>Anchor</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.impl.TextImpl#getData <em>Data</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.impl.TextImpl#getPosition <em>Position</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.impl.TextImpl#getAnchor <em>Anchor</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class TextImpl extends GraphicalElementImpl implements Text {
+
 	/**
 	 * The default value of the '{@link #getData() <em>Data</em>}' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getData()
 	 * @generated
 	 * @ordered
@@ -58,6 +59,7 @@ public class TextImpl extends GraphicalElementImpl implements Text {
 	/**
 	 * The cached value of the '{@link #getData() <em>Data</em>}' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getData()
 	 * @generated
 	 * @ordered
@@ -67,6 +69,7 @@ public class TextImpl extends GraphicalElementImpl implements Text {
 	/**
 	 * The cached value of the '{@link #getPosition() <em>Position</em>}' containment reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getPosition()
 	 * @generated
 	 * @ordered
@@ -77,6 +80,7 @@ public class TextImpl extends GraphicalElementImpl implements Text {
 	 * The default value of the '{@link #getAnchor() <em>Anchor</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getAnchor()
 	 * @generated
 	 * @ordered
@@ -87,6 +91,7 @@ public class TextImpl extends GraphicalElementImpl implements Text {
 	 * The cached value of the '{@link #getAnchor() <em>Anchor</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getAnchor()
 	 * @generated
 	 * @ordered
@@ -95,6 +100,7 @@ public class TextImpl extends GraphicalElementImpl implements Text {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected TextImpl() {
@@ -103,6 +109,7 @@ public class TextImpl extends GraphicalElementImpl implements Text {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -112,6 +119,7 @@ public class TextImpl extends GraphicalElementImpl implements Text {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getData() {
@@ -120,17 +128,19 @@ public class TextImpl extends GraphicalElementImpl implements Text {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setData(String newData) {
 		String oldData = data;
 		data = newData;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.TEXT__DATA, oldData, data));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Point getPosition() {
@@ -139,40 +149,45 @@ public class TextImpl extends GraphicalElementImpl implements Text {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public NotificationChain basicSetPosition(Point newPosition,
-			NotificationChain msgs) {
+	public NotificationChain basicSetPosition(Point newPosition, NotificationChain msgs) {
 		Point oldPosition = position;
 		position = newPosition;
-		if (eNotificationRequired()) {
+		if(eNotificationRequired()) {
 			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, DGPackage.TEXT__POSITION, oldPosition, newPosition);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
+			if(msgs == null)
+				msgs = notification;
+			else
+				msgs.add(notification);
 		}
 		return msgs;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setPosition(Point newPosition) {
-		if (newPosition != position) {
+		if(newPosition != position) {
 			NotificationChain msgs = null;
-			if (position != null)
+			if(position != null)
 				msgs = ((InternalEObject)position).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - DGPackage.TEXT__POSITION, null, msgs);
-			if (newPosition != null)
+			if(newPosition != null)
 				msgs = ((InternalEObject)newPosition).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - DGPackage.TEXT__POSITION, null, msgs);
 			msgs = basicSetPosition(newPosition, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
+			if(msgs != null)
+				msgs.dispatch();
+		} else if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.TEXT__POSITION, newPosition, newPosition));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public TextAnchor getAnchor() {
@@ -182,19 +197,22 @@ public class TextImpl extends GraphicalElementImpl implements Text {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setAnchor(TextAnchor newAnchor) {
 		TextAnchor oldAnchor = anchor;
 		anchor = newAnchor == null ? ANCHOR_EDEFAULT : newAnchor;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.TEXT__ANCHOR, oldAnchor, anchor));
 	}
 
 	/**
-	 * The cached validation expression for the '{@link #dataCannotBeEmpty(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Data Cannot Be Empty</em>}' invariant operation.
+	 * The cached validation expression for the '{@link #dataCannotBeEmpty(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
+	 * <em>Data Cannot Be Empty</em>}' invariant operation.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @see #dataCannotBeEmpty(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
 	 * @generated
 	 * @ordered
@@ -203,135 +221,129 @@ public class TextImpl extends GraphicalElementImpl implements Text {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public boolean dataCannotBeEmpty(DiagnosticChain diagnostics,
-			Map<Object, Object> context) {
-		return
-			DGValidator.validate
-				(DGPackage.Literals.TEXT,
-				 this,
-				 diagnostics,
-				 context,
-				 "http://www.eclipse.org/emf/2002/Ecore/OCL",
-				 DGPackage.Literals.TEXT___DATA_CANNOT_BE_EMPTY__DIAGNOSTICCHAIN_MAP,
-				 DATA_CANNOT_BE_EMPTY_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION,
-				 Diagnostic.ERROR,
-				 DGValidator.DIAGNOSTIC_SOURCE,
-				 DGValidator.TEXT__DATA_CANNOT_BE_EMPTY);
+	public boolean dataCannotBeEmpty(DiagnosticChain diagnostics, Map<Object, Object> context) {
+		return DGValidator.validate(DGPackage.Literals.TEXT, this, diagnostics, context, "http://www.eclipse.org/emf/2002/Ecore/OCL", DGPackage.Literals.TEXT___DATA_CANNOT_BE_EMPTY__DIAGNOSTICCHAIN_MAP, DATA_CANNOT_BE_EMPTY_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION, Diagnostic.ERROR, DGValidator.DIAGNOSTIC_SOURCE, DGValidator.TEXT__DATA_CANNOT_BE_EMPTY);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd,
-			int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case DGPackage.TEXT__POSITION:
-				return basicSetPosition(null, msgs);
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch(featureID) {
+		case DGPackage.TEXT__POSITION:
+			return basicSetPosition(null, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case DGPackage.TEXT__DATA:
-				return getData();
-			case DGPackage.TEXT__POSITION:
-				return getPosition();
-			case DGPackage.TEXT__ANCHOR:
-				return getAnchor();
+		switch(featureID) {
+		case DGPackage.TEXT__DATA:
+			return getData();
+		case DGPackage.TEXT__POSITION:
+			return getPosition();
+		case DGPackage.TEXT__ANCHOR:
+			return getAnchor();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case DGPackage.TEXT__DATA:
-				setData((String)newValue);
-				return;
-			case DGPackage.TEXT__POSITION:
-				setPosition((Point)newValue);
-				return;
-			case DGPackage.TEXT__ANCHOR:
-				setAnchor((TextAnchor)newValue);
-				return;
+		switch(featureID) {
+		case DGPackage.TEXT__DATA:
+			setData((String)newValue);
+			return;
+		case DGPackage.TEXT__POSITION:
+			setPosition((Point)newValue);
+			return;
+		case DGPackage.TEXT__ANCHOR:
+			setAnchor((TextAnchor)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case DGPackage.TEXT__DATA:
-				setData(DATA_EDEFAULT);
-				return;
-			case DGPackage.TEXT__POSITION:
-				setPosition((Point)null);
-				return;
-			case DGPackage.TEXT__ANCHOR:
-				setAnchor(ANCHOR_EDEFAULT);
-				return;
+		switch(featureID) {
+		case DGPackage.TEXT__DATA:
+			setData(DATA_EDEFAULT);
+			return;
+		case DGPackage.TEXT__POSITION:
+			setPosition((Point)null);
+			return;
+		case DGPackage.TEXT__ANCHOR:
+			setAnchor(ANCHOR_EDEFAULT);
+			return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case DGPackage.TEXT__DATA:
-				return DATA_EDEFAULT == null ? data != null : !DATA_EDEFAULT.equals(data);
-			case DGPackage.TEXT__POSITION:
-				return position != null;
-			case DGPackage.TEXT__ANCHOR:
-				return anchor != ANCHOR_EDEFAULT;
+		switch(featureID) {
+		case DGPackage.TEXT__DATA:
+			return DATA_EDEFAULT == null ? data != null : !DATA_EDEFAULT.equals(data);
+		case DGPackage.TEXT__POSITION:
+			return position != null;
+		case DGPackage.TEXT__ANCHOR:
+			return anchor != ANCHOR_EDEFAULT;
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	@SuppressWarnings("unchecked")
-	public Object eInvoke(int operationID, EList<?> arguments)
-			throws InvocationTargetException {
-		switch (operationID) {
-			case DGPackage.TEXT___DATA_CANNOT_BE_EMPTY__DIAGNOSTICCHAIN_MAP:
-				return dataCannotBeEmpty((DiagnosticChain)arguments.get(0), (Map<Object, Object>)arguments.get(1));
+	public Object eInvoke(int operationID, EList<?> arguments) throws InvocationTargetException {
+		switch(operationID) {
+		case DGPackage.TEXT___DATA_CANNOT_BE_EMPTY__DIAGNOSTICCHAIN_MAP:
+			return dataCannotBeEmpty((DiagnosticChain)arguments.get(0), (Map<Object, Object>)arguments.get(1));
 		}
 		return super.eInvoke(operationID, arguments);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) return super.toString();
-
+		if(eIsProxy())
+			return super.toString();
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (data: ");
 		result.append(data);
@@ -340,5 +352,4 @@ public class TextImpl extends GraphicalElementImpl implements Text {
 		result.append(')');
 		return result.toString();
 	}
-
 } // TextImpl
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/TransformImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/TransformImpl.java
index 5612d490ba0..300924e0640 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/TransformImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/TransformImpl.java
@@ -19,17 +19,17 @@ import org.eclipse.papyrus.dd.dg.DGPackage;
 import org.eclipse.papyrus.dd.dg.Transform;
 
 /**
- * <!-- begin-user-doc --> An implementation of the model object '
- * <em><b>Transform</b></em>'. <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object ' <em><b>Transform</b></em>'. <!-- end-user-doc -->
  * <p>
  * </p>
- *
+ * 
  * @generated
  */
-public abstract class TransformImpl extends MinimalEObjectImpl.Container
-		implements Transform {
+public abstract class TransformImpl extends MinimalEObjectImpl.Container implements Transform {
+
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected TransformImpl() {
@@ -38,11 +38,11 @@ public abstract class TransformImpl extends MinimalEObjectImpl.Container
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	protected EClass eStaticClass() {
 		return DGPackage.Literals.TRANSFORM;
 	}
-
 } // TransformImpl
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/TranslateImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/TranslateImpl.java
index 78b0b9af6e8..5038f929363 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/TranslateImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/TranslateImpl.java
@@ -21,22 +21,23 @@ import org.eclipse.papyrus.dd.dg.DGPackage;
 import org.eclipse.papyrus.dd.dg.Translate;
 
 /**
- * <!-- begin-user-doc --> An implementation of the model object '
- * <em><b>Translate</b></em>'. <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object ' <em><b>Translate</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.dd.dg.impl.TranslateImpl#getDeltaX <em>Delta X</em>}</li>
- *   <li>{@link org.eclipse.papyrus.dd.dg.impl.TranslateImpl#getDeltaY <em>Delta Y</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.impl.TranslateImpl#getDeltaX <em>Delta X</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.impl.TranslateImpl#getDeltaY <em>Delta Y</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class TranslateImpl extends TransformImpl implements Translate {
+
 	/**
 	 * The default value of the '{@link #getDeltaX() <em>Delta X</em>}' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getDeltaX()
 	 * @generated
 	 * @ordered
@@ -46,6 +47,7 @@ public class TranslateImpl extends TransformImpl implements Translate {
 	/**
 	 * The cached value of the '{@link #getDeltaX() <em>Delta X</em>}' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getDeltaX()
 	 * @generated
 	 * @ordered
@@ -55,6 +57,7 @@ public class TranslateImpl extends TransformImpl implements Translate {
 	/**
 	 * The default value of the '{@link #getDeltaY() <em>Delta Y</em>}' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getDeltaY()
 	 * @generated
 	 * @ordered
@@ -64,6 +67,7 @@ public class TranslateImpl extends TransformImpl implements Translate {
 	/**
 	 * The cached value of the '{@link #getDeltaY() <em>Delta Y</em>}' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getDeltaY()
 	 * @generated
 	 * @ordered
@@ -72,6 +76,7 @@ public class TranslateImpl extends TransformImpl implements Translate {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected TranslateImpl() {
@@ -80,6 +85,7 @@ public class TranslateImpl extends TransformImpl implements Translate {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -89,6 +95,7 @@ public class TranslateImpl extends TransformImpl implements Translate {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public double getDeltaX() {
@@ -97,17 +104,19 @@ public class TranslateImpl extends TransformImpl implements Translate {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setDeltaX(double newDeltaX) {
 		double oldDeltaX = deltaX;
 		deltaX = newDeltaX;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.TRANSLATE__DELTA_X, oldDeltaX, deltaX));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public double getDeltaY() {
@@ -116,87 +125,93 @@ public class TranslateImpl extends TransformImpl implements Translate {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setDeltaY(double newDeltaY) {
 		double oldDeltaY = deltaY;
 		deltaY = newDeltaY;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.TRANSLATE__DELTA_Y, oldDeltaY, deltaY));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case DGPackage.TRANSLATE__DELTA_X:
-				return getDeltaX();
-			case DGPackage.TRANSLATE__DELTA_Y:
-				return getDeltaY();
+		switch(featureID) {
+		case DGPackage.TRANSLATE__DELTA_X:
+			return getDeltaX();
+		case DGPackage.TRANSLATE__DELTA_Y:
+			return getDeltaY();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case DGPackage.TRANSLATE__DELTA_X:
-				setDeltaX((Double)newValue);
-				return;
-			case DGPackage.TRANSLATE__DELTA_Y:
-				setDeltaY((Double)newValue);
-				return;
+		switch(featureID) {
+		case DGPackage.TRANSLATE__DELTA_X:
+			setDeltaX((Double)newValue);
+			return;
+		case DGPackage.TRANSLATE__DELTA_Y:
+			setDeltaY((Double)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case DGPackage.TRANSLATE__DELTA_X:
-				setDeltaX(DELTA_X_EDEFAULT);
-				return;
-			case DGPackage.TRANSLATE__DELTA_Y:
-				setDeltaY(DELTA_Y_EDEFAULT);
-				return;
+		switch(featureID) {
+		case DGPackage.TRANSLATE__DELTA_X:
+			setDeltaX(DELTA_X_EDEFAULT);
+			return;
+		case DGPackage.TRANSLATE__DELTA_Y:
+			setDeltaY(DELTA_Y_EDEFAULT);
+			return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case DGPackage.TRANSLATE__DELTA_X:
-				return deltaX != DELTA_X_EDEFAULT;
-			case DGPackage.TRANSLATE__DELTA_Y:
-				return deltaY != DELTA_Y_EDEFAULT;
+		switch(featureID) {
+		case DGPackage.TRANSLATE__DELTA_X:
+			return deltaX != DELTA_X_EDEFAULT;
+		case DGPackage.TRANSLATE__DELTA_Y:
+			return deltaY != DELTA_Y_EDEFAULT;
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) return super.toString();
-
+		if(eIsProxy())
+			return super.toString();
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (deltaX: ");
 		result.append(deltaX);
@@ -205,5 +220,4 @@ public class TranslateImpl extends TransformImpl implements Translate {
 		result.append(')');
 		return result.toString();
 	}
-
 } // TranslateImpl
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/UseImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/UseImpl.java
index 96ace814158..bb6e9daf938 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/UseImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/impl/UseImpl.java
@@ -32,22 +32,23 @@ import org.eclipse.papyrus.dd.dg.Use;
 import org.eclipse.papyrus.dd.dg.util.DGValidator;
 
 /**
- * <!-- begin-user-doc --> An implementation of the model object '
- * <em><b>Use</b></em>'. <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object ' <em><b>Use</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.dd.dg.impl.UseImpl#getBounds <em>Bounds</em>}</li>
- *   <li>{@link org.eclipse.papyrus.dd.dg.impl.UseImpl#getReferencedElement <em>Referenced Element</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.impl.UseImpl#getBounds <em>Bounds</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.dg.impl.UseImpl#getReferencedElement <em>Referenced Element</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class UseImpl extends GraphicalElementImpl implements Use {
+
 	/**
 	 * The cached value of the '{@link #getBounds() <em>Bounds</em>}' containment reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getBounds()
 	 * @generated
 	 * @ordered
@@ -58,6 +59,7 @@ public class UseImpl extends GraphicalElementImpl implements Use {
 	 * The cached value of the '{@link #getReferencedElement() <em>Referenced Element</em>}' reference.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @see #getReferencedElement()
 	 * @generated
 	 * @ordered
@@ -66,6 +68,7 @@ public class UseImpl extends GraphicalElementImpl implements Use {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected UseImpl() {
@@ -74,6 +77,7 @@ public class UseImpl extends GraphicalElementImpl implements Use {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -83,6 +87,7 @@ public class UseImpl extends GraphicalElementImpl implements Use {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Bounds getBounds() {
@@ -91,47 +96,52 @@ public class UseImpl extends GraphicalElementImpl implements Use {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public NotificationChain basicSetBounds(Bounds newBounds,
-			NotificationChain msgs) {
+	public NotificationChain basicSetBounds(Bounds newBounds, NotificationChain msgs) {
 		Bounds oldBounds = bounds;
 		bounds = newBounds;
-		if (eNotificationRequired()) {
+		if(eNotificationRequired()) {
 			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, DGPackage.USE__BOUNDS, oldBounds, newBounds);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
+			if(msgs == null)
+				msgs = notification;
+			else
+				msgs.add(notification);
 		}
 		return msgs;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setBounds(Bounds newBounds) {
-		if (newBounds != bounds) {
+		if(newBounds != bounds) {
 			NotificationChain msgs = null;
-			if (bounds != null)
+			if(bounds != null)
 				msgs = ((InternalEObject)bounds).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - DGPackage.USE__BOUNDS, null, msgs);
-			if (newBounds != null)
+			if(newBounds != null)
 				msgs = ((InternalEObject)newBounds).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - DGPackage.USE__BOUNDS, null, msgs);
 			msgs = basicSetBounds(newBounds, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
+			if(msgs != null)
+				msgs.dispatch();
+		} else if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.USE__BOUNDS, newBounds, newBounds));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public GraphicalElement getReferencedElement() {
-		if (referencedElement != null && referencedElement.eIsProxy()) {
+		if(referencedElement != null && referencedElement.eIsProxy()) {
 			InternalEObject oldReferencedElement = (InternalEObject)referencedElement;
 			referencedElement = (GraphicalElement)eResolveProxy(oldReferencedElement);
-			if (referencedElement != oldReferencedElement) {
-				if (eNotificationRequired())
+			if(referencedElement != oldReferencedElement) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, DGPackage.USE__REFERENCED_ELEMENT, oldReferencedElement, referencedElement));
 			}
 		}
@@ -140,6 +150,7 @@ public class UseImpl extends GraphicalElementImpl implements Use {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public GraphicalElement basicGetReferencedElement() {
@@ -148,23 +159,22 @@ public class UseImpl extends GraphicalElementImpl implements Use {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setReferencedElement(GraphicalElement newReferencedElement) {
 		GraphicalElement oldReferencedElement = referencedElement;
 		referencedElement = newReferencedElement;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, DGPackage.USE__REFERENCED_ELEMENT, oldReferencedElement, referencedElement));
 	}
 
 	/**
-	 * The cached validation expression for the '
-	 * {@link #referencedElementHasId(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
+	 * The cached validation expression for the ' {@link #referencedElementHasId(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
 	 * <em>Referenced Element Has Id</em>}' invariant operation. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
-	 * @see #referencedElementHasId(org.eclipse.emf.common.util.DiagnosticChain,
-	 *      java.util.Map)
+	 * @see #referencedElementHasId(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
 	 * @generated
 	 * @ordered
 	 */
@@ -172,116 +182,109 @@ public class UseImpl extends GraphicalElementImpl implements Use {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public boolean referencedElementHasId(DiagnosticChain diagnostics,
-			Map<Object, Object> context) {
-		return
-			DGValidator.validate
-				(DGPackage.Literals.USE,
-				 this,
-				 diagnostics,
-				 context,
-				 "http://www.eclipse.org/emf/2002/Ecore/OCL",
-				 DGPackage.Literals.USE___REFERENCED_ELEMENT_HAS_ID__DIAGNOSTICCHAIN_MAP,
-				 REFERENCED_ELEMENT_HAS_ID_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION,
-				 Diagnostic.ERROR,
-				 DGValidator.DIAGNOSTIC_SOURCE,
-				 DGValidator.USE__REFERENCED_ELEMENT_HAS_ID);
+	public boolean referencedElementHasId(DiagnosticChain diagnostics, Map<Object, Object> context) {
+		return DGValidator.validate(DGPackage.Literals.USE, this, diagnostics, context, "http://www.eclipse.org/emf/2002/Ecore/OCL", DGPackage.Literals.USE___REFERENCED_ELEMENT_HAS_ID__DIAGNOSTICCHAIN_MAP, REFERENCED_ELEMENT_HAS_ID_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION, Diagnostic.ERROR, DGValidator.DIAGNOSTIC_SOURCE, DGValidator.USE__REFERENCED_ELEMENT_HAS_ID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd,
-			int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case DGPackage.USE__BOUNDS:
-				return basicSetBounds(null, msgs);
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch(featureID) {
+		case DGPackage.USE__BOUNDS:
+			return basicSetBounds(null, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case DGPackage.USE__BOUNDS:
-				return getBounds();
-			case DGPackage.USE__REFERENCED_ELEMENT:
-				if (resolve) return getReferencedElement();
-				return basicGetReferencedElement();
+		switch(featureID) {
+		case DGPackage.USE__BOUNDS:
+			return getBounds();
+		case DGPackage.USE__REFERENCED_ELEMENT:
+			if(resolve)
+				return getReferencedElement();
+			return basicGetReferencedElement();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case DGPackage.USE__BOUNDS:
-				setBounds((Bounds)newValue);
-				return;
-			case DGPackage.USE__REFERENCED_ELEMENT:
-				setReferencedElement((GraphicalElement)newValue);
-				return;
+		switch(featureID) {
+		case DGPackage.USE__BOUNDS:
+			setBounds((Bounds)newValue);
+			return;
+		case DGPackage.USE__REFERENCED_ELEMENT:
+			setReferencedElement((GraphicalElement)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case DGPackage.USE__BOUNDS:
-				setBounds((Bounds)null);
-				return;
-			case DGPackage.USE__REFERENCED_ELEMENT:
-				setReferencedElement((GraphicalElement)null);
-				return;
+		switch(featureID) {
+		case DGPackage.USE__BOUNDS:
+			setBounds((Bounds)null);
+			return;
+		case DGPackage.USE__REFERENCED_ELEMENT:
+			setReferencedElement((GraphicalElement)null);
+			return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case DGPackage.USE__BOUNDS:
-				return bounds != null;
-			case DGPackage.USE__REFERENCED_ELEMENT:
-				return referencedElement != null;
+		switch(featureID) {
+		case DGPackage.USE__BOUNDS:
+			return bounds != null;
+		case DGPackage.USE__REFERENCED_ELEMENT:
+			return referencedElement != null;
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	@SuppressWarnings("unchecked")
-	public Object eInvoke(int operationID, EList<?> arguments)
-			throws InvocationTargetException {
-		switch (operationID) {
-			case DGPackage.USE___REFERENCED_ELEMENT_HAS_ID__DIAGNOSTICCHAIN_MAP:
-				return referencedElementHasId((DiagnosticChain)arguments.get(0), (Map<Object, Object>)arguments.get(1));
+	public Object eInvoke(int operationID, EList<?> arguments) throws InvocationTargetException {
+		switch(operationID) {
+		case DGPackage.USE___REFERENCED_ELEMENT_HAS_ID__DIAGNOSTICCHAIN_MAP:
+			return referencedElementHasId((DiagnosticChain)arguments.get(0), (Map<Object, Object>)arguments.get(1));
 		}
 		return super.eInvoke(operationID, arguments);
 	}
-
 } // UseImpl
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/util/DGAdapterFactory.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/util/DGAdapterFactory.java
index 956c257a9fc..9288055272d 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/util/DGAdapterFactory.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/util/DGAdapterFactory.java
@@ -24,6 +24,7 @@ import org.eclipse.papyrus.dd.dg.*;
  * <!-- begin-user-doc --> The <b>Adapter Factory</b> for the model. It provides
  * an adapter <code>createXXX</code> method for each class of the model. <!--
  * end-user-doc -->
+ * 
  * @see org.eclipse.papyrus.dd.dg.DGPackage
  * @generated
  */
@@ -32,6 +33,7 @@ public class DGAdapterFactory extends AdapterFactoryImpl {
 	/**
 	 * The cached model package.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected static DGPackage modelPackage;
@@ -40,10 +42,11 @@ public class DGAdapterFactory extends AdapterFactoryImpl {
 	 * Creates an instance of the adapter factory.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public DGAdapterFactory() {
-		if (modelPackage == null) {
+		if(modelPackage == null) {
 			modelPackage = DGPackage.eINSTANCE;
 		}
 	}
@@ -53,15 +56,16 @@ public class DGAdapterFactory extends AdapterFactoryImpl {
 	 * <!-- begin-user-doc --> This implementation returns <code>true</code> if
 	 * the object is either the model's package or is an instance object of the
 	 * model. <!-- end-user-doc -->
+	 * 
 	 * @return whether this factory is applicable for the type of the object.
 	 * @generated
 	 */
 	@Override
 	public boolean isFactoryForType(Object object) {
-		if (object == modelPackage) {
+		if(object == modelPackage) {
 			return true;
 		}
-		if (object instanceof EObject) {
+		if(object instanceof EObject) {
 			return ((EObject)object).eClass().getEPackage() == modelPackage;
 		}
 		return false;
@@ -74,189 +78,235 @@ public class DGAdapterFactory extends AdapterFactoryImpl {
 	 * @generated
 	 */
 	protected DGSwitch<Adapter> modelSwitch = new DGSwitch<Adapter>() {
-			@Override
-			public Adapter caseCanvas(Canvas object) {
-				return createCanvasAdapter();
-			}
-			@Override
-			public Adapter caseGroup(Group object) {
-				return createGroupAdapter();
-			}
-			@Override
-			public Adapter caseGraphicalElement(GraphicalElement object) {
-				return createGraphicalElementAdapter();
-			}
-			@Override
-			public Adapter caseDefinition(Definition object) {
-				return createDefinitionAdapter();
-			}
-			@Override
-			public Adapter caseMoveTo(MoveTo object) {
-				return createMoveToAdapter();
-			}
-			@Override
-			public Adapter casePathCommand(PathCommand object) {
-				return createPathCommandAdapter();
-			}
-			@Override
-			public Adapter caseClipPath(ClipPath object) {
-				return createClipPathAdapter();
-			}
-			@Override
-			public Adapter caseStyle(Style object) {
-				return createStyleAdapter();
-			}
-			@Override
-			public Adapter casePaint(Paint object) {
-				return createPaintAdapter();
-			}
-			@Override
-			public Adapter casePaintServer(PaintServer object) {
-				return createPaintServerAdapter();
-			}
-			@Override
-			public Adapter caseTransform(Transform object) {
-				return createTransformAdapter();
-			}
-			@Override
-			public Adapter caseCircle(Circle object) {
-				return createCircleAdapter();
-			}
-			@Override
-			public Adapter caseClosePath(ClosePath object) {
-				return createClosePathAdapter();
-			}
-			@Override
-			public Adapter caseCubicCurveTo(CubicCurveTo object) {
-				return createCubicCurveToAdapter();
-			}
-			@Override
-			public Adapter caseDefinitions(Definitions object) {
-				return createDefinitionsAdapter();
-			}
-			@Override
-			public Adapter caseStyleSheet(StyleSheet object) {
-				return createStyleSheetAdapter();
-			}
-			@Override
-			public Adapter caseStyleRule(StyleRule object) {
-				return createStyleRuleAdapter();
-			}
-			@Override
-			public Adapter caseStyleSelector(StyleSelector object) {
-				return createStyleSelectorAdapter();
-			}
-			@Override
-			public Adapter caseEllipse(Ellipse object) {
-				return createEllipseAdapter();
-			}
-			@Override
-			public Adapter caseEllipticalArcTo(EllipticalArcTo object) {
-				return createEllipticalArcToAdapter();
-			}
-			@Override
-			public Adapter caseQuadraticCurveTo(QuadraticCurveTo object) {
-				return createQuadraticCurveToAdapter();
-			}
-			@Override
-			public Adapter caseGradient(Gradient object) {
-				return createGradientAdapter();
-			}
-			@Override
-			public Adapter caseGradientStop(GradientStop object) {
-				return createGradientStopAdapter();
-			}
-			@Override
-			public Adapter caseImage(Image object) {
-				return createImageAdapter();
-			}
-			@Override
-			public Adapter caseLine(Line object) {
-				return createLineAdapter();
-			}
-			@Override
-			public Adapter caseMarkedElement(MarkedElement object) {
-				return createMarkedElementAdapter();
-			}
-			@Override
-			public Adapter caseMarker(Marker object) {
-				return createMarkerAdapter();
-			}
-			@Override
-			public Adapter caseLinearGradient(LinearGradient object) {
-				return createLinearGradientAdapter();
-			}
-			@Override
-			public Adapter caseLineTo(LineTo object) {
-				return createLineToAdapter();
-			}
-			@Override
-			public Adapter caseMatrix(Matrix object) {
-				return createMatrixAdapter();
-			}
-			@Override
-			public Adapter casePath(Path object) {
-				return createPathAdapter();
-			}
-			@Override
-			public Adapter casePattern(Pattern object) {
-				return createPatternAdapter();
-			}
-			@Override
-			public Adapter casePolygon(Polygon object) {
-				return createPolygonAdapter();
-			}
-			@Override
-			public Adapter casePolyline(Polyline object) {
-				return createPolylineAdapter();
-			}
-			@Override
-			public Adapter caseRadialGradient(RadialGradient object) {
-				return createRadialGradientAdapter();
-			}
-			@Override
-			public Adapter caseRectangle(Rectangle object) {
-				return createRectangleAdapter();
-			}
-			@Override
-			public Adapter caseRootCanvas(RootCanvas object) {
-				return createRootCanvasAdapter();
-			}
-			@Override
-			public Adapter caseRotate(Rotate object) {
-				return createRotateAdapter();
-			}
-			@Override
-			public Adapter caseScale(Scale object) {
-				return createScaleAdapter();
-			}
-			@Override
-			public Adapter caseSkew(Skew object) {
-				return createSkewAdapter();
-			}
-			@Override
-			public Adapter caseText(Text object) {
-				return createTextAdapter();
-			}
-			@Override
-			public Adapter caseTranslate(Translate object) {
-				return createTranslateAdapter();
-			}
-			@Override
-			public Adapter caseUse(Use object) {
-				return createUseAdapter();
-			}
-			@Override
-			public Adapter defaultCase(EObject object) {
-				return createEObjectAdapter();
-			}
-		};
+
+		@Override
+		public Adapter caseCanvas(Canvas object) {
+			return createCanvasAdapter();
+		}
+
+		@Override
+		public Adapter caseGroup(Group object) {
+			return createGroupAdapter();
+		}
+
+		@Override
+		public Adapter caseGraphicalElement(GraphicalElement object) {
+			return createGraphicalElementAdapter();
+		}
+
+		@Override
+		public Adapter caseDefinition(Definition object) {
+			return createDefinitionAdapter();
+		}
+
+		@Override
+		public Adapter caseMoveTo(MoveTo object) {
+			return createMoveToAdapter();
+		}
+
+		@Override
+		public Adapter casePathCommand(PathCommand object) {
+			return createPathCommandAdapter();
+		}
+
+		@Override
+		public Adapter caseClipPath(ClipPath object) {
+			return createClipPathAdapter();
+		}
+
+		@Override
+		public Adapter caseStyle(Style object) {
+			return createStyleAdapter();
+		}
+
+		@Override
+		public Adapter casePaint(Paint object) {
+			return createPaintAdapter();
+		}
+
+		@Override
+		public Adapter casePaintServer(PaintServer object) {
+			return createPaintServerAdapter();
+		}
+
+		@Override
+		public Adapter caseTransform(Transform object) {
+			return createTransformAdapter();
+		}
+
+		@Override
+		public Adapter caseCircle(Circle object) {
+			return createCircleAdapter();
+		}
+
+		@Override
+		public Adapter caseClosePath(ClosePath object) {
+			return createClosePathAdapter();
+		}
+
+		@Override
+		public Adapter caseCubicCurveTo(CubicCurveTo object) {
+			return createCubicCurveToAdapter();
+		}
+
+		@Override
+		public Adapter caseDefinitions(Definitions object) {
+			return createDefinitionsAdapter();
+		}
+
+		@Override
+		public Adapter caseStyleSheet(StyleSheet object) {
+			return createStyleSheetAdapter();
+		}
+
+		@Override
+		public Adapter caseStyleRule(StyleRule object) {
+			return createStyleRuleAdapter();
+		}
+
+		@Override
+		public Adapter caseStyleSelector(StyleSelector object) {
+			return createStyleSelectorAdapter();
+		}
+
+		@Override
+		public Adapter caseEllipse(Ellipse object) {
+			return createEllipseAdapter();
+		}
+
+		@Override
+		public Adapter caseEllipticalArcTo(EllipticalArcTo object) {
+			return createEllipticalArcToAdapter();
+		}
+
+		@Override
+		public Adapter caseQuadraticCurveTo(QuadraticCurveTo object) {
+			return createQuadraticCurveToAdapter();
+		}
+
+		@Override
+		public Adapter caseGradient(Gradient object) {
+			return createGradientAdapter();
+		}
+
+		@Override
+		public Adapter caseGradientStop(GradientStop object) {
+			return createGradientStopAdapter();
+		}
+
+		@Override
+		public Adapter caseImage(Image object) {
+			return createImageAdapter();
+		}
+
+		@Override
+		public Adapter caseLine(Line object) {
+			return createLineAdapter();
+		}
+
+		@Override
+		public Adapter caseMarkedElement(MarkedElement object) {
+			return createMarkedElementAdapter();
+		}
+
+		@Override
+		public Adapter caseMarker(Marker object) {
+			return createMarkerAdapter();
+		}
+
+		@Override
+		public Adapter caseLinearGradient(LinearGradient object) {
+			return createLinearGradientAdapter();
+		}
+
+		@Override
+		public Adapter caseLineTo(LineTo object) {
+			return createLineToAdapter();
+		}
+
+		@Override
+		public Adapter caseMatrix(Matrix object) {
+			return createMatrixAdapter();
+		}
+
+		@Override
+		public Adapter casePath(Path object) {
+			return createPathAdapter();
+		}
+
+		@Override
+		public Adapter casePattern(Pattern object) {
+			return createPatternAdapter();
+		}
+
+		@Override
+		public Adapter casePolygon(Polygon object) {
+			return createPolygonAdapter();
+		}
+
+		@Override
+		public Adapter casePolyline(Polyline object) {
+			return createPolylineAdapter();
+		}
+
+		@Override
+		public Adapter caseRadialGradient(RadialGradient object) {
+			return createRadialGradientAdapter();
+		}
+
+		@Override
+		public Adapter caseRectangle(Rectangle object) {
+			return createRectangleAdapter();
+		}
+
+		@Override
+		public Adapter caseRootCanvas(RootCanvas object) {
+			return createRootCanvasAdapter();
+		}
+
+		@Override
+		public Adapter caseRotate(Rotate object) {
+			return createRotateAdapter();
+		}
+
+		@Override
+		public Adapter caseScale(Scale object) {
+			return createScaleAdapter();
+		}
+
+		@Override
+		public Adapter caseSkew(Skew object) {
+			return createSkewAdapter();
+		}
+
+		@Override
+		public Adapter caseText(Text object) {
+			return createTextAdapter();
+		}
+
+		@Override
+		public Adapter caseTranslate(Translate object) {
+			return createTranslateAdapter();
+		}
+
+		@Override
+		public Adapter caseUse(Use object) {
+			return createUseAdapter();
+		}
+
+		@Override
+		public Adapter defaultCase(EObject object) {
+			return createEObjectAdapter();
+		}
+	};
 
 	/**
 	 * Creates an adapter for the <code>target</code>.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param target the object to adapt.
+	 * 
+	 * @param target
+	 *        the object to adapt.
 	 * @return the adapter for the <code>target</code>.
 	 * @generated
 	 */
@@ -266,8 +316,7 @@ public class DGAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '
-	 * {@link org.eclipse.papyrus.dd.dg.Canvas <em>Canvas</em>}'. <!--
+	 * Creates a new adapter for an object of class ' {@link org.eclipse.papyrus.dd.dg.Canvas <em>Canvas</em>}'. <!--
 	 * begin-user-doc --> This default implementation returns null so that we
 	 * can easily ignore cases; it's useful to ignore a case when inheritance
 	 * will catch all the cases anyway. <!-- end-user-doc -->
@@ -281,8 +330,7 @@ public class DGAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '
-	 * {@link org.eclipse.papyrus.dd.dg.Group <em>Group</em>}'. <!--
+	 * Creates a new adapter for an object of class ' {@link org.eclipse.papyrus.dd.dg.Group <em>Group</em>}'. <!--
 	 * begin-user-doc --> This default implementation returns null so that we
 	 * can easily ignore cases; it's useful to ignore a case when inheritance
 	 * will catch all the cases anyway. <!-- end-user-doc -->
@@ -301,6 +349,7 @@ public class DGAdapterFactory extends AdapterFactoryImpl {
 	 * implementation returns null so that we can easily ignore cases; it's
 	 * useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.dd.dg.GraphicalElement
 	 * @generated
@@ -310,8 +359,7 @@ public class DGAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '
-	 * {@link org.eclipse.papyrus.dd.dg.Definition <em>Definition</em>}'. <!--
+	 * Creates a new adapter for an object of class ' {@link org.eclipse.papyrus.dd.dg.Definition <em>Definition</em>}'. <!--
 	 * begin-user-doc --> This default implementation returns null so that we
 	 * can easily ignore cases; it's useful to ignore a case when inheritance
 	 * will catch all the cases anyway. <!-- end-user-doc -->
@@ -325,8 +373,7 @@ public class DGAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '
-	 * {@link org.eclipse.papyrus.dd.dg.ClipPath <em>Clip Path</em>}'. <!--
+	 * Creates a new adapter for an object of class ' {@link org.eclipse.papyrus.dd.dg.ClipPath <em>Clip Path</em>}'. <!--
 	 * begin-user-doc --> This default implementation returns null so that we
 	 * can easily ignore cases; it's useful to ignore a case when inheritance
 	 * will catch all the cases anyway. <!-- end-user-doc -->
@@ -340,8 +387,7 @@ public class DGAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '
-	 * {@link org.eclipse.papyrus.dd.dg.Style <em>Style</em>}'. <!--
+	 * Creates a new adapter for an object of class ' {@link org.eclipse.papyrus.dd.dg.Style <em>Style</em>}'. <!--
 	 * begin-user-doc --> This default implementation returns null so that we
 	 * can easily ignore cases; it's useful to ignore a case when inheritance
 	 * will catch all the cases anyway. <!-- end-user-doc -->
@@ -355,8 +401,7 @@ public class DGAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '
-	 * {@link org.eclipse.papyrus.dd.dg.Paint <em>Paint</em>}'. <!--
+	 * Creates a new adapter for an object of class ' {@link org.eclipse.papyrus.dd.dg.Paint <em>Paint</em>}'. <!--
 	 * begin-user-doc --> This default implementation returns null so that we
 	 * can easily ignore cases; it's useful to ignore a case when inheritance
 	 * will catch all the cases anyway. <!-- end-user-doc -->
@@ -374,6 +419,7 @@ public class DGAdapterFactory extends AdapterFactoryImpl {
 	 * <!-- begin-user-doc --> This default implementation returns null so that
 	 * we can easily ignore cases; it's useful to ignore a case when inheritance
 	 * will catch all the cases anyway. <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.dd.dg.PaintServer
 	 * @generated
@@ -383,8 +429,7 @@ public class DGAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '
-	 * {@link org.eclipse.papyrus.dd.dg.Transform <em>Transform</em>}'. <!--
+	 * Creates a new adapter for an object of class ' {@link org.eclipse.papyrus.dd.dg.Transform <em>Transform</em>}'. <!--
 	 * begin-user-doc --> This default implementation returns null so that we
 	 * can easily ignore cases; it's useful to ignore a case when inheritance
 	 * will catch all the cases anyway. <!-- end-user-doc -->
@@ -398,8 +443,7 @@ public class DGAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '
-	 * {@link org.eclipse.papyrus.dd.dg.Definitions <em>Definitions</em>}'. <!--
+	 * Creates a new adapter for an object of class ' {@link org.eclipse.papyrus.dd.dg.Definitions <em>Definitions</em>}'. <!--
 	 * begin-user-doc --> This default implementation returns null so that we
 	 * can easily ignore cases; it's useful to ignore a case when inheritance
 	 * will catch all the cases anyway. <!-- end-user-doc -->
@@ -417,6 +461,7 @@ public class DGAdapterFactory extends AdapterFactoryImpl {
 	 * <!-- begin-user-doc --> This default implementation returns null so that
 	 * we can easily ignore cases; it's useful to ignore a case when inheritance
 	 * will catch all the cases anyway. <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.dd.dg.CubicCurveTo
 	 * @generated
@@ -430,6 +475,7 @@ public class DGAdapterFactory extends AdapterFactoryImpl {
 	 * <!-- begin-user-doc --> This default implementation returns null so that
 	 * we can easily ignore cases; it's useful to ignore a case when inheritance
 	 * will catch all the cases anyway. <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.dd.dg.PathCommand
 	 * @generated
@@ -439,8 +485,7 @@ public class DGAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '
-	 * {@link org.eclipse.papyrus.dd.dg.Marker <em>Marker</em>}'. <!--
+	 * Creates a new adapter for an object of class ' {@link org.eclipse.papyrus.dd.dg.Marker <em>Marker</em>}'. <!--
 	 * begin-user-doc --> This default implementation returns null so that we
 	 * can easily ignore cases; it's useful to ignore a case when inheritance
 	 * will catch all the cases anyway. <!-- end-user-doc -->
@@ -454,8 +499,7 @@ public class DGAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '
-	 * {@link org.eclipse.papyrus.dd.dg.StyleSheet <em>Style Sheet</em>}'. <!--
+	 * Creates a new adapter for an object of class ' {@link org.eclipse.papyrus.dd.dg.StyleSheet <em>Style Sheet</em>}'. <!--
 	 * begin-user-doc --> This default implementation returns null so that we
 	 * can easily ignore cases; it's useful to ignore a case when inheritance
 	 * will catch all the cases anyway. <!-- end-user-doc -->
@@ -469,8 +513,7 @@ public class DGAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '
-	 * {@link org.eclipse.papyrus.dd.dg.StyleRule <em>Style Rule</em>}'. <!--
+	 * Creates a new adapter for an object of class ' {@link org.eclipse.papyrus.dd.dg.StyleRule <em>Style Rule</em>}'. <!--
 	 * begin-user-doc --> This default implementation returns null so that we
 	 * can easily ignore cases; it's useful to ignore a case when inheritance
 	 * will catch all the cases anyway. <!-- end-user-doc -->
@@ -488,6 +531,7 @@ public class DGAdapterFactory extends AdapterFactoryImpl {
 	 * <!-- begin-user-doc --> This default implementation returns null so that
 	 * we can easily ignore cases; it's useful to ignore a case when inheritance
 	 * will catch all the cases anyway. <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.dd.dg.StyleSelector
 	 * @generated
@@ -497,8 +541,7 @@ public class DGAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '
-	 * {@link org.eclipse.papyrus.dd.dg.Circle <em>Circle</em>}'. <!--
+	 * Creates a new adapter for an object of class ' {@link org.eclipse.papyrus.dd.dg.Circle <em>Circle</em>}'. <!--
 	 * begin-user-doc --> This default implementation returns null so that we
 	 * can easily ignore cases; it's useful to ignore a case when inheritance
 	 * will catch all the cases anyway. <!-- end-user-doc -->
@@ -512,8 +555,7 @@ public class DGAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '
-	 * {@link org.eclipse.papyrus.dd.dg.ClosePath <em>Close Path</em>}'. <!--
+	 * Creates a new adapter for an object of class ' {@link org.eclipse.papyrus.dd.dg.ClosePath <em>Close Path</em>}'. <!--
 	 * begin-user-doc --> This default implementation returns null so that we
 	 * can easily ignore cases; it's useful to ignore a case when inheritance
 	 * will catch all the cases anyway. <!-- end-user-doc -->
@@ -527,8 +569,7 @@ public class DGAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '
-	 * {@link org.eclipse.papyrus.dd.dg.Ellipse <em>Ellipse</em>}'. <!--
+	 * Creates a new adapter for an object of class ' {@link org.eclipse.papyrus.dd.dg.Ellipse <em>Ellipse</em>}'. <!--
 	 * begin-user-doc --> This default implementation returns null so that we
 	 * can easily ignore cases; it's useful to ignore a case when inheritance
 	 * will catch all the cases anyway. <!-- end-user-doc -->
@@ -547,6 +588,7 @@ public class DGAdapterFactory extends AdapterFactoryImpl {
 	 * implementation returns null so that we can easily ignore cases; it's
 	 * useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.dd.dg.EllipticalArcTo
 	 * @generated
@@ -561,6 +603,7 @@ public class DGAdapterFactory extends AdapterFactoryImpl {
 	 * implementation returns null so that we can easily ignore cases; it's
 	 * useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.dd.dg.QuadraticCurveTo
 	 * @generated
@@ -570,8 +613,7 @@ public class DGAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '
-	 * {@link org.eclipse.papyrus.dd.dg.Gradient <em>Gradient</em>}'. <!--
+	 * Creates a new adapter for an object of class ' {@link org.eclipse.papyrus.dd.dg.Gradient <em>Gradient</em>}'. <!--
 	 * begin-user-doc --> This default implementation returns null so that we
 	 * can easily ignore cases; it's useful to ignore a case when inheritance
 	 * will catch all the cases anyway. <!-- end-user-doc -->
@@ -589,6 +631,7 @@ public class DGAdapterFactory extends AdapterFactoryImpl {
 	 * <!-- begin-user-doc --> This default implementation returns null so that
 	 * we can easily ignore cases; it's useful to ignore a case when inheritance
 	 * will catch all the cases anyway. <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.dd.dg.GradientStop
 	 * @generated
@@ -598,8 +641,7 @@ public class DGAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '
-	 * {@link org.eclipse.papyrus.dd.dg.Image <em>Image</em>}'. <!--
+	 * Creates a new adapter for an object of class ' {@link org.eclipse.papyrus.dd.dg.Image <em>Image</em>}'. <!--
 	 * begin-user-doc --> This default implementation returns null so that we
 	 * can easily ignore cases; it's useful to ignore a case when inheritance
 	 * will catch all the cases anyway. <!-- end-user-doc -->
@@ -613,8 +655,7 @@ public class DGAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '
-	 * {@link org.eclipse.papyrus.dd.dg.Line <em>Line</em>}'. <!--
+	 * Creates a new adapter for an object of class ' {@link org.eclipse.papyrus.dd.dg.Line <em>Line</em>}'. <!--
 	 * begin-user-doc --> This default implementation returns null so that we
 	 * can easily ignore cases; it's useful to ignore a case when inheritance
 	 * will catch all the cases anyway. <!-- end-user-doc -->
@@ -632,6 +673,7 @@ public class DGAdapterFactory extends AdapterFactoryImpl {
 	 * <!-- begin-user-doc --> This default implementation returns null so that
 	 * we can easily ignore cases; it's useful to ignore a case when inheritance
 	 * will catch all the cases anyway. <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.dd.dg.MarkedElement
 	 * @generated
@@ -645,6 +687,7 @@ public class DGAdapterFactory extends AdapterFactoryImpl {
 	 * <!-- begin-user-doc --> This default implementation returns null so
 	 * that we can easily ignore cases; it's useful to ignore a case when
 	 * inheritance will catch all the cases anyway. <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.dd.dg.LinearGradient
 	 * @generated
@@ -654,8 +697,7 @@ public class DGAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '
-	 * {@link org.eclipse.papyrus.dd.dg.LineTo <em>Line To</em>}'. <!--
+	 * Creates a new adapter for an object of class ' {@link org.eclipse.papyrus.dd.dg.LineTo <em>Line To</em>}'. <!--
 	 * begin-user-doc --> This default implementation returns null so that we
 	 * can easily ignore cases; it's useful to ignore a case when inheritance
 	 * will catch all the cases anyway. <!-- end-user-doc -->
@@ -669,8 +711,7 @@ public class DGAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '
-	 * {@link org.eclipse.papyrus.dd.dg.Matrix <em>Matrix</em>}'. <!--
+	 * Creates a new adapter for an object of class ' {@link org.eclipse.papyrus.dd.dg.Matrix <em>Matrix</em>}'. <!--
 	 * begin-user-doc --> This default implementation returns null so that we
 	 * can easily ignore cases; it's useful to ignore a case when inheritance
 	 * will catch all the cases anyway. <!-- end-user-doc -->
@@ -684,8 +725,7 @@ public class DGAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '
-	 * {@link org.eclipse.papyrus.dd.dg.MoveTo <em>Move To</em>}'. <!--
+	 * Creates a new adapter for an object of class ' {@link org.eclipse.papyrus.dd.dg.MoveTo <em>Move To</em>}'. <!--
 	 * begin-user-doc --> This default implementation returns null so that we
 	 * can easily ignore cases; it's useful to ignore a case when inheritance
 	 * will catch all the cases anyway. <!-- end-user-doc -->
@@ -699,8 +739,7 @@ public class DGAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '
-	 * {@link org.eclipse.papyrus.dd.dg.Path <em>Path</em>}'. <!--
+	 * Creates a new adapter for an object of class ' {@link org.eclipse.papyrus.dd.dg.Path <em>Path</em>}'. <!--
 	 * begin-user-doc --> This default implementation returns null so that we
 	 * can easily ignore cases; it's useful to ignore a case when inheritance
 	 * will catch all the cases anyway. <!-- end-user-doc -->
@@ -714,8 +753,7 @@ public class DGAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '
-	 * {@link org.eclipse.papyrus.dd.dg.Pattern <em>Pattern</em>}'. <!--
+	 * Creates a new adapter for an object of class ' {@link org.eclipse.papyrus.dd.dg.Pattern <em>Pattern</em>}'. <!--
 	 * begin-user-doc --> This default implementation returns null so that we
 	 * can easily ignore cases; it's useful to ignore a case when inheritance
 	 * will catch all the cases anyway. <!-- end-user-doc -->
@@ -729,8 +767,7 @@ public class DGAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '
-	 * {@link org.eclipse.papyrus.dd.dg.Polygon <em>Polygon</em>}'. <!--
+	 * Creates a new adapter for an object of class ' {@link org.eclipse.papyrus.dd.dg.Polygon <em>Polygon</em>}'. <!--
 	 * begin-user-doc --> This default implementation returns null so that we
 	 * can easily ignore cases; it's useful to ignore a case when inheritance
 	 * will catch all the cases anyway. <!-- end-user-doc -->
@@ -744,8 +781,7 @@ public class DGAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '
-	 * {@link org.eclipse.papyrus.dd.dg.Polyline <em>Polyline</em>}'. <!--
+	 * Creates a new adapter for an object of class ' {@link org.eclipse.papyrus.dd.dg.Polyline <em>Polyline</em>}'. <!--
 	 * begin-user-doc --> This default implementation returns null so that we
 	 * can easily ignore cases; it's useful to ignore a case when inheritance
 	 * will catch all the cases anyway. <!-- end-user-doc -->
@@ -763,6 +799,7 @@ public class DGAdapterFactory extends AdapterFactoryImpl {
 	 * <!-- begin-user-doc --> This default implementation returns null so
 	 * that we can easily ignore cases; it's useful to ignore a case when
 	 * inheritance will catch all the cases anyway. <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.dd.dg.RadialGradient
 	 * @generated
@@ -772,8 +809,7 @@ public class DGAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '
-	 * {@link org.eclipse.papyrus.dd.dg.Rectangle <em>Rectangle</em>}'. <!--
+	 * Creates a new adapter for an object of class ' {@link org.eclipse.papyrus.dd.dg.Rectangle <em>Rectangle</em>}'. <!--
 	 * begin-user-doc --> This default implementation returns null so that we
 	 * can easily ignore cases; it's useful to ignore a case when inheritance
 	 * will catch all the cases anyway. <!-- end-user-doc -->
@@ -787,8 +823,7 @@ public class DGAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '
-	 * {@link org.eclipse.papyrus.dd.dg.RootCanvas <em>Root Canvas</em>}'. <!--
+	 * Creates a new adapter for an object of class ' {@link org.eclipse.papyrus.dd.dg.RootCanvas <em>Root Canvas</em>}'. <!--
 	 * begin-user-doc --> This default implementation returns null so that we
 	 * can easily ignore cases; it's useful to ignore a case when inheritance
 	 * will catch all the cases anyway. <!-- end-user-doc -->
@@ -802,8 +837,7 @@ public class DGAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '
-	 * {@link org.eclipse.papyrus.dd.dg.Rotate <em>Rotate</em>}'. <!--
+	 * Creates a new adapter for an object of class ' {@link org.eclipse.papyrus.dd.dg.Rotate <em>Rotate</em>}'. <!--
 	 * begin-user-doc --> This default implementation returns null so that we
 	 * can easily ignore cases; it's useful to ignore a case when inheritance
 	 * will catch all the cases anyway. <!-- end-user-doc -->
@@ -817,8 +851,7 @@ public class DGAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '
-	 * {@link org.eclipse.papyrus.dd.dg.Scale <em>Scale</em>}'. <!--
+	 * Creates a new adapter for an object of class ' {@link org.eclipse.papyrus.dd.dg.Scale <em>Scale</em>}'. <!--
 	 * begin-user-doc --> This default implementation returns null so that we
 	 * can easily ignore cases; it's useful to ignore a case when inheritance
 	 * will catch all the cases anyway. <!-- end-user-doc -->
@@ -832,8 +865,7 @@ public class DGAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '
-	 * {@link org.eclipse.papyrus.dd.dg.Skew <em>Skew</em>}'. <!--
+	 * Creates a new adapter for an object of class ' {@link org.eclipse.papyrus.dd.dg.Skew <em>Skew</em>}'. <!--
 	 * begin-user-doc --> This default implementation returns null so that we
 	 * can easily ignore cases; it's useful to ignore a case when inheritance
 	 * will catch all the cases anyway. <!-- end-user-doc -->
@@ -847,8 +879,7 @@ public class DGAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '
-	 * {@link org.eclipse.papyrus.dd.dg.Text <em>Text</em>}'. <!--
+	 * Creates a new adapter for an object of class ' {@link org.eclipse.papyrus.dd.dg.Text <em>Text</em>}'. <!--
 	 * begin-user-doc --> This default implementation returns null so that we
 	 * can easily ignore cases; it's useful to ignore a case when inheritance
 	 * will catch all the cases anyway. <!-- end-user-doc -->
@@ -862,8 +893,7 @@ public class DGAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '
-	 * {@link org.eclipse.papyrus.dd.dg.Translate <em>Translate</em>}'. <!--
+	 * Creates a new adapter for an object of class ' {@link org.eclipse.papyrus.dd.dg.Translate <em>Translate</em>}'. <!--
 	 * begin-user-doc --> This default implementation returns null so that we
 	 * can easily ignore cases; it's useful to ignore a case when inheritance
 	 * will catch all the cases anyway. <!-- end-user-doc -->
@@ -882,6 +912,7 @@ public class DGAdapterFactory extends AdapterFactoryImpl {
 	 * --> This default implementation returns null so that we can easily ignore
 	 * cases; it's useful to ignore a case when inheritance will catch all the
 	 * cases anyway. <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.dd.dg.Use
 	 * @generated
@@ -894,11 +925,11 @@ public class DGAdapterFactory extends AdapterFactoryImpl {
 	 * Creates a new adapter for the default case.
 	 * <!-- begin-user-doc --> This
 	 * default implementation returns null. <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @generated
 	 */
 	public Adapter createEObjectAdapter() {
 		return null;
 	}
-
 } // DGAdapterFactory
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/util/DGSwitch.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/util/DGSwitch.java
index b65156813cc..40c0b47ceff 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/util/DGSwitch.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/util/DGSwitch.java
@@ -20,11 +20,11 @@ import org.eclipse.papyrus.dd.dg.*;
 
 /**
  * <!-- begin-user-doc --> The <b>Switch</b> for the model's inheritance
- * hierarchy. It supports the call {@link #doSwitch(EObject) doSwitch(object)}
- * to invoke the <code>caseXXX</code> method for each class of the model,
+ * hierarchy. It supports the call {@link #doSwitch(EObject) doSwitch(object)} to invoke the <code>caseXXX</code> method for each class of the model,
  * starting with the actual class of the object and proceeding up the
  * inheritance hierarchy until a non-null result is returned, which is the
  * result of the switch. <!-- end-user-doc -->
+ * 
  * @see org.eclipse.papyrus.dd.dg.DGPackage
  * @generated
  */
@@ -33,6 +33,7 @@ public class DGSwitch<T> extends Switch<T> {
 	/**
 	 * The cached model package
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected static DGPackage modelPackage;
@@ -41,10 +42,11 @@ public class DGSwitch<T> extends Switch<T> {
 	 * Creates an instance of the switch.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public DGSwitch() {
-		if (modelPackage == null) {
+		if(modelPackage == null) {
 			modelPackage = DGPackage.eINSTANCE;
 		}
 	}
@@ -66,335 +68,487 @@ public class DGSwitch<T> extends Switch<T> {
 	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @return the first non-null result returned by a <code>caseXXX</code> call.
 	 * @generated
 	 */
 	@Override
 	protected T doSwitch(int classifierID, EObject theEObject) {
-		switch (classifierID) {
-			case DGPackage.CANVAS: {
-				Canvas canvas = (Canvas)theEObject;
-				T result = caseCanvas(canvas);
-				if (result == null) result = caseGroup(canvas);
-				if (result == null) result = caseGraphicalElement(canvas);
-				if (result == null) result = caseDefinition(canvas);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case DGPackage.GROUP: {
-				Group group = (Group)theEObject;
-				T result = caseGroup(group);
-				if (result == null) result = caseGraphicalElement(group);
-				if (result == null) result = caseDefinition(group);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case DGPackage.GRAPHICAL_ELEMENT: {
-				GraphicalElement graphicalElement = (GraphicalElement)theEObject;
-				T result = caseGraphicalElement(graphicalElement);
-				if (result == null) result = caseDefinition(graphicalElement);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case DGPackage.DEFINITION: {
-				Definition definition = (Definition)theEObject;
-				T result = caseDefinition(definition);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case DGPackage.MOVE_TO: {
-				MoveTo moveTo = (MoveTo)theEObject;
-				T result = caseMoveTo(moveTo);
-				if (result == null) result = casePathCommand(moveTo);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case DGPackage.PATH_COMMAND: {
-				PathCommand pathCommand = (PathCommand)theEObject;
-				T result = casePathCommand(pathCommand);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case DGPackage.CLIP_PATH: {
-				ClipPath clipPath = (ClipPath)theEObject;
-				T result = caseClipPath(clipPath);
-				if (result == null) result = caseGroup(clipPath);
-				if (result == null) result = caseGraphicalElement(clipPath);
-				if (result == null) result = caseDefinition(clipPath);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case DGPackage.STYLE: {
-				Style style = (Style)theEObject;
-				T result = caseStyle(style);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case DGPackage.PAINT: {
-				Paint paint = (Paint)theEObject;
-				T result = casePaint(paint);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case DGPackage.PAINT_SERVER: {
-				PaintServer paintServer = (PaintServer)theEObject;
-				T result = casePaintServer(paintServer);
-				if (result == null) result = caseDefinition(paintServer);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case DGPackage.TRANSFORM: {
-				Transform transform = (Transform)theEObject;
-				T result = caseTransform(transform);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case DGPackage.CIRCLE: {
-				Circle circle = (Circle)theEObject;
-				T result = caseCircle(circle);
-				if (result == null) result = caseGraphicalElement(circle);
-				if (result == null) result = caseDefinition(circle);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case DGPackage.CLOSE_PATH: {
-				ClosePath closePath = (ClosePath)theEObject;
-				T result = caseClosePath(closePath);
-				if (result == null) result = casePathCommand(closePath);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case DGPackage.CUBIC_CURVE_TO: {
-				CubicCurveTo cubicCurveTo = (CubicCurveTo)theEObject;
-				T result = caseCubicCurveTo(cubicCurveTo);
-				if (result == null) result = casePathCommand(cubicCurveTo);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case DGPackage.DEFINITIONS: {
-				Definitions definitions = (Definitions)theEObject;
-				T result = caseDefinitions(definitions);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case DGPackage.STYLE_SHEET: {
-				StyleSheet styleSheet = (StyleSheet)theEObject;
-				T result = caseStyleSheet(styleSheet);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case DGPackage.STYLE_RULE: {
-				StyleRule styleRule = (StyleRule)theEObject;
-				T result = caseStyleRule(styleRule);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case DGPackage.STYLE_SELECTOR: {
-				StyleSelector styleSelector = (StyleSelector)theEObject;
-				T result = caseStyleSelector(styleSelector);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case DGPackage.ELLIPSE: {
-				Ellipse ellipse = (Ellipse)theEObject;
-				T result = caseEllipse(ellipse);
-				if (result == null) result = caseGraphicalElement(ellipse);
-				if (result == null) result = caseDefinition(ellipse);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case DGPackage.ELLIPTICAL_ARC_TO: {
-				EllipticalArcTo ellipticalArcTo = (EllipticalArcTo)theEObject;
-				T result = caseEllipticalArcTo(ellipticalArcTo);
-				if (result == null) result = casePathCommand(ellipticalArcTo);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case DGPackage.QUADRATIC_CURVE_TO: {
-				QuadraticCurveTo quadraticCurveTo = (QuadraticCurveTo)theEObject;
-				T result = caseQuadraticCurveTo(quadraticCurveTo);
-				if (result == null) result = casePathCommand(quadraticCurveTo);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case DGPackage.GRADIENT: {
-				Gradient gradient = (Gradient)theEObject;
-				T result = caseGradient(gradient);
-				if (result == null) result = casePaintServer(gradient);
-				if (result == null) result = caseDefinition(gradient);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case DGPackage.GRADIENT_STOP: {
-				GradientStop gradientStop = (GradientStop)theEObject;
-				T result = caseGradientStop(gradientStop);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case DGPackage.IMAGE: {
-				Image image = (Image)theEObject;
-				T result = caseImage(image);
-				if (result == null) result = caseGraphicalElement(image);
-				if (result == null) result = caseDefinition(image);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case DGPackage.LINE: {
-				Line line = (Line)theEObject;
-				T result = caseLine(line);
-				if (result == null) result = caseMarkedElement(line);
-				if (result == null) result = caseGraphicalElement(line);
-				if (result == null) result = caseDefinition(line);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case DGPackage.MARKED_ELEMENT: {
-				MarkedElement markedElement = (MarkedElement)theEObject;
-				T result = caseMarkedElement(markedElement);
-				if (result == null) result = caseGraphicalElement(markedElement);
-				if (result == null) result = caseDefinition(markedElement);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case DGPackage.MARKER: {
-				Marker marker = (Marker)theEObject;
-				T result = caseMarker(marker);
-				if (result == null) result = caseGroup(marker);
-				if (result == null) result = caseGraphicalElement(marker);
-				if (result == null) result = caseDefinition(marker);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case DGPackage.LINEAR_GRADIENT: {
-				LinearGradient linearGradient = (LinearGradient)theEObject;
-				T result = caseLinearGradient(linearGradient);
-				if (result == null) result = caseGradient(linearGradient);
-				if (result == null) result = casePaintServer(linearGradient);
-				if (result == null) result = caseDefinition(linearGradient);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case DGPackage.LINE_TO: {
-				LineTo lineTo = (LineTo)theEObject;
-				T result = caseLineTo(lineTo);
-				if (result == null) result = casePathCommand(lineTo);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case DGPackage.MATRIX: {
-				Matrix matrix = (Matrix)theEObject;
-				T result = caseMatrix(matrix);
-				if (result == null) result = caseTransform(matrix);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case DGPackage.PATH: {
-				Path path = (Path)theEObject;
-				T result = casePath(path);
-				if (result == null) result = caseMarkedElement(path);
-				if (result == null) result = caseGraphicalElement(path);
-				if (result == null) result = caseDefinition(path);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case DGPackage.PATTERN: {
-				Pattern pattern = (Pattern)theEObject;
-				T result = casePattern(pattern);
-				if (result == null) result = casePaintServer(pattern);
-				if (result == null) result = caseDefinition(pattern);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case DGPackage.POLYGON: {
-				Polygon polygon = (Polygon)theEObject;
-				T result = casePolygon(polygon);
-				if (result == null) result = caseMarkedElement(polygon);
-				if (result == null) result = caseGraphicalElement(polygon);
-				if (result == null) result = caseDefinition(polygon);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case DGPackage.POLYLINE: {
-				Polyline polyline = (Polyline)theEObject;
-				T result = casePolyline(polyline);
-				if (result == null) result = caseMarkedElement(polyline);
-				if (result == null) result = caseGraphicalElement(polyline);
-				if (result == null) result = caseDefinition(polyline);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case DGPackage.RADIAL_GRADIENT: {
-				RadialGradient radialGradient = (RadialGradient)theEObject;
-				T result = caseRadialGradient(radialGradient);
-				if (result == null) result = caseGradient(radialGradient);
-				if (result == null) result = casePaintServer(radialGradient);
-				if (result == null) result = caseDefinition(radialGradient);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case DGPackage.RECTANGLE: {
-				Rectangle rectangle = (Rectangle)theEObject;
-				T result = caseRectangle(rectangle);
-				if (result == null) result = caseGraphicalElement(rectangle);
-				if (result == null) result = caseDefinition(rectangle);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case DGPackage.ROOT_CANVAS: {
-				RootCanvas rootCanvas = (RootCanvas)theEObject;
-				T result = caseRootCanvas(rootCanvas);
-				if (result == null) result = caseCanvas(rootCanvas);
-				if (result == null) result = caseGroup(rootCanvas);
-				if (result == null) result = caseGraphicalElement(rootCanvas);
-				if (result == null) result = caseDefinition(rootCanvas);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case DGPackage.ROTATE: {
-				Rotate rotate = (Rotate)theEObject;
-				T result = caseRotate(rotate);
-				if (result == null) result = caseTransform(rotate);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case DGPackage.SCALE: {
-				Scale scale = (Scale)theEObject;
-				T result = caseScale(scale);
-				if (result == null) result = caseTransform(scale);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case DGPackage.SKEW: {
-				Skew skew = (Skew)theEObject;
-				T result = caseSkew(skew);
-				if (result == null) result = caseTransform(skew);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case DGPackage.TEXT: {
-				Text text = (Text)theEObject;
-				T result = caseText(text);
-				if (result == null) result = caseGraphicalElement(text);
-				if (result == null) result = caseDefinition(text);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case DGPackage.TRANSLATE: {
-				Translate translate = (Translate)theEObject;
-				T result = caseTranslate(translate);
-				if (result == null) result = caseTransform(translate);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case DGPackage.USE: {
-				Use use = (Use)theEObject;
-				T result = caseUse(use);
-				if (result == null) result = caseGraphicalElement(use);
-				if (result == null) result = caseDefinition(use);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			default: return defaultCase(theEObject);
+		switch(classifierID) {
+		case DGPackage.CANVAS:
+		{
+			Canvas canvas = (Canvas)theEObject;
+			T result = caseCanvas(canvas);
+			if(result == null)
+				result = caseGroup(canvas);
+			if(result == null)
+				result = caseGraphicalElement(canvas);
+			if(result == null)
+				result = caseDefinition(canvas);
+			if(result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case DGPackage.GROUP:
+		{
+			Group group = (Group)theEObject;
+			T result = caseGroup(group);
+			if(result == null)
+				result = caseGraphicalElement(group);
+			if(result == null)
+				result = caseDefinition(group);
+			if(result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case DGPackage.GRAPHICAL_ELEMENT:
+		{
+			GraphicalElement graphicalElement = (GraphicalElement)theEObject;
+			T result = caseGraphicalElement(graphicalElement);
+			if(result == null)
+				result = caseDefinition(graphicalElement);
+			if(result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case DGPackage.DEFINITION:
+		{
+			Definition definition = (Definition)theEObject;
+			T result = caseDefinition(definition);
+			if(result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case DGPackage.MOVE_TO:
+		{
+			MoveTo moveTo = (MoveTo)theEObject;
+			T result = caseMoveTo(moveTo);
+			if(result == null)
+				result = casePathCommand(moveTo);
+			if(result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case DGPackage.PATH_COMMAND:
+		{
+			PathCommand pathCommand = (PathCommand)theEObject;
+			T result = casePathCommand(pathCommand);
+			if(result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case DGPackage.CLIP_PATH:
+		{
+			ClipPath clipPath = (ClipPath)theEObject;
+			T result = caseClipPath(clipPath);
+			if(result == null)
+				result = caseGroup(clipPath);
+			if(result == null)
+				result = caseGraphicalElement(clipPath);
+			if(result == null)
+				result = caseDefinition(clipPath);
+			if(result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case DGPackage.STYLE:
+		{
+			Style style = (Style)theEObject;
+			T result = caseStyle(style);
+			if(result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case DGPackage.PAINT:
+		{
+			Paint paint = (Paint)theEObject;
+			T result = casePaint(paint);
+			if(result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case DGPackage.PAINT_SERVER:
+		{
+			PaintServer paintServer = (PaintServer)theEObject;
+			T result = casePaintServer(paintServer);
+			if(result == null)
+				result = caseDefinition(paintServer);
+			if(result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case DGPackage.TRANSFORM:
+		{
+			Transform transform = (Transform)theEObject;
+			T result = caseTransform(transform);
+			if(result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case DGPackage.CIRCLE:
+		{
+			Circle circle = (Circle)theEObject;
+			T result = caseCircle(circle);
+			if(result == null)
+				result = caseGraphicalElement(circle);
+			if(result == null)
+				result = caseDefinition(circle);
+			if(result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case DGPackage.CLOSE_PATH:
+		{
+			ClosePath closePath = (ClosePath)theEObject;
+			T result = caseClosePath(closePath);
+			if(result == null)
+				result = casePathCommand(closePath);
+			if(result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case DGPackage.CUBIC_CURVE_TO:
+		{
+			CubicCurveTo cubicCurveTo = (CubicCurveTo)theEObject;
+			T result = caseCubicCurveTo(cubicCurveTo);
+			if(result == null)
+				result = casePathCommand(cubicCurveTo);
+			if(result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case DGPackage.DEFINITIONS:
+		{
+			Definitions definitions = (Definitions)theEObject;
+			T result = caseDefinitions(definitions);
+			if(result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case DGPackage.STYLE_SHEET:
+		{
+			StyleSheet styleSheet = (StyleSheet)theEObject;
+			T result = caseStyleSheet(styleSheet);
+			if(result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case DGPackage.STYLE_RULE:
+		{
+			StyleRule styleRule = (StyleRule)theEObject;
+			T result = caseStyleRule(styleRule);
+			if(result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case DGPackage.STYLE_SELECTOR:
+		{
+			StyleSelector styleSelector = (StyleSelector)theEObject;
+			T result = caseStyleSelector(styleSelector);
+			if(result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case DGPackage.ELLIPSE:
+		{
+			Ellipse ellipse = (Ellipse)theEObject;
+			T result = caseEllipse(ellipse);
+			if(result == null)
+				result = caseGraphicalElement(ellipse);
+			if(result == null)
+				result = caseDefinition(ellipse);
+			if(result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case DGPackage.ELLIPTICAL_ARC_TO:
+		{
+			EllipticalArcTo ellipticalArcTo = (EllipticalArcTo)theEObject;
+			T result = caseEllipticalArcTo(ellipticalArcTo);
+			if(result == null)
+				result = casePathCommand(ellipticalArcTo);
+			if(result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case DGPackage.QUADRATIC_CURVE_TO:
+		{
+			QuadraticCurveTo quadraticCurveTo = (QuadraticCurveTo)theEObject;
+			T result = caseQuadraticCurveTo(quadraticCurveTo);
+			if(result == null)
+				result = casePathCommand(quadraticCurveTo);
+			if(result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case DGPackage.GRADIENT:
+		{
+			Gradient gradient = (Gradient)theEObject;
+			T result = caseGradient(gradient);
+			if(result == null)
+				result = casePaintServer(gradient);
+			if(result == null)
+				result = caseDefinition(gradient);
+			if(result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case DGPackage.GRADIENT_STOP:
+		{
+			GradientStop gradientStop = (GradientStop)theEObject;
+			T result = caseGradientStop(gradientStop);
+			if(result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case DGPackage.IMAGE:
+		{
+			Image image = (Image)theEObject;
+			T result = caseImage(image);
+			if(result == null)
+				result = caseGraphicalElement(image);
+			if(result == null)
+				result = caseDefinition(image);
+			if(result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case DGPackage.LINE:
+		{
+			Line line = (Line)theEObject;
+			T result = caseLine(line);
+			if(result == null)
+				result = caseMarkedElement(line);
+			if(result == null)
+				result = caseGraphicalElement(line);
+			if(result == null)
+				result = caseDefinition(line);
+			if(result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case DGPackage.MARKED_ELEMENT:
+		{
+			MarkedElement markedElement = (MarkedElement)theEObject;
+			T result = caseMarkedElement(markedElement);
+			if(result == null)
+				result = caseGraphicalElement(markedElement);
+			if(result == null)
+				result = caseDefinition(markedElement);
+			if(result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case DGPackage.MARKER:
+		{
+			Marker marker = (Marker)theEObject;
+			T result = caseMarker(marker);
+			if(result == null)
+				result = caseGroup(marker);
+			if(result == null)
+				result = caseGraphicalElement(marker);
+			if(result == null)
+				result = caseDefinition(marker);
+			if(result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case DGPackage.LINEAR_GRADIENT:
+		{
+			LinearGradient linearGradient = (LinearGradient)theEObject;
+			T result = caseLinearGradient(linearGradient);
+			if(result == null)
+				result = caseGradient(linearGradient);
+			if(result == null)
+				result = casePaintServer(linearGradient);
+			if(result == null)
+				result = caseDefinition(linearGradient);
+			if(result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case DGPackage.LINE_TO:
+		{
+			LineTo lineTo = (LineTo)theEObject;
+			T result = caseLineTo(lineTo);
+			if(result == null)
+				result = casePathCommand(lineTo);
+			if(result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case DGPackage.MATRIX:
+		{
+			Matrix matrix = (Matrix)theEObject;
+			T result = caseMatrix(matrix);
+			if(result == null)
+				result = caseTransform(matrix);
+			if(result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case DGPackage.PATH:
+		{
+			Path path = (Path)theEObject;
+			T result = casePath(path);
+			if(result == null)
+				result = caseMarkedElement(path);
+			if(result == null)
+				result = caseGraphicalElement(path);
+			if(result == null)
+				result = caseDefinition(path);
+			if(result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case DGPackage.PATTERN:
+		{
+			Pattern pattern = (Pattern)theEObject;
+			T result = casePattern(pattern);
+			if(result == null)
+				result = casePaintServer(pattern);
+			if(result == null)
+				result = caseDefinition(pattern);
+			if(result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case DGPackage.POLYGON:
+		{
+			Polygon polygon = (Polygon)theEObject;
+			T result = casePolygon(polygon);
+			if(result == null)
+				result = caseMarkedElement(polygon);
+			if(result == null)
+				result = caseGraphicalElement(polygon);
+			if(result == null)
+				result = caseDefinition(polygon);
+			if(result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case DGPackage.POLYLINE:
+		{
+			Polyline polyline = (Polyline)theEObject;
+			T result = casePolyline(polyline);
+			if(result == null)
+				result = caseMarkedElement(polyline);
+			if(result == null)
+				result = caseGraphicalElement(polyline);
+			if(result == null)
+				result = caseDefinition(polyline);
+			if(result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case DGPackage.RADIAL_GRADIENT:
+		{
+			RadialGradient radialGradient = (RadialGradient)theEObject;
+			T result = caseRadialGradient(radialGradient);
+			if(result == null)
+				result = caseGradient(radialGradient);
+			if(result == null)
+				result = casePaintServer(radialGradient);
+			if(result == null)
+				result = caseDefinition(radialGradient);
+			if(result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case DGPackage.RECTANGLE:
+		{
+			Rectangle rectangle = (Rectangle)theEObject;
+			T result = caseRectangle(rectangle);
+			if(result == null)
+				result = caseGraphicalElement(rectangle);
+			if(result == null)
+				result = caseDefinition(rectangle);
+			if(result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case DGPackage.ROOT_CANVAS:
+		{
+			RootCanvas rootCanvas = (RootCanvas)theEObject;
+			T result = caseRootCanvas(rootCanvas);
+			if(result == null)
+				result = caseCanvas(rootCanvas);
+			if(result == null)
+				result = caseGroup(rootCanvas);
+			if(result == null)
+				result = caseGraphicalElement(rootCanvas);
+			if(result == null)
+				result = caseDefinition(rootCanvas);
+			if(result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case DGPackage.ROTATE:
+		{
+			Rotate rotate = (Rotate)theEObject;
+			T result = caseRotate(rotate);
+			if(result == null)
+				result = caseTransform(rotate);
+			if(result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case DGPackage.SCALE:
+		{
+			Scale scale = (Scale)theEObject;
+			T result = caseScale(scale);
+			if(result == null)
+				result = caseTransform(scale);
+			if(result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case DGPackage.SKEW:
+		{
+			Skew skew = (Skew)theEObject;
+			T result = caseSkew(skew);
+			if(result == null)
+				result = caseTransform(skew);
+			if(result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case DGPackage.TEXT:
+		{
+			Text text = (Text)theEObject;
+			T result = caseText(text);
+			if(result == null)
+				result = caseGraphicalElement(text);
+			if(result == null)
+				result = caseDefinition(text);
+			if(result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case DGPackage.TRANSLATE:
+		{
+			Translate translate = (Translate)theEObject;
+			T result = caseTranslate(translate);
+			if(result == null)
+				result = caseTransform(translate);
+			if(result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case DGPackage.USE:
+		{
+			Use use = (Use)theEObject;
+			T result = caseUse(use);
+			if(result == null)
+				result = caseGraphicalElement(use);
+			if(result == null)
+				result = caseDefinition(use);
+			if(result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		default:
+			return defaultCase(theEObject);
 		}
 	}
 
@@ -403,7 +557,9 @@ public class DGSwitch<T> extends Switch<T> {
 	 * <!-- begin-user-doc --> This implementation returns
 	 * null; returning a non-null result will terminate the switch. <!--
 	 * end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Canvas</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -417,7 +573,9 @@ public class DGSwitch<T> extends Switch<T> {
 	 * <!-- begin-user-doc --> This implementation returns
 	 * null; returning a non-null result will terminate the switch. <!--
 	 * end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Group</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -431,7 +589,9 @@ public class DGSwitch<T> extends Switch<T> {
 	 * <!-- begin-user-doc --> This implementation
 	 * returns null; returning a non-null result will terminate the switch. <!--
 	 * end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Graphical Element</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -445,7 +605,9 @@ public class DGSwitch<T> extends Switch<T> {
 	 * <!-- begin-user-doc --> This implementation returns
 	 * null; returning a non-null result will terminate the switch. <!--
 	 * end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Definition</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -459,7 +621,9 @@ public class DGSwitch<T> extends Switch<T> {
 	 * <!-- begin-user-doc --> This implementation returns
 	 * null; returning a non-null result will terminate the switch. <!--
 	 * end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Clip Path</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -473,7 +637,9 @@ public class DGSwitch<T> extends Switch<T> {
 	 * <!-- begin-user-doc --> This implementation returns
 	 * null; returning a non-null result will terminate the switch. <!--
 	 * end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Style</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -487,7 +653,9 @@ public class DGSwitch<T> extends Switch<T> {
 	 * <!-- begin-user-doc --> This implementation returns
 	 * null; returning a non-null result will terminate the switch. <!--
 	 * end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Paint</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -501,7 +669,9 @@ public class DGSwitch<T> extends Switch<T> {
 	 * <!-- begin-user-doc --> This implementation
 	 * returns null; returning a non-null result will terminate the switch. <!--
 	 * end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Paint Server</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -515,7 +685,9 @@ public class DGSwitch<T> extends Switch<T> {
 	 * <!-- begin-user-doc --> This implementation returns
 	 * null; returning a non-null result will terminate the switch. <!--
 	 * end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Transform</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -529,7 +701,9 @@ public class DGSwitch<T> extends Switch<T> {
 	 * <!-- begin-user-doc --> This implementation
 	 * returns null; returning a non-null result will terminate the switch. <!--
 	 * end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Definitions</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -543,7 +717,9 @@ public class DGSwitch<T> extends Switch<T> {
 	 * <!-- begin-user-doc --> This implementation
 	 * returns null; returning a non-null result will terminate the switch. <!--
 	 * end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Cubic Curve To</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -557,7 +733,9 @@ public class DGSwitch<T> extends Switch<T> {
 	 * <!-- begin-user-doc --> This implementation
 	 * returns null; returning a non-null result will terminate the switch. <!--
 	 * end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Path Command</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -571,7 +749,9 @@ public class DGSwitch<T> extends Switch<T> {
 	 * <!-- begin-user-doc --> This implementation returns
 	 * null; returning a non-null result will terminate the switch. <!--
 	 * end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Marker</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -585,7 +765,9 @@ public class DGSwitch<T> extends Switch<T> {
 	 * <!-- begin-user-doc --> This implementation
 	 * returns null; returning a non-null result will terminate the switch. <!--
 	 * end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Style Sheet</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -599,7 +781,9 @@ public class DGSwitch<T> extends Switch<T> {
 	 * <!-- begin-user-doc --> This implementation returns
 	 * null; returning a non-null result will terminate the switch. <!--
 	 * end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Style Rule</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -613,7 +797,9 @@ public class DGSwitch<T> extends Switch<T> {
 	 * <!-- begin-user-doc --> This implementation
 	 * returns null; returning a non-null result will terminate the switch. <!--
 	 * end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Style Selector</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -627,7 +813,9 @@ public class DGSwitch<T> extends Switch<T> {
 	 * <!-- begin-user-doc --> This implementation returns
 	 * null; returning a non-null result will terminate the switch. <!--
 	 * end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Circle</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -641,7 +829,9 @@ public class DGSwitch<T> extends Switch<T> {
 	 * <!-- begin-user-doc --> This implementation returns
 	 * null; returning a non-null result will terminate the switch. <!--
 	 * end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Close Path</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -655,7 +845,9 @@ public class DGSwitch<T> extends Switch<T> {
 	 * <!-- begin-user-doc --> This implementation returns
 	 * null; returning a non-null result will terminate the switch. <!--
 	 * end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Ellipse</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -669,7 +861,9 @@ public class DGSwitch<T> extends Switch<T> {
 	 * <!-- begin-user-doc --> This implementation
 	 * returns null; returning a non-null result will terminate the switch. <!--
 	 * end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Elliptical Arc To</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -683,7 +877,9 @@ public class DGSwitch<T> extends Switch<T> {
 	 * <!-- begin-user-doc --> This implementation
 	 * returns null; returning a non-null result will terminate the switch. <!--
 	 * end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Quadratic Curve To</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -697,7 +893,9 @@ public class DGSwitch<T> extends Switch<T> {
 	 * <!-- begin-user-doc --> This implementation returns
 	 * null; returning a non-null result will terminate the switch. <!--
 	 * end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Gradient</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -711,7 +909,9 @@ public class DGSwitch<T> extends Switch<T> {
 	 * <!-- begin-user-doc --> This implementation
 	 * returns null; returning a non-null result will terminate the switch. <!--
 	 * end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Gradient Stop</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -725,7 +925,9 @@ public class DGSwitch<T> extends Switch<T> {
 	 * <!-- begin-user-doc --> This implementation returns
 	 * null; returning a non-null result will terminate the switch. <!--
 	 * end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Image</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -735,15 +937,13 @@ public class DGSwitch<T> extends Switch<T> {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '
-	 * <em>Line</em>'. <!-- begin-user-doc --> This implementation returns null;
+	 * Returns the result of interpreting the object as an instance of ' <em>Line</em>'. <!-- begin-user-doc --> This implementation returns null;
 	 * returning a non-null result will terminate the switch. <!-- end-user-doc
 	 * -->
 	 * 
 	 * @param object
-	 *            the target of the switch.
-	 * @return the result of interpreting the object as an instance of '
-	 *         <em>Line</em>'.
+	 *        the target of the switch.
+	 * @return the result of interpreting the object as an instance of ' <em>Line</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -756,7 +956,9 @@ public class DGSwitch<T> extends Switch<T> {
 	 * <!-- begin-user-doc --> This implementation
 	 * returns null; returning a non-null result will terminate the switch. <!--
 	 * end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Marked Element</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -770,7 +972,9 @@ public class DGSwitch<T> extends Switch<T> {
 	 * <!-- begin-user-doc --> This implementation
 	 * returns null; returning a non-null result will terminate the switch. <!--
 	 * end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Linear Gradient</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -784,7 +988,9 @@ public class DGSwitch<T> extends Switch<T> {
 	 * <!-- begin-user-doc --> This implementation returns
 	 * null; returning a non-null result will terminate the switch. <!--
 	 * end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Line To</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -798,7 +1004,9 @@ public class DGSwitch<T> extends Switch<T> {
 	 * <!-- begin-user-doc --> This implementation returns
 	 * null; returning a non-null result will terminate the switch. <!--
 	 * end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Matrix</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -812,7 +1020,9 @@ public class DGSwitch<T> extends Switch<T> {
 	 * <!-- begin-user-doc --> This implementation returns
 	 * null; returning a non-null result will terminate the switch. <!--
 	 * end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Move To</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -822,15 +1032,13 @@ public class DGSwitch<T> extends Switch<T> {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '
-	 * <em>Path</em>'. <!-- begin-user-doc --> This implementation returns null;
+	 * Returns the result of interpreting the object as an instance of ' <em>Path</em>'. <!-- begin-user-doc --> This implementation returns null;
 	 * returning a non-null result will terminate the switch. <!-- end-user-doc
 	 * -->
 	 * 
 	 * @param object
-	 *            the target of the switch.
-	 * @return the result of interpreting the object as an instance of '
-	 *         <em>Path</em>'.
+	 *        the target of the switch.
+	 * @return the result of interpreting the object as an instance of ' <em>Path</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -843,7 +1051,9 @@ public class DGSwitch<T> extends Switch<T> {
 	 * <!-- begin-user-doc --> This implementation returns
 	 * null; returning a non-null result will terminate the switch. <!--
 	 * end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Pattern</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -857,7 +1067,9 @@ public class DGSwitch<T> extends Switch<T> {
 	 * <!-- begin-user-doc --> This implementation returns
 	 * null; returning a non-null result will terminate the switch. <!--
 	 * end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Polygon</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -871,7 +1083,9 @@ public class DGSwitch<T> extends Switch<T> {
 	 * <!-- begin-user-doc --> This implementation returns
 	 * null; returning a non-null result will terminate the switch. <!--
 	 * end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Polyline</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -885,7 +1099,9 @@ public class DGSwitch<T> extends Switch<T> {
 	 * <!-- begin-user-doc --> This implementation
 	 * returns null; returning a non-null result will terminate the switch. <!--
 	 * end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Radial Gradient</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -899,7 +1115,9 @@ public class DGSwitch<T> extends Switch<T> {
 	 * <!-- begin-user-doc --> This implementation returns
 	 * null; returning a non-null result will terminate the switch. <!--
 	 * end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Rectangle</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -913,7 +1131,9 @@ public class DGSwitch<T> extends Switch<T> {
 	 * <!-- begin-user-doc --> This implementation
 	 * returns null; returning a non-null result will terminate the switch. <!--
 	 * end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Root Canvas</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -927,7 +1147,9 @@ public class DGSwitch<T> extends Switch<T> {
 	 * <!-- begin-user-doc --> This implementation returns
 	 * null; returning a non-null result will terminate the switch. <!--
 	 * end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Rotate</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -941,7 +1163,9 @@ public class DGSwitch<T> extends Switch<T> {
 	 * <!-- begin-user-doc --> This implementation returns
 	 * null; returning a non-null result will terminate the switch. <!--
 	 * end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Scale</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -951,15 +1175,13 @@ public class DGSwitch<T> extends Switch<T> {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '
-	 * <em>Skew</em>'. <!-- begin-user-doc --> This implementation returns null;
+	 * Returns the result of interpreting the object as an instance of ' <em>Skew</em>'. <!-- begin-user-doc --> This implementation returns null;
 	 * returning a non-null result will terminate the switch. <!-- end-user-doc
 	 * -->
 	 * 
 	 * @param object
-	 *            the target of the switch.
-	 * @return the result of interpreting the object as an instance of '
-	 *         <em>Skew</em>'.
+	 *        the target of the switch.
+	 * @return the result of interpreting the object as an instance of ' <em>Skew</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -968,15 +1190,13 @@ public class DGSwitch<T> extends Switch<T> {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '
-	 * <em>Text</em>'. <!-- begin-user-doc --> This implementation returns null;
+	 * Returns the result of interpreting the object as an instance of ' <em>Text</em>'. <!-- begin-user-doc --> This implementation returns null;
 	 * returning a non-null result will terminate the switch. <!-- end-user-doc
 	 * -->
 	 * 
 	 * @param object
-	 *            the target of the switch.
-	 * @return the result of interpreting the object as an instance of '
-	 *         <em>Text</em>'.
+	 *        the target of the switch.
+	 * @return the result of interpreting the object as an instance of ' <em>Text</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -989,7 +1209,9 @@ public class DGSwitch<T> extends Switch<T> {
 	 * <!-- begin-user-doc --> This implementation returns
 	 * null; returning a non-null result will terminate the switch. <!--
 	 * end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Translate</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -999,15 +1221,13 @@ public class DGSwitch<T> extends Switch<T> {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '
-	 * <em>Use</em>'. <!-- begin-user-doc --> This implementation returns null;
+	 * Returns the result of interpreting the object as an instance of ' <em>Use</em>'. <!-- begin-user-doc --> This implementation returns null;
 	 * returning a non-null result will terminate the switch. <!-- end-user-doc
 	 * -->
 	 * 
 	 * @param object
-	 *            the target of the switch.
-	 * @return the result of interpreting the object as an instance of '
-	 *         <em>Use</em>'.
+	 *        the target of the switch.
+	 * @return the result of interpreting the object as an instance of ' <em>Use</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -1020,7 +1240,9 @@ public class DGSwitch<T> extends Switch<T> {
 	 * <!-- begin-user-doc --> This implementation returns
 	 * null; returning a non-null result will terminate the switch, but this is
 	 * the last case anyway. <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
 	 * @generated
@@ -1029,5 +1251,4 @@ public class DGSwitch<T> extends Switch<T> {
 	public T defaultCase(EObject object) {
 		return null;
 	}
-
 } // DGSwitch
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/util/DGValidator.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/util/DGValidator.java
index 33929df30f4..022c2556b26 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/util/DGValidator.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/dg/util/DGValidator.java
@@ -37,13 +37,16 @@ public class DGValidator extends EObjectValidator {
 	/**
 	 * The cached model package
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static final DGValidator INSTANCE = new DGValidator();
 
 	/**
-	 * A constant for the {@link org.eclipse.emf.common.util.Diagnostic#getSource() source} of diagnostic {@link org.eclipse.emf.common.util.Diagnostic#getCode() codes} from this package.
+	 * A constant for the {@link org.eclipse.emf.common.util.Diagnostic#getSource() source} of diagnostic
+	 * {@link org.eclipse.emf.common.util.Diagnostic#getCode() codes} from this package.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.emf.common.util.Diagnostic#getSource()
 	 * @see org.eclipse.emf.common.util.Diagnostic#getCode()
 	 * @generated
@@ -72,6 +75,7 @@ public class DGValidator extends EObjectValidator {
 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Id Cannot Be Empty' of 'Definition'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static final int DEFINITION__ID_CANNOT_BE_EMPTY = 3;
@@ -80,6 +84,7 @@ public class DGValidator extends EObjectValidator {
 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Valid Font Size' of 'Style'.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static final int STYLE__VALID_FONT_SIZE = 4;
@@ -88,6 +93,7 @@ public class DGValidator extends EObjectValidator {
 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Valid Fill Opacity' of 'Style'.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static final int STYLE__VALID_FILL_OPACITY = 5;
@@ -96,6 +102,7 @@ public class DGValidator extends EObjectValidator {
 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Valid Stroke Width' of 'Style'.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static final int STYLE__VALID_STROKE_WIDTH = 6;
@@ -104,6 +111,7 @@ public class DGValidator extends EObjectValidator {
 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Valid Dash Length Size' of 'Style'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static final int STYLE__VALID_DASH_LENGTH_SIZE = 7;
@@ -112,6 +120,7 @@ public class DGValidator extends EObjectValidator {
 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Valid Stroke Opacity' of 'Style'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static final int STYLE__VALID_STROKE_OPACITY = 8;
@@ -129,6 +138,7 @@ public class DGValidator extends EObjectValidator {
 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Non Negative Radius' of 'Circle'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static final int CIRCLE__NON_NEGATIVE_RADIUS = 10;
@@ -137,6 +147,7 @@ public class DGValidator extends EObjectValidator {
 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Valid Offset' of 'Gradient Stop'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static final int GRADIENT_STOP__VALID_OFFSET = 11;
@@ -145,6 +156,7 @@ public class DGValidator extends EObjectValidator {
 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Valid Opacity' of 'Gradient Stop'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static final int GRADIENT_STOP__VALID_OPACITY = 12;
@@ -153,6 +165,7 @@ public class DGValidator extends EObjectValidator {
 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Source Cannot Be Empty' of 'Image'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static final int IMAGE__SOURCE_CANNOT_BE_EMPTY = 13;
@@ -197,6 +210,7 @@ public class DGValidator extends EObjectValidator {
 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'First Command Must Be Move' of 'Path'.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static final int PATH__FIRST_COMMAND_MUST_BE_MOVE = 18;
@@ -205,6 +219,7 @@ public class DGValidator extends EObjectValidator {
 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Valid Center Point' of 'Radial Gradient'.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static final int RADIAL_GRADIENT__VALID_CENTER_POINT = 19;
@@ -213,6 +228,7 @@ public class DGValidator extends EObjectValidator {
 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Valid Focus Point' of 'Radial Gradient'.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static final int RADIAL_GRADIENT__VALID_FOCUS_POINT = 20;
@@ -221,6 +237,7 @@ public class DGValidator extends EObjectValidator {
 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Valid Radius' of 'Radial Gradient'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static final int RADIAL_GRADIENT__VALID_RADIUS = 21;
@@ -238,6 +255,7 @@ public class DGValidator extends EObjectValidator {
 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Nonnegativescale' of 'Scale'.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static final int SCALE__NONNEGATIVESCALE = 23;
@@ -246,6 +264,7 @@ public class DGValidator extends EObjectValidator {
 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Data Cannot Be Empty' of 'Text'.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static final int TEXT__DATA_CANNOT_BE_EMPTY = 24;
@@ -254,6 +273,7 @@ public class DGValidator extends EObjectValidator {
 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Referenced Element Has Id' of 'Use'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static final int USE__REFERENCED_ELEMENT_HAS_ID = 25;
@@ -262,6 +282,7 @@ public class DGValidator extends EObjectValidator {
 	 * A constant with a fixed name that can be used as the base value for additional hand written constants.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private static final int GENERATED_DIAGNOSTIC_CODE_COUNT = 25;
@@ -270,6 +291,7 @@ public class DGValidator extends EObjectValidator {
 	 * A constant with a fixed name that can be used as the base value for additional hand written constants in a derived class.
 	 * <!-- begin-user-doc
 	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected static final int DIAGNOSTIC_CODE_COUNT = GENERATED_DIAGNOSTIC_CODE_COUNT;
@@ -277,12 +299,10 @@ public class DGValidator extends EObjectValidator {
 	/**
 	 * Delegates evaluation of the given invariant expression against the object in the given context.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public static boolean validate(EClass eClass, EObject eObject,
-			DiagnosticChain diagnostics, Map<Object, Object> context,
-			String validationDelegate, EOperation invariant, String expression,
-			int severity, String source, int code) {
+	public static boolean validate(EClass eClass, EObject eObject, DiagnosticChain diagnostics, Map<Object, Object> context, String validationDelegate, EOperation invariant, String expression, int severity, String source, int code) {
 		return EObjectValidator.validate(eClass, eObject, diagnostics, context, validationDelegate, invariant, expression, severity, source, code);
 	}
 
@@ -290,6 +310,7 @@ public class DGValidator extends EObjectValidator {
 	 * Creates an instance of the switch.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public DGValidator() {
@@ -300,219 +321,257 @@ public class DGValidator extends EObjectValidator {
 	 * Returns the package of this validator switch.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	protected EPackage getEPackage() {
-	  return DGPackage.eINSTANCE;
+		return DGPackage.eINSTANCE;
 	}
 
 	/**
 	 * Calls <code>validateXXX</code> for the corresponding classifier of the model.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
-	protected boolean validate(int classifierID, Object value,
-			DiagnosticChain diagnostics, Map<Object, Object> context) {
-		switch (classifierID) {
-			case DGPackage.CANVAS:
-				return validateCanvas((Canvas)value, diagnostics, context);
-			case DGPackage.GROUP:
-				return validateGroup((Group)value, diagnostics, context);
-			case DGPackage.GRAPHICAL_ELEMENT:
-				return validateGraphicalElement((GraphicalElement)value, diagnostics, context);
-			case DGPackage.DEFINITION:
-				return validateDefinition((Definition)value, diagnostics, context);
-			case DGPackage.MOVE_TO:
-				return validateMoveTo((MoveTo)value, diagnostics, context);
-			case DGPackage.PATH_COMMAND:
-				return validatePathCommand((PathCommand)value, diagnostics, context);
-			case DGPackage.CLIP_PATH:
-				return validateClipPath((ClipPath)value, diagnostics, context);
-			case DGPackage.STYLE:
-				return validateStyle((Style)value, diagnostics, context);
-			case DGPackage.PAINT:
-				return validatePaint((Paint)value, diagnostics, context);
-			case DGPackage.PAINT_SERVER:
-				return validatePaintServer((PaintServer)value, diagnostics, context);
-			case DGPackage.TRANSFORM:
-				return validateTransform((Transform)value, diagnostics, context);
-			case DGPackage.CIRCLE:
-				return validateCircle((Circle)value, diagnostics, context);
-			case DGPackage.CLOSE_PATH:
-				return validateClosePath((ClosePath)value, diagnostics, context);
-			case DGPackage.CUBIC_CURVE_TO:
-				return validateCubicCurveTo((CubicCurveTo)value, diagnostics, context);
-			case DGPackage.DEFINITIONS:
-				return validateDefinitions((Definitions)value, diagnostics, context);
-			case DGPackage.STYLE_SHEET:
-				return validateStyleSheet((StyleSheet)value, diagnostics, context);
-			case DGPackage.STYLE_RULE:
-				return validateStyleRule((StyleRule)value, diagnostics, context);
-			case DGPackage.STYLE_SELECTOR:
-				return validateStyleSelector((StyleSelector)value, diagnostics, context);
-			case DGPackage.ELLIPSE:
-				return validateEllipse((Ellipse)value, diagnostics, context);
-			case DGPackage.ELLIPTICAL_ARC_TO:
-				return validateEllipticalArcTo((EllipticalArcTo)value, diagnostics, context);
-			case DGPackage.QUADRATIC_CURVE_TO:
-				return validateQuadraticCurveTo((QuadraticCurveTo)value, diagnostics, context);
-			case DGPackage.GRADIENT:
-				return validateGradient((Gradient)value, diagnostics, context);
-			case DGPackage.GRADIENT_STOP:
-				return validateGradientStop((GradientStop)value, diagnostics, context);
-			case DGPackage.IMAGE:
-				return validateImage((Image)value, diagnostics, context);
-			case DGPackage.LINE:
-				return validateLine((Line)value, diagnostics, context);
-			case DGPackage.MARKED_ELEMENT:
-				return validateMarkedElement((MarkedElement)value, diagnostics, context);
-			case DGPackage.MARKER:
-				return validateMarker((Marker)value, diagnostics, context);
-			case DGPackage.LINEAR_GRADIENT:
-				return validateLinearGradient((LinearGradient)value, diagnostics, context);
-			case DGPackage.LINE_TO:
-				return validateLineTo((LineTo)value, diagnostics, context);
-			case DGPackage.MATRIX:
-				return validateMatrix((Matrix)value, diagnostics, context);
-			case DGPackage.PATH:
-				return validatePath((Path)value, diagnostics, context);
-			case DGPackage.PATTERN:
-				return validatePattern((Pattern)value, diagnostics, context);
-			case DGPackage.POLYGON:
-				return validatePolygon((Polygon)value, diagnostics, context);
-			case DGPackage.POLYLINE:
-				return validatePolyline((Polyline)value, diagnostics, context);
-			case DGPackage.RADIAL_GRADIENT:
-				return validateRadialGradient((RadialGradient)value, diagnostics, context);
-			case DGPackage.RECTANGLE:
-				return validateRectangle((Rectangle)value, diagnostics, context);
-			case DGPackage.ROOT_CANVAS:
-				return validateRootCanvas((RootCanvas)value, diagnostics, context);
-			case DGPackage.ROTATE:
-				return validateRotate((Rotate)value, diagnostics, context);
-			case DGPackage.SCALE:
-				return validateScale((Scale)value, diagnostics, context);
-			case DGPackage.SKEW:
-				return validateSkew((Skew)value, diagnostics, context);
-			case DGPackage.TEXT:
-				return validateText((Text)value, diagnostics, context);
-			case DGPackage.TRANSLATE:
-				return validateTranslate((Translate)value, diagnostics, context);
-			case DGPackage.USE:
-				return validateUse((Use)value, diagnostics, context);
-			case DGPackage.FONT_DECORATION:
-				return validateFontDecoration((FontDecoration)value, diagnostics, context);
-			case DGPackage.ELEMENT_KIND:
-				return validateElementKind((ElementKind)value, diagnostics, context);
-			case DGPackage.TEXT_ANCHOR:
-				return validateTextAnchor((TextAnchor)value, diagnostics, context);
-			default:
-				return true;
+	protected boolean validate(int classifierID, Object value, DiagnosticChain diagnostics, Map<Object, Object> context) {
+		switch(classifierID) {
+		case DGPackage.CANVAS:
+			return validateCanvas((Canvas)value, diagnostics, context);
+		case DGPackage.GROUP:
+			return validateGroup((Group)value, diagnostics, context);
+		case DGPackage.GRAPHICAL_ELEMENT:
+			return validateGraphicalElement((GraphicalElement)value, diagnostics, context);
+		case DGPackage.DEFINITION:
+			return validateDefinition((Definition)value, diagnostics, context);
+		case DGPackage.MOVE_TO:
+			return validateMoveTo((MoveTo)value, diagnostics, context);
+		case DGPackage.PATH_COMMAND:
+			return validatePathCommand((PathCommand)value, diagnostics, context);
+		case DGPackage.CLIP_PATH:
+			return validateClipPath((ClipPath)value, diagnostics, context);
+		case DGPackage.STYLE:
+			return validateStyle((Style)value, diagnostics, context);
+		case DGPackage.PAINT:
+			return validatePaint((Paint)value, diagnostics, context);
+		case DGPackage.PAINT_SERVER:
+			return validatePaintServer((PaintServer)value, diagnostics, context);
+		case DGPackage.TRANSFORM:
+			return validateTransform((Transform)value, diagnostics, context);
+		case DGPackage.CIRCLE:
+			return validateCircle((Circle)value, diagnostics, context);
+		case DGPackage.CLOSE_PATH:
+			return validateClosePath((ClosePath)value, diagnostics, context);
+		case DGPackage.CUBIC_CURVE_TO:
+			return validateCubicCurveTo((CubicCurveTo)value, diagnostics, context);
+		case DGPackage.DEFINITIONS:
+			return validateDefinitions((Definitions)value, diagnostics, context);
+		case DGPackage.STYLE_SHEET:
+			return validateStyleSheet((StyleSheet)value, diagnostics, context);
+		case DGPackage.STYLE_RULE:
+			return validateStyleRule((StyleRule)value, diagnostics, context);
+		case DGPackage.STYLE_SELECTOR:
+			return validateStyleSelector((StyleSelector)value, diagnostics, context);
+		case DGPackage.ELLIPSE:
+			return validateEllipse((Ellipse)value, diagnostics, context);
+		case DGPackage.ELLIPTICAL_ARC_TO:
+			return validateEllipticalArcTo((EllipticalArcTo)value, diagnostics, context);
+		case DGPackage.QUADRATIC_CURVE_TO:
+			return validateQuadraticCurveTo((QuadraticCurveTo)value, diagnostics, context);
+		case DGPackage.GRADIENT:
+			return validateGradient((Gradient)value, diagnostics, context);
+		case DGPackage.GRADIENT_STOP:
+			return validateGradientStop((GradientStop)value, diagnostics, context);
+		case DGPackage.IMAGE:
+			return validateImage((Image)value, diagnostics, context);
+		case DGPackage.LINE:
+			return validateLine((Line)value, diagnostics, context);
+		case DGPackage.MARKED_ELEMENT:
+			return validateMarkedElement((MarkedElement)value, diagnostics, context);
+		case DGPackage.MARKER:
+			return validateMarker((Marker)value, diagnostics, context);
+		case DGPackage.LINEAR_GRADIENT:
+			return validateLinearGradient((LinearGradient)value, diagnostics, context);
+		case DGPackage.LINE_TO:
+			return validateLineTo((LineTo)value, diagnostics, context);
+		case DGPackage.MATRIX:
+			return validateMatrix((Matrix)value, diagnostics, context);
+		case DGPackage.PATH:
+			return validatePath((Path)value, diagnostics, context);
+		case DGPackage.PATTERN:
+			return validatePattern((Pattern)value, diagnostics, context);
+		case DGPackage.POLYGON:
+			return validatePolygon((Polygon)value, diagnostics, context);
+		case DGPackage.POLYLINE:
+			return validatePolyline((Polyline)value, diagnostics, context);
+		case DGPackage.RADIAL_GRADIENT:
+			return validateRadialGradient((RadialGradient)value, diagnostics, context);
+		case DGPackage.RECTANGLE:
+			return validateRectangle((Rectangle)value, diagnostics, context);
+		case DGPackage.ROOT_CANVAS:
+			return validateRootCanvas((RootCanvas)value, diagnostics, context);
+		case DGPackage.ROTATE:
+			return validateRotate((Rotate)value, diagnostics, context);
+		case DGPackage.SCALE:
+			return validateScale((Scale)value, diagnostics, context);
+		case DGPackage.SKEW:
+			return validateSkew((Skew)value, diagnostics, context);
+		case DGPackage.TEXT:
+			return validateText((Text)value, diagnostics, context);
+		case DGPackage.TRANSLATE:
+			return validateTranslate((Translate)value, diagnostics, context);
+		case DGPackage.USE:
+			return validateUse((Use)value, diagnostics, context);
+		case DGPackage.FONT_DECORATION:
+			return validateFontDecoration((FontDecoration)value, diagnostics, context);
+		case DGPackage.ELEMENT_KIND:
+			return validateElementKind((ElementKind)value, diagnostics, context);
+		case DGPackage.TEXT_ANCHOR:
+			return validateTextAnchor((TextAnchor)value, diagnostics, context);
+		default:
+			return true;
 		}
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public boolean validateCanvas(Canvas canvas, DiagnosticChain diagnostics,
-			Map<Object, Object> context) {
-		if (!validate_NoCircularContainment(canvas, diagnostics, context)) return false;
+	public boolean validateCanvas(Canvas canvas, DiagnosticChain diagnostics, Map<Object, Object> context) {
+		if(!validate_NoCircularContainment(canvas, diagnostics, context))
+			return false;
 		boolean result = validate_EveryMultiplicityConforms(canvas, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryDataValueConforms(canvas, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryReferenceIsContained(canvas, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryBidirectionalReferenceIsPaired(canvas, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryProxyResolves(canvas, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_UniqueID(canvas, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryKeyUnique(canvas, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryMapEntryUnique(canvas, diagnostics, context);
-		if (result || diagnostics != null) result &= validateDefinition_idCannotBeEmpty(canvas, diagnostics, context);
-		if (result || diagnostics != null) result &= validateGraphicalElement_referencedClippathHasId(canvas, diagnostics, context);
-		if (result || diagnostics != null) result &= validateCanvas_canvasCannotHaveTransforms(canvas, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_EveryDataValueConforms(canvas, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_EveryReferenceIsContained(canvas, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_EveryBidirectionalReferenceIsPaired(canvas, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_EveryProxyResolves(canvas, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_UniqueID(canvas, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_EveryKeyUnique(canvas, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_EveryMapEntryUnique(canvas, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validateDefinition_idCannotBeEmpty(canvas, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validateGraphicalElement_referencedClippathHasId(canvas, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validateCanvas_canvasCannotHaveTransforms(canvas, diagnostics, context);
 		return result;
 	}
 
 	/**
 	 * Validates the canvasCannotHaveTransforms constraint of '<em>Canvas</em>'.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public boolean validateCanvas_canvasCannotHaveTransforms(Canvas canvas,
-			DiagnosticChain diagnostics, Map<Object, Object> context) {
+	public boolean validateCanvas_canvasCannotHaveTransforms(Canvas canvas, DiagnosticChain diagnostics, Map<Object, Object> context) {
 		return canvas.canvasCannotHaveTransforms(diagnostics, context);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public boolean validateGroup(Group group, DiagnosticChain diagnostics,
-			Map<Object, Object> context) {
-		if (!validate_NoCircularContainment(group, diagnostics, context)) return false;
+	public boolean validateGroup(Group group, DiagnosticChain diagnostics, Map<Object, Object> context) {
+		if(!validate_NoCircularContainment(group, diagnostics, context))
+			return false;
 		boolean result = validate_EveryMultiplicityConforms(group, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryDataValueConforms(group, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryReferenceIsContained(group, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryBidirectionalReferenceIsPaired(group, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryProxyResolves(group, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_UniqueID(group, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryKeyUnique(group, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryMapEntryUnique(group, diagnostics, context);
-		if (result || diagnostics != null) result &= validateDefinition_idCannotBeEmpty(group, diagnostics, context);
-		if (result || diagnostics != null) result &= validateGraphicalElement_referencedClippathHasId(group, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_EveryDataValueConforms(group, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_EveryReferenceIsContained(group, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_EveryBidirectionalReferenceIsPaired(group, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_EveryProxyResolves(group, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_UniqueID(group, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_EveryKeyUnique(group, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_EveryMapEntryUnique(group, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validateDefinition_idCannotBeEmpty(group, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validateGraphicalElement_referencedClippathHasId(group, diagnostics, context);
 		return result;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public boolean validateGraphicalElement(GraphicalElement graphicalElement,
-			DiagnosticChain diagnostics, Map<Object, Object> context) {
-		if (!validate_NoCircularContainment(graphicalElement, diagnostics, context)) return false;
+	public boolean validateGraphicalElement(GraphicalElement graphicalElement, DiagnosticChain diagnostics, Map<Object, Object> context) {
+		if(!validate_NoCircularContainment(graphicalElement, diagnostics, context))
+			return false;
 		boolean result = validate_EveryMultiplicityConforms(graphicalElement, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryDataValueConforms(graphicalElement, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryReferenceIsContained(graphicalElement, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryBidirectionalReferenceIsPaired(graphicalElement, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryProxyResolves(graphicalElement, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_UniqueID(graphicalElement, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryKeyUnique(graphicalElement, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryMapEntryUnique(graphicalElement, diagnostics, context);
-		if (result || diagnostics != null) result &= validateDefinition_idCannotBeEmpty(graphicalElement, diagnostics, context);
-		if (result || diagnostics != null) result &= validateGraphicalElement_referencedClippathHasId(graphicalElement, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_EveryDataValueConforms(graphicalElement, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_EveryReferenceIsContained(graphicalElement, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_EveryBidirectionalReferenceIsPaired(graphicalElement, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_EveryProxyResolves(graphicalElement, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_UniqueID(graphicalElement, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_EveryKeyUnique(graphicalElement, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_EveryMapEntryUnique(graphicalElement, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validateDefinition_idCannotBeEmpty(graphicalElement, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validateGraphicalElement_referencedClippathHasId(graphicalElement, diagnostics, context);
 		return result;
 	}
 
 	/**
-	 * Validates the referencedClippathHasId constraint of '
-	 * <em>Graphical Element</em>'. <!-- begin-user-doc --> <!-- end-user-doc
+	 * Validates the referencedClippathHasId constraint of ' <em>Graphical Element</em>'. <!-- begin-user-doc --> <!-- end-user-doc
 	 * -->
 	 * 
 	 * @generated
 	 */
-	public boolean validateGraphicalElement_referencedClippathHasId(
-			GraphicalElement graphicalElement, DiagnosticChain diagnostics,
-			Map<Object, Object> context) {
+	public boolean validateGraphicalElement_referencedClippathHasId(GraphicalElement graphicalElement, DiagnosticChain diagnostics, Map<Object, Object> context) {
 		return graphicalElement.referencedClippathHasId(diagnostics, context);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public boolean validateDefinition(Definition definition,
-			DiagnosticChain diagnostics, Map<Object, Object> context) {
-		if (!validate_NoCircularContainment(definition, diagnostics, context)) return false;
+	public boolean validateDefinition(Definition definition, DiagnosticChain diagnostics, Map<Object, Object> context) {
+		if(!validate_NoCircularContainment(definition, diagnostics, context))
+			return false;
 		boolean result = validate_EveryMultiplicityConforms(definition, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryDataValueConforms(definition, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryReferenceIsContained(definition, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryBidirectionalReferenceIsPaired(definition, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryProxyResolves(definition, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_UniqueID(definition, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryKeyUnique(definition, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryMapEntryUnique(definition, diagnostics, context);
-		if (result || diagnostics != null) result &= validateDefinition_idCannotBeEmpty(definition, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_EveryDataValueConforms(definition, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_EveryReferenceIsContained(definition, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_EveryBidirectionalReferenceIsPaired(definition, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_EveryProxyResolves(definition, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_UniqueID(definition, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_EveryKeyUnique(definition, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_EveryMapEntryUnique(definition, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validateDefinition_idCannotBeEmpty(definition, diagnostics, context);
 		return result;
 	}
 
@@ -522,51 +581,73 @@ public class DGValidator extends EObjectValidator {
 	 * 
 	 * @generated
 	 */
-	public boolean validateDefinition_idCannotBeEmpty(Definition definition,
-			DiagnosticChain diagnostics, Map<Object, Object> context) {
+	public boolean validateDefinition_idCannotBeEmpty(Definition definition, DiagnosticChain diagnostics, Map<Object, Object> context) {
 		return definition.idCannotBeEmpty(diagnostics, context);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public boolean validateClipPath(ClipPath clipPath,
-			DiagnosticChain diagnostics, Map<Object, Object> context) {
-		if (!validate_NoCircularContainment(clipPath, diagnostics, context)) return false;
+	public boolean validateClipPath(ClipPath clipPath, DiagnosticChain diagnostics, Map<Object, Object> context) {
+		if(!validate_NoCircularContainment(clipPath, diagnostics, context))
+			return false;
 		boolean result = validate_EveryMultiplicityConforms(clipPath, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryDataValueConforms(clipPath, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryReferenceIsContained(clipPath, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryBidirectionalReferenceIsPaired(clipPath, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryProxyResolves(clipPath, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_UniqueID(clipPath, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryKeyUnique(clipPath, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryMapEntryUnique(clipPath, diagnostics, context);
-		if (result || diagnostics != null) result &= validateDefinition_idCannotBeEmpty(clipPath, diagnostics, context);
-		if (result || diagnostics != null) result &= validateGraphicalElement_referencedClippathHasId(clipPath, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_EveryDataValueConforms(clipPath, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_EveryReferenceIsContained(clipPath, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_EveryBidirectionalReferenceIsPaired(clipPath, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_EveryProxyResolves(clipPath, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_UniqueID(clipPath, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_EveryKeyUnique(clipPath, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_EveryMapEntryUnique(clipPath, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validateDefinition_idCannotBeEmpty(clipPath, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validateGraphicalElement_referencedClippathHasId(clipPath, diagnostics, context);
 		return result;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public boolean validateStyle(Style style, DiagnosticChain diagnostics,
-			Map<Object, Object> context) {
-		if (!validate_NoCircularContainment(style, diagnostics, context)) return false;
+	public boolean validateStyle(Style style, DiagnosticChain diagnostics, Map<Object, Object> context) {
+		if(!validate_NoCircularContainment(style, diagnostics, context))
+			return false;
 		boolean result = validate_EveryMultiplicityConforms(style, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryDataValueConforms(style, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryReferenceIsContained(style, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryBidirectionalReferenceIsPaired(style, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryProxyResolves(style, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_UniqueID(style, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryKeyUnique(style, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryMapEntryUnique(style, diagnostics, context);
-		if (result || diagnostics != null) result &= validateStyle_validFontSize(style, diagnostics, context);
-		if (result || diagnostics != null) result &= validateStyle_validFillOpacity(style, diagnostics, context);
-		if (result || diagnostics != null) result &= validateStyle_validStrokeWidth(style, diagnostics, context);
-		if (result || diagnostics != null) result &= validateStyle_validDashLengthSize(style, diagnostics, context);
-		if (result || diagnostics != null) result &= validateStyle_validStrokeOpacity(style, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_EveryDataValueConforms(style, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_EveryReferenceIsContained(style, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_EveryBidirectionalReferenceIsPaired(style, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_EveryProxyResolves(style, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_UniqueID(style, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_EveryKeyUnique(style, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_EveryMapEntryUnique(style, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validateStyle_validFontSize(style, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validateStyle_validFillOpacity(style, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validateStyle_validStrokeWidth(style, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validateStyle_validDashLengthSize(style, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validateStyle_validStrokeOpacity(style, diagnostics, context);
 		return result;
 	}
 
@@ -576,8 +657,7 @@ public class DGValidator extends EObjectValidator {
 	 * 
 	 * @generated
 	 */
-	public boolean validateStyle_validFontSize(Style style,
-			DiagnosticChain diagnostics, Map<Object, Object> context) {
+	public boolean validateStyle_validFontSize(Style style, DiagnosticChain diagnostics, Map<Object, Object> context) {
 		return style.validFontSize(diagnostics, context);
 	}
 
@@ -587,8 +667,7 @@ public class DGValidator extends EObjectValidator {
 	 * 
 	 * @generated
 	 */
-	public boolean validateStyle_validFillOpacity(Style style,
-			DiagnosticChain diagnostics, Map<Object, Object> context) {
+	public boolean validateStyle_validFillOpacity(Style style, DiagnosticChain diagnostics, Map<Object, Object> context) {
 		return style.validFillOpacity(diagnostics, context);
 	}
 
@@ -598,8 +677,7 @@ public class DGValidator extends EObjectValidator {
 	 * 
 	 * @generated
 	 */
-	public boolean validateStyle_validStrokeWidth(Style style,
-			DiagnosticChain diagnostics, Map<Object, Object> context) {
+	public boolean validateStyle_validStrokeWidth(Style style, DiagnosticChain diagnostics, Map<Object, Object> context) {
 		return style.validStrokeWidth(diagnostics, context);
 	}
 
@@ -609,8 +687,7 @@ public class DGValidator extends EObjectValidator {
 	 * 
 	 * @generated
 	 */
-	public boolean validateStyle_validDashLengthSize(Style style,
-			DiagnosticChain diagnostics, Map<Object, Object> context) {
+	public boolean validateStyle_validDashLengthSize(Style style, DiagnosticChain diagnostics, Map<Object, Object> context) {
 		return style.validDashLengthSize(diagnostics, context);
 	}
 
@@ -620,160 +697,198 @@ public class DGValidator extends EObjectValidator {
 	 * 
 	 * @generated
 	 */
-	public boolean validateStyle_validStrokeOpacity(Style style,
-			DiagnosticChain diagnostics, Map<Object, Object> context) {
+	public boolean validateStyle_validStrokeOpacity(Style style, DiagnosticChain diagnostics, Map<Object, Object> context) {
 		return style.validStrokeOpacity(diagnostics, context);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public boolean validatePaint(Paint paint, DiagnosticChain diagnostics,
-			Map<Object, Object> context) {
-		if (!validate_NoCircularContainment(paint, diagnostics, context)) return false;
+	public boolean validatePaint(Paint paint, DiagnosticChain diagnostics, Map<Object, Object> context) {
+		if(!validate_NoCircularContainment(paint, diagnostics, context))
+			return false;
 		boolean result = validate_EveryMultiplicityConforms(paint, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryDataValueConforms(paint, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryReferenceIsContained(paint, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryBidirectionalReferenceIsPaired(paint, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryProxyResolves(paint, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_UniqueID(paint, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryKeyUnique(paint, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryMapEntryUnique(paint, diagnostics, context);
-		if (result || diagnostics != null) result &= validatePaint_referencedPaintServerHasId(paint, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_EveryDataValueConforms(paint, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_EveryReferenceIsContained(paint, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_EveryBidirectionalReferenceIsPaired(paint, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_EveryProxyResolves(paint, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_UniqueID(paint, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_EveryKeyUnique(paint, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_EveryMapEntryUnique(paint, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validatePaint_referencedPaintServerHasId(paint, diagnostics, context);
 		return result;
 	}
 
 	/**
 	 * Validates the referencedPaintServerHasId constraint of '<em>Paint</em>'.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public boolean validatePaint_referencedPaintServerHasId(Paint paint,
-			DiagnosticChain diagnostics, Map<Object, Object> context) {
+	public boolean validatePaint_referencedPaintServerHasId(Paint paint, DiagnosticChain diagnostics, Map<Object, Object> context) {
 		return paint.referencedPaintServerHasId(diagnostics, context);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public boolean validatePaintServer(PaintServer paintServer,
-			DiagnosticChain diagnostics, Map<Object, Object> context) {
-		if (!validate_NoCircularContainment(paintServer, diagnostics, context)) return false;
+	public boolean validatePaintServer(PaintServer paintServer, DiagnosticChain diagnostics, Map<Object, Object> context) {
+		if(!validate_NoCircularContainment(paintServer, diagnostics, context))
+			return false;
 		boolean result = validate_EveryMultiplicityConforms(paintServer, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryDataValueConforms(paintServer, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryReferenceIsContained(paintServer, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryBidirectionalReferenceIsPaired(paintServer, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryProxyResolves(paintServer, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_UniqueID(paintServer, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryKeyUnique(paintServer, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryMapEntryUnique(paintServer, diagnostics, context);
-		if (result || diagnostics != null) result &= validateDefinition_idCannotBeEmpty(paintServer, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_EveryDataValueConforms(paintServer, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_EveryReferenceIsContained(paintServer, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_EveryBidirectionalReferenceIsPaired(paintServer, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_EveryProxyResolves(paintServer, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_UniqueID(paintServer, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_EveryKeyUnique(paintServer, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_EveryMapEntryUnique(paintServer, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validateDefinition_idCannotBeEmpty(paintServer, diagnostics, context);
 		return result;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public boolean validateTransform(Transform transform,
-			DiagnosticChain diagnostics, Map<Object, Object> context) {
+	public boolean validateTransform(Transform transform, DiagnosticChain diagnostics, Map<Object, Object> context) {
 		return validate_EveryDefaultConstraint(transform, diagnostics, context);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public boolean validateDefinitions(Definitions definitions,
-			DiagnosticChain diagnostics, Map<Object, Object> context) {
+	public boolean validateDefinitions(Definitions definitions, DiagnosticChain diagnostics, Map<Object, Object> context) {
 		return validate_EveryDefaultConstraint(definitions, diagnostics, context);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public boolean validateCubicCurveTo(CubicCurveTo cubicCurveTo,
-			DiagnosticChain diagnostics, Map<Object, Object> context) {
+	public boolean validateCubicCurveTo(CubicCurveTo cubicCurveTo, DiagnosticChain diagnostics, Map<Object, Object> context) {
 		return validate_EveryDefaultConstraint(cubicCurveTo, diagnostics, context);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public boolean validatePathCommand(PathCommand pathCommand,
-			DiagnosticChain diagnostics, Map<Object, Object> context) {
+	public boolean validatePathCommand(PathCommand pathCommand, DiagnosticChain diagnostics, Map<Object, Object> context) {
 		return validate_EveryDefaultConstraint(pathCommand, diagnostics, context);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public boolean validateMarker(Marker marker, DiagnosticChain diagnostics,
-			Map<Object, Object> context) {
-		if (!validate_NoCircularContainment(marker, diagnostics, context)) return false;
+	public boolean validateMarker(Marker marker, DiagnosticChain diagnostics, Map<Object, Object> context) {
+		if(!validate_NoCircularContainment(marker, diagnostics, context))
+			return false;
 		boolean result = validate_EveryMultiplicityConforms(marker, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryDataValueConforms(marker, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryReferenceIsContained(marker, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryBidirectionalReferenceIsPaired(marker, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryProxyResolves(marker, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_UniqueID(marker, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryKeyUnique(marker, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryMapEntryUnique(marker, diagnostics, context);
-		if (result || diagnostics != null) result &= validateDefinition_idCannotBeEmpty(marker, diagnostics, context);
-		if (result || diagnostics != null) result &= validateGraphicalElement_referencedClippathHasId(marker, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_EveryDataValueConforms(marker, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_EveryReferenceIsContained(marker, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_EveryBidirectionalReferenceIsPaired(marker, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_EveryProxyResolves(marker, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_UniqueID(marker, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_EveryKeyUnique(marker, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_EveryMapEntryUnique(marker, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validateDefinition_idCannotBeEmpty(marker, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validateGraphicalElement_referencedClippathHasId(marker, diagnostics, context);
 		return result;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public boolean validateStyleSheet(StyleSheet styleSheet,
-			DiagnosticChain diagnostics, Map<Object, Object> context) {
+	public boolean validateStyleSheet(StyleSheet styleSheet, DiagnosticChain diagnostics, Map<Object, Object> context) {
 		return validate_EveryDefaultConstraint(styleSheet, diagnostics, context);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public boolean validateStyleRule(StyleRule styleRule,
-			DiagnosticChain diagnostics, Map<Object, Object> context) {
+	public boolean validateStyleRule(StyleRule styleRule, DiagnosticChain diagnostics, Map<Object, Object> context) {
 		return validate_EveryDefaultConstraint(styleRule, diagnostics, context);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public boolean validateStyleSelector(StyleSelector styleSelector,
-			DiagnosticChain diagnostics, Map<Object, Object> context) {
+	public boolean validateStyleSelector(StyleSelector styleSelector, DiagnosticChain diagnostics, Map<Object, Object> context) {
 		return validate_EveryDefaultConstraint(styleSelector, diagnostics, context);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public boolean validateCircle(Circle circle, DiagnosticChain diagnostics,
-			Map<Object, Object> context) {
-		if (!validate_NoCircularContainment(circle, diagnostics, context)) return false;
+	public boolean validateCircle(Circle circle, DiagnosticChain diagnostics, Map<Object, Object> context) {
+		if(!validate_NoCircularContainment(circle, diagnostics, context))
+			return false;
 		boolean result = validate_EveryMultiplicityConforms(circle, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryDataValueConforms(circle, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryReferenceIsContained(circle, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryBidirectionalReferenceIsPaired(circle, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryProxyResolves(circle, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_UniqueID(circle, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryKeyUnique(circle, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryMapEntryUnique(circle, diagnostics, context);
-		if (result || diagnostics != null) result &= validateDefinition_idCannotBeEmpty(circle, diagnostics, context);
-		if (result || diagnostics != null) result &= validateGraphicalElement_referencedClippathHasId(circle, diagnostics, context);
-		if (result || diagnostics != null) result &= validateCircle_nonNegativeRadius(circle, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_EveryDataValueConforms(circle, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_EveryReferenceIsContained(circle, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_EveryBidirectionalReferenceIsPaired(circle, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_EveryProxyResolves(circle, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_UniqueID(circle, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_EveryKeyUnique(circle, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_EveryMapEntryUnique(circle, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validateDefinition_idCannotBeEmpty(circle, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validateGraphicalElement_referencedClippathHasId(circle, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validateCircle_nonNegativeRadius(circle, diagnostics, context);
 		return result;
 	}
 
@@ -783,94 +898,122 @@ public class DGValidator extends EObjectValidator {
 	 * 
 	 * @generated
 	 */
-	public boolean validateCircle_nonNegativeRadius(Circle circle,
-			DiagnosticChain diagnostics, Map<Object, Object> context) {
+	public boolean validateCircle_nonNegativeRadius(Circle circle, DiagnosticChain diagnostics, Map<Object, Object> context) {
 		return circle.nonNegativeRadius(diagnostics, context);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public boolean validateClosePath(ClosePath closePath,
-			DiagnosticChain diagnostics, Map<Object, Object> context) {
+	public boolean validateClosePath(ClosePath closePath, DiagnosticChain diagnostics, Map<Object, Object> context) {
 		return validate_EveryDefaultConstraint(closePath, diagnostics, context);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public boolean validateEllipse(Ellipse ellipse,
-			DiagnosticChain diagnostics, Map<Object, Object> context) {
-		if (!validate_NoCircularContainment(ellipse, diagnostics, context)) return false;
+	public boolean validateEllipse(Ellipse ellipse, DiagnosticChain diagnostics, Map<Object, Object> context) {
+		if(!validate_NoCircularContainment(ellipse, diagnostics, context))
+			return false;
 		boolean result = validate_EveryMultiplicityConforms(ellipse, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryDataValueConforms(ellipse, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryReferenceIsContained(ellipse, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryBidirectionalReferenceIsPaired(ellipse, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryProxyResolves(ellipse, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_UniqueID(ellipse, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryKeyUnique(ellipse, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryMapEntryUnique(ellipse, diagnostics, context);
-		if (result || diagnostics != null) result &= validateDefinition_idCannotBeEmpty(ellipse, diagnostics, context);
-		if (result || diagnostics != null) result &= validateGraphicalElement_referencedClippathHasId(ellipse, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_EveryDataValueConforms(ellipse, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_EveryReferenceIsContained(ellipse, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_EveryBidirectionalReferenceIsPaired(ellipse, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_EveryProxyResolves(ellipse, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_UniqueID(ellipse, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_EveryKeyUnique(ellipse, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_EveryMapEntryUnique(ellipse, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validateDefinition_idCannotBeEmpty(ellipse, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validateGraphicalElement_referencedClippathHasId(ellipse, diagnostics, context);
 		return result;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public boolean validateEllipticalArcTo(EllipticalArcTo ellipticalArcTo,
-			DiagnosticChain diagnostics, Map<Object, Object> context) {
+	public boolean validateEllipticalArcTo(EllipticalArcTo ellipticalArcTo, DiagnosticChain diagnostics, Map<Object, Object> context) {
 		return validate_EveryDefaultConstraint(ellipticalArcTo, diagnostics, context);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public boolean validateQuadraticCurveTo(QuadraticCurveTo quadraticCurveTo,
-			DiagnosticChain diagnostics, Map<Object, Object> context) {
+	public boolean validateQuadraticCurveTo(QuadraticCurveTo quadraticCurveTo, DiagnosticChain diagnostics, Map<Object, Object> context) {
 		return validate_EveryDefaultConstraint(quadraticCurveTo, diagnostics, context);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public boolean validateGradient(Gradient gradient,
-			DiagnosticChain diagnostics, Map<Object, Object> context) {
-		if (!validate_NoCircularContainment(gradient, diagnostics, context)) return false;
+	public boolean validateGradient(Gradient gradient, DiagnosticChain diagnostics, Map<Object, Object> context) {
+		if(!validate_NoCircularContainment(gradient, diagnostics, context))
+			return false;
 		boolean result = validate_EveryMultiplicityConforms(gradient, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryDataValueConforms(gradient, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryReferenceIsContained(gradient, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryBidirectionalReferenceIsPaired(gradient, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryProxyResolves(gradient, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_UniqueID(gradient, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryKeyUnique(gradient, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryMapEntryUnique(gradient, diagnostics, context);
-		if (result || diagnostics != null) result &= validateDefinition_idCannotBeEmpty(gradient, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_EveryDataValueConforms(gradient, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_EveryReferenceIsContained(gradient, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_EveryBidirectionalReferenceIsPaired(gradient, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_EveryProxyResolves(gradient, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_UniqueID(gradient, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_EveryKeyUnique(gradient, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_EveryMapEntryUnique(gradient, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validateDefinition_idCannotBeEmpty(gradient, diagnostics, context);
 		return result;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public boolean validateGradientStop(GradientStop gradientStop,
-			DiagnosticChain diagnostics, Map<Object, Object> context) {
-		if (!validate_NoCircularContainment(gradientStop, diagnostics, context)) return false;
+	public boolean validateGradientStop(GradientStop gradientStop, DiagnosticChain diagnostics, Map<Object, Object> context) {
+		if(!validate_NoCircularContainment(gradientStop, diagnostics, context))
+			return false;
 		boolean result = validate_EveryMultiplicityConforms(gradientStop, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryDataValueConforms(gradientStop, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryReferenceIsContained(gradientStop, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryBidirectionalReferenceIsPaired(gradientStop, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryProxyResolves(gradientStop, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_UniqueID(gradientStop, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryKeyUnique(gradientStop, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryMapEntryUnique(gradientStop, diagnostics, context);
-		if (result || diagnostics != null) result &= validateGradientStop_validOffset(gradientStop, diagnostics, context);
-		if (result || diagnostics != null) result &= validateGradientStop_validOpacity(gradientStop, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_EveryDataValueConforms(gradientStop, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_EveryReferenceIsContained(gradientStop, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_EveryBidirectionalReferenceIsPaired(gradientStop, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_EveryProxyResolves(gradientStop, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_UniqueID(gradientStop, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_EveryKeyUnique(gradientStop, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_EveryMapEntryUnique(gradientStop, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validateGradientStop_validOffset(gradientStop, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validateGradientStop_validOpacity(gradientStop, diagnostics, context);
 		return result;
 	}
 
@@ -880,8 +1023,7 @@ public class DGValidator extends EObjectValidator {
 	 * 
 	 * @generated
 	 */
-	public boolean validateGradientStop_validOffset(GradientStop gradientStop,
-			DiagnosticChain diagnostics, Map<Object, Object> context) {
+	public boolean validateGradientStop_validOffset(GradientStop gradientStop, DiagnosticChain diagnostics, Map<Object, Object> context) {
 		return gradientStop.validOffset(diagnostics, context);
 	}
 
@@ -891,29 +1033,39 @@ public class DGValidator extends EObjectValidator {
 	 * 
 	 * @generated
 	 */
-	public boolean validateGradientStop_validOpacity(GradientStop gradientStop,
-			DiagnosticChain diagnostics, Map<Object, Object> context) {
+	public boolean validateGradientStop_validOpacity(GradientStop gradientStop, DiagnosticChain diagnostics, Map<Object, Object> context) {
 		return gradientStop.validOpacity(diagnostics, context);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public boolean validateImage(Image image, DiagnosticChain diagnostics,
-			Map<Object, Object> context) {
-		if (!validate_NoCircularContainment(image, diagnostics, context)) return false;
+	public boolean validateImage(Image image, DiagnosticChain diagnostics, Map<Object, Object> context) {
+		if(!validate_NoCircularContainment(image, diagnostics, context))
+			return false;
 		boolean result = validate_EveryMultiplicityConforms(image, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryDataValueConforms(image, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryReferenceIsContained(image, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryBidirectionalReferenceIsPaired(image, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryProxyResolves(image, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_UniqueID(image, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryKeyUnique(image, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryMapEntryUnique(image, diagnostics, context);
-		if (result || diagnostics != null) result &= validateDefinition_idCannotBeEmpty(image, diagnostics, context);
-		if (result || diagnostics != null) result &= validateGraphicalElement_referencedClippathHasId(image, diagnostics, context);
-		if (result || diagnostics != null) result &= validateImage_sourceCannotBeEmpty(image, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_EveryDataValueConforms(image, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_EveryReferenceIsContained(image, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_EveryBidirectionalReferenceIsPaired(image, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_EveryProxyResolves(image, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_UniqueID(image, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_EveryKeyUnique(image, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_EveryMapEntryUnique(image, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validateDefinition_idCannotBeEmpty(image, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validateGraphicalElement_referencedClippathHasId(image, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validateImage_sourceCannotBeEmpty(image, diagnostics, context);
 		return result;
 	}
 
@@ -923,169 +1075,214 @@ public class DGValidator extends EObjectValidator {
 	 * 
 	 * @generated
 	 */
-	public boolean validateImage_sourceCannotBeEmpty(Image image,
-			DiagnosticChain diagnostics, Map<Object, Object> context) {
+	public boolean validateImage_sourceCannotBeEmpty(Image image, DiagnosticChain diagnostics, Map<Object, Object> context) {
 		return image.sourceCannotBeEmpty(diagnostics, context);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public boolean validateLine(Line line, DiagnosticChain diagnostics,
-			Map<Object, Object> context) {
-		if (!validate_NoCircularContainment(line, diagnostics, context)) return false;
+	public boolean validateLine(Line line, DiagnosticChain diagnostics, Map<Object, Object> context) {
+		if(!validate_NoCircularContainment(line, diagnostics, context))
+			return false;
 		boolean result = validate_EveryMultiplicityConforms(line, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryDataValueConforms(line, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryReferenceIsContained(line, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryBidirectionalReferenceIsPaired(line, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryProxyResolves(line, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_UniqueID(line, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryKeyUnique(line, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryMapEntryUnique(line, diagnostics, context);
-		if (result || diagnostics != null) result &= validateDefinition_idCannotBeEmpty(line, diagnostics, context);
-		if (result || diagnostics != null) result &= validateGraphicalElement_referencedClippathHasId(line, diagnostics, context);
-		if (result || diagnostics != null) result &= validateMarkedElement_referencedStartMarkerHasId(line, diagnostics, context);
-		if (result || diagnostics != null) result &= validateMarkedElement_referencedMidMarkerHasId(line, diagnostics, context);
-		if (result || diagnostics != null) result &= validateMarkedElement_referencedEndMarkerHasId(line, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_EveryDataValueConforms(line, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_EveryReferenceIsContained(line, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_EveryBidirectionalReferenceIsPaired(line, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_EveryProxyResolves(line, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_UniqueID(line, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_EveryKeyUnique(line, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_EveryMapEntryUnique(line, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validateDefinition_idCannotBeEmpty(line, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validateGraphicalElement_referencedClippathHasId(line, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validateMarkedElement_referencedStartMarkerHasId(line, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validateMarkedElement_referencedMidMarkerHasId(line, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validateMarkedElement_referencedEndMarkerHasId(line, diagnostics, context);
 		return result;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public boolean validateMarkedElement(MarkedElement markedElement,
-			DiagnosticChain diagnostics, Map<Object, Object> context) {
-		if (!validate_NoCircularContainment(markedElement, diagnostics, context)) return false;
+	public boolean validateMarkedElement(MarkedElement markedElement, DiagnosticChain diagnostics, Map<Object, Object> context) {
+		if(!validate_NoCircularContainment(markedElement, diagnostics, context))
+			return false;
 		boolean result = validate_EveryMultiplicityConforms(markedElement, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryDataValueConforms(markedElement, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryReferenceIsContained(markedElement, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryBidirectionalReferenceIsPaired(markedElement, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryProxyResolves(markedElement, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_UniqueID(markedElement, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryKeyUnique(markedElement, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryMapEntryUnique(markedElement, diagnostics, context);
-		if (result || diagnostics != null) result &= validateDefinition_idCannotBeEmpty(markedElement, diagnostics, context);
-		if (result || diagnostics != null) result &= validateGraphicalElement_referencedClippathHasId(markedElement, diagnostics, context);
-		if (result || diagnostics != null) result &= validateMarkedElement_referencedStartMarkerHasId(markedElement, diagnostics, context);
-		if (result || diagnostics != null) result &= validateMarkedElement_referencedMidMarkerHasId(markedElement, diagnostics, context);
-		if (result || diagnostics != null) result &= validateMarkedElement_referencedEndMarkerHasId(markedElement, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_EveryDataValueConforms(markedElement, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_EveryReferenceIsContained(markedElement, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_EveryBidirectionalReferenceIsPaired(markedElement, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_EveryProxyResolves(markedElement, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_UniqueID(markedElement, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_EveryKeyUnique(markedElement, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_EveryMapEntryUnique(markedElement, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validateDefinition_idCannotBeEmpty(markedElement, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validateGraphicalElement_referencedClippathHasId(markedElement, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validateMarkedElement_referencedStartMarkerHasId(markedElement, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validateMarkedElement_referencedMidMarkerHasId(markedElement, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validateMarkedElement_referencedEndMarkerHasId(markedElement, diagnostics, context);
 		return result;
 	}
 
 	/**
 	 * Validates the referencedStartMarkerHasId constraint of '<em>Marked Element</em>'.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public boolean validateMarkedElement_referencedStartMarkerHasId(
-			MarkedElement markedElement, DiagnosticChain diagnostics,
-			Map<Object, Object> context) {
+	public boolean validateMarkedElement_referencedStartMarkerHasId(MarkedElement markedElement, DiagnosticChain diagnostics, Map<Object, Object> context) {
 		return markedElement.referencedStartMarkerHasId(diagnostics, context);
 	}
 
 	/**
 	 * Validates the referencedMidMarkerHasId constraint of '<em>Marked Element</em>'.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public boolean validateMarkedElement_referencedMidMarkerHasId(
-			MarkedElement markedElement, DiagnosticChain diagnostics,
-			Map<Object, Object> context) {
+	public boolean validateMarkedElement_referencedMidMarkerHasId(MarkedElement markedElement, DiagnosticChain diagnostics, Map<Object, Object> context) {
 		return markedElement.referencedMidMarkerHasId(diagnostics, context);
 	}
 
 	/**
 	 * Validates the referencedEndMarkerHasId constraint of '<em>Marked Element</em>'.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public boolean validateMarkedElement_referencedEndMarkerHasId(
-			MarkedElement markedElement, DiagnosticChain diagnostics,
-			Map<Object, Object> context) {
+	public boolean validateMarkedElement_referencedEndMarkerHasId(MarkedElement markedElement, DiagnosticChain diagnostics, Map<Object, Object> context) {
 		return markedElement.referencedEndMarkerHasId(diagnostics, context);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public boolean validateLinearGradient(LinearGradient linearGradient,
-			DiagnosticChain diagnostics, Map<Object, Object> context) {
-		if (!validate_NoCircularContainment(linearGradient, diagnostics, context)) return false;
+	public boolean validateLinearGradient(LinearGradient linearGradient, DiagnosticChain diagnostics, Map<Object, Object> context) {
+		if(!validate_NoCircularContainment(linearGradient, diagnostics, context))
+			return false;
 		boolean result = validate_EveryMultiplicityConforms(linearGradient, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryDataValueConforms(linearGradient, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryReferenceIsContained(linearGradient, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryBidirectionalReferenceIsPaired(linearGradient, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryProxyResolves(linearGradient, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_UniqueID(linearGradient, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryKeyUnique(linearGradient, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryMapEntryUnique(linearGradient, diagnostics, context);
-		if (result || diagnostics != null) result &= validateDefinition_idCannotBeEmpty(linearGradient, diagnostics, context);
-		if (result || diagnostics != null) result &= validateLinearGradient_validGradientVector(linearGradient, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_EveryDataValueConforms(linearGradient, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_EveryReferenceIsContained(linearGradient, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_EveryBidirectionalReferenceIsPaired(linearGradient, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_EveryProxyResolves(linearGradient, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_UniqueID(linearGradient, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_EveryKeyUnique(linearGradient, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_EveryMapEntryUnique(linearGradient, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validateDefinition_idCannotBeEmpty(linearGradient, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validateLinearGradient_validGradientVector(linearGradient, diagnostics, context);
 		return result;
 	}
 
 	/**
 	 * Validates the validGradientVector constraint of '<em>Linear Gradient</em>'.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public boolean validateLinearGradient_validGradientVector(
-			LinearGradient linearGradient, DiagnosticChain diagnostics,
-			Map<Object, Object> context) {
+	public boolean validateLinearGradient_validGradientVector(LinearGradient linearGradient, DiagnosticChain diagnostics, Map<Object, Object> context) {
 		return linearGradient.validGradientVector(diagnostics, context);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public boolean validateLineTo(LineTo lineTo, DiagnosticChain diagnostics,
-			Map<Object, Object> context) {
+	public boolean validateLineTo(LineTo lineTo, DiagnosticChain diagnostics, Map<Object, Object> context) {
 		return validate_EveryDefaultConstraint(lineTo, diagnostics, context);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public boolean validateMatrix(Matrix matrix, DiagnosticChain diagnostics,
-			Map<Object, Object> context) {
+	public boolean validateMatrix(Matrix matrix, DiagnosticChain diagnostics, Map<Object, Object> context) {
 		return validate_EveryDefaultConstraint(matrix, diagnostics, context);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public boolean validateMoveTo(MoveTo moveTo, DiagnosticChain diagnostics,
-			Map<Object, Object> context) {
+	public boolean validateMoveTo(MoveTo moveTo, DiagnosticChain diagnostics, Map<Object, Object> context) {
 		return validate_EveryDefaultConstraint(moveTo, diagnostics, context);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public boolean validatePath(Path path, DiagnosticChain diagnostics,
-			Map<Object, Object> context) {
-		if (!validate_NoCircularContainment(path, diagnostics, context)) return false;
+	public boolean validatePath(Path path, DiagnosticChain diagnostics, Map<Object, Object> context) {
+		if(!validate_NoCircularContainment(path, diagnostics, context))
+			return false;
 		boolean result = validate_EveryMultiplicityConforms(path, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryDataValueConforms(path, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryReferenceIsContained(path, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryBidirectionalReferenceIsPaired(path, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryProxyResolves(path, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_UniqueID(path, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryKeyUnique(path, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryMapEntryUnique(path, diagnostics, context);
-		if (result || diagnostics != null) result &= validateDefinition_idCannotBeEmpty(path, diagnostics, context);
-		if (result || diagnostics != null) result &= validateGraphicalElement_referencedClippathHasId(path, diagnostics, context);
-		if (result || diagnostics != null) result &= validateMarkedElement_referencedStartMarkerHasId(path, diagnostics, context);
-		if (result || diagnostics != null) result &= validateMarkedElement_referencedMidMarkerHasId(path, diagnostics, context);
-		if (result || diagnostics != null) result &= validateMarkedElement_referencedEndMarkerHasId(path, diagnostics, context);
-		if (result || diagnostics != null) result &= validatePath_firstCommandMustBeMove(path, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_EveryDataValueConforms(path, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_EveryReferenceIsContained(path, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_EveryBidirectionalReferenceIsPaired(path, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_EveryProxyResolves(path, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_UniqueID(path, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_EveryKeyUnique(path, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_EveryMapEntryUnique(path, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validateDefinition_idCannotBeEmpty(path, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validateGraphicalElement_referencedClippathHasId(path, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validateMarkedElement_referencedStartMarkerHasId(path, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validateMarkedElement_referencedMidMarkerHasId(path, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validateMarkedElement_referencedEndMarkerHasId(path, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validatePath_firstCommandMustBeMove(path, diagnostics, context);
 		return result;
 	}
 
@@ -1095,117 +1292,161 @@ public class DGValidator extends EObjectValidator {
 	 * 
 	 * @generated
 	 */
-	public boolean validatePath_firstCommandMustBeMove(Path path,
-			DiagnosticChain diagnostics, Map<Object, Object> context) {
+	public boolean validatePath_firstCommandMustBeMove(Path path, DiagnosticChain diagnostics, Map<Object, Object> context) {
 		return path.firstCommandMustBeMove(diagnostics, context);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public boolean validatePattern(Pattern pattern,
-			DiagnosticChain diagnostics, Map<Object, Object> context) {
-		if (!validate_NoCircularContainment(pattern, diagnostics, context)) return false;
+	public boolean validatePattern(Pattern pattern, DiagnosticChain diagnostics, Map<Object, Object> context) {
+		if(!validate_NoCircularContainment(pattern, diagnostics, context))
+			return false;
 		boolean result = validate_EveryMultiplicityConforms(pattern, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryDataValueConforms(pattern, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryReferenceIsContained(pattern, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryBidirectionalReferenceIsPaired(pattern, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryProxyResolves(pattern, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_UniqueID(pattern, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryKeyUnique(pattern, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryMapEntryUnique(pattern, diagnostics, context);
-		if (result || diagnostics != null) result &= validateDefinition_idCannotBeEmpty(pattern, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_EveryDataValueConforms(pattern, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_EveryReferenceIsContained(pattern, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_EveryBidirectionalReferenceIsPaired(pattern, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_EveryProxyResolves(pattern, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_UniqueID(pattern, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_EveryKeyUnique(pattern, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_EveryMapEntryUnique(pattern, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validateDefinition_idCannotBeEmpty(pattern, diagnostics, context);
 		return result;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public boolean validatePolygon(Polygon polygon,
-			DiagnosticChain diagnostics, Map<Object, Object> context) {
-		if (!validate_NoCircularContainment(polygon, diagnostics, context)) return false;
+	public boolean validatePolygon(Polygon polygon, DiagnosticChain diagnostics, Map<Object, Object> context) {
+		if(!validate_NoCircularContainment(polygon, diagnostics, context))
+			return false;
 		boolean result = validate_EveryMultiplicityConforms(polygon, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryDataValueConforms(polygon, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryReferenceIsContained(polygon, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryBidirectionalReferenceIsPaired(polygon, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryProxyResolves(polygon, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_UniqueID(polygon, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryKeyUnique(polygon, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryMapEntryUnique(polygon, diagnostics, context);
-		if (result || diagnostics != null) result &= validateDefinition_idCannotBeEmpty(polygon, diagnostics, context);
-		if (result || diagnostics != null) result &= validateGraphicalElement_referencedClippathHasId(polygon, diagnostics, context);
-		if (result || diagnostics != null) result &= validateMarkedElement_referencedStartMarkerHasId(polygon, diagnostics, context);
-		if (result || diagnostics != null) result &= validateMarkedElement_referencedMidMarkerHasId(polygon, diagnostics, context);
-		if (result || diagnostics != null) result &= validateMarkedElement_referencedEndMarkerHasId(polygon, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_EveryDataValueConforms(polygon, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_EveryReferenceIsContained(polygon, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_EveryBidirectionalReferenceIsPaired(polygon, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_EveryProxyResolves(polygon, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_UniqueID(polygon, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_EveryKeyUnique(polygon, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_EveryMapEntryUnique(polygon, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validateDefinition_idCannotBeEmpty(polygon, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validateGraphicalElement_referencedClippathHasId(polygon, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validateMarkedElement_referencedStartMarkerHasId(polygon, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validateMarkedElement_referencedMidMarkerHasId(polygon, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validateMarkedElement_referencedEndMarkerHasId(polygon, diagnostics, context);
 		return result;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public boolean validatePolyline(Polyline polyline,
-			DiagnosticChain diagnostics, Map<Object, Object> context) {
-		if (!validate_NoCircularContainment(polyline, diagnostics, context)) return false;
+	public boolean validatePolyline(Polyline polyline, DiagnosticChain diagnostics, Map<Object, Object> context) {
+		if(!validate_NoCircularContainment(polyline, diagnostics, context))
+			return false;
 		boolean result = validate_EveryMultiplicityConforms(polyline, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryDataValueConforms(polyline, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryReferenceIsContained(polyline, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryBidirectionalReferenceIsPaired(polyline, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryProxyResolves(polyline, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_UniqueID(polyline, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryKeyUnique(polyline, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryMapEntryUnique(polyline, diagnostics, context);
-		if (result || diagnostics != null) result &= validateDefinition_idCannotBeEmpty(polyline, diagnostics, context);
-		if (result || diagnostics != null) result &= validateGraphicalElement_referencedClippathHasId(polyline, diagnostics, context);
-		if (result || diagnostics != null) result &= validateMarkedElement_referencedStartMarkerHasId(polyline, diagnostics, context);
-		if (result || diagnostics != null) result &= validateMarkedElement_referencedMidMarkerHasId(polyline, diagnostics, context);
-		if (result || diagnostics != null) result &= validateMarkedElement_referencedEndMarkerHasId(polyline, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_EveryDataValueConforms(polyline, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_EveryReferenceIsContained(polyline, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_EveryBidirectionalReferenceIsPaired(polyline, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_EveryProxyResolves(polyline, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_UniqueID(polyline, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_EveryKeyUnique(polyline, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_EveryMapEntryUnique(polyline, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validateDefinition_idCannotBeEmpty(polyline, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validateGraphicalElement_referencedClippathHasId(polyline, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validateMarkedElement_referencedStartMarkerHasId(polyline, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validateMarkedElement_referencedMidMarkerHasId(polyline, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validateMarkedElement_referencedEndMarkerHasId(polyline, diagnostics, context);
 		return result;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public boolean validateRadialGradient(RadialGradient radialGradient,
-			DiagnosticChain diagnostics, Map<Object, Object> context) {
-		if (!validate_NoCircularContainment(radialGradient, diagnostics, context)) return false;
+	public boolean validateRadialGradient(RadialGradient radialGradient, DiagnosticChain diagnostics, Map<Object, Object> context) {
+		if(!validate_NoCircularContainment(radialGradient, diagnostics, context))
+			return false;
 		boolean result = validate_EveryMultiplicityConforms(radialGradient, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryDataValueConforms(radialGradient, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryReferenceIsContained(radialGradient, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryBidirectionalReferenceIsPaired(radialGradient, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryProxyResolves(radialGradient, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_UniqueID(radialGradient, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryKeyUnique(radialGradient, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryMapEntryUnique(radialGradient, diagnostics, context);
-		if (result || diagnostics != null) result &= validateDefinition_idCannotBeEmpty(radialGradient, diagnostics, context);
-		if (result || diagnostics != null) result &= validateRadialGradient_validCenterPoint(radialGradient, diagnostics, context);
-		if (result || diagnostics != null) result &= validateRadialGradient_validFocusPoint(radialGradient, diagnostics, context);
-		if (result || diagnostics != null) result &= validateRadialGradient_validRadius(radialGradient, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_EveryDataValueConforms(radialGradient, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_EveryReferenceIsContained(radialGradient, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_EveryBidirectionalReferenceIsPaired(radialGradient, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_EveryProxyResolves(radialGradient, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_UniqueID(radialGradient, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_EveryKeyUnique(radialGradient, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_EveryMapEntryUnique(radialGradient, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validateDefinition_idCannotBeEmpty(radialGradient, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validateRadialGradient_validCenterPoint(radialGradient, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validateRadialGradient_validFocusPoint(radialGradient, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validateRadialGradient_validRadius(radialGradient, diagnostics, context);
 		return result;
 	}
 
 	/**
 	 * Validates the validCenterPoint constraint of '<em>Radial Gradient</em>'.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public boolean validateRadialGradient_validCenterPoint(
-			RadialGradient radialGradient, DiagnosticChain diagnostics,
-			Map<Object, Object> context) {
+	public boolean validateRadialGradient_validCenterPoint(RadialGradient radialGradient, DiagnosticChain diagnostics, Map<Object, Object> context) {
 		return radialGradient.validCenterPoint(diagnostics, context);
 	}
 
 	/**
 	 * Validates the validFocusPoint constraint of '<em>Radial Gradient</em>'.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public boolean validateRadialGradient_validFocusPoint(
-			RadialGradient radialGradient, DiagnosticChain diagnostics,
-			Map<Object, Object> context) {
+	public boolean validateRadialGradient_validFocusPoint(RadialGradient radialGradient, DiagnosticChain diagnostics, Map<Object, Object> context) {
 		return radialGradient.validFocusPoint(diagnostics, context);
 	}
 
@@ -1215,90 +1456,118 @@ public class DGValidator extends EObjectValidator {
 	 * 
 	 * @generated
 	 */
-	public boolean validateRadialGradient_validRadius(
-			RadialGradient radialGradient, DiagnosticChain diagnostics,
-			Map<Object, Object> context) {
+	public boolean validateRadialGradient_validRadius(RadialGradient radialGradient, DiagnosticChain diagnostics, Map<Object, Object> context) {
 		return radialGradient.validRadius(diagnostics, context);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public boolean validateRectangle(Rectangle rectangle,
-			DiagnosticChain diagnostics, Map<Object, Object> context) {
-		if (!validate_NoCircularContainment(rectangle, diagnostics, context)) return false;
+	public boolean validateRectangle(Rectangle rectangle, DiagnosticChain diagnostics, Map<Object, Object> context) {
+		if(!validate_NoCircularContainment(rectangle, diagnostics, context))
+			return false;
 		boolean result = validate_EveryMultiplicityConforms(rectangle, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryDataValueConforms(rectangle, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryReferenceIsContained(rectangle, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryBidirectionalReferenceIsPaired(rectangle, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryProxyResolves(rectangle, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_UniqueID(rectangle, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryKeyUnique(rectangle, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryMapEntryUnique(rectangle, diagnostics, context);
-		if (result || diagnostics != null) result &= validateDefinition_idCannotBeEmpty(rectangle, diagnostics, context);
-		if (result || diagnostics != null) result &= validateGraphicalElement_referencedClippathHasId(rectangle, diagnostics, context);
-		if (result || diagnostics != null) result &= validateRectangle_nonNegativeCornerRadius(rectangle, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_EveryDataValueConforms(rectangle, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_EveryReferenceIsContained(rectangle, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_EveryBidirectionalReferenceIsPaired(rectangle, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_EveryProxyResolves(rectangle, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_UniqueID(rectangle, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_EveryKeyUnique(rectangle, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_EveryMapEntryUnique(rectangle, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validateDefinition_idCannotBeEmpty(rectangle, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validateGraphicalElement_referencedClippathHasId(rectangle, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validateRectangle_nonNegativeCornerRadius(rectangle, diagnostics, context);
 		return result;
 	}
 
 	/**
 	 * Validates the nonNegativeCornerRadius constraint of '<em>Rectangle</em>'.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public boolean validateRectangle_nonNegativeCornerRadius(
-			Rectangle rectangle, DiagnosticChain diagnostics,
-			Map<Object, Object> context) {
+	public boolean validateRectangle_nonNegativeCornerRadius(Rectangle rectangle, DiagnosticChain diagnostics, Map<Object, Object> context) {
 		return rectangle.nonNegativeCornerRadius(diagnostics, context);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public boolean validateRootCanvas(RootCanvas rootCanvas,
-			DiagnosticChain diagnostics, Map<Object, Object> context) {
-		if (!validate_NoCircularContainment(rootCanvas, diagnostics, context)) return false;
+	public boolean validateRootCanvas(RootCanvas rootCanvas, DiagnosticChain diagnostics, Map<Object, Object> context) {
+		if(!validate_NoCircularContainment(rootCanvas, diagnostics, context))
+			return false;
 		boolean result = validate_EveryMultiplicityConforms(rootCanvas, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryDataValueConforms(rootCanvas, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryReferenceIsContained(rootCanvas, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryBidirectionalReferenceIsPaired(rootCanvas, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryProxyResolves(rootCanvas, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_UniqueID(rootCanvas, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryKeyUnique(rootCanvas, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryMapEntryUnique(rootCanvas, diagnostics, context);
-		if (result || diagnostics != null) result &= validateDefinition_idCannotBeEmpty(rootCanvas, diagnostics, context);
-		if (result || diagnostics != null) result &= validateGraphicalElement_referencedClippathHasId(rootCanvas, diagnostics, context);
-		if (result || diagnostics != null) result &= validateCanvas_canvasCannotHaveTransforms(rootCanvas, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_EveryDataValueConforms(rootCanvas, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_EveryReferenceIsContained(rootCanvas, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_EveryBidirectionalReferenceIsPaired(rootCanvas, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_EveryProxyResolves(rootCanvas, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_UniqueID(rootCanvas, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_EveryKeyUnique(rootCanvas, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_EveryMapEntryUnique(rootCanvas, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validateDefinition_idCannotBeEmpty(rootCanvas, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validateGraphicalElement_referencedClippathHasId(rootCanvas, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validateCanvas_canvasCannotHaveTransforms(rootCanvas, diagnostics, context);
 		return result;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public boolean validateRotate(Rotate rotate, DiagnosticChain diagnostics,
-			Map<Object, Object> context) {
+	public boolean validateRotate(Rotate rotate, DiagnosticChain diagnostics, Map<Object, Object> context) {
 		return validate_EveryDefaultConstraint(rotate, diagnostics, context);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public boolean validateScale(Scale scale, DiagnosticChain diagnostics,
-			Map<Object, Object> context) {
-		if (!validate_NoCircularContainment(scale, diagnostics, context)) return false;
+	public boolean validateScale(Scale scale, DiagnosticChain diagnostics, Map<Object, Object> context) {
+		if(!validate_NoCircularContainment(scale, diagnostics, context))
+			return false;
 		boolean result = validate_EveryMultiplicityConforms(scale, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryDataValueConforms(scale, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryReferenceIsContained(scale, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryBidirectionalReferenceIsPaired(scale, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryProxyResolves(scale, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_UniqueID(scale, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryKeyUnique(scale, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryMapEntryUnique(scale, diagnostics, context);
-		if (result || diagnostics != null) result &= validateScale_nonnegativescale(scale, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_EveryDataValueConforms(scale, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_EveryReferenceIsContained(scale, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_EveryBidirectionalReferenceIsPaired(scale, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_EveryProxyResolves(scale, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_UniqueID(scale, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_EveryKeyUnique(scale, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_EveryMapEntryUnique(scale, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validateScale_nonnegativescale(scale, diagnostics, context);
 		return result;
 	}
 
@@ -1308,38 +1577,48 @@ public class DGValidator extends EObjectValidator {
 	 * 
 	 * @generated
 	 */
-	public boolean validateScale_nonnegativescale(Scale scale,
-			DiagnosticChain diagnostics, Map<Object, Object> context) {
+	public boolean validateScale_nonnegativescale(Scale scale, DiagnosticChain diagnostics, Map<Object, Object> context) {
 		return scale.nonnegativescale(diagnostics, context);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public boolean validateSkew(Skew skew, DiagnosticChain diagnostics,
-			Map<Object, Object> context) {
+	public boolean validateSkew(Skew skew, DiagnosticChain diagnostics, Map<Object, Object> context) {
 		return validate_EveryDefaultConstraint(skew, diagnostics, context);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public boolean validateText(Text text, DiagnosticChain diagnostics,
-			Map<Object, Object> context) {
-		if (!validate_NoCircularContainment(text, diagnostics, context)) return false;
+	public boolean validateText(Text text, DiagnosticChain diagnostics, Map<Object, Object> context) {
+		if(!validate_NoCircularContainment(text, diagnostics, context))
+			return false;
 		boolean result = validate_EveryMultiplicityConforms(text, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryDataValueConforms(text, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryReferenceIsContained(text, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryBidirectionalReferenceIsPaired(text, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryProxyResolves(text, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_UniqueID(text, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryKeyUnique(text, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryMapEntryUnique(text, diagnostics, context);
-		if (result || diagnostics != null) result &= validateDefinition_idCannotBeEmpty(text, diagnostics, context);
-		if (result || diagnostics != null) result &= validateGraphicalElement_referencedClippathHasId(text, diagnostics, context);
-		if (result || diagnostics != null) result &= validateText_dataCannotBeEmpty(text, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_EveryDataValueConforms(text, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_EveryReferenceIsContained(text, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_EveryBidirectionalReferenceIsPaired(text, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_EveryProxyResolves(text, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_UniqueID(text, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_EveryKeyUnique(text, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_EveryMapEntryUnique(text, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validateDefinition_idCannotBeEmpty(text, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validateGraphicalElement_referencedClippathHasId(text, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validateText_dataCannotBeEmpty(text, diagnostics, context);
 		return result;
 	}
 
@@ -1349,38 +1628,48 @@ public class DGValidator extends EObjectValidator {
 	 * 
 	 * @generated
 	 */
-	public boolean validateText_dataCannotBeEmpty(Text text,
-			DiagnosticChain diagnostics, Map<Object, Object> context) {
+	public boolean validateText_dataCannotBeEmpty(Text text, DiagnosticChain diagnostics, Map<Object, Object> context) {
 		return text.dataCannotBeEmpty(diagnostics, context);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public boolean validateTranslate(Translate translate,
-			DiagnosticChain diagnostics, Map<Object, Object> context) {
+	public boolean validateTranslate(Translate translate, DiagnosticChain diagnostics, Map<Object, Object> context) {
 		return validate_EveryDefaultConstraint(translate, diagnostics, context);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public boolean validateUse(Use use, DiagnosticChain diagnostics,
-			Map<Object, Object> context) {
-		if (!validate_NoCircularContainment(use, diagnostics, context)) return false;
+	public boolean validateUse(Use use, DiagnosticChain diagnostics, Map<Object, Object> context) {
+		if(!validate_NoCircularContainment(use, diagnostics, context))
+			return false;
 		boolean result = validate_EveryMultiplicityConforms(use, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryDataValueConforms(use, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryReferenceIsContained(use, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryBidirectionalReferenceIsPaired(use, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryProxyResolves(use, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_UniqueID(use, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryKeyUnique(use, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryMapEntryUnique(use, diagnostics, context);
-		if (result || diagnostics != null) result &= validateDefinition_idCannotBeEmpty(use, diagnostics, context);
-		if (result || diagnostics != null) result &= validateGraphicalElement_referencedClippathHasId(use, diagnostics, context);
-		if (result || diagnostics != null) result &= validateUse_referencedElementHasId(use, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_EveryDataValueConforms(use, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_EveryReferenceIsContained(use, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_EveryBidirectionalReferenceIsPaired(use, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_EveryProxyResolves(use, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_UniqueID(use, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_EveryKeyUnique(use, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_EveryMapEntryUnique(use, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validateDefinition_idCannotBeEmpty(use, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validateGraphicalElement_referencedClippathHasId(use, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validateUse_referencedElementHasId(use, diagnostics, context);
 		return result;
 	}
 
@@ -1390,32 +1679,32 @@ public class DGValidator extends EObjectValidator {
 	 * 
 	 * @generated
 	 */
-	public boolean validateUse_referencedElementHasId(Use use,
-			DiagnosticChain diagnostics, Map<Object, Object> context) {
+	public boolean validateUse_referencedElementHasId(Use use, DiagnosticChain diagnostics, Map<Object, Object> context) {
 		return use.referencedElementHasId(diagnostics, context);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public boolean validateFontDecoration(FontDecoration fontDecoration,
-			DiagnosticChain diagnostics, Map<Object, Object> context) {
+	public boolean validateFontDecoration(FontDecoration fontDecoration, DiagnosticChain diagnostics, Map<Object, Object> context) {
 		return true;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public boolean validateElementKind(ElementKind elementKind,
-			DiagnosticChain diagnostics, Map<Object, Object> context) {
+	public boolean validateElementKind(ElementKind elementKind, DiagnosticChain diagnostics, Map<Object, Object> context) {
 		return true;
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean validateTextAnchor(TextAnchor textAnchor, DiagnosticChain diagnostics, Map<Object, Object> context) {
@@ -1425,6 +1714,7 @@ public class DGValidator extends EObjectValidator {
 	/**
 	 * Returns the resource locator that will be used to fetch messages for this validator's diagnostics.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -1434,5 +1724,4 @@ public class DGValidator extends EObjectValidator {
 		// Ensure that you remove @generated or mark it @generated NOT
 		return super.getResourceLocator();
 	}
-
 } // DGValidator
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/DIFactory.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/DIFactory.java
index 9cfa5003a92..2c53807f018 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/DIFactory.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/DIFactory.java
@@ -16,6 +16,7 @@ import org.eclipse.emf.ecore.EFactory;
 /**
  * <!-- begin-user-doc --> The <b>Factory</b> for the model. It provides a
  * create method for each non-abstract class of the model. <!-- end-user-doc -->
+ * 
  * @see org.eclipse.papyrus.dd.di.DIPackage
  * @generated
  */
@@ -25,6 +26,7 @@ public interface DIFactory extends EFactory {
 	 * The singleton instance of the factory.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	DIFactory eINSTANCE = org.eclipse.papyrus.dd.di.impl.DIFactoryImpl.init();
@@ -33,9 +35,9 @@ public interface DIFactory extends EFactory {
 	 * Returns the package supported by this factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the package supported by this factory.
 	 * @generated
 	 */
 	DIPackage getDIPackage();
-
 } // DIFactory
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/DIPackage.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/DIPackage.java
index 898647d85e8..4813018f014 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/DIPackage.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/DIPackage.java
@@ -41,6 +41,7 @@ public interface DIPackage extends EPackage {
 	/**
 	 * The package name.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	String eNAME = "di";
@@ -48,6 +49,7 @@ public interface DIPackage extends EPackage {
 	/**
 	 * The package namespace URI.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	String eNS_URI = "http://www.omg.org/spec/DD/20110901/DI";
@@ -55,6 +57,7 @@ public interface DIPackage extends EPackage {
 	/**
 	 * The package namespace name.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	String eNS_PREFIX = "di";
@@ -63,6 +66,7 @@ public interface DIPackage extends EPackage {
 	 * The singleton instance of the package.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	DIPackage eINSTANCE = org.eclipse.papyrus.dd.di.impl.DIPackageImpl.init();
@@ -71,6 +75,7 @@ public interface DIPackage extends EPackage {
 	 * The meta object id for the '{@link org.eclipse.papyrus.dd.di.impl.DiagramElementImpl <em>Diagram Element</em>}' class.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @see org.eclipse.papyrus.dd.di.impl.DiagramElementImpl
 	 * @see org.eclipse.papyrus.dd.di.impl.DIPackageImpl#getDiagramElement()
 	 * @generated
@@ -90,6 +95,7 @@ public interface DIPackage extends EPackage {
 	 * The feature id for the '<em><b>Owning Diagram Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -99,6 +105,7 @@ public interface DIPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Diagram Element</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -107,6 +114,7 @@ public interface DIPackage extends EPackage {
 	/**
 	 * The feature id for the '<em><b>Local Style</b></em>' reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -125,6 +133,7 @@ public interface DIPackage extends EPackage {
 	 * The feature id for the '<em><b>Target Edge</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -134,6 +143,7 @@ public interface DIPackage extends EPackage {
 	 * The feature id for the '<em><b>Source Edge</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -142,6 +152,7 @@ public interface DIPackage extends EPackage {
 	/**
 	 * The number of structural features of the '<em>Diagram Element</em>' class.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -159,6 +170,7 @@ public interface DIPackage extends EPackage {
 	/**
 	 * The meta object id for the '{@link org.eclipse.papyrus.dd.di.impl.StyleImpl <em>Style</em>}' class.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.papyrus.dd.di.impl.StyleImpl
 	 * @see org.eclipse.papyrus.dd.di.impl.DIPackageImpl#getStyle()
 	 * @generated
@@ -186,6 +198,7 @@ public interface DIPackage extends EPackage {
 	/**
 	 * The meta object id for the '{@link org.eclipse.papyrus.dd.di.impl.EdgeImpl <em>Edge</em>}' class.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.papyrus.dd.di.impl.EdgeImpl
 	 * @see org.eclipse.papyrus.dd.di.impl.DIPackageImpl#getEdge()
 	 * @generated
@@ -205,6 +218,7 @@ public interface DIPackage extends EPackage {
 	 * The feature id for the '<em><b>Owning Diagram Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -214,6 +228,7 @@ public interface DIPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Diagram Element</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -222,6 +237,7 @@ public interface DIPackage extends EPackage {
 	/**
 	 * The feature id for the '<em><b>Local Style</b></em>' reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -240,6 +256,7 @@ public interface DIPackage extends EPackage {
 	 * The feature id for the '<em><b>Target Edge</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -249,6 +266,7 @@ public interface DIPackage extends EPackage {
 	 * The feature id for the '<em><b>Source Edge</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -258,6 +276,7 @@ public interface DIPackage extends EPackage {
 	 * The feature id for the '<em><b>Source Diagram Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -266,6 +285,7 @@ public interface DIPackage extends EPackage {
 	/**
 	 * The feature id for the '<em><b>Waypoint</b></em>' containment reference list.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -275,6 +295,7 @@ public interface DIPackage extends EPackage {
 	 * The feature id for the '<em><b>Target Diagram Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -301,6 +322,7 @@ public interface DIPackage extends EPackage {
 	/**
 	 * The meta object id for the '{@link org.eclipse.papyrus.dd.di.impl.ShapeImpl <em>Shape</em>}' class.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.papyrus.dd.di.impl.ShapeImpl
 	 * @see org.eclipse.papyrus.dd.di.impl.DIPackageImpl#getShape()
 	 * @generated
@@ -320,6 +342,7 @@ public interface DIPackage extends EPackage {
 	 * The feature id for the '<em><b>Owning Diagram Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -329,6 +352,7 @@ public interface DIPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Diagram Element</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -337,6 +361,7 @@ public interface DIPackage extends EPackage {
 	/**
 	 * The feature id for the '<em><b>Local Style</b></em>' reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -355,6 +380,7 @@ public interface DIPackage extends EPackage {
 	 * The feature id for the '<em><b>Target Edge</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -364,6 +390,7 @@ public interface DIPackage extends EPackage {
 	 * The feature id for the '<em><b>Source Edge</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -372,6 +399,7 @@ public interface DIPackage extends EPackage {
 	/**
 	 * The feature id for the '<em><b>Bounds</b></em>' containment reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -398,6 +426,7 @@ public interface DIPackage extends EPackage {
 	/**
 	 * The meta object id for the '{@link org.eclipse.papyrus.dd.di.impl.DiagramImpl <em>Diagram</em>}' class.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.papyrus.dd.di.impl.DiagramImpl
 	 * @see org.eclipse.papyrus.dd.di.impl.DIPackageImpl#getDiagram()
 	 * @generated
@@ -417,6 +446,7 @@ public interface DIPackage extends EPackage {
 	 * The feature id for the '<em><b>Owning Diagram Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -426,6 +456,7 @@ public interface DIPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Diagram Element</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -434,6 +465,7 @@ public interface DIPackage extends EPackage {
 	/**
 	 * The feature id for the '<em><b>Local Style</b></em>' reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -452,6 +484,7 @@ public interface DIPackage extends EPackage {
 	 * The feature id for the '<em><b>Target Edge</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -461,6 +494,7 @@ public interface DIPackage extends EPackage {
 	 * The feature id for the '<em><b>Source Edge</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -469,6 +503,7 @@ public interface DIPackage extends EPackage {
 	/**
 	 * The feature id for the '<em><b>Bounds</b></em>' containment reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -522,6 +557,7 @@ public interface DIPackage extends EPackage {
 	/**
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.dd.di.DiagramElement <em>Diagram Element</em>}'.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Diagram Element</em>'.
 	 * @see org.eclipse.papyrus.dd.di.DiagramElement
 	 * @generated
@@ -531,6 +567,7 @@ public interface DIPackage extends EPackage {
 	/**
 	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.dd.di.DiagramElement#getModelElement <em>Model Element</em>}'.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference list '<em>Model Element</em>'.
 	 * @see org.eclipse.papyrus.dd.di.DiagramElement#getModelElement()
 	 * @see #getDiagramElement()
@@ -539,9 +576,11 @@ public interface DIPackage extends EPackage {
 	EReference getDiagramElement_ModelElement();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.dd.di.DiagramElement#getOwningDiagramElement <em>Owning Diagram Element</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.dd.di.DiagramElement#getOwningDiagramElement
+	 * <em>Owning Diagram Element</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Owning Diagram Element</em>'.
 	 * @see org.eclipse.papyrus.dd.di.DiagramElement#getOwningDiagramElement()
 	 * @see #getDiagramElement()
@@ -550,9 +589,11 @@ public interface DIPackage extends EPackage {
 	EReference getDiagramElement_OwningDiagramElement();
 
 	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.dd.di.DiagramElement#getOwnedDiagramElement <em>Owned Diagram Element</em>}'.
+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.dd.di.DiagramElement#getOwnedDiagramElement
+	 * <em>Owned Diagram Element</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference list '<em>Owned Diagram Element</em>'.
 	 * @see org.eclipse.papyrus.dd.di.DiagramElement#getOwnedDiagramElement()
 	 * @see #getDiagramElement()
@@ -563,6 +604,7 @@ public interface DIPackage extends EPackage {
 	/**
 	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.dd.di.DiagramElement#getLocalStyle <em>Local Style</em>}'.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Local Style</em>'.
 	 * @see org.eclipse.papyrus.dd.di.DiagramElement#getLocalStyle()
 	 * @see #getDiagramElement()
@@ -573,6 +615,7 @@ public interface DIPackage extends EPackage {
 	/**
 	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.dd.di.DiagramElement#getSharedStyle <em>Shared Style</em>}'.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Shared Style</em>'.
 	 * @see org.eclipse.papyrus.dd.di.DiagramElement#getSharedStyle()
 	 * @see #getDiagramElement()
@@ -584,6 +627,7 @@ public interface DIPackage extends EPackage {
 	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.dd.di.DiagramElement#getTargetEdge <em>Target Edge</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference list '<em>Target Edge</em>'.
 	 * @see org.eclipse.papyrus.dd.di.DiagramElement#getTargetEdge()
 	 * @see #getDiagramElement()
@@ -595,6 +639,7 @@ public interface DIPackage extends EPackage {
 	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.dd.di.DiagramElement#getSourceEdge <em>Source Edge</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference list '<em>Source Edge</em>'.
 	 * @see org.eclipse.papyrus.dd.di.DiagramElement#getSourceEdge()
 	 * @see #getDiagramElement()
@@ -603,8 +648,7 @@ public interface DIPackage extends EPackage {
 	EReference getDiagramElement_SourceEdge();
 
 	/**
-	 * Returns the meta object for class '
-	 * {@link org.eclipse.papyrus.dd.di.Style <em>Style</em>}'. <!--
+	 * Returns the meta object for class ' {@link org.eclipse.papyrus.dd.di.Style <em>Style</em>}'. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @return the meta object for class '<em>Style</em>'.
@@ -616,6 +660,7 @@ public interface DIPackage extends EPackage {
 	/**
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.dd.di.Edge <em>Edge</em>}'.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Edge</em>'.
 	 * @see org.eclipse.papyrus.dd.di.Edge
 	 * @generated
@@ -626,6 +671,7 @@ public interface DIPackage extends EPackage {
 	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.dd.di.Edge#getSourceDiagramElement <em>Source Diagram Element</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Source Diagram Element</em>'.
 	 * @see org.eclipse.papyrus.dd.di.Edge#getSourceDiagramElement()
 	 * @see #getEdge()
@@ -636,6 +682,7 @@ public interface DIPackage extends EPackage {
 	/**
 	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.dd.di.Edge#getWaypoint <em>Waypoint</em>}'.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Waypoint</em>'.
 	 * @see org.eclipse.papyrus.dd.di.Edge#getWaypoint()
 	 * @see #getEdge()
@@ -647,6 +694,7 @@ public interface DIPackage extends EPackage {
 	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.dd.di.Edge#getTargetDiagramElement <em>Target Diagram Element</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Target Diagram Element</em>'.
 	 * @see org.eclipse.papyrus.dd.di.Edge#getTargetDiagramElement()
 	 * @see #getEdge()
@@ -655,8 +703,7 @@ public interface DIPackage extends EPackage {
 	EReference getEdge_TargetDiagramElement();
 
 	/**
-	 * Returns the meta object for class '
-	 * {@link org.eclipse.papyrus.dd.di.Diagram <em>Diagram</em>}'. <!--
+	 * Returns the meta object for class ' {@link org.eclipse.papyrus.dd.di.Diagram <em>Diagram</em>}'. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @return the meta object for class '<em>Diagram</em>'.
@@ -666,8 +713,7 @@ public interface DIPackage extends EPackage {
 	EClass getDiagram();
 
 	/**
-	 * Returns the meta object for the attribute '
-	 * {@link org.eclipse.papyrus.dd.di.Diagram#getName <em>Name</em>}'. <!--
+	 * Returns the meta object for the attribute ' {@link org.eclipse.papyrus.dd.di.Diagram#getName <em>Name</em>}'. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @return the meta object for the attribute '<em>Name</em>'.
@@ -680,6 +726,7 @@ public interface DIPackage extends EPackage {
 	/**
 	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.dd.di.Diagram#getDocumentation <em>Documentation</em>}'.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Documentation</em>'.
 	 * @see org.eclipse.papyrus.dd.di.Diagram#getDocumentation()
 	 * @see #getDiagram()
@@ -690,6 +737,7 @@ public interface DIPackage extends EPackage {
 	/**
 	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.dd.di.Diagram#getResolution <em>Resolution</em>}'.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Resolution</em>'.
 	 * @see org.eclipse.papyrus.dd.di.Diagram#getResolution()
 	 * @see #getDiagram()
@@ -698,8 +746,7 @@ public interface DIPackage extends EPackage {
 	EAttribute getDiagram_Resolution();
 
 	/**
-	 * Returns the meta object for class '
-	 * {@link org.eclipse.papyrus.dd.di.Shape <em>Shape</em>}'. <!--
+	 * Returns the meta object for class ' {@link org.eclipse.papyrus.dd.di.Shape <em>Shape</em>}'. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @return the meta object for class '<em>Shape</em>'.
@@ -709,8 +756,7 @@ public interface DIPackage extends EPackage {
 	EClass getShape();
 
 	/**
-	 * Returns the meta object for the containment reference '
-	 * {@link org.eclipse.papyrus.dd.di.Shape#getBounds <em>Bounds</em>}'. <!--
+	 * Returns the meta object for the containment reference ' {@link org.eclipse.papyrus.dd.di.Shape#getBounds <em>Bounds</em>}'. <!--
 	 * begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @return the meta object for the containment reference '<em>Bounds</em>'.
@@ -740,6 +786,7 @@ public interface DIPackage extends EPackage {
 	 * <li>and each data type</li>
 	 * </ul>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	interface Literals {
@@ -748,6 +795,7 @@ public interface DIPackage extends EPackage {
 		 * The meta object literal for the '{@link org.eclipse.papyrus.dd.di.impl.DiagramElementImpl <em>Diagram Element</em>}' class.
 		 * <!-- begin-user-doc --> <!--
 		 * end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.dd.di.impl.DiagramElementImpl
 		 * @see org.eclipse.papyrus.dd.di.impl.DIPackageImpl#getDiagramElement()
 		 * @generated
@@ -757,6 +805,7 @@ public interface DIPackage extends EPackage {
 		/**
 		 * The meta object literal for the '<em><b>Model Element</b></em>' reference list feature.
 		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference DIAGRAM_ELEMENT__MODEL_ELEMENT = eINSTANCE.getDiagramElement_ModelElement();
@@ -765,6 +814,7 @@ public interface DIPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Owning Diagram Element</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference DIAGRAM_ELEMENT__OWNING_DIAGRAM_ELEMENT = eINSTANCE.getDiagramElement_OwningDiagramElement();
@@ -773,6 +823,7 @@ public interface DIPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Owned Diagram Element</b></em>' reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference DIAGRAM_ELEMENT__OWNED_DIAGRAM_ELEMENT = eINSTANCE.getDiagramElement_OwnedDiagramElement();
@@ -781,6 +832,7 @@ public interface DIPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Local Style</b></em>' reference feature.
 		 * <!-- begin-user-doc --> <!--
 		 * end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference DIAGRAM_ELEMENT__LOCAL_STYLE = eINSTANCE.getDiagramElement_LocalStyle();
@@ -788,6 +840,7 @@ public interface DIPackage extends EPackage {
 		/**
 		 * The meta object literal for the '<em><b>Shared Style</b></em>' reference feature.
 		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference DIAGRAM_ELEMENT__SHARED_STYLE = eINSTANCE.getDiagramElement_SharedStyle();
@@ -796,6 +849,7 @@ public interface DIPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Target Edge</b></em>' reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference DIAGRAM_ELEMENT__TARGET_EDGE = eINSTANCE.getDiagramElement_TargetEdge();
@@ -804,6 +858,7 @@ public interface DIPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Source Edge</b></em>' reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference DIAGRAM_ELEMENT__SOURCE_EDGE = eINSTANCE.getDiagramElement_SourceEdge();
@@ -811,6 +866,7 @@ public interface DIPackage extends EPackage {
 		/**
 		 * The meta object literal for the '{@link org.eclipse.papyrus.dd.di.impl.StyleImpl <em>Style</em>}' class.
 		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.dd.di.impl.StyleImpl
 		 * @see org.eclipse.papyrus.dd.di.impl.DIPackageImpl#getStyle()
 		 * @generated
@@ -820,6 +876,7 @@ public interface DIPackage extends EPackage {
 		/**
 		 * The meta object literal for the '{@link org.eclipse.papyrus.dd.di.impl.EdgeImpl <em>Edge</em>}' class.
 		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.dd.di.impl.EdgeImpl
 		 * @see org.eclipse.papyrus.dd.di.impl.DIPackageImpl#getEdge()
 		 * @generated
@@ -830,6 +887,7 @@ public interface DIPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Source Diagram Element</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference EDGE__SOURCE_DIAGRAM_ELEMENT = eINSTANCE.getEdge_SourceDiagramElement();
@@ -838,6 +896,7 @@ public interface DIPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Waypoint</b></em>' containment reference list feature.
 		 * <!-- begin-user-doc --> <!--
 		 * end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference EDGE__WAYPOINT = eINSTANCE.getEdge_Waypoint();
@@ -846,6 +905,7 @@ public interface DIPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Target Diagram Element</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference EDGE__TARGET_DIAGRAM_ELEMENT = eINSTANCE.getEdge_TargetDiagramElement();
@@ -853,6 +913,7 @@ public interface DIPackage extends EPackage {
 		/**
 		 * The meta object literal for the '{@link org.eclipse.papyrus.dd.di.impl.DiagramImpl <em>Diagram</em>}' class.
 		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.dd.di.impl.DiagramImpl
 		 * @see org.eclipse.papyrus.dd.di.impl.DIPackageImpl#getDiagram()
 		 * @generated
@@ -862,6 +923,7 @@ public interface DIPackage extends EPackage {
 		/**
 		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
 		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute DIAGRAM__NAME = eINSTANCE.getDiagram_Name();
@@ -869,6 +931,7 @@ public interface DIPackage extends EPackage {
 		/**
 		 * The meta object literal for the '<em><b>Documentation</b></em>' attribute feature.
 		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute DIAGRAM__DOCUMENTATION = eINSTANCE.getDiagram_Documentation();
@@ -876,6 +939,7 @@ public interface DIPackage extends EPackage {
 		/**
 		 * The meta object literal for the '<em><b>Resolution</b></em>' attribute feature.
 		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute DIAGRAM__RESOLUTION = eINSTANCE.getDiagram_Resolution();
@@ -883,6 +947,7 @@ public interface DIPackage extends EPackage {
 		/**
 		 * The meta object literal for the '{@link org.eclipse.papyrus.dd.di.impl.ShapeImpl <em>Shape</em>}' class.
 		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.dd.di.impl.ShapeImpl
 		 * @see org.eclipse.papyrus.dd.di.impl.DIPackageImpl#getShape()
 		 * @generated
@@ -892,10 +957,9 @@ public interface DIPackage extends EPackage {
 		/**
 		 * The meta object literal for the '<em><b>Bounds</b></em>' containment reference feature.
 		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference SHAPE__BOUNDS = eINSTANCE.getShape_Bounds();
-
 	}
-
 } // DIPackage
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/Diagram.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/Diagram.java
index 753a5b5f421..797a2cd29c2 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/Diagram.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/Diagram.java
@@ -12,22 +12,22 @@
 package org.eclipse.papyrus.dd.di;
 
 /**
- * <!-- begin-user-doc --> A representation of the model object '
- * <em><b>Diagram</b></em>'. <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object ' <em><b>Diagram</b></em>'. <!-- end-user-doc -->
+ * 
  * <!-- begin-model-doc -->
- * Diagram is an abstract container of a graph of diagram elements. Diagrams are diagram elements with an origin point in the x-y coordinate system. Their elements are laid out relative to their origin point.
+ * Diagram is an abstract container of a graph of diagram elements. Diagrams are diagram elements with an origin point in the x-y coordinate system.
+ * Their elements are laid out relative to their origin point.
  * <!-- end-model-doc -->
- *
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.dd.di.Diagram#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.papyrus.dd.di.Diagram#getDocumentation <em>Documentation</em>}</li>
- *   <li>{@link org.eclipse.papyrus.dd.di.Diagram#getResolution <em>Resolution</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.di.Diagram#getName <em>Name</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.di.Diagram#getDocumentation <em>Documentation</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.di.Diagram#getResolution <em>Resolution</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.dd.di.DIPackage#getDiagram()
  * @model abstract="true"
  * @generated
@@ -41,6 +41,7 @@ public interface Diagram extends Shape {
 	 * <!-- begin-model-doc -->
 	 * the name of the diagram.
 	 * <!-- end-model-doc -->
+	 * 
 	 * @return the value of the '<em>Name</em>' attribute.
 	 * @see #setName(String)
 	 * @see org.eclipse.papyrus.dd.di.DIPackage#getDiagram_Name()
@@ -52,7 +53,9 @@ public interface Diagram extends Shape {
 	/**
 	 * Sets the value of the '{@link org.eclipse.papyrus.dd.di.Diagram#getName <em>Name</em>}' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Name</em>' attribute.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Name</em>' attribute.
 	 * @see #getName()
 	 * @generated
 	 */
@@ -77,7 +80,9 @@ public interface Diagram extends Shape {
 	 * Sets the value of the '{@link org.eclipse.papyrus.dd.di.Diagram#getDocumentation <em>Documentation</em>}' attribute.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * @param value the new value of the '<em>Documentation</em>' attribute.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Documentation</em>' attribute.
 	 * @see #getDocumentation()
 	 * @generated
 	 */
@@ -102,10 +107,11 @@ public interface Diagram extends Shape {
 	 * Sets the value of the '{@link org.eclipse.papyrus.dd.di.Diagram#getResolution <em>Resolution</em>}' attribute.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * @param value the new value of the '<em>Resolution</em>' attribute.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Resolution</em>' attribute.
 	 * @see #getResolution()
 	 * @generated
 	 */
 	void setResolution(double value);
-
 } // Diagram
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/DiagramElement.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/DiagramElement.java
index 86b80e696ff..7a0b050af72 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/DiagramElement.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/DiagramElement.java
@@ -16,26 +16,26 @@ import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EObject;
 
 /**
- * <!-- begin-user-doc --> A representation of the model object '
- * <em><b>Diagram Element</b></em>'. <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object ' <em><b>Diagram Element</b></em>'. <!-- end-user-doc -->
+ * 
  * <!-- begin-model-doc -->
- * DiagramElement is the abstract super type of all elements in diagrams, including diagrams themselves. When contained in a diagram, diagram elements are laid out relative to the diagram?s origin.
+ * DiagramElement is the abstract super type of all elements in diagrams, including diagrams themselves. When contained in a diagram, diagram elements
+ * are laid out relative to the diagram?s origin.
  * <!-- end-model-doc -->
- *
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.dd.di.DiagramElement#getModelElement <em>Model Element</em>}</li>
- *   <li>{@link org.eclipse.papyrus.dd.di.DiagramElement#getOwningDiagramElement <em>Owning Diagram Element</em>}</li>
- *   <li>{@link org.eclipse.papyrus.dd.di.DiagramElement#getOwnedDiagramElement <em>Owned Diagram Element</em>}</li>
- *   <li>{@link org.eclipse.papyrus.dd.di.DiagramElement#getLocalStyle <em>Local Style</em>}</li>
- *   <li>{@link org.eclipse.papyrus.dd.di.DiagramElement#getSharedStyle <em>Shared Style</em>}</li>
- *   <li>{@link org.eclipse.papyrus.dd.di.DiagramElement#getTargetEdge <em>Target Edge</em>}</li>
- *   <li>{@link org.eclipse.papyrus.dd.di.DiagramElement#getSourceEdge <em>Source Edge</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.di.DiagramElement#getModelElement <em>Model Element</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.di.DiagramElement#getOwningDiagramElement <em>Owning Diagram Element</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.di.DiagramElement#getOwnedDiagramElement <em>Owned Diagram Element</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.di.DiagramElement#getLocalStyle <em>Local Style</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.di.DiagramElement#getSharedStyle <em>Shared Style</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.di.DiagramElement#getTargetEdge <em>Target Edge</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.di.DiagramElement#getSourceEdge <em>Source Edge</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.dd.di.DIPackage#getDiagramElement()
  * @model abstract="true"
  * @generated
@@ -50,6 +50,7 @@ public interface DiagramElement extends EObject {
 	 * <!-- begin-model-doc -->
 	 * a reference to a depicted model element, which can be any MOF-based element
 	 * <!-- end-model-doc -->
+	 * 
 	 * @return the value of the '<em>Model Element</em>' reference list.
 	 * @see org.eclipse.papyrus.dd.di.DIPackage#getDiagramElement_ModelElement()
 	 * @model transient="true" changeable="false" volatile="true" derived="true"
@@ -59,13 +60,15 @@ public interface DiagramElement extends EObject {
 
 	/**
 	 * Returns the value of the '<em><b>Owning Diagram Element</b></em>' reference.
-	 * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.dd.di.DiagramElement#getOwnedDiagramElement <em>Owned Diagram Element</em>}'.
+	 * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.dd.di.DiagramElement#getOwnedDiagramElement <em>Owned Diagram Element</em>}
+	 * '.
 	 * This feature is a derived union.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * <!-- begin-model-doc -->
 	 * a reference to the diagram element that directly owns this diagram element.
 	 * <!-- end-model-doc -->
+	 * 
 	 * @return the value of the '<em>Owning Diagram Element</em>' reference.
 	 * @see org.eclipse.papyrus.dd.di.DIPackage#getDiagramElement_OwningDiagramElement()
 	 * @see org.eclipse.papyrus.dd.di.DiagramElement#getOwnedDiagramElement
@@ -77,13 +80,15 @@ public interface DiagramElement extends EObject {
 	/**
 	 * Returns the value of the '<em><b>Owned Diagram Element</b></em>' reference list.
 	 * The list contents are of type {@link org.eclipse.papyrus.dd.di.DiagramElement}.
-	 * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.dd.di.DiagramElement#getOwningDiagramElement <em>Owning Diagram Element</em>}'.
+	 * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.dd.di.DiagramElement#getOwningDiagramElement
+	 * <em>Owning Diagram Element</em>}'.
 	 * This feature is a derived union.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * <!-- begin-model-doc -->
 	 * a collection of diagram elements that are directly owned by this diagram element.
 	 * <!-- end-model-doc -->
+	 * 
 	 * @return the value of the '<em>Owned Diagram Element</em>' reference list.
 	 * @see org.eclipse.papyrus.dd.di.DIPackage#getDiagramElement_OwnedDiagramElement()
 	 * @see org.eclipse.papyrus.dd.di.DiagramElement#getOwningDiagramElement
@@ -130,6 +135,7 @@ public interface DiagramElement extends EObject {
 	 * <!-- begin-model-doc -->
 	 * a collection of edges that reference this diagram element as a target.
 	 * <!-- end-model-doc -->
+	 * 
 	 * @return the value of the '<em>Target Edge</em>' reference list.
 	 * @see org.eclipse.papyrus.dd.di.DIPackage#getDiagramElement_TargetEdge()
 	 * @see org.eclipse.papyrus.dd.di.Edge#getTargetDiagramElement
@@ -148,6 +154,7 @@ public interface DiagramElement extends EObject {
 	 * <!-- begin-model-doc -->
 	 * a collection of edges that reference this diagram element as a source.
 	 * <!-- end-model-doc -->
+	 * 
 	 * @return the value of the '<em>Source Edge</em>' reference list.
 	 * @see org.eclipse.papyrus.dd.di.DIPackage#getDiagramElement_SourceEdge()
 	 * @see org.eclipse.papyrus.dd.di.Edge#getSourceDiagramElement
@@ -155,5 +162,4 @@ public interface DiagramElement extends EObject {
 	 * @generated
 	 */
 	EList<Edge> getSourceEdge();
-
 } // DiagramElement
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/Edge.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/Edge.java
index 81e284afb7e..e7051914b17 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/Edge.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/Edge.java
@@ -16,22 +16,22 @@ import org.eclipse.emf.common.util.EList;
 import org.eclipse.papyrus.dd.dc.Point;
 
 /**
- * <!-- begin-user-doc --> A representation of the model object '
- * <em><b>Edge</b></em>'. <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object ' <em><b>Edge</b></em>'. <!-- end-user-doc -->
+ * 
  * <!-- begin-model-doc -->
- * Edge is a diagram element that renders as a polyline, connecting a source diagram element to a target diagram element, and is positioned relative to the origin of the diagram.
+ * Edge is a diagram element that renders as a polyline, connecting a source diagram element to a target diagram element, and is positioned relative
+ * to the origin of the diagram.
  * <!-- end-model-doc -->
- *
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.dd.di.Edge#getSourceDiagramElement <em>Source Diagram Element</em>}</li>
- *   <li>{@link org.eclipse.papyrus.dd.di.Edge#getWaypoint <em>Waypoint</em>}</li>
- *   <li>{@link org.eclipse.papyrus.dd.di.Edge#getTargetDiagramElement <em>Target Diagram Element</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.di.Edge#getSourceDiagramElement <em>Source Diagram Element</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.di.Edge#getWaypoint <em>Waypoint</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.di.Edge#getTargetDiagramElement <em>Target Diagram Element</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.dd.di.DIPackage#getEdge()
  * @model abstract="true"
  * @generated
@@ -47,6 +47,7 @@ public interface Edge extends DiagramElement {
 	 * <!-- begin-model-doc -->
 	 * the edge's source diagram element, i.e. where the edge starts from.
 	 * <!-- end-model-doc -->
+	 * 
 	 * @return the value of the '<em>Source Diagram Element</em>' reference.
 	 * @see org.eclipse.papyrus.dd.di.DIPackage#getEdge_SourceDiagramElement()
 	 * @see org.eclipse.papyrus.dd.di.DiagramElement#getSourceEdge
@@ -57,8 +58,7 @@ public interface Edge extends DiagramElement {
 
 	/**
 	 * Returns the value of the '<em><b>Waypoint</b></em>' containment reference
-	 * list. The list contents are of type
-	 * {@link org.eclipse.papyrus.dd.dc.Point}. <!-- begin-user-doc --> <!--
+	 * list. The list contents are of type {@link org.eclipse.papyrus.dd.dc.Point}. <!-- begin-user-doc --> <!--
 	 * end-user-doc --> <!-- begin-model-doc --> an optional list of points
 	 * relative to the origin of the nesting diagram that specifies the
 	 * connected line segments of the edge <!-- end-model-doc -->
@@ -79,6 +79,7 @@ public interface Edge extends DiagramElement {
 	 * <!-- begin-model-doc -->
 	 * the edge's target diagram element, i.e. where the edge ends at.
 	 * <!-- end-model-doc -->
+	 * 
 	 * @return the value of the '<em>Target Diagram Element</em>' reference.
 	 * @see org.eclipse.papyrus.dd.di.DIPackage#getEdge_TargetDiagramElement()
 	 * @see org.eclipse.papyrus.dd.di.DiagramElement#getTargetEdge
@@ -86,5 +87,4 @@ public interface Edge extends DiagramElement {
 	 * @generated
 	 */
 	DiagramElement getTargetDiagramElement();
-
 } // Edge
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/Shape.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/Shape.java
index a5d90b9746a..f653995ab8a 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/Shape.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/Shape.java
@@ -14,20 +14,19 @@ package org.eclipse.papyrus.dd.di;
 import org.eclipse.papyrus.dd.dc.Bounds;
 
 /**
- * <!-- begin-user-doc --> A representation of the model object '
- * <em><b>Shape</b></em>'. <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object ' <em><b>Shape</b></em>'. <!-- end-user-doc -->
+ * 
  * <!-- begin-model-doc -->
  * Shape is a diagram element with given bounds that is laid out relative to the origin of the diagram
  * <!-- end-model-doc -->
- *
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.dd.di.Shape#getBounds <em>Bounds</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.di.Shape#getBounds <em>Bounds</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.dd.di.DIPackage#getShape()
  * @model abstract="true"
  * @generated
@@ -52,10 +51,11 @@ public interface Shape extends DiagramElement {
 	 * Sets the value of the '{@link org.eclipse.papyrus.dd.di.Shape#getBounds <em>Bounds</em>}' containment reference.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
-	 * @param value the new value of the '<em>Bounds</em>' containment reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Bounds</em>' containment reference.
 	 * @see #getBounds()
 	 * @generated
 	 */
 	void setBounds(Bounds value);
-
 } // Shape
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/Style.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/Style.java
index efc722356e6..0ea4238ddbf 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/Style.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/Style.java
@@ -14,14 +14,13 @@ package org.eclipse.papyrus.dd.di;
 import org.eclipse.emf.ecore.EObject;
 
 /**
- * <!-- begin-user-doc --> A representation of the model object '
- * <em><b>Style</b></em>'. <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc --> A representation of the model object ' <em><b>Style</b></em>'. <!-- end-user-doc -->
+ * 
  * <!-- begin-model-doc -->
  * Style contains formatting properties that affect the appearance or style of diagram elements, including diagram themselves.
  * <!-- end-model-doc -->
- *
- *
+ * 
+ * 
  * @see org.eclipse.papyrus.dd.di.DIPackage#getStyle()
  * @model abstract="true"
  * @generated
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/impl/DIFactoryImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/impl/DIFactoryImpl.java
index 0f630896c72..854683f0b5f 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/impl/DIFactoryImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/impl/DIFactoryImpl.java
@@ -24,6 +24,7 @@ import org.eclipse.papyrus.dd.di.*;
 /**
  * <!-- begin-user-doc --> An implementation of the model <b>Factory</b>. <!--
  * end-user-doc -->
+ * 
  * @generated
  */
 public class DIFactoryImpl extends EFactoryImpl implements DIFactory {
@@ -32,16 +33,16 @@ public class DIFactoryImpl extends EFactoryImpl implements DIFactory {
 	 * Creates the default factory implementation.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static DIFactory init() {
 		try {
 			DIFactory theDIFactory = (DIFactory)EPackage.Registry.INSTANCE.getEFactory(DIPackage.eNS_URI);
-			if (theDIFactory != null) {
+			if(theDIFactory != null) {
 				return theDIFactory;
 			}
-		}
-		catch (Exception exception) {
+		} catch (Exception exception) {
 			EcorePlugin.INSTANCE.log(exception);
 		}
 		return new DIFactoryImpl();
@@ -51,6 +52,7 @@ public class DIFactoryImpl extends EFactoryImpl implements DIFactory {
 	 * Creates an instance of the factory.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public DIFactoryImpl() {
@@ -59,18 +61,20 @@ public class DIFactoryImpl extends EFactoryImpl implements DIFactory {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public EObject create(EClass eClass) {
-		switch (eClass.getClassifierID()) {
-			default:
-				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
+		switch(eClass.getClassifierID()) {
+		default:
+			throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
 		}
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public DIPackage getDIPackage() {
@@ -79,6 +83,7 @@ public class DIFactoryImpl extends EFactoryImpl implements DIFactory {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @deprecated
 	 * @generated
 	 */
@@ -86,5 +91,4 @@ public class DIFactoryImpl extends EFactoryImpl implements DIFactory {
 	public static DIPackage getPackage() {
 		return DIPackage.eINSTANCE;
 	}
-
 } // DIFactoryImpl
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/impl/DIPackageImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/impl/DIPackageImpl.java
index 2d4258b812b..3e5c8add8a7 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/impl/DIPackageImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/impl/DIPackageImpl.java
@@ -32,49 +32,52 @@ import org.eclipse.papyrus.dd.di.Style;
 /**
  * <!-- begin-user-doc --> An implementation of the model <b>Package</b>. <!--
  * end-user-doc -->
+ * 
  * @generated
  */
 public class DIPackageImpl extends EPackageImpl implements DIPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass diagramElementEClass = null;
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass styleEClass = null;
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass edgeEClass = null;
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass diagramEClass = null;
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass shapeEClass = null;
 
 	/**
-	 * Creates an instance of the model <b>Package</b>, registered with
-	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the
+	 * Creates an instance of the model <b>Package</b>, registered with {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the
 	 * package package URI value.
 	 * <p>
-	 * Note: the correct way to create the package is via the static factory
-	 * method {@link #init init()}, which also performs initialization of the
-	 * package, or returns the registered package, if one already exists. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
+	 * Note: the correct way to create the package is via the static factory method {@link #init init()}, which also performs initialization of the
+	 * package, or returns the registered package, if one already exists. <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @see org.eclipse.emf.ecore.EPackage.Registry
 	 * @see org.eclipse.papyrus.dd.di.DIPackage#eNS_URI
@@ -87,6 +90,7 @@ public class DIPackageImpl extends EPackageImpl implements DIPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private static boolean isInited = false;
@@ -96,10 +100,8 @@ public class DIPackageImpl extends EPackageImpl implements DIPackage {
 	 * and for any others upon which it depends.
 	 * 
 	 * <p>
-	 * This method is used to initialize {@link DIPackage#eINSTANCE} when that
-	 * field is accessed. Clients should not invoke it directly. Instead, they
-	 * should simply access that field to obtain the package. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
+	 * This method is used to initialize {@link DIPackage#eINSTANCE} when that field is accessed. Clients should not invoke it directly. Instead, they
+	 * should simply access that field to obtain the package. <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @see #eNS_URI
 	 * @see #createPackageContents()
@@ -107,27 +109,20 @@ public class DIPackageImpl extends EPackageImpl implements DIPackage {
 	 * @generated
 	 */
 	public static DIPackage init() {
-		if (isInited) return (DIPackage)EPackage.Registry.INSTANCE.getEPackage(DIPackage.eNS_URI);
-
+		if(isInited)
+			return (DIPackage)EPackage.Registry.INSTANCE.getEPackage(DIPackage.eNS_URI);
 		// Obtain or create and register package
 		DIPackageImpl theDIPackage = (DIPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof DIPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new DIPackageImpl());
-
 		isInited = true;
-
 		// Initialize simple dependencies
 		DCPackage.eINSTANCE.eClass();
 		EcorePackage.eINSTANCE.eClass();
-
 		// Create package meta-data objects
 		theDIPackage.createPackageContents();
-
 		// Initialize created meta-data
 		theDIPackage.initializePackageContents();
-
 		// Mark meta-data to indicate it can't be changed
 		theDIPackage.freeze();
-
-  
 		// Update the registry and return the package
 		EPackage.Registry.INSTANCE.put(DIPackage.eNS_URI, theDIPackage);
 		return theDIPackage;
@@ -135,6 +130,7 @@ public class DIPackageImpl extends EPackageImpl implements DIPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getDiagramElement() {
@@ -143,6 +139,7 @@ public class DIPackageImpl extends EPackageImpl implements DIPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getDiagramElement_ModelElement() {
@@ -152,6 +149,7 @@ public class DIPackageImpl extends EPackageImpl implements DIPackage {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getDiagramElement_OwningDiagramElement() {
@@ -161,6 +159,7 @@ public class DIPackageImpl extends EPackageImpl implements DIPackage {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getDiagramElement_OwnedDiagramElement() {
@@ -169,6 +168,7 @@ public class DIPackageImpl extends EPackageImpl implements DIPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getDiagramElement_LocalStyle() {
@@ -177,6 +177,7 @@ public class DIPackageImpl extends EPackageImpl implements DIPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getDiagramElement_SharedStyle() {
@@ -186,6 +187,7 @@ public class DIPackageImpl extends EPackageImpl implements DIPackage {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getDiagramElement_TargetEdge() {
@@ -195,6 +197,7 @@ public class DIPackageImpl extends EPackageImpl implements DIPackage {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getDiagramElement_SourceEdge() {
@@ -203,6 +206,7 @@ public class DIPackageImpl extends EPackageImpl implements DIPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getStyle() {
@@ -211,6 +215,7 @@ public class DIPackageImpl extends EPackageImpl implements DIPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getEdge() {
@@ -220,6 +225,7 @@ public class DIPackageImpl extends EPackageImpl implements DIPackage {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getEdge_SourceDiagramElement() {
@@ -228,6 +234,7 @@ public class DIPackageImpl extends EPackageImpl implements DIPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getEdge_Waypoint() {
@@ -237,6 +244,7 @@ public class DIPackageImpl extends EPackageImpl implements DIPackage {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getEdge_TargetDiagramElement() {
@@ -245,6 +253,7 @@ public class DIPackageImpl extends EPackageImpl implements DIPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getDiagram() {
@@ -253,6 +262,7 @@ public class DIPackageImpl extends EPackageImpl implements DIPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getDiagram_Name() {
@@ -261,6 +271,7 @@ public class DIPackageImpl extends EPackageImpl implements DIPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getDiagram_Documentation() {
@@ -269,6 +280,7 @@ public class DIPackageImpl extends EPackageImpl implements DIPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getDiagram_Resolution() {
@@ -277,6 +289,7 @@ public class DIPackageImpl extends EPackageImpl implements DIPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getShape() {
@@ -285,6 +298,7 @@ public class DIPackageImpl extends EPackageImpl implements DIPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getShape_Bounds() {
@@ -293,6 +307,7 @@ public class DIPackageImpl extends EPackageImpl implements DIPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public DIFactory getDIFactory() {
@@ -301,21 +316,23 @@ public class DIPackageImpl extends EPackageImpl implements DIPackage {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private boolean isCreated = false;
 
 	/**
-	 * Creates the meta-model objects for the package.  This method is
+	 * Creates the meta-model objects for the package. This method is
 	 * guarded to have no affect on any invocation but its first.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void createPackageContents() {
-		if (isCreated) return;
+		if(isCreated)
+			return;
 		isCreated = true;
-
 		// Create classes and their features
 		diagramElementEClass = createEClass(DIAGRAM_ELEMENT);
 		createEReference(diagramElementEClass, DIAGRAM_ELEMENT__MODEL_ELEMENT);
@@ -325,25 +342,22 @@ public class DIPackageImpl extends EPackageImpl implements DIPackage {
 		createEReference(diagramElementEClass, DIAGRAM_ELEMENT__SHARED_STYLE);
 		createEReference(diagramElementEClass, DIAGRAM_ELEMENT__TARGET_EDGE);
 		createEReference(diagramElementEClass, DIAGRAM_ELEMENT__SOURCE_EDGE);
-
 		styleEClass = createEClass(STYLE);
-
 		edgeEClass = createEClass(EDGE);
 		createEReference(edgeEClass, EDGE__SOURCE_DIAGRAM_ELEMENT);
 		createEReference(edgeEClass, EDGE__WAYPOINT);
 		createEReference(edgeEClass, EDGE__TARGET_DIAGRAM_ELEMENT);
-
 		diagramEClass = createEClass(DIAGRAM);
 		createEAttribute(diagramEClass, DIAGRAM__NAME);
 		createEAttribute(diagramEClass, DIAGRAM__DOCUMENTATION);
 		createEAttribute(diagramEClass, DIAGRAM__RESOLUTION);
-
 		shapeEClass = createEClass(SHAPE);
 		createEReference(shapeEClass, SHAPE__BOUNDS);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private boolean isInitialized = false;
@@ -356,27 +370,22 @@ public class DIPackageImpl extends EPackageImpl implements DIPackage {
 	 * @generated
 	 */
 	public void initializePackageContents() {
-		if (isInitialized) return;
+		if(isInitialized)
+			return;
 		isInitialized = true;
-
 		// Initialize package
 		setName(eNAME);
 		setNsPrefix(eNS_PREFIX);
 		setNsURI(eNS_URI);
-
 		// Obtain other dependent packages
 		EcorePackage theEcorePackage = (EcorePackage)EPackage.Registry.INSTANCE.getEPackage(EcorePackage.eNS_URI);
 		DCPackage theDCPackage = (DCPackage)EPackage.Registry.INSTANCE.getEPackage(DCPackage.eNS_URI);
-
 		// Create type parameters
-
 		// Set bounds for type parameters
-
 		// Add supertypes to classes
 		edgeEClass.getESuperTypes().add(this.getDiagramElement());
 		diagramEClass.getESuperTypes().add(this.getShape());
 		shapeEClass.getESuperTypes().add(this.getDiagramElement());
-
 		// Initialize classes, features, and operations; add parameters
 		initEClass(diagramElementEClass, DiagramElement.class, "DiagramElement", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEReference(getDiagramElement_ModelElement(), theEcorePackage.getEObject(), null, "modelElement", null, 0, -1, DiagramElement.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
@@ -386,25 +395,19 @@ public class DIPackageImpl extends EPackageImpl implements DIPackage {
 		initEReference(getDiagramElement_SharedStyle(), this.getStyle(), null, "sharedStyle", null, 0, 1, DiagramElement.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, !IS_ORDERED);
 		initEReference(getDiagramElement_TargetEdge(), this.getEdge(), this.getEdge_TargetDiagramElement(), "targetEdge", null, 0, -1, DiagramElement.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
 		initEReference(getDiagramElement_SourceEdge(), this.getEdge(), this.getEdge_SourceDiagramElement(), "sourceEdge", null, 0, -1, DiagramElement.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
-
 		initEClass(styleEClass, Style.class, "Style", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
 		initEClass(edgeEClass, Edge.class, "Edge", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEReference(getEdge_SourceDiagramElement(), this.getDiagramElement(), this.getDiagramElement_SourceEdge(), "sourceDiagramElement", null, 1, 1, Edge.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, !IS_ORDERED);
 		initEReference(getEdge_Waypoint(), theDCPackage.getPoint(), null, "waypoint", null, 0, -1, Edge.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEReference(getEdge_TargetDiagramElement(), this.getDiagramElement(), this.getDiagramElement_TargetEdge(), "targetDiagramElement", null, 1, 1, Edge.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, !IS_ORDERED);
-
 		initEClass(diagramEClass, Diagram.class, "Diagram", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEAttribute(getDiagram_Name(), theDCPackage.getString(), "name", "", 1, 1, Diagram.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
 		initEAttribute(getDiagram_Documentation(), theDCPackage.getString(), "documentation", "", 1, 1, Diagram.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
 		initEAttribute(getDiagram_Resolution(), theDCPackage.getReal(), "resolution", "300", 1, 1, Diagram.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-
 		initEClass(shapeEClass, Shape.class, "Shape", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEReference(getShape_Bounds(), theDCPackage.getBounds(), null, "bounds", null, 0, 1, Shape.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-
 		// Create resource
 		createResource(eNS_URI);
-
 		// Create annotations
 		// union
 		createUnionAnnotations();
@@ -414,55 +417,19 @@ public class DIPackageImpl extends EPackageImpl implements DIPackage {
 	 * Initializes the annotations for <b>union</b>.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void createUnionAnnotations() {
-		String source = "union";					
-		addAnnotation
-		  (getDiagramElement_ModelElement(), 
-		   source, 
-		   new String[] {
-		   });			
-		addAnnotation
-		  (getDiagramElement_OwningDiagramElement(), 
-		   source, 
-		   new String[] {
-		   });			
-		addAnnotation
-		  (getDiagramElement_OwnedDiagramElement(), 
-		   source, 
-		   new String[] {
-		   });			
-		addAnnotation
-		  (getDiagramElement_LocalStyle(), 
-		   source, 
-		   new String[] {
-		   });			
-		addAnnotation
-		  (getDiagramElement_SharedStyle(), 
-		   source, 
-		   new String[] {
-		   });			
-		addAnnotation
-		  (getDiagramElement_TargetEdge(), 
-		   source, 
-		   new String[] {
-		   });			
-		addAnnotation
-		  (getDiagramElement_SourceEdge(), 
-		   source, 
-		   new String[] {
-		   });					
-		addAnnotation
-		  (getEdge_SourceDiagramElement(), 
-		   source, 
-		   new String[] {
-		   });				
-		addAnnotation
-		  (getEdge_TargetDiagramElement(), 
-		   source, 
-		   new String[] {
-		   });						
+		String source = "union";
+		addAnnotation(getDiagramElement_ModelElement(), source, new String[]{});
+		addAnnotation(getDiagramElement_OwningDiagramElement(), source, new String[]{});
+		addAnnotation(getDiagramElement_OwnedDiagramElement(), source, new String[]{});
+		addAnnotation(getDiagramElement_LocalStyle(), source, new String[]{});
+		addAnnotation(getDiagramElement_SharedStyle(), source, new String[]{});
+		addAnnotation(getDiagramElement_TargetEdge(), source, new String[]{});
+		addAnnotation(getDiagramElement_SourceEdge(), source, new String[]{});
+		addAnnotation(getEdge_SourceDiagramElement(), source, new String[]{});
+		addAnnotation(getEdge_TargetDiagramElement(), source, new String[]{});
 	}
-
 } // DIPackageImpl
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/impl/DiagramElementImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/impl/DiagramElementImpl.java
index c5a0a799d57..0f4b97df362 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/impl/DiagramElementImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/impl/DiagramElementImpl.java
@@ -23,28 +23,27 @@ import org.eclipse.papyrus.dd.di.Style;
 import org.eclipse.uml2.common.util.DerivedUnionEObjectEList;
 
 /**
- * <!-- begin-user-doc --> An implementation of the model object '
- * <em><b>Diagram Element</b></em>'. <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object ' <em><b>Diagram Element</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.dd.di.impl.DiagramElementImpl#getModelElement <em>Model Element</em>}</li>
- *   <li>{@link org.eclipse.papyrus.dd.di.impl.DiagramElementImpl#getOwningDiagramElement <em>Owning Diagram Element</em>}</li>
- *   <li>{@link org.eclipse.papyrus.dd.di.impl.DiagramElementImpl#getOwnedDiagramElement <em>Owned Diagram Element</em>}</li>
- *   <li>{@link org.eclipse.papyrus.dd.di.impl.DiagramElementImpl#getLocalStyle <em>Local Style</em>}</li>
- *   <li>{@link org.eclipse.papyrus.dd.di.impl.DiagramElementImpl#getSharedStyle <em>Shared Style</em>}</li>
- *   <li>{@link org.eclipse.papyrus.dd.di.impl.DiagramElementImpl#getTargetEdge <em>Target Edge</em>}</li>
- *   <li>{@link org.eclipse.papyrus.dd.di.impl.DiagramElementImpl#getSourceEdge <em>Source Edge</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.di.impl.DiagramElementImpl#getModelElement <em>Model Element</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.di.impl.DiagramElementImpl#getOwningDiagramElement <em>Owning Diagram Element</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.di.impl.DiagramElementImpl#getOwnedDiagramElement <em>Owned Diagram Element</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.di.impl.DiagramElementImpl#getLocalStyle <em>Local Style</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.di.impl.DiagramElementImpl#getSharedStyle <em>Shared Style</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.di.impl.DiagramElementImpl#getTargetEdge <em>Target Edge</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.di.impl.DiagramElementImpl#getSourceEdge <em>Source Edge</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
-public abstract class DiagramElementImpl extends MinimalEObjectImpl.Container
-		implements DiagramElement {
+public abstract class DiagramElementImpl extends MinimalEObjectImpl.Container implements DiagramElement {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected DiagramElementImpl() {
@@ -53,6 +52,7 @@ public abstract class DiagramElementImpl extends MinimalEObjectImpl.Container
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -62,6 +62,7 @@ public abstract class DiagramElementImpl extends MinimalEObjectImpl.Container
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<EObject> getModelElement() {
@@ -71,6 +72,7 @@ public abstract class DiagramElementImpl extends MinimalEObjectImpl.Container
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public DiagramElement getOwningDiagramElement() {
@@ -81,6 +83,7 @@ public abstract class DiagramElementImpl extends MinimalEObjectImpl.Container
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public DiagramElement basicGetOwningDiagramElement() {
@@ -90,6 +93,7 @@ public abstract class DiagramElementImpl extends MinimalEObjectImpl.Container
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<DiagramElement> getOwnedDiagramElement() {
@@ -99,6 +103,7 @@ public abstract class DiagramElementImpl extends MinimalEObjectImpl.Container
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<Edge> getTargetEdge() {
@@ -108,6 +113,7 @@ public abstract class DiagramElementImpl extends MinimalEObjectImpl.Container
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<Edge> getSourceEdge() {
@@ -116,6 +122,7 @@ public abstract class DiagramElementImpl extends MinimalEObjectImpl.Container
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Style getLocalStyle() {
@@ -126,6 +133,7 @@ public abstract class DiagramElementImpl extends MinimalEObjectImpl.Container
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Style basicGetLocalStyle() {
@@ -134,6 +142,7 @@ public abstract class DiagramElementImpl extends MinimalEObjectImpl.Container
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Style getSharedStyle() {
@@ -143,6 +152,7 @@ public abstract class DiagramElementImpl extends MinimalEObjectImpl.Container
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Style basicGetSharedStyle() {
@@ -151,53 +161,58 @@ public abstract class DiagramElementImpl extends MinimalEObjectImpl.Container
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case DIPackage.DIAGRAM_ELEMENT__MODEL_ELEMENT:
-				return getModelElement();
-			case DIPackage.DIAGRAM_ELEMENT__OWNING_DIAGRAM_ELEMENT:
-				if (resolve) return getOwningDiagramElement();
-				return basicGetOwningDiagramElement();
-			case DIPackage.DIAGRAM_ELEMENT__OWNED_DIAGRAM_ELEMENT:
-				return getOwnedDiagramElement();
-			case DIPackage.DIAGRAM_ELEMENT__LOCAL_STYLE:
-				if (resolve) return getLocalStyle();
-				return basicGetLocalStyle();
-			case DIPackage.DIAGRAM_ELEMENT__SHARED_STYLE:
-				if (resolve) return getSharedStyle();
-				return basicGetSharedStyle();
-			case DIPackage.DIAGRAM_ELEMENT__TARGET_EDGE:
-				return getTargetEdge();
-			case DIPackage.DIAGRAM_ELEMENT__SOURCE_EDGE:
-				return getSourceEdge();
+		switch(featureID) {
+		case DIPackage.DIAGRAM_ELEMENT__MODEL_ELEMENT:
+			return getModelElement();
+		case DIPackage.DIAGRAM_ELEMENT__OWNING_DIAGRAM_ELEMENT:
+			if(resolve)
+				return getOwningDiagramElement();
+			return basicGetOwningDiagramElement();
+		case DIPackage.DIAGRAM_ELEMENT__OWNED_DIAGRAM_ELEMENT:
+			return getOwnedDiagramElement();
+		case DIPackage.DIAGRAM_ELEMENT__LOCAL_STYLE:
+			if(resolve)
+				return getLocalStyle();
+			return basicGetLocalStyle();
+		case DIPackage.DIAGRAM_ELEMENT__SHARED_STYLE:
+			if(resolve)
+				return getSharedStyle();
+			return basicGetSharedStyle();
+		case DIPackage.DIAGRAM_ELEMENT__TARGET_EDGE:
+			return getTargetEdge();
+		case DIPackage.DIAGRAM_ELEMENT__SOURCE_EDGE:
+			return getSourceEdge();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case DIPackage.DIAGRAM_ELEMENT__MODEL_ELEMENT:
-				return isSetModelElement();
-			case DIPackage.DIAGRAM_ELEMENT__OWNING_DIAGRAM_ELEMENT:
-				return isSetOwningDiagramElement();
-			case DIPackage.DIAGRAM_ELEMENT__OWNED_DIAGRAM_ELEMENT:
-				return isSetOwnedDiagramElement();
-			case DIPackage.DIAGRAM_ELEMENT__LOCAL_STYLE:
-				return isSetLocalStyle();
-			case DIPackage.DIAGRAM_ELEMENT__SHARED_STYLE:
-				return isSetSharedStyle();
-			case DIPackage.DIAGRAM_ELEMENT__TARGET_EDGE:
-				return isSetTargetEdge();
-			case DIPackage.DIAGRAM_ELEMENT__SOURCE_EDGE:
-				return isSetSourceEdge();
+		switch(featureID) {
+		case DIPackage.DIAGRAM_ELEMENT__MODEL_ELEMENT:
+			return isSetModelElement();
+		case DIPackage.DIAGRAM_ELEMENT__OWNING_DIAGRAM_ELEMENT:
+			return isSetOwningDiagramElement();
+		case DIPackage.DIAGRAM_ELEMENT__OWNED_DIAGRAM_ELEMENT:
+			return isSetOwnedDiagramElement();
+		case DIPackage.DIAGRAM_ELEMENT__LOCAL_STYLE:
+			return isSetLocalStyle();
+		case DIPackage.DIAGRAM_ELEMENT__SHARED_STYLE:
+			return isSetSharedStyle();
+		case DIPackage.DIAGRAM_ELEMENT__TARGET_EDGE:
+			return isSetTargetEdge();
+		case DIPackage.DIAGRAM_ELEMENT__SOURCE_EDGE:
+			return isSetSourceEdge();
 		}
 		return super.eIsSet(featureID);
 	}
@@ -205,6 +220,7 @@ public abstract class DiagramElementImpl extends MinimalEObjectImpl.Container
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetModelElement() {
@@ -214,6 +230,7 @@ public abstract class DiagramElementImpl extends MinimalEObjectImpl.Container
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetOwningDiagramElement() {
@@ -223,6 +240,7 @@ public abstract class DiagramElementImpl extends MinimalEObjectImpl.Container
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetOwnedDiagramElement() {
@@ -232,6 +250,7 @@ public abstract class DiagramElementImpl extends MinimalEObjectImpl.Container
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetLocalStyle() {
@@ -241,6 +260,7 @@ public abstract class DiagramElementImpl extends MinimalEObjectImpl.Container
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetSharedStyle() {
@@ -250,6 +270,7 @@ public abstract class DiagramElementImpl extends MinimalEObjectImpl.Container
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetTargetEdge() {
@@ -259,10 +280,10 @@ public abstract class DiagramElementImpl extends MinimalEObjectImpl.Container
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetSourceEdge() {
 		return false;
 	}
-
 } // DiagramElementImpl
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/impl/DiagramImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/impl/DiagramImpl.java
index 9660868647f..99f5da439a6 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/impl/DiagramImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/impl/DiagramImpl.java
@@ -21,17 +21,16 @@ import org.eclipse.papyrus.dd.di.DIPackage;
 import org.eclipse.papyrus.dd.di.Diagram;
 
 /**
- * <!-- begin-user-doc --> An implementation of the model object '
- * <em><b>Diagram</b></em>'. <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object ' <em><b>Diagram</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.dd.di.impl.DiagramImpl#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.papyrus.dd.di.impl.DiagramImpl#getDocumentation <em>Documentation</em>}</li>
- *   <li>{@link org.eclipse.papyrus.dd.di.impl.DiagramImpl#getResolution <em>Resolution</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.di.impl.DiagramImpl#getName <em>Name</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.di.impl.DiagramImpl#getDocumentation <em>Documentation</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.di.impl.DiagramImpl#getResolution <em>Resolution</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public abstract class DiagramImpl extends ShapeImpl implements Diagram {
@@ -39,6 +38,7 @@ public abstract class DiagramImpl extends ShapeImpl implements Diagram {
 	/**
 	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getName()
 	 * @generated
 	 * @ordered
@@ -48,6 +48,7 @@ public abstract class DiagramImpl extends ShapeImpl implements Diagram {
 	/**
 	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getName()
 	 * @generated
 	 * @ordered
@@ -58,6 +59,7 @@ public abstract class DiagramImpl extends ShapeImpl implements Diagram {
 	 * The default value of the '{@link #getDocumentation() <em>Documentation</em>}' attribute.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @see #getDocumentation()
 	 * @generated
 	 * @ordered
@@ -68,6 +70,7 @@ public abstract class DiagramImpl extends ShapeImpl implements Diagram {
 	 * The cached value of the '{@link #getDocumentation() <em>Documentation</em>}' attribute.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @see #getDocumentation()
 	 * @generated
 	 * @ordered
@@ -77,6 +80,7 @@ public abstract class DiagramImpl extends ShapeImpl implements Diagram {
 	/**
 	 * The default value of the '{@link #getResolution() <em>Resolution</em>}' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getResolution()
 	 * @generated
 	 * @ordered
@@ -86,6 +90,7 @@ public abstract class DiagramImpl extends ShapeImpl implements Diagram {
 	/**
 	 * The cached value of the '{@link #getResolution() <em>Resolution</em>}' attribute.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getResolution()
 	 * @generated
 	 * @ordered
@@ -94,6 +99,7 @@ public abstract class DiagramImpl extends ShapeImpl implements Diagram {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected DiagramImpl() {
@@ -102,6 +108,7 @@ public abstract class DiagramImpl extends ShapeImpl implements Diagram {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -111,6 +118,7 @@ public abstract class DiagramImpl extends ShapeImpl implements Diagram {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getName() {
@@ -119,17 +127,19 @@ public abstract class DiagramImpl extends ShapeImpl implements Diagram {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setName(String newName) {
 		String oldName = name;
 		name = newName;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, DIPackage.DIAGRAM__NAME, oldName, name));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getDocumentation() {
@@ -138,17 +148,19 @@ public abstract class DiagramImpl extends ShapeImpl implements Diagram {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setDocumentation(String newDocumentation) {
 		String oldDocumentation = documentation;
 		documentation = newDocumentation;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, DIPackage.DIAGRAM__DOCUMENTATION, oldDocumentation, documentation));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public double getResolution() {
@@ -157,97 +169,103 @@ public abstract class DiagramImpl extends ShapeImpl implements Diagram {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setResolution(double newResolution) {
 		double oldResolution = resolution;
 		resolution = newResolution;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, DIPackage.DIAGRAM__RESOLUTION, oldResolution, resolution));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case DIPackage.DIAGRAM__NAME:
-				return getName();
-			case DIPackage.DIAGRAM__DOCUMENTATION:
-				return getDocumentation();
-			case DIPackage.DIAGRAM__RESOLUTION:
-				return getResolution();
+		switch(featureID) {
+		case DIPackage.DIAGRAM__NAME:
+			return getName();
+		case DIPackage.DIAGRAM__DOCUMENTATION:
+			return getDocumentation();
+		case DIPackage.DIAGRAM__RESOLUTION:
+			return getResolution();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case DIPackage.DIAGRAM__NAME:
-				setName((String)newValue);
-				return;
-			case DIPackage.DIAGRAM__DOCUMENTATION:
-				setDocumentation((String)newValue);
-				return;
-			case DIPackage.DIAGRAM__RESOLUTION:
-				setResolution((Double)newValue);
-				return;
+		switch(featureID) {
+		case DIPackage.DIAGRAM__NAME:
+			setName((String)newValue);
+			return;
+		case DIPackage.DIAGRAM__DOCUMENTATION:
+			setDocumentation((String)newValue);
+			return;
+		case DIPackage.DIAGRAM__RESOLUTION:
+			setResolution((Double)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case DIPackage.DIAGRAM__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case DIPackage.DIAGRAM__DOCUMENTATION:
-				setDocumentation(DOCUMENTATION_EDEFAULT);
-				return;
-			case DIPackage.DIAGRAM__RESOLUTION:
-				setResolution(RESOLUTION_EDEFAULT);
-				return;
+		switch(featureID) {
+		case DIPackage.DIAGRAM__NAME:
+			setName(NAME_EDEFAULT);
+			return;
+		case DIPackage.DIAGRAM__DOCUMENTATION:
+			setDocumentation(DOCUMENTATION_EDEFAULT);
+			return;
+		case DIPackage.DIAGRAM__RESOLUTION:
+			setResolution(RESOLUTION_EDEFAULT);
+			return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case DIPackage.DIAGRAM__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case DIPackage.DIAGRAM__DOCUMENTATION:
-				return DOCUMENTATION_EDEFAULT == null ? documentation != null : !DOCUMENTATION_EDEFAULT.equals(documentation);
-			case DIPackage.DIAGRAM__RESOLUTION:
-				return resolution != RESOLUTION_EDEFAULT;
+		switch(featureID) {
+		case DIPackage.DIAGRAM__NAME:
+			return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
+		case DIPackage.DIAGRAM__DOCUMENTATION:
+			return DOCUMENTATION_EDEFAULT == null ? documentation != null : !DOCUMENTATION_EDEFAULT.equals(documentation);
+		case DIPackage.DIAGRAM__RESOLUTION:
+			return resolution != RESOLUTION_EDEFAULT;
 		}
 		return super.eIsSet(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) return super.toString();
-
+		if(eIsProxy())
+			return super.toString();
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (name: ");
 		result.append(name);
@@ -258,5 +276,4 @@ public abstract class DiagramImpl extends ShapeImpl implements Diagram {
 		result.append(')');
 		return result.toString();
 	}
-
 } // DiagramImpl
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/impl/EdgeImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/impl/EdgeImpl.java
index 569b1bdc2ed..3cd73de8f98 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/impl/EdgeImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/impl/EdgeImpl.java
@@ -24,17 +24,16 @@ import org.eclipse.papyrus.dd.di.DiagramElement;
 import org.eclipse.papyrus.dd.di.Edge;
 
 /**
- * <!-- begin-user-doc --> An implementation of the model object '
- * <em><b>Edge</b></em>'. <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object ' <em><b>Edge</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.dd.di.impl.EdgeImpl#getSourceDiagramElement <em>Source Diagram Element</em>}</li>
- *   <li>{@link org.eclipse.papyrus.dd.di.impl.EdgeImpl#getTargetDiagramElement <em>Target Diagram Element</em>}</li>
- *   <li>{@link org.eclipse.papyrus.dd.di.impl.EdgeImpl#getWaypoint <em>Waypoint</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.di.impl.EdgeImpl#getSourceDiagramElement <em>Source Diagram Element</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.di.impl.EdgeImpl#getTargetDiagramElement <em>Target Diagram Element</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.di.impl.EdgeImpl#getWaypoint <em>Waypoint</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public abstract class EdgeImpl extends DiagramElementImpl implements Edge {
@@ -42,6 +41,7 @@ public abstract class EdgeImpl extends DiagramElementImpl implements Edge {
 	/**
 	 * The cached value of the '{@link #getWaypoint() <em>Waypoint</em>}' containment reference list.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getWaypoint()
 	 * @generated
 	 * @ordered
@@ -50,6 +50,7 @@ public abstract class EdgeImpl extends DiagramElementImpl implements Edge {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected EdgeImpl() {
@@ -58,6 +59,7 @@ public abstract class EdgeImpl extends DiagramElementImpl implements Edge {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -68,6 +70,7 @@ public abstract class EdgeImpl extends DiagramElementImpl implements Edge {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public DiagramElement getSourceDiagramElement() {
@@ -78,6 +81,7 @@ public abstract class EdgeImpl extends DiagramElementImpl implements Edge {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public DiagramElement basicGetSourceDiagramElement() {
@@ -87,6 +91,7 @@ public abstract class EdgeImpl extends DiagramElementImpl implements Edge {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public DiagramElement getTargetDiagramElement() {
@@ -97,6 +102,7 @@ public abstract class EdgeImpl extends DiagramElementImpl implements Edge {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public DiagramElement basicGetTargetDiagramElement() {
@@ -105,10 +111,11 @@ public abstract class EdgeImpl extends DiagramElementImpl implements Edge {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<Point> getWaypoint() {
-		if (waypoint == null) {
+		if(waypoint == null) {
 			waypoint = new EObjectContainmentEList<Point>(Point.class, this, DIPackage.EDGE__WAYPOINT);
 		}
 		return waypoint;
@@ -116,80 +123,86 @@ public abstract class EdgeImpl extends DiagramElementImpl implements Edge {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd,
-			int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case DIPackage.EDGE__WAYPOINT:
-				return ((InternalEList<?>)getWaypoint()).basicRemove(otherEnd, msgs);
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch(featureID) {
+		case DIPackage.EDGE__WAYPOINT:
+			return ((InternalEList<?>)getWaypoint()).basicRemove(otherEnd, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case DIPackage.EDGE__SOURCE_DIAGRAM_ELEMENT:
-				if (resolve) return getSourceDiagramElement();
-				return basicGetSourceDiagramElement();
-			case DIPackage.EDGE__TARGET_DIAGRAM_ELEMENT:
-				if (resolve) return getTargetDiagramElement();
-				return basicGetTargetDiagramElement();
-			case DIPackage.EDGE__WAYPOINT:
-				return getWaypoint();
+		switch(featureID) {
+		case DIPackage.EDGE__SOURCE_DIAGRAM_ELEMENT:
+			if(resolve)
+				return getSourceDiagramElement();
+			return basicGetSourceDiagramElement();
+		case DIPackage.EDGE__TARGET_DIAGRAM_ELEMENT:
+			if(resolve)
+				return getTargetDiagramElement();
+			return basicGetTargetDiagramElement();
+		case DIPackage.EDGE__WAYPOINT:
+			return getWaypoint();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case DIPackage.EDGE__WAYPOINT:
-				getWaypoint().clear();
-				getWaypoint().addAll((Collection<? extends Point>)newValue);
-				return;
+		switch(featureID) {
+		case DIPackage.EDGE__WAYPOINT:
+			getWaypoint().clear();
+			getWaypoint().addAll((Collection<? extends Point>)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case DIPackage.EDGE__WAYPOINT:
-				getWaypoint().clear();
-				return;
+		switch(featureID) {
+		case DIPackage.EDGE__WAYPOINT:
+			getWaypoint().clear();
+			return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case DIPackage.EDGE__SOURCE_DIAGRAM_ELEMENT:
-				return isSetSourceDiagramElement();
-			case DIPackage.EDGE__TARGET_DIAGRAM_ELEMENT:
-				return isSetTargetDiagramElement();
-			case DIPackage.EDGE__WAYPOINT:
-				return waypoint != null && !waypoint.isEmpty();
+		switch(featureID) {
+		case DIPackage.EDGE__SOURCE_DIAGRAM_ELEMENT:
+			return isSetSourceDiagramElement();
+		case DIPackage.EDGE__TARGET_DIAGRAM_ELEMENT:
+			return isSetTargetDiagramElement();
+		case DIPackage.EDGE__WAYPOINT:
+			return waypoint != null && !waypoint.isEmpty();
 		}
 		return super.eIsSet(featureID);
 	}
@@ -197,6 +210,7 @@ public abstract class EdgeImpl extends DiagramElementImpl implements Edge {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetSourceDiagramElement() {
@@ -206,10 +220,10 @@ public abstract class EdgeImpl extends DiagramElementImpl implements Edge {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetTargetDiagramElement() {
 		return false;
 	}
-
 } // EdgeImpl
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/impl/ShapeImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/impl/ShapeImpl.java
index bfa1d26e1ba..e8e97183140 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/impl/ShapeImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/impl/ShapeImpl.java
@@ -25,15 +25,14 @@ import org.eclipse.papyrus.dd.di.DIPackage;
 import org.eclipse.papyrus.dd.di.Shape;
 
 /**
- * <!-- begin-user-doc --> An implementation of the model object '
- * <em><b>Shape</b></em>'. <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object ' <em><b>Shape</b></em>'. <!-- end-user-doc -->
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.dd.di.impl.ShapeImpl#getBounds <em>Bounds</em>}</li>
+ * <li>{@link org.eclipse.papyrus.dd.di.impl.ShapeImpl#getBounds <em>Bounds</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public abstract class ShapeImpl extends DiagramElementImpl implements Shape {
@@ -41,6 +40,7 @@ public abstract class ShapeImpl extends DiagramElementImpl implements Shape {
 	/**
 	 * The cached value of the '{@link #getBounds() <em>Bounds</em>}' containment reference.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #getBounds()
 	 * @generated
 	 * @ordered
@@ -49,6 +49,7 @@ public abstract class ShapeImpl extends DiagramElementImpl implements Shape {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected ShapeImpl() {
@@ -57,6 +58,7 @@ public abstract class ShapeImpl extends DiagramElementImpl implements Shape {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -66,6 +68,7 @@ public abstract class ShapeImpl extends DiagramElementImpl implements Shape {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Bounds getBounds() {
@@ -74,103 +77,110 @@ public abstract class ShapeImpl extends DiagramElementImpl implements Shape {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public NotificationChain basicSetBounds(Bounds newBounds,
-			NotificationChain msgs) {
+	public NotificationChain basicSetBounds(Bounds newBounds, NotificationChain msgs) {
 		Bounds oldBounds = bounds;
 		bounds = newBounds;
-		if (eNotificationRequired()) {
+		if(eNotificationRequired()) {
 			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, DIPackage.SHAPE__BOUNDS, oldBounds, newBounds);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
+			if(msgs == null)
+				msgs = notification;
+			else
+				msgs.add(notification);
 		}
 		return msgs;
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setBounds(Bounds newBounds) {
-		if (newBounds != bounds) {
+		if(newBounds != bounds) {
 			NotificationChain msgs = null;
-			if (bounds != null)
+			if(bounds != null)
 				msgs = ((InternalEObject)bounds).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - DIPackage.SHAPE__BOUNDS, null, msgs);
-			if (newBounds != null)
+			if(newBounds != null)
 				msgs = ((InternalEObject)newBounds).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - DIPackage.SHAPE__BOUNDS, null, msgs);
 			msgs = basicSetBounds(newBounds, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
+			if(msgs != null)
+				msgs.dispatch();
+		} else if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, DIPackage.SHAPE__BOUNDS, newBounds, newBounds));
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd,
-			int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case DIPackage.SHAPE__BOUNDS:
-				return basicSetBounds(null, msgs);
+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+		switch(featureID) {
+		case DIPackage.SHAPE__BOUNDS:
+			return basicSetBounds(null, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case DIPackage.SHAPE__BOUNDS:
-				return getBounds();
+		switch(featureID) {
+		case DIPackage.SHAPE__BOUNDS:
+			return getBounds();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case DIPackage.SHAPE__BOUNDS:
-				setBounds((Bounds)newValue);
-				return;
+		switch(featureID) {
+		case DIPackage.SHAPE__BOUNDS:
+			setBounds((Bounds)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case DIPackage.SHAPE__BOUNDS:
-				setBounds((Bounds)null);
-				return;
+		switch(featureID) {
+		case DIPackage.SHAPE__BOUNDS:
+			setBounds((Bounds)null);
+			return;
 		}
 		super.eUnset(featureID);
 	}
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case DIPackage.SHAPE__BOUNDS:
-				return bounds != null;
+		switch(featureID) {
+		case DIPackage.SHAPE__BOUNDS:
+			return bounds != null;
 		}
 		return super.eIsSet(featureID);
 	}
-
 } // ShapeImpl
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/impl/StyleImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/impl/StyleImpl.java
index dbd1caa2d7d..8c715df8114 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/impl/StyleImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/impl/StyleImpl.java
@@ -19,18 +19,17 @@ import org.eclipse.papyrus.dd.di.DIPackage;
 import org.eclipse.papyrus.dd.di.Style;
 
 /**
- * <!-- begin-user-doc --> An implementation of the model object '
- * <em><b>Style</b></em>'. <!-- end-user-doc -->
+ * <!-- begin-user-doc --> An implementation of the model object ' <em><b>Style</b></em>'. <!-- end-user-doc -->
  * <p>
  * </p>
- *
+ * 
  * @generated
  */
-public abstract class StyleImpl extends MinimalEObjectImpl.Container implements
-		Style {
+public abstract class StyleImpl extends MinimalEObjectImpl.Container implements Style {
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected StyleImpl() {
@@ -39,11 +38,11 @@ public abstract class StyleImpl extends MinimalEObjectImpl.Container implements
 
 	/**
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	protected EClass eStaticClass() {
 		return DIPackage.Literals.STYLE;
 	}
-
 } // StyleImpl
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/util/DIAdapterFactory.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/util/DIAdapterFactory.java
index 6a8c2ae0756..486410425b2 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/util/DIAdapterFactory.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/util/DIAdapterFactory.java
@@ -24,6 +24,7 @@ import org.eclipse.papyrus.dd.di.*;
  * <!-- begin-user-doc --> The <b>Adapter Factory</b> for the model. It provides
  * an adapter <code>createXXX</code> method for each class of the model. <!--
  * end-user-doc -->
+ * 
  * @see org.eclipse.papyrus.dd.di.DIPackage
  * @generated
  */
@@ -32,6 +33,7 @@ public class DIAdapterFactory extends AdapterFactoryImpl {
 	/**
 	 * The cached model package.
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected static DIPackage modelPackage;
@@ -40,10 +42,11 @@ public class DIAdapterFactory extends AdapterFactoryImpl {
 	 * Creates an instance of the adapter factory.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public DIAdapterFactory() {
-		if (modelPackage == null) {
+		if(modelPackage == null) {
 			modelPackage = DIPackage.eINSTANCE;
 		}
 	}
@@ -53,15 +56,16 @@ public class DIAdapterFactory extends AdapterFactoryImpl {
 	 * <!-- begin-user-doc --> This implementation returns <code>true</code> if
 	 * the object is either the model's package or is an instance object of the
 	 * model. <!-- end-user-doc -->
+	 * 
 	 * @return whether this factory is applicable for the type of the object.
 	 * @generated
 	 */
 	@Override
 	public boolean isFactoryForType(Object object) {
-		if (object == modelPackage) {
+		if(object == modelPackage) {
 			return true;
 		}
-		if (object instanceof EObject) {
+		if(object instanceof EObject) {
 			return ((EObject)object).eClass().getEPackage() == modelPackage;
 		}
 		return false;
@@ -74,37 +78,45 @@ public class DIAdapterFactory extends AdapterFactoryImpl {
 	 * @generated
 	 */
 	protected DISwitch<Adapter> modelSwitch = new DISwitch<Adapter>() {
-			@Override
-			public Adapter caseDiagramElement(DiagramElement object) {
-				return createDiagramElementAdapter();
-			}
-			@Override
-			public Adapter caseStyle(Style object) {
-				return createStyleAdapter();
-			}
-			@Override
-			public Adapter caseEdge(Edge object) {
-				return createEdgeAdapter();
-			}
-			@Override
-			public Adapter caseDiagram(Diagram object) {
-				return createDiagramAdapter();
-			}
-			@Override
-			public Adapter caseShape(Shape object) {
-				return createShapeAdapter();
-			}
-			@Override
-			public Adapter defaultCase(EObject object) {
-				return createEObjectAdapter();
-			}
-		};
+
+		@Override
+		public Adapter caseDiagramElement(DiagramElement object) {
+			return createDiagramElementAdapter();
+		}
+
+		@Override
+		public Adapter caseStyle(Style object) {
+			return createStyleAdapter();
+		}
+
+		@Override
+		public Adapter caseEdge(Edge object) {
+			return createEdgeAdapter();
+		}
+
+		@Override
+		public Adapter caseDiagram(Diagram object) {
+			return createDiagramAdapter();
+		}
+
+		@Override
+		public Adapter caseShape(Shape object) {
+			return createShapeAdapter();
+		}
+
+		@Override
+		public Adapter defaultCase(EObject object) {
+			return createEObjectAdapter();
+		}
+	};
 
 	/**
 	 * Creates an adapter for the <code>target</code>.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param target the object to adapt.
+	 * 
+	 * @param target
+	 *        the object to adapt.
 	 * @return the adapter for the <code>target</code>.
 	 * @generated
 	 */
@@ -118,6 +130,7 @@ public class DIAdapterFactory extends AdapterFactoryImpl {
 	 * <!-- begin-user-doc --> This default implementation returns null so
 	 * that we can easily ignore cases; it's useful to ignore a case when
 	 * inheritance will catch all the cases anyway. <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.dd.di.DiagramElement
 	 * @generated
@@ -127,8 +140,7 @@ public class DIAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '
-	 * {@link org.eclipse.papyrus.dd.di.Style <em>Style</em>}'. <!--
+	 * Creates a new adapter for an object of class ' {@link org.eclipse.papyrus.dd.di.Style <em>Style</em>}'. <!--
 	 * begin-user-doc --> This default implementation returns null so that we
 	 * can easily ignore cases; it's useful to ignore a case when inheritance
 	 * will catch all the cases anyway. <!-- end-user-doc -->
@@ -142,8 +154,7 @@ public class DIAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '
-	 * {@link org.eclipse.papyrus.dd.di.Edge <em>Edge</em>}'. <!--
+	 * Creates a new adapter for an object of class ' {@link org.eclipse.papyrus.dd.di.Edge <em>Edge</em>}'. <!--
 	 * begin-user-doc --> This default implementation returns null so that we
 	 * can easily ignore cases; it's useful to ignore a case when inheritance
 	 * will catch all the cases anyway. <!-- end-user-doc -->
@@ -157,8 +168,7 @@ public class DIAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '
-	 * {@link org.eclipse.papyrus.dd.di.Diagram <em>Diagram</em>}'. <!--
+	 * Creates a new adapter for an object of class ' {@link org.eclipse.papyrus.dd.di.Diagram <em>Diagram</em>}'. <!--
 	 * begin-user-doc --> This default implementation returns null so that we
 	 * can easily ignore cases; it's useful to ignore a case when inheritance
 	 * will catch all the cases anyway. <!-- end-user-doc -->
@@ -172,8 +182,7 @@ public class DIAdapterFactory extends AdapterFactoryImpl {
 	}
 
 	/**
-	 * Creates a new adapter for an object of class '
-	 * {@link org.eclipse.papyrus.dd.di.Shape <em>Shape</em>}'. <!--
+	 * Creates a new adapter for an object of class ' {@link org.eclipse.papyrus.dd.di.Shape <em>Shape</em>}'. <!--
 	 * begin-user-doc --> This default implementation returns null so that we
 	 * can easily ignore cases; it's useful to ignore a case when inheritance
 	 * will catch all the cases anyway. <!-- end-user-doc -->
@@ -190,11 +199,11 @@ public class DIAdapterFactory extends AdapterFactoryImpl {
 	 * Creates a new adapter for the default case.
 	 * <!-- begin-user-doc --> This
 	 * default implementation returns null. <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @generated
 	 */
 	public Adapter createEObjectAdapter() {
 		return null;
 	}
-
 } // DIAdapterFactory
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/util/DIDerivedUnionAdapter.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/util/DIDerivedUnionAdapter.java
index 3f108322941..630f0b97d54 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/util/DIDerivedUnionAdapter.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/util/DIDerivedUnionAdapter.java
@@ -28,14 +28,17 @@ import org.eclipse.papyrus.dd.di.Shape;
  * <!-- begin-user-doc -->
  * An adapter that propagates notifications for derived unions.
  * <!-- end-user-doc -->
+ * 
  * @see org.eclipse.papyrus.dd.di.DIPackage
  * @generated
  */
 public class DIDerivedUnionAdapter extends AdapterImpl {
+
 	/**
 	 * The cached model package.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected static DIPackage modelPackage;
@@ -44,10 +47,11 @@ public class DIDerivedUnionAdapter extends AdapterImpl {
 	 * Creates an instance of the adapter.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public DIDerivedUnionAdapter() {
-		if (modelPackage == null) {
+		if(modelPackage == null) {
 			modelPackage = DIPackage.eINSTANCE;
 		}
 	}
@@ -56,14 +60,16 @@ public class DIDerivedUnionAdapter extends AdapterImpl {
 	 * Calls <code>notifyChanged</code> with the appropriate model class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param notification a description of the change.
+	 * 
+	 * @param notification
+	 *        a description of the change.
 	 * @generated
 	 */
 	public void notifyChanged(Notification notification) {
 		Object notifier = notification.getNotifier();
-		if (notifier instanceof EObject) {
+		if(notifier instanceof EObject) {
 			EClass eClass = ((EObject)notifier).eClass();
-			if (eClass.eContainer() == modelPackage) {
+			if(eClass.eContainer() == modelPackage) {
 				notifyChanged(notification, eClass);
 			}
 		}
@@ -73,21 +79,24 @@ public class DIDerivedUnionAdapter extends AdapterImpl {
 	 * Calls <code>notifyXXXChanged</code> for the corresponding class of the model.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param notification a description of the change.
-	 * @param eClass the Ecore class of the notifier.
+	 * 
+	 * @param notification
+	 *        a description of the change.
+	 * @param eClass
+	 *        the Ecore class of the notifier.
 	 * @generated
 	 */
 	protected void notifyChanged(Notification notification, EClass eClass) {
-		switch (eClass.getClassifierID()) {
-			case DIPackage.EDGE:
-				notifyEdgeChanged(notification, eClass);
-				break;
-			case DIPackage.DIAGRAM:
-				notifyDiagramChanged(notification, eClass);
-				break;
-			case DIPackage.SHAPE:
-				notifyShapeChanged(notification, eClass);
-				break;
+		switch(eClass.getClassifierID()) {
+		case DIPackage.EDGE:
+			notifyEdgeChanged(notification, eClass);
+			break;
+		case DIPackage.DIAGRAM:
+			notifyDiagramChanged(notification, eClass);
+			break;
+		case DIPackage.SHAPE:
+			notifyShapeChanged(notification, eClass);
+			break;
 		}
 	}
 
@@ -95,9 +104,13 @@ public class DIDerivedUnionAdapter extends AdapterImpl {
 	 * Does nothing; clients may override so that it does something.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param notification a description of the change.
-	 * @param eClass the Ecore class of the notifier.
-	 * @param derivedUnion the derived union affected by the change.
+	 * 
+	 * @param notification
+	 *        a description of the change.
+	 * @param eClass
+	 *        the Ecore class of the notifier.
+	 * @param derivedUnion
+	 *        the derived union affected by the change.
 	 * @generated
 	 */
 	public void notifyChanged(Notification notification, EClass eClass, EStructuralFeature derivedUnion) {
@@ -108,12 +121,15 @@ public class DIDerivedUnionAdapter extends AdapterImpl {
 	 * Calls <code>notifyChanged</code> for each affected derived union.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param notification a description of the change.
-	 * @param eClass the Ecore class of the notifier.
+	 * 
+	 * @param notification
+	 *        a description of the change.
+	 * @param eClass
+	 *        the Ecore class of the notifier.
 	 * @generated
 	 */
 	protected void notifyEdgeChanged(Notification notification, EClass eClass) {
-		switch (notification.getFeatureID(Edge.class)) {
+		switch(notification.getFeatureID(Edge.class)) {
 		}
 	}
 
@@ -121,12 +137,15 @@ public class DIDerivedUnionAdapter extends AdapterImpl {
 	 * Calls <code>notifyChanged</code> for each affected derived union.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param notification a description of the change.
-	 * @param eClass the Ecore class of the notifier.
+	 * 
+	 * @param notification
+	 *        a description of the change.
+	 * @param eClass
+	 *        the Ecore class of the notifier.
 	 * @generated
 	 */
 	protected void notifyDiagramChanged(Notification notification, EClass eClass) {
-		switch (notification.getFeatureID(Diagram.class)) {
+		switch(notification.getFeatureID(Diagram.class)) {
 		}
 	}
 
@@ -134,13 +153,15 @@ public class DIDerivedUnionAdapter extends AdapterImpl {
 	 * Calls <code>notifyChanged</code> for each affected derived union.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param notification a description of the change.
-	 * @param eClass the Ecore class of the notifier.
+	 * 
+	 * @param notification
+	 *        a description of the change.
+	 * @param eClass
+	 *        the Ecore class of the notifier.
 	 * @generated
 	 */
 	protected void notifyShapeChanged(Notification notification, EClass eClass) {
-		switch (notification.getFeatureID(Shape.class)) {
+		switch(notification.getFeatureID(Shape.class)) {
 		}
 	}
-
 } //DIDerivedUnionAdapter
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/util/DISwitch.java b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/util/DISwitch.java
index 8f2e5e9f4f9..aa62f4c0218 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/util/DISwitch.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.dd/src/org/eclipse/papyrus/dd/di/util/DISwitch.java
@@ -20,11 +20,11 @@ import org.eclipse.papyrus.dd.di.*;
 
 /**
  * <!-- begin-user-doc --> The <b>Switch</b> for the model's inheritance
- * hierarchy. It supports the call {@link #doSwitch(EObject) doSwitch(object)}
- * to invoke the <code>caseXXX</code> method for each class of the model,
+ * hierarchy. It supports the call {@link #doSwitch(EObject) doSwitch(object)} to invoke the <code>caseXXX</code> method for each class of the model,
  * starting with the actual class of the object and proceeding up the
  * inheritance hierarchy until a non-null result is returned, which is the
  * result of the switch. <!-- end-user-doc -->
+ * 
  * @see org.eclipse.papyrus.dd.di.DIPackage
  * @generated
  */
@@ -33,6 +33,7 @@ public class DISwitch<T> extends Switch<T> {
 	/**
 	 * The cached model package
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected static DIPackage modelPackage;
@@ -41,10 +42,11 @@ public class DISwitch<T> extends Switch<T> {
 	 * Creates an instance of the switch.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public DISwitch() {
-		if (modelPackage == null) {
+		if(modelPackage == null) {
 			modelPackage = DIPackage.eINSTANCE;
 		}
 	}
@@ -66,47 +68,63 @@ public class DISwitch<T> extends Switch<T> {
 	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
 	 * <!-- begin-user-doc --> <!--
 	 * end-user-doc -->
+	 * 
 	 * @return the first non-null result returned by a <code>caseXXX</code> call.
 	 * @generated
 	 */
 	@Override
 	protected T doSwitch(int classifierID, EObject theEObject) {
-		switch (classifierID) {
-			case DIPackage.DIAGRAM_ELEMENT: {
-				DiagramElement diagramElement = (DiagramElement)theEObject;
-				T result = caseDiagramElement(diagramElement);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case DIPackage.STYLE: {
-				Style style = (Style)theEObject;
-				T result = caseStyle(style);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case DIPackage.EDGE: {
-				Edge edge = (Edge)theEObject;
-				T result = caseEdge(edge);
-				if (result == null) result = caseDiagramElement(edge);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case DIPackage.DIAGRAM: {
-				Diagram diagram = (Diagram)theEObject;
-				T result = caseDiagram(diagram);
-				if (result == null) result = caseShape(diagram);
-				if (result == null) result = caseDiagramElement(diagram);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case DIPackage.SHAPE: {
-				Shape shape = (Shape)theEObject;
-				T result = caseShape(shape);
-				if (result == null) result = caseDiagramElement(shape);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			default: return defaultCase(theEObject);
+		switch(classifierID) {
+		case DIPackage.DIAGRAM_ELEMENT:
+		{
+			DiagramElement diagramElement = (DiagramElement)theEObject;
+			T result = caseDiagramElement(diagramElement);
+			if(result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case DIPackage.STYLE:
+		{
+			Style style = (Style)theEObject;
+			T result = caseStyle(style);
+			if(result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case DIPackage.EDGE:
+		{
+			Edge edge = (Edge)theEObject;
+			T result = caseEdge(edge);
+			if(result == null)
+				result = caseDiagramElement(edge);
+			if(result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case DIPackage.DIAGRAM:
+		{
+			Diagram diagram = (Diagram)theEObject;
+			T result = caseDiagram(diagram);
+			if(result == null)
+				result = caseShape(diagram);
+			if(result == null)
+				result = caseDiagramElement(diagram);
+			if(result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case DIPackage.SHAPE:
+		{
+			Shape shape = (Shape)theEObject;
+			T result = caseShape(shape);
+			if(result == null)
+				result = caseDiagramElement(shape);
+			if(result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		default:
+			return defaultCase(theEObject);
 		}
 	}
 
@@ -115,7 +133,9 @@ public class DISwitch<T> extends Switch<T> {
 	 * <!-- begin-user-doc --> This implementation
 	 * returns null; returning a non-null result will terminate the switch. <!--
 	 * end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Diagram Element</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -129,7 +149,9 @@ public class DISwitch<T> extends Switch<T> {
 	 * <!-- begin-user-doc --> This implementation returns
 	 * null; returning a non-null result will terminate the switch. <!--
 	 * end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Style</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -139,15 +161,13 @@ public class DISwitch<T> extends Switch<T> {
 	}
 
 	/**
-	 * Returns the result of interpreting the object as an instance of '
-	 * <em>Edge</em>'. <!-- begin-user-doc --> This implementation returns null;
+	 * Returns the result of interpreting the object as an instance of ' <em>Edge</em>'. <!-- begin-user-doc --> This implementation returns null;
 	 * returning a non-null result will terminate the switch. <!-- end-user-doc
 	 * -->
 	 * 
 	 * @param object
-	 *            the target of the switch.
-	 * @return the result of interpreting the object as an instance of '
-	 *         <em>Edge</em>'.
+	 *        the target of the switch.
+	 * @return the result of interpreting the object as an instance of ' <em>Edge</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
 	 */
@@ -160,7 +180,9 @@ public class DISwitch<T> extends Switch<T> {
 	 * <!-- begin-user-doc --> This implementation returns
 	 * null; returning a non-null result will terminate the switch. <!--
 	 * end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Diagram</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -174,7 +196,9 @@ public class DISwitch<T> extends Switch<T> {
 	 * <!-- begin-user-doc --> This implementation returns
 	 * null; returning a non-null result will terminate the switch. <!--
 	 * end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Shape</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -188,7 +212,9 @@ public class DISwitch<T> extends Switch<T> {
 	 * <!-- begin-user-doc --> This implementation returns
 	 * null; returning a non-null result will terminate the switch, but this is
 	 * the last case anyway. <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
 	 * @generated
@@ -197,5 +223,4 @@ public class DISwitch<T> extends Switch<T> {
 	public T defaultCase(EObject object) {
 		return null;
 	}
-
 } // DISwitch
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/.settings/org.eclipse.jdt.core.prefs b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 00000000000..e5766923962
--- /dev/null
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,281 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=0
+org.eclipse.jdt.core.formatter.alignment_for_assignment=0
+org.eclipse.jdt.core.formatter.alignment_for_binary_expression=0
+org.eclipse.jdt.core.formatter.alignment_for_compact_if=0
+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=0
+org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=0
+org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
+org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=0
+org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
+org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_after_package=1
+org.eclipse.jdt.core.formatter.blank_lines_before_field=1
+org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=1
+org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
+org.eclipse.jdt.core.formatter.blank_lines_before_method=1
+org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
+org.eclipse.jdt.core.formatter.blank_lines_before_package=0
+org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
+org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
+org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=next_line
+org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=next_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
+org.eclipse.jdt.core.formatter.comment.format_block_comments=true
+org.eclipse.jdt.core.formatter.comment.format_header=false
+org.eclipse.jdt.core.formatter.comment.format_html=true
+org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
+org.eclipse.jdt.core.formatter.comment.format_line_comments=false
+org.eclipse.jdt.core.formatter.comment.format_source_code=true
+org.eclipse.jdt.core.formatter.comment.indent_parameter_description=false
+org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
+org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
+org.eclipse.jdt.core.formatter.comment.line_length=150
+org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
+org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
+org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
+org.eclipse.jdt.core.formatter.compact_else_if=true
+org.eclipse.jdt.core.formatter.continuation_indentation=1
+org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=1
+org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
+org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
+org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
+org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
+org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_empty_lines=false
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
+org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
+org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
+org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.join_lines_in_comments=false
+org.eclipse.jdt.core.formatter.join_wrapped_lines=true
+org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.lineSplit=200
+org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
+org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=0
+org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=false
+org.eclipse.jdt.core.formatter.tabulation.char=tab
+org.eclipse.jdt.core.formatter.tabulation.size=4
+org.eclipse.jdt.core.formatter.use_on_off_tags=false
+org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
+org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
+org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/.settings/org.eclipse.jdt.ui.prefs b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/.settings/org.eclipse.jdt.ui.prefs
new file mode 100644
index 00000000000..b5f980cae55
--- /dev/null
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/.settings/org.eclipse.jdt.ui.prefs
@@ -0,0 +1,3 @@
+eclipse.preferences.version=1
+formatter_profile=_Zero blank Papyrus Formatter Profile CDM
+formatter_settings_version=12
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/src/org/eclipse/papyrus/umldi/provider/UMLDIEditPlugin.java b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/src/org/eclipse/papyrus/umldi/provider/UMLDIEditPlugin.java
index c268714ae9f..8ad06d0bf72 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/src/org/eclipse/papyrus/umldi/provider/UMLDIEditPlugin.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/src/org/eclipse/papyrus/umldi/provider/UMLDIEditPlugin.java
@@ -25,13 +25,16 @@ import org.eclipse.uml2.uml.edit.UMLEditPlugin;
  * This is the central singleton for the UMLDI edit plugin.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
+ * 
  * @generated
  */
 public final class UMLDIEditPlugin extends EMFPlugin {
+
 	/**
 	 * Keep track of the singleton.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static final UMLDIEditPlugin INSTANCE = new UMLDIEditPlugin();
@@ -40,6 +43,7 @@ public final class UMLDIEditPlugin extends EMFPlugin {
 	 * Keep track of the singleton.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private static Implementation plugin;
@@ -48,21 +52,18 @@ public final class UMLDIEditPlugin extends EMFPlugin {
 	 * Create the instance.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public UMLDIEditPlugin() {
-		super
-		  (new ResourceLocator [] {
-		     DDEditPlugin.INSTANCE,
-		     EcoreEditPlugin.INSTANCE,
-		     UMLEditPlugin.INSTANCE,
-		   });
+		super(new ResourceLocator[]{ DDEditPlugin.INSTANCE, EcoreEditPlugin.INSTANCE, UMLEditPlugin.INSTANCE, });
 	}
 
 	/**
 	 * Returns the singleton instance of the Eclipse plugin.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the singleton instance.
 	 * @generated
 	 */
@@ -75,6 +76,7 @@ public final class UMLDIEditPlugin extends EMFPlugin {
 	 * Returns the singleton instance of the Eclipse plugin.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the singleton instance.
 	 * @generated
 	 */
@@ -86,22 +88,23 @@ public final class UMLDIEditPlugin extends EMFPlugin {
 	 * The actual implementation of the Eclipse <b>Plugin</b>.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static class Implementation extends EclipsePlugin {
+
 		/**
 		 * Creates an instance.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		public Implementation() {
 			super();
-
 			// Remember the static instance.
 			//
 			plugin = this;
 		}
 	}
-
 }
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/src/org/eclipse/papyrus/umldi/provider/UMLDIItemProviderAdapterFactory.java b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/src/org/eclipse/papyrus/umldi/provider/UMLDIItemProviderAdapterFactory.java
index 58d359579e1..33bf30489f4 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/src/org/eclipse/papyrus/umldi/provider/UMLDIItemProviderAdapterFactory.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/src/org/eclipse/papyrus/umldi/provider/UMLDIItemProviderAdapterFactory.java
@@ -41,13 +41,16 @@ import org.eclipse.papyrus.umldi.util.UMLDIAdapterFactory;
  * Note that most of the adapters are shared among multiple instances.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
+ * 
  * @generated
  */
 public class UMLDIItemProviderAdapterFactory extends UMLDIAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier, IDisposable {
+
 	/**
 	 * This keeps track of the root adapter factory that delegates to this adapter factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected ComposedAdapterFactory parentAdapterFactory;
@@ -56,6 +59,7 @@ public class UMLDIItemProviderAdapterFactory extends UMLDIAdapterFactory impleme
 	 * This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected IChangeNotifier changeNotifier = new ChangeNotifier();
@@ -64,6 +68,7 @@ public class UMLDIItemProviderAdapterFactory extends UMLDIAdapterFactory impleme
 	 * This keeps track of all the supported types checked by {@link #isFactoryForType isFactoryForType}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected Collection<Object> supportedTypes = new ArrayList<Object>();
@@ -72,6 +77,7 @@ public class UMLDIItemProviderAdapterFactory extends UMLDIAdapterFactory impleme
 	 * This constructs an instance.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public UMLDIItemProviderAdapterFactory() {
@@ -88,6 +94,7 @@ public class UMLDIItemProviderAdapterFactory extends UMLDIAdapterFactory impleme
 	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.umldi.UmlDiagram} instances.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected UmlDiagramItemProvider umlDiagramItemProvider;
@@ -96,14 +103,14 @@ public class UMLDIItemProviderAdapterFactory extends UMLDIAdapterFactory impleme
 	 * This creates an adapter for a {@link org.eclipse.papyrus.umldi.UmlDiagram}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Adapter createUmlDiagramAdapter() {
-		if (umlDiagramItemProvider == null) {
+		if(umlDiagramItemProvider == null) {
 			umlDiagramItemProvider = new UmlDiagramItemProvider(this);
 		}
-
 		return umlDiagramItemProvider;
 	}
 
@@ -111,6 +118,7 @@ public class UMLDIItemProviderAdapterFactory extends UMLDIAdapterFactory impleme
 	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.umldi.UmlShape} instances.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected UmlShapeItemProvider umlShapeItemProvider;
@@ -119,14 +127,14 @@ public class UMLDIItemProviderAdapterFactory extends UMLDIAdapterFactory impleme
 	 * This creates an adapter for a {@link org.eclipse.papyrus.umldi.UmlShape}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Adapter createUmlShapeAdapter() {
-		if (umlShapeItemProvider == null) {
+		if(umlShapeItemProvider == null) {
 			umlShapeItemProvider = new UmlShapeItemProvider(this);
 		}
-
 		return umlShapeItemProvider;
 	}
 
@@ -134,6 +142,7 @@ public class UMLDIItemProviderAdapterFactory extends UMLDIAdapterFactory impleme
 	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.umldi.UmlStyle} instances.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected UmlStyleItemProvider umlStyleItemProvider;
@@ -142,14 +151,14 @@ public class UMLDIItemProviderAdapterFactory extends UMLDIAdapterFactory impleme
 	 * This creates an adapter for a {@link org.eclipse.papyrus.umldi.UmlStyle}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Adapter createUmlStyleAdapter() {
-		if (umlStyleItemProvider == null) {
+		if(umlStyleItemProvider == null) {
 			umlStyleItemProvider = new UmlStyleItemProvider(this);
 		}
-
 		return umlStyleItemProvider;
 	}
 
@@ -157,6 +166,7 @@ public class UMLDIItemProviderAdapterFactory extends UMLDIAdapterFactory impleme
 	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.umldi.UmlEdge} instances.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected UmlEdgeItemProvider umlEdgeItemProvider;
@@ -165,14 +175,14 @@ public class UMLDIItemProviderAdapterFactory extends UMLDIAdapterFactory impleme
 	 * This creates an adapter for a {@link org.eclipse.papyrus.umldi.UmlEdge}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Adapter createUmlEdgeAdapter() {
-		if (umlEdgeItemProvider == null) {
+		if(umlEdgeItemProvider == null) {
 			umlEdgeItemProvider = new UmlEdgeItemProvider(this);
 		}
-
 		return umlEdgeItemProvider;
 	}
 
@@ -180,6 +190,7 @@ public class UMLDIItemProviderAdapterFactory extends UMLDIAdapterFactory impleme
 	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.umldi.UmlCompartment} instances.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected UmlCompartmentItemProvider umlCompartmentItemProvider;
@@ -188,14 +199,14 @@ public class UMLDIItemProviderAdapterFactory extends UMLDIAdapterFactory impleme
 	 * This creates an adapter for a {@link org.eclipse.papyrus.umldi.UmlCompartment}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Adapter createUmlCompartmentAdapter() {
-		if (umlCompartmentItemProvider == null) {
+		if(umlCompartmentItemProvider == null) {
 			umlCompartmentItemProvider = new UmlCompartmentItemProvider(this);
 		}
-
 		return umlCompartmentItemProvider;
 	}
 
@@ -203,6 +214,7 @@ public class UMLDIItemProviderAdapterFactory extends UMLDIAdapterFactory impleme
 	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.umldi.UmlLabel} instances.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected UmlLabelItemProvider umlLabelItemProvider;
@@ -211,14 +223,14 @@ public class UMLDIItemProviderAdapterFactory extends UMLDIAdapterFactory impleme
 	 * This creates an adapter for a {@link org.eclipse.papyrus.umldi.UmlLabel}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Adapter createUmlLabelAdapter() {
-		if (umlLabelItemProvider == null) {
+		if(umlLabelItemProvider == null) {
 			umlLabelItemProvider = new UmlLabelItemProvider(this);
 		}
-
 		return umlLabelItemProvider;
 	}
 
@@ -226,6 +238,7 @@ public class UMLDIItemProviderAdapterFactory extends UMLDIAdapterFactory impleme
 	 * This returns the root adapter factory that contains this factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public ComposeableAdapterFactory getRootAdapterFactory() {
@@ -236,6 +249,7 @@ public class UMLDIItemProviderAdapterFactory extends UMLDIAdapterFactory impleme
 	 * This sets the composed adapter factory that contains this factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory) {
@@ -245,6 +259,7 @@ public class UMLDIItemProviderAdapterFactory extends UMLDIAdapterFactory impleme
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -256,6 +271,7 @@ public class UMLDIItemProviderAdapterFactory extends UMLDIAdapterFactory impleme
 	 * This implementation substitutes the factory itself as the key for the adapter.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -266,17 +282,17 @@ public class UMLDIItemProviderAdapterFactory extends UMLDIAdapterFactory impleme
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object adapt(Object object, Object type) {
-		if (isFactoryForType(type)) {
+		if(isFactoryForType(type)) {
 			Object adapter = super.adapt(object, type);
-			if (!(type instanceof Class<?>) || (((Class<?>)type).isInstance(adapter))) {
+			if(!(type instanceof Class<?>) || (((Class<?>)type).isInstance(adapter))) {
 				return adapter;
 			}
 		}
-
 		return null;
 	}
 
@@ -284,6 +300,7 @@ public class UMLDIItemProviderAdapterFactory extends UMLDIAdapterFactory impleme
 	 * This adds a listener.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void addListener(INotifyChangedListener notifyChangedListener) {
@@ -294,6 +311,7 @@ public class UMLDIItemProviderAdapterFactory extends UMLDIAdapterFactory impleme
 	 * This removes a listener.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void removeListener(INotifyChangedListener notifyChangedListener) {
@@ -304,29 +322,35 @@ public class UMLDIItemProviderAdapterFactory extends UMLDIAdapterFactory impleme
 	 * This delegates to {@link #changeNotifier} and to {@link #parentAdapterFactory}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void fireNotifyChanged(Notification notification) {
 		changeNotifier.fireNotifyChanged(notification);
-
-		if (parentAdapterFactory != null) {
+		if(parentAdapterFactory != null) {
 			parentAdapterFactory.fireNotifyChanged(notification);
 		}
 	}
 
 	/**
-	 * This disposes all of the item providers created by this factory. 
+	 * This disposes all of the item providers created by this factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void dispose() {
-		if (umlDiagramItemProvider != null) umlDiagramItemProvider.dispose();
-		if (umlShapeItemProvider != null) umlShapeItemProvider.dispose();
-		if (umlStyleItemProvider != null) umlStyleItemProvider.dispose();
-		if (umlEdgeItemProvider != null) umlEdgeItemProvider.dispose();
-		if (umlCompartmentItemProvider != null) umlCompartmentItemProvider.dispose();
-		if (umlLabelItemProvider != null) umlLabelItemProvider.dispose();
+		if(umlDiagramItemProvider != null)
+			umlDiagramItemProvider.dispose();
+		if(umlShapeItemProvider != null)
+			umlShapeItemProvider.dispose();
+		if(umlStyleItemProvider != null)
+			umlStyleItemProvider.dispose();
+		if(umlEdgeItemProvider != null)
+			umlEdgeItemProvider.dispose();
+		if(umlCompartmentItemProvider != null)
+			umlCompartmentItemProvider.dispose();
+		if(umlLabelItemProvider != null)
+			umlLabelItemProvider.dispose();
 	}
-
 }
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/src/org/eclipse/papyrus/umldi/provider/UmlCompartmentItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/src/org/eclipse/papyrus/umldi/provider/UmlCompartmentItemProvider.java
index 18da0c46f80..bd38be8f512 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/src/org/eclipse/papyrus/umldi/provider/UmlCompartmentItemProvider.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/src/org/eclipse/papyrus/umldi/provider/UmlCompartmentItemProvider.java
@@ -11,7 +11,6 @@
  */
 package org.eclipse.papyrus.umldi.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 
@@ -38,22 +37,16 @@ import org.eclipse.papyrus.umldi.UmlCompartmentKind;
  * This is the item provider adapter for a {@link org.eclipse.papyrus.umldi.UmlCompartment} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
+ * 
  * @generated
  */
-public class UmlCompartmentItemProvider
-	extends UmlShapeItemProvider
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource,
-		IItemColorProvider,
-		IItemFontProvider {
+public class UmlCompartmentItemProvider extends UmlShapeItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider {
+
 	/**
 	 * This constructs an instance from a factory and a notifier.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public UmlCompartmentItemProvider(AdapterFactory adapterFactory) {
@@ -64,13 +57,13 @@ public class UmlCompartmentItemProvider
 	 * This returns the property descriptors for the adapted class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
+		if(itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
-
 			addKindPropertyDescriptor(object);
 		}
 		return itemPropertyDescriptors;
@@ -80,28 +73,18 @@ public class UmlCompartmentItemProvider
 	 * This adds a property descriptor for the Kind feature.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addKindPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_UmlCompartment_kind_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_UmlCompartment_kind_feature", "_UI_UmlCompartment_type"),
-				 UMLDIPackage.Literals.UML_COMPARTMENT__KIND,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_UmlCompartment_kind_feature"), getString("_UI_PropertyDescriptor_description", "_UI_UmlCompartment_kind_feature", "_UI_UmlCompartment_type"), UMLDIPackage.Literals.UML_COMPARTMENT__KIND, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
 	 * This returns UmlCompartment.gif.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -113,15 +96,14 @@ public class UmlCompartmentItemProvider
 	 * This returns the label text for the adapted class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String getText(Object object) {
 		UmlCompartmentKind labelValue = ((UmlCompartment)object).getKind();
 		String label = labelValue == null ? null : labelValue.toString();
-		return label == null || label.length() == 0 ?
-			getString("_UI_UmlCompartment_type") :
-			getString("_UI_UmlCompartment_type") + " " + label;
+		return label == null || label.length() == 0 ? getString("_UI_UmlCompartment_type") : getString("_UI_UmlCompartment_type") + " " + label;
 	}
 
 	/**
@@ -129,16 +111,16 @@ public class UmlCompartmentItemProvider
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void notifyChanged(Notification notification) {
 		updateChildren(notification);
-
-		switch (notification.getFeatureID(UmlCompartment.class)) {
-			case UMLDIPackage.UML_COMPARTMENT__KIND:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
+		switch(notification.getFeatureID(UmlCompartment.class)) {
+		case UMLDIPackage.UML_COMPARTMENT__KIND:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+			return;
 		}
 		super.notifyChanged(notification);
 	}
@@ -148,11 +130,11 @@ public class UmlCompartmentItemProvider
 	 * that can be created under this object.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
 	}
-
 }
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/src/org/eclipse/papyrus/umldi/provider/UmlDiagramElementItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/src/org/eclipse/papyrus/umldi/provider/UmlDiagramElementItemProvider.java
index 7406e236d63..b8be49dc6a5 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/src/org/eclipse/papyrus/umldi/provider/UmlDiagramElementItemProvider.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/src/org/eclipse/papyrus/umldi/provider/UmlDiagramElementItemProvider.java
@@ -11,7 +11,6 @@
  */
 package org.eclipse.papyrus.umldi.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 
@@ -43,22 +42,16 @@ import org.eclipse.papyrus.umldi.UmlDiagramElement;
  * This is the item provider adapter for a {@link org.eclipse.papyrus.umldi.UmlDiagramElement} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
+ * 
  * @generated
  */
-public class UmlDiagramElementItemProvider
-	extends DiagramElementItemProvider
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource,
-		IItemColorProvider,
-		IItemFontProvider {
+public class UmlDiagramElementItemProvider extends DiagramElementItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider {
+
 	/**
 	 * This constructs an instance from a factory and a notifier.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public UmlDiagramElementItemProvider(AdapterFactory adapterFactory) {
@@ -69,13 +62,13 @@ public class UmlDiagramElementItemProvider
 	 * This returns the property descriptors for the adapted class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
+		if(itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
-
 			addUmlModelElementPropertyDescriptor(object);
 			addSharedUmlStylePropertyDescriptor(object);
 			addTargetUmlEdgePropertyDescriptor(object);
@@ -88,88 +81,44 @@ public class UmlDiagramElementItemProvider
 	 * This adds a property descriptor for the Uml Model Element feature.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addUmlModelElementPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_UmlDiagramElement_umlModelElement_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_UmlDiagramElement_umlModelElement_feature", "_UI_UmlDiagramElement_type"),
-				 UMLDIPackage.Literals.UML_DIAGRAM_ELEMENT__UML_MODEL_ELEMENT,
-				 true,
-				 false,
-				 true,
-				 null,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_UmlDiagramElement_umlModelElement_feature"), getString("_UI_PropertyDescriptor_description", "_UI_UmlDiagramElement_umlModelElement_feature", "_UI_UmlDiagramElement_type"), UMLDIPackage.Literals.UML_DIAGRAM_ELEMENT__UML_MODEL_ELEMENT, true, false, true, null, null, null));
 	}
 
 	/**
 	 * This adds a property descriptor for the Shared Uml Style feature.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addSharedUmlStylePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_UmlDiagramElement_sharedUmlStyle_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_UmlDiagramElement_sharedUmlStyle_feature", "_UI_UmlDiagramElement_type"),
-				 UMLDIPackage.Literals.UML_DIAGRAM_ELEMENT__SHARED_UML_STYLE,
-				 true,
-				 false,
-				 true,
-				 null,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_UmlDiagramElement_sharedUmlStyle_feature"), getString("_UI_PropertyDescriptor_description", "_UI_UmlDiagramElement_sharedUmlStyle_feature", "_UI_UmlDiagramElement_type"), UMLDIPackage.Literals.UML_DIAGRAM_ELEMENT__SHARED_UML_STYLE, true, false, true, null, null, null));
 	}
 
 	/**
 	 * This adds a property descriptor for the Target Uml Edge feature.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addTargetUmlEdgePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_UmlDiagramElement_targetUmlEdge_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_UmlDiagramElement_targetUmlEdge_feature", "_UI_UmlDiagramElement_type"),
-				 UMLDIPackage.Literals.UML_DIAGRAM_ELEMENT__TARGET_UML_EDGE,
-				 true,
-				 false,
-				 true,
-				 null,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_UmlDiagramElement_targetUmlEdge_feature"), getString("_UI_PropertyDescriptor_description", "_UI_UmlDiagramElement_targetUmlEdge_feature", "_UI_UmlDiagramElement_type"), UMLDIPackage.Literals.UML_DIAGRAM_ELEMENT__TARGET_UML_EDGE, true, false, true, null, null, null));
 	}
 
 	/**
 	 * This adds a property descriptor for the Source Uml Edge feature.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addSourceUmlEdgePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_UmlDiagramElement_sourceUmlEdge_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_UmlDiagramElement_sourceUmlEdge_feature", "_UI_UmlDiagramElement_type"),
-				 UMLDIPackage.Literals.UML_DIAGRAM_ELEMENT__SOURCE_UML_EDGE,
-				 true,
-				 false,
-				 true,
-				 null,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_UmlDiagramElement_sourceUmlEdge_feature"), getString("_UI_PropertyDescriptor_description", "_UI_UmlDiagramElement_sourceUmlEdge_feature", "_UI_UmlDiagramElement_type"), UMLDIPackage.Literals.UML_DIAGRAM_ELEMENT__SOURCE_UML_EDGE, true, false, true, null, null, null));
 	}
 
 	/**
@@ -178,11 +127,12 @@ public class UmlDiagramElementItemProvider
 	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-		if (childrenFeatures == null) {
+		if(childrenFeatures == null) {
 			super.getChildrenFeatures(object);
 			childrenFeatures.add(UMLDIPackage.Literals.UML_DIAGRAM_ELEMENT__LOCAL_UML_STYLE);
 			childrenFeatures.add(UMLDIPackage.Literals.UML_DIAGRAM_ELEMENT__OWNED_UML_DIAGRAM_ELEMENT);
@@ -193,13 +143,13 @@ public class UmlDiagramElementItemProvider
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	protected EStructuralFeature getChildFeature(Object object, Object child) {
 		// Check the type of the specified child object and return the proper feature to use for
 		// adding (see {@link AddCommand}) it as a child.
-
 		return super.getChildFeature(object, child);
 	}
 
@@ -207,6 +157,7 @@ public class UmlDiagramElementItemProvider
 	 * This returns the label text for the adapted class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -219,17 +170,17 @@ public class UmlDiagramElementItemProvider
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void notifyChanged(Notification notification) {
 		updateChildren(notification);
-
-		switch (notification.getFeatureID(UmlDiagramElement.class)) {
-			case UMLDIPackage.UML_DIAGRAM_ELEMENT__LOCAL_UML_STYLE:
-			case UMLDIPackage.UML_DIAGRAM_ELEMENT__OWNED_UML_DIAGRAM_ELEMENT:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
+		switch(notification.getFeatureID(UmlDiagramElement.class)) {
+		case UMLDIPackage.UML_DIAGRAM_ELEMENT__LOCAL_UML_STYLE:
+		case UMLDIPackage.UML_DIAGRAM_ELEMENT__OWNED_UML_DIAGRAM_ELEMENT:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+			return;
 		}
 		super.notifyChanged(notification);
 	}
@@ -239,52 +190,29 @@ public class UmlDiagramElementItemProvider
 	 * that can be created under this object.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add
-			(createChildParameter
-				(UMLDIPackage.Literals.UML_DIAGRAM_ELEMENT__LOCAL_UML_STYLE,
-				 UMLDIFactory.eINSTANCE.createUmlStyle()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(UMLDIPackage.Literals.UML_DIAGRAM_ELEMENT__OWNED_UML_DIAGRAM_ELEMENT,
-				 UMLDIFactory.eINSTANCE.createUmlShape()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(UMLDIPackage.Literals.UML_DIAGRAM_ELEMENT__OWNED_UML_DIAGRAM_ELEMENT,
-				 UMLDIFactory.eINSTANCE.createUmlDiagram()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(UMLDIPackage.Literals.UML_DIAGRAM_ELEMENT__OWNED_UML_DIAGRAM_ELEMENT,
-				 UMLDIFactory.eINSTANCE.createUmlEdge()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(UMLDIPackage.Literals.UML_DIAGRAM_ELEMENT__OWNED_UML_DIAGRAM_ELEMENT,
-				 UMLDIFactory.eINSTANCE.createUmlCompartment()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(UMLDIPackage.Literals.UML_DIAGRAM_ELEMENT__OWNED_UML_DIAGRAM_ELEMENT,
-				 UMLDIFactory.eINSTANCE.createUmlLabel()));
+		newChildDescriptors.add(createChildParameter(UMLDIPackage.Literals.UML_DIAGRAM_ELEMENT__LOCAL_UML_STYLE, UMLDIFactory.eINSTANCE.createUmlStyle()));
+		newChildDescriptors.add(createChildParameter(UMLDIPackage.Literals.UML_DIAGRAM_ELEMENT__OWNED_UML_DIAGRAM_ELEMENT, UMLDIFactory.eINSTANCE.createUmlShape()));
+		newChildDescriptors.add(createChildParameter(UMLDIPackage.Literals.UML_DIAGRAM_ELEMENT__OWNED_UML_DIAGRAM_ELEMENT, UMLDIFactory.eINSTANCE.createUmlDiagram()));
+		newChildDescriptors.add(createChildParameter(UMLDIPackage.Literals.UML_DIAGRAM_ELEMENT__OWNED_UML_DIAGRAM_ELEMENT, UMLDIFactory.eINSTANCE.createUmlEdge()));
+		newChildDescriptors.add(createChildParameter(UMLDIPackage.Literals.UML_DIAGRAM_ELEMENT__OWNED_UML_DIAGRAM_ELEMENT, UMLDIFactory.eINSTANCE.createUmlCompartment()));
+		newChildDescriptors.add(createChildParameter(UMLDIPackage.Literals.UML_DIAGRAM_ELEMENT__OWNED_UML_DIAGRAM_ELEMENT, UMLDIFactory.eINSTANCE.createUmlLabel()));
 	}
 
 	/**
 	 * Return the resource locator for this item provider's resources.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public ResourceLocator getResourceLocator() {
 		return UMLDIEditPlugin.INSTANCE;
 	}
-
 }
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/src/org/eclipse/papyrus/umldi/provider/UmlDiagramItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/src/org/eclipse/papyrus/umldi/provider/UmlDiagramItemProvider.java
index eade00ee446..dde395ebe5e 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/src/org/eclipse/papyrus/umldi/provider/UmlDiagramItemProvider.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/src/org/eclipse/papyrus/umldi/provider/UmlDiagramItemProvider.java
@@ -11,7 +11,6 @@
  */
 package org.eclipse.papyrus.umldi.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 
@@ -39,22 +38,16 @@ import org.eclipse.papyrus.umldi.UmlDiagram;
  * This is the item provider adapter for a {@link org.eclipse.papyrus.umldi.UmlDiagram} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
+ * 
  * @generated
  */
-public class UmlDiagramItemProvider
-	extends UmlShapeItemProvider
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource,
-		IItemColorProvider,
-		IItemFontProvider {
+public class UmlDiagramItemProvider extends UmlShapeItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider {
+
 	/**
 	 * This constructs an instance from a factory and a notifier.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public UmlDiagramItemProvider(AdapterFactory adapterFactory) {
@@ -65,13 +58,13 @@ public class UmlDiagramItemProvider
 	 * This returns the property descriptors for the adapted class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
+		if(itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
-
 			addNamePropertyDescriptor(object);
 			addDocumentationPropertyDescriptor(object);
 			addResolutionPropertyDescriptor(object);
@@ -83,72 +76,40 @@ public class UmlDiagramItemProvider
 	 * This adds a property descriptor for the Name feature.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addNamePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Diagram_name_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Diagram_name_feature", "_UI_Diagram_type"),
-				 DIPackage.Literals.DIAGRAM__NAME,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Diagram_name_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Diagram_name_feature", "_UI_Diagram_type"), DIPackage.Literals.DIAGRAM__NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
 	 * This adds a property descriptor for the Documentation feature.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addDocumentationPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Diagram_documentation_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Diagram_documentation_feature", "_UI_Diagram_type"),
-				 DIPackage.Literals.DIAGRAM__DOCUMENTATION,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Diagram_documentation_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Diagram_documentation_feature", "_UI_Diagram_type"), DIPackage.Literals.DIAGRAM__DOCUMENTATION, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
 	 * This adds a property descriptor for the Resolution feature.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addResolutionPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Diagram_resolution_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Diagram_resolution_feature", "_UI_Diagram_type"),
-				 DIPackage.Literals.DIAGRAM__RESOLUTION,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.REAL_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Diagram_resolution_feature"), getString("_UI_PropertyDescriptor_description", "_UI_Diagram_resolution_feature", "_UI_Diagram_type"), DIPackage.Literals.DIAGRAM__RESOLUTION, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
 	}
 
 	/**
 	 * This returns UmlDiagram.gif.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -160,14 +121,13 @@ public class UmlDiagramItemProvider
 	 * This returns the label text for the adapted class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String getText(Object object) {
 		String label = ((UmlDiagram)object).getName();
-		return label == null || label.length() == 0 ?
-			getString("_UI_UmlDiagram_type") :
-			getString("_UI_UmlDiagram_type") + " " + label;
+		return label == null || label.length() == 0 ? getString("_UI_UmlDiagram_type") : getString("_UI_UmlDiagram_type") + " " + label;
 	}
 
 	/**
@@ -175,18 +135,18 @@ public class UmlDiagramItemProvider
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void notifyChanged(Notification notification) {
 		updateChildren(notification);
-
-		switch (notification.getFeatureID(UmlDiagram.class)) {
-			case UMLDIPackage.UML_DIAGRAM__NAME:
-			case UMLDIPackage.UML_DIAGRAM__DOCUMENTATION:
-			case UMLDIPackage.UML_DIAGRAM__RESOLUTION:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
+		switch(notification.getFeatureID(UmlDiagram.class)) {
+		case UMLDIPackage.UML_DIAGRAM__NAME:
+		case UMLDIPackage.UML_DIAGRAM__DOCUMENTATION:
+		case UMLDIPackage.UML_DIAGRAM__RESOLUTION:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+			return;
 		}
 		super.notifyChanged(notification);
 	}
@@ -196,11 +156,11 @@ public class UmlDiagramItemProvider
 	 * that can be created under this object.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
 	}
-
 }
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/src/org/eclipse/papyrus/umldi/provider/UmlEdgeItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/src/org/eclipse/papyrus/umldi/provider/UmlEdgeItemProvider.java
index f2fae7e695f..8f3877cd995 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/src/org/eclipse/papyrus/umldi/provider/UmlEdgeItemProvider.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/src/org/eclipse/papyrus/umldi/provider/UmlEdgeItemProvider.java
@@ -11,7 +11,6 @@
  */
 package org.eclipse.papyrus.umldi.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 
@@ -42,22 +41,16 @@ import org.eclipse.papyrus.umldi.UmlEdge;
  * This is the item provider adapter for a {@link org.eclipse.papyrus.umldi.UmlEdge} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
+ * 
  * @generated
  */
-public class UmlEdgeItemProvider
-	extends UmlDiagramElementItemProvider
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource,
-		IItemColorProvider,
-		IItemFontProvider {
+public class UmlEdgeItemProvider extends UmlDiagramElementItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider {
+
 	/**
 	 * This constructs an instance from a factory and a notifier.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public UmlEdgeItemProvider(AdapterFactory adapterFactory) {
@@ -68,13 +61,13 @@ public class UmlEdgeItemProvider
 	 * This returns the property descriptors for the adapted class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
+		if(itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
-
 			addSourceUmlDiagramElementPropertyDescriptor(object);
 			addTargetUmlDiagramElementPropertyDescriptor(object);
 		}
@@ -85,44 +78,22 @@ public class UmlEdgeItemProvider
 	 * This adds a property descriptor for the Source Uml Diagram Element feature.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addSourceUmlDiagramElementPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_UmlEdge_sourceUmlDiagramElement_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_UmlEdge_sourceUmlDiagramElement_feature", "_UI_UmlEdge_type"),
-				 UMLDIPackage.Literals.UML_EDGE__SOURCE_UML_DIAGRAM_ELEMENT,
-				 true,
-				 false,
-				 true,
-				 null,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_UmlEdge_sourceUmlDiagramElement_feature"), getString("_UI_PropertyDescriptor_description", "_UI_UmlEdge_sourceUmlDiagramElement_feature", "_UI_UmlEdge_type"), UMLDIPackage.Literals.UML_EDGE__SOURCE_UML_DIAGRAM_ELEMENT, true, false, true, null, null, null));
 	}
 
 	/**
 	 * This adds a property descriptor for the Target Uml Diagram Element feature.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addTargetUmlDiagramElementPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_UmlEdge_targetUmlDiagramElement_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_UmlEdge_targetUmlDiagramElement_feature", "_UI_UmlEdge_type"),
-				 UMLDIPackage.Literals.UML_EDGE__TARGET_UML_DIAGRAM_ELEMENT,
-				 true,
-				 false,
-				 true,
-				 null,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_UmlEdge_targetUmlDiagramElement_feature"), getString("_UI_PropertyDescriptor_description", "_UI_UmlEdge_targetUmlDiagramElement_feature", "_UI_UmlEdge_type"), UMLDIPackage.Literals.UML_EDGE__TARGET_UML_DIAGRAM_ELEMENT, true, false, true, null, null, null));
 	}
 
 	/**
@@ -131,11 +102,12 @@ public class UmlEdgeItemProvider
 	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-		if (childrenFeatures == null) {
+		if(childrenFeatures == null) {
 			super.getChildrenFeatures(object);
 			childrenFeatures.add(DIPackage.Literals.EDGE__WAYPOINT);
 		}
@@ -145,13 +117,13 @@ public class UmlEdgeItemProvider
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	protected EStructuralFeature getChildFeature(Object object, Object child) {
 		// Check the type of the specified child object and return the proper feature to use for
 		// adding (see {@link AddCommand}) it as a child.
-
 		return super.getChildFeature(object, child);
 	}
 
@@ -159,6 +131,7 @@ public class UmlEdgeItemProvider
 	 * This returns UmlEdge.gif.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -170,6 +143,7 @@ public class UmlEdgeItemProvider
 	 * This returns the label text for the adapted class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -182,16 +156,16 @@ public class UmlEdgeItemProvider
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void notifyChanged(Notification notification) {
 		updateChildren(notification);
-
-		switch (notification.getFeatureID(UmlEdge.class)) {
-			case UMLDIPackage.UML_EDGE__WAYPOINT:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
+		switch(notification.getFeatureID(UmlEdge.class)) {
+		case UMLDIPackage.UML_EDGE__WAYPOINT:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+			return;
 		}
 		super.notifyChanged(notification);
 	}
@@ -201,16 +175,12 @@ public class UmlEdgeItemProvider
 	 * that can be created under this object.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DIPackage.Literals.EDGE__WAYPOINT,
-				 DCFactory.eINSTANCE.createPoint()));
+		newChildDescriptors.add(createChildParameter(DIPackage.Literals.EDGE__WAYPOINT, DCFactory.eINSTANCE.createPoint()));
 	}
-
 }
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/src/org/eclipse/papyrus/umldi/provider/UmlLabelItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/src/org/eclipse/papyrus/umldi/provider/UmlLabelItemProvider.java
index fc7343fbaea..4d9e550b217 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/src/org/eclipse/papyrus/umldi/provider/UmlLabelItemProvider.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/src/org/eclipse/papyrus/umldi/provider/UmlLabelItemProvider.java
@@ -11,7 +11,6 @@
  */
 package org.eclipse.papyrus.umldi.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 
@@ -38,22 +37,16 @@ import org.eclipse.papyrus.umldi.UmlLabelKind;
  * This is the item provider adapter for a {@link org.eclipse.papyrus.umldi.UmlLabel} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
+ * 
  * @generated
  */
-public class UmlLabelItemProvider
-	extends UmlShapeItemProvider
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource,
-		IItemColorProvider,
-		IItemFontProvider {
+public class UmlLabelItemProvider extends UmlShapeItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider {
+
 	/**
 	 * This constructs an instance from a factory and a notifier.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public UmlLabelItemProvider(AdapterFactory adapterFactory) {
@@ -64,13 +57,13 @@ public class UmlLabelItemProvider
 	 * This returns the property descriptors for the adapted class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
+		if(itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
-
 			addKindPropertyDescriptor(object);
 		}
 		return itemPropertyDescriptors;
@@ -80,28 +73,18 @@ public class UmlLabelItemProvider
 	 * This adds a property descriptor for the Kind feature.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addKindPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_UmlLabel_kind_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_UmlLabel_kind_feature", "_UI_UmlLabel_type"),
-				 UMLDIPackage.Literals.UML_LABEL__KIND,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_UmlLabel_kind_feature"), getString("_UI_PropertyDescriptor_description", "_UI_UmlLabel_kind_feature", "_UI_UmlLabel_type"), UMLDIPackage.Literals.UML_LABEL__KIND, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
 	 * This returns UmlLabel.gif.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -113,15 +96,14 @@ public class UmlLabelItemProvider
 	 * This returns the label text for the adapted class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String getText(Object object) {
 		UmlLabelKind labelValue = ((UmlLabel)object).getKind();
 		String label = labelValue == null ? null : labelValue.toString();
-		return label == null || label.length() == 0 ?
-			getString("_UI_UmlLabel_type") :
-			getString("_UI_UmlLabel_type") + " " + label;
+		return label == null || label.length() == 0 ? getString("_UI_UmlLabel_type") : getString("_UI_UmlLabel_type") + " " + label;
 	}
 
 	/**
@@ -129,16 +111,16 @@ public class UmlLabelItemProvider
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void notifyChanged(Notification notification) {
 		updateChildren(notification);
-
-		switch (notification.getFeatureID(UmlLabel.class)) {
-			case UMLDIPackage.UML_LABEL__KIND:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
+		switch(notification.getFeatureID(UmlLabel.class)) {
+		case UMLDIPackage.UML_LABEL__KIND:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+			return;
 		}
 		super.notifyChanged(notification);
 	}
@@ -148,11 +130,11 @@ public class UmlLabelItemProvider
 	 * that can be created under this object.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
 	}
-
 }
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/src/org/eclipse/papyrus/umldi/provider/UmlShapeItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/src/org/eclipse/papyrus/umldi/provider/UmlShapeItemProvider.java
index cdea1b937d4..75af186ac17 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/src/org/eclipse/papyrus/umldi/provider/UmlShapeItemProvider.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/src/org/eclipse/papyrus/umldi/provider/UmlShapeItemProvider.java
@@ -11,7 +11,6 @@
  */
 package org.eclipse.papyrus.umldi.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 
@@ -41,22 +40,16 @@ import org.eclipse.papyrus.umldi.UmlShape;
  * This is the item provider adapter for a {@link org.eclipse.papyrus.umldi.UmlShape} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
+ * 
  * @generated
  */
-public class UmlShapeItemProvider
-	extends UmlDiagramElementItemProvider
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource,
-		IItemColorProvider,
-		IItemFontProvider {
+public class UmlShapeItemProvider extends UmlDiagramElementItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider {
+
 	/**
 	 * This constructs an instance from a factory and a notifier.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public UmlShapeItemProvider(AdapterFactory adapterFactory) {
@@ -67,13 +60,13 @@ public class UmlShapeItemProvider
 	 * This returns the property descriptors for the adapted class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
+		if(itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
-
 		}
 		return itemPropertyDescriptors;
 	}
@@ -84,11 +77,12 @@ public class UmlShapeItemProvider
 	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-		if (childrenFeatures == null) {
+		if(childrenFeatures == null) {
 			super.getChildrenFeatures(object);
 			childrenFeatures.add(DIPackage.Literals.SHAPE__BOUNDS);
 		}
@@ -98,13 +92,13 @@ public class UmlShapeItemProvider
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	protected EStructuralFeature getChildFeature(Object object, Object child) {
 		// Check the type of the specified child object and return the proper feature to use for
 		// adding (see {@link AddCommand}) it as a child.
-
 		return super.getChildFeature(object, child);
 	}
 
@@ -112,6 +106,7 @@ public class UmlShapeItemProvider
 	 * This returns UmlShape.gif.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -123,6 +118,7 @@ public class UmlShapeItemProvider
 	 * This returns the label text for the adapted class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -135,16 +131,16 @@ public class UmlShapeItemProvider
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void notifyChanged(Notification notification) {
 		updateChildren(notification);
-
-		switch (notification.getFeatureID(UmlShape.class)) {
-			case UMLDIPackage.UML_SHAPE__BOUNDS:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
+		switch(notification.getFeatureID(UmlShape.class)) {
+		case UMLDIPackage.UML_SHAPE__BOUNDS:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
+			return;
 		}
 		super.notifyChanged(notification);
 	}
@@ -154,16 +150,12 @@ public class UmlShapeItemProvider
 	 * that can be created under this object.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
 		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add
-			(createChildParameter
-				(DIPackage.Literals.SHAPE__BOUNDS,
-				 DCFactory.eINSTANCE.createBounds()));
+		newChildDescriptors.add(createChildParameter(DIPackage.Literals.SHAPE__BOUNDS, DCFactory.eINSTANCE.createBounds()));
 	}
-
 }
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/src/org/eclipse/papyrus/umldi/provider/UmlStyleItemProvider.java b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/src/org/eclipse/papyrus/umldi/provider/UmlStyleItemProvider.java
index 5b07392aee5..83473d1685c 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/src/org/eclipse/papyrus/umldi/provider/UmlStyleItemProvider.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.edit/src/org/eclipse/papyrus/umldi/provider/UmlStyleItemProvider.java
@@ -11,7 +11,6 @@
  */
 package org.eclipse.papyrus.umldi.provider;
 
-
 import java.util.Collection;
 import java.util.List;
 
@@ -41,22 +40,16 @@ import org.eclipse.papyrus.umldi.UmlStyle;
  * This is the item provider adapter for a {@link org.eclipse.papyrus.umldi.UmlStyle} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
+ * 
  * @generated
  */
-public class UmlStyleItemProvider
-	extends StyleItemProvider
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource,
-		IItemColorProvider,
-		IItemFontProvider {
+public class UmlStyleItemProvider extends StyleItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, IItemColorProvider, IItemFontProvider {
+
 	/**
 	 * This constructs an instance from a factory and a notifier.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public UmlStyleItemProvider(AdapterFactory adapterFactory) {
@@ -67,13 +60,13 @@ public class UmlStyleItemProvider
 	 * This returns the property descriptors for the adapted class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
+		if(itemPropertyDescriptors == null) {
 			super.getPropertyDescriptors(object);
-
 			addFontNamePropertyDescriptor(object);
 			addFontSizePropertyDescriptor(object);
 		}
@@ -84,50 +77,29 @@ public class UmlStyleItemProvider
 	 * This adds a property descriptor for the Font Name feature.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addFontNamePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_UmlStyle_fontName_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_UmlStyle_fontName_feature", "_UI_UmlStyle_type"),
-				 UMLDIPackage.Literals.UML_STYLE__FONT_NAME,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_UmlStyle_fontName_feature"), getString("_UI_PropertyDescriptor_description", "_UI_UmlStyle_fontName_feature", "_UI_UmlStyle_type"), UMLDIPackage.Literals.UML_STYLE__FONT_NAME, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
 	}
 
 	/**
 	 * This adds a property descriptor for the Font Size feature.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void addFontSizePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_UmlStyle_fontSize_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_UmlStyle_fontSize_feature", "_UI_UmlStyle_type"),
-				 UMLDIPackage.Literals.UML_STYLE__FONT_SIZE,
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.REAL_VALUE_IMAGE,
-				 null,
-				 null));
+		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_UmlStyle_fontSize_feature"), getString("_UI_PropertyDescriptor_description", "_UI_UmlStyle_fontSize_feature", "_UI_UmlStyle_type"), UMLDIPackage.Literals.UML_STYLE__FONT_SIZE, true, false, false, ItemPropertyDescriptor.REAL_VALUE_IMAGE, null, null));
 	}
 
 	/**
 	 * This returns UmlStyle.gif.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -139,14 +111,13 @@ public class UmlStyleItemProvider
 	 * This returns the label text for the adapted class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String getText(Object object) {
 		String label = ((UmlStyle)object).getFontName();
-		return label == null || label.length() == 0 ?
-			getString("_UI_UmlStyle_type") :
-			getString("_UI_UmlStyle_type") + " " + label;
+		return label == null || label.length() == 0 ? getString("_UI_UmlStyle_type") : getString("_UI_UmlStyle_type") + " " + label;
 	}
 
 	/**
@@ -154,17 +125,17 @@ public class UmlStyleItemProvider
 	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void notifyChanged(Notification notification) {
 		updateChildren(notification);
-
-		switch (notification.getFeatureID(UmlStyle.class)) {
-			case UMLDIPackage.UML_STYLE__FONT_NAME:
-			case UMLDIPackage.UML_STYLE__FONT_SIZE:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
+		switch(notification.getFeatureID(UmlStyle.class)) {
+		case UMLDIPackage.UML_STYLE__FONT_NAME:
+		case UMLDIPackage.UML_STYLE__FONT_SIZE:
+			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+			return;
 		}
 		super.notifyChanged(notification);
 	}
@@ -174,6 +145,7 @@ public class UmlStyleItemProvider
 	 * that can be created under this object.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -185,11 +157,11 @@ public class UmlStyleItemProvider
 	 * Return the resource locator for this item provider's resources.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public ResourceLocator getResourceLocator() {
 		return UMLDIEditPlugin.INSTANCE;
 	}
-
 }
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.editor/src/org/eclipse/papyrus/umldi/editor/UMLDIActionBarContributor.java b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.editor/src/org/eclipse/papyrus/umldi/editor/UMLDIActionBarContributor.java
index bfddf39a957..bab68c859b5 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.editor/src/org/eclipse/papyrus/umldi/editor/UMLDIActionBarContributor.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.editor/src/org/eclipse/papyrus/umldi/editor/UMLDIActionBarContributor.java
@@ -53,128 +53,134 @@ import org.eclipse.ui.IEditorPart;
 import org.eclipse.ui.PartInitException;
 
 /**
- * This is the action bar contributor for the UMLDI model editor.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * This is the action bar contributor for the UMLDI model editor. <!--
+ * begin-user-doc --> <!-- end-user-doc -->
+ * 
  * @generated
  */
-public class UMLDIActionBarContributor
-	extends EditingDomainActionBarContributor
-	implements ISelectionChangedListener {
+public class UMLDIActionBarContributor extends
+		EditingDomainActionBarContributor implements ISelectionChangedListener {
 	/**
-	 * This keeps track of the active editor.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This keeps track of the active editor. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected IEditorPart activeEditorPart;
 
 	/**
-	 * This keeps track of the current selection provider.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This keeps track of the current selection provider. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected ISelectionProvider selectionProvider;
 
 	/**
-	 * This action opens the Properties view.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This action opens the Properties view. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	protected IAction showPropertiesViewAction =
-		new Action(UMLDIEditorPlugin.INSTANCE.getString("_UI_ShowPropertiesView_menu_item")) {
-			@Override
-			public void run() {
-				try {
-					getPage().showView("org.eclipse.ui.views.PropertySheet");
-				}
-				catch (PartInitException exception) {
-					UMLDIEditorPlugin.INSTANCE.log(exception);
-				}
+	protected IAction showPropertiesViewAction = new Action(
+			UMLDIEditorPlugin.INSTANCE
+					.getString("_UI_ShowPropertiesView_menu_item")) {
+		@Override
+		public void run() {
+			try {
+				getPage().showView("org.eclipse.ui.views.PropertySheet");
+			} catch (PartInitException exception) {
+				UMLDIEditorPlugin.INSTANCE.log(exception);
 			}
-		};
+		}
+	};
 
 	/**
 	 * This action refreshes the viewer of the current editor if the editor
-	 * implements {@link org.eclipse.emf.common.ui.viewer.IViewerProvider}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * implements {@link org.eclipse.emf.common.ui.viewer.IViewerProvider}. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	protected IAction refreshViewerAction =
-		new Action(UMLDIEditorPlugin.INSTANCE.getString("_UI_RefreshViewer_menu_item")) {
-			@Override
-			public boolean isEnabled() {
-				return activeEditorPart instanceof IViewerProvider;
-			}
+	protected IAction refreshViewerAction = new Action(
+			UMLDIEditorPlugin.INSTANCE.getString("_UI_RefreshViewer_menu_item")) {
+		@Override
+		public boolean isEnabled() {
+			return activeEditorPart instanceof IViewerProvider;
+		}
 
-			@Override
-			public void run() {
-				if (activeEditorPart instanceof IViewerProvider) {
-					Viewer viewer = ((IViewerProvider)activeEditorPart).getViewer();
-					if (viewer != null) {
-						viewer.refresh();
-					}
+		@Override
+		public void run() {
+			if (activeEditorPart instanceof IViewerProvider) {
+				Viewer viewer = ((IViewerProvider) activeEditorPart)
+						.getViewer();
+				if (viewer != null) {
+					viewer.refresh();
 				}
 			}
-		};
+		}
+	};
 
 	/**
-	 * This will contain one {@link org.eclipse.emf.edit.ui.action.CreateChildAction} corresponding to each descriptor
-	 * generated for the current selection by the item provider.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This will contain one
+	 * {@link org.eclipse.emf.edit.ui.action.CreateChildAction} corresponding to
+	 * each descriptor generated for the current selection by the item provider.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected Collection<IAction> createChildActions;
 
 	/**
-	 * This will contain a map of {@link org.eclipse.emf.edit.ui.action.CreateChildAction}s, keyed by sub-menu text.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This will contain a map of
+	 * {@link org.eclipse.emf.edit.ui.action.CreateChildAction}s, keyed by
+	 * sub-menu text. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected Map<String, Collection<IAction>> createChildSubmenuActions;
 
 	/**
-	 * This is the menu manager into which menu contribution items should be added for CreateChild actions.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This is the menu manager into which menu contribution items should be
+	 * added for CreateChild actions. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 */
 	protected IMenuManager createChildMenuManager;
 
 	/**
-	 * This will contain one {@link org.eclipse.emf.edit.ui.action.CreateSiblingAction} corresponding to each descriptor
-	 * generated for the current selection by the item provider.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This will contain one
+	 * {@link org.eclipse.emf.edit.ui.action.CreateSiblingAction} corresponding
+	 * to each descriptor generated for the current selection by the item
+	 * provider. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected Collection<IAction> createSiblingActions;
 
 	/**
-	 * This will contain a map of {@link org.eclipse.emf.edit.ui.action.CreateSiblingAction}s, keyed by submenu text.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This will contain a map of
+	 * {@link org.eclipse.emf.edit.ui.action.CreateSiblingAction}s, keyed by
+	 * submenu text. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected Map<String, Collection<IAction>> createSiblingSubmenuActions;
 
 	/**
-	 * This is the menu manager into which menu contribution items should be added for CreateSibling actions.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This is the menu manager into which menu contribution items should be
+	 * added for CreateSibling actions. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected IMenuManager createSiblingMenuManager;
 
 	/**
-	 * This creates an instance of the contributor.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This creates an instance of the contributor. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public UMLDIActionBarContributor() {
@@ -185,9 +191,9 @@ public class UMLDIActionBarContributor
 	}
 
 	/**
-	 * This adds Separators for editor additions to the tool bar.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds Separators for editor additions to the tool bar. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -197,17 +203,19 @@ public class UMLDIActionBarContributor
 	}
 
 	/**
-	 * This adds to the menu bar a menu and some separators for editor additions,
-	 * as well as the sub-menus for object creation items.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This adds to the menu bar a menu and some separators for editor
+	 * additions, as well as the sub-menus for object creation items. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void contributeToMenu(IMenuManager menuManager) {
 		super.contributeToMenu(menuManager);
 
-		IMenuManager submenuManager = new MenuManager(UMLDIEditorPlugin.INSTANCE.getString("_UI_UMLDIEditor_menu"), "org.eclipse.papyrus.umldiMenuID");
+		IMenuManager submenuManager = new MenuManager(
+				UMLDIEditorPlugin.INSTANCE.getString("_UI_UMLDIEditor_menu"),
+				"org.eclipse.papyrus.umldiMenuID");
 		menuManager.insertAfter("additions", submenuManager);
 		submenuManager.add(new Separator("settings"));
 		submenuManager.add(new Separator("actions"));
@@ -216,30 +224,34 @@ public class UMLDIActionBarContributor
 
 		// Prepare for CreateChild item addition or removal.
 		//
-		createChildMenuManager = new MenuManager(UMLDIEditorPlugin.INSTANCE.getString("_UI_CreateChild_menu_item"));
+		createChildMenuManager = new MenuManager(
+				UMLDIEditorPlugin.INSTANCE
+						.getString("_UI_CreateChild_menu_item"));
 		submenuManager.insertBefore("additions", createChildMenuManager);
 
 		// Prepare for CreateSibling item addition or removal.
 		//
-		createSiblingMenuManager = new MenuManager(UMLDIEditorPlugin.INSTANCE.getString("_UI_CreateSibling_menu_item"));
+		createSiblingMenuManager = new MenuManager(
+				UMLDIEditorPlugin.INSTANCE
+						.getString("_UI_CreateSibling_menu_item"));
 		submenuManager.insertBefore("additions", createSiblingMenuManager);
 
 		// Force an update because Eclipse hides empty menus now.
 		//
-		submenuManager.addMenuListener
-			(new IMenuListener() {
-				 public void menuAboutToShow(IMenuManager menuManager) {
-					 menuManager.updateAll(true);
-				 }
-			 });
+		submenuManager.addMenuListener(new IMenuListener() {
+			public void menuAboutToShow(IMenuManager menuManager) {
+				menuManager.updateAll(true);
+			}
+		});
 
 		addGlobalActions(submenuManager);
 	}
 
 	/**
-	 * When the active editor changes, this remembers the change and registers with it as a selection provider.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * When the active editor changes, this remembers the change and registers
+	 * with it as a selection provider. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -254,25 +266,27 @@ public class UMLDIActionBarContributor
 		}
 		if (part == null) {
 			selectionProvider = null;
-		}
-		else {
+		} else {
 			selectionProvider = part.getSite().getSelectionProvider();
 			selectionProvider.addSelectionChangedListener(this);
 
 			// Fake a selection changed event to update the menus.
 			//
 			if (selectionProvider.getSelection() != null) {
-				selectionChanged(new SelectionChangedEvent(selectionProvider, selectionProvider.getSelection()));
+				selectionChanged(new SelectionChangedEvent(selectionProvider,
+						selectionProvider.getSelection()));
 			}
 		}
 	}
 
 	/**
-	 * This implements {@link org.eclipse.jface.viewers.ISelectionChangedListener},
-	 * handling {@link org.eclipse.jface.viewers.SelectionChangedEvent}s by querying for the children and siblings
-	 * that can be added to the selected object and updating the menus accordingly.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This implements
+	 * {@link org.eclipse.jface.viewers.ISelectionChangedListener}, handling
+	 * {@link org.eclipse.jface.viewers.SelectionChangedEvent}s by querying for
+	 * the children and siblings that can be added to the selected object and
+	 * updating the menus accordingly. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 */
 	public void selectionChanged(SelectionChangedEvent event) {
@@ -283,7 +297,8 @@ public class UMLDIActionBarContributor
 			depopulateManager(createChildMenuManager, createChildActions);
 		}
 		if (createSiblingMenuManager != null) {
-			depopulateManager(createSiblingMenuManager, createSiblingSubmenuActions);
+			depopulateManager(createSiblingMenuManager,
+					createSiblingSubmenuActions);
 			depopulateManager(createSiblingMenuManager, createSiblingActions);
 		}
 
@@ -293,10 +308,13 @@ public class UMLDIActionBarContributor
 		Collection<?> newSiblingDescriptors = null;
 
 		ISelection selection = event.getSelection();
-		if (selection instanceof IStructuredSelection && ((IStructuredSelection)selection).size() == 1) {
-			Object object = ((IStructuredSelection)selection).getFirstElement();
+		if (selection instanceof IStructuredSelection
+				&& ((IStructuredSelection) selection).size() == 1) {
+			Object object = ((IStructuredSelection) selection)
+					.getFirstElement();
 
-			EditingDomain domain = ((IEditingDomainProvider)activeEditorPart).getEditingDomain();
+			EditingDomain domain = ((IEditingDomainProvider) activeEditorPart)
+					.getEditingDomain();
 
 			newChildDescriptors = domain.getNewChildDescriptors(object, null);
 			newSiblingDescriptors = domain.getNewChildDescriptors(null, object);
@@ -304,87 +322,102 @@ public class UMLDIActionBarContributor
 
 		// Generate actions for selection; populate and redraw the menus.
 		//
-		createChildActions = generateCreateChildActions(newChildDescriptors, selection);
+		createChildActions = generateCreateChildActions(newChildDescriptors,
+				selection);
 		createChildSubmenuActions = extractSubmenuActions(createChildActions);
-		createSiblingActions = generateCreateSiblingActions(newSiblingDescriptors, selection);
+		createSiblingActions = generateCreateSiblingActions(
+				newSiblingDescriptors, selection);
 		createSiblingSubmenuActions = extractSubmenuActions(createSiblingActions);
 
 		if (createChildMenuManager != null) {
-			populateManager(createChildMenuManager, createChildSubmenuActions, null);
+			populateManager(createChildMenuManager, createChildSubmenuActions,
+					null);
 			populateManager(createChildMenuManager, createChildActions, null);
 			createChildMenuManager.update(true);
 		}
 		if (createSiblingMenuManager != null) {
-			populateManager(createSiblingMenuManager, createSiblingSubmenuActions, null);
-			populateManager(createSiblingMenuManager, createSiblingActions, null);
+			populateManager(createSiblingMenuManager,
+					createSiblingSubmenuActions, null);
+			populateManager(createSiblingMenuManager, createSiblingActions,
+					null);
 			createSiblingMenuManager.update(true);
 		}
 	}
 
 	/**
-	 * This generates a {@link org.eclipse.emf.edit.ui.action.CreateChildAction} for each object in <code>descriptors</code>,
-	 * and returns the collection of these actions.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This generates a {@link org.eclipse.emf.edit.ui.action.CreateChildAction}
+	 * for each object in <code>descriptors</code>, and returns the collection
+	 * of these actions. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	protected Collection<IAction> generateCreateChildActions(Collection<?> descriptors, ISelection selection) {
+	protected Collection<IAction> generateCreateChildActions(
+			Collection<?> descriptors, ISelection selection) {
 		Collection<IAction> actions = new ArrayList<IAction>();
 		if (descriptors != null) {
 			for (Object descriptor : descriptors) {
-				actions.add(new CreateChildAction(activeEditorPart, selection, descriptor));
+				actions.add(new CreateChildAction(activeEditorPart, selection,
+						descriptor));
 			}
 		}
 		return actions;
 	}
 
 	/**
-	 * This generates a {@link org.eclipse.emf.edit.ui.action.CreateSiblingAction} for each object in <code>descriptors</code>,
-	 * and returns the collection of these actions.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This generates a
+	 * {@link org.eclipse.emf.edit.ui.action.CreateSiblingAction} for each
+	 * object in <code>descriptors</code>, and returns the collection of these
+	 * actions. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	protected Collection<IAction> generateCreateSiblingActions(Collection<?> descriptors, ISelection selection) {
+	protected Collection<IAction> generateCreateSiblingActions(
+			Collection<?> descriptors, ISelection selection) {
 		Collection<IAction> actions = new ArrayList<IAction>();
 		if (descriptors != null) {
 			for (Object descriptor : descriptors) {
-				actions.add(new CreateSiblingAction(activeEditorPart, selection, descriptor));
+				actions.add(new CreateSiblingAction(activeEditorPart,
+						selection, descriptor));
 			}
 		}
 		return actions;
 	}
 
 	/**
-	 * This populates the specified <code>manager</code> with {@link org.eclipse.jface.action.ActionContributionItem}s
-	 * based on the {@link org.eclipse.jface.action.IAction}s contained in the <code>actions</code> collection,
-	 * by inserting them before the specified contribution item <code>contributionID</code>.
-	 * If <code>contributionID</code> is <code>null</code>, they are simply added.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This populates the specified <code>manager</code> with
+	 * {@link org.eclipse.jface.action.ActionContributionItem}s based on the
+	 * {@link org.eclipse.jface.action.IAction}s contained in the
+	 * <code>actions</code> collection, by inserting them before the specified
+	 * contribution item <code>contributionID</code>. If
+	 * <code>contributionID</code> is <code>null</code>, they are simply added.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	protected void populateManager(IContributionManager manager, Collection<? extends IAction> actions, String contributionID) {
+	protected void populateManager(IContributionManager manager,
+			Collection<? extends IAction> actions, String contributionID) {
 		if (actions != null) {
 			for (IAction action : actions) {
 				if (contributionID != null) {
 					manager.insertBefore(contributionID, action);
-				}
-				else {
+				} else {
 					manager.add(action);
 				}
 			}
 		}
 	}
-		
+
 	/**
-	 * This removes from the specified <code>manager</code> all {@link org.eclipse.jface.action.ActionContributionItem}s
-	 * based on the {@link org.eclipse.jface.action.IAction}s contained in the <code>actions</code> collection.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This removes from the specified <code>manager</code> all
+	 * {@link org.eclipse.jface.action.ActionContributionItem}s based on the
+	 * {@link org.eclipse.jface.action.IAction}s contained in the
+	 * <code>actions</code> collection. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	protected void depopulateManager(IContributionManager manager, Collection<? extends IAction> actions) {
+	protected void depopulateManager(IContributionManager manager,
+			Collection<? extends IAction> actions) {
 		if (actions != null) {
 			IContributionItem[] items = manager.getItems();
 			for (int i = 0; i < items.length; i++) {
@@ -392,13 +425,15 @@ public class UMLDIActionBarContributor
 				//
 				IContributionItem contributionItem = items[i];
 				while (contributionItem instanceof SubContributionItem) {
-					contributionItem = ((SubContributionItem)contributionItem).getInnerItem();
+					contributionItem = ((SubContributionItem) contributionItem)
+							.getInnerItem();
 				}
 
 				// Delete the ActionContributionItems with matching action.
 				//
 				if (contributionItem instanceof ActionContributionItem) {
-					IAction action = ((ActionContributionItem)contributionItem).getAction();
+					IAction action = ((ActionContributionItem) contributionItem)
+							.getAction();
 					if (actions.contains(action)) {
 						manager.remove(contributionItem);
 					}
@@ -408,23 +443,27 @@ public class UMLDIActionBarContributor
 	}
 
 	/**
-	 * This extracts those actions in the <code>submenuActions</code> collection whose text is qualified and returns
-	 * a map of these actions, keyed by submenu text.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This extracts those actions in the <code>submenuActions</code> collection
+	 * whose text is qualified and returns a map of these actions, keyed by
+	 * submenu text. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	protected Map<String, Collection<IAction>> extractSubmenuActions(Collection<IAction> createActions) {
+	protected Map<String, Collection<IAction>> extractSubmenuActions(
+			Collection<IAction> createActions) {
 		Map<String, Collection<IAction>> createSubmenuActions = new LinkedHashMap<String, Collection<IAction>>();
 		if (createActions != null) {
-			for (Iterator<IAction> actions = createActions.iterator(); actions.hasNext(); ) {
+			for (Iterator<IAction> actions = createActions.iterator(); actions
+					.hasNext();) {
 				IAction action = actions.next();
 				StringTokenizer st = new StringTokenizer(action.getText(), "|");
 				if (st.countTokens() == 2) {
 					String text = st.nextToken().trim();
-					Collection<IAction> submenuActions = createSubmenuActions.get(text);
+					Collection<IAction> submenuActions = createSubmenuActions
+							.get(text);
 					if (submenuActions == null) {
-						createSubmenuActions.put(text, submenuActions = new ArrayList<IAction>());
+						createSubmenuActions.put(text,
+								submenuActions = new ArrayList<IAction>());
 					}
 					action.setText(st.nextToken().trim());
 					submenuActions.add(action);
@@ -436,23 +475,27 @@ public class UMLDIActionBarContributor
 	}
 
 	/**
-	 * This populates the specified <code>manager</code> with {@link org.eclipse.jface.action.MenuManager}s containing
-	 * {@link org.eclipse.jface.action.ActionContributionItem}s based on the {@link org.eclipse.jface.action.IAction}s
-	 * contained in the <code>submenuActions</code> collection, by inserting them before the specified contribution
-	 * item <code>contributionID</code>.
-	 * If <code>contributionID</code> is <code>null</code>, they are simply added.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This populates the specified <code>manager</code> with
+	 * {@link org.eclipse.jface.action.MenuManager}s containing
+	 * {@link org.eclipse.jface.action.ActionContributionItem}s based on the
+	 * {@link org.eclipse.jface.action.IAction}s contained in the
+	 * <code>submenuActions</code> collection, by inserting them before the
+	 * specified contribution item <code>contributionID</code>. If
+	 * <code>contributionID</code> is <code>null</code>, they are simply added.
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	protected void populateManager(IContributionManager manager, Map<String, Collection<IAction>> submenuActions, String contributionID) {
+	protected void populateManager(IContributionManager manager,
+			Map<String, Collection<IAction>> submenuActions,
+			String contributionID) {
 		if (submenuActions != null) {
-			for (Map.Entry<String, Collection<IAction>> entry : submenuActions.entrySet()) {
+			for (Map.Entry<String, Collection<IAction>> entry : submenuActions
+					.entrySet()) {
 				MenuManager submenuManager = new MenuManager(entry.getKey());
 				if (contributionID != null) {
 					manager.insertBefore(contributionID, submenuManager);
-				}
-				else {
+				} else {
 					manager.add(submenuManager);
 				}
 				populateManager(submenuManager, entry.getValue(), null);
@@ -461,22 +504,27 @@ public class UMLDIActionBarContributor
 	}
 
 	/**
-	 * This removes from the specified <code>manager</code> all {@link org.eclipse.jface.action.MenuManager}s and their
-	 * {@link org.eclipse.jface.action.ActionContributionItem}s based on the {@link org.eclipse.jface.action.IAction}s
-	 * contained in the <code>submenuActions</code> map.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This removes from the specified <code>manager</code> all
+	 * {@link org.eclipse.jface.action.MenuManager}s and their
+	 * {@link org.eclipse.jface.action.ActionContributionItem}s based on the
+	 * {@link org.eclipse.jface.action.IAction}s contained in the
+	 * <code>submenuActions</code> map. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	protected void depopulateManager(IContributionManager manager, Map<String, Collection<IAction>> submenuActions) {
+	protected void depopulateManager(IContributionManager manager,
+			Map<String, Collection<IAction>> submenuActions) {
 		if (submenuActions != null) {
 			IContributionItem[] items = manager.getItems();
 			for (int i = 0; i < items.length; i++) {
 				IContributionItem contributionItem = items[i];
 				if (contributionItem instanceof MenuManager) {
-					MenuManager submenuManager = (MenuManager)contributionItem;
-					if (submenuActions.containsKey(submenuManager.getMenuText())) {
-						depopulateManager(submenuManager, submenuActions.get(contributionItem));
+					MenuManager submenuManager = (MenuManager) contributionItem;
+					if (submenuActions
+							.containsKey(submenuManager.getMenuText())) {
+						depopulateManager(submenuManager,
+								submenuActions.get(contributionItem.toString()));
 						manager.remove(contributionItem);
 					}
 				}
@@ -485,9 +533,9 @@ public class UMLDIActionBarContributor
 	}
 
 	/**
-	 * This populates the pop-up menu before it appears.
-	 * <!-- begin-user-doc -->
+	 * This populates the pop-up menu before it appears. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -495,21 +543,25 @@ public class UMLDIActionBarContributor
 		super.menuAboutToShow(menuManager);
 		MenuManager submenuManager = null;
 
-		submenuManager = new MenuManager(UMLDIEditorPlugin.INSTANCE.getString("_UI_CreateChild_menu_item"));
+		submenuManager = new MenuManager(
+				UMLDIEditorPlugin.INSTANCE
+						.getString("_UI_CreateChild_menu_item"));
 		populateManager(submenuManager, createChildSubmenuActions, null);
 		populateManager(submenuManager, createChildActions, null);
 		menuManager.insertBefore("edit", submenuManager);
 
-		submenuManager = new MenuManager(UMLDIEditorPlugin.INSTANCE.getString("_UI_CreateSibling_menu_item"));
+		submenuManager = new MenuManager(
+				UMLDIEditorPlugin.INSTANCE
+						.getString("_UI_CreateSibling_menu_item"));
 		populateManager(submenuManager, createSiblingSubmenuActions, null);
 		populateManager(submenuManager, createSiblingActions, null);
 		menuManager.insertBefore("edit", submenuManager);
 	}
 
 	/**
-	 * This inserts global actions before the "additions-end" separator.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This inserts global actions before the "additions-end" separator. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -517,16 +569,16 @@ public class UMLDIActionBarContributor
 		menuManager.insertAfter("additions-end", new Separator("ui-actions"));
 		menuManager.insertAfter("ui-actions", showPropertiesViewAction);
 
-		refreshViewerAction.setEnabled(refreshViewerAction.isEnabled());		
+		refreshViewerAction.setEnabled(refreshViewerAction.isEnabled());
 		menuManager.insertAfter("ui-actions", refreshViewerAction);
 
 		super.addGlobalActions(menuManager);
 	}
 
 	/**
-	 * This ensures that a delete action will clean up all references to deleted objects.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This ensures that a delete action will clean up all references to deleted
+	 * objects. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.editor/src/org/eclipse/papyrus/umldi/editor/UMLDIEditorPlugin.java b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.editor/src/org/eclipse/papyrus/umldi/editor/UMLDIEditorPlugin.java
index 19d8d154ce9..18d0d28f30b 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.editor/src/org/eclipse/papyrus/umldi/editor/UMLDIEditorPlugin.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.editor/src/org/eclipse/papyrus/umldi/editor/UMLDIEditorPlugin.java
@@ -21,50 +21,45 @@ import org.eclipse.papyrus.dd.edit.DDEditPlugin;
 import org.eclipse.uml2.uml.edit.UMLEditPlugin;
 
 /**
- * This is the central singleton for the UMLDI editor plugin.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * This is the central singleton for the UMLDI editor plugin. <!--
+ * begin-user-doc --> <!-- end-user-doc -->
+ * 
  * @generated
  */
 public final class UMLDIEditorPlugin extends EMFPlugin {
-	
+
 	public static final String IMAGE_TRANSFORM = "Transform";
-	
+
 	/**
-	 * Keep track of the singleton.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Keep track of the singleton. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 */
 	public static final UMLDIEditorPlugin INSTANCE = new UMLDIEditorPlugin();
-	
+
 	/**
-	 * Keep track of the singleton.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Keep track of the singleton. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 */
 	private static Implementation plugin;
 
 	/**
-	 * Create the instance.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Create the instance. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public UMLDIEditorPlugin() {
-		super
-			(new ResourceLocator [] {
-				DDEditPlugin.INSTANCE,
-				EcoreEditPlugin.INSTANCE,
-				UMLEditPlugin.INSTANCE,
-			});
+		super(new ResourceLocator[] { DDEditPlugin.INSTANCE,
+				EcoreEditPlugin.INSTANCE, UMLEditPlugin.INSTANCE, });
 	}
 
 	/**
-	 * Returns the singleton instance of the Eclipse plugin.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the singleton instance of the Eclipse plugin. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @return the singleton instance.
 	 * @generated
 	 */
@@ -72,34 +67,33 @@ public final class UMLDIEditorPlugin extends EMFPlugin {
 	public ResourceLocator getPluginResourceLocator() {
 		return plugin;
 	}
-	
+
 	/**
-	 * Returns the singleton instance of the Eclipse plugin.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Returns the singleton instance of the Eclipse plugin. <!-- begin-user-doc
+	 * --> <!-- end-user-doc -->
+	 * 
 	 * @return the singleton instance.
 	 * @generated
 	 */
 	public static Implementation getPlugin() {
 		return plugin;
 	}
-	
+
 	/**
-	 * The actual implementation of the Eclipse <b>Plugin</b>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The actual implementation of the Eclipse <b>Plugin</b>. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static class Implementation extends EclipseUIPlugin {
 		/**
-		 * Creates an instance.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * Creates an instance. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		public Implementation() {
 			super();
-	
+
 			// Remember the static instance.
 			//
 			plugin = this;
@@ -108,9 +102,11 @@ public final class UMLDIEditorPlugin extends EMFPlugin {
 		@Override
 		protected void initializeImageRegistry(ImageRegistry reg) {
 			super.initializeImageRegistry(reg);
-			reg.put(IMAGE_TRANSFORM, ImageDescriptor.createFromURL(getBundle().getEntry("icons/Transform.png")));
+			reg.put(IMAGE_TRANSFORM,
+					ImageDescriptor.createFromURL(getBundle().getEntry(
+							"icons/Transform.png")));
 		}
-		
+
 	}
 
 	public static ImageDescriptor getImageDescriptor(String id) {
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.editor/src/org/eclipse/papyrus/umldi/editor/UMLDIModelPage.java b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.editor/src/org/eclipse/papyrus/umldi/editor/UMLDIModelPage.java
index 9e1a0626812..26d71a750a8 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.editor/src/org/eclipse/papyrus/umldi/editor/UMLDIModelPage.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.editor/src/org/eclipse/papyrus/umldi/editor/UMLDIModelPage.java
@@ -48,29 +48,36 @@ public class UMLDIModelPage extends DDModelPage {
 	@Override
 	public void setupActions(IToolBarManager manager) {
 		super.setupActions(manager);
-		
+
 		Action action;
-		
+
 		action = new Action("Transform to DG") {
 			public void run() {
 				EditingDomain editingDomain = getDDEditor().getEditingDomain();
-				Resource inResource = editingDomain.getResourceSet().getResources().get(0);
+				Resource inResource = editingDomain.getResourceSet()
+						.getResources().get(0);
 				EList<EObject> inObjects = inResource.getContents();
 
-				ModelExtent input = new BasicModelExtent(inObjects);		
+				ModelExtent input = new BasicModelExtent(inObjects);
 				ModelExtent output = new BasicModelExtent();
 
 				ExecutionContextImpl context = new ExecutionContextImpl();
 				context.setConfigProperty("keepModeling", true);
 
-				URI transformationURI = URI.createURI("platform:/plugin/org.eclipse.papyrus.umldi2dg/transforms/umldi2dg.qvto");
-				TransformationExecutor executor = new TransformationExecutor(transformationURI);
-				ExecutionDiagnostic result = executor.execute(context, input, output);
-				if(result.getSeverity() == Diagnostic.OK) {
+				URI transformationURI = URI
+						.createURI("platform:/plugin/org.eclipse.papyrus.umldi2dg/transforms/umldi2dg.qvto");
+				TransformationExecutor executor = new TransformationExecutor(
+						transformationURI);
+				ExecutionDiagnostic result = executor.execute(context, input,
+						output);
+				if (result.getSeverity() == Diagnostic.OK) {
 					try {
 						List<EObject> outObjects = output.getContents();
-					    ResourceSet outResourceSet = new ResourceSetImpl();
-						Resource outResource = outResourceSet.createResource(inResource.getURI().trimFileExtension().appendFileExtension("dg"));
+						ResourceSet outResourceSet = new ResourceSetImpl();
+						Resource outResource = outResourceSet
+								.createResource(inResource.getURI()
+										.trimFileExtension()
+										.appendFileExtension("dg"));
 						outResource.getContents().addAll(outObjects);
 						outResource.save(Collections.emptyMap());
 					} catch (IOException e) {
@@ -79,14 +86,15 @@ public class UMLDIModelPage extends DDModelPage {
 				} else {
 					IStatus status = BasicDiagnostic.toIStatus(result);
 					UMLDIEditorPlugin.getPlugin().getLog().log(status);
-					StatusManager.getManager().handle(status, StatusManager.BLOCK);
-				}			
+					StatusManager.getManager().handle(status,
+							StatusManager.BLOCK);
+				}
 			}
 		};
 		action.setToolTipText("Transform to DG");
-		action.setImageDescriptor(UMLDIEditorPlugin.getImageDescriptor(UMLDIEditorPlugin.IMAGE_TRANSFORM));
+		action.setImageDescriptor(UMLDIEditorPlugin
+				.getImageDescriptor(UMLDIEditorPlugin.IMAGE_TRANSFORM));
 		manager.appendToGroup("Page", action);
 	}
 
-	
 }
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.editor/src/org/eclipse/papyrus/umldi/editor/UMLDIModelWizard.java b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.editor/src/org/eclipse/papyrus/umldi/editor/UMLDIModelWizard.java
index 40b856f9dec..8a06e1826cd 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.editor/src/org/eclipse/papyrus/umldi/editor/UMLDIModelWizard.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi.editor/src/org/eclipse/papyrus/umldi/editor/UMLDIModelWizard.java
@@ -11,7 +11,6 @@
  */
 package org.eclipse.papyrus.umldi.editor;
 
-
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -82,7 +81,6 @@ import org.eclipse.papyrus.umldi.UMLDIFactory;
 import org.eclipse.papyrus.umldi.UMLDIPackage;
 import org.eclipse.papyrus.umldi.provider.UMLDIEditPlugin;
 
-
 import org.eclipse.core.runtime.Path;
 
 import org.eclipse.jface.viewers.ISelection;
@@ -93,105 +91,109 @@ import org.eclipse.ui.IWorkbenchPart;
 import org.eclipse.ui.IWorkbenchWindow;
 import org.eclipse.ui.PartInitException;
 
-
 /**
- * This is a simple wizard for creating a new model file.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
+ * This is a simple wizard for creating a new model file. <!-- begin-user-doc
+ * --> <!-- end-user-doc -->
+ * 
  * @generated
  */
 public class UMLDIModelWizard extends Wizard implements INewWizard {
 	/**
-	 * The supported extensions for created files.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The supported extensions for created files. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public static final List<String> FILE_EXTENSIONS =
-		Collections.unmodifiableList(Arrays.asList(UMLDIEditorPlugin.INSTANCE.getString("_UI_UMLDIEditorFilenameExtensions").split("\\s*,\\s*")));
+	public static final List<String> FILE_EXTENSIONS = Collections
+			.unmodifiableList(Arrays.asList(UMLDIEditorPlugin.INSTANCE
+					.getString("_UI_UMLDIEditorFilenameExtensions").split(
+							"\\s*,\\s*")));
 
 	/**
-	 * A formatted list of supported file extensions, suitable for display.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * A formatted list of supported file extensions, suitable for display. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public static final String FORMATTED_FILE_EXTENSIONS =
-		UMLDIEditorPlugin.INSTANCE.getString("_UI_UMLDIEditorFilenameExtensions").replaceAll("\\s*,\\s*", ", ");
+	public static final String FORMATTED_FILE_EXTENSIONS = UMLDIEditorPlugin.INSTANCE
+			.getString("_UI_UMLDIEditorFilenameExtensions").replaceAll(
+					"\\s*,\\s*", ", ");
 
 	/**
-	 * This caches an instance of the model package.
-	 * <!-- begin-user-doc -->
+	 * This caches an instance of the model package. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected UMLDIPackage umldiPackage = UMLDIPackage.eINSTANCE;
 
 	/**
-	 * This caches an instance of the model factory.
-	 * <!-- begin-user-doc -->
+	 * This caches an instance of the model factory. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected UMLDIFactory umldiFactory = umldiPackage.getUMLDIFactory();
 
 	/**
-	 * This is the file creation page.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This is the file creation page. <!-- begin-user-doc --> <!-- end-user-doc
+	 * -->
+	 * 
 	 * @generated
 	 */
 	protected UMLDIModelWizardNewFileCreationPage newFileCreationPage;
 
 	/**
-	 * This is the initial object creation page.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This is the initial object creation page. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected UMLDIModelWizardInitialObjectCreationPage initialObjectCreationPage;
 
 	/**
-	 * Remember the selection during initialization for populating the default container.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Remember the selection during initialization for populating the default
+	 * container. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected IStructuredSelection selection;
 
 	/**
-	 * Remember the workbench during initialization.
-	 * <!-- begin-user-doc -->
+	 * Remember the workbench during initialization. <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected IWorkbench workbench;
 
 	/**
 	 * Caches the names of the types that can be created as the root object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected List<String> initialObjectNames;
 
 	/**
-	 * This just records the information.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This just records the information. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void init(IWorkbench workbench, IStructuredSelection selection) {
 		this.workbench = workbench;
 		this.selection = selection;
 		setWindowTitle(UMLDIEditorPlugin.INSTANCE.getString("_UI_Wizard_label"));
-		setDefaultPageImageDescriptor(ExtendedImageRegistry.INSTANCE.getImageDescriptor(UMLDIEditorPlugin.INSTANCE.getImage("full/wizban/NewUMLDI")));
+		setDefaultPageImageDescriptor(ExtendedImageRegistry.INSTANCE
+				.getImageDescriptor(UMLDIEditorPlugin.INSTANCE
+						.getImage("full/wizban/NewUMLDI")));
 	}
 
 	/**
 	 * Returns the names of the types that can be created as the root object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected Collection<String> getInitialObjectNames() {
@@ -199,33 +201,35 @@ public class UMLDIModelWizard extends Wizard implements INewWizard {
 			initialObjectNames = new ArrayList<String>();
 			for (EClassifier eClassifier : umldiPackage.getEClassifiers()) {
 				if (eClassifier instanceof EClass) {
-					EClass eClass = (EClass)eClassifier;
+					EClass eClass = (EClass) eClassifier;
 					if (!eClass.isAbstract()) {
 						initialObjectNames.add(eClass.getName());
 					}
 				}
 			}
-			Collections.sort(initialObjectNames, CommonPlugin.INSTANCE.getComparator());
+			Collections.sort(initialObjectNames,
+					CommonPlugin.INSTANCE.getComparator());
 		}
 		return initialObjectNames;
 	}
 
 	/**
-	 * Create a new model.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Create a new model. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected EObject createInitialModel() {
-		EClass eClass = (EClass)umldiPackage.getEClassifier(initialObjectCreationPage.getInitialObjectName());
+		EClass eClass = (EClass) umldiPackage
+				.getEClassifier(initialObjectCreationPage
+						.getInitialObjectName());
 		EObject rootObject = umldiFactory.create(eClass);
 		return rootObject;
 	}
 
 	/**
-	 * Do the work after everything is specified.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Do the work after everything is specified. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -237,103 +241,110 @@ public class UMLDIModelWizard extends Wizard implements INewWizard {
 
 			// Do the work within an operation.
 			//
-			WorkspaceModifyOperation operation =
-				new WorkspaceModifyOperation() {
-					@Override
-					protected void execute(IProgressMonitor progressMonitor) {
-						try {
-							// Create a resource set
-							//
-							ResourceSet resourceSet = new ResourceSetImpl();
-
-							// Get the URI of the model file.
-							//
-							URI fileURI = URI.createPlatformResourceURI(modelFile.getFullPath().toString(), true);
-
-							// Create a resource for this file.
-							//
-							Resource resource = resourceSet.createResource(fileURI);
-
-							// Add the initial model object to the contents.
-							//
-							EObject rootObject = createInitialModel();
-							if (rootObject != null) {
-								resource.getContents().add(rootObject);
-							}
-
-							// Save the contents of the resource to the file system.
-							//
-							Map<Object, Object> options = new HashMap<Object, Object>();
-							options.put(XMLResource.OPTION_ENCODING, initialObjectCreationPage.getEncoding());
-							resource.save(options);
-						}
-						catch (Exception exception) {
-							UMLDIEditorPlugin.INSTANCE.log(exception);
-						}
-						finally {
-							progressMonitor.done();
+			WorkspaceModifyOperation operation = new WorkspaceModifyOperation() {
+				@Override
+				protected void execute(IProgressMonitor progressMonitor) {
+					try {
+						// Create a resource set
+						//
+						ResourceSet resourceSet = new ResourceSetImpl();
+
+						// Get the URI of the model file.
+						//
+						URI fileURI = URI.createPlatformResourceURI(modelFile
+								.getFullPath().toString(), true);
+
+						// Create a resource for this file.
+						//
+						Resource resource = resourceSet.createResource(fileURI);
+
+						// Add the initial model object to the contents.
+						//
+						EObject rootObject = createInitialModel();
+						if (rootObject != null) {
+							resource.getContents().add(rootObject);
 						}
+
+						// Save the contents of the resource to the file system.
+						//
+						Map<Object, Object> options = new HashMap<Object, Object>();
+						options.put(XMLResource.OPTION_ENCODING,
+								initialObjectCreationPage.getEncoding());
+						resource.save(options);
+					} catch (Exception exception) {
+						UMLDIEditorPlugin.INSTANCE.log(exception);
+					} finally {
+						progressMonitor.done();
 					}
-				};
+				}
+			};
 
 			getContainer().run(false, false, operation);
 
 			// Select the new file resource in the current view.
 			//
-			IWorkbenchWindow workbenchWindow = workbench.getActiveWorkbenchWindow();
+			IWorkbenchWindow workbenchWindow = workbench
+					.getActiveWorkbenchWindow();
 			IWorkbenchPage page = workbenchWindow.getActivePage();
 			final IWorkbenchPart activePart = page.getActivePart();
 			if (activePart instanceof ISetSelectionTarget) {
-				final ISelection targetSelection = new StructuredSelection(modelFile);
-				getShell().getDisplay().asyncExec
-					(new Runnable() {
-						 public void run() {
-							 ((ISetSelectionTarget)activePart).selectReveal(targetSelection);
-						 }
-					 });
+				final ISelection targetSelection = new StructuredSelection(
+						modelFile);
+				getShell().getDisplay().asyncExec(new Runnable() {
+					public void run() {
+						((ISetSelectionTarget) activePart)
+								.selectReveal(targetSelection);
+					}
+				});
 			}
 
 			// Open an editor on the new file.
 			//
 			try {
-				page.openEditor
-					(new FileEditorInput(modelFile),
-					 workbench.getEditorRegistry().getDefaultEditor(modelFile.getFullPath().toString()).getId());					 	 
-			}
-			catch (PartInitException exception) {
-				MessageDialog.openError(workbenchWindow.getShell(), UMLDIEditorPlugin.INSTANCE.getString("_UI_OpenEditorError_label"), exception.getMessage());
+				page.openEditor(
+						new FileEditorInput(modelFile),
+						workbench
+								.getEditorRegistry()
+								.getDefaultEditor(
+										modelFile.getFullPath().toString())
+								.getId());
+			} catch (PartInitException exception) {
+				MessageDialog.openError(workbenchWindow.getShell(),
+						UMLDIEditorPlugin.INSTANCE
+								.getString("_UI_OpenEditorError_label"),
+						exception.getMessage());
 				return false;
 			}
 
 			return true;
-		}
-		catch (Exception exception) {
+		} catch (Exception exception) {
 			UMLDIEditorPlugin.INSTANCE.log(exception);
 			return false;
 		}
 	}
 
 	/**
-	 * This is the one page of the wizard.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This is the one page of the wizard. <!-- begin-user-doc --> <!--
+	 * end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	public class UMLDIModelWizardNewFileCreationPage extends WizardNewFileCreationPage {
+	public class UMLDIModelWizardNewFileCreationPage extends
+			WizardNewFileCreationPage {
 		/**
-		 * Pass in the selection.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * Pass in the selection. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
-		public UMLDIModelWizardNewFileCreationPage(String pageId, IStructuredSelection selection) {
+		public UMLDIModelWizardNewFileCreationPage(String pageId,
+				IStructuredSelection selection) {
 			super(pageId, selection);
 		}
 
 		/**
-		 * The framework calls this to see if the file is correct.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * The framework calls this to see if the file is correct. <!--
+		 * begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		@Override
@@ -341,8 +352,10 @@ public class UMLDIModelWizard extends Wizard implements INewWizard {
 			if (super.validatePage()) {
 				String extension = new Path(getFileName()).getFileExtension();
 				if (extension == null || !FILE_EXTENSIONS.contains(extension)) {
-					String key = FILE_EXTENSIONS.size() > 1 ? "_WARN_FilenameExtensions" : "_WARN_FilenameExtension";
-					setErrorMessage(UMLDIEditorPlugin.INSTANCE.getString(key, new Object [] { FORMATTED_FILE_EXTENSIONS }));
+					String key = FILE_EXTENSIONS.size() > 1 ? "_WARN_FilenameExtensions"
+							: "_WARN_FilenameExtension";
+					setErrorMessage(UMLDIEditorPlugin.INSTANCE.getString(key,
+							new Object[] { FORMATTED_FILE_EXTENSIONS }));
 					return false;
 				}
 				return true;
@@ -351,47 +364,45 @@ public class UMLDIModelWizard extends Wizard implements INewWizard {
 		}
 
 		/**
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		public IFile getModelFile() {
-			return ResourcesPlugin.getWorkspace().getRoot().getFile(getContainerFullPath().append(getFileName()));
+			return ResourcesPlugin.getWorkspace().getRoot()
+					.getFile(getContainerFullPath().append(getFileName()));
 		}
 	}
 
 	/**
-	 * This is the page where the type of object to create is selected.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * This is the page where the type of object to create is selected. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public class UMLDIModelWizardInitialObjectCreationPage extends WizardPage {
 		/**
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		protected Combo initialObjectField;
 
 		/**
-		 * @generated
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * @generated <!-- begin-user-doc --> <!-- end-user-doc -->
 		 */
 		protected List<String> encodings;
 
 		/**
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		protected Combo encodingField;
 
 		/**
-		 * Pass in the selection.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * Pass in the selection. <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		public UMLDIModelWizardInitialObjectCreationPage(String pageId) {
@@ -399,8 +410,8 @@ public class UMLDIModelWizard extends Wizard implements INewWizard {
 		}
 
 		/**
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		public void createControl(Composite parent) {
@@ -420,7 +431,8 @@ public class UMLDIModelWizard extends Wizard implements INewWizard {
 
 			Label containerLabel = new Label(composite, SWT.LEFT);
 			{
-				containerLabel.setText(UMLDIEditorPlugin.INSTANCE.getString("_UI_ModelObject"));
+				containerLabel.setText(UMLDIEditorPlugin.INSTANCE
+						.getString("_UI_ModelObject"));
 
 				GridData data = new GridData();
 				data.horizontalAlignment = GridData.FILL;
@@ -446,7 +458,8 @@ public class UMLDIModelWizard extends Wizard implements INewWizard {
 
 			Label encodingLabel = new Label(composite, SWT.LEFT);
 			{
-				encodingLabel.setText(UMLDIEditorPlugin.INSTANCE.getString("_UI_XMLEncoding"));
+				encodingLabel.setText(UMLDIEditorPlugin.INSTANCE
+						.getString("_UI_XMLEncoding"));
 
 				GridData data = new GridData();
 				data.horizontalAlignment = GridData.FILL;
@@ -472,29 +485,29 @@ public class UMLDIModelWizard extends Wizard implements INewWizard {
 		}
 
 		/**
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
-		protected ModifyListener validator =
-			new ModifyListener() {
-				public void modifyText(ModifyEvent e) {
-					setPageComplete(validatePage());
-				}
-			};
+		protected ModifyListener validator = new ModifyListener() {
+			public void modifyText(ModifyEvent e) {
+				setPageComplete(validatePage());
+			}
+		};
 
 		/**
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		protected boolean validatePage() {
-			return getInitialObjectName() != null && getEncodings().contains(encodingField.getText());
+			return getInitialObjectName() != null
+					&& getEncodings().contains(encodingField.getText());
 		}
 
 		/**
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		@Override
@@ -504,8 +517,7 @@ public class UMLDIModelWizard extends Wizard implements INewWizard {
 				if (initialObjectField.getItemCount() == 1) {
 					initialObjectField.clearSelection();
 					encodingField.setFocus();
-				}
-				else {
+				} else {
 					encodingField.clearSelection();
 					initialObjectField.setFocus();
 				}
@@ -513,8 +525,8 @@ public class UMLDIModelWizard extends Wizard implements INewWizard {
 		}
 
 		/**
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		public String getInitialObjectName() {
@@ -529,8 +541,8 @@ public class UMLDIModelWizard extends Wizard implements INewWizard {
 		}
 
 		/**
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		public String getEncoding() {
@@ -538,30 +550,33 @@ public class UMLDIModelWizard extends Wizard implements INewWizard {
 		}
 
 		/**
-		 * Returns the label for the specified type name.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * Returns the label for the specified type name. <!-- begin-user-doc
+		 * --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		protected String getLabel(String typeName) {
 			try {
-				return UMLDIEditPlugin.INSTANCE.getString("_UI_" + typeName + "_type");
-			}
-			catch(MissingResourceException mre) {
+				return UMLDIEditPlugin.INSTANCE.getString("_UI_" + typeName
+						+ "_type");
+			} catch (MissingResourceException mre) {
 				UMLDIEditorPlugin.INSTANCE.log(mre);
 			}
 			return typeName;
 		}
 
 		/**
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
+		 * <!-- begin-user-doc --> <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		protected Collection<String> getEncodings() {
 			if (encodings == null) {
 				encodings = new ArrayList<String>();
-				for (StringTokenizer stringTokenizer = new StringTokenizer(UMLDIEditorPlugin.INSTANCE.getString("_UI_XMLEncodingChoices")); stringTokenizer.hasMoreTokens(); ) {
+				for (StringTokenizer stringTokenizer = new StringTokenizer(
+						UMLDIEditorPlugin.INSTANCE
+								.getString("_UI_XMLEncodingChoices")); stringTokenizer
+						.hasMoreTokens();) {
 					encodings.add(stringTokenizer.nextToken());
 				}
 			}
@@ -570,22 +585,29 @@ public class UMLDIModelWizard extends Wizard implements INewWizard {
 	}
 
 	/**
-	 * The framework calls this to create the contents of the wizard.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * The framework calls this to create the contents of the wizard. <!--
+	 * begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-		@Override
+	@Override
 	public void addPages() {
 		// Create a page, set the title, and the initial model file name.
 		//
-		newFileCreationPage = new UMLDIModelWizardNewFileCreationPage("Whatever", selection);
-		newFileCreationPage.setTitle(UMLDIEditorPlugin.INSTANCE.getString("_UI_UMLDIModelWizard_label"));
-		newFileCreationPage.setDescription(UMLDIEditorPlugin.INSTANCE.getString("_UI_UMLDIModelWizard_description"));
-		newFileCreationPage.setFileName(UMLDIEditorPlugin.INSTANCE.getString("_UI_UMLDIEditorFilenameDefaultBase") + "." + FILE_EXTENSIONS.get(0));
+		newFileCreationPage = new UMLDIModelWizardNewFileCreationPage(
+				"Whatever", selection);
+		newFileCreationPage.setTitle(UMLDIEditorPlugin.INSTANCE
+				.getString("_UI_UMLDIModelWizard_label"));
+		newFileCreationPage.setDescription(UMLDIEditorPlugin.INSTANCE
+				.getString("_UI_UMLDIModelWizard_description"));
+		newFileCreationPage.setFileName(UMLDIEditorPlugin.INSTANCE
+				.getString("_UI_UMLDIEditorFilenameDefaultBase")
+				+ "."
+				+ FILE_EXTENSIONS.get(0));
 		addPage(newFileCreationPage);
 
-		// Try and get the resource selection to determine a current directory for the file dialog.
+		// Try and get the resource selection to determine a current directory
+		// for the file dialog.
 		//
 		if (selection != null && !selection.isEmpty()) {
 			// Get the resource...
@@ -594,40 +616,49 @@ public class UMLDIModelWizard extends Wizard implements INewWizard {
 			if (selectedElement instanceof IResource) {
 				// Get the resource parent, if its a file.
 				//
-				IResource selectedResource = (IResource)selectedElement;
+				IResource selectedResource = (IResource) selectedElement;
 				if (selectedResource.getType() == IResource.FILE) {
 					selectedResource = selectedResource.getParent();
 				}
 
 				// This gives us a directory...
 				//
-				if (selectedResource instanceof IFolder || selectedResource instanceof IProject) {
+				if (selectedResource instanceof IFolder
+						|| selectedResource instanceof IProject) {
 					// Set this for the container.
 					//
-					newFileCreationPage.setContainerFullPath(selectedResource.getFullPath());
+					newFileCreationPage.setContainerFullPath(selectedResource
+							.getFullPath());
 
 					// Make up a unique new name here.
 					//
-					String defaultModelBaseFilename = UMLDIEditorPlugin.INSTANCE.getString("_UI_UMLDIEditorFilenameDefaultBase");
-					String defaultModelFilenameExtension = FILE_EXTENSIONS.get(0);
-					String modelFilename = defaultModelBaseFilename + "." + defaultModelFilenameExtension;
-					for (int i = 1; ((IContainer)selectedResource).findMember(modelFilename) != null; ++i) {
-						modelFilename = defaultModelBaseFilename + i + "." + defaultModelFilenameExtension;
+					String defaultModelBaseFilename = UMLDIEditorPlugin.INSTANCE
+							.getString("_UI_UMLDIEditorFilenameDefaultBase");
+					String defaultModelFilenameExtension = FILE_EXTENSIONS
+							.get(0);
+					String modelFilename = defaultModelBaseFilename + "."
+							+ defaultModelFilenameExtension;
+					for (int i = 1; ((IContainer) selectedResource)
+							.findMember(modelFilename) != null; ++i) {
+						modelFilename = defaultModelBaseFilename + i + "."
+								+ defaultModelFilenameExtension;
 					}
 					newFileCreationPage.setFileName(modelFilename);
 				}
 			}
 		}
-		initialObjectCreationPage = new UMLDIModelWizardInitialObjectCreationPage("Whatever2");
-		initialObjectCreationPage.setTitle(UMLDIEditorPlugin.INSTANCE.getString("_UI_UMLDIModelWizard_label"));
-		initialObjectCreationPage.setDescription(UMLDIEditorPlugin.INSTANCE.getString("_UI_Wizard_initial_object_description"));
+		initialObjectCreationPage = new UMLDIModelWizardInitialObjectCreationPage(
+				"Whatever2");
+		initialObjectCreationPage.setTitle(UMLDIEditorPlugin.INSTANCE
+				.getString("_UI_UMLDIModelWizard_label"));
+		initialObjectCreationPage.setDescription(UMLDIEditorPlugin.INSTANCE
+				.getString("_UI_Wizard_initial_object_description"));
 		addPage(initialObjectCreationPage);
 	}
 
 	/**
-	 * Get the file from the page.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * Get the file from the page. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public IFile getModelFile() {
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/.settings/org.eclipse.jdt.core.prefs b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 00000000000..e5766923962
--- /dev/null
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,281 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=0
+org.eclipse.jdt.core.formatter.alignment_for_assignment=0
+org.eclipse.jdt.core.formatter.alignment_for_binary_expression=0
+org.eclipse.jdt.core.formatter.alignment_for_compact_if=0
+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=0
+org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=0
+org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
+org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=0
+org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
+org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_after_package=1
+org.eclipse.jdt.core.formatter.blank_lines_before_field=1
+org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=1
+org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
+org.eclipse.jdt.core.formatter.blank_lines_before_method=1
+org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
+org.eclipse.jdt.core.formatter.blank_lines_before_package=0
+org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
+org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
+org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=next_line
+org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=next_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
+org.eclipse.jdt.core.formatter.comment.format_block_comments=true
+org.eclipse.jdt.core.formatter.comment.format_header=false
+org.eclipse.jdt.core.formatter.comment.format_html=true
+org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
+org.eclipse.jdt.core.formatter.comment.format_line_comments=false
+org.eclipse.jdt.core.formatter.comment.format_source_code=true
+org.eclipse.jdt.core.formatter.comment.indent_parameter_description=false
+org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
+org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
+org.eclipse.jdt.core.formatter.comment.line_length=150
+org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
+org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
+org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
+org.eclipse.jdt.core.formatter.compact_else_if=true
+org.eclipse.jdt.core.formatter.continuation_indentation=1
+org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=1
+org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
+org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
+org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
+org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
+org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_empty_lines=false
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
+org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
+org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
+org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.join_lines_in_comments=false
+org.eclipse.jdt.core.formatter.join_wrapped_lines=true
+org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.lineSplit=200
+org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
+org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=0
+org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=false
+org.eclipse.jdt.core.formatter.tabulation.char=tab
+org.eclipse.jdt.core.formatter.tabulation.size=4
+org.eclipse.jdt.core.formatter.use_on_off_tags=false
+org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
+org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
+org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/.settings/org.eclipse.jdt.ui.prefs b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/.settings/org.eclipse.jdt.ui.prefs
new file mode 100644
index 00000000000..b5f980cae55
--- /dev/null
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/.settings/org.eclipse.jdt.ui.prefs
@@ -0,0 +1,3 @@
+eclipse.preferences.version=1
+formatter_profile=_Zero blank Papyrus Formatter Profile CDM
+formatter_settings_version=12
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/UMLDIFactory.java b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/UMLDIFactory.java
index 54cd36f6ae2..42e736701af 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/UMLDIFactory.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/UMLDIFactory.java
@@ -18,14 +18,17 @@ import org.eclipse.emf.ecore.EFactory;
  * The <b>Factory</b> for the model.
  * It provides a create method for each non-abstract class of the model.
  * <!-- end-user-doc -->
+ * 
  * @see org.eclipse.papyrus.umldi.UMLDIPackage
  * @generated
  */
 public interface UMLDIFactory extends EFactory {
+
 	/**
 	 * The singleton instance of the factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	UMLDIFactory eINSTANCE = org.eclipse.papyrus.umldi.impl.UMLDIFactoryImpl.init();
@@ -34,6 +37,7 @@ public interface UMLDIFactory extends EFactory {
 	 * Returns a new object of class '<em>Uml Diagram</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Uml Diagram</em>'.
 	 * @generated
 	 */
@@ -43,6 +47,7 @@ public interface UMLDIFactory extends EFactory {
 	 * Returns a new object of class '<em>Uml Style</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Uml Style</em>'.
 	 * @generated
 	 */
@@ -52,6 +57,7 @@ public interface UMLDIFactory extends EFactory {
 	 * Returns a new object of class '<em>Uml Edge</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Uml Edge</em>'.
 	 * @generated
 	 */
@@ -61,6 +67,7 @@ public interface UMLDIFactory extends EFactory {
 	 * Returns a new object of class '<em>Uml Compartment</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Uml Compartment</em>'.
 	 * @generated
 	 */
@@ -70,6 +77,7 @@ public interface UMLDIFactory extends EFactory {
 	 * Returns a new object of class '<em>Uml Label</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Uml Label</em>'.
 	 * @generated
 	 */
@@ -79,6 +87,7 @@ public interface UMLDIFactory extends EFactory {
 	 * Returns a new object of class '<em>Uml Shape</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return a new object of class '<em>Uml Shape</em>'.
 	 * @generated
 	 */
@@ -88,9 +97,9 @@ public interface UMLDIFactory extends EFactory {
 	 * Returns the package supported by this factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the package supported by this factory.
 	 * @generated
 	 */
 	UMLDIPackage getUMLDIPackage();
-
 } //UMLDIFactory
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/UMLDIPackage.java b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/UMLDIPackage.java
index 4b0bfea1931..2fe265d03b6 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/UMLDIPackage.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/UMLDIPackage.java
@@ -25,23 +25,26 @@ import org.eclipse.papyrus.dd.di.DIPackage;
  * The <b>Package</b> for the model.
  * It contains accessors for the meta objects to represent
  * <ul>
- *   <li>each class,</li>
- *   <li>each feature of each class,</li>
- *   <li>each operation of each class,</li>
- *   <li>each enum,</li>
- *   <li>and each data type</li>
+ * <li>each class,</li>
+ * <li>each feature of each class,</li>
+ * <li>each operation of each class,</li>
+ * <li>each enum,</li>
+ * <li>and each data type</li>
  * </ul>
  * <!-- end-user-doc -->
+ * 
  * @see org.eclipse.papyrus.umldi.UMLDIFactory
  * @model kind="package"
  *        annotation="http://www.eclipse.org/emf/2002/Ecore validationDelegates='http://www.eclipse.org/emf/2002/Ecore/OCL'"
  * @generated
  */
 public interface UMLDIPackage extends EPackage {
+
 	/**
 	 * The package name.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	String eNAME = "umldi";
@@ -50,6 +53,7 @@ public interface UMLDIPackage extends EPackage {
 	 * The package namespace URI.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	String eNS_URI = "http://www.omg.org/spec/UML/20131001/UMLDI";
@@ -58,6 +62,7 @@ public interface UMLDIPackage extends EPackage {
 	 * The package namespace name.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	String eNS_PREFIX = "umldi";
@@ -66,6 +71,7 @@ public interface UMLDIPackage extends EPackage {
 	 * The singleton instance of the package.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	UMLDIPackage eINSTANCE = org.eclipse.papyrus.umldi.impl.UMLDIPackageImpl.init();
@@ -74,6 +80,7 @@ public interface UMLDIPackage extends EPackage {
 	 * The meta object id for the '{@link org.eclipse.papyrus.umldi.impl.UmlDiagramElementImpl <em>Uml Diagram Element</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.papyrus.umldi.impl.UmlDiagramElementImpl
 	 * @see org.eclipse.papyrus.umldi.impl.UMLDIPackageImpl#getUmlDiagramElement()
 	 * @generated
@@ -84,6 +91,7 @@ public interface UMLDIPackage extends EPackage {
 	 * The feature id for the '<em><b>Model Element</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -93,6 +101,7 @@ public interface UMLDIPackage extends EPackage {
 	 * The feature id for the '<em><b>Owning Diagram Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -102,6 +111,7 @@ public interface UMLDIPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Diagram Element</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -111,6 +121,7 @@ public interface UMLDIPackage extends EPackage {
 	 * The feature id for the '<em><b>Local Style</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -120,6 +131,7 @@ public interface UMLDIPackage extends EPackage {
 	 * The feature id for the '<em><b>Shared Style</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -129,6 +141,7 @@ public interface UMLDIPackage extends EPackage {
 	 * The feature id for the '<em><b>Target Edge</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -138,6 +151,7 @@ public interface UMLDIPackage extends EPackage {
 	 * The feature id for the '<em><b>Source Edge</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -147,6 +161,7 @@ public interface UMLDIPackage extends EPackage {
 	 * The feature id for the '<em><b>Uml Model Element</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -156,6 +171,7 @@ public interface UMLDIPackage extends EPackage {
 	 * The feature id for the '<em><b>Shared Uml Style</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -165,6 +181,7 @@ public interface UMLDIPackage extends EPackage {
 	 * The feature id for the '<em><b>Local Uml Style</b></em>' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -174,6 +191,7 @@ public interface UMLDIPackage extends EPackage {
 	 * The feature id for the '<em><b>Owning Uml Diagram Element</b></em>' container reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -183,6 +201,7 @@ public interface UMLDIPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Uml Diagram Element</b></em>' containment reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -192,6 +211,7 @@ public interface UMLDIPackage extends EPackage {
 	 * The feature id for the '<em><b>Target Uml Edge</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -201,6 +221,7 @@ public interface UMLDIPackage extends EPackage {
 	 * The feature id for the '<em><b>Source Uml Edge</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -210,6 +231,7 @@ public interface UMLDIPackage extends EPackage {
 	 * The number of structural features of the '<em>Uml Diagram Element</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -219,6 +241,7 @@ public interface UMLDIPackage extends EPackage {
 	 * The number of operations of the '<em>Uml Diagram Element</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -228,6 +251,7 @@ public interface UMLDIPackage extends EPackage {
 	 * The meta object id for the '{@link org.eclipse.papyrus.umldi.impl.UmlDiagramImpl <em>Uml Diagram</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.papyrus.umldi.impl.UmlDiagramImpl
 	 * @see org.eclipse.papyrus.umldi.impl.UMLDIPackageImpl#getUmlDiagram()
 	 * @generated
@@ -238,6 +262,7 @@ public interface UMLDIPackage extends EPackage {
 	 * The meta object id for the '{@link org.eclipse.papyrus.umldi.impl.UmlStyleImpl <em>Uml Style</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.papyrus.umldi.impl.UmlStyleImpl
 	 * @see org.eclipse.papyrus.umldi.impl.UMLDIPackageImpl#getUmlStyle()
 	 * @generated
@@ -248,6 +273,7 @@ public interface UMLDIPackage extends EPackage {
 	 * The meta object id for the '{@link org.eclipse.papyrus.umldi.impl.UmlEdgeImpl <em>Uml Edge</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.papyrus.umldi.impl.UmlEdgeImpl
 	 * @see org.eclipse.papyrus.umldi.impl.UMLDIPackageImpl#getUmlEdge()
 	 * @generated
@@ -258,6 +284,7 @@ public interface UMLDIPackage extends EPackage {
 	 * The meta object id for the '{@link org.eclipse.papyrus.umldi.impl.UmlShapeImpl <em>Uml Shape</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.papyrus.umldi.impl.UmlShapeImpl
 	 * @see org.eclipse.papyrus.umldi.impl.UMLDIPackageImpl#getUmlShape()
 	 * @generated
@@ -268,6 +295,7 @@ public interface UMLDIPackage extends EPackage {
 	 * The feature id for the '<em><b>Model Element</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -277,6 +305,7 @@ public interface UMLDIPackage extends EPackage {
 	 * The feature id for the '<em><b>Owning Diagram Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -286,6 +315,7 @@ public interface UMLDIPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Diagram Element</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -295,6 +325,7 @@ public interface UMLDIPackage extends EPackage {
 	 * The feature id for the '<em><b>Local Style</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -304,6 +335,7 @@ public interface UMLDIPackage extends EPackage {
 	 * The feature id for the '<em><b>Shared Style</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -313,6 +345,7 @@ public interface UMLDIPackage extends EPackage {
 	 * The feature id for the '<em><b>Target Edge</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -322,6 +355,7 @@ public interface UMLDIPackage extends EPackage {
 	 * The feature id for the '<em><b>Source Edge</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -331,6 +365,7 @@ public interface UMLDIPackage extends EPackage {
 	 * The feature id for the '<em><b>Uml Model Element</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -340,6 +375,7 @@ public interface UMLDIPackage extends EPackage {
 	 * The feature id for the '<em><b>Shared Uml Style</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -349,6 +385,7 @@ public interface UMLDIPackage extends EPackage {
 	 * The feature id for the '<em><b>Local Uml Style</b></em>' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -358,6 +395,7 @@ public interface UMLDIPackage extends EPackage {
 	 * The feature id for the '<em><b>Owning Uml Diagram Element</b></em>' container reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -367,6 +405,7 @@ public interface UMLDIPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Uml Diagram Element</b></em>' containment reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -376,6 +415,7 @@ public interface UMLDIPackage extends EPackage {
 	 * The feature id for the '<em><b>Target Uml Edge</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -385,6 +425,7 @@ public interface UMLDIPackage extends EPackage {
 	 * The feature id for the '<em><b>Source Uml Edge</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -394,6 +435,7 @@ public interface UMLDIPackage extends EPackage {
 	 * The feature id for the '<em><b>Bounds</b></em>' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -403,6 +445,7 @@ public interface UMLDIPackage extends EPackage {
 	 * The number of structural features of the '<em>Uml Shape</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -412,6 +455,7 @@ public interface UMLDIPackage extends EPackage {
 	 * The number of operations of the '<em>Uml Shape</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -421,6 +465,7 @@ public interface UMLDIPackage extends EPackage {
 	 * The feature id for the '<em><b>Model Element</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -430,6 +475,7 @@ public interface UMLDIPackage extends EPackage {
 	 * The feature id for the '<em><b>Owning Diagram Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -439,6 +485,7 @@ public interface UMLDIPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Diagram Element</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -448,6 +495,7 @@ public interface UMLDIPackage extends EPackage {
 	 * The feature id for the '<em><b>Local Style</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -457,6 +505,7 @@ public interface UMLDIPackage extends EPackage {
 	 * The feature id for the '<em><b>Shared Style</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -466,6 +515,7 @@ public interface UMLDIPackage extends EPackage {
 	 * The feature id for the '<em><b>Target Edge</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -475,6 +525,7 @@ public interface UMLDIPackage extends EPackage {
 	 * The feature id for the '<em><b>Source Edge</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -484,6 +535,7 @@ public interface UMLDIPackage extends EPackage {
 	 * The feature id for the '<em><b>Uml Model Element</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -493,6 +545,7 @@ public interface UMLDIPackage extends EPackage {
 	 * The feature id for the '<em><b>Shared Uml Style</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -502,6 +555,7 @@ public interface UMLDIPackage extends EPackage {
 	 * The feature id for the '<em><b>Local Uml Style</b></em>' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -511,6 +565,7 @@ public interface UMLDIPackage extends EPackage {
 	 * The feature id for the '<em><b>Owning Uml Diagram Element</b></em>' container reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -520,6 +575,7 @@ public interface UMLDIPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Uml Diagram Element</b></em>' containment reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -529,6 +585,7 @@ public interface UMLDIPackage extends EPackage {
 	 * The feature id for the '<em><b>Target Uml Edge</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -538,6 +595,7 @@ public interface UMLDIPackage extends EPackage {
 	 * The feature id for the '<em><b>Source Uml Edge</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -547,6 +605,7 @@ public interface UMLDIPackage extends EPackage {
 	 * The feature id for the '<em><b>Bounds</b></em>' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -556,6 +615,7 @@ public interface UMLDIPackage extends EPackage {
 	 * The feature id for the '<em><b>Name</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -565,6 +625,7 @@ public interface UMLDIPackage extends EPackage {
 	 * The feature id for the '<em><b>Documentation</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -574,6 +635,7 @@ public interface UMLDIPackage extends EPackage {
 	 * The feature id for the '<em><b>Resolution</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -583,6 +645,7 @@ public interface UMLDIPackage extends EPackage {
 	 * The number of structural features of the '<em>Uml Diagram</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -592,6 +655,7 @@ public interface UMLDIPackage extends EPackage {
 	 * The number of operations of the '<em>Uml Diagram</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -601,6 +665,7 @@ public interface UMLDIPackage extends EPackage {
 	 * The feature id for the '<em><b>Font Name</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -610,6 +675,7 @@ public interface UMLDIPackage extends EPackage {
 	 * The feature id for the '<em><b>Font Size</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -619,6 +685,7 @@ public interface UMLDIPackage extends EPackage {
 	 * The number of structural features of the '<em>Uml Style</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -628,6 +695,7 @@ public interface UMLDIPackage extends EPackage {
 	 * The operation id for the '<em>Fontsize Positive</em>' operation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -637,6 +705,7 @@ public interface UMLDIPackage extends EPackage {
 	 * The number of operations of the '<em>Uml Style</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -646,6 +715,7 @@ public interface UMLDIPackage extends EPackage {
 	 * The feature id for the '<em><b>Model Element</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -655,6 +725,7 @@ public interface UMLDIPackage extends EPackage {
 	 * The feature id for the '<em><b>Owning Diagram Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -664,6 +735,7 @@ public interface UMLDIPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Diagram Element</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -673,6 +745,7 @@ public interface UMLDIPackage extends EPackage {
 	 * The feature id for the '<em><b>Local Style</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -682,6 +755,7 @@ public interface UMLDIPackage extends EPackage {
 	 * The feature id for the '<em><b>Shared Style</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -691,6 +765,7 @@ public interface UMLDIPackage extends EPackage {
 	 * The feature id for the '<em><b>Target Edge</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -700,6 +775,7 @@ public interface UMLDIPackage extends EPackage {
 	 * The feature id for the '<em><b>Source Edge</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -709,6 +785,7 @@ public interface UMLDIPackage extends EPackage {
 	 * The feature id for the '<em><b>Uml Model Element</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -718,6 +795,7 @@ public interface UMLDIPackage extends EPackage {
 	 * The feature id for the '<em><b>Shared Uml Style</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -727,6 +805,7 @@ public interface UMLDIPackage extends EPackage {
 	 * The feature id for the '<em><b>Local Uml Style</b></em>' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -736,6 +815,7 @@ public interface UMLDIPackage extends EPackage {
 	 * The feature id for the '<em><b>Owning Uml Diagram Element</b></em>' container reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -745,6 +825,7 @@ public interface UMLDIPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Uml Diagram Element</b></em>' containment reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -754,6 +835,7 @@ public interface UMLDIPackage extends EPackage {
 	 * The feature id for the '<em><b>Target Uml Edge</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -763,6 +845,7 @@ public interface UMLDIPackage extends EPackage {
 	 * The feature id for the '<em><b>Source Uml Edge</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -772,6 +855,7 @@ public interface UMLDIPackage extends EPackage {
 	 * The feature id for the '<em><b>Source Diagram Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -781,6 +865,7 @@ public interface UMLDIPackage extends EPackage {
 	 * The feature id for the '<em><b>Waypoint</b></em>' containment reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -790,6 +875,7 @@ public interface UMLDIPackage extends EPackage {
 	 * The feature id for the '<em><b>Target Diagram Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -799,6 +885,7 @@ public interface UMLDIPackage extends EPackage {
 	 * The feature id for the '<em><b>Source Uml Diagram Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -808,6 +895,7 @@ public interface UMLDIPackage extends EPackage {
 	 * The feature id for the '<em><b>Target Uml Diagram Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -817,6 +905,7 @@ public interface UMLDIPackage extends EPackage {
 	 * The number of structural features of the '<em>Uml Edge</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -826,16 +915,17 @@ public interface UMLDIPackage extends EPackage {
 	 * The number of operations of the '<em>Uml Edge</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
 	int UML_EDGE_OPERATION_COUNT = UML_DIAGRAM_ELEMENT_OPERATION_COUNT + 0;
 
-
 	/**
 	 * The meta object id for the '{@link org.eclipse.papyrus.umldi.impl.UmlCompartmentImpl <em>Uml Compartment</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.papyrus.umldi.impl.UmlCompartmentImpl
 	 * @see org.eclipse.papyrus.umldi.impl.UMLDIPackageImpl#getUmlCompartment()
 	 * @generated
@@ -846,6 +936,7 @@ public interface UMLDIPackage extends EPackage {
 	 * The feature id for the '<em><b>Model Element</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -855,6 +946,7 @@ public interface UMLDIPackage extends EPackage {
 	 * The feature id for the '<em><b>Owning Diagram Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -864,6 +956,7 @@ public interface UMLDIPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Diagram Element</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -873,6 +966,7 @@ public interface UMLDIPackage extends EPackage {
 	 * The feature id for the '<em><b>Local Style</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -882,6 +976,7 @@ public interface UMLDIPackage extends EPackage {
 	 * The feature id for the '<em><b>Shared Style</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -891,6 +986,7 @@ public interface UMLDIPackage extends EPackage {
 	 * The feature id for the '<em><b>Target Edge</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -900,6 +996,7 @@ public interface UMLDIPackage extends EPackage {
 	 * The feature id for the '<em><b>Source Edge</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -909,6 +1006,7 @@ public interface UMLDIPackage extends EPackage {
 	 * The feature id for the '<em><b>Uml Model Element</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -918,6 +1016,7 @@ public interface UMLDIPackage extends EPackage {
 	 * The feature id for the '<em><b>Shared Uml Style</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -927,6 +1026,7 @@ public interface UMLDIPackage extends EPackage {
 	 * The feature id for the '<em><b>Local Uml Style</b></em>' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -936,6 +1036,7 @@ public interface UMLDIPackage extends EPackage {
 	 * The feature id for the '<em><b>Owning Uml Diagram Element</b></em>' container reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -945,6 +1046,7 @@ public interface UMLDIPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Uml Diagram Element</b></em>' containment reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -954,6 +1056,7 @@ public interface UMLDIPackage extends EPackage {
 	 * The feature id for the '<em><b>Target Uml Edge</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -963,6 +1066,7 @@ public interface UMLDIPackage extends EPackage {
 	 * The feature id for the '<em><b>Source Uml Edge</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -972,6 +1076,7 @@ public interface UMLDIPackage extends EPackage {
 	 * The feature id for the '<em><b>Bounds</b></em>' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -981,6 +1086,7 @@ public interface UMLDIPackage extends EPackage {
 	 * The feature id for the '<em><b>Kind</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -990,6 +1096,7 @@ public interface UMLDIPackage extends EPackage {
 	 * The number of structural features of the '<em>Uml Compartment</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -999,6 +1106,7 @@ public interface UMLDIPackage extends EPackage {
 	 * The number of operations of the '<em>Uml Compartment</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1008,6 +1116,7 @@ public interface UMLDIPackage extends EPackage {
 	 * The meta object id for the '{@link org.eclipse.papyrus.umldi.impl.UmlLabelImpl <em>Uml Label</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.papyrus.umldi.impl.UmlLabelImpl
 	 * @see org.eclipse.papyrus.umldi.impl.UMLDIPackageImpl#getUmlLabel()
 	 * @generated
@@ -1018,6 +1127,7 @@ public interface UMLDIPackage extends EPackage {
 	 * The feature id for the '<em><b>Model Element</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1027,6 +1137,7 @@ public interface UMLDIPackage extends EPackage {
 	 * The feature id for the '<em><b>Owning Diagram Element</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1036,6 +1147,7 @@ public interface UMLDIPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Diagram Element</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1045,6 +1157,7 @@ public interface UMLDIPackage extends EPackage {
 	 * The feature id for the '<em><b>Local Style</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1054,6 +1167,7 @@ public interface UMLDIPackage extends EPackage {
 	 * The feature id for the '<em><b>Shared Style</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1063,6 +1177,7 @@ public interface UMLDIPackage extends EPackage {
 	 * The feature id for the '<em><b>Target Edge</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1072,6 +1187,7 @@ public interface UMLDIPackage extends EPackage {
 	 * The feature id for the '<em><b>Source Edge</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1081,6 +1197,7 @@ public interface UMLDIPackage extends EPackage {
 	 * The feature id for the '<em><b>Uml Model Element</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1090,6 +1207,7 @@ public interface UMLDIPackage extends EPackage {
 	 * The feature id for the '<em><b>Shared Uml Style</b></em>' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1099,6 +1217,7 @@ public interface UMLDIPackage extends EPackage {
 	 * The feature id for the '<em><b>Local Uml Style</b></em>' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1108,6 +1227,7 @@ public interface UMLDIPackage extends EPackage {
 	 * The feature id for the '<em><b>Owning Uml Diagram Element</b></em>' container reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1117,6 +1237,7 @@ public interface UMLDIPackage extends EPackage {
 	 * The feature id for the '<em><b>Owned Uml Diagram Element</b></em>' containment reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1126,6 +1247,7 @@ public interface UMLDIPackage extends EPackage {
 	 * The feature id for the '<em><b>Target Uml Edge</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1135,6 +1257,7 @@ public interface UMLDIPackage extends EPackage {
 	 * The feature id for the '<em><b>Source Uml Edge</b></em>' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1144,6 +1267,7 @@ public interface UMLDIPackage extends EPackage {
 	 * The feature id for the '<em><b>Bounds</b></em>' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1153,6 +1277,7 @@ public interface UMLDIPackage extends EPackage {
 	 * The feature id for the '<em><b>Kind</b></em>' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1162,6 +1287,7 @@ public interface UMLDIPackage extends EPackage {
 	 * The number of structural features of the '<em>Uml Label</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1171,6 +1297,7 @@ public interface UMLDIPackage extends EPackage {
 	 * The number of operations of the '<em>Uml Label</em>' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 * @ordered
 	 */
@@ -1180,6 +1307,7 @@ public interface UMLDIPackage extends EPackage {
 	 * The meta object id for the '{@link org.eclipse.papyrus.umldi.UmlCompartmentKind <em>Uml Compartment Kind</em>}' enum.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.papyrus.umldi.UmlCompartmentKind
 	 * @see org.eclipse.papyrus.umldi.impl.UMLDIPackageImpl#getUmlCompartmentKind()
 	 * @generated
@@ -1190,17 +1318,18 @@ public interface UMLDIPackage extends EPackage {
 	 * The meta object id for the '{@link org.eclipse.papyrus.umldi.UmlLabelKind <em>Uml Label Kind</em>}' enum.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.papyrus.umldi.UmlLabelKind
 	 * @see org.eclipse.papyrus.umldi.impl.UMLDIPackageImpl#getUmlLabelKind()
 	 * @generated
 	 */
 	int UML_LABEL_KIND = 8;
 
-
 	/**
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.umldi.UmlDiagram <em>Uml Diagram</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Uml Diagram</em>'.
 	 * @see org.eclipse.papyrus.umldi.UmlDiagram
 	 * @generated
@@ -1211,6 +1340,7 @@ public interface UMLDIPackage extends EPackage {
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.umldi.UmlDiagramElement <em>Uml Diagram Element</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Uml Diagram Element</em>'.
 	 * @see org.eclipse.papyrus.umldi.UmlDiagramElement
 	 * @generated
@@ -1218,9 +1348,11 @@ public interface UMLDIPackage extends EPackage {
 	EClass getUmlDiagramElement();
 
 	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.umldi.UmlDiagramElement#getUmlModelElement <em>Uml Model Element</em>}'.
+	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.umldi.UmlDiagramElement#getUmlModelElement
+	 * <em>Uml Model Element</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference list '<em>Uml Model Element</em>'.
 	 * @see org.eclipse.papyrus.umldi.UmlDiagramElement#getUmlModelElement()
 	 * @see #getUmlDiagramElement()
@@ -1232,6 +1364,7 @@ public interface UMLDIPackage extends EPackage {
 	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.umldi.UmlDiagramElement#getSharedUmlStyle <em>Shared Uml Style</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Shared Uml Style</em>'.
 	 * @see org.eclipse.papyrus.umldi.UmlDiagramElement#getSharedUmlStyle()
 	 * @see #getUmlDiagramElement()
@@ -1240,9 +1373,11 @@ public interface UMLDIPackage extends EPackage {
 	EReference getUmlDiagramElement_SharedUmlStyle();
 
 	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.umldi.UmlDiagramElement#getLocalUmlStyle <em>Local Uml Style</em>}'.
+	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.umldi.UmlDiagramElement#getLocalUmlStyle
+	 * <em>Local Uml Style</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference '<em>Local Uml Style</em>'.
 	 * @see org.eclipse.papyrus.umldi.UmlDiagramElement#getLocalUmlStyle()
 	 * @see #getUmlDiagramElement()
@@ -1251,9 +1386,11 @@ public interface UMLDIPackage extends EPackage {
 	EReference getUmlDiagramElement_LocalUmlStyle();
 
 	/**
-	 * Returns the meta object for the container reference '{@link org.eclipse.papyrus.umldi.UmlDiagramElement#getOwningUmlDiagramElement <em>Owning Uml Diagram Element</em>}'.
+	 * Returns the meta object for the container reference '{@link org.eclipse.papyrus.umldi.UmlDiagramElement#getOwningUmlDiagramElement
+	 * <em>Owning Uml Diagram Element</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the container reference '<em>Owning Uml Diagram Element</em>'.
 	 * @see org.eclipse.papyrus.umldi.UmlDiagramElement#getOwningUmlDiagramElement()
 	 * @see #getUmlDiagramElement()
@@ -1262,9 +1399,11 @@ public interface UMLDIPackage extends EPackage {
 	EReference getUmlDiagramElement_OwningUmlDiagramElement();
 
 	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.umldi.UmlDiagramElement#getOwnedUmlDiagramElement <em>Owned Uml Diagram Element</em>}'.
+	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.umldi.UmlDiagramElement#getOwnedUmlDiagramElement
+	 * <em>Owned Uml Diagram Element</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the containment reference list '<em>Owned Uml Diagram Element</em>'.
 	 * @see org.eclipse.papyrus.umldi.UmlDiagramElement#getOwnedUmlDiagramElement()
 	 * @see #getUmlDiagramElement()
@@ -1276,6 +1415,7 @@ public interface UMLDIPackage extends EPackage {
 	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.umldi.UmlDiagramElement#getTargetUmlEdge <em>Target Uml Edge</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference list '<em>Target Uml Edge</em>'.
 	 * @see org.eclipse.papyrus.umldi.UmlDiagramElement#getTargetUmlEdge()
 	 * @see #getUmlDiagramElement()
@@ -1287,6 +1427,7 @@ public interface UMLDIPackage extends EPackage {
 	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.umldi.UmlDiagramElement#getSourceUmlEdge <em>Source Uml Edge</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference list '<em>Source Uml Edge</em>'.
 	 * @see org.eclipse.papyrus.umldi.UmlDiagramElement#getSourceUmlEdge()
 	 * @see #getUmlDiagramElement()
@@ -1298,6 +1439,7 @@ public interface UMLDIPackage extends EPackage {
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.umldi.UmlStyle <em>Uml Style</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Uml Style</em>'.
 	 * @see org.eclipse.papyrus.umldi.UmlStyle
 	 * @generated
@@ -1308,6 +1450,7 @@ public interface UMLDIPackage extends EPackage {
 	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.umldi.UmlStyle#getFontName <em>Font Name</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Font Name</em>'.
 	 * @see org.eclipse.papyrus.umldi.UmlStyle#getFontName()
 	 * @see #getUmlStyle()
@@ -1319,6 +1462,7 @@ public interface UMLDIPackage extends EPackage {
 	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.umldi.UmlStyle#getFontSize <em>Font Size</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Font Size</em>'.
 	 * @see org.eclipse.papyrus.umldi.UmlStyle#getFontSize()
 	 * @see #getUmlStyle()
@@ -1327,9 +1471,12 @@ public interface UMLDIPackage extends EPackage {
 	EAttribute getUmlStyle_FontSize();
 
 	/**
-	 * Returns the meta object for the '{@link org.eclipse.papyrus.umldi.UmlStyle#fontsizePositive(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Fontsize Positive</em>}' operation.
+	 * Returns the meta object for the '
+	 * {@link org.eclipse.papyrus.umldi.UmlStyle#fontsizePositive(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
+	 * <em>Fontsize Positive</em>}' operation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the '<em>Fontsize Positive</em>' operation.
 	 * @see org.eclipse.papyrus.umldi.UmlStyle#fontsizePositive(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
 	 * @generated
@@ -1340,6 +1487,7 @@ public interface UMLDIPackage extends EPackage {
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.umldi.UmlEdge <em>Uml Edge</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Uml Edge</em>'.
 	 * @see org.eclipse.papyrus.umldi.UmlEdge
 	 * @generated
@@ -1347,9 +1495,11 @@ public interface UMLDIPackage extends EPackage {
 	EClass getUmlEdge();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.umldi.UmlEdge#getSourceUmlDiagramElement <em>Source Uml Diagram Element</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.umldi.UmlEdge#getSourceUmlDiagramElement
+	 * <em>Source Uml Diagram Element</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Source Uml Diagram Element</em>'.
 	 * @see org.eclipse.papyrus.umldi.UmlEdge#getSourceUmlDiagramElement()
 	 * @see #getUmlEdge()
@@ -1358,9 +1508,11 @@ public interface UMLDIPackage extends EPackage {
 	EReference getUmlEdge_SourceUmlDiagramElement();
 
 	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.umldi.UmlEdge#getTargetUmlDiagramElement <em>Target Uml Diagram Element</em>}'.
+	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.umldi.UmlEdge#getTargetUmlDiagramElement
+	 * <em>Target Uml Diagram Element</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the reference '<em>Target Uml Diagram Element</em>'.
 	 * @see org.eclipse.papyrus.umldi.UmlEdge#getTargetUmlDiagramElement()
 	 * @see #getUmlEdge()
@@ -1372,6 +1524,7 @@ public interface UMLDIPackage extends EPackage {
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.umldi.UmlCompartment <em>Uml Compartment</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Uml Compartment</em>'.
 	 * @see org.eclipse.papyrus.umldi.UmlCompartment
 	 * @generated
@@ -1382,6 +1535,7 @@ public interface UMLDIPackage extends EPackage {
 	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.umldi.UmlCompartment#getKind <em>Kind</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Kind</em>'.
 	 * @see org.eclipse.papyrus.umldi.UmlCompartment#getKind()
 	 * @see #getUmlCompartment()
@@ -1393,6 +1547,7 @@ public interface UMLDIPackage extends EPackage {
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.umldi.UmlLabel <em>Uml Label</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Uml Label</em>'.
 	 * @see org.eclipse.papyrus.umldi.UmlLabel
 	 * @generated
@@ -1403,6 +1558,7 @@ public interface UMLDIPackage extends EPackage {
 	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.umldi.UmlLabel#getKind <em>Kind</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for the attribute '<em>Kind</em>'.
 	 * @see org.eclipse.papyrus.umldi.UmlLabel#getKind()
 	 * @see #getUmlLabel()
@@ -1414,6 +1570,7 @@ public interface UMLDIPackage extends EPackage {
 	 * Returns the meta object for enum '{@link org.eclipse.papyrus.umldi.UmlCompartmentKind <em>Uml Compartment Kind</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for enum '<em>Uml Compartment Kind</em>'.
 	 * @see org.eclipse.papyrus.umldi.UmlCompartmentKind
 	 * @generated
@@ -1424,6 +1581,7 @@ public interface UMLDIPackage extends EPackage {
 	 * Returns the meta object for enum '{@link org.eclipse.papyrus.umldi.UmlLabelKind <em>Uml Label Kind</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for enum '<em>Uml Label Kind</em>'.
 	 * @see org.eclipse.papyrus.umldi.UmlLabelKind
 	 * @generated
@@ -1434,6 +1592,7 @@ public interface UMLDIPackage extends EPackage {
 	 * Returns the meta object for class '{@link org.eclipse.papyrus.umldi.UmlShape <em>Uml Shape</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the meta object for class '<em>Uml Shape</em>'.
 	 * @see org.eclipse.papyrus.umldi.UmlShape
 	 * @generated
@@ -1444,6 +1603,7 @@ public interface UMLDIPackage extends EPackage {
 	 * Returns the factory that creates the instances of the model.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the factory that creates the instances of the model.
 	 * @generated
 	 */
@@ -1453,20 +1613,23 @@ public interface UMLDIPackage extends EPackage {
 	 * <!-- begin-user-doc -->
 	 * Defines literals for the meta objects that represent
 	 * <ul>
-	 *   <li>each class,</li>
-	 *   <li>each feature of each class,</li>
-	 *   <li>each operation of each class,</li>
-	 *   <li>each enum,</li>
-	 *   <li>and each data type</li>
+	 * <li>each class,</li>
+	 * <li>each feature of each class,</li>
+	 * <li>each operation of each class,</li>
+	 * <li>each enum,</li>
+	 * <li>and each data type</li>
 	 * </ul>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	interface Literals {
+
 		/**
 		 * The meta object literal for the '{@link org.eclipse.papyrus.umldi.impl.UmlDiagramImpl <em>Uml Diagram</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.umldi.impl.UmlDiagramImpl
 		 * @see org.eclipse.papyrus.umldi.impl.UMLDIPackageImpl#getUmlDiagram()
 		 * @generated
@@ -1477,6 +1640,7 @@ public interface UMLDIPackage extends EPackage {
 		 * The meta object literal for the '{@link org.eclipse.papyrus.umldi.impl.UmlDiagramElementImpl <em>Uml Diagram Element</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.umldi.impl.UmlDiagramElementImpl
 		 * @see org.eclipse.papyrus.umldi.impl.UMLDIPackageImpl#getUmlDiagramElement()
 		 * @generated
@@ -1487,6 +1651,7 @@ public interface UMLDIPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Uml Model Element</b></em>' reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference UML_DIAGRAM_ELEMENT__UML_MODEL_ELEMENT = eINSTANCE.getUmlDiagramElement_UmlModelElement();
@@ -1495,6 +1660,7 @@ public interface UMLDIPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Shared Uml Style</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference UML_DIAGRAM_ELEMENT__SHARED_UML_STYLE = eINSTANCE.getUmlDiagramElement_SharedUmlStyle();
@@ -1503,6 +1669,7 @@ public interface UMLDIPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Local Uml Style</b></em>' containment reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference UML_DIAGRAM_ELEMENT__LOCAL_UML_STYLE = eINSTANCE.getUmlDiagramElement_LocalUmlStyle();
@@ -1511,6 +1678,7 @@ public interface UMLDIPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Owning Uml Diagram Element</b></em>' container reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference UML_DIAGRAM_ELEMENT__OWNING_UML_DIAGRAM_ELEMENT = eINSTANCE.getUmlDiagramElement_OwningUmlDiagramElement();
@@ -1519,6 +1687,7 @@ public interface UMLDIPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Owned Uml Diagram Element</b></em>' containment reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference UML_DIAGRAM_ELEMENT__OWNED_UML_DIAGRAM_ELEMENT = eINSTANCE.getUmlDiagramElement_OwnedUmlDiagramElement();
@@ -1527,6 +1696,7 @@ public interface UMLDIPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Target Uml Edge</b></em>' reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference UML_DIAGRAM_ELEMENT__TARGET_UML_EDGE = eINSTANCE.getUmlDiagramElement_TargetUmlEdge();
@@ -1535,6 +1705,7 @@ public interface UMLDIPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Source Uml Edge</b></em>' reference list feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference UML_DIAGRAM_ELEMENT__SOURCE_UML_EDGE = eINSTANCE.getUmlDiagramElement_SourceUmlEdge();
@@ -1543,6 +1714,7 @@ public interface UMLDIPackage extends EPackage {
 		 * The meta object literal for the '{@link org.eclipse.papyrus.umldi.impl.UmlStyleImpl <em>Uml Style</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.umldi.impl.UmlStyleImpl
 		 * @see org.eclipse.papyrus.umldi.impl.UMLDIPackageImpl#getUmlStyle()
 		 * @generated
@@ -1553,6 +1725,7 @@ public interface UMLDIPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Font Name</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute UML_STYLE__FONT_NAME = eINSTANCE.getUmlStyle_FontName();
@@ -1561,6 +1734,7 @@ public interface UMLDIPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Font Size</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute UML_STYLE__FONT_SIZE = eINSTANCE.getUmlStyle_FontSize();
@@ -1569,6 +1743,7 @@ public interface UMLDIPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Fontsize Positive</b></em>' operation.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EOperation UML_STYLE___FONTSIZE_POSITIVE__DIAGNOSTICCHAIN_MAP = eINSTANCE.getUmlStyle__FontsizePositive__DiagnosticChain_Map();
@@ -1577,6 +1752,7 @@ public interface UMLDIPackage extends EPackage {
 		 * The meta object literal for the '{@link org.eclipse.papyrus.umldi.impl.UmlEdgeImpl <em>Uml Edge</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.umldi.impl.UmlEdgeImpl
 		 * @see org.eclipse.papyrus.umldi.impl.UMLDIPackageImpl#getUmlEdge()
 		 * @generated
@@ -1587,6 +1763,7 @@ public interface UMLDIPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Source Uml Diagram Element</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference UML_EDGE__SOURCE_UML_DIAGRAM_ELEMENT = eINSTANCE.getUmlEdge_SourceUmlDiagramElement();
@@ -1595,6 +1772,7 @@ public interface UMLDIPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Target Uml Diagram Element</b></em>' reference feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EReference UML_EDGE__TARGET_UML_DIAGRAM_ELEMENT = eINSTANCE.getUmlEdge_TargetUmlDiagramElement();
@@ -1603,6 +1781,7 @@ public interface UMLDIPackage extends EPackage {
 		 * The meta object literal for the '{@link org.eclipse.papyrus.umldi.impl.UmlCompartmentImpl <em>Uml Compartment</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.umldi.impl.UmlCompartmentImpl
 		 * @see org.eclipse.papyrus.umldi.impl.UMLDIPackageImpl#getUmlCompartment()
 		 * @generated
@@ -1613,6 +1792,7 @@ public interface UMLDIPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Kind</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute UML_COMPARTMENT__KIND = eINSTANCE.getUmlCompartment_Kind();
@@ -1621,6 +1801,7 @@ public interface UMLDIPackage extends EPackage {
 		 * The meta object literal for the '{@link org.eclipse.papyrus.umldi.impl.UmlLabelImpl <em>Uml Label</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.umldi.impl.UmlLabelImpl
 		 * @see org.eclipse.papyrus.umldi.impl.UMLDIPackageImpl#getUmlLabel()
 		 * @generated
@@ -1631,6 +1812,7 @@ public interface UMLDIPackage extends EPackage {
 		 * The meta object literal for the '<em><b>Kind</b></em>' attribute feature.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @generated
 		 */
 		EAttribute UML_LABEL__KIND = eINSTANCE.getUmlLabel_Kind();
@@ -1639,6 +1821,7 @@ public interface UMLDIPackage extends EPackage {
 		 * The meta object literal for the '{@link org.eclipse.papyrus.umldi.UmlCompartmentKind <em>Uml Compartment Kind</em>}' enum.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.umldi.UmlCompartmentKind
 		 * @see org.eclipse.papyrus.umldi.impl.UMLDIPackageImpl#getUmlCompartmentKind()
 		 * @generated
@@ -1649,6 +1832,7 @@ public interface UMLDIPackage extends EPackage {
 		 * The meta object literal for the '{@link org.eclipse.papyrus.umldi.UmlLabelKind <em>Uml Label Kind</em>}' enum.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.umldi.UmlLabelKind
 		 * @see org.eclipse.papyrus.umldi.impl.UMLDIPackageImpl#getUmlLabelKind()
 		 * @generated
@@ -1659,12 +1843,11 @@ public interface UMLDIPackage extends EPackage {
 		 * The meta object literal for the '{@link org.eclipse.papyrus.umldi.impl.UmlShapeImpl <em>Uml Shape</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
+		 * 
 		 * @see org.eclipse.papyrus.umldi.impl.UmlShapeImpl
 		 * @see org.eclipse.papyrus.umldi.impl.UMLDIPackageImpl#getUmlShape()
 		 * @generated
 		 */
 		EClass UML_SHAPE = eINSTANCE.getUmlShape();
-
 	}
-
 } //UMLDIPackage
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/UmlCompartment.java b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/UmlCompartment.java
index 0483e558079..b7e33a9043d 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/UmlCompartment.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/UmlCompartment.java
@@ -11,33 +11,33 @@
  */
 package org.eclipse.papyrus.umldi;
 
-
 /**
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Uml Compartment</b></em>'.
  * <!-- end-user-doc -->
- *
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.umldi.UmlCompartment#getKind <em>Kind</em>}</li>
+ * <li>{@link org.eclipse.papyrus.umldi.UmlCompartment#getKind <em>Kind</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.umldi.UMLDIPackage#getUmlCompartment()
  * @model
  * @generated
  */
 public interface UmlCompartment extends UmlShape {
+
 	/**
 	 * Returns the value of the '<em><b>Kind</b></em>' attribute.
 	 * The literals are from the enumeration {@link org.eclipse.papyrus.umldi.UmlCompartmentKind}.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Kind</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Kind</em>' attribute isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Kind</em>' attribute.
 	 * @see org.eclipse.papyrus.umldi.UmlCompartmentKind
 	 * @see #setKind(UmlCompartmentKind)
@@ -51,11 +51,12 @@ public interface UmlCompartment extends UmlShape {
 	 * Sets the value of the '{@link org.eclipse.papyrus.umldi.UmlCompartment#getKind <em>Kind</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Kind</em>' attribute.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Kind</em>' attribute.
 	 * @see org.eclipse.papyrus.umldi.UmlCompartmentKind
 	 * @see #getKind()
 	 * @generated
 	 */
 	void setKind(UmlCompartmentKind value);
-
 } // UmlCompartment
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/UmlCompartmentKind.java b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/UmlCompartmentKind.java
index 426a00d7b0d..2d4b6c8f5b1 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/UmlCompartmentKind.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/UmlCompartmentKind.java
@@ -22,6 +22,7 @@ import org.eclipse.emf.common.util.Enumerator;
  * A representation of the literals of the enumeration '<em><b>Uml Compartment Kind</b></em>',
  * and utility methods for working with them.
  * <!-- end-user-doc -->
+ * 
  * @see org.eclipse.papyrus.umldi.UMLDIPackage#getUmlCompartmentKind()
  * @model
  * @generated
@@ -31,16 +32,17 @@ public enum UmlCompartmentKind implements Enumerator {
 	 * The '<em><b>Attributes</b></em>' literal object.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #ATTRIBUTES_VALUE
 	 * @generated
 	 * @ordered
 	 */
 	ATTRIBUTES(0, "attributes", "attributes"),
-
 	/**
 	 * The '<em><b>Operations</b></em>' literal object.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #OPERATIONS_VALUE
 	 * @generated
 	 * @ordered
@@ -51,10 +53,10 @@ public enum UmlCompartmentKind implements Enumerator {
 	 * The '<em><b>Attributes</b></em>' literal value.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of '<em><b>Attributes</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of '<em><b>Attributes</b></em>' literal object isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #ATTRIBUTES
 	 * @model name="attributes"
 	 * @generated
@@ -66,10 +68,10 @@ public enum UmlCompartmentKind implements Enumerator {
 	 * The '<em><b>Operations</b></em>' literal value.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of '<em><b>Operations</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of '<em><b>Operations</b></em>' literal object isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #OPERATIONS
 	 * @model name="operations"
 	 * @generated
@@ -81,18 +83,16 @@ public enum UmlCompartmentKind implements Enumerator {
 	 * An array of all the '<em><b>Uml Compartment Kind</b></em>' enumerators.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	private static final UmlCompartmentKind[] VALUES_ARRAY =
-		new UmlCompartmentKind[] {
-			ATTRIBUTES,
-			OPERATIONS,
-		};
+	private static final UmlCompartmentKind[] VALUES_ARRAY = new UmlCompartmentKind[]{ ATTRIBUTES, OPERATIONS, };
 
 	/**
 	 * A public read-only list of all the '<em><b>Uml Compartment Kind</b></em>' enumerators.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static final List<UmlCompartmentKind> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
@@ -101,12 +101,13 @@ public enum UmlCompartmentKind implements Enumerator {
 	 * Returns the '<em><b>Uml Compartment Kind</b></em>' literal with the specified literal value.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static UmlCompartmentKind get(String literal) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+		for(int i = 0; i < VALUES_ARRAY.length; ++i) {
 			UmlCompartmentKind result = VALUES_ARRAY[i];
-			if (result.toString().equals(literal)) {
+			if(result.toString().equals(literal)) {
 				return result;
 			}
 		}
@@ -117,12 +118,13 @@ public enum UmlCompartmentKind implements Enumerator {
 	 * Returns the '<em><b>Uml Compartment Kind</b></em>' literal with the specified name.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static UmlCompartmentKind getByName(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+		for(int i = 0; i < VALUES_ARRAY.length; ++i) {
 			UmlCompartmentKind result = VALUES_ARRAY[i];
-			if (result.getName().equals(name)) {
+			if(result.getName().equals(name)) {
 				return result;
 			}
 		}
@@ -133,12 +135,15 @@ public enum UmlCompartmentKind implements Enumerator {
 	 * Returns the '<em><b>Uml Compartment Kind</b></em>' literal with the specified integer value.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static UmlCompartmentKind get(int value) {
-		switch (value) {
-			case ATTRIBUTES_VALUE: return ATTRIBUTES;
-			case OPERATIONS_VALUE: return OPERATIONS;
+		switch(value) {
+		case ATTRIBUTES_VALUE:
+			return ATTRIBUTES;
+		case OPERATIONS_VALUE:
+			return OPERATIONS;
 		}
 		return null;
 	}
@@ -146,6 +151,7 @@ public enum UmlCompartmentKind implements Enumerator {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private final int value;
@@ -153,6 +159,7 @@ public enum UmlCompartmentKind implements Enumerator {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private final String name;
@@ -160,6 +167,7 @@ public enum UmlCompartmentKind implements Enumerator {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private final String literal;
@@ -168,6 +176,7 @@ public enum UmlCompartmentKind implements Enumerator {
 	 * Only this class can construct instances.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private UmlCompartmentKind(int value, String name, String literal) {
@@ -179,39 +188,42 @@ public enum UmlCompartmentKind implements Enumerator {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public int getValue() {
-	  return value;
+		return value;
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getName() {
-	  return name;
+		return name;
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getLiteral() {
-	  return literal;
+		return literal;
 	}
 
 	/**
 	 * Returns the literal value of the enumerator, which is its string representation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
 		return literal;
 	}
-	
 } //UmlCompartmentKind
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/UmlDiagram.java b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/UmlDiagram.java
index 9b4028f84c6..181be814de7 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/UmlDiagram.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/UmlDiagram.java
@@ -17,12 +17,12 @@ import org.eclipse.papyrus.dd.di.Diagram;
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Uml Diagram</b></em>'.
  * <!-- end-user-doc -->
- *
+ * 
  * <!-- begin-model-doc -->
  * The most general class for UML diagrams.
  * <!-- end-model-doc -->
- *
- *
+ * 
+ * 
  * @see org.eclipse.papyrus.umldi.UMLDIPackage#getUmlDiagram()
  * @model
  * @generated
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/UmlDiagramElement.java b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/UmlDiagramElement.java
index 88e06342686..ccdeb495a61 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/UmlDiagramElement.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/UmlDiagramElement.java
@@ -21,43 +21,45 @@ import org.eclipse.uml2.uml.Element;
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Uml Diagram Element</b></em>'.
  * <!-- end-user-doc -->
- *
+ * 
  * <!-- begin-model-doc -->
  * The most general class for UML diagram interchange.
  * <!-- end-model-doc -->
- *
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.umldi.UmlDiagramElement#getUmlModelElement <em>Uml Model Element</em>}</li>
- *   <li>{@link org.eclipse.papyrus.umldi.UmlDiagramElement#getSharedUmlStyle <em>Shared Uml Style</em>}</li>
- *   <li>{@link org.eclipse.papyrus.umldi.UmlDiagramElement#getLocalUmlStyle <em>Local Uml Style</em>}</li>
- *   <li>{@link org.eclipse.papyrus.umldi.UmlDiagramElement#getOwningUmlDiagramElement <em>Owning Uml Diagram Element</em>}</li>
- *   <li>{@link org.eclipse.papyrus.umldi.UmlDiagramElement#getOwnedUmlDiagramElement <em>Owned Uml Diagram Element</em>}</li>
- *   <li>{@link org.eclipse.papyrus.umldi.UmlDiagramElement#getTargetUmlEdge <em>Target Uml Edge</em>}</li>
- *   <li>{@link org.eclipse.papyrus.umldi.UmlDiagramElement#getSourceUmlEdge <em>Source Uml Edge</em>}</li>
+ * <li>{@link org.eclipse.papyrus.umldi.UmlDiagramElement#getUmlModelElement <em>Uml Model Element</em>}</li>
+ * <li>{@link org.eclipse.papyrus.umldi.UmlDiagramElement#getSharedUmlStyle <em>Shared Uml Style</em>}</li>
+ * <li>{@link org.eclipse.papyrus.umldi.UmlDiagramElement#getLocalUmlStyle <em>Local Uml Style</em>}</li>
+ * <li>{@link org.eclipse.papyrus.umldi.UmlDiagramElement#getOwningUmlDiagramElement <em>Owning Uml Diagram Element</em>}</li>
+ * <li>{@link org.eclipse.papyrus.umldi.UmlDiagramElement#getOwnedUmlDiagramElement <em>Owned Uml Diagram Element</em>}</li>
+ * <li>{@link org.eclipse.papyrus.umldi.UmlDiagramElement#getTargetUmlEdge <em>Target Uml Edge</em>}</li>
+ * <li>{@link org.eclipse.papyrus.umldi.UmlDiagramElement#getSourceUmlEdge <em>Source Uml Edge</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.umldi.UMLDIPackage#getUmlDiagramElement()
  * @model abstract="true"
  * @generated
  */
 public interface UmlDiagramElement extends DiagramElement {
+
 	/**
 	 * Returns the value of the '<em><b>Uml Model Element</b></em>' reference list.
 	 * The list contents are of type {@link org.eclipse.uml2.uml.Element}.
 	 * <p>
 	 * This feature subsets the following features:
 	 * <ul>
-	 *   <li>'{@link org.eclipse.papyrus.dd.di.DiagramElement#getModelElement() <em>Model Element</em>}'</li>
+	 * <li>'{@link org.eclipse.papyrus.dd.di.DiagramElement#getModelElement() <em>Model Element</em>}'</li>
 	 * </ul>
 	 * </p>
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * <!-- begin-model-doc -->
-	 * Restricts UMLDiagramElements to show UML Elements, rather than other language elements. 
+	 * Restricts UMLDiagramElements to show UML Elements, rather than other language elements.
 	 * <!-- end-model-doc -->
+	 * 
 	 * @return the value of the '<em>Uml Model Element</em>' reference list.
 	 * @see org.eclipse.papyrus.umldi.UMLDIPackage#getUmlDiagramElement_UmlModelElement()
 	 * @model
@@ -70,7 +72,7 @@ public interface UmlDiagramElement extends DiagramElement {
 	 * <p>
 	 * This feature subsets the following features:
 	 * <ul>
-	 *   <li>'{@link org.eclipse.papyrus.dd.di.DiagramElement#getSharedStyle() <em>Shared Style</em>}'</li>
+	 * <li>'{@link org.eclipse.papyrus.dd.di.DiagramElement#getSharedStyle() <em>Shared Style</em>}'</li>
 	 * </ul>
 	 * </p>
 	 * <!-- begin-user-doc -->
@@ -78,6 +80,7 @@ public interface UmlDiagramElement extends DiagramElement {
 	 * <!-- begin-model-doc -->
 	 * Restricts shared styles to UMLStyles.
 	 * <!-- end-model-doc -->
+	 * 
 	 * @return the value of the '<em>Shared Uml Style</em>' reference.
 	 * @see #setSharedUmlStyle(UmlStyle)
 	 * @see org.eclipse.papyrus.umldi.UMLDIPackage#getUmlDiagramElement_SharedUmlStyle()
@@ -90,7 +93,9 @@ public interface UmlDiagramElement extends DiagramElement {
 	 * Sets the value of the '{@link org.eclipse.papyrus.umldi.UmlDiagramElement#getSharedUmlStyle <em>Shared Uml Style</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Shared Uml Style</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Shared Uml Style</em>' reference.
 	 * @see #getSharedUmlStyle()
 	 * @generated
 	 */
@@ -101,7 +106,7 @@ public interface UmlDiagramElement extends DiagramElement {
 	 * <p>
 	 * This feature subsets the following features:
 	 * <ul>
-	 *   <li>'{@link org.eclipse.papyrus.dd.di.DiagramElement#getLocalStyle() <em>Local Style</em>}'</li>
+	 * <li>'{@link org.eclipse.papyrus.dd.di.DiagramElement#getLocalStyle() <em>Local Style</em>}'</li>
 	 * </ul>
 	 * </p>
 	 * <!-- begin-user-doc -->
@@ -109,6 +114,7 @@ public interface UmlDiagramElement extends DiagramElement {
 	 * <!-- begin-model-doc -->
 	 * Restricts owned styles to UMLStyles.
 	 * <!-- end-model-doc -->
+	 * 
 	 * @return the value of the '<em>Local Uml Style</em>' containment reference.
 	 * @see #setLocalUmlStyle(UmlStyle)
 	 * @see org.eclipse.papyrus.umldi.UMLDIPackage#getUmlDiagramElement_LocalUmlStyle()
@@ -121,7 +127,9 @@ public interface UmlDiagramElement extends DiagramElement {
 	 * Sets the value of the '{@link org.eclipse.papyrus.umldi.UmlDiagramElement#getLocalUmlStyle <em>Local Uml Style</em>}' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Local Uml Style</em>' containment reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Local Uml Style</em>' containment reference.
 	 * @see #getLocalUmlStyle()
 	 * @generated
 	 */
@@ -129,11 +137,12 @@ public interface UmlDiagramElement extends DiagramElement {
 
 	/**
 	 * Returns the value of the '<em><b>Owning Uml Diagram Element</b></em>' container reference.
-	 * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.umldi.UmlDiagramElement#getOwnedUmlDiagramElement <em>Owned Uml Diagram Element</em>}'.
+	 * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.umldi.UmlDiagramElement#getOwnedUmlDiagramElement
+	 * <em>Owned Uml Diagram Element</em>}'.
 	 * <p>
 	 * This feature subsets the following features:
 	 * <ul>
-	 *   <li>'{@link org.eclipse.papyrus.dd.di.DiagramElement#getOwningDiagramElement() <em>Owning Diagram Element</em>}'</li>
+	 * <li>'{@link org.eclipse.papyrus.dd.di.DiagramElement#getOwningDiagramElement() <em>Owning Diagram Element</em>}'</li>
 	 * </ul>
 	 * </p>
 	 * <!-- begin-user-doc -->
@@ -141,6 +150,7 @@ public interface UmlDiagramElement extends DiagramElement {
 	 * <!-- begin-model-doc -->
 	 * Restricts UMLDiagramElements to be owned by only UMLDiagramElements.
 	 * <!-- end-model-doc -->
+	 * 
 	 * @return the value of the '<em>Owning Uml Diagram Element</em>' container reference.
 	 * @see #setOwningUmlDiagramElement(UmlDiagramElement)
 	 * @see org.eclipse.papyrus.umldi.UMLDIPackage#getUmlDiagramElement_OwningUmlDiagramElement()
@@ -151,10 +161,13 @@ public interface UmlDiagramElement extends DiagramElement {
 	UmlDiagramElement getOwningUmlDiagramElement();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.umldi.UmlDiagramElement#getOwningUmlDiagramElement <em>Owning Uml Diagram Element</em>}' container reference.
+	 * Sets the value of the '{@link org.eclipse.papyrus.umldi.UmlDiagramElement#getOwningUmlDiagramElement <em>Owning Uml Diagram Element</em>}'
+	 * container reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Owning Uml Diagram Element</em>' container reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Owning Uml Diagram Element</em>' container reference.
 	 * @see #getOwningUmlDiagramElement()
 	 * @generated
 	 */
@@ -163,11 +176,12 @@ public interface UmlDiagramElement extends DiagramElement {
 	/**
 	 * Returns the value of the '<em><b>Owned Uml Diagram Element</b></em>' containment reference list.
 	 * The list contents are of type {@link org.eclipse.papyrus.umldi.UmlDiagramElement}.
-	 * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.umldi.UmlDiagramElement#getOwningUmlDiagramElement <em>Owning Uml Diagram Element</em>}'.
+	 * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.umldi.UmlDiagramElement#getOwningUmlDiagramElement
+	 * <em>Owning Uml Diagram Element</em>}'.
 	 * <p>
 	 * This feature subsets the following features:
 	 * <ul>
-	 *   <li>'{@link org.eclipse.papyrus.dd.di.DiagramElement#getOwnedDiagramElement() <em>Owned Diagram Element</em>}'</li>
+	 * <li>'{@link org.eclipse.papyrus.dd.di.DiagramElement#getOwnedDiagramElement() <em>Owned Diagram Element</em>}'</li>
 	 * </ul>
 	 * </p>
 	 * <!-- begin-user-doc -->
@@ -175,6 +189,7 @@ public interface UmlDiagramElement extends DiagramElement {
 	 * <!-- begin-model-doc -->
 	 * Restricts UMLDiagramElements to own only UMLDiagramElements.
 	 * <!-- end-model-doc -->
+	 * 
 	 * @return the value of the '<em>Owned Uml Diagram Element</em>' containment reference list.
 	 * @see org.eclipse.papyrus.umldi.UMLDIPackage#getUmlDiagramElement_OwnedUmlDiagramElement()
 	 * @see org.eclipse.papyrus.umldi.UmlDiagramElement#getOwningUmlDiagramElement
@@ -186,19 +201,20 @@ public interface UmlDiagramElement extends DiagramElement {
 	/**
 	 * Returns the value of the '<em><b>Target Uml Edge</b></em>' reference list.
 	 * The list contents are of type {@link org.eclipse.papyrus.umldi.UmlEdge}.
-	 * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.umldi.UmlEdge#getTargetUmlDiagramElement <em>Target Uml Diagram Element</em>}'.
+	 * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.umldi.UmlEdge#getTargetUmlDiagramElement
+	 * <em>Target Uml Diagram Element</em>}'.
 	 * <p>
 	 * This feature subsets the following features:
 	 * <ul>
-	 *   <li>'{@link org.eclipse.papyrus.dd.di.DiagramElement#getTargetEdge() <em>Target Edge</em>}'</li>
+	 * <li>'{@link org.eclipse.papyrus.dd.di.DiagramElement#getTargetEdge() <em>Target Edge</em>}'</li>
 	 * </ul>
 	 * </p>
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Target Uml Edge</em>' reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Target Uml Edge</em>' reference list isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Target Uml Edge</em>' reference list.
 	 * @see org.eclipse.papyrus.umldi.UMLDIPackage#getUmlDiagramElement_TargetUmlEdge()
 	 * @see org.eclipse.papyrus.umldi.UmlEdge#getTargetUmlDiagramElement
@@ -210,19 +226,20 @@ public interface UmlDiagramElement extends DiagramElement {
 	/**
 	 * Returns the value of the '<em><b>Source Uml Edge</b></em>' reference list.
 	 * The list contents are of type {@link org.eclipse.papyrus.umldi.UmlEdge}.
-	 * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.umldi.UmlEdge#getSourceUmlDiagramElement <em>Source Uml Diagram Element</em>}'.
+	 * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.umldi.UmlEdge#getSourceUmlDiagramElement
+	 * <em>Source Uml Diagram Element</em>}'.
 	 * <p>
 	 * This feature subsets the following features:
 	 * <ul>
-	 *   <li>'{@link org.eclipse.papyrus.dd.di.DiagramElement#getSourceEdge() <em>Source Edge</em>}'</li>
+	 * <li>'{@link org.eclipse.papyrus.dd.di.DiagramElement#getSourceEdge() <em>Source Edge</em>}'</li>
 	 * </ul>
 	 * </p>
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Source Uml Edge</em>' reference list isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Source Uml Edge</em>' reference list isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Source Uml Edge</em>' reference list.
 	 * @see org.eclipse.papyrus.umldi.UMLDIPackage#getUmlDiagramElement_SourceUmlEdge()
 	 * @see org.eclipse.papyrus.umldi.UmlEdge#getSourceUmlDiagramElement
@@ -230,5 +247,4 @@ public interface UmlDiagramElement extends DiagramElement {
 	 * @generated
 	 */
 	EList<UmlEdge> getSourceUmlEdge();
-
 } // UmlDiagramElement
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/UmlEdge.java b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/UmlEdge.java
index 398975b0786..143217e73a1 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/UmlEdge.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/UmlEdge.java
@@ -17,31 +17,32 @@ import org.eclipse.papyrus.dd.di.Edge;
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Uml Edge</b></em>'.
  * <!-- end-user-doc -->
- *
+ * 
  * <!-- begin-model-doc -->
  * The most general class for UML diagram elements that are rendered as lines.
  * <!-- end-model-doc -->
- *
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.umldi.UmlEdge#getSourceUmlDiagramElement <em>Source Uml Diagram Element</em>}</li>
- *   <li>{@link org.eclipse.papyrus.umldi.UmlEdge#getTargetUmlDiagramElement <em>Target Uml Diagram Element</em>}</li>
+ * <li>{@link org.eclipse.papyrus.umldi.UmlEdge#getSourceUmlDiagramElement <em>Source Uml Diagram Element</em>}</li>
+ * <li>{@link org.eclipse.papyrus.umldi.UmlEdge#getTargetUmlDiagramElement <em>Target Uml Diagram Element</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.umldi.UMLDIPackage#getUmlEdge()
  * @model
  * @generated
  */
 public interface UmlEdge extends UmlDiagramElement, Edge {
+
 	/**
 	 * Returns the value of the '<em><b>Source Uml Diagram Element</b></em>' reference.
 	 * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.umldi.UmlDiagramElement#getSourceUmlEdge <em>Source Uml Edge</em>}'.
 	 * <p>
 	 * This feature subsets the following features:
 	 * <ul>
-	 *   <li>'{@link org.eclipse.papyrus.dd.di.Edge#getSourceDiagramElement() <em>Source Diagram Element</em>}'</li>
+	 * <li>'{@link org.eclipse.papyrus.dd.di.Edge#getSourceDiagramElement() <em>Source Diagram Element</em>}'</li>
 	 * </ul>
 	 * </p>
 	 * <!-- begin-user-doc -->
@@ -49,6 +50,7 @@ public interface UmlEdge extends UmlDiagramElement, Edge {
 	 * <!-- begin-model-doc -->
 	 * Restricts the sources of UMLEdges to UMLDiagramElements.
 	 * <!-- end-model-doc -->
+	 * 
 	 * @return the value of the '<em>Source Uml Diagram Element</em>' reference.
 	 * @see #setSourceUmlDiagramElement(UmlDiagramElement)
 	 * @see org.eclipse.papyrus.umldi.UMLDIPackage#getUmlEdge_SourceUmlDiagramElement()
@@ -62,7 +64,9 @@ public interface UmlEdge extends UmlDiagramElement, Edge {
 	 * Sets the value of the '{@link org.eclipse.papyrus.umldi.UmlEdge#getSourceUmlDiagramElement <em>Source Uml Diagram Element</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Source Uml Diagram Element</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Source Uml Diagram Element</em>' reference.
 	 * @see #getSourceUmlDiagramElement()
 	 * @generated
 	 */
@@ -74,7 +78,7 @@ public interface UmlEdge extends UmlDiagramElement, Edge {
 	 * <p>
 	 * This feature subsets the following features:
 	 * <ul>
-	 *   <li>'{@link org.eclipse.papyrus.dd.di.Edge#getTargetDiagramElement() <em>Target Diagram Element</em>}'</li>
+	 * <li>'{@link org.eclipse.papyrus.dd.di.Edge#getTargetDiagramElement() <em>Target Diagram Element</em>}'</li>
 	 * </ul>
 	 * </p>
 	 * <!-- begin-user-doc -->
@@ -82,6 +86,7 @@ public interface UmlEdge extends UmlDiagramElement, Edge {
 	 * <!-- begin-model-doc -->
 	 * Restricts the targets of UMLEdges to UMLDiagramElements.
 	 * <!-- end-model-doc -->
+	 * 
 	 * @return the value of the '<em>Target Uml Diagram Element</em>' reference.
 	 * @see #setTargetUmlDiagramElement(UmlDiagramElement)
 	 * @see org.eclipse.papyrus.umldi.UMLDIPackage#getUmlEdge_TargetUmlDiagramElement()
@@ -95,10 +100,11 @@ public interface UmlEdge extends UmlDiagramElement, Edge {
 	 * Sets the value of the '{@link org.eclipse.papyrus.umldi.UmlEdge#getTargetUmlDiagramElement <em>Target Uml Diagram Element</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Target Uml Diagram Element</em>' reference.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Target Uml Diagram Element</em>' reference.
 	 * @see #getTargetUmlDiagramElement()
 	 * @generated
 	 */
 	void setTargetUmlDiagramElement(UmlDiagramElement value);
-
 } // UmlEdge
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/UmlLabel.java b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/UmlLabel.java
index 847adacffdd..3a158d880cc 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/UmlLabel.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/UmlLabel.java
@@ -11,33 +11,33 @@
  */
 package org.eclipse.papyrus.umldi;
 
-
 /**
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Uml Label</b></em>'.
  * <!-- end-user-doc -->
- *
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.umldi.UmlLabel#getKind <em>Kind</em>}</li>
+ * <li>{@link org.eclipse.papyrus.umldi.UmlLabel#getKind <em>Kind</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.umldi.UMLDIPackage#getUmlLabel()
  * @model
  * @generated
  */
 public interface UmlLabel extends UmlShape {
+
 	/**
 	 * Returns the value of the '<em><b>Kind</b></em>' attribute.
 	 * The literals are from the enumeration {@link org.eclipse.papyrus.umldi.UmlLabelKind}.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of the '<em>Kind</em>' attribute isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of the '<em>Kind</em>' attribute isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the value of the '<em>Kind</em>' attribute.
 	 * @see org.eclipse.papyrus.umldi.UmlLabelKind
 	 * @see #setKind(UmlLabelKind)
@@ -51,11 +51,12 @@ public interface UmlLabel extends UmlShape {
 	 * Sets the value of the '{@link org.eclipse.papyrus.umldi.UmlLabel#getKind <em>Kind</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Kind</em>' attribute.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Kind</em>' attribute.
 	 * @see org.eclipse.papyrus.umldi.UmlLabelKind
 	 * @see #getKind()
 	 * @generated
 	 */
 	void setKind(UmlLabelKind value);
-
 } // UmlLabel
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/UmlLabelKind.java b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/UmlLabelKind.java
index 4092f638b2a..5d75b70954e 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/UmlLabelKind.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/UmlLabelKind.java
@@ -22,6 +22,7 @@ import org.eclipse.emf.common.util.Enumerator;
  * A representation of the literals of the enumeration '<em><b>Uml Label Kind</b></em>',
  * and utility methods for working with them.
  * <!-- end-user-doc -->
+ * 
  * @see org.eclipse.papyrus.umldi.UMLDIPackage#getUmlLabelKind()
  * @model
  * @generated
@@ -31,6 +32,7 @@ public enum UmlLabelKind implements Enumerator {
 	 * The '<em><b>Name</b></em>' literal object.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #NAME_VALUE
 	 * @generated
 	 * @ordered
@@ -41,10 +43,10 @@ public enum UmlLabelKind implements Enumerator {
 	 * The '<em><b>Name</b></em>' literal value.
 	 * <!-- begin-user-doc -->
 	 * <p>
-	 * If the meaning of '<em><b>Name</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
+	 * If the meaning of '<em><b>Name</b></em>' literal object isn't clear, there really should be more of a description here...
 	 * </p>
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #NAME
 	 * @model name="name"
 	 * @generated
@@ -56,17 +58,16 @@ public enum UmlLabelKind implements Enumerator {
 	 * An array of all the '<em><b>Uml Label Kind</b></em>' enumerators.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	private static final UmlLabelKind[] VALUES_ARRAY =
-		new UmlLabelKind[] {
-			NAME,
-		};
+	private static final UmlLabelKind[] VALUES_ARRAY = new UmlLabelKind[]{ NAME, };
 
 	/**
 	 * A public read-only list of all the '<em><b>Uml Label Kind</b></em>' enumerators.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static final List<UmlLabelKind> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
@@ -75,12 +76,13 @@ public enum UmlLabelKind implements Enumerator {
 	 * Returns the '<em><b>Uml Label Kind</b></em>' literal with the specified literal value.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static UmlLabelKind get(String literal) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+		for(int i = 0; i < VALUES_ARRAY.length; ++i) {
 			UmlLabelKind result = VALUES_ARRAY[i];
-			if (result.toString().equals(literal)) {
+			if(result.toString().equals(literal)) {
 				return result;
 			}
 		}
@@ -91,12 +93,13 @@ public enum UmlLabelKind implements Enumerator {
 	 * Returns the '<em><b>Uml Label Kind</b></em>' literal with the specified name.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static UmlLabelKind getByName(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
+		for(int i = 0; i < VALUES_ARRAY.length; ++i) {
 			UmlLabelKind result = VALUES_ARRAY[i];
-			if (result.getName().equals(name)) {
+			if(result.getName().equals(name)) {
 				return result;
 			}
 		}
@@ -107,11 +110,13 @@ public enum UmlLabelKind implements Enumerator {
 	 * Returns the '<em><b>Uml Label Kind</b></em>' literal with the specified integer value.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static UmlLabelKind get(int value) {
-		switch (value) {
-			case NAME_VALUE: return NAME;
+		switch(value) {
+		case NAME_VALUE:
+			return NAME;
 		}
 		return null;
 	}
@@ -119,6 +124,7 @@ public enum UmlLabelKind implements Enumerator {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private final int value;
@@ -126,6 +132,7 @@ public enum UmlLabelKind implements Enumerator {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private final String name;
@@ -133,6 +140,7 @@ public enum UmlLabelKind implements Enumerator {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private final String literal;
@@ -141,6 +149,7 @@ public enum UmlLabelKind implements Enumerator {
 	 * Only this class can construct instances.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private UmlLabelKind(int value, String name, String literal) {
@@ -152,39 +161,42 @@ public enum UmlLabelKind implements Enumerator {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public int getValue() {
-	  return value;
+		return value;
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getName() {
-	  return name;
+		return name;
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getLiteral() {
-	  return literal;
+		return literal;
 	}
 
 	/**
 	 * Returns the literal value of the enumerator, which is its string representation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
 		return literal;
 	}
-	
 } //UmlLabelKind
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/UmlShape.java b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/UmlShape.java
index 4b700a1067f..326a38c7245 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/UmlShape.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/UmlShape.java
@@ -17,12 +17,12 @@ import org.eclipse.papyrus.dd.di.Shape;
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Uml Shape</b></em>'.
  * <!-- end-user-doc -->
- *
+ * 
  * <!-- begin-model-doc -->
  * The most general class for UML diagram elements that are not rendered as lines.
  * <!-- end-model-doc -->
- *
- *
+ * 
+ * 
  * @see org.eclipse.papyrus.umldi.UMLDIPackage#getUmlShape()
  * @model
  * @generated
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/UmlStyle.java b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/UmlStyle.java
index 034f6e514bb..2df30015e8d 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/UmlStyle.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/UmlStyle.java
@@ -21,24 +21,25 @@ import org.eclipse.papyrus.dd.di.Style;
  * <!-- begin-user-doc -->
  * A representation of the model object '<em><b>Uml Style</b></em>'.
  * <!-- end-user-doc -->
- *
+ * 
  * <!-- begin-model-doc -->
  * The most general class for Styles in UML.
  * <!-- end-model-doc -->
- *
+ * 
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.umldi.UmlStyle#getFontName <em>Font Name</em>}</li>
- *   <li>{@link org.eclipse.papyrus.umldi.UmlStyle#getFontSize <em>Font Size</em>}</li>
+ * <li>{@link org.eclipse.papyrus.umldi.UmlStyle#getFontName <em>Font Name</em>}</li>
+ * <li>{@link org.eclipse.papyrus.umldi.UmlStyle#getFontSize <em>Font Size</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @see org.eclipse.papyrus.umldi.UMLDIPackage#getUmlStyle()
  * @model
  * @generated
  */
 public interface UmlStyle extends Style {
+
 	/**
 	 * Returns the value of the '<em><b>Font Name</b></em>' attribute.
 	 * <!-- begin-user-doc -->
@@ -46,6 +47,7 @@ public interface UmlStyle extends Style {
 	 * <!-- begin-model-doc -->
 	 * Name of a font used to render strings.
 	 * <!-- end-model-doc -->
+	 * 
 	 * @return the value of the '<em>Font Name</em>' attribute.
 	 * @see #setFontName(String)
 	 * @see org.eclipse.papyrus.umldi.UMLDIPackage#getUmlStyle_FontName()
@@ -58,7 +60,9 @@ public interface UmlStyle extends Style {
 	 * Sets the value of the '{@link org.eclipse.papyrus.umldi.UmlStyle#getFontName <em>Font Name</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Font Name</em>' attribute.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Font Name</em>' attribute.
 	 * @see #getFontName()
 	 * @generated
 	 */
@@ -71,6 +75,7 @@ public interface UmlStyle extends Style {
 	 * <!-- begin-model-doc -->
 	 * Size of a font for rendering strings, given in typographical points.
 	 * <!-- end-model-doc -->
+	 * 
 	 * @return the value of the '<em>Font Size</em>' attribute.
 	 * @see #setFontSize(double)
 	 * @see org.eclipse.papyrus.umldi.UMLDIPackage#getUmlStyle_FontSize()
@@ -83,7 +88,9 @@ public interface UmlStyle extends Style {
 	 * Sets the value of the '{@link org.eclipse.papyrus.umldi.UmlStyle#getFontSize <em>Font Size</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Font Size</em>' attribute.
+	 * 
+	 * @param value
+	 *        the new value of the '<em>Font Size</em>' attribute.
 	 * @see #getFontSize()
 	 * @generated
 	 */
@@ -94,12 +101,14 @@ public interface UmlStyle extends Style {
 	 * <!-- end-user-doc -->
 	 * <!-- begin-model-doc -->
 	 * fontSize must be greater than zero.
-	 * @param diagnostics The chain of diagnostics to which problems are to be appended.
-	 * @param context The cache of context-specific information.
-	 * <!-- end-model-doc -->
+	 * 
+	 * @param diagnostics
+	 *        The chain of diagnostics to which problems are to be appended.
+	 * @param context
+	 *        The cache of context-specific information.
+	 *        <!-- end-model-doc -->
 	 * @model annotation="http://www.eclipse.org/emf/2002/Ecore/OCL body='fontSize > 0'"
 	 * @generated
 	 */
 	boolean fontsizePositive(DiagnosticChain diagnostics, Map<Object, Object> context);
-
 } // UmlStyle
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/impl/UMLDIFactoryImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/impl/UMLDIFactoryImpl.java
index 5f34bd02cd8..70cc062e32f 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/impl/UMLDIFactoryImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/impl/UMLDIFactoryImpl.java
@@ -26,23 +26,25 @@ import org.eclipse.papyrus.umldi.*;
  * <!-- begin-user-doc -->
  * An implementation of the model <b>Factory</b>.
  * <!-- end-user-doc -->
+ * 
  * @generated
  */
 public class UMLDIFactoryImpl extends EFactoryImpl implements UMLDIFactory {
+
 	/**
 	 * Creates the default factory implementation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static UMLDIFactory init() {
 		try {
 			UMLDIFactory theUMLDIFactory = (UMLDIFactory)EPackage.Registry.INSTANCE.getEFactory(UMLDIPackage.eNS_URI);
-			if (theUMLDIFactory != null) {
+			if(theUMLDIFactory != null) {
 				return theUMLDIFactory;
 			}
-		}
-		catch (Exception exception) {
+		} catch (Exception exception) {
 			EcorePlugin.INSTANCE.log(exception);
 		}
 		return new UMLDIFactoryImpl();
@@ -52,6 +54,7 @@ public class UMLDIFactoryImpl extends EFactoryImpl implements UMLDIFactory {
 	 * Creates an instance of the factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public UMLDIFactoryImpl() {
@@ -61,59 +64,69 @@ public class UMLDIFactoryImpl extends EFactoryImpl implements UMLDIFactory {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public EObject create(EClass eClass) {
-		switch (eClass.getClassifierID()) {
-			case UMLDIPackage.UML_DIAGRAM: return createUmlDiagram();
-			case UMLDIPackage.UML_SHAPE: return createUmlShape();
-			case UMLDIPackage.UML_STYLE: return createUmlStyle();
-			case UMLDIPackage.UML_EDGE: return createUmlEdge();
-			case UMLDIPackage.UML_COMPARTMENT: return createUmlCompartment();
-			case UMLDIPackage.UML_LABEL: return createUmlLabel();
-			default:
-				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
+		switch(eClass.getClassifierID()) {
+		case UMLDIPackage.UML_DIAGRAM:
+			return createUmlDiagram();
+		case UMLDIPackage.UML_SHAPE:
+			return createUmlShape();
+		case UMLDIPackage.UML_STYLE:
+			return createUmlStyle();
+		case UMLDIPackage.UML_EDGE:
+			return createUmlEdge();
+		case UMLDIPackage.UML_COMPARTMENT:
+			return createUmlCompartment();
+		case UMLDIPackage.UML_LABEL:
+			return createUmlLabel();
+		default:
+			throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
 		}
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object createFromString(EDataType eDataType, String initialValue) {
-		switch (eDataType.getClassifierID()) {
-			case UMLDIPackage.UML_COMPARTMENT_KIND:
-				return createUmlCompartmentKindFromString(eDataType, initialValue);
-			case UMLDIPackage.UML_LABEL_KIND:
-				return createUmlLabelKindFromString(eDataType, initialValue);
-			default:
-				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
+		switch(eDataType.getClassifierID()) {
+		case UMLDIPackage.UML_COMPARTMENT_KIND:
+			return createUmlCompartmentKindFromString(eDataType, initialValue);
+		case UMLDIPackage.UML_LABEL_KIND:
+			return createUmlLabelKindFromString(eDataType, initialValue);
+		default:
+			throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
 		}
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String convertToString(EDataType eDataType, Object instanceValue) {
-		switch (eDataType.getClassifierID()) {
-			case UMLDIPackage.UML_COMPARTMENT_KIND:
-				return convertUmlCompartmentKindToString(eDataType, instanceValue);
-			case UMLDIPackage.UML_LABEL_KIND:
-				return convertUmlLabelKindToString(eDataType, instanceValue);
-			default:
-				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
+		switch(eDataType.getClassifierID()) {
+		case UMLDIPackage.UML_COMPARTMENT_KIND:
+			return convertUmlCompartmentKindToString(eDataType, instanceValue);
+		case UMLDIPackage.UML_LABEL_KIND:
+			return convertUmlLabelKindToString(eDataType, instanceValue);
+		default:
+			throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
 		}
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public UmlDiagram createUmlDiagram() {
@@ -124,6 +137,7 @@ public class UMLDIFactoryImpl extends EFactoryImpl implements UMLDIFactory {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public UmlStyle createUmlStyle() {
@@ -134,6 +148,7 @@ public class UMLDIFactoryImpl extends EFactoryImpl implements UMLDIFactory {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public UmlEdge createUmlEdge() {
@@ -144,6 +159,7 @@ public class UMLDIFactoryImpl extends EFactoryImpl implements UMLDIFactory {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public UmlCompartment createUmlCompartment() {
@@ -154,6 +170,7 @@ public class UMLDIFactoryImpl extends EFactoryImpl implements UMLDIFactory {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public UmlLabel createUmlLabel() {
@@ -164,17 +181,20 @@ public class UMLDIFactoryImpl extends EFactoryImpl implements UMLDIFactory {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public UmlCompartmentKind createUmlCompartmentKindFromString(EDataType eDataType, String initialValue) {
 		UmlCompartmentKind result = UmlCompartmentKind.get(initialValue);
-		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
+		if(result == null)
+			throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
 		return result;
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String convertUmlCompartmentKindToString(EDataType eDataType, Object instanceValue) {
@@ -184,17 +204,20 @@ public class UMLDIFactoryImpl extends EFactoryImpl implements UMLDIFactory {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public UmlLabelKind createUmlLabelKindFromString(EDataType eDataType, String initialValue) {
 		UmlLabelKind result = UmlLabelKind.get(initialValue);
-		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
+		if(result == null)
+			throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
 		return result;
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String convertUmlLabelKindToString(EDataType eDataType, Object instanceValue) {
@@ -204,6 +227,7 @@ public class UMLDIFactoryImpl extends EFactoryImpl implements UMLDIFactory {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public UmlShape createUmlShape() {
@@ -214,6 +238,7 @@ public class UMLDIFactoryImpl extends EFactoryImpl implements UMLDIFactory {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public UMLDIPackage getUMLDIPackage() {
@@ -223,6 +248,7 @@ public class UMLDIFactoryImpl extends EFactoryImpl implements UMLDIFactory {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @deprecated
 	 * @generated
 	 */
@@ -230,5 +256,4 @@ public class UMLDIFactoryImpl extends EFactoryImpl implements UMLDIFactory {
 	public static UMLDIPackage getPackage() {
 		return UMLDIPackage.eINSTANCE;
 	}
-
 } //UMLDIFactoryImpl
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/impl/UMLDIPackageImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/impl/UMLDIPackageImpl.java
index caccb6eddcd..9633094d84a 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/impl/UMLDIPackageImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/impl/UMLDIPackageImpl.java
@@ -48,12 +48,15 @@ import org.eclipse.uml2.uml.UMLPackage;
  * <!-- begin-user-doc -->
  * An implementation of the model <b>Package</b>.
  * <!-- end-user-doc -->
+ * 
  * @generated
  */
 public class UMLDIPackageImpl extends EPackageImpl implements UMLDIPackage {
+
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass umlDiagramEClass = null;
@@ -61,6 +64,7 @@ public class UMLDIPackageImpl extends EPackageImpl implements UMLDIPackage {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass umlDiagramElementEClass = null;
@@ -68,6 +72,7 @@ public class UMLDIPackageImpl extends EPackageImpl implements UMLDIPackage {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass umlStyleEClass = null;
@@ -75,6 +80,7 @@ public class UMLDIPackageImpl extends EPackageImpl implements UMLDIPackage {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass umlEdgeEClass = null;
@@ -82,6 +88,7 @@ public class UMLDIPackageImpl extends EPackageImpl implements UMLDIPackage {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass umlCompartmentEClass = null;
@@ -89,6 +96,7 @@ public class UMLDIPackageImpl extends EPackageImpl implements UMLDIPackage {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass umlLabelEClass = null;
@@ -96,6 +104,7 @@ public class UMLDIPackageImpl extends EPackageImpl implements UMLDIPackage {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EEnum umlCompartmentKindEEnum = null;
@@ -103,6 +112,7 @@ public class UMLDIPackageImpl extends EPackageImpl implements UMLDIPackage {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EEnum umlLabelKindEEnum = null;
@@ -110,20 +120,19 @@ public class UMLDIPackageImpl extends EPackageImpl implements UMLDIPackage {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private EClass umlShapeEClass = null;
 
 	/**
-	 * Creates an instance of the model <b>Package</b>, registered with
-	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
+	 * Creates an instance of the model <b>Package</b>, registered with {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the
+	 * package
 	 * package URI value.
-	 * <p>Note: the correct way to create the package is via the static
-	 * factory method {@link #init init()}, which also performs
-	 * initialization of the package, or returns the registered package,
-	 * if one already exists.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <p>
+	 * Note: the correct way to create the package is via the static factory method {@link #init init()}, which also performs initialization of the
+	 * package, or returns the registered package, if one already exists. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.emf.ecore.EPackage.Registry
 	 * @see org.eclipse.papyrus.umldi.UMLDIPackage#eNS_URI
 	 * @see #init()
@@ -136,6 +145,7 @@ public class UMLDIPackageImpl extends EPackageImpl implements UMLDIPackage {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private static boolean isInited = false;
@@ -143,46 +153,37 @@ public class UMLDIPackageImpl extends EPackageImpl implements UMLDIPackage {
 	/**
 	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
 	 * 
-	 * <p>This method is used to initialize {@link UMLDIPackage#eINSTANCE} when that field is accessed.
-	 * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
+	 * <p>
+	 * This method is used to initialize {@link UMLDIPackage#eINSTANCE} when that field is accessed. Clients should not invoke it directly. Instead,
+	 * they should simply access that field to obtain the package. <!-- begin-user-doc --> <!-- end-user-doc -->
+	 * 
 	 * @see #eNS_URI
 	 * @see #createPackageContents()
 	 * @see #initializePackageContents()
 	 * @generated
 	 */
 	public static UMLDIPackage init() {
-		if (isInited) return (UMLDIPackage)EPackage.Registry.INSTANCE.getEPackage(UMLDIPackage.eNS_URI);
-
+		if(isInited)
+			return (UMLDIPackage)EPackage.Registry.INSTANCE.getEPackage(UMLDIPackage.eNS_URI);
 		// Obtain or create and register package
 		UMLDIPackageImpl theUMLDIPackage = (UMLDIPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof UMLDIPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new UMLDIPackageImpl());
-
 		isInited = true;
-
 		// Initialize simple dependencies
 		DIPackage.eINSTANCE.eClass();
 		UMLPackage.eINSTANCE.eClass();
-
 		// Create package meta-data objects
 		theUMLDIPackage.createPackageContents();
-
 		// Initialize created meta-data
 		theUMLDIPackage.initializePackageContents();
-
 		// Register package validator
-		EValidator.Registry.INSTANCE.put
-			(theUMLDIPackage, 
-			 new EValidator.Descriptor() {
-				 public EValidator getEValidator() {
-					 return UMLDIValidator.INSTANCE;
-				 }
-			 });
+		EValidator.Registry.INSTANCE.put(theUMLDIPackage, new EValidator.Descriptor() {
 
+			public EValidator getEValidator() {
+				return UMLDIValidator.INSTANCE;
+			}
+		});
 		// Mark meta-data to indicate it can't be changed
 		theUMLDIPackage.freeze();
-
-  
 		// Update the registry and return the package
 		EPackage.Registry.INSTANCE.put(UMLDIPackage.eNS_URI, theUMLDIPackage);
 		return theUMLDIPackage;
@@ -191,6 +192,7 @@ public class UMLDIPackageImpl extends EPackageImpl implements UMLDIPackage {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getUmlDiagram() {
@@ -200,6 +202,7 @@ public class UMLDIPackageImpl extends EPackageImpl implements UMLDIPackage {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getUmlDiagramElement() {
@@ -209,6 +212,7 @@ public class UMLDIPackageImpl extends EPackageImpl implements UMLDIPackage {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getUmlDiagramElement_UmlModelElement() {
@@ -218,6 +222,7 @@ public class UMLDIPackageImpl extends EPackageImpl implements UMLDIPackage {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getUmlDiagramElement_SharedUmlStyle() {
@@ -227,6 +232,7 @@ public class UMLDIPackageImpl extends EPackageImpl implements UMLDIPackage {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getUmlDiagramElement_LocalUmlStyle() {
@@ -236,6 +242,7 @@ public class UMLDIPackageImpl extends EPackageImpl implements UMLDIPackage {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getUmlDiagramElement_OwningUmlDiagramElement() {
@@ -245,6 +252,7 @@ public class UMLDIPackageImpl extends EPackageImpl implements UMLDIPackage {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getUmlDiagramElement_OwnedUmlDiagramElement() {
@@ -254,6 +262,7 @@ public class UMLDIPackageImpl extends EPackageImpl implements UMLDIPackage {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getUmlDiagramElement_TargetUmlEdge() {
@@ -263,6 +272,7 @@ public class UMLDIPackageImpl extends EPackageImpl implements UMLDIPackage {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getUmlDiagramElement_SourceUmlEdge() {
@@ -272,6 +282,7 @@ public class UMLDIPackageImpl extends EPackageImpl implements UMLDIPackage {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getUmlStyle() {
@@ -281,6 +292,7 @@ public class UMLDIPackageImpl extends EPackageImpl implements UMLDIPackage {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getUmlStyle_FontName() {
@@ -290,6 +302,7 @@ public class UMLDIPackageImpl extends EPackageImpl implements UMLDIPackage {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getUmlStyle_FontSize() {
@@ -299,6 +312,7 @@ public class UMLDIPackageImpl extends EPackageImpl implements UMLDIPackage {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EOperation getUmlStyle__FontsizePositive__DiagnosticChain_Map() {
@@ -308,6 +322,7 @@ public class UMLDIPackageImpl extends EPackageImpl implements UMLDIPackage {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getUmlEdge() {
@@ -317,6 +332,7 @@ public class UMLDIPackageImpl extends EPackageImpl implements UMLDIPackage {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getUmlEdge_SourceUmlDiagramElement() {
@@ -326,6 +342,7 @@ public class UMLDIPackageImpl extends EPackageImpl implements UMLDIPackage {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EReference getUmlEdge_TargetUmlDiagramElement() {
@@ -335,6 +352,7 @@ public class UMLDIPackageImpl extends EPackageImpl implements UMLDIPackage {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getUmlCompartment() {
@@ -344,6 +362,7 @@ public class UMLDIPackageImpl extends EPackageImpl implements UMLDIPackage {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getUmlCompartment_Kind() {
@@ -353,6 +372,7 @@ public class UMLDIPackageImpl extends EPackageImpl implements UMLDIPackage {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getUmlLabel() {
@@ -362,6 +382,7 @@ public class UMLDIPackageImpl extends EPackageImpl implements UMLDIPackage {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EAttribute getUmlLabel_Kind() {
@@ -371,6 +392,7 @@ public class UMLDIPackageImpl extends EPackageImpl implements UMLDIPackage {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EEnum getUmlCompartmentKind() {
@@ -380,6 +402,7 @@ public class UMLDIPackageImpl extends EPackageImpl implements UMLDIPackage {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EEnum getUmlLabelKind() {
@@ -389,6 +412,7 @@ public class UMLDIPackageImpl extends EPackageImpl implements UMLDIPackage {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EClass getUmlShape() {
@@ -398,6 +422,7 @@ public class UMLDIPackageImpl extends EPackageImpl implements UMLDIPackage {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public UMLDIFactory getUMLDIFactory() {
@@ -407,26 +432,26 @@ public class UMLDIPackageImpl extends EPackageImpl implements UMLDIPackage {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private boolean isCreated = false;
 
 	/**
-	 * Creates the meta-model objects for the package.  This method is
+	 * Creates the meta-model objects for the package. This method is
 	 * guarded to have no affect on any invocation but its first.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void createPackageContents() {
-		if (isCreated) return;
+		if(isCreated)
+			return;
 		isCreated = true;
-
 		// Create classes and their features
 		umlDiagramEClass = createEClass(UML_DIAGRAM);
-
 		umlShapeEClass = createEClass(UML_SHAPE);
-
 		umlDiagramElementEClass = createEClass(UML_DIAGRAM_ELEMENT);
 		createEReference(umlDiagramElementEClass, UML_DIAGRAM_ELEMENT__UML_MODEL_ELEMENT);
 		createEReference(umlDiagramElementEClass, UML_DIAGRAM_ELEMENT__SHARED_UML_STYLE);
@@ -435,22 +460,17 @@ public class UMLDIPackageImpl extends EPackageImpl implements UMLDIPackage {
 		createEReference(umlDiagramElementEClass, UML_DIAGRAM_ELEMENT__OWNED_UML_DIAGRAM_ELEMENT);
 		createEReference(umlDiagramElementEClass, UML_DIAGRAM_ELEMENT__TARGET_UML_EDGE);
 		createEReference(umlDiagramElementEClass, UML_DIAGRAM_ELEMENT__SOURCE_UML_EDGE);
-
 		umlStyleEClass = createEClass(UML_STYLE);
 		createEAttribute(umlStyleEClass, UML_STYLE__FONT_NAME);
 		createEAttribute(umlStyleEClass, UML_STYLE__FONT_SIZE);
 		createEOperation(umlStyleEClass, UML_STYLE___FONTSIZE_POSITIVE__DIAGNOSTICCHAIN_MAP);
-
 		umlEdgeEClass = createEClass(UML_EDGE);
 		createEReference(umlEdgeEClass, UML_EDGE__SOURCE_UML_DIAGRAM_ELEMENT);
 		createEReference(umlEdgeEClass, UML_EDGE__TARGET_UML_DIAGRAM_ELEMENT);
-
 		umlCompartmentEClass = createEClass(UML_COMPARTMENT);
 		createEAttribute(umlCompartmentEClass, UML_COMPARTMENT__KIND);
-
 		umlLabelEClass = createEClass(UML_LABEL);
 		createEAttribute(umlLabelEClass, UML_LABEL__KIND);
-
 		// Create enums
 		umlCompartmentKindEEnum = createEEnum(UML_COMPARTMENT_KIND);
 		umlLabelKindEEnum = createEEnum(UML_LABEL_KIND);
@@ -459,35 +479,33 @@ public class UMLDIPackageImpl extends EPackageImpl implements UMLDIPackage {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private boolean isInitialized = false;
 
 	/**
-	 * Complete the initialization of the package and its meta-model.  This
+	 * Complete the initialization of the package and its meta-model. This
 	 * method is guarded to have no affect on any invocation but its first.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void initializePackageContents() {
-		if (isInitialized) return;
+		if(isInitialized)
+			return;
 		isInitialized = true;
-
 		// Initialize package
 		setName(eNAME);
 		setNsPrefix(eNS_PREFIX);
 		setNsURI(eNS_URI);
-
 		// Obtain other dependent packages
 		DIPackage theDIPackage = (DIPackage)EPackage.Registry.INSTANCE.getEPackage(DIPackage.eNS_URI);
 		UMLPackage theUMLPackage = (UMLPackage)EPackage.Registry.INSTANCE.getEPackage(UMLPackage.eNS_URI);
 		DCPackage theDCPackage = (DCPackage)EPackage.Registry.INSTANCE.getEPackage(DCPackage.eNS_URI);
-
 		// Create type parameters
-
 		// Set bounds for type parameters
-
 		// Add supertypes to classes
 		umlDiagramEClass.getESuperTypes().add(this.getUmlShape());
 		umlDiagramEClass.getESuperTypes().add(theDIPackage.getDiagram());
@@ -499,12 +517,9 @@ public class UMLDIPackageImpl extends EPackageImpl implements UMLDIPackage {
 		umlEdgeEClass.getESuperTypes().add(theDIPackage.getEdge());
 		umlCompartmentEClass.getESuperTypes().add(this.getUmlShape());
 		umlLabelEClass.getESuperTypes().add(this.getUmlShape());
-
 		// Initialize classes, features, and operations; add parameters
 		initEClass(umlDiagramEClass, UmlDiagram.class, "UmlDiagram", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
 		initEClass(umlShapeEClass, UmlShape.class, "UmlShape", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
 		initEClass(umlDiagramElementEClass, UmlDiagramElement.class, "UmlDiagramElement", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEReference(getUmlDiagramElement_UmlModelElement(), theUMLPackage.getElement(), null, "umlModelElement", null, 0, -1, UmlDiagramElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEReference(getUmlDiagramElement_SharedUmlStyle(), this.getUmlStyle(), null, "sharedUmlStyle", null, 0, 1, UmlDiagramElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
@@ -513,11 +528,9 @@ public class UMLDIPackageImpl extends EPackageImpl implements UMLDIPackage {
 		initEReference(getUmlDiagramElement_OwnedUmlDiagramElement(), this.getUmlDiagramElement(), this.getUmlDiagramElement_OwningUmlDiagramElement(), "ownedUmlDiagramElement", null, 0, -1, UmlDiagramElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEReference(getUmlDiagramElement_TargetUmlEdge(), this.getUmlEdge(), this.getUmlEdge_TargetUmlDiagramElement(), "targetUmlEdge", null, 0, -1, UmlDiagramElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 		initEReference(getUmlDiagramElement_SourceUmlEdge(), this.getUmlEdge(), this.getUmlEdge_SourceUmlDiagramElement(), "sourceUmlEdge", null, 0, -1, UmlDiagramElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
 		initEClass(umlStyleEClass, UmlStyle.class, "UmlStyle", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEAttribute(getUmlStyle_FontName(), theDCPackage.getString(), "fontName", null, 0, 1, UmlStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
 		initEAttribute(getUmlStyle_FontSize(), theDCPackage.getReal(), "fontSize", null, 0, 1, UmlStyle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-
 		EOperation op = initEOperation(getUmlStyle__FontsizePositive__DiagnosticChain_Map(), ecorePackage.getEBoolean(), "fontsizePositive", 0, 1, IS_UNIQUE, IS_ORDERED);
 		addEParameter(op, ecorePackage.getEDiagnosticChain(), "diagnostics", 0, 1, IS_UNIQUE, IS_ORDERED);
 		EGenericType g1 = createEGenericType(ecorePackage.getEMap());
@@ -526,28 +539,21 @@ public class UMLDIPackageImpl extends EPackageImpl implements UMLDIPackage {
 		g2 = createEGenericType(ecorePackage.getEJavaObject());
 		g1.getETypeArguments().add(g2);
 		addEParameter(op, g1, "context", 0, 1, IS_UNIQUE, IS_ORDERED);
-
 		initEClass(umlEdgeEClass, UmlEdge.class, "UmlEdge", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEReference(getUmlEdge_SourceUmlDiagramElement(), this.getUmlDiagramElement(), this.getUmlDiagramElement_SourceUmlEdge(), "sourceUmlDiagramElement", null, 1, 1, UmlEdge.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
 		initEReference(getUmlEdge_TargetUmlDiagramElement(), this.getUmlDiagramElement(), this.getUmlDiagramElement_TargetUmlEdge(), "targetUmlDiagramElement", null, 1, 1, UmlEdge.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-
 		initEClass(umlCompartmentEClass, UmlCompartment.class, "UmlCompartment", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEAttribute(getUmlCompartment_Kind(), this.getUmlCompartmentKind(), "kind", null, 1, 1, UmlCompartment.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-
 		initEClass(umlLabelEClass, UmlLabel.class, "UmlLabel", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 		initEAttribute(getUmlLabel_Kind(), this.getUmlLabelKind(), "kind", null, 1, 1, UmlLabel.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, !IS_ORDERED);
-
 		// Initialize enums and add enum literals
 		initEEnum(umlCompartmentKindEEnum, UmlCompartmentKind.class, "UmlCompartmentKind");
 		addEEnumLiteral(umlCompartmentKindEEnum, UmlCompartmentKind.ATTRIBUTES);
 		addEEnumLiteral(umlCompartmentKindEEnum, UmlCompartmentKind.OPERATIONS);
-
 		initEEnum(umlLabelKindEEnum, UmlLabelKind.class, "UmlLabelKind");
 		addEEnumLiteral(umlLabelKindEEnum, UmlLabelKind.NAME);
-
 		// Create resource
 		createResource(eNS_URI);
-
 		// Create annotations
 		// http://www.eclipse.org/emf/2002/Ecore
 		createEcoreAnnotations();
@@ -561,114 +567,43 @@ public class UMLDIPackageImpl extends EPackageImpl implements UMLDIPackage {
 	 * Initializes the annotations for <b>http://www.eclipse.org/emf/2002/Ecore</b>.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void createEcoreAnnotations() {
-		String source = "http://www.eclipse.org/emf/2002/Ecore";		
-		addAnnotation
-		  (this, 
-		   source, 
-		   new String[] {
-			 "validationDelegates", "http://www.eclipse.org/emf/2002/Ecore/OCL"
-		   });																											
+		String source = "http://www.eclipse.org/emf/2002/Ecore";
+		addAnnotation(this, source, new String[]{ "validationDelegates", "http://www.eclipse.org/emf/2002/Ecore/OCL" });
 	}
 
 	/**
 	 * Initializes the annotations for <b>subsets</b>.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void createSubsetsAnnotations() {
-		String source = "subsets";							
-		addAnnotation
-		  (getUmlDiagramElement_UmlModelElement(), 
-		   source, 
-		   new String[] {
-		   },
-		   new URI[] {
-			 URI.createURI(DIPackage.eNS_URI).appendFragment("//DiagramElement/modelElement")
-		   });			
-		addAnnotation
-		  (getUmlDiagramElement_SharedUmlStyle(), 
-		   source, 
-		   new String[] {
-		   },
-		   new URI[] {
-			 URI.createURI(DIPackage.eNS_URI).appendFragment("//DiagramElement/sharedStyle")
-		   });			
-		addAnnotation
-		  (getUmlDiagramElement_LocalUmlStyle(), 
-		   source, 
-		   new String[] {
-		   },
-		   new URI[] {
-			 URI.createURI(DIPackage.eNS_URI).appendFragment("//DiagramElement/localStyle")
-		   });			
-		addAnnotation
-		  (getUmlDiagramElement_OwningUmlDiagramElement(), 
-		   source, 
-		   new String[] {
-		   },
-		   new URI[] {
-			 URI.createURI(DIPackage.eNS_URI).appendFragment("//DiagramElement/owningDiagramElement")
-		   });			
-		addAnnotation
-		  (getUmlDiagramElement_OwnedUmlDiagramElement(), 
-		   source, 
-		   new String[] {
-		   },
-		   new URI[] {
-			 URI.createURI(DIPackage.eNS_URI).appendFragment("//DiagramElement/ownedDiagramElement")
-		   });		
-		addAnnotation
-		  (getUmlDiagramElement_TargetUmlEdge(), 
-		   source, 
-		   new String[] {
-		   },
-		   new URI[] {
-			 URI.createURI(DIPackage.eNS_URI).appendFragment("//DiagramElement/targetEdge")
-		   });		
-		addAnnotation
-		  (getUmlDiagramElement_SourceUmlEdge(), 
-		   source, 
-		   new String[] {
-		   },
-		   new URI[] {
-			 URI.createURI(DIPackage.eNS_URI).appendFragment("//DiagramElement/sourceEdge")
-		   });											
-		addAnnotation
-		  (getUmlEdge_SourceUmlDiagramElement(), 
-		   source, 
-		   new String[] {
-		   },
-		   new URI[] {
-			 URI.createURI(DIPackage.eNS_URI).appendFragment("//Edge/sourceDiagramElement")
-		   });			
-		addAnnotation
-		  (getUmlEdge_TargetUmlDiagramElement(), 
-		   source, 
-		   new String[] {
-		   },
-		   new URI[] {
-			 URI.createURI(DIPackage.eNS_URI).appendFragment("//Edge/targetDiagramElement")
-		   });
+		String source = "subsets";
+		addAnnotation(getUmlDiagramElement_UmlModelElement(), source, new String[]{}, new URI[]{ URI.createURI(DIPackage.eNS_URI).appendFragment("//DiagramElement/modelElement") });
+		addAnnotation(getUmlDiagramElement_SharedUmlStyle(), source, new String[]{}, new URI[]{ URI.createURI(DIPackage.eNS_URI).appendFragment("//DiagramElement/sharedStyle") });
+		addAnnotation(getUmlDiagramElement_LocalUmlStyle(), source, new String[]{}, new URI[]{ URI.createURI(DIPackage.eNS_URI).appendFragment("//DiagramElement/localStyle") });
+		addAnnotation(getUmlDiagramElement_OwningUmlDiagramElement(), source, new String[]{}, new URI[]{ URI.createURI(DIPackage.eNS_URI).appendFragment("//DiagramElement/owningDiagramElement") });
+		addAnnotation(getUmlDiagramElement_OwnedUmlDiagramElement(), source, new String[]{}, new URI[]{ URI.createURI(DIPackage.eNS_URI).appendFragment("//DiagramElement/ownedDiagramElement") });
+		addAnnotation(getUmlDiagramElement_TargetUmlEdge(), source, new String[]{}, new URI[]{ URI.createURI(DIPackage.eNS_URI).appendFragment("//DiagramElement/targetEdge") });
+		addAnnotation(getUmlDiagramElement_SourceUmlEdge(), source, new String[]{}, new URI[]{ URI.createURI(DIPackage.eNS_URI).appendFragment("//DiagramElement/sourceEdge") });
+		addAnnotation(getUmlEdge_SourceUmlDiagramElement(), source, new String[]{}, new URI[]{ URI.createURI(DIPackage.eNS_URI).appendFragment("//Edge/sourceDiagramElement") });
+		addAnnotation(getUmlEdge_TargetUmlDiagramElement(), source, new String[]{}, new URI[]{ URI.createURI(DIPackage.eNS_URI).appendFragment("//Edge/targetDiagramElement") });
 	}
 
 	/**
 	 * Initializes the annotations for <b>http://www.eclipse.org/emf/2002/Ecore/OCL</b>.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected void createOCLAnnotations() {
-		String source = "http://www.eclipse.org/emf/2002/Ecore/OCL";																			
-		addAnnotation
-		  (getUmlStyle__FontsizePositive__DiagnosticChain_Map(), 
-		   source, 
-		   new String[] {
-			 "body", "fontSize > 0"
-		   });										
+		String source = "http://www.eclipse.org/emf/2002/Ecore/OCL";
+		addAnnotation(getUmlStyle__FontsizePositive__DiagnosticChain_Map(), source, new String[]{ "body", "fontSize > 0" });
 	}
-
 } //UMLDIPackageImpl
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/impl/UmlCompartmentImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/impl/UmlCompartmentImpl.java
index b59e6bc0703..467e8be3c8c 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/impl/UmlCompartmentImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/impl/UmlCompartmentImpl.java
@@ -28,17 +28,19 @@ import org.eclipse.papyrus.umldi.UmlCompartmentKind;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.umldi.impl.UmlCompartmentImpl#getKind <em>Kind</em>}</li>
+ * <li>{@link org.eclipse.papyrus.umldi.impl.UmlCompartmentImpl#getKind <em>Kind</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class UmlCompartmentImpl extends UmlShapeImpl implements UmlCompartment {
+
 	/**
 	 * The default value of the '{@link #getKind() <em>Kind</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getKind()
 	 * @generated
 	 * @ordered
@@ -49,6 +51,7 @@ public class UmlCompartmentImpl extends UmlShapeImpl implements UmlCompartment {
 	 * The cached value of the '{@link #getKind() <em>Kind</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getKind()
 	 * @generated
 	 * @ordered
@@ -58,6 +61,7 @@ public class UmlCompartmentImpl extends UmlShapeImpl implements UmlCompartment {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected UmlCompartmentImpl() {
@@ -67,6 +71,7 @@ public class UmlCompartmentImpl extends UmlShapeImpl implements UmlCompartment {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -77,6 +82,7 @@ public class UmlCompartmentImpl extends UmlShapeImpl implements UmlCompartment {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public UmlCompartmentKind getKind() {
@@ -86,25 +92,27 @@ public class UmlCompartmentImpl extends UmlShapeImpl implements UmlCompartment {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setKind(UmlCompartmentKind newKind) {
 		UmlCompartmentKind oldKind = kind;
 		kind = newKind == null ? KIND_EDEFAULT : newKind;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, UMLDIPackage.UML_COMPARTMENT__KIND, oldKind, kind));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case UMLDIPackage.UML_COMPARTMENT__KIND:
-				return getKind();
+		switch(featureID) {
+		case UMLDIPackage.UML_COMPARTMENT__KIND:
+			return getKind();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -112,14 +120,15 @@ public class UmlCompartmentImpl extends UmlShapeImpl implements UmlCompartment {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case UMLDIPackage.UML_COMPARTMENT__KIND:
-				setKind((UmlCompartmentKind)newValue);
-				return;
+		switch(featureID) {
+		case UMLDIPackage.UML_COMPARTMENT__KIND:
+			setKind((UmlCompartmentKind)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -127,14 +136,15 @@ public class UmlCompartmentImpl extends UmlShapeImpl implements UmlCompartment {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case UMLDIPackage.UML_COMPARTMENT__KIND:
-				setKind(KIND_EDEFAULT);
-				return;
+		switch(featureID) {
+		case UMLDIPackage.UML_COMPARTMENT__KIND:
+			setKind(KIND_EDEFAULT);
+			return;
 		}
 		super.eUnset(featureID);
 	}
@@ -142,13 +152,14 @@ public class UmlCompartmentImpl extends UmlShapeImpl implements UmlCompartment {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case UMLDIPackage.UML_COMPARTMENT__KIND:
-				return kind != KIND_EDEFAULT;
+		switch(featureID) {
+		case UMLDIPackage.UML_COMPARTMENT__KIND:
+			return kind != KIND_EDEFAULT;
 		}
 		return super.eIsSet(featureID);
 	}
@@ -156,17 +167,17 @@ public class UmlCompartmentImpl extends UmlShapeImpl implements UmlCompartment {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) return super.toString();
-
+		if(eIsProxy())
+			return super.toString();
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (kind: ");
 		result.append(kind);
 		result.append(')');
 		return result.toString();
 	}
-
 } //UmlCompartmentImpl
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/impl/UmlDiagramElementImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/impl/UmlDiagramElementImpl.java
index a395e1cbd49..af96b8881c8 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/impl/UmlDiagramElementImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/impl/UmlDiagramElementImpl.java
@@ -52,30 +52,32 @@ import org.eclipse.uml2.uml.Element;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.umldi.impl.UmlDiagramElementImpl#getModelElement <em>Model Element</em>}</li>
- *   <li>{@link org.eclipse.papyrus.umldi.impl.UmlDiagramElementImpl#getSharedStyle <em>Shared Style</em>}</li>
- *   <li>{@link org.eclipse.papyrus.umldi.impl.UmlDiagramElementImpl#getLocalStyle <em>Local Style</em>}</li>
- *   <li>{@link org.eclipse.papyrus.umldi.impl.UmlDiagramElementImpl#getOwningDiagramElement <em>Owning Diagram Element</em>}</li>
- *   <li>{@link org.eclipse.papyrus.umldi.impl.UmlDiagramElementImpl#getOwnedDiagramElement <em>Owned Diagram Element</em>}</li>
- *   <li>{@link org.eclipse.papyrus.umldi.impl.UmlDiagramElementImpl#getTargetEdge <em>Target Edge</em>}</li>
- *   <li>{@link org.eclipse.papyrus.umldi.impl.UmlDiagramElementImpl#getSourceEdge <em>Source Edge</em>}</li>
- *   <li>{@link org.eclipse.papyrus.umldi.impl.UmlDiagramElementImpl#getUmlModelElement <em>Uml Model Element</em>}</li>
- *   <li>{@link org.eclipse.papyrus.umldi.impl.UmlDiagramElementImpl#getSharedUmlStyle <em>Shared Uml Style</em>}</li>
- *   <li>{@link org.eclipse.papyrus.umldi.impl.UmlDiagramElementImpl#getLocalUmlStyle <em>Local Uml Style</em>}</li>
- *   <li>{@link org.eclipse.papyrus.umldi.impl.UmlDiagramElementImpl#getOwningUmlDiagramElement <em>Owning Uml Diagram Element</em>}</li>
- *   <li>{@link org.eclipse.papyrus.umldi.impl.UmlDiagramElementImpl#getOwnedUmlDiagramElement <em>Owned Uml Diagram Element</em>}</li>
- *   <li>{@link org.eclipse.papyrus.umldi.impl.UmlDiagramElementImpl#getTargetUmlEdge <em>Target Uml Edge</em>}</li>
- *   <li>{@link org.eclipse.papyrus.umldi.impl.UmlDiagramElementImpl#getSourceUmlEdge <em>Source Uml Edge</em>}</li>
+ * <li>{@link org.eclipse.papyrus.umldi.impl.UmlDiagramElementImpl#getModelElement <em>Model Element</em>}</li>
+ * <li>{@link org.eclipse.papyrus.umldi.impl.UmlDiagramElementImpl#getSharedStyle <em>Shared Style</em>}</li>
+ * <li>{@link org.eclipse.papyrus.umldi.impl.UmlDiagramElementImpl#getLocalStyle <em>Local Style</em>}</li>
+ * <li>{@link org.eclipse.papyrus.umldi.impl.UmlDiagramElementImpl#getOwningDiagramElement <em>Owning Diagram Element</em>}</li>
+ * <li>{@link org.eclipse.papyrus.umldi.impl.UmlDiagramElementImpl#getOwnedDiagramElement <em>Owned Diagram Element</em>}</li>
+ * <li>{@link org.eclipse.papyrus.umldi.impl.UmlDiagramElementImpl#getTargetEdge <em>Target Edge</em>}</li>
+ * <li>{@link org.eclipse.papyrus.umldi.impl.UmlDiagramElementImpl#getSourceEdge <em>Source Edge</em>}</li>
+ * <li>{@link org.eclipse.papyrus.umldi.impl.UmlDiagramElementImpl#getUmlModelElement <em>Uml Model Element</em>}</li>
+ * <li>{@link org.eclipse.papyrus.umldi.impl.UmlDiagramElementImpl#getSharedUmlStyle <em>Shared Uml Style</em>}</li>
+ * <li>{@link org.eclipse.papyrus.umldi.impl.UmlDiagramElementImpl#getLocalUmlStyle <em>Local Uml Style</em>}</li>
+ * <li>{@link org.eclipse.papyrus.umldi.impl.UmlDiagramElementImpl#getOwningUmlDiagramElement <em>Owning Uml Diagram Element</em>}</li>
+ * <li>{@link org.eclipse.papyrus.umldi.impl.UmlDiagramElementImpl#getOwnedUmlDiagramElement <em>Owned Uml Diagram Element</em>}</li>
+ * <li>{@link org.eclipse.papyrus.umldi.impl.UmlDiagramElementImpl#getTargetUmlEdge <em>Target Uml Edge</em>}</li>
+ * <li>{@link org.eclipse.papyrus.umldi.impl.UmlDiagramElementImpl#getSourceUmlEdge <em>Source Uml Edge</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public abstract class UmlDiagramElementImpl extends DiagramElementImpl implements UmlDiagramElement {
+
 	/**
 	 * The cached value of the '{@link #getUmlModelElement() <em>Uml Model Element</em>}' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getUmlModelElement()
 	 * @generated
 	 * @ordered
@@ -86,6 +88,7 @@ public abstract class UmlDiagramElementImpl extends DiagramElementImpl implement
 	 * The cached value of the '{@link #getSharedUmlStyle() <em>Shared Uml Style</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getSharedUmlStyle()
 	 * @generated
 	 * @ordered
@@ -96,6 +99,7 @@ public abstract class UmlDiagramElementImpl extends DiagramElementImpl implement
 	 * The cached value of the '{@link #getLocalUmlStyle() <em>Local Uml Style</em>}' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getLocalUmlStyle()
 	 * @generated
 	 * @ordered
@@ -106,6 +110,7 @@ public abstract class UmlDiagramElementImpl extends DiagramElementImpl implement
 	 * The cached value of the '{@link #getOwnedUmlDiagramElement() <em>Owned Uml Diagram Element</em>}' containment reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getOwnedUmlDiagramElement()
 	 * @generated
 	 * @ordered
@@ -116,6 +121,7 @@ public abstract class UmlDiagramElementImpl extends DiagramElementImpl implement
 	 * The cached value of the '{@link #getTargetUmlEdge() <em>Target Uml Edge</em>}' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getTargetUmlEdge()
 	 * @generated
 	 * @ordered
@@ -126,6 +132,7 @@ public abstract class UmlDiagramElementImpl extends DiagramElementImpl implement
 	 * The cached value of the '{@link #getSourceUmlEdge() <em>Source Uml Edge</em>}' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getSourceUmlEdge()
 	 * @generated
 	 * @ordered
@@ -135,6 +142,7 @@ public abstract class UmlDiagramElementImpl extends DiagramElementImpl implement
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected UmlDiagramElementImpl() {
@@ -144,6 +152,7 @@ public abstract class UmlDiagramElementImpl extends DiagramElementImpl implement
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -154,6 +163,7 @@ public abstract class UmlDiagramElementImpl extends DiagramElementImpl implement
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -165,15 +175,17 @@ public abstract class UmlDiagramElementImpl extends DiagramElementImpl implement
 	 * The array of subset feature identifiers for the '{@link #getModelElement() <em>Model Element</em>}' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getModelElement()
 	 * @generated
 	 * @ordered
 	 */
-	protected static final int[] MODEL_ELEMENT_ESUBSETS = new int[] {UMLDIPackage.UML_DIAGRAM_ELEMENT__UML_MODEL_ELEMENT};
+	protected static final int[] MODEL_ELEMENT_ESUBSETS = new int[]{ UMLDIPackage.UML_DIAGRAM_ELEMENT__UML_MODEL_ELEMENT };
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -185,11 +197,12 @@ public abstract class UmlDiagramElementImpl extends DiagramElementImpl implement
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Style basicGetSharedStyle() {
-		if (eIsSet(UMLDIPackage.UML_DIAGRAM_ELEMENT__SHARED_UML_STYLE)) {
+		if(eIsSet(UMLDIPackage.UML_DIAGRAM_ELEMENT__SHARED_UML_STYLE)) {
 			return basicGetSharedUmlStyle();
 		}
 		return super.basicGetSharedStyle();
@@ -198,6 +211,7 @@ public abstract class UmlDiagramElementImpl extends DiagramElementImpl implement
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -209,11 +223,12 @@ public abstract class UmlDiagramElementImpl extends DiagramElementImpl implement
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Style basicGetLocalStyle() {
-		if (eIsSet(UMLDIPackage.UML_DIAGRAM_ELEMENT__LOCAL_UML_STYLE)) {
+		if(eIsSet(UMLDIPackage.UML_DIAGRAM_ELEMENT__LOCAL_UML_STYLE)) {
 			return getLocalUmlStyle();
 		}
 		return super.basicGetLocalStyle();
@@ -222,6 +237,7 @@ public abstract class UmlDiagramElementImpl extends DiagramElementImpl implement
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -233,12 +249,13 @@ public abstract class UmlDiagramElementImpl extends DiagramElementImpl implement
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public DiagramElement basicGetOwningDiagramElement() {
-		UmlDiagramElement owningUmlDiagramElement = getOwningUmlDiagramElement();			
-		if (owningUmlDiagramElement != null) {
+		UmlDiagramElement owningUmlDiagramElement = getOwningUmlDiagramElement();
+		if(owningUmlDiagramElement != null) {
 			return owningUmlDiagramElement;
 		}
 		return super.basicGetOwningDiagramElement();
@@ -247,6 +264,7 @@ public abstract class UmlDiagramElementImpl extends DiagramElementImpl implement
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -258,15 +276,17 @@ public abstract class UmlDiagramElementImpl extends DiagramElementImpl implement
 	 * The array of subset feature identifiers for the '{@link #getOwnedDiagramElement() <em>Owned Diagram Element</em>}' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getOwnedDiagramElement()
 	 * @generated
 	 * @ordered
 	 */
-	protected static final int[] OWNED_DIAGRAM_ELEMENT_ESUBSETS = new int[] {UMLDIPackage.UML_DIAGRAM_ELEMENT__OWNED_UML_DIAGRAM_ELEMENT};
+	protected static final int[] OWNED_DIAGRAM_ELEMENT_ESUBSETS = new int[]{ UMLDIPackage.UML_DIAGRAM_ELEMENT__OWNED_UML_DIAGRAM_ELEMENT };
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -278,15 +298,17 @@ public abstract class UmlDiagramElementImpl extends DiagramElementImpl implement
 	 * The array of subset feature identifiers for the '{@link #getTargetEdge() <em>Target Edge</em>}' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getTargetEdge()
 	 * @generated
 	 * @ordered
 	 */
-	protected static final int[] TARGET_EDGE_ESUBSETS = new int[] {UMLDIPackage.UML_DIAGRAM_ELEMENT__TARGET_UML_EDGE};
+	protected static final int[] TARGET_EDGE_ESUBSETS = new int[]{ UMLDIPackage.UML_DIAGRAM_ELEMENT__TARGET_UML_EDGE };
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -298,19 +320,21 @@ public abstract class UmlDiagramElementImpl extends DiagramElementImpl implement
 	 * The array of subset feature identifiers for the '{@link #getSourceEdge() <em>Source Edge</em>}' reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getSourceEdge()
 	 * @generated
 	 * @ordered
 	 */
-	protected static final int[] SOURCE_EDGE_ESUBSETS = new int[] {UMLDIPackage.UML_DIAGRAM_ELEMENT__SOURCE_UML_EDGE};
+	protected static final int[] SOURCE_EDGE_ESUBSETS = new int[]{ UMLDIPackage.UML_DIAGRAM_ELEMENT__SOURCE_UML_EDGE };
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<Element> getUmlModelElement() {
-		if (umlModelElement == null) {
+		if(umlModelElement == null) {
 			umlModelElement = new EObjectResolvingEList<Element>(Element.class, this, UMLDIPackage.UML_DIAGRAM_ELEMENT__UML_MODEL_ELEMENT);
 		}
 		return umlModelElement;
@@ -319,14 +343,15 @@ public abstract class UmlDiagramElementImpl extends DiagramElementImpl implement
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public UmlStyle getSharedUmlStyle() {
-		if (sharedUmlStyle != null && sharedUmlStyle.eIsProxy()) {
+		if(sharedUmlStyle != null && sharedUmlStyle.eIsProxy()) {
 			InternalEObject oldSharedUmlStyle = (InternalEObject)sharedUmlStyle;
 			sharedUmlStyle = (UmlStyle)eResolveProxy(oldSharedUmlStyle);
-			if (sharedUmlStyle != oldSharedUmlStyle) {
-				if (eNotificationRequired())
+			if(sharedUmlStyle != oldSharedUmlStyle) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, UMLDIPackage.UML_DIAGRAM_ELEMENT__SHARED_UML_STYLE, oldSharedUmlStyle, sharedUmlStyle));
 			}
 		}
@@ -336,6 +361,7 @@ public abstract class UmlDiagramElementImpl extends DiagramElementImpl implement
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public UmlStyle basicGetSharedUmlStyle() {
@@ -345,18 +371,20 @@ public abstract class UmlDiagramElementImpl extends DiagramElementImpl implement
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setSharedUmlStyle(UmlStyle newSharedUmlStyle) {
 		UmlStyle oldSharedUmlStyle = sharedUmlStyle;
 		sharedUmlStyle = newSharedUmlStyle;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, UMLDIPackage.UML_DIAGRAM_ELEMENT__SHARED_UML_STYLE, oldSharedUmlStyle, sharedUmlStyle));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public UmlStyle getLocalUmlStyle() {
@@ -366,14 +394,18 @@ public abstract class UmlDiagramElementImpl extends DiagramElementImpl implement
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NotificationChain basicSetLocalUmlStyle(UmlStyle newLocalUmlStyle, NotificationChain msgs) {
 		UmlStyle oldLocalUmlStyle = localUmlStyle;
 		localUmlStyle = newLocalUmlStyle;
-		if (eNotificationRequired()) {
+		if(eNotificationRequired()) {
 			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, UMLDIPackage.UML_DIAGRAM_ELEMENT__LOCAL_UML_STYLE, oldLocalUmlStyle, newLocalUmlStyle);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
+			if(msgs == null)
+				msgs = notification;
+			else
+				msgs.add(notification);
 		}
 		return msgs;
 	}
@@ -381,35 +413,39 @@ public abstract class UmlDiagramElementImpl extends DiagramElementImpl implement
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setLocalUmlStyle(UmlStyle newLocalUmlStyle) {
-		if (newLocalUmlStyle != localUmlStyle) {
+		if(newLocalUmlStyle != localUmlStyle) {
 			NotificationChain msgs = null;
-			if (localUmlStyle != null)
+			if(localUmlStyle != null)
 				msgs = ((InternalEObject)localUmlStyle).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - UMLDIPackage.UML_DIAGRAM_ELEMENT__LOCAL_UML_STYLE, null, msgs);
-			if (newLocalUmlStyle != null)
+			if(newLocalUmlStyle != null)
 				msgs = ((InternalEObject)newLocalUmlStyle).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - UMLDIPackage.UML_DIAGRAM_ELEMENT__LOCAL_UML_STYLE, null, msgs);
 			msgs = basicSetLocalUmlStyle(newLocalUmlStyle, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
+			if(msgs != null)
+				msgs.dispatch();
+		} else if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, UMLDIPackage.UML_DIAGRAM_ELEMENT__LOCAL_UML_STYLE, newLocalUmlStyle, newLocalUmlStyle));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public UmlDiagramElement getOwningUmlDiagramElement() {
-		if (eContainerFeatureID() != UMLDIPackage.UML_DIAGRAM_ELEMENT__OWNING_UML_DIAGRAM_ELEMENT) return null;
+		if(eContainerFeatureID() != UMLDIPackage.UML_DIAGRAM_ELEMENT__OWNING_UML_DIAGRAM_ELEMENT)
+			return null;
 		return (UmlDiagramElement)eInternalContainer();
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NotificationChain basicSetOwningUmlDiagramElement(UmlDiagramElement newOwningUmlDiagramElement, NotificationChain msgs) {
@@ -420,31 +456,33 @@ public abstract class UmlDiagramElementImpl extends DiagramElementImpl implement
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setOwningUmlDiagramElement(UmlDiagramElement newOwningUmlDiagramElement) {
-		if (newOwningUmlDiagramElement != eInternalContainer() || (eContainerFeatureID() != UMLDIPackage.UML_DIAGRAM_ELEMENT__OWNING_UML_DIAGRAM_ELEMENT && newOwningUmlDiagramElement != null)) {
-			if (EcoreUtil.isAncestor(this, newOwningUmlDiagramElement))
+		if(newOwningUmlDiagramElement != eInternalContainer() || (eContainerFeatureID() != UMLDIPackage.UML_DIAGRAM_ELEMENT__OWNING_UML_DIAGRAM_ELEMENT && newOwningUmlDiagramElement != null)) {
+			if(EcoreUtil.isAncestor(this, newOwningUmlDiagramElement))
 				throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
 			NotificationChain msgs = null;
-			if (eInternalContainer() != null)
+			if(eInternalContainer() != null)
 				msgs = eBasicRemoveFromContainer(msgs);
-			if (newOwningUmlDiagramElement != null)
+			if(newOwningUmlDiagramElement != null)
 				msgs = ((InternalEObject)newOwningUmlDiagramElement).eInverseAdd(this, UMLDIPackage.UML_DIAGRAM_ELEMENT__OWNED_UML_DIAGRAM_ELEMENT, UmlDiagramElement.class, msgs);
 			msgs = basicSetOwningUmlDiagramElement(newOwningUmlDiagramElement, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
+			if(msgs != null)
+				msgs.dispatch();
+		} else if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, UMLDIPackage.UML_DIAGRAM_ELEMENT__OWNING_UML_DIAGRAM_ELEMENT, newOwningUmlDiagramElement, newOwningUmlDiagramElement));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<UmlDiagramElement> getOwnedUmlDiagramElement() {
-		if (ownedUmlDiagramElement == null) {
+		if(ownedUmlDiagramElement == null) {
 			ownedUmlDiagramElement = new EObjectContainmentWithInverseEList<UmlDiagramElement>(UmlDiagramElement.class, this, UMLDIPackage.UML_DIAGRAM_ELEMENT__OWNED_UML_DIAGRAM_ELEMENT, UMLDIPackage.UML_DIAGRAM_ELEMENT__OWNING_UML_DIAGRAM_ELEMENT);
 		}
 		return ownedUmlDiagramElement;
@@ -453,10 +491,11 @@ public abstract class UmlDiagramElementImpl extends DiagramElementImpl implement
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<UmlEdge> getTargetUmlEdge() {
-		if (targetUmlEdge == null) {
+		if(targetUmlEdge == null) {
 			targetUmlEdge = new EObjectWithInverseResolvingEList<UmlEdge>(UmlEdge.class, this, UMLDIPackage.UML_DIAGRAM_ELEMENT__TARGET_UML_EDGE, UMLDIPackage.UML_EDGE__TARGET_UML_DIAGRAM_ELEMENT);
 		}
 		return targetUmlEdge;
@@ -465,10 +504,11 @@ public abstract class UmlDiagramElementImpl extends DiagramElementImpl implement
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<UmlEdge> getSourceUmlEdge() {
-		if (sourceUmlEdge == null) {
+		if(sourceUmlEdge == null) {
 			sourceUmlEdge = new EObjectWithInverseResolvingEList<UmlEdge>(UmlEdge.class, this, UMLDIPackage.UML_DIAGRAM_ELEMENT__SOURCE_UML_EDGE, UMLDIPackage.UML_EDGE__SOURCE_UML_DIAGRAM_ELEMENT);
 		}
 		return sourceUmlEdge;
@@ -477,22 +517,23 @@ public abstract class UmlDiagramElementImpl extends DiagramElementImpl implement
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case UMLDIPackage.UML_DIAGRAM_ELEMENT__OWNING_UML_DIAGRAM_ELEMENT:
-				if (eInternalContainer() != null)
-					msgs = eBasicRemoveFromContainer(msgs);
-				return basicSetOwningUmlDiagramElement((UmlDiagramElement)otherEnd, msgs);
-			case UMLDIPackage.UML_DIAGRAM_ELEMENT__OWNED_UML_DIAGRAM_ELEMENT:
-				return ((InternalEList<InternalEObject>)(InternalEList<?>)getOwnedUmlDiagramElement()).basicAdd(otherEnd, msgs);
-			case UMLDIPackage.UML_DIAGRAM_ELEMENT__TARGET_UML_EDGE:
-				return ((InternalEList<InternalEObject>)(InternalEList<?>)getTargetUmlEdge()).basicAdd(otherEnd, msgs);
-			case UMLDIPackage.UML_DIAGRAM_ELEMENT__SOURCE_UML_EDGE:
-				return ((InternalEList<InternalEObject>)(InternalEList<?>)getSourceUmlEdge()).basicAdd(otherEnd, msgs);
+		switch(featureID) {
+		case UMLDIPackage.UML_DIAGRAM_ELEMENT__OWNING_UML_DIAGRAM_ELEMENT:
+			if(eInternalContainer() != null)
+				msgs = eBasicRemoveFromContainer(msgs);
+			return basicSetOwningUmlDiagramElement((UmlDiagramElement)otherEnd, msgs);
+		case UMLDIPackage.UML_DIAGRAM_ELEMENT__OWNED_UML_DIAGRAM_ELEMENT:
+			return ((InternalEList<InternalEObject>)(InternalEList<?>)getOwnedUmlDiagramElement()).basicAdd(otherEnd, msgs);
+		case UMLDIPackage.UML_DIAGRAM_ELEMENT__TARGET_UML_EDGE:
+			return ((InternalEList<InternalEObject>)(InternalEList<?>)getTargetUmlEdge()).basicAdd(otherEnd, msgs);
+		case UMLDIPackage.UML_DIAGRAM_ELEMENT__SOURCE_UML_EDGE:
+			return ((InternalEList<InternalEObject>)(InternalEList<?>)getSourceUmlEdge()).basicAdd(otherEnd, msgs);
 		}
 		return super.eInverseAdd(otherEnd, featureID, msgs);
 	}
@@ -500,21 +541,22 @@ public abstract class UmlDiagramElementImpl extends DiagramElementImpl implement
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case UMLDIPackage.UML_DIAGRAM_ELEMENT__LOCAL_UML_STYLE:
-				return basicSetLocalUmlStyle(null, msgs);
-			case UMLDIPackage.UML_DIAGRAM_ELEMENT__OWNING_UML_DIAGRAM_ELEMENT:
-				return basicSetOwningUmlDiagramElement(null, msgs);
-			case UMLDIPackage.UML_DIAGRAM_ELEMENT__OWNED_UML_DIAGRAM_ELEMENT:
-				return ((InternalEList<?>)getOwnedUmlDiagramElement()).basicRemove(otherEnd, msgs);
-			case UMLDIPackage.UML_DIAGRAM_ELEMENT__TARGET_UML_EDGE:
-				return ((InternalEList<?>)getTargetUmlEdge()).basicRemove(otherEnd, msgs);
-			case UMLDIPackage.UML_DIAGRAM_ELEMENT__SOURCE_UML_EDGE:
-				return ((InternalEList<?>)getSourceUmlEdge()).basicRemove(otherEnd, msgs);
+		switch(featureID) {
+		case UMLDIPackage.UML_DIAGRAM_ELEMENT__LOCAL_UML_STYLE:
+			return basicSetLocalUmlStyle(null, msgs);
+		case UMLDIPackage.UML_DIAGRAM_ELEMENT__OWNING_UML_DIAGRAM_ELEMENT:
+			return basicSetOwningUmlDiagramElement(null, msgs);
+		case UMLDIPackage.UML_DIAGRAM_ELEMENT__OWNED_UML_DIAGRAM_ELEMENT:
+			return ((InternalEList<?>)getOwnedUmlDiagramElement()).basicRemove(otherEnd, msgs);
+		case UMLDIPackage.UML_DIAGRAM_ELEMENT__TARGET_UML_EDGE:
+			return ((InternalEList<?>)getTargetUmlEdge()).basicRemove(otherEnd, msgs);
+		case UMLDIPackage.UML_DIAGRAM_ELEMENT__SOURCE_UML_EDGE:
+			return ((InternalEList<?>)getSourceUmlEdge()).basicRemove(otherEnd, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
@@ -522,13 +564,14 @@ public abstract class UmlDiagramElementImpl extends DiagramElementImpl implement
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs) {
-		switch (eContainerFeatureID()) {
-			case UMLDIPackage.UML_DIAGRAM_ELEMENT__OWNING_UML_DIAGRAM_ELEMENT:
-				return eInternalContainer().eInverseRemove(this, UMLDIPackage.UML_DIAGRAM_ELEMENT__OWNED_UML_DIAGRAM_ELEMENT, UmlDiagramElement.class, msgs);
+		switch(eContainerFeatureID()) {
+		case UMLDIPackage.UML_DIAGRAM_ELEMENT__OWNING_UML_DIAGRAM_ELEMENT:
+			return eInternalContainer().eInverseRemove(this, UMLDIPackage.UML_DIAGRAM_ELEMENT__OWNED_UML_DIAGRAM_ELEMENT, UmlDiagramElement.class, msgs);
 		}
 		return super.eBasicRemoveFromContainerFeature(msgs);
 	}
@@ -536,26 +579,28 @@ public abstract class UmlDiagramElementImpl extends DiagramElementImpl implement
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case UMLDIPackage.UML_DIAGRAM_ELEMENT__UML_MODEL_ELEMENT:
-				return getUmlModelElement();
-			case UMLDIPackage.UML_DIAGRAM_ELEMENT__SHARED_UML_STYLE:
-				if (resolve) return getSharedUmlStyle();
-				return basicGetSharedUmlStyle();
-			case UMLDIPackage.UML_DIAGRAM_ELEMENT__LOCAL_UML_STYLE:
-				return getLocalUmlStyle();
-			case UMLDIPackage.UML_DIAGRAM_ELEMENT__OWNING_UML_DIAGRAM_ELEMENT:
-				return getOwningUmlDiagramElement();
-			case UMLDIPackage.UML_DIAGRAM_ELEMENT__OWNED_UML_DIAGRAM_ELEMENT:
-				return getOwnedUmlDiagramElement();
-			case UMLDIPackage.UML_DIAGRAM_ELEMENT__TARGET_UML_EDGE:
-				return getTargetUmlEdge();
-			case UMLDIPackage.UML_DIAGRAM_ELEMENT__SOURCE_UML_EDGE:
-				return getSourceUmlEdge();
+		switch(featureID) {
+		case UMLDIPackage.UML_DIAGRAM_ELEMENT__UML_MODEL_ELEMENT:
+			return getUmlModelElement();
+		case UMLDIPackage.UML_DIAGRAM_ELEMENT__SHARED_UML_STYLE:
+			if(resolve)
+				return getSharedUmlStyle();
+			return basicGetSharedUmlStyle();
+		case UMLDIPackage.UML_DIAGRAM_ELEMENT__LOCAL_UML_STYLE:
+			return getLocalUmlStyle();
+		case UMLDIPackage.UML_DIAGRAM_ELEMENT__OWNING_UML_DIAGRAM_ELEMENT:
+			return getOwningUmlDiagramElement();
+		case UMLDIPackage.UML_DIAGRAM_ELEMENT__OWNED_UML_DIAGRAM_ELEMENT:
+			return getOwnedUmlDiagramElement();
+		case UMLDIPackage.UML_DIAGRAM_ELEMENT__TARGET_UML_EDGE:
+			return getTargetUmlEdge();
+		case UMLDIPackage.UML_DIAGRAM_ELEMENT__SOURCE_UML_EDGE:
+			return getSourceUmlEdge();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -563,37 +608,38 @@ public abstract class UmlDiagramElementImpl extends DiagramElementImpl implement
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case UMLDIPackage.UML_DIAGRAM_ELEMENT__UML_MODEL_ELEMENT:
-				getUmlModelElement().clear();
-				getUmlModelElement().addAll((Collection<? extends Element>)newValue);
-				return;
-			case UMLDIPackage.UML_DIAGRAM_ELEMENT__SHARED_UML_STYLE:
-				setSharedUmlStyle((UmlStyle)newValue);
-				return;
-			case UMLDIPackage.UML_DIAGRAM_ELEMENT__LOCAL_UML_STYLE:
-				setLocalUmlStyle((UmlStyle)newValue);
-				return;
-			case UMLDIPackage.UML_DIAGRAM_ELEMENT__OWNING_UML_DIAGRAM_ELEMENT:
-				setOwningUmlDiagramElement((UmlDiagramElement)newValue);
-				return;
-			case UMLDIPackage.UML_DIAGRAM_ELEMENT__OWNED_UML_DIAGRAM_ELEMENT:
-				getOwnedUmlDiagramElement().clear();
-				getOwnedUmlDiagramElement().addAll((Collection<? extends UmlDiagramElement>)newValue);
-				return;
-			case UMLDIPackage.UML_DIAGRAM_ELEMENT__TARGET_UML_EDGE:
-				getTargetUmlEdge().clear();
-				getTargetUmlEdge().addAll((Collection<? extends UmlEdge>)newValue);
-				return;
-			case UMLDIPackage.UML_DIAGRAM_ELEMENT__SOURCE_UML_EDGE:
-				getSourceUmlEdge().clear();
-				getSourceUmlEdge().addAll((Collection<? extends UmlEdge>)newValue);
-				return;
+		switch(featureID) {
+		case UMLDIPackage.UML_DIAGRAM_ELEMENT__UML_MODEL_ELEMENT:
+			getUmlModelElement().clear();
+			getUmlModelElement().addAll((Collection<? extends Element>)newValue);
+			return;
+		case UMLDIPackage.UML_DIAGRAM_ELEMENT__SHARED_UML_STYLE:
+			setSharedUmlStyle((UmlStyle)newValue);
+			return;
+		case UMLDIPackage.UML_DIAGRAM_ELEMENT__LOCAL_UML_STYLE:
+			setLocalUmlStyle((UmlStyle)newValue);
+			return;
+		case UMLDIPackage.UML_DIAGRAM_ELEMENT__OWNING_UML_DIAGRAM_ELEMENT:
+			setOwningUmlDiagramElement((UmlDiagramElement)newValue);
+			return;
+		case UMLDIPackage.UML_DIAGRAM_ELEMENT__OWNED_UML_DIAGRAM_ELEMENT:
+			getOwnedUmlDiagramElement().clear();
+			getOwnedUmlDiagramElement().addAll((Collection<? extends UmlDiagramElement>)newValue);
+			return;
+		case UMLDIPackage.UML_DIAGRAM_ELEMENT__TARGET_UML_EDGE:
+			getTargetUmlEdge().clear();
+			getTargetUmlEdge().addAll((Collection<? extends UmlEdge>)newValue);
+			return;
+		case UMLDIPackage.UML_DIAGRAM_ELEMENT__SOURCE_UML_EDGE:
+			getSourceUmlEdge().clear();
+			getSourceUmlEdge().addAll((Collection<? extends UmlEdge>)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -601,32 +647,33 @@ public abstract class UmlDiagramElementImpl extends DiagramElementImpl implement
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case UMLDIPackage.UML_DIAGRAM_ELEMENT__UML_MODEL_ELEMENT:
-				getUmlModelElement().clear();
-				return;
-			case UMLDIPackage.UML_DIAGRAM_ELEMENT__SHARED_UML_STYLE:
-				setSharedUmlStyle((UmlStyle)null);
-				return;
-			case UMLDIPackage.UML_DIAGRAM_ELEMENT__LOCAL_UML_STYLE:
-				setLocalUmlStyle((UmlStyle)null);
-				return;
-			case UMLDIPackage.UML_DIAGRAM_ELEMENT__OWNING_UML_DIAGRAM_ELEMENT:
-				setOwningUmlDiagramElement((UmlDiagramElement)null);
-				return;
-			case UMLDIPackage.UML_DIAGRAM_ELEMENT__OWNED_UML_DIAGRAM_ELEMENT:
-				getOwnedUmlDiagramElement().clear();
-				return;
-			case UMLDIPackage.UML_DIAGRAM_ELEMENT__TARGET_UML_EDGE:
-				getTargetUmlEdge().clear();
-				return;
-			case UMLDIPackage.UML_DIAGRAM_ELEMENT__SOURCE_UML_EDGE:
-				getSourceUmlEdge().clear();
-				return;
+		switch(featureID) {
+		case UMLDIPackage.UML_DIAGRAM_ELEMENT__UML_MODEL_ELEMENT:
+			getUmlModelElement().clear();
+			return;
+		case UMLDIPackage.UML_DIAGRAM_ELEMENT__SHARED_UML_STYLE:
+			setSharedUmlStyle((UmlStyle)null);
+			return;
+		case UMLDIPackage.UML_DIAGRAM_ELEMENT__LOCAL_UML_STYLE:
+			setLocalUmlStyle((UmlStyle)null);
+			return;
+		case UMLDIPackage.UML_DIAGRAM_ELEMENT__OWNING_UML_DIAGRAM_ELEMENT:
+			setOwningUmlDiagramElement((UmlDiagramElement)null);
+			return;
+		case UMLDIPackage.UML_DIAGRAM_ELEMENT__OWNED_UML_DIAGRAM_ELEMENT:
+			getOwnedUmlDiagramElement().clear();
+			return;
+		case UMLDIPackage.UML_DIAGRAM_ELEMENT__TARGET_UML_EDGE:
+			getTargetUmlEdge().clear();
+			return;
+		case UMLDIPackage.UML_DIAGRAM_ELEMENT__SOURCE_UML_EDGE:
+			getSourceUmlEdge().clear();
+			return;
 		}
 		super.eUnset(featureID);
 	}
@@ -634,39 +681,40 @@ public abstract class UmlDiagramElementImpl extends DiagramElementImpl implement
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case UMLDIPackage.UML_DIAGRAM_ELEMENT__MODEL_ELEMENT:
-				return isSetModelElement();
-			case UMLDIPackage.UML_DIAGRAM_ELEMENT__SHARED_STYLE:
-				return isSetSharedStyle();
-			case UMLDIPackage.UML_DIAGRAM_ELEMENT__LOCAL_STYLE:
-				return isSetLocalStyle();
-			case UMLDIPackage.UML_DIAGRAM_ELEMENT__OWNING_DIAGRAM_ELEMENT:
-				return isSetOwningDiagramElement();
-			case UMLDIPackage.UML_DIAGRAM_ELEMENT__OWNED_DIAGRAM_ELEMENT:
-				return isSetOwnedDiagramElement();
-			case UMLDIPackage.UML_DIAGRAM_ELEMENT__TARGET_EDGE:
-				return isSetTargetEdge();
-			case UMLDIPackage.UML_DIAGRAM_ELEMENT__SOURCE_EDGE:
-				return isSetSourceEdge();
-			case UMLDIPackage.UML_DIAGRAM_ELEMENT__UML_MODEL_ELEMENT:
-				return umlModelElement != null && !umlModelElement.isEmpty();
-			case UMLDIPackage.UML_DIAGRAM_ELEMENT__SHARED_UML_STYLE:
-				return sharedUmlStyle != null;
-			case UMLDIPackage.UML_DIAGRAM_ELEMENT__LOCAL_UML_STYLE:
-				return localUmlStyle != null;
-			case UMLDIPackage.UML_DIAGRAM_ELEMENT__OWNING_UML_DIAGRAM_ELEMENT:
-				return getOwningUmlDiagramElement() != null;
-			case UMLDIPackage.UML_DIAGRAM_ELEMENT__OWNED_UML_DIAGRAM_ELEMENT:
-				return ownedUmlDiagramElement != null && !ownedUmlDiagramElement.isEmpty();
-			case UMLDIPackage.UML_DIAGRAM_ELEMENT__TARGET_UML_EDGE:
-				return targetUmlEdge != null && !targetUmlEdge.isEmpty();
-			case UMLDIPackage.UML_DIAGRAM_ELEMENT__SOURCE_UML_EDGE:
-				return sourceUmlEdge != null && !sourceUmlEdge.isEmpty();
+		switch(featureID) {
+		case UMLDIPackage.UML_DIAGRAM_ELEMENT__MODEL_ELEMENT:
+			return isSetModelElement();
+		case UMLDIPackage.UML_DIAGRAM_ELEMENT__SHARED_STYLE:
+			return isSetSharedStyle();
+		case UMLDIPackage.UML_DIAGRAM_ELEMENT__LOCAL_STYLE:
+			return isSetLocalStyle();
+		case UMLDIPackage.UML_DIAGRAM_ELEMENT__OWNING_DIAGRAM_ELEMENT:
+			return isSetOwningDiagramElement();
+		case UMLDIPackage.UML_DIAGRAM_ELEMENT__OWNED_DIAGRAM_ELEMENT:
+			return isSetOwnedDiagramElement();
+		case UMLDIPackage.UML_DIAGRAM_ELEMENT__TARGET_EDGE:
+			return isSetTargetEdge();
+		case UMLDIPackage.UML_DIAGRAM_ELEMENT__SOURCE_EDGE:
+			return isSetSourceEdge();
+		case UMLDIPackage.UML_DIAGRAM_ELEMENT__UML_MODEL_ELEMENT:
+			return umlModelElement != null && !umlModelElement.isEmpty();
+		case UMLDIPackage.UML_DIAGRAM_ELEMENT__SHARED_UML_STYLE:
+			return sharedUmlStyle != null;
+		case UMLDIPackage.UML_DIAGRAM_ELEMENT__LOCAL_UML_STYLE:
+			return localUmlStyle != null;
+		case UMLDIPackage.UML_DIAGRAM_ELEMENT__OWNING_UML_DIAGRAM_ELEMENT:
+			return getOwningUmlDiagramElement() != null;
+		case UMLDIPackage.UML_DIAGRAM_ELEMENT__OWNED_UML_DIAGRAM_ELEMENT:
+			return ownedUmlDiagramElement != null && !ownedUmlDiagramElement.isEmpty();
+		case UMLDIPackage.UML_DIAGRAM_ELEMENT__TARGET_UML_EDGE:
+			return targetUmlEdge != null && !targetUmlEdge.isEmpty();
+		case UMLDIPackage.UML_DIAGRAM_ELEMENT__SOURCE_UML_EDGE:
+			return sourceUmlEdge != null && !sourceUmlEdge.isEmpty();
 		}
 		return super.eIsSet(featureID);
 	}
@@ -674,78 +722,77 @@ public abstract class UmlDiagramElementImpl extends DiagramElementImpl implement
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean isSetModelElement() {
-		return super.isSetModelElement()
-			|| eIsSet(UMLDIPackage.UML_DIAGRAM_ELEMENT__UML_MODEL_ELEMENT);
+		return super.isSetModelElement() || eIsSet(UMLDIPackage.UML_DIAGRAM_ELEMENT__UML_MODEL_ELEMENT);
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean isSetSharedStyle() {
-		return super.isSetSharedStyle()
-			|| eIsSet(UMLDIPackage.UML_DIAGRAM_ELEMENT__SHARED_UML_STYLE);
+		return super.isSetSharedStyle() || eIsSet(UMLDIPackage.UML_DIAGRAM_ELEMENT__SHARED_UML_STYLE);
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean isSetLocalStyle() {
-		return super.isSetLocalStyle()
-			|| eIsSet(UMLDIPackage.UML_DIAGRAM_ELEMENT__LOCAL_UML_STYLE);
+		return super.isSetLocalStyle() || eIsSet(UMLDIPackage.UML_DIAGRAM_ELEMENT__LOCAL_UML_STYLE);
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean isSetOwningDiagramElement() {
-		return super.isSetOwningDiagramElement()
-			|| eIsSet(UMLDIPackage.UML_DIAGRAM_ELEMENT__OWNING_UML_DIAGRAM_ELEMENT);
+		return super.isSetOwningDiagramElement() || eIsSet(UMLDIPackage.UML_DIAGRAM_ELEMENT__OWNING_UML_DIAGRAM_ELEMENT);
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean isSetOwnedDiagramElement() {
-		return super.isSetOwnedDiagramElement()
-			|| eIsSet(UMLDIPackage.UML_DIAGRAM_ELEMENT__OWNED_UML_DIAGRAM_ELEMENT);
+		return super.isSetOwnedDiagramElement() || eIsSet(UMLDIPackage.UML_DIAGRAM_ELEMENT__OWNED_UML_DIAGRAM_ELEMENT);
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean isSetTargetEdge() {
-		return super.isSetTargetEdge()
-			|| eIsSet(UMLDIPackage.UML_DIAGRAM_ELEMENT__TARGET_UML_EDGE);
+		return super.isSetTargetEdge() || eIsSet(UMLDIPackage.UML_DIAGRAM_ELEMENT__TARGET_UML_EDGE);
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean isSetSourceEdge() {
-		return super.isSetSourceEdge()
-			|| eIsSet(UMLDIPackage.UML_DIAGRAM_ELEMENT__SOURCE_UML_EDGE);
+		return super.isSetSourceEdge() || eIsSet(UMLDIPackage.UML_DIAGRAM_ELEMENT__SOURCE_UML_EDGE);
 	}
-
 } //UmlDiagramElementImpl
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/impl/UmlDiagramImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/impl/UmlDiagramImpl.java
index e2594f6326b..04916ab835f 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/impl/UmlDiagramImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/impl/UmlDiagramImpl.java
@@ -26,19 +26,21 @@ import org.eclipse.papyrus.umldi.UmlDiagram;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.umldi.impl.UmlDiagramImpl#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.papyrus.umldi.impl.UmlDiagramImpl#getDocumentation <em>Documentation</em>}</li>
- *   <li>{@link org.eclipse.papyrus.umldi.impl.UmlDiagramImpl#getResolution <em>Resolution</em>}</li>
+ * <li>{@link org.eclipse.papyrus.umldi.impl.UmlDiagramImpl#getName <em>Name</em>}</li>
+ * <li>{@link org.eclipse.papyrus.umldi.impl.UmlDiagramImpl#getDocumentation <em>Documentation</em>}</li>
+ * <li>{@link org.eclipse.papyrus.umldi.impl.UmlDiagramImpl#getResolution <em>Resolution</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class UmlDiagramImpl extends UmlShapeImpl implements UmlDiagram {
+
 	/**
 	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getName()
 	 * @generated
 	 * @ordered
@@ -49,6 +51,7 @@ public class UmlDiagramImpl extends UmlShapeImpl implements UmlDiagram {
 	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getName()
 	 * @generated
 	 * @ordered
@@ -59,6 +62,7 @@ public class UmlDiagramImpl extends UmlShapeImpl implements UmlDiagram {
 	 * The default value of the '{@link #getDocumentation() <em>Documentation</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getDocumentation()
 	 * @generated
 	 * @ordered
@@ -69,6 +73,7 @@ public class UmlDiagramImpl extends UmlShapeImpl implements UmlDiagram {
 	 * The cached value of the '{@link #getDocumentation() <em>Documentation</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getDocumentation()
 	 * @generated
 	 * @ordered
@@ -79,6 +84,7 @@ public class UmlDiagramImpl extends UmlShapeImpl implements UmlDiagram {
 	 * The default value of the '{@link #getResolution() <em>Resolution</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getResolution()
 	 * @generated
 	 * @ordered
@@ -89,6 +95,7 @@ public class UmlDiagramImpl extends UmlShapeImpl implements UmlDiagram {
 	 * The cached value of the '{@link #getResolution() <em>Resolution</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getResolution()
 	 * @generated
 	 * @ordered
@@ -98,6 +105,7 @@ public class UmlDiagramImpl extends UmlShapeImpl implements UmlDiagram {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected UmlDiagramImpl() {
@@ -107,6 +115,7 @@ public class UmlDiagramImpl extends UmlShapeImpl implements UmlDiagram {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -117,6 +126,7 @@ public class UmlDiagramImpl extends UmlShapeImpl implements UmlDiagram {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getName() {
@@ -126,18 +136,20 @@ public class UmlDiagramImpl extends UmlShapeImpl implements UmlDiagram {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setName(String newName) {
 		String oldName = name;
 		name = newName;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, UMLDIPackage.UML_DIAGRAM__NAME, oldName, name));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getDocumentation() {
@@ -147,18 +159,20 @@ public class UmlDiagramImpl extends UmlShapeImpl implements UmlDiagram {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setDocumentation(String newDocumentation) {
 		String oldDocumentation = documentation;
 		documentation = newDocumentation;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, UMLDIPackage.UML_DIAGRAM__DOCUMENTATION, oldDocumentation, documentation));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public double getResolution() {
@@ -168,29 +182,31 @@ public class UmlDiagramImpl extends UmlShapeImpl implements UmlDiagram {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setResolution(double newResolution) {
 		double oldResolution = resolution;
 		resolution = newResolution;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, UMLDIPackage.UML_DIAGRAM__RESOLUTION, oldResolution, resolution));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case UMLDIPackage.UML_DIAGRAM__NAME:
-				return getName();
-			case UMLDIPackage.UML_DIAGRAM__DOCUMENTATION:
-				return getDocumentation();
-			case UMLDIPackage.UML_DIAGRAM__RESOLUTION:
-				return getResolution();
+		switch(featureID) {
+		case UMLDIPackage.UML_DIAGRAM__NAME:
+			return getName();
+		case UMLDIPackage.UML_DIAGRAM__DOCUMENTATION:
+			return getDocumentation();
+		case UMLDIPackage.UML_DIAGRAM__RESOLUTION:
+			return getResolution();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -198,20 +214,21 @@ public class UmlDiagramImpl extends UmlShapeImpl implements UmlDiagram {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case UMLDIPackage.UML_DIAGRAM__NAME:
-				setName((String)newValue);
-				return;
-			case UMLDIPackage.UML_DIAGRAM__DOCUMENTATION:
-				setDocumentation((String)newValue);
-				return;
-			case UMLDIPackage.UML_DIAGRAM__RESOLUTION:
-				setResolution((Double)newValue);
-				return;
+		switch(featureID) {
+		case UMLDIPackage.UML_DIAGRAM__NAME:
+			setName((String)newValue);
+			return;
+		case UMLDIPackage.UML_DIAGRAM__DOCUMENTATION:
+			setDocumentation((String)newValue);
+			return;
+		case UMLDIPackage.UML_DIAGRAM__RESOLUTION:
+			setResolution((Double)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -219,20 +236,21 @@ public class UmlDiagramImpl extends UmlShapeImpl implements UmlDiagram {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case UMLDIPackage.UML_DIAGRAM__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case UMLDIPackage.UML_DIAGRAM__DOCUMENTATION:
-				setDocumentation(DOCUMENTATION_EDEFAULT);
-				return;
-			case UMLDIPackage.UML_DIAGRAM__RESOLUTION:
-				setResolution(RESOLUTION_EDEFAULT);
-				return;
+		switch(featureID) {
+		case UMLDIPackage.UML_DIAGRAM__NAME:
+			setName(NAME_EDEFAULT);
+			return;
+		case UMLDIPackage.UML_DIAGRAM__DOCUMENTATION:
+			setDocumentation(DOCUMENTATION_EDEFAULT);
+			return;
+		case UMLDIPackage.UML_DIAGRAM__RESOLUTION:
+			setResolution(RESOLUTION_EDEFAULT);
+			return;
 		}
 		super.eUnset(featureID);
 	}
@@ -240,17 +258,18 @@ public class UmlDiagramImpl extends UmlShapeImpl implements UmlDiagram {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case UMLDIPackage.UML_DIAGRAM__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case UMLDIPackage.UML_DIAGRAM__DOCUMENTATION:
-				return DOCUMENTATION_EDEFAULT == null ? documentation != null : !DOCUMENTATION_EDEFAULT.equals(documentation);
-			case UMLDIPackage.UML_DIAGRAM__RESOLUTION:
-				return resolution != RESOLUTION_EDEFAULT;
+		switch(featureID) {
+		case UMLDIPackage.UML_DIAGRAM__NAME:
+			return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
+		case UMLDIPackage.UML_DIAGRAM__DOCUMENTATION:
+			return DOCUMENTATION_EDEFAULT == null ? documentation != null : !DOCUMENTATION_EDEFAULT.equals(documentation);
+		case UMLDIPackage.UML_DIAGRAM__RESOLUTION:
+			return resolution != RESOLUTION_EDEFAULT;
 		}
 		return super.eIsSet(featureID);
 	}
@@ -258,16 +277,21 @@ public class UmlDiagramImpl extends UmlShapeImpl implements UmlDiagram {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {
-		if (baseClass == Diagram.class) {
-			switch (derivedFeatureID) {
-				case UMLDIPackage.UML_DIAGRAM__NAME: return DIPackage.DIAGRAM__NAME;
-				case UMLDIPackage.UML_DIAGRAM__DOCUMENTATION: return DIPackage.DIAGRAM__DOCUMENTATION;
-				case UMLDIPackage.UML_DIAGRAM__RESOLUTION: return DIPackage.DIAGRAM__RESOLUTION;
-				default: return -1;
+		if(baseClass == Diagram.class) {
+			switch(derivedFeatureID) {
+			case UMLDIPackage.UML_DIAGRAM__NAME:
+				return DIPackage.DIAGRAM__NAME;
+			case UMLDIPackage.UML_DIAGRAM__DOCUMENTATION:
+				return DIPackage.DIAGRAM__DOCUMENTATION;
+			case UMLDIPackage.UML_DIAGRAM__RESOLUTION:
+				return DIPackage.DIAGRAM__RESOLUTION;
+			default:
+				return -1;
 			}
 		}
 		return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);
@@ -276,16 +300,21 @@ public class UmlDiagramImpl extends UmlShapeImpl implements UmlDiagram {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {
-		if (baseClass == Diagram.class) {
-			switch (baseFeatureID) {
-				case DIPackage.DIAGRAM__NAME: return UMLDIPackage.UML_DIAGRAM__NAME;
-				case DIPackage.DIAGRAM__DOCUMENTATION: return UMLDIPackage.UML_DIAGRAM__DOCUMENTATION;
-				case DIPackage.DIAGRAM__RESOLUTION: return UMLDIPackage.UML_DIAGRAM__RESOLUTION;
-				default: return -1;
+		if(baseClass == Diagram.class) {
+			switch(baseFeatureID) {
+			case DIPackage.DIAGRAM__NAME:
+				return UMLDIPackage.UML_DIAGRAM__NAME;
+			case DIPackage.DIAGRAM__DOCUMENTATION:
+				return UMLDIPackage.UML_DIAGRAM__DOCUMENTATION;
+			case DIPackage.DIAGRAM__RESOLUTION:
+				return UMLDIPackage.UML_DIAGRAM__RESOLUTION;
+			default:
+				return -1;
 			}
 		}
 		return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
@@ -294,12 +323,13 @@ public class UmlDiagramImpl extends UmlShapeImpl implements UmlDiagram {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) return super.toString();
-
+		if(eIsProxy())
+			return super.toString();
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (name: ");
 		result.append(name);
@@ -310,5 +340,4 @@ public class UmlDiagramImpl extends UmlShapeImpl implements UmlDiagram {
 		result.append(')');
 		return result.toString();
 	}
-
 } //UmlDiagramImpl
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/impl/UmlEdgeImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/impl/UmlEdgeImpl.java
index 3fb49b71f6c..cf7959db125 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/impl/UmlEdgeImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/impl/UmlEdgeImpl.java
@@ -43,21 +43,23 @@ import org.eclipse.papyrus.umldi.UmlEdge;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.umldi.impl.UmlEdgeImpl#getSourceDiagramElement <em>Source Diagram Element</em>}</li>
- *   <li>{@link org.eclipse.papyrus.umldi.impl.UmlEdgeImpl#getTargetDiagramElement <em>Target Diagram Element</em>}</li>
- *   <li>{@link org.eclipse.papyrus.umldi.impl.UmlEdgeImpl#getWaypoint <em>Waypoint</em>}</li>
- *   <li>{@link org.eclipse.papyrus.umldi.impl.UmlEdgeImpl#getSourceUmlDiagramElement <em>Source Uml Diagram Element</em>}</li>
- *   <li>{@link org.eclipse.papyrus.umldi.impl.UmlEdgeImpl#getTargetUmlDiagramElement <em>Target Uml Diagram Element</em>}</li>
+ * <li>{@link org.eclipse.papyrus.umldi.impl.UmlEdgeImpl#getSourceDiagramElement <em>Source Diagram Element</em>}</li>
+ * <li>{@link org.eclipse.papyrus.umldi.impl.UmlEdgeImpl#getTargetDiagramElement <em>Target Diagram Element</em>}</li>
+ * <li>{@link org.eclipse.papyrus.umldi.impl.UmlEdgeImpl#getWaypoint <em>Waypoint</em>}</li>
+ * <li>{@link org.eclipse.papyrus.umldi.impl.UmlEdgeImpl#getSourceUmlDiagramElement <em>Source Uml Diagram Element</em>}</li>
+ * <li>{@link org.eclipse.papyrus.umldi.impl.UmlEdgeImpl#getTargetUmlDiagramElement <em>Target Uml Diagram Element</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class UmlEdgeImpl extends UmlDiagramElementImpl implements UmlEdge {
+
 	/**
 	 * The cached value of the '{@link #getWaypoint() <em>Waypoint</em>}' containment reference list.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getWaypoint()
 	 * @generated
 	 * @ordered
@@ -68,6 +70,7 @@ public class UmlEdgeImpl extends UmlDiagramElementImpl implements UmlEdge {
 	 * The cached value of the '{@link #getSourceUmlDiagramElement() <em>Source Uml Diagram Element</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getSourceUmlDiagramElement()
 	 * @generated
 	 * @ordered
@@ -78,6 +81,7 @@ public class UmlEdgeImpl extends UmlDiagramElementImpl implements UmlEdge {
 	 * The cached value of the '{@link #getTargetUmlDiagramElement() <em>Target Uml Diagram Element</em>}' reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getTargetUmlDiagramElement()
 	 * @generated
 	 * @ordered
@@ -87,6 +91,7 @@ public class UmlEdgeImpl extends UmlDiagramElementImpl implements UmlEdge {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected UmlEdgeImpl() {
@@ -96,6 +101,7 @@ public class UmlEdgeImpl extends UmlDiagramElementImpl implements UmlEdge {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -106,6 +112,7 @@ public class UmlEdgeImpl extends UmlDiagramElementImpl implements UmlEdge {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public DiagramElement getSourceDiagramElement() {
@@ -116,10 +123,11 @@ public class UmlEdgeImpl extends UmlDiagramElementImpl implements UmlEdge {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public DiagramElement basicGetSourceDiagramElement() {
-		if (eIsSet(UMLDIPackage.UML_EDGE__SOURCE_UML_DIAGRAM_ELEMENT)) {
+		if(eIsSet(UMLDIPackage.UML_EDGE__SOURCE_UML_DIAGRAM_ELEMENT)) {
 			return basicGetSourceUmlDiagramElement();
 		}
 		return null;
@@ -128,6 +136,7 @@ public class UmlEdgeImpl extends UmlDiagramElementImpl implements UmlEdge {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public DiagramElement getTargetDiagramElement() {
@@ -138,10 +147,11 @@ public class UmlEdgeImpl extends UmlDiagramElementImpl implements UmlEdge {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public DiagramElement basicGetTargetDiagramElement() {
-		if (eIsSet(UMLDIPackage.UML_EDGE__TARGET_UML_DIAGRAM_ELEMENT)) {
+		if(eIsSet(UMLDIPackage.UML_EDGE__TARGET_UML_DIAGRAM_ELEMENT)) {
 			return basicGetTargetUmlDiagramElement();
 		}
 		return null;
@@ -150,10 +160,11 @@ public class UmlEdgeImpl extends UmlDiagramElementImpl implements UmlEdge {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public EList<Point> getWaypoint() {
-		if (waypoint == null) {
+		if(waypoint == null) {
 			waypoint = new EObjectContainmentEList<Point>(Point.class, this, UMLDIPackage.UML_EDGE__WAYPOINT);
 		}
 		return waypoint;
@@ -162,14 +173,15 @@ public class UmlEdgeImpl extends UmlDiagramElementImpl implements UmlEdge {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public UmlDiagramElement getSourceUmlDiagramElement() {
-		if (sourceUmlDiagramElement != null && sourceUmlDiagramElement.eIsProxy()) {
+		if(sourceUmlDiagramElement != null && sourceUmlDiagramElement.eIsProxy()) {
 			InternalEObject oldSourceUmlDiagramElement = (InternalEObject)sourceUmlDiagramElement;
 			sourceUmlDiagramElement = (UmlDiagramElement)eResolveProxy(oldSourceUmlDiagramElement);
-			if (sourceUmlDiagramElement != oldSourceUmlDiagramElement) {
-				if (eNotificationRequired())
+			if(sourceUmlDiagramElement != oldSourceUmlDiagramElement) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, UMLDIPackage.UML_EDGE__SOURCE_UML_DIAGRAM_ELEMENT, oldSourceUmlDiagramElement, sourceUmlDiagramElement));
 			}
 		}
@@ -179,6 +191,7 @@ public class UmlEdgeImpl extends UmlDiagramElementImpl implements UmlEdge {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public UmlDiagramElement basicGetSourceUmlDiagramElement() {
@@ -188,14 +201,18 @@ public class UmlEdgeImpl extends UmlDiagramElementImpl implements UmlEdge {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NotificationChain basicSetSourceUmlDiagramElement(UmlDiagramElement newSourceUmlDiagramElement, NotificationChain msgs) {
 		UmlDiagramElement oldSourceUmlDiagramElement = sourceUmlDiagramElement;
 		sourceUmlDiagramElement = newSourceUmlDiagramElement;
-		if (eNotificationRequired()) {
+		if(eNotificationRequired()) {
 			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, UMLDIPackage.UML_EDGE__SOURCE_UML_DIAGRAM_ELEMENT, oldSourceUmlDiagramElement, newSourceUmlDiagramElement);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
+			if(msgs == null)
+				msgs = notification;
+			else
+				msgs.add(notification);
 		}
 		return msgs;
 	}
@@ -203,33 +220,35 @@ public class UmlEdgeImpl extends UmlDiagramElementImpl implements UmlEdge {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setSourceUmlDiagramElement(UmlDiagramElement newSourceUmlDiagramElement) {
-		if (newSourceUmlDiagramElement != sourceUmlDiagramElement) {
+		if(newSourceUmlDiagramElement != sourceUmlDiagramElement) {
 			NotificationChain msgs = null;
-			if (sourceUmlDiagramElement != null)
+			if(sourceUmlDiagramElement != null)
 				msgs = ((InternalEObject)sourceUmlDiagramElement).eInverseRemove(this, UMLDIPackage.UML_DIAGRAM_ELEMENT__SOURCE_UML_EDGE, UmlDiagramElement.class, msgs);
-			if (newSourceUmlDiagramElement != null)
+			if(newSourceUmlDiagramElement != null)
 				msgs = ((InternalEObject)newSourceUmlDiagramElement).eInverseAdd(this, UMLDIPackage.UML_DIAGRAM_ELEMENT__SOURCE_UML_EDGE, UmlDiagramElement.class, msgs);
 			msgs = basicSetSourceUmlDiagramElement(newSourceUmlDiagramElement, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
+			if(msgs != null)
+				msgs.dispatch();
+		} else if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, UMLDIPackage.UML_EDGE__SOURCE_UML_DIAGRAM_ELEMENT, newSourceUmlDiagramElement, newSourceUmlDiagramElement));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public UmlDiagramElement getTargetUmlDiagramElement() {
-		if (targetUmlDiagramElement != null && targetUmlDiagramElement.eIsProxy()) {
+		if(targetUmlDiagramElement != null && targetUmlDiagramElement.eIsProxy()) {
 			InternalEObject oldTargetUmlDiagramElement = (InternalEObject)targetUmlDiagramElement;
 			targetUmlDiagramElement = (UmlDiagramElement)eResolveProxy(oldTargetUmlDiagramElement);
-			if (targetUmlDiagramElement != oldTargetUmlDiagramElement) {
-				if (eNotificationRequired())
+			if(targetUmlDiagramElement != oldTargetUmlDiagramElement) {
+				if(eNotificationRequired())
 					eNotify(new ENotificationImpl(this, Notification.RESOLVE, UMLDIPackage.UML_EDGE__TARGET_UML_DIAGRAM_ELEMENT, oldTargetUmlDiagramElement, targetUmlDiagramElement));
 			}
 		}
@@ -239,6 +258,7 @@ public class UmlEdgeImpl extends UmlDiagramElementImpl implements UmlEdge {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public UmlDiagramElement basicGetTargetUmlDiagramElement() {
@@ -248,14 +268,18 @@ public class UmlEdgeImpl extends UmlDiagramElementImpl implements UmlEdge {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NotificationChain basicSetTargetUmlDiagramElement(UmlDiagramElement newTargetUmlDiagramElement, NotificationChain msgs) {
 		UmlDiagramElement oldTargetUmlDiagramElement = targetUmlDiagramElement;
 		targetUmlDiagramElement = newTargetUmlDiagramElement;
-		if (eNotificationRequired()) {
+		if(eNotificationRequired()) {
 			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, UMLDIPackage.UML_EDGE__TARGET_UML_DIAGRAM_ELEMENT, oldTargetUmlDiagramElement, newTargetUmlDiagramElement);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
+			if(msgs == null)
+				msgs = notification;
+			else
+				msgs.add(notification);
 		}
 		return msgs;
 	}
@@ -263,38 +287,40 @@ public class UmlEdgeImpl extends UmlDiagramElementImpl implements UmlEdge {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setTargetUmlDiagramElement(UmlDiagramElement newTargetUmlDiagramElement) {
-		if (newTargetUmlDiagramElement != targetUmlDiagramElement) {
+		if(newTargetUmlDiagramElement != targetUmlDiagramElement) {
 			NotificationChain msgs = null;
-			if (targetUmlDiagramElement != null)
+			if(targetUmlDiagramElement != null)
 				msgs = ((InternalEObject)targetUmlDiagramElement).eInverseRemove(this, UMLDIPackage.UML_DIAGRAM_ELEMENT__TARGET_UML_EDGE, UmlDiagramElement.class, msgs);
-			if (newTargetUmlDiagramElement != null)
+			if(newTargetUmlDiagramElement != null)
 				msgs = ((InternalEObject)newTargetUmlDiagramElement).eInverseAdd(this, UMLDIPackage.UML_DIAGRAM_ELEMENT__TARGET_UML_EDGE, UmlDiagramElement.class, msgs);
 			msgs = basicSetTargetUmlDiagramElement(newTargetUmlDiagramElement, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
+			if(msgs != null)
+				msgs.dispatch();
+		} else if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, UMLDIPackage.UML_EDGE__TARGET_UML_DIAGRAM_ELEMENT, newTargetUmlDiagramElement, newTargetUmlDiagramElement));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case UMLDIPackage.UML_EDGE__SOURCE_UML_DIAGRAM_ELEMENT:
-				if (sourceUmlDiagramElement != null)
-					msgs = ((InternalEObject)sourceUmlDiagramElement).eInverseRemove(this, UMLDIPackage.UML_DIAGRAM_ELEMENT__SOURCE_UML_EDGE, UmlDiagramElement.class, msgs);
-				return basicSetSourceUmlDiagramElement((UmlDiagramElement)otherEnd, msgs);
-			case UMLDIPackage.UML_EDGE__TARGET_UML_DIAGRAM_ELEMENT:
-				if (targetUmlDiagramElement != null)
-					msgs = ((InternalEObject)targetUmlDiagramElement).eInverseRemove(this, UMLDIPackage.UML_DIAGRAM_ELEMENT__TARGET_UML_EDGE, UmlDiagramElement.class, msgs);
-				return basicSetTargetUmlDiagramElement((UmlDiagramElement)otherEnd, msgs);
+		switch(featureID) {
+		case UMLDIPackage.UML_EDGE__SOURCE_UML_DIAGRAM_ELEMENT:
+			if(sourceUmlDiagramElement != null)
+				msgs = ((InternalEObject)sourceUmlDiagramElement).eInverseRemove(this, UMLDIPackage.UML_DIAGRAM_ELEMENT__SOURCE_UML_EDGE, UmlDiagramElement.class, msgs);
+			return basicSetSourceUmlDiagramElement((UmlDiagramElement)otherEnd, msgs);
+		case UMLDIPackage.UML_EDGE__TARGET_UML_DIAGRAM_ELEMENT:
+			if(targetUmlDiagramElement != null)
+				msgs = ((InternalEObject)targetUmlDiagramElement).eInverseRemove(this, UMLDIPackage.UML_DIAGRAM_ELEMENT__TARGET_UML_EDGE, UmlDiagramElement.class, msgs);
+			return basicSetTargetUmlDiagramElement((UmlDiagramElement)otherEnd, msgs);
 		}
 		return super.eInverseAdd(otherEnd, featureID, msgs);
 	}
@@ -302,17 +328,18 @@ public class UmlEdgeImpl extends UmlDiagramElementImpl implements UmlEdge {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case UMLDIPackage.UML_EDGE__WAYPOINT:
-				return ((InternalEList<?>)getWaypoint()).basicRemove(otherEnd, msgs);
-			case UMLDIPackage.UML_EDGE__SOURCE_UML_DIAGRAM_ELEMENT:
-				return basicSetSourceUmlDiagramElement(null, msgs);
-			case UMLDIPackage.UML_EDGE__TARGET_UML_DIAGRAM_ELEMENT:
-				return basicSetTargetUmlDiagramElement(null, msgs);
+		switch(featureID) {
+		case UMLDIPackage.UML_EDGE__WAYPOINT:
+			return ((InternalEList<?>)getWaypoint()).basicRemove(otherEnd, msgs);
+		case UMLDIPackage.UML_EDGE__SOURCE_UML_DIAGRAM_ELEMENT:
+			return basicSetSourceUmlDiagramElement(null, msgs);
+		case UMLDIPackage.UML_EDGE__TARGET_UML_DIAGRAM_ELEMENT:
+			return basicSetTargetUmlDiagramElement(null, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
@@ -320,25 +347,30 @@ public class UmlEdgeImpl extends UmlDiagramElementImpl implements UmlEdge {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case UMLDIPackage.UML_EDGE__SOURCE_DIAGRAM_ELEMENT:
-				if (resolve) return getSourceDiagramElement();
-				return basicGetSourceDiagramElement();
-			case UMLDIPackage.UML_EDGE__TARGET_DIAGRAM_ELEMENT:
-				if (resolve) return getTargetDiagramElement();
-				return basicGetTargetDiagramElement();
-			case UMLDIPackage.UML_EDGE__WAYPOINT:
-				return getWaypoint();
-			case UMLDIPackage.UML_EDGE__SOURCE_UML_DIAGRAM_ELEMENT:
-				if (resolve) return getSourceUmlDiagramElement();
-				return basicGetSourceUmlDiagramElement();
-			case UMLDIPackage.UML_EDGE__TARGET_UML_DIAGRAM_ELEMENT:
-				if (resolve) return getTargetUmlDiagramElement();
-				return basicGetTargetUmlDiagramElement();
+		switch(featureID) {
+		case UMLDIPackage.UML_EDGE__SOURCE_DIAGRAM_ELEMENT:
+			if(resolve)
+				return getSourceDiagramElement();
+			return basicGetSourceDiagramElement();
+		case UMLDIPackage.UML_EDGE__TARGET_DIAGRAM_ELEMENT:
+			if(resolve)
+				return getTargetDiagramElement();
+			return basicGetTargetDiagramElement();
+		case UMLDIPackage.UML_EDGE__WAYPOINT:
+			return getWaypoint();
+		case UMLDIPackage.UML_EDGE__SOURCE_UML_DIAGRAM_ELEMENT:
+			if(resolve)
+				return getSourceUmlDiagramElement();
+			return basicGetSourceUmlDiagramElement();
+		case UMLDIPackage.UML_EDGE__TARGET_UML_DIAGRAM_ELEMENT:
+			if(resolve)
+				return getTargetUmlDiagramElement();
+			return basicGetTargetUmlDiagramElement();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -346,22 +378,23 @@ public class UmlEdgeImpl extends UmlDiagramElementImpl implements UmlEdge {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@SuppressWarnings("unchecked")
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case UMLDIPackage.UML_EDGE__WAYPOINT:
-				getWaypoint().clear();
-				getWaypoint().addAll((Collection<? extends Point>)newValue);
-				return;
-			case UMLDIPackage.UML_EDGE__SOURCE_UML_DIAGRAM_ELEMENT:
-				setSourceUmlDiagramElement((UmlDiagramElement)newValue);
-				return;
-			case UMLDIPackage.UML_EDGE__TARGET_UML_DIAGRAM_ELEMENT:
-				setTargetUmlDiagramElement((UmlDiagramElement)newValue);
-				return;
+		switch(featureID) {
+		case UMLDIPackage.UML_EDGE__WAYPOINT:
+			getWaypoint().clear();
+			getWaypoint().addAll((Collection<? extends Point>)newValue);
+			return;
+		case UMLDIPackage.UML_EDGE__SOURCE_UML_DIAGRAM_ELEMENT:
+			setSourceUmlDiagramElement((UmlDiagramElement)newValue);
+			return;
+		case UMLDIPackage.UML_EDGE__TARGET_UML_DIAGRAM_ELEMENT:
+			setTargetUmlDiagramElement((UmlDiagramElement)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -369,20 +402,21 @@ public class UmlEdgeImpl extends UmlDiagramElementImpl implements UmlEdge {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case UMLDIPackage.UML_EDGE__WAYPOINT:
-				getWaypoint().clear();
-				return;
-			case UMLDIPackage.UML_EDGE__SOURCE_UML_DIAGRAM_ELEMENT:
-				setSourceUmlDiagramElement((UmlDiagramElement)null);
-				return;
-			case UMLDIPackage.UML_EDGE__TARGET_UML_DIAGRAM_ELEMENT:
-				setTargetUmlDiagramElement((UmlDiagramElement)null);
-				return;
+		switch(featureID) {
+		case UMLDIPackage.UML_EDGE__WAYPOINT:
+			getWaypoint().clear();
+			return;
+		case UMLDIPackage.UML_EDGE__SOURCE_UML_DIAGRAM_ELEMENT:
+			setSourceUmlDiagramElement((UmlDiagramElement)null);
+			return;
+		case UMLDIPackage.UML_EDGE__TARGET_UML_DIAGRAM_ELEMENT:
+			setTargetUmlDiagramElement((UmlDiagramElement)null);
+			return;
 		}
 		super.eUnset(featureID);
 	}
@@ -390,21 +424,22 @@ public class UmlEdgeImpl extends UmlDiagramElementImpl implements UmlEdge {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case UMLDIPackage.UML_EDGE__SOURCE_DIAGRAM_ELEMENT:
-				return isSetSourceDiagramElement();
-			case UMLDIPackage.UML_EDGE__TARGET_DIAGRAM_ELEMENT:
-				return isSetTargetDiagramElement();
-			case UMLDIPackage.UML_EDGE__WAYPOINT:
-				return waypoint != null && !waypoint.isEmpty();
-			case UMLDIPackage.UML_EDGE__SOURCE_UML_DIAGRAM_ELEMENT:
-				return sourceUmlDiagramElement != null;
-			case UMLDIPackage.UML_EDGE__TARGET_UML_DIAGRAM_ELEMENT:
-				return targetUmlDiagramElement != null;
+		switch(featureID) {
+		case UMLDIPackage.UML_EDGE__SOURCE_DIAGRAM_ELEMENT:
+			return isSetSourceDiagramElement();
+		case UMLDIPackage.UML_EDGE__TARGET_DIAGRAM_ELEMENT:
+			return isSetTargetDiagramElement();
+		case UMLDIPackage.UML_EDGE__WAYPOINT:
+			return waypoint != null && !waypoint.isEmpty();
+		case UMLDIPackage.UML_EDGE__SOURCE_UML_DIAGRAM_ELEMENT:
+			return sourceUmlDiagramElement != null;
+		case UMLDIPackage.UML_EDGE__TARGET_UML_DIAGRAM_ELEMENT:
+			return targetUmlDiagramElement != null;
 		}
 		return super.eIsSet(featureID);
 	}
@@ -412,16 +447,21 @@ public class UmlEdgeImpl extends UmlDiagramElementImpl implements UmlEdge {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {
-		if (baseClass == Edge.class) {
-			switch (derivedFeatureID) {
-				case UMLDIPackage.UML_EDGE__SOURCE_DIAGRAM_ELEMENT: return DIPackage.EDGE__SOURCE_DIAGRAM_ELEMENT;
-				case UMLDIPackage.UML_EDGE__WAYPOINT: return DIPackage.EDGE__WAYPOINT;
-				case UMLDIPackage.UML_EDGE__TARGET_DIAGRAM_ELEMENT: return DIPackage.EDGE__TARGET_DIAGRAM_ELEMENT;
-				default: return -1;
+		if(baseClass == Edge.class) {
+			switch(derivedFeatureID) {
+			case UMLDIPackage.UML_EDGE__SOURCE_DIAGRAM_ELEMENT:
+				return DIPackage.EDGE__SOURCE_DIAGRAM_ELEMENT;
+			case UMLDIPackage.UML_EDGE__WAYPOINT:
+				return DIPackage.EDGE__WAYPOINT;
+			case UMLDIPackage.UML_EDGE__TARGET_DIAGRAM_ELEMENT:
+				return DIPackage.EDGE__TARGET_DIAGRAM_ELEMENT;
+			default:
+				return -1;
 			}
 		}
 		return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);
@@ -430,16 +470,21 @@ public class UmlEdgeImpl extends UmlDiagramElementImpl implements UmlEdge {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {
-		if (baseClass == Edge.class) {
-			switch (baseFeatureID) {
-				case DIPackage.EDGE__SOURCE_DIAGRAM_ELEMENT: return UMLDIPackage.UML_EDGE__SOURCE_DIAGRAM_ELEMENT;
-				case DIPackage.EDGE__WAYPOINT: return UMLDIPackage.UML_EDGE__WAYPOINT;
-				case DIPackage.EDGE__TARGET_DIAGRAM_ELEMENT: return UMLDIPackage.UML_EDGE__TARGET_DIAGRAM_ELEMENT;
-				default: return -1;
+		if(baseClass == Edge.class) {
+			switch(baseFeatureID) {
+			case DIPackage.EDGE__SOURCE_DIAGRAM_ELEMENT:
+				return UMLDIPackage.UML_EDGE__SOURCE_DIAGRAM_ELEMENT;
+			case DIPackage.EDGE__WAYPOINT:
+				return UMLDIPackage.UML_EDGE__WAYPOINT;
+			case DIPackage.EDGE__TARGET_DIAGRAM_ELEMENT:
+				return UMLDIPackage.UML_EDGE__TARGET_DIAGRAM_ELEMENT;
+			default:
+				return -1;
 			}
 		}
 		return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
@@ -448,6 +493,7 @@ public class UmlEdgeImpl extends UmlDiagramElementImpl implements UmlEdge {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetSourceDiagramElement() {
@@ -457,10 +503,10 @@ public class UmlEdgeImpl extends UmlDiagramElementImpl implements UmlEdge {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean isSetTargetDiagramElement() {
 		return eIsSet(UMLDIPackage.UML_EDGE__TARGET_UML_DIAGRAM_ELEMENT);
 	}
-
 } //UmlEdgeImpl
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/impl/UmlLabelImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/impl/UmlLabelImpl.java
index 4484631af12..f544a7a7627 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/impl/UmlLabelImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/impl/UmlLabelImpl.java
@@ -28,17 +28,19 @@ import org.eclipse.papyrus.umldi.UmlLabelKind;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.umldi.impl.UmlLabelImpl#getKind <em>Kind</em>}</li>
+ * <li>{@link org.eclipse.papyrus.umldi.impl.UmlLabelImpl#getKind <em>Kind</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class UmlLabelImpl extends UmlShapeImpl implements UmlLabel {
+
 	/**
 	 * The default value of the '{@link #getKind() <em>Kind</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getKind()
 	 * @generated
 	 * @ordered
@@ -49,6 +51,7 @@ public class UmlLabelImpl extends UmlShapeImpl implements UmlLabel {
 	 * The cached value of the '{@link #getKind() <em>Kind</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getKind()
 	 * @generated
 	 * @ordered
@@ -58,6 +61,7 @@ public class UmlLabelImpl extends UmlShapeImpl implements UmlLabel {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected UmlLabelImpl() {
@@ -67,6 +71,7 @@ public class UmlLabelImpl extends UmlShapeImpl implements UmlLabel {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -77,6 +82,7 @@ public class UmlLabelImpl extends UmlShapeImpl implements UmlLabel {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public UmlLabelKind getKind() {
@@ -86,25 +92,27 @@ public class UmlLabelImpl extends UmlShapeImpl implements UmlLabel {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setKind(UmlLabelKind newKind) {
 		UmlLabelKind oldKind = kind;
 		kind = newKind == null ? KIND_EDEFAULT : newKind;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, UMLDIPackage.UML_LABEL__KIND, oldKind, kind));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case UMLDIPackage.UML_LABEL__KIND:
-				return getKind();
+		switch(featureID) {
+		case UMLDIPackage.UML_LABEL__KIND:
+			return getKind();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -112,14 +120,15 @@ public class UmlLabelImpl extends UmlShapeImpl implements UmlLabel {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case UMLDIPackage.UML_LABEL__KIND:
-				setKind((UmlLabelKind)newValue);
-				return;
+		switch(featureID) {
+		case UMLDIPackage.UML_LABEL__KIND:
+			setKind((UmlLabelKind)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -127,14 +136,15 @@ public class UmlLabelImpl extends UmlShapeImpl implements UmlLabel {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case UMLDIPackage.UML_LABEL__KIND:
-				setKind(KIND_EDEFAULT);
-				return;
+		switch(featureID) {
+		case UMLDIPackage.UML_LABEL__KIND:
+			setKind(KIND_EDEFAULT);
+			return;
 		}
 		super.eUnset(featureID);
 	}
@@ -142,13 +152,14 @@ public class UmlLabelImpl extends UmlShapeImpl implements UmlLabel {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case UMLDIPackage.UML_LABEL__KIND:
-				return kind != KIND_EDEFAULT;
+		switch(featureID) {
+		case UMLDIPackage.UML_LABEL__KIND:
+			return kind != KIND_EDEFAULT;
 		}
 		return super.eIsSet(featureID);
 	}
@@ -156,17 +167,17 @@ public class UmlLabelImpl extends UmlShapeImpl implements UmlLabel {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) return super.toString();
-
+		if(eIsProxy())
+			return super.toString();
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (kind: ");
 		result.append(kind);
 		result.append(')');
 		return result.toString();
 	}
-
 } //UmlLabelImpl
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/impl/UmlShapeImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/impl/UmlShapeImpl.java
index e058fdec4a8..187ab6feecf 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/impl/UmlShapeImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/impl/UmlShapeImpl.java
@@ -34,17 +34,19 @@ import org.eclipse.papyrus.umldi.UmlShape;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.umldi.impl.UmlShapeImpl#getBounds <em>Bounds</em>}</li>
+ * <li>{@link org.eclipse.papyrus.umldi.impl.UmlShapeImpl#getBounds <em>Bounds</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class UmlShapeImpl extends UmlDiagramElementImpl implements UmlShape {
+
 	/**
 	 * The cached value of the '{@link #getBounds() <em>Bounds</em>}' containment reference.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getBounds()
 	 * @generated
 	 * @ordered
@@ -54,6 +56,7 @@ public class UmlShapeImpl extends UmlDiagramElementImpl implements UmlShape {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected UmlShapeImpl() {
@@ -63,6 +66,7 @@ public class UmlShapeImpl extends UmlDiagramElementImpl implements UmlShape {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -73,6 +77,7 @@ public class UmlShapeImpl extends UmlDiagramElementImpl implements UmlShape {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public Bounds getBounds() {
@@ -82,14 +87,18 @@ public class UmlShapeImpl extends UmlDiagramElementImpl implements UmlShape {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public NotificationChain basicSetBounds(Bounds newBounds, NotificationChain msgs) {
 		Bounds oldBounds = bounds;
 		bounds = newBounds;
-		if (eNotificationRequired()) {
+		if(eNotificationRequired()) {
 			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, UMLDIPackage.UML_SHAPE__BOUNDS, oldBounds, newBounds);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
+			if(msgs == null)
+				msgs = notification;
+			else
+				msgs.add(notification);
 		}
 		return msgs;
 	}
@@ -97,32 +106,34 @@ public class UmlShapeImpl extends UmlDiagramElementImpl implements UmlShape {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setBounds(Bounds newBounds) {
-		if (newBounds != bounds) {
+		if(newBounds != bounds) {
 			NotificationChain msgs = null;
-			if (bounds != null)
+			if(bounds != null)
 				msgs = ((InternalEObject)bounds).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - UMLDIPackage.UML_SHAPE__BOUNDS, null, msgs);
-			if (newBounds != null)
+			if(newBounds != null)
 				msgs = ((InternalEObject)newBounds).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - UMLDIPackage.UML_SHAPE__BOUNDS, null, msgs);
 			msgs = basicSetBounds(newBounds, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
+			if(msgs != null)
+				msgs.dispatch();
+		} else if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, UMLDIPackage.UML_SHAPE__BOUNDS, newBounds, newBounds));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case UMLDIPackage.UML_SHAPE__BOUNDS:
-				return basicSetBounds(null, msgs);
+		switch(featureID) {
+		case UMLDIPackage.UML_SHAPE__BOUNDS:
+			return basicSetBounds(null, msgs);
 		}
 		return super.eInverseRemove(otherEnd, featureID, msgs);
 	}
@@ -130,13 +141,14 @@ public class UmlShapeImpl extends UmlDiagramElementImpl implements UmlShape {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case UMLDIPackage.UML_SHAPE__BOUNDS:
-				return getBounds();
+		switch(featureID) {
+		case UMLDIPackage.UML_SHAPE__BOUNDS:
+			return getBounds();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -144,14 +156,15 @@ public class UmlShapeImpl extends UmlDiagramElementImpl implements UmlShape {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case UMLDIPackage.UML_SHAPE__BOUNDS:
-				setBounds((Bounds)newValue);
-				return;
+		switch(featureID) {
+		case UMLDIPackage.UML_SHAPE__BOUNDS:
+			setBounds((Bounds)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -159,14 +172,15 @@ public class UmlShapeImpl extends UmlDiagramElementImpl implements UmlShape {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case UMLDIPackage.UML_SHAPE__BOUNDS:
-				setBounds((Bounds)null);
-				return;
+		switch(featureID) {
+		case UMLDIPackage.UML_SHAPE__BOUNDS:
+			setBounds((Bounds)null);
+			return;
 		}
 		super.eUnset(featureID);
 	}
@@ -174,13 +188,14 @@ public class UmlShapeImpl extends UmlDiagramElementImpl implements UmlShape {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case UMLDIPackage.UML_SHAPE__BOUNDS:
-				return bounds != null;
+		switch(featureID) {
+		case UMLDIPackage.UML_SHAPE__BOUNDS:
+			return bounds != null;
 		}
 		return super.eIsSet(featureID);
 	}
@@ -188,14 +203,17 @@ public class UmlShapeImpl extends UmlDiagramElementImpl implements UmlShape {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {
-		if (baseClass == Shape.class) {
-			switch (derivedFeatureID) {
-				case UMLDIPackage.UML_SHAPE__BOUNDS: return DIPackage.SHAPE__BOUNDS;
-				default: return -1;
+		if(baseClass == Shape.class) {
+			switch(derivedFeatureID) {
+			case UMLDIPackage.UML_SHAPE__BOUNDS:
+				return DIPackage.SHAPE__BOUNDS;
+			default:
+				return -1;
 			}
 		}
 		return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);
@@ -204,17 +222,19 @@ public class UmlShapeImpl extends UmlDiagramElementImpl implements UmlShape {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {
-		if (baseClass == Shape.class) {
-			switch (baseFeatureID) {
-				case DIPackage.SHAPE__BOUNDS: return UMLDIPackage.UML_SHAPE__BOUNDS;
-				default: return -1;
+		if(baseClass == Shape.class) {
+			switch(baseFeatureID) {
+			case DIPackage.SHAPE__BOUNDS:
+				return UMLDIPackage.UML_SHAPE__BOUNDS;
+			default:
+				return -1;
 			}
 		}
 		return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
 	}
-
 } //UmlShapeImpl
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/impl/UmlStyleImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/impl/UmlStyleImpl.java
index 06c241ea6b5..d9974893360 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/impl/UmlStyleImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/impl/UmlStyleImpl.java
@@ -39,18 +39,20 @@ import org.eclipse.papyrus.umldi.util.UMLDIValidator;
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.papyrus.umldi.impl.UmlStyleImpl#getFontName <em>Font Name</em>}</li>
- *   <li>{@link org.eclipse.papyrus.umldi.impl.UmlStyleImpl#getFontSize <em>Font Size</em>}</li>
+ * <li>{@link org.eclipse.papyrus.umldi.impl.UmlStyleImpl#getFontName <em>Font Name</em>}</li>
+ * <li>{@link org.eclipse.papyrus.umldi.impl.UmlStyleImpl#getFontSize <em>Font Size</em>}</li>
  * </ul>
  * </p>
- *
+ * 
  * @generated
  */
 public class UmlStyleImpl extends StyleImpl implements UmlStyle {
+
 	/**
 	 * The default value of the '{@link #getFontName() <em>Font Name</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getFontName()
 	 * @generated
 	 * @ordered
@@ -61,6 +63,7 @@ public class UmlStyleImpl extends StyleImpl implements UmlStyle {
 	 * The cached value of the '{@link #getFontName() <em>Font Name</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getFontName()
 	 * @generated
 	 * @ordered
@@ -71,6 +74,7 @@ public class UmlStyleImpl extends StyleImpl implements UmlStyle {
 	 * The default value of the '{@link #getFontSize() <em>Font Size</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getFontSize()
 	 * @generated
 	 * @ordered
@@ -81,6 +85,7 @@ public class UmlStyleImpl extends StyleImpl implements UmlStyle {
 	 * The cached value of the '{@link #getFontSize() <em>Font Size</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #getFontSize()
 	 * @generated
 	 * @ordered
@@ -90,6 +95,7 @@ public class UmlStyleImpl extends StyleImpl implements UmlStyle {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected UmlStyleImpl() {
@@ -99,6 +105,7 @@ public class UmlStyleImpl extends StyleImpl implements UmlStyle {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -109,6 +116,7 @@ public class UmlStyleImpl extends StyleImpl implements UmlStyle {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public String getFontName() {
@@ -118,18 +126,20 @@ public class UmlStyleImpl extends StyleImpl implements UmlStyle {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setFontName(String newFontName) {
 		String oldFontName = fontName;
 		fontName = newFontName;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, UMLDIPackage.UML_STYLE__FONT_NAME, oldFontName, fontName));
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public double getFontSize() {
@@ -139,19 +149,22 @@ public class UmlStyleImpl extends StyleImpl implements UmlStyle {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public void setFontSize(double newFontSize) {
 		double oldFontSize = fontSize;
 		fontSize = newFontSize;
-		if (eNotificationRequired())
+		if(eNotificationRequired())
 			eNotify(new ENotificationImpl(this, Notification.SET, UMLDIPackage.UML_STYLE__FONT_SIZE, oldFontSize, fontSize));
 	}
 
 	/**
-	 * The cached validation expression for the '{@link #fontsizePositive(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Fontsize Positive</em>}' invariant operation.
+	 * The cached validation expression for the '{@link #fontsizePositive(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
+	 * <em>Fontsize Positive</em>}' invariant operation.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see #fontsizePositive(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
 	 * @generated
 	 * @ordered
@@ -161,35 +174,26 @@ public class UmlStyleImpl extends StyleImpl implements UmlStyle {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean fontsizePositive(DiagnosticChain diagnostics, Map<Object, Object> context) {
-		return
-			UMLDIValidator.validate
-				(UMLDIPackage.Literals.UML_STYLE,
-				 this,
-				 diagnostics,
-				 context,
-				 "http://www.eclipse.org/emf/2002/Ecore/OCL",
-				 UMLDIPackage.Literals.UML_STYLE___FONTSIZE_POSITIVE__DIAGNOSTICCHAIN_MAP,
-				 FONTSIZE_POSITIVE_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION,
-				 Diagnostic.ERROR,
-				 UMLDIValidator.DIAGNOSTIC_SOURCE,
-				 UMLDIValidator.UML_STYLE__FONTSIZE_POSITIVE);
+		return UMLDIValidator.validate(UMLDIPackage.Literals.UML_STYLE, this, diagnostics, context, "http://www.eclipse.org/emf/2002/Ecore/OCL", UMLDIPackage.Literals.UML_STYLE___FONTSIZE_POSITIVE__DIAGNOSTICCHAIN_MAP, FONTSIZE_POSITIVE_DIAGNOSTIC_CHAIN_MAP__EEXPRESSION, Diagnostic.ERROR, UMLDIValidator.DIAGNOSTIC_SOURCE, UMLDIValidator.UML_STYLE__FONTSIZE_POSITIVE);
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case UMLDIPackage.UML_STYLE__FONT_NAME:
-				return getFontName();
-			case UMLDIPackage.UML_STYLE__FONT_SIZE:
-				return getFontSize();
+		switch(featureID) {
+		case UMLDIPackage.UML_STYLE__FONT_NAME:
+			return getFontName();
+		case UMLDIPackage.UML_STYLE__FONT_SIZE:
+			return getFontSize();
 		}
 		return super.eGet(featureID, resolve, coreType);
 	}
@@ -197,17 +201,18 @@ public class UmlStyleImpl extends StyleImpl implements UmlStyle {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case UMLDIPackage.UML_STYLE__FONT_NAME:
-				setFontName((String)newValue);
-				return;
-			case UMLDIPackage.UML_STYLE__FONT_SIZE:
-				setFontSize((Double)newValue);
-				return;
+		switch(featureID) {
+		case UMLDIPackage.UML_STYLE__FONT_NAME:
+			setFontName((String)newValue);
+			return;
+		case UMLDIPackage.UML_STYLE__FONT_SIZE:
+			setFontSize((Double)newValue);
+			return;
 		}
 		super.eSet(featureID, newValue);
 	}
@@ -215,17 +220,18 @@ public class UmlStyleImpl extends StyleImpl implements UmlStyle {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public void eUnset(int featureID) {
-		switch (featureID) {
-			case UMLDIPackage.UML_STYLE__FONT_NAME:
-				setFontName(FONT_NAME_EDEFAULT);
-				return;
-			case UMLDIPackage.UML_STYLE__FONT_SIZE:
-				setFontSize(FONT_SIZE_EDEFAULT);
-				return;
+		switch(featureID) {
+		case UMLDIPackage.UML_STYLE__FONT_NAME:
+			setFontName(FONT_NAME_EDEFAULT);
+			return;
+		case UMLDIPackage.UML_STYLE__FONT_SIZE:
+			setFontSize(FONT_SIZE_EDEFAULT);
+			return;
 		}
 		super.eUnset(featureID);
 	}
@@ -233,15 +239,16 @@ public class UmlStyleImpl extends StyleImpl implements UmlStyle {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case UMLDIPackage.UML_STYLE__FONT_NAME:
-				return FONT_NAME_EDEFAULT == null ? fontName != null : !FONT_NAME_EDEFAULT.equals(fontName);
-			case UMLDIPackage.UML_STYLE__FONT_SIZE:
-				return fontSize != FONT_SIZE_EDEFAULT;
+		switch(featureID) {
+		case UMLDIPackage.UML_STYLE__FONT_NAME:
+			return FONT_NAME_EDEFAULT == null ? fontName != null : !FONT_NAME_EDEFAULT.equals(fontName);
+		case UMLDIPackage.UML_STYLE__FONT_SIZE:
+			return fontSize != FONT_SIZE_EDEFAULT;
 		}
 		return super.eIsSet(featureID);
 	}
@@ -249,14 +256,15 @@ public class UmlStyleImpl extends StyleImpl implements UmlStyle {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	@SuppressWarnings("unchecked")
 	public Object eInvoke(int operationID, EList<?> arguments) throws InvocationTargetException {
-		switch (operationID) {
-			case UMLDIPackage.UML_STYLE___FONTSIZE_POSITIVE__DIAGNOSTICCHAIN_MAP:
-				return fontsizePositive((DiagnosticChain)arguments.get(0), (Map<Object, Object>)arguments.get(1));
+		switch(operationID) {
+		case UMLDIPackage.UML_STYLE___FONTSIZE_POSITIVE__DIAGNOSTICCHAIN_MAP:
+			return fontsizePositive((DiagnosticChain)arguments.get(0), (Map<Object, Object>)arguments.get(1));
 		}
 		return super.eInvoke(operationID, arguments);
 	}
@@ -264,12 +272,13 @@ public class UmlStyleImpl extends StyleImpl implements UmlStyle {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	public String toString() {
-		if (eIsProxy()) return super.toString();
-
+		if(eIsProxy())
+			return super.toString();
 		StringBuffer result = new StringBuffer(super.toString());
 		result.append(" (fontName: ");
 		result.append(fontName);
@@ -278,5 +287,4 @@ public class UmlStyleImpl extends StyleImpl implements UmlStyle {
 		result.append(')');
 		return result.toString();
 	}
-
 } //UmlStyleImpl
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/util/UMLDIAdapterFactory.java b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/util/UMLDIAdapterFactory.java
index d9d5e21fa65..62e0245af8f 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/util/UMLDIAdapterFactory.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/util/UMLDIAdapterFactory.java
@@ -31,14 +31,17 @@ import org.eclipse.papyrus.umldi.*;
  * The <b>Adapter Factory</b> for the model.
  * It provides an adapter <code>createXXX</code> method for each class of the model.
  * <!-- end-user-doc -->
+ * 
  * @see org.eclipse.papyrus.umldi.UMLDIPackage
  * @generated
  */
 public class UMLDIAdapterFactory extends AdapterFactoryImpl {
+
 	/**
 	 * The cached model package.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected static UMLDIPackage modelPackage;
@@ -47,10 +50,11 @@ public class UMLDIAdapterFactory extends AdapterFactoryImpl {
 	 * Creates an instance of the adapter factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public UMLDIAdapterFactory() {
-		if (modelPackage == null) {
+		if(modelPackage == null) {
 			modelPackage = UMLDIPackage.eINSTANCE;
 		}
 	}
@@ -60,15 +64,16 @@ public class UMLDIAdapterFactory extends AdapterFactoryImpl {
 	 * <!-- begin-user-doc -->
 	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return whether this factory is applicable for the type of the object.
 	 * @generated
 	 */
 	@Override
 	public boolean isFactoryForType(Object object) {
-		if (object == modelPackage) {
+		if(object == modelPackage) {
 			return true;
 		}
-		if (object instanceof EObject) {
+		if(object instanceof EObject) {
 			return ((EObject)object).eClass().getEPackage() == modelPackage;
 		}
 		return false;
@@ -78,69 +83,84 @@ public class UMLDIAdapterFactory extends AdapterFactoryImpl {
 	 * The switch that delegates to the <code>createXXX</code> methods.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
-	protected UMLDISwitch<Adapter> modelSwitch =
-		new UMLDISwitch<Adapter>() {
-			@Override
-			public Adapter caseUmlDiagram(UmlDiagram object) {
-				return createUmlDiagramAdapter();
-			}
-			@Override
-			public Adapter caseUmlShape(UmlShape object) {
-				return createUmlShapeAdapter();
-			}
-			@Override
-			public Adapter caseUmlDiagramElement(UmlDiagramElement object) {
-				return createUmlDiagramElementAdapter();
-			}
-			@Override
-			public Adapter caseUmlStyle(UmlStyle object) {
-				return createUmlStyleAdapter();
-			}
-			@Override
-			public Adapter caseUmlEdge(UmlEdge object) {
-				return createUmlEdgeAdapter();
-			}
-			@Override
-			public Adapter caseUmlCompartment(UmlCompartment object) {
-				return createUmlCompartmentAdapter();
-			}
-			@Override
-			public Adapter caseUmlLabel(UmlLabel object) {
-				return createUmlLabelAdapter();
-			}
-			@Override
-			public Adapter caseDiagramElement(DiagramElement object) {
-				return createDiagramElementAdapter();
-			}
-			@Override
-			public Adapter caseShape(Shape object) {
-				return createShapeAdapter();
-			}
-			@Override
-			public Adapter caseDiagram(Diagram object) {
-				return createDiagramAdapter();
-			}
-			@Override
-			public Adapter caseStyle(Style object) {
-				return createStyleAdapter();
-			}
-			@Override
-			public Adapter caseEdge(Edge object) {
-				return createEdgeAdapter();
-			}
-			@Override
-			public Adapter defaultCase(EObject object) {
-				return createEObjectAdapter();
-			}
-		};
+	protected UMLDISwitch<Adapter> modelSwitch = new UMLDISwitch<Adapter>() {
+
+		@Override
+		public Adapter caseUmlDiagram(UmlDiagram object) {
+			return createUmlDiagramAdapter();
+		}
+
+		@Override
+		public Adapter caseUmlShape(UmlShape object) {
+			return createUmlShapeAdapter();
+		}
+
+		@Override
+		public Adapter caseUmlDiagramElement(UmlDiagramElement object) {
+			return createUmlDiagramElementAdapter();
+		}
+
+		@Override
+		public Adapter caseUmlStyle(UmlStyle object) {
+			return createUmlStyleAdapter();
+		}
+
+		@Override
+		public Adapter caseUmlEdge(UmlEdge object) {
+			return createUmlEdgeAdapter();
+		}
+
+		@Override
+		public Adapter caseUmlCompartment(UmlCompartment object) {
+			return createUmlCompartmentAdapter();
+		}
+
+		@Override
+		public Adapter caseUmlLabel(UmlLabel object) {
+			return createUmlLabelAdapter();
+		}
+
+		@Override
+		public Adapter caseDiagramElement(DiagramElement object) {
+			return createDiagramElementAdapter();
+		}
+
+		@Override
+		public Adapter caseShape(Shape object) {
+			return createShapeAdapter();
+		}
+
+		@Override
+		public Adapter caseDiagram(Diagram object) {
+			return createDiagramAdapter();
+		}
+
+		@Override
+		public Adapter caseStyle(Style object) {
+			return createStyleAdapter();
+		}
+
+		@Override
+		public Adapter caseEdge(Edge object) {
+			return createEdgeAdapter();
+		}
+
+		@Override
+		public Adapter defaultCase(EObject object) {
+			return createEObjectAdapter();
+		}
+	};
 
 	/**
 	 * Creates an adapter for the <code>target</code>.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param target the object to adapt.
+	 * 
+	 * @param target
+	 *        the object to adapt.
 	 * @return the adapter for the <code>target</code>.
 	 * @generated
 	 */
@@ -149,13 +169,13 @@ public class UMLDIAdapterFactory extends AdapterFactoryImpl {
 		return modelSwitch.doSwitch((EObject)target);
 	}
 
-
 	/**
 	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.umldi.UmlDiagram <em>Uml Diagram</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.umldi.UmlDiagram
 	 * @generated
@@ -170,6 +190,7 @@ public class UMLDIAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.umldi.UmlDiagramElement
 	 * @generated
@@ -184,6 +205,7 @@ public class UMLDIAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.umldi.UmlStyle
 	 * @generated
@@ -198,6 +220,7 @@ public class UMLDIAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.umldi.UmlEdge
 	 * @generated
@@ -212,6 +235,7 @@ public class UMLDIAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.umldi.UmlCompartment
 	 * @generated
@@ -226,6 +250,7 @@ public class UMLDIAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.umldi.UmlLabel
 	 * @generated
@@ -240,6 +265,7 @@ public class UMLDIAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.umldi.UmlShape
 	 * @generated
@@ -254,6 +280,7 @@ public class UMLDIAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.dd.di.DiagramElement
 	 * @generated
@@ -268,6 +295,7 @@ public class UMLDIAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.dd.di.Shape
 	 * @generated
@@ -282,6 +310,7 @@ public class UMLDIAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.dd.di.Diagram
 	 * @generated
@@ -296,6 +325,7 @@ public class UMLDIAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.dd.di.Style
 	 * @generated
@@ -310,6 +340,7 @@ public class UMLDIAdapterFactory extends AdapterFactoryImpl {
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @see org.eclipse.papyrus.dd.di.Edge
 	 * @generated
@@ -323,11 +354,11 @@ public class UMLDIAdapterFactory extends AdapterFactoryImpl {
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null.
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the new adapter.
 	 * @generated
 	 */
 	public Adapter createEObjectAdapter() {
 		return null;
 	}
-
 } //UMLDIAdapterFactory
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/util/UMLDIDerivedUnionAdapter.java b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/util/UMLDIDerivedUnionAdapter.java
index 256e057d8ef..f090b9f07b0 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/util/UMLDIDerivedUnionAdapter.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/util/UMLDIDerivedUnionAdapter.java
@@ -32,14 +32,17 @@ import org.eclipse.papyrus.umldi.UmlShape;
  * <!-- begin-user-doc -->
  * An adapter that propagates notifications for derived unions.
  * <!-- end-user-doc -->
+ * 
  * @see org.eclipse.papyrus.umldi.UMLDIPackage
  * @generated
  */
 public class UMLDIDerivedUnionAdapter extends AdapterImpl {
+
 	/**
 	 * The cached model package.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected static UMLDIPackage modelPackage;
@@ -48,10 +51,11 @@ public class UMLDIDerivedUnionAdapter extends AdapterImpl {
 	 * Creates an instance of the adapter.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public UMLDIDerivedUnionAdapter() {
-		if (modelPackage == null) {
+		if(modelPackage == null) {
 			modelPackage = UMLDIPackage.eINSTANCE;
 		}
 	}
@@ -60,14 +64,16 @@ public class UMLDIDerivedUnionAdapter extends AdapterImpl {
 	 * Calls <code>notifyChanged</code> with the appropriate model class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param notification a description of the change.
+	 * 
+	 * @param notification
+	 *        a description of the change.
 	 * @generated
 	 */
 	public void notifyChanged(Notification notification) {
 		Object notifier = notification.getNotifier();
-		if (notifier instanceof EObject) {
+		if(notifier instanceof EObject) {
 			EClass eClass = ((EObject)notifier).eClass();
-			if (eClass.eContainer() == modelPackage) {
+			if(eClass.eContainer() == modelPackage) {
 				notifyChanged(notification, eClass);
 			}
 		}
@@ -77,27 +83,30 @@ public class UMLDIDerivedUnionAdapter extends AdapterImpl {
 	 * Calls <code>notifyXXXChanged</code> for the corresponding class of the model.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param notification a description of the change.
-	 * @param eClass the Ecore class of the notifier.
+	 * 
+	 * @param notification
+	 *        a description of the change.
+	 * @param eClass
+	 *        the Ecore class of the notifier.
 	 * @generated
 	 */
 	protected void notifyChanged(Notification notification, EClass eClass) {
-		switch (eClass.getClassifierID()) {
-			case UMLDIPackage.UML_DIAGRAM:
-				notifyUmlDiagramChanged(notification, eClass);
-				break;
-			case UMLDIPackage.UML_SHAPE:
-				notifyUmlShapeChanged(notification, eClass);
-				break;
-			case UMLDIPackage.UML_EDGE:
-				notifyUmlEdgeChanged(notification, eClass);
-				break;
-			case UMLDIPackage.UML_COMPARTMENT:
-				notifyUmlCompartmentChanged(notification, eClass);
-				break;
-			case UMLDIPackage.UML_LABEL:
-				notifyUmlLabelChanged(notification, eClass);
-				break;
+		switch(eClass.getClassifierID()) {
+		case UMLDIPackage.UML_DIAGRAM:
+			notifyUmlDiagramChanged(notification, eClass);
+			break;
+		case UMLDIPackage.UML_SHAPE:
+			notifyUmlShapeChanged(notification, eClass);
+			break;
+		case UMLDIPackage.UML_EDGE:
+			notifyUmlEdgeChanged(notification, eClass);
+			break;
+		case UMLDIPackage.UML_COMPARTMENT:
+			notifyUmlCompartmentChanged(notification, eClass);
+			break;
+		case UMLDIPackage.UML_LABEL:
+			notifyUmlLabelChanged(notification, eClass);
+			break;
 		}
 	}
 
@@ -105,9 +114,13 @@ public class UMLDIDerivedUnionAdapter extends AdapterImpl {
 	 * Does nothing; clients may override so that it does something.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param notification a description of the change.
-	 * @param eClass the Ecore class of the notifier.
-	 * @param derivedUnion the derived union affected by the change.
+	 * 
+	 * @param notification
+	 *        a description of the change.
+	 * @param eClass
+	 *        the Ecore class of the notifier.
+	 * @param derivedUnion
+	 *        the derived union affected by the change.
 	 * @generated
 	 */
 	public void notifyChanged(Notification notification, EClass eClass, EStructuralFeature derivedUnion) {
@@ -118,33 +131,36 @@ public class UMLDIDerivedUnionAdapter extends AdapterImpl {
 	 * Calls <code>notifyChanged</code> for each affected derived union.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param notification a description of the change.
-	 * @param eClass the Ecore class of the notifier.
+	 * 
+	 * @param notification
+	 *        a description of the change.
+	 * @param eClass
+	 *        the Ecore class of the notifier.
 	 * @generated
 	 */
 	protected void notifyUmlDiagramChanged(Notification notification, EClass eClass) {
-		switch (notification.getFeatureID(UmlDiagram.class)) {
-			case UMLDIPackage.UML_DIAGRAM__UML_MODEL_ELEMENT:
-				notifyChanged(notification, eClass, DIPackage.Literals.DIAGRAM_ELEMENT__MODEL_ELEMENT);
-				break;
-			case UMLDIPackage.UML_DIAGRAM__SHARED_UML_STYLE:
-				notifyChanged(notification, eClass, DIPackage.Literals.DIAGRAM_ELEMENT__SHARED_STYLE);
-				break;
-			case UMLDIPackage.UML_DIAGRAM__LOCAL_UML_STYLE:
-				notifyChanged(notification, eClass, DIPackage.Literals.DIAGRAM_ELEMENT__LOCAL_STYLE);
-				break;
-			case UMLDIPackage.UML_DIAGRAM__OWNING_UML_DIAGRAM_ELEMENT:
-				notifyChanged(notification, eClass, DIPackage.Literals.DIAGRAM_ELEMENT__OWNING_DIAGRAM_ELEMENT);
-				break;
-			case UMLDIPackage.UML_DIAGRAM__OWNED_UML_DIAGRAM_ELEMENT:
-				notifyChanged(notification, eClass, DIPackage.Literals.DIAGRAM_ELEMENT__OWNED_DIAGRAM_ELEMENT);
-				break;
-			case UMLDIPackage.UML_DIAGRAM__TARGET_UML_EDGE:
-				notifyChanged(notification, eClass, DIPackage.Literals.DIAGRAM_ELEMENT__TARGET_EDGE);
-				break;
-			case UMLDIPackage.UML_DIAGRAM__SOURCE_UML_EDGE:
-				notifyChanged(notification, eClass, DIPackage.Literals.DIAGRAM_ELEMENT__SOURCE_EDGE);
-				break;
+		switch(notification.getFeatureID(UmlDiagram.class)) {
+		case UMLDIPackage.UML_DIAGRAM__UML_MODEL_ELEMENT:
+			notifyChanged(notification, eClass, DIPackage.Literals.DIAGRAM_ELEMENT__MODEL_ELEMENT);
+			break;
+		case UMLDIPackage.UML_DIAGRAM__SHARED_UML_STYLE:
+			notifyChanged(notification, eClass, DIPackage.Literals.DIAGRAM_ELEMENT__SHARED_STYLE);
+			break;
+		case UMLDIPackage.UML_DIAGRAM__LOCAL_UML_STYLE:
+			notifyChanged(notification, eClass, DIPackage.Literals.DIAGRAM_ELEMENT__LOCAL_STYLE);
+			break;
+		case UMLDIPackage.UML_DIAGRAM__OWNING_UML_DIAGRAM_ELEMENT:
+			notifyChanged(notification, eClass, DIPackage.Literals.DIAGRAM_ELEMENT__OWNING_DIAGRAM_ELEMENT);
+			break;
+		case UMLDIPackage.UML_DIAGRAM__OWNED_UML_DIAGRAM_ELEMENT:
+			notifyChanged(notification, eClass, DIPackage.Literals.DIAGRAM_ELEMENT__OWNED_DIAGRAM_ELEMENT);
+			break;
+		case UMLDIPackage.UML_DIAGRAM__TARGET_UML_EDGE:
+			notifyChanged(notification, eClass, DIPackage.Literals.DIAGRAM_ELEMENT__TARGET_EDGE);
+			break;
+		case UMLDIPackage.UML_DIAGRAM__SOURCE_UML_EDGE:
+			notifyChanged(notification, eClass, DIPackage.Literals.DIAGRAM_ELEMENT__SOURCE_EDGE);
+			break;
 		}
 	}
 
@@ -152,39 +168,42 @@ public class UMLDIDerivedUnionAdapter extends AdapterImpl {
 	 * Calls <code>notifyChanged</code> for each affected derived union.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param notification a description of the change.
-	 * @param eClass the Ecore class of the notifier.
+	 * 
+	 * @param notification
+	 *        a description of the change.
+	 * @param eClass
+	 *        the Ecore class of the notifier.
 	 * @generated
 	 */
 	protected void notifyUmlEdgeChanged(Notification notification, EClass eClass) {
-		switch (notification.getFeatureID(UmlEdge.class)) {
-			case UMLDIPackage.UML_EDGE__UML_MODEL_ELEMENT:
-				notifyChanged(notification, eClass, DIPackage.Literals.DIAGRAM_ELEMENT__MODEL_ELEMENT);
-				break;
-			case UMLDIPackage.UML_EDGE__SHARED_UML_STYLE:
-				notifyChanged(notification, eClass, DIPackage.Literals.DIAGRAM_ELEMENT__SHARED_STYLE);
-				break;
-			case UMLDIPackage.UML_EDGE__LOCAL_UML_STYLE:
-				notifyChanged(notification, eClass, DIPackage.Literals.DIAGRAM_ELEMENT__LOCAL_STYLE);
-				break;
-			case UMLDIPackage.UML_EDGE__OWNING_UML_DIAGRAM_ELEMENT:
-				notifyChanged(notification, eClass, DIPackage.Literals.DIAGRAM_ELEMENT__OWNING_DIAGRAM_ELEMENT);
-				break;
-			case UMLDIPackage.UML_EDGE__OWNED_UML_DIAGRAM_ELEMENT:
-				notifyChanged(notification, eClass, DIPackage.Literals.DIAGRAM_ELEMENT__OWNED_DIAGRAM_ELEMENT);
-				break;
-			case UMLDIPackage.UML_EDGE__TARGET_UML_EDGE:
-				notifyChanged(notification, eClass, DIPackage.Literals.DIAGRAM_ELEMENT__TARGET_EDGE);
-				break;
-			case UMLDIPackage.UML_EDGE__SOURCE_UML_EDGE:
-				notifyChanged(notification, eClass, DIPackage.Literals.DIAGRAM_ELEMENT__SOURCE_EDGE);
-				break;
-			case UMLDIPackage.UML_EDGE__SOURCE_UML_DIAGRAM_ELEMENT:
-				notifyChanged(notification, eClass, DIPackage.Literals.EDGE__SOURCE_DIAGRAM_ELEMENT);
-				break;
-			case UMLDIPackage.UML_EDGE__TARGET_UML_DIAGRAM_ELEMENT:
-				notifyChanged(notification, eClass, DIPackage.Literals.EDGE__TARGET_DIAGRAM_ELEMENT);
-				break;
+		switch(notification.getFeatureID(UmlEdge.class)) {
+		case UMLDIPackage.UML_EDGE__UML_MODEL_ELEMENT:
+			notifyChanged(notification, eClass, DIPackage.Literals.DIAGRAM_ELEMENT__MODEL_ELEMENT);
+			break;
+		case UMLDIPackage.UML_EDGE__SHARED_UML_STYLE:
+			notifyChanged(notification, eClass, DIPackage.Literals.DIAGRAM_ELEMENT__SHARED_STYLE);
+			break;
+		case UMLDIPackage.UML_EDGE__LOCAL_UML_STYLE:
+			notifyChanged(notification, eClass, DIPackage.Literals.DIAGRAM_ELEMENT__LOCAL_STYLE);
+			break;
+		case UMLDIPackage.UML_EDGE__OWNING_UML_DIAGRAM_ELEMENT:
+			notifyChanged(notification, eClass, DIPackage.Literals.DIAGRAM_ELEMENT__OWNING_DIAGRAM_ELEMENT);
+			break;
+		case UMLDIPackage.UML_EDGE__OWNED_UML_DIAGRAM_ELEMENT:
+			notifyChanged(notification, eClass, DIPackage.Literals.DIAGRAM_ELEMENT__OWNED_DIAGRAM_ELEMENT);
+			break;
+		case UMLDIPackage.UML_EDGE__TARGET_UML_EDGE:
+			notifyChanged(notification, eClass, DIPackage.Literals.DIAGRAM_ELEMENT__TARGET_EDGE);
+			break;
+		case UMLDIPackage.UML_EDGE__SOURCE_UML_EDGE:
+			notifyChanged(notification, eClass, DIPackage.Literals.DIAGRAM_ELEMENT__SOURCE_EDGE);
+			break;
+		case UMLDIPackage.UML_EDGE__SOURCE_UML_DIAGRAM_ELEMENT:
+			notifyChanged(notification, eClass, DIPackage.Literals.EDGE__SOURCE_DIAGRAM_ELEMENT);
+			break;
+		case UMLDIPackage.UML_EDGE__TARGET_UML_DIAGRAM_ELEMENT:
+			notifyChanged(notification, eClass, DIPackage.Literals.EDGE__TARGET_DIAGRAM_ELEMENT);
+			break;
 		}
 	}
 
@@ -192,33 +211,36 @@ public class UMLDIDerivedUnionAdapter extends AdapterImpl {
 	 * Calls <code>notifyChanged</code> for each affected derived union.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param notification a description of the change.
-	 * @param eClass the Ecore class of the notifier.
+	 * 
+	 * @param notification
+	 *        a description of the change.
+	 * @param eClass
+	 *        the Ecore class of the notifier.
 	 * @generated
 	 */
 	protected void notifyUmlCompartmentChanged(Notification notification, EClass eClass) {
-		switch (notification.getFeatureID(UmlCompartment.class)) {
-			case UMLDIPackage.UML_COMPARTMENT__UML_MODEL_ELEMENT:
-				notifyChanged(notification, eClass, DIPackage.Literals.DIAGRAM_ELEMENT__MODEL_ELEMENT);
-				break;
-			case UMLDIPackage.UML_COMPARTMENT__SHARED_UML_STYLE:
-				notifyChanged(notification, eClass, DIPackage.Literals.DIAGRAM_ELEMENT__SHARED_STYLE);
-				break;
-			case UMLDIPackage.UML_COMPARTMENT__LOCAL_UML_STYLE:
-				notifyChanged(notification, eClass, DIPackage.Literals.DIAGRAM_ELEMENT__LOCAL_STYLE);
-				break;
-			case UMLDIPackage.UML_COMPARTMENT__OWNING_UML_DIAGRAM_ELEMENT:
-				notifyChanged(notification, eClass, DIPackage.Literals.DIAGRAM_ELEMENT__OWNING_DIAGRAM_ELEMENT);
-				break;
-			case UMLDIPackage.UML_COMPARTMENT__OWNED_UML_DIAGRAM_ELEMENT:
-				notifyChanged(notification, eClass, DIPackage.Literals.DIAGRAM_ELEMENT__OWNED_DIAGRAM_ELEMENT);
-				break;
-			case UMLDIPackage.UML_COMPARTMENT__TARGET_UML_EDGE:
-				notifyChanged(notification, eClass, DIPackage.Literals.DIAGRAM_ELEMENT__TARGET_EDGE);
-				break;
-			case UMLDIPackage.UML_COMPARTMENT__SOURCE_UML_EDGE:
-				notifyChanged(notification, eClass, DIPackage.Literals.DIAGRAM_ELEMENT__SOURCE_EDGE);
-				break;
+		switch(notification.getFeatureID(UmlCompartment.class)) {
+		case UMLDIPackage.UML_COMPARTMENT__UML_MODEL_ELEMENT:
+			notifyChanged(notification, eClass, DIPackage.Literals.DIAGRAM_ELEMENT__MODEL_ELEMENT);
+			break;
+		case UMLDIPackage.UML_COMPARTMENT__SHARED_UML_STYLE:
+			notifyChanged(notification, eClass, DIPackage.Literals.DIAGRAM_ELEMENT__SHARED_STYLE);
+			break;
+		case UMLDIPackage.UML_COMPARTMENT__LOCAL_UML_STYLE:
+			notifyChanged(notification, eClass, DIPackage.Literals.DIAGRAM_ELEMENT__LOCAL_STYLE);
+			break;
+		case UMLDIPackage.UML_COMPARTMENT__OWNING_UML_DIAGRAM_ELEMENT:
+			notifyChanged(notification, eClass, DIPackage.Literals.DIAGRAM_ELEMENT__OWNING_DIAGRAM_ELEMENT);
+			break;
+		case UMLDIPackage.UML_COMPARTMENT__OWNED_UML_DIAGRAM_ELEMENT:
+			notifyChanged(notification, eClass, DIPackage.Literals.DIAGRAM_ELEMENT__OWNED_DIAGRAM_ELEMENT);
+			break;
+		case UMLDIPackage.UML_COMPARTMENT__TARGET_UML_EDGE:
+			notifyChanged(notification, eClass, DIPackage.Literals.DIAGRAM_ELEMENT__TARGET_EDGE);
+			break;
+		case UMLDIPackage.UML_COMPARTMENT__SOURCE_UML_EDGE:
+			notifyChanged(notification, eClass, DIPackage.Literals.DIAGRAM_ELEMENT__SOURCE_EDGE);
+			break;
 		}
 	}
 
@@ -226,33 +248,36 @@ public class UMLDIDerivedUnionAdapter extends AdapterImpl {
 	 * Calls <code>notifyChanged</code> for each affected derived union.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param notification a description of the change.
-	 * @param eClass the Ecore class of the notifier.
+	 * 
+	 * @param notification
+	 *        a description of the change.
+	 * @param eClass
+	 *        the Ecore class of the notifier.
 	 * @generated
 	 */
 	protected void notifyUmlLabelChanged(Notification notification, EClass eClass) {
-		switch (notification.getFeatureID(UmlLabel.class)) {
-			case UMLDIPackage.UML_LABEL__UML_MODEL_ELEMENT:
-				notifyChanged(notification, eClass, DIPackage.Literals.DIAGRAM_ELEMENT__MODEL_ELEMENT);
-				break;
-			case UMLDIPackage.UML_LABEL__SHARED_UML_STYLE:
-				notifyChanged(notification, eClass, DIPackage.Literals.DIAGRAM_ELEMENT__SHARED_STYLE);
-				break;
-			case UMLDIPackage.UML_LABEL__LOCAL_UML_STYLE:
-				notifyChanged(notification, eClass, DIPackage.Literals.DIAGRAM_ELEMENT__LOCAL_STYLE);
-				break;
-			case UMLDIPackage.UML_LABEL__OWNING_UML_DIAGRAM_ELEMENT:
-				notifyChanged(notification, eClass, DIPackage.Literals.DIAGRAM_ELEMENT__OWNING_DIAGRAM_ELEMENT);
-				break;
-			case UMLDIPackage.UML_LABEL__OWNED_UML_DIAGRAM_ELEMENT:
-				notifyChanged(notification, eClass, DIPackage.Literals.DIAGRAM_ELEMENT__OWNED_DIAGRAM_ELEMENT);
-				break;
-			case UMLDIPackage.UML_LABEL__TARGET_UML_EDGE:
-				notifyChanged(notification, eClass, DIPackage.Literals.DIAGRAM_ELEMENT__TARGET_EDGE);
-				break;
-			case UMLDIPackage.UML_LABEL__SOURCE_UML_EDGE:
-				notifyChanged(notification, eClass, DIPackage.Literals.DIAGRAM_ELEMENT__SOURCE_EDGE);
-				break;
+		switch(notification.getFeatureID(UmlLabel.class)) {
+		case UMLDIPackage.UML_LABEL__UML_MODEL_ELEMENT:
+			notifyChanged(notification, eClass, DIPackage.Literals.DIAGRAM_ELEMENT__MODEL_ELEMENT);
+			break;
+		case UMLDIPackage.UML_LABEL__SHARED_UML_STYLE:
+			notifyChanged(notification, eClass, DIPackage.Literals.DIAGRAM_ELEMENT__SHARED_STYLE);
+			break;
+		case UMLDIPackage.UML_LABEL__LOCAL_UML_STYLE:
+			notifyChanged(notification, eClass, DIPackage.Literals.DIAGRAM_ELEMENT__LOCAL_STYLE);
+			break;
+		case UMLDIPackage.UML_LABEL__OWNING_UML_DIAGRAM_ELEMENT:
+			notifyChanged(notification, eClass, DIPackage.Literals.DIAGRAM_ELEMENT__OWNING_DIAGRAM_ELEMENT);
+			break;
+		case UMLDIPackage.UML_LABEL__OWNED_UML_DIAGRAM_ELEMENT:
+			notifyChanged(notification, eClass, DIPackage.Literals.DIAGRAM_ELEMENT__OWNED_DIAGRAM_ELEMENT);
+			break;
+		case UMLDIPackage.UML_LABEL__TARGET_UML_EDGE:
+			notifyChanged(notification, eClass, DIPackage.Literals.DIAGRAM_ELEMENT__TARGET_EDGE);
+			break;
+		case UMLDIPackage.UML_LABEL__SOURCE_UML_EDGE:
+			notifyChanged(notification, eClass, DIPackage.Literals.DIAGRAM_ELEMENT__SOURCE_EDGE);
+			break;
 		}
 	}
 
@@ -260,34 +285,36 @@ public class UMLDIDerivedUnionAdapter extends AdapterImpl {
 	 * Calls <code>notifyChanged</code> for each affected derived union.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param notification a description of the change.
-	 * @param eClass the Ecore class of the notifier.
+	 * 
+	 * @param notification
+	 *        a description of the change.
+	 * @param eClass
+	 *        the Ecore class of the notifier.
 	 * @generated
 	 */
 	protected void notifyUmlShapeChanged(Notification notification, EClass eClass) {
-		switch (notification.getFeatureID(UmlShape.class)) {
-			case UMLDIPackage.UML_SHAPE__UML_MODEL_ELEMENT:
-				notifyChanged(notification, eClass, DIPackage.Literals.DIAGRAM_ELEMENT__MODEL_ELEMENT);
-				break;
-			case UMLDIPackage.UML_SHAPE__SHARED_UML_STYLE:
-				notifyChanged(notification, eClass, DIPackage.Literals.DIAGRAM_ELEMENT__SHARED_STYLE);
-				break;
-			case UMLDIPackage.UML_SHAPE__LOCAL_UML_STYLE:
-				notifyChanged(notification, eClass, DIPackage.Literals.DIAGRAM_ELEMENT__LOCAL_STYLE);
-				break;
-			case UMLDIPackage.UML_SHAPE__OWNING_UML_DIAGRAM_ELEMENT:
-				notifyChanged(notification, eClass, DIPackage.Literals.DIAGRAM_ELEMENT__OWNING_DIAGRAM_ELEMENT);
-				break;
-			case UMLDIPackage.UML_SHAPE__OWNED_UML_DIAGRAM_ELEMENT:
-				notifyChanged(notification, eClass, DIPackage.Literals.DIAGRAM_ELEMENT__OWNED_DIAGRAM_ELEMENT);
-				break;
-			case UMLDIPackage.UML_SHAPE__TARGET_UML_EDGE:
-				notifyChanged(notification, eClass, DIPackage.Literals.DIAGRAM_ELEMENT__TARGET_EDGE);
-				break;
-			case UMLDIPackage.UML_SHAPE__SOURCE_UML_EDGE:
-				notifyChanged(notification, eClass, DIPackage.Literals.DIAGRAM_ELEMENT__SOURCE_EDGE);
-				break;
+		switch(notification.getFeatureID(UmlShape.class)) {
+		case UMLDIPackage.UML_SHAPE__UML_MODEL_ELEMENT:
+			notifyChanged(notification, eClass, DIPackage.Literals.DIAGRAM_ELEMENT__MODEL_ELEMENT);
+			break;
+		case UMLDIPackage.UML_SHAPE__SHARED_UML_STYLE:
+			notifyChanged(notification, eClass, DIPackage.Literals.DIAGRAM_ELEMENT__SHARED_STYLE);
+			break;
+		case UMLDIPackage.UML_SHAPE__LOCAL_UML_STYLE:
+			notifyChanged(notification, eClass, DIPackage.Literals.DIAGRAM_ELEMENT__LOCAL_STYLE);
+			break;
+		case UMLDIPackage.UML_SHAPE__OWNING_UML_DIAGRAM_ELEMENT:
+			notifyChanged(notification, eClass, DIPackage.Literals.DIAGRAM_ELEMENT__OWNING_DIAGRAM_ELEMENT);
+			break;
+		case UMLDIPackage.UML_SHAPE__OWNED_UML_DIAGRAM_ELEMENT:
+			notifyChanged(notification, eClass, DIPackage.Literals.DIAGRAM_ELEMENT__OWNED_DIAGRAM_ELEMENT);
+			break;
+		case UMLDIPackage.UML_SHAPE__TARGET_UML_EDGE:
+			notifyChanged(notification, eClass, DIPackage.Literals.DIAGRAM_ELEMENT__TARGET_EDGE);
+			break;
+		case UMLDIPackage.UML_SHAPE__SOURCE_UML_EDGE:
+			notifyChanged(notification, eClass, DIPackage.Literals.DIAGRAM_ELEMENT__SOURCE_EDGE);
+			break;
 		}
 	}
-
 } //UMLDIDerivedUnionAdapter
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/util/UMLDIResourceFactoryImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/util/UMLDIResourceFactoryImpl.java
index 858cc9f23eb..01027446749 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/util/UMLDIResourceFactoryImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/util/UMLDIResourceFactoryImpl.java
@@ -23,14 +23,17 @@ import org.eclipse.emf.ecore.xmi.XMLResource;
  * <!-- begin-user-doc -->
  * The <b>Resource Factory</b> associated with the package.
  * <!-- end-user-doc -->
+ * 
  * @see org.eclipse.papyrus.umldi.util.UMLDIResourceImpl
  * @generated
  */
 public class UMLDIResourceFactoryImpl extends ResourceFactoryImpl {
+
 	/**
 	 * Creates an instance of the resource factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public UMLDIResourceFactoryImpl() {
@@ -41,6 +44,7 @@ public class UMLDIResourceFactoryImpl extends ResourceFactoryImpl {
 	 * Creates an instance of the resource.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -48,14 +52,10 @@ public class UMLDIResourceFactoryImpl extends ResourceFactoryImpl {
 		XMLResource result = new UMLDIResourceImpl(uri);
 		result.getDefaultSaveOptions().put(XMLResource.OPTION_EXTENDED_META_DATA, Boolean.TRUE);
 		result.getDefaultLoadOptions().put(XMLResource.OPTION_EXTENDED_META_DATA, Boolean.TRUE);
-
 		result.getDefaultSaveOptions().put(XMLResource.OPTION_SCHEMA_LOCATION, Boolean.TRUE);
-
 		result.getDefaultLoadOptions().put(XMLResource.OPTION_USE_ENCODED_ATTRIBUTE_STYLE, Boolean.TRUE);
 		result.getDefaultSaveOptions().put(XMLResource.OPTION_USE_ENCODED_ATTRIBUTE_STYLE, Boolean.TRUE);
-
 		result.getDefaultLoadOptions().put(XMLResource.OPTION_USE_LEXICAL_HANDLER, Boolean.TRUE);
 		return result;
 	}
-
 } //UMLDIResourceFactoryImpl
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/util/UMLDIResourceImpl.java b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/util/UMLDIResourceImpl.java
index c8f7f9d108c..2c104742328 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/util/UMLDIResourceImpl.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/util/UMLDIResourceImpl.java
@@ -19,19 +19,22 @@ import org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl;
  * <!-- begin-user-doc -->
  * The <b>Resource </b> associated with the package.
  * <!-- end-user-doc -->
+ * 
  * @see org.eclipse.papyrus.umldi.util.UMLDIResourceFactoryImpl
  * @generated
  */
 public class UMLDIResourceImpl extends XMLResourceImpl {
+
 	/**
 	 * Creates an instance of the resource.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @param uri the URI of the new resource.
+	 * 
+	 * @param uri
+	 *        the URI of the new resource.
 	 * @generated
 	 */
 	public UMLDIResourceImpl(URI uri) {
 		super(uri);
 	}
-
 } //UMLDIResourceImpl
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/util/UMLDISwitch.java b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/util/UMLDISwitch.java
index bf214bba8c3..705f3661789 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/util/UMLDISwitch.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/util/UMLDISwitch.java
@@ -27,21 +27,23 @@ import org.eclipse.papyrus.umldi.*;
 /**
  * <!-- begin-user-doc -->
  * The <b>Switch</b> for the model's inheritance hierarchy.
- * It supports the call {@link #doSwitch(EObject) doSwitch(object)}
- * to invoke the <code>caseXXX</code> method for each class of the model,
+ * It supports the call {@link #doSwitch(EObject) doSwitch(object)} to invoke the <code>caseXXX</code> method for each class of the model,
  * starting with the actual class of the object
  * and proceeding up the inheritance hierarchy
  * until a non-null result is returned,
  * which is the result of the switch.
  * <!-- end-user-doc -->
+ * 
  * @see org.eclipse.papyrus.umldi.UMLDIPackage
  * @generated
  */
 public class UMLDISwitch<T> extends Switch<T> {
+
 	/**
 	 * The cached model package
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected static UMLDIPackage modelPackage;
@@ -50,10 +52,11 @@ public class UMLDISwitch<T> extends Switch<T> {
 	 * Creates an instance of the switch.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public UMLDISwitch() {
-		if (modelPackage == null) {
+		if(modelPackage == null) {
 			modelPackage = UMLDIPackage.eINSTANCE;
 		}
 	}
@@ -62,6 +65,7 @@ public class UMLDISwitch<T> extends Switch<T> {
 	 * Checks whether this is a switch for the given package.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @parameter ePackage the package in question.
 	 * @return whether this is a switch for the given package.
 	 * @generated
@@ -75,76 +79,113 @@ public class UMLDISwitch<T> extends Switch<T> {
 	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @return the first non-null result returned by a <code>caseXXX</code> call.
 	 * @generated
 	 */
 	@Override
 	protected T doSwitch(int classifierID, EObject theEObject) {
-		switch (classifierID) {
-			case UMLDIPackage.UML_DIAGRAM: {
-				UmlDiagram umlDiagram = (UmlDiagram)theEObject;
-				T result = caseUmlDiagram(umlDiagram);
-				if (result == null) result = caseUmlShape(umlDiagram);
-				if (result == null) result = caseDiagram(umlDiagram);
-				if (result == null) result = caseUmlDiagramElement(umlDiagram);
-				if (result == null) result = caseShape(umlDiagram);
-				if (result == null) result = caseDiagramElement(umlDiagram);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case UMLDIPackage.UML_SHAPE: {
-				UmlShape umlShape = (UmlShape)theEObject;
-				T result = caseUmlShape(umlShape);
-				if (result == null) result = caseUmlDiagramElement(umlShape);
-				if (result == null) result = caseShape(umlShape);
-				if (result == null) result = caseDiagramElement(umlShape);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case UMLDIPackage.UML_DIAGRAM_ELEMENT: {
-				UmlDiagramElement umlDiagramElement = (UmlDiagramElement)theEObject;
-				T result = caseUmlDiagramElement(umlDiagramElement);
-				if (result == null) result = caseDiagramElement(umlDiagramElement);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case UMLDIPackage.UML_STYLE: {
-				UmlStyle umlStyle = (UmlStyle)theEObject;
-				T result = caseUmlStyle(umlStyle);
-				if (result == null) result = caseStyle(umlStyle);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case UMLDIPackage.UML_EDGE: {
-				UmlEdge umlEdge = (UmlEdge)theEObject;
-				T result = caseUmlEdge(umlEdge);
-				if (result == null) result = caseUmlDiagramElement(umlEdge);
-				if (result == null) result = caseEdge(umlEdge);
-				if (result == null) result = caseDiagramElement(umlEdge);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case UMLDIPackage.UML_COMPARTMENT: {
-				UmlCompartment umlCompartment = (UmlCompartment)theEObject;
-				T result = caseUmlCompartment(umlCompartment);
-				if (result == null) result = caseUmlShape(umlCompartment);
-				if (result == null) result = caseUmlDiagramElement(umlCompartment);
-				if (result == null) result = caseShape(umlCompartment);
-				if (result == null) result = caseDiagramElement(umlCompartment);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case UMLDIPackage.UML_LABEL: {
-				UmlLabel umlLabel = (UmlLabel)theEObject;
-				T result = caseUmlLabel(umlLabel);
-				if (result == null) result = caseUmlShape(umlLabel);
-				if (result == null) result = caseUmlDiagramElement(umlLabel);
-				if (result == null) result = caseShape(umlLabel);
-				if (result == null) result = caseDiagramElement(umlLabel);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			default: return defaultCase(theEObject);
+		switch(classifierID) {
+		case UMLDIPackage.UML_DIAGRAM:
+		{
+			UmlDiagram umlDiagram = (UmlDiagram)theEObject;
+			T result = caseUmlDiagram(umlDiagram);
+			if(result == null)
+				result = caseUmlShape(umlDiagram);
+			if(result == null)
+				result = caseDiagram(umlDiagram);
+			if(result == null)
+				result = caseUmlDiagramElement(umlDiagram);
+			if(result == null)
+				result = caseShape(umlDiagram);
+			if(result == null)
+				result = caseDiagramElement(umlDiagram);
+			if(result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case UMLDIPackage.UML_SHAPE:
+		{
+			UmlShape umlShape = (UmlShape)theEObject;
+			T result = caseUmlShape(umlShape);
+			if(result == null)
+				result = caseUmlDiagramElement(umlShape);
+			if(result == null)
+				result = caseShape(umlShape);
+			if(result == null)
+				result = caseDiagramElement(umlShape);
+			if(result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case UMLDIPackage.UML_DIAGRAM_ELEMENT:
+		{
+			UmlDiagramElement umlDiagramElement = (UmlDiagramElement)theEObject;
+			T result = caseUmlDiagramElement(umlDiagramElement);
+			if(result == null)
+				result = caseDiagramElement(umlDiagramElement);
+			if(result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case UMLDIPackage.UML_STYLE:
+		{
+			UmlStyle umlStyle = (UmlStyle)theEObject;
+			T result = caseUmlStyle(umlStyle);
+			if(result == null)
+				result = caseStyle(umlStyle);
+			if(result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case UMLDIPackage.UML_EDGE:
+		{
+			UmlEdge umlEdge = (UmlEdge)theEObject;
+			T result = caseUmlEdge(umlEdge);
+			if(result == null)
+				result = caseUmlDiagramElement(umlEdge);
+			if(result == null)
+				result = caseEdge(umlEdge);
+			if(result == null)
+				result = caseDiagramElement(umlEdge);
+			if(result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case UMLDIPackage.UML_COMPARTMENT:
+		{
+			UmlCompartment umlCompartment = (UmlCompartment)theEObject;
+			T result = caseUmlCompartment(umlCompartment);
+			if(result == null)
+				result = caseUmlShape(umlCompartment);
+			if(result == null)
+				result = caseUmlDiagramElement(umlCompartment);
+			if(result == null)
+				result = caseShape(umlCompartment);
+			if(result == null)
+				result = caseDiagramElement(umlCompartment);
+			if(result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		case UMLDIPackage.UML_LABEL:
+		{
+			UmlLabel umlLabel = (UmlLabel)theEObject;
+			T result = caseUmlLabel(umlLabel);
+			if(result == null)
+				result = caseUmlShape(umlLabel);
+			if(result == null)
+				result = caseUmlDiagramElement(umlLabel);
+			if(result == null)
+				result = caseShape(umlLabel);
+			if(result == null)
+				result = caseDiagramElement(umlLabel);
+			if(result == null)
+				result = defaultCase(theEObject);
+			return result;
+		}
+		default:
+			return defaultCase(theEObject);
 		}
 	}
 
@@ -154,7 +195,9 @@ public class UMLDISwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Uml Diagram</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -169,7 +212,9 @@ public class UMLDISwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Uml Diagram Element</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -184,7 +229,9 @@ public class UMLDISwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Uml Style</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -199,7 +246,9 @@ public class UMLDISwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Uml Edge</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -214,7 +263,9 @@ public class UMLDISwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Uml Compartment</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -229,7 +280,9 @@ public class UMLDISwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Uml Label</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -244,7 +297,9 @@ public class UMLDISwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Uml Shape</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -259,7 +314,9 @@ public class UMLDISwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Diagram Element</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -274,7 +331,9 @@ public class UMLDISwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Shape</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -289,7 +348,9 @@ public class UMLDISwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Diagram</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -304,7 +365,9 @@ public class UMLDISwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Style</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -319,7 +382,9 @@ public class UMLDISwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>Edge</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
 	 * @generated
@@ -334,7 +399,9 @@ public class UMLDISwitch<T> extends Switch<T> {
 	 * This implementation returns null;
 	 * returning a non-null result will terminate the switch, but this is the last case anyway.
 	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
+	 * 
+	 * @param object
+	 *        the target of the switch.
 	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
 	 * @generated
@@ -343,5 +410,4 @@ public class UMLDISwitch<T> extends Switch<T> {
 	public T defaultCase(EObject object) {
 		return null;
 	}
-
 } //UMLDISwitch
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/util/UMLDIValidator.java b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/util/UMLDIValidator.java
index f6fa6decc21..56ee7ee5bfb 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/util/UMLDIValidator.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/util/UMLDIValidator.java
@@ -29,22 +29,27 @@ import org.eclipse.papyrus.umldi.*;
  * <!-- begin-user-doc -->
  * The <b>Validator</b> for the model.
  * <!-- end-user-doc -->
+ * 
  * @see org.eclipse.papyrus.umldi.UMLDIPackage
  * @generated
  */
 public class UMLDIValidator extends EObjectValidator {
+
 	/**
 	 * The cached model package
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static final UMLDIValidator INSTANCE = new UMLDIValidator();
 
 	/**
-	 * A constant for the {@link org.eclipse.emf.common.util.Diagnostic#getSource() source} of diagnostic {@link org.eclipse.emf.common.util.Diagnostic#getCode() codes} from this package.
+	 * A constant for the {@link org.eclipse.emf.common.util.Diagnostic#getSource() source} of diagnostic
+	 * {@link org.eclipse.emf.common.util.Diagnostic#getCode() codes} from this package.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @see org.eclipse.emf.common.util.Diagnostic#getSource()
 	 * @see org.eclipse.emf.common.util.Diagnostic#getCode()
 	 * @generated
@@ -55,6 +60,7 @@ public class UMLDIValidator extends EObjectValidator {
 	 * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Fontsize Positive' of 'Uml Style'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static final int UML_STYLE__FONTSIZE_POSITIVE = 1;
@@ -63,6 +69,7 @@ public class UMLDIValidator extends EObjectValidator {
 	 * A constant with a fixed name that can be used as the base value for additional hand written constants.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	private static final int GENERATED_DIAGNOSTIC_CODE_COUNT = 1;
@@ -71,6 +78,7 @@ public class UMLDIValidator extends EObjectValidator {
 	 * A constant with a fixed name that can be used as the base value for additional hand written constants in a derived class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	protected static final int DIAGNOSTIC_CODE_COUNT = GENERATED_DIAGNOSTIC_CODE_COUNT;
@@ -79,6 +87,7 @@ public class UMLDIValidator extends EObjectValidator {
 	 * Delegates evaluation of the given invariant expression against the object in the given context.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public static boolean validate(EClass eClass, EObject eObject, DiagnosticChain diagnostics, Map<Object, Object> context, String validationDelegate, EOperation invariant, String expression, int severity, String source, int code) {
@@ -89,6 +98,7 @@ public class UMLDIValidator extends EObjectValidator {
 	 * Creates an instance of the switch.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public UMLDIValidator() {
@@ -99,48 +109,51 @@ public class UMLDIValidator extends EObjectValidator {
 	 * Returns the package of this validator switch.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	protected EPackage getEPackage() {
-	  return UMLDIPackage.eINSTANCE;
+		return UMLDIPackage.eINSTANCE;
 	}
 
 	/**
 	 * Calls <code>validateXXX</code> for the corresponding classifier of the model.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	protected boolean validate(int classifierID, Object value, DiagnosticChain diagnostics, Map<Object, Object> context) {
-		switch (classifierID) {
-			case UMLDIPackage.UML_DIAGRAM:
-				return validateUmlDiagram((UmlDiagram)value, diagnostics, context);
-			case UMLDIPackage.UML_SHAPE:
-				return validateUmlShape((UmlShape)value, diagnostics, context);
-			case UMLDIPackage.UML_DIAGRAM_ELEMENT:
-				return validateUmlDiagramElement((UmlDiagramElement)value, diagnostics, context);
-			case UMLDIPackage.UML_STYLE:
-				return validateUmlStyle((UmlStyle)value, diagnostics, context);
-			case UMLDIPackage.UML_EDGE:
-				return validateUmlEdge((UmlEdge)value, diagnostics, context);
-			case UMLDIPackage.UML_COMPARTMENT:
-				return validateUmlCompartment((UmlCompartment)value, diagnostics, context);
-			case UMLDIPackage.UML_LABEL:
-				return validateUmlLabel((UmlLabel)value, diagnostics, context);
-			case UMLDIPackage.UML_COMPARTMENT_KIND:
-				return validateUmlCompartmentKind((UmlCompartmentKind)value, diagnostics, context);
-			case UMLDIPackage.UML_LABEL_KIND:
-				return validateUmlLabelKind((UmlLabelKind)value, diagnostics, context);
-			default:
-				return true;
+		switch(classifierID) {
+		case UMLDIPackage.UML_DIAGRAM:
+			return validateUmlDiagram((UmlDiagram)value, diagnostics, context);
+		case UMLDIPackage.UML_SHAPE:
+			return validateUmlShape((UmlShape)value, diagnostics, context);
+		case UMLDIPackage.UML_DIAGRAM_ELEMENT:
+			return validateUmlDiagramElement((UmlDiagramElement)value, diagnostics, context);
+		case UMLDIPackage.UML_STYLE:
+			return validateUmlStyle((UmlStyle)value, diagnostics, context);
+		case UMLDIPackage.UML_EDGE:
+			return validateUmlEdge((UmlEdge)value, diagnostics, context);
+		case UMLDIPackage.UML_COMPARTMENT:
+			return validateUmlCompartment((UmlCompartment)value, diagnostics, context);
+		case UMLDIPackage.UML_LABEL:
+			return validateUmlLabel((UmlLabel)value, diagnostics, context);
+		case UMLDIPackage.UML_COMPARTMENT_KIND:
+			return validateUmlCompartmentKind((UmlCompartmentKind)value, diagnostics, context);
+		case UMLDIPackage.UML_LABEL_KIND:
+			return validateUmlLabelKind((UmlLabelKind)value, diagnostics, context);
+		default:
+			return true;
 		}
 	}
 
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean validateUmlDiagram(UmlDiagram umlDiagram, DiagnosticChain diagnostics, Map<Object, Object> context) {
@@ -150,6 +163,7 @@ public class UMLDIValidator extends EObjectValidator {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean validateUmlDiagramElement(UmlDiagramElement umlDiagramElement, DiagnosticChain diagnostics, Map<Object, Object> context) {
@@ -159,19 +173,29 @@ public class UMLDIValidator extends EObjectValidator {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean validateUmlStyle(UmlStyle umlStyle, DiagnosticChain diagnostics, Map<Object, Object> context) {
-		if (!validate_NoCircularContainment(umlStyle, diagnostics, context)) return false;
+		if(!validate_NoCircularContainment(umlStyle, diagnostics, context))
+			return false;
 		boolean result = validate_EveryMultiplicityConforms(umlStyle, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryDataValueConforms(umlStyle, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryReferenceIsContained(umlStyle, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryBidirectionalReferenceIsPaired(umlStyle, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryProxyResolves(umlStyle, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_UniqueID(umlStyle, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryKeyUnique(umlStyle, diagnostics, context);
-		if (result || diagnostics != null) result &= validate_EveryMapEntryUnique(umlStyle, diagnostics, context);
-		if (result || diagnostics != null) result &= validateUmlStyle_fontsizePositive(umlStyle, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_EveryDataValueConforms(umlStyle, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_EveryReferenceIsContained(umlStyle, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_EveryBidirectionalReferenceIsPaired(umlStyle, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_EveryProxyResolves(umlStyle, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_UniqueID(umlStyle, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_EveryKeyUnique(umlStyle, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validate_EveryMapEntryUnique(umlStyle, diagnostics, context);
+		if(result || diagnostics != null)
+			result &= validateUmlStyle_fontsizePositive(umlStyle, diagnostics, context);
 		return result;
 	}
 
@@ -179,6 +203,7 @@ public class UMLDIValidator extends EObjectValidator {
 	 * Validates the fontsizePositive constraint of '<em>Uml Style</em>'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean validateUmlStyle_fontsizePositive(UmlStyle umlStyle, DiagnosticChain diagnostics, Map<Object, Object> context) {
@@ -188,6 +213,7 @@ public class UMLDIValidator extends EObjectValidator {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean validateUmlEdge(UmlEdge umlEdge, DiagnosticChain diagnostics, Map<Object, Object> context) {
@@ -197,6 +223,7 @@ public class UMLDIValidator extends EObjectValidator {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean validateUmlCompartment(UmlCompartment umlCompartment, DiagnosticChain diagnostics, Map<Object, Object> context) {
@@ -206,6 +233,7 @@ public class UMLDIValidator extends EObjectValidator {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean validateUmlLabel(UmlLabel umlLabel, DiagnosticChain diagnostics, Map<Object, Object> context) {
@@ -215,6 +243,7 @@ public class UMLDIValidator extends EObjectValidator {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean validateUmlCompartmentKind(UmlCompartmentKind umlCompartmentKind, DiagnosticChain diagnostics, Map<Object, Object> context) {
@@ -224,6 +253,7 @@ public class UMLDIValidator extends EObjectValidator {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean validateUmlLabelKind(UmlLabelKind umlLabelKind, DiagnosticChain diagnostics, Map<Object, Object> context) {
@@ -233,6 +263,7 @@ public class UMLDIValidator extends EObjectValidator {
 	/**
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public boolean validateUmlShape(UmlShape umlShape, DiagnosticChain diagnostics, Map<Object, Object> context) {
@@ -243,6 +274,7 @@ public class UMLDIValidator extends EObjectValidator {
 	 * Returns the resource locator that will be used to fetch messages for this validator's diagnostics.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
@@ -252,5 +284,4 @@ public class UMLDIValidator extends EObjectValidator {
 		// Ensure that you remove @generated or mark it @generated NOT
 		return super.getResourceLocator();
 	}
-
 } //UMLDIValidator
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/util/UMLDIXMLProcessor.java b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/util/UMLDIXMLProcessor.java
index de0aa472735..fbbd307e142 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/util/UMLDIXMLProcessor.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi/src/org/eclipse/papyrus/umldi/util/UMLDIXMLProcessor.java
@@ -25,6 +25,7 @@ import org.eclipse.papyrus.umldi.UMLDIPackage;
  * This class contains helper methods to serialize and deserialize XML documents
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
+ * 
  * @generated
  */
 public class UMLDIXMLProcessor extends XMLProcessor {
@@ -33,27 +34,28 @@ public class UMLDIXMLProcessor extends XMLProcessor {
 	 * Public constructor to instantiate the helper.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	public UMLDIXMLProcessor() {
 		super((EPackage.Registry.INSTANCE));
 		UMLDIPackage.eINSTANCE.eClass();
 	}
-	
+
 	/**
 	 * Register for "*" and "xml" file extensions the UMLDIResourceFactoryImpl factory.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
+	 * 
 	 * @generated
 	 */
 	@Override
 	protected Map<String, Resource.Factory> getRegistrations() {
-		if (registrations == null) {
+		if(registrations == null) {
 			super.getRegistrations();
 			registrations.put(XML_EXTENSION, new UMLDIResourceFactoryImpl());
 			registrations.put(STAR_EXTENSION, new UMLDIResourceFactoryImpl());
 		}
 		return registrations;
 	}
-
 } //UMLDIXMLProcessor
diff --git a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi2dg/src/org/eclipse/papyrus/umldi2dg/UtilitiesLibrary.java b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi2dg/src/org/eclipse/papyrus/umldi2dg/UtilitiesLibrary.java
index ed4d4c36f3d..a35b5186d4f 100644
--- a/extraplugins/diagram-definition/org.eclipse.papyrus.umldi2dg/src/org/eclipse/papyrus/umldi2dg/UtilitiesLibrary.java
+++ b/extraplugins/diagram-definition/org.eclipse.papyrus.umldi2dg/src/org/eclipse/papyrus/umldi2dg/UtilitiesLibrary.java
@@ -16,14 +16,19 @@ import java.awt.Color;
 import org.eclipse.papyrus.dd.dc.DCFactory;
 import org.eclipse.papyrus.dd.dc.DCPackage;
 
+/**
+ * A utility library of black-box operations used in the umldi2dg QVTO
+ * transformation
+ */
 public class UtilitiesLibrary {
-	
+
 	public UtilitiesLibrary() {
 		super();
 	}
 
 	public Color createColor(String colorStr) {
-		return (Color)DCFactory.eINSTANCE.createFromString(DCPackage.eINSTANCE.getColor(), colorStr);
+		return (Color) DCFactory.eINSTANCE.createFromString(
+				DCPackage.eINSTANCE.getColor(), colorStr);
 	}
-	
+
 }