Bug 510937 - [TEST] [REFACTOR] [OXYGEN] The tests for Papyrus' main plugins should be clearer to visualize during execution on the server and segmented to respect the plugin's architecture

Change-Id: I5125c9ae1552ef8144aff12881e0ba2cfb1be102
Signed-off-by: Quentin Le Menez <quentin.lemenez@cea.fr>

558 files changed, 27582 insertions, 22736 deletions

diff --git a/tests/integration/plugins/org.eclipse.papyrus.integrationtests.editor/META-INF/MANIFEST.MF b/tests/integration/plugins/org.eclipse.papyrus.integrationtests.editor/META-INF/MANIFEST.MF
deleted file mode 100644
index 1db4c5cb885..00000000000
--- a/tests/integration/plugins/org.eclipse.papyrus.integrationtests.editor/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,30 +0,0 @@
-Manifest-Version: 1.0

-Require-Bundle: org.eclipse.core.runtime,

- org.eclipse.core.resources,

- org.eclipse.papyrus.infra.core;bundle-version="1.2.0",

- org.eclipse.ui.workbench,

- org.eclipse.ui.ide,

- org.eclipse.emf.ecore;bundle-version="2.9.1",

- org.junit;bundle-version="4.10.0",

- org.eclipse.papyrus.uml.tools;bundle-version="1.2.0",

- org.eclipse.papyrus.uml.diagram.clazz;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="[3.0.0,4.0.0)",

- org.eclipse.papyrus.uml.diagram.activity;bundle-version="1.2.0",

- org.eclipse.papyrus.uml.diagram.common;bundle-version="1.2.0",

- org.eclipse.papyrus.uml.diagram.emftree;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.emf.diagram.common;bundle-version="1.2.0",

- org.eclipse.core.commands;bundle-version="3.6.100",

- org.eclipse.emf.transaction;bundle-version="1.4.0",

- org.eclipse.papyrus.infra.ui;bundle-version="1.2.0",

- org.eclipse.papyrus.infra.core.sasheditor;bundle-version="1.2.0"

-Export-Package: org.eclipse.papyrus.integrationtests.editor

-Bundle-Vendor: %providerName

-Bundle-ActivationPolicy: lazy

-Bundle-Version: 1.2.0.qualifier

-Bundle-Name: %pluginName

-Bundle-Localization: plugin

-Bundle-ManifestVersion: 2

-Bundle-Activator: org.eclipse.papyrus.integrationtests.editor.Activator

-Bundle-SymbolicName: org.eclipse.papyrus.integrationtests.editor

-Bundle-RequiredExecutionEnvironment: JavaSE-1.6

diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 4759947300a..00000000000
--- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,291 +0,0 @@
-eclipse.preferences.version=1

-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled

-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5

-org.eclipse.jdt.core.compiler.compliance=1.5

-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error

-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error

-org.eclipse.jdt.core.compiler.source=1.5

-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16

-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16

-org.eclipse.jdt.core.formatter.alignment_for_assignment=0

-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16

-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16

-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80

-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0

-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16

-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=16

-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80

-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16

-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16

-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16

-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=0

-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0

-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=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line

-org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=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=true

-org.eclipse.jdt.core.formatter.comment.format_source_code=true

-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true

-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=260

-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=2

-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2

-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_after_type_annotation=do not insert

-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not 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=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_lambda_arrow=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_lambda_arrow=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=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=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=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=insert

-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=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=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=false

-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=260

-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=5

-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true

-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/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/about.html b/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/about.html
deleted file mode 100644
index 82d49bf5f81..00000000000
--- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.sasheditor.di.tests/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"

-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>

-<title>About</title>

-</head>

-<body lang="EN-US">

-<h2>About This Content</h2>

- 

-<p>June 5, 2007</p>	

-<h3>License</h3>

-

-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 

-indicated below, the Content is provided to you under the terms and conditions of the

-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 

-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

-

-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 

-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may

-apply to your use of any object code in the Content.  Check the Redistributor's license that was 

-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise

-indicated below, the terms and conditions of the EPL still apply to any source code in the Content

-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>

-

-</body>

-</html>

diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.tests/AllTestsWithMemoryDump.launch b/tests/junit/plugins/core/org.eclipse.papyrus.tests/AllTestsWithMemoryDump.launch
deleted file mode 100644
index 028d768c36a..00000000000
--- a/tests/junit/plugins/core/org.eclipse.papyrus.tests/AllTestsWithMemoryDump.launch
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig">
-<booleanAttribute key="append.args" value="true"/>
-<booleanAttribute key="askclear" value="false"/>
-<booleanAttribute key="automaticAdd" value="true"/>
-<booleanAttribute key="automaticValidate" value="false"/>
-<stringAttribute key="bootstrap" value=""/>
-<stringAttribute key="checked" value="[NONE]"/>
-<booleanAttribute key="clearConfig" value="true"/>
-<booleanAttribute key="clearws" value="true"/>
-<booleanAttribute key="clearwslog" value="false"/>
-<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/>
-<booleanAttribute key="default" value="true"/>
-<booleanAttribute key="includeOptional" value="true"/>
-<stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/org.eclipse.papyrus.tests/test/org/eclipse/papyrus/tests/AllTests.java"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="1"/>
-</listAttribute>
-<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
-<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="true"/>
-<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
-<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
-<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.papyrus.tests.AllTests"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.papyrus.tests"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dosgi.requiredJavaVersion=1.5 -Xms1024m -Xmx2048m -DsuppressRawWhenUnchecked=true -XX:MaxPermSize=1024M"/>
-<stringAttribute key="pde.version" value="3.3"/>
-<stringAttribute key="product" value="org.eclipse.sdk.ide"/>
-<booleanAttribute key="run_in_ui_thread" value="true"/>
-<booleanAttribute key="show_selected_only" value="false"/>
-<stringAttribute key="templateConfig" value="${target_home}\configuration\config.ini"/>
-<booleanAttribute key="tracing" value="false"/>
-<booleanAttribute key="useCustomFeatures" value="false"/>
-<booleanAttribute key="useDefaultConfig" value="true"/>
-<booleanAttribute key="useDefaultConfigArea" value="false"/>
-<booleanAttribute key="useProduct" value="true"/>
-</launchConfiguration>
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.tests/Papyrus ALL tests - Failures.launch b/tests/junit/plugins/core/org.eclipse.papyrus.tests/Papyrus ALL tests - Failures.launch
deleted file mode 100644
index 4be2d26a2b4..00000000000
--- a/tests/junit/plugins/core/org.eclipse.papyrus.tests/Papyrus ALL tests - Failures.launch
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>

-<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig">

-<booleanAttribute key="askclear" value="false"/>

-<booleanAttribute key="automaticAdd" value="true"/>

-<booleanAttribute key="automaticValidate" value="true"/>

-<stringAttribute key="bootstrap" value=""/>

-<stringAttribute key="checked" value="[NONE]"/>

-<booleanAttribute key="clearConfig" value="true"/>

-<booleanAttribute key="clearws" value="true"/>

-<booleanAttribute key="clearwslog" value="false"/>

-<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/Papyrus ALL tests - Failures"/>

-<booleanAttribute key="default" value="true"/>

-<booleanAttribute key="includeOptional" value="true"/>

-<stringAttribute key="location" value="${workspace_loc}/../junit-failures-workspace"/>

-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">

-<listEntry value="/org.eclipse.papyrus.tests/test/org/eclipse/papyrus/tests/AllTests.java"/>

-</listAttribute>

-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">

-<listEntry value="1"/>

-</listAttribute>

-<mapAttribute key="org.eclipse.debug.core.environmentVariables">

-<mapEntry key="skip.long.junit.tests" value="false"/>

-</mapAttribute>

-<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>

-<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>

-<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>

-<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>

-<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>

-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>

-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.papyrus.tests.AllTests"/>

-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog -testConfig=FAILING_TESTS_CONFIG"/>

-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.papyrus.tests"/>

-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>

-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dosgi.requiredJavaVersion=1.6 -Xms512m -Xmx2048m -DsuppressRawWhenUnchecked=true -XX:MaxPermSize=512M&#13;&#10;-XX:SoftRefLRUPolicyMSPerMB=100"/>

-<stringAttribute key="pde.version" value="3.3"/>

-<stringAttribute key="product" value="org.eclipse.platform.ide"/>

-<booleanAttribute key="run_in_ui_thread" value="true"/>

-<booleanAttribute key="show_selected_only" value="false"/>

-<booleanAttribute key="tracing" value="true"/>

-<booleanAttribute key="useCustomFeatures" value="false"/>

-<booleanAttribute key="useDefaultConfig" value="true"/>

-<booleanAttribute key="useDefaultConfigArea" value="true"/>

-<booleanAttribute key="useProduct" value="true"/>

-<stringAttribute key="yk-options" value="&#10;additional-options2=onexit\=snapshot&#10;"/>

-</launchConfiguration>

diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.tests/Papyrus ALL tests With Coverage.launch b/tests/junit/plugins/core/org.eclipse.papyrus.tests/Papyrus ALL tests With Coverage.launch
deleted file mode 100644
index c7141af8016..00000000000
--- a/tests/junit/plugins/core/org.eclipse.papyrus.tests/Papyrus ALL tests With Coverage.launch
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>

-<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig">

-<booleanAttribute key="askclear" value="false"/>

-<booleanAttribute key="automaticAdd" value="true"/>

-<booleanAttribute key="automaticValidate" value="false"/>

-<stringAttribute key="bootstrap" value=""/>

-<stringAttribute key="checked" value="[NONE]"/>

-<booleanAttribute key="clearConfig" value="true"/>

-<booleanAttribute key="clearws" value="true"/>

-<booleanAttribute key="clearwslog" value="false"/>

-<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/Papyrus ALL tests With Coverage"/>

-<booleanAttribute key="default" value="true"/>

-<booleanAttribute key="includeOptional" value="true"/>

-<stringAttribute key="location" value="${workspace_loc}/../junit-workspace-coverage"/>

-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">

-<listEntry value="/org.eclipse.papyrus.tests/test/org/eclipse/papyrus/tests/AllTests.java"/>

-</listAttribute>

-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">

-<listEntry value="1"/>

-</listAttribute>

-<mapAttribute key="org.eclipse.debug.core.environmentVariables">

-<mapEntry key="skip.long.junit.tests" value="false"/>

-</mapAttribute>

-<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>

-<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>

-<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>

-<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>

-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>

-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.papyrus.tests.AllTests"/>

-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.papyrus.tests"/>

-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>

-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dosgi.requiredJavaVersion=1.5 -Xms1024m -Xmx4096m -DsuppressRawWhenUnchecked=true -XX:MaxPermSize=712M"/>

-<stringAttribute key="pde.version" value="3.3"/>

-<stringAttribute key="product" value="org.eclipse.platform.ide"/>

-<booleanAttribute key="run_in_ui_thread" value="true"/>

-<booleanAttribute key="show_selected_only" value="false"/>

-<booleanAttribute key="tracing" value="true"/>

-<booleanAttribute key="useCustomFeatures" value="false"/>

-<booleanAttribute key="useDefaultConfig" value="true"/>

-<booleanAttribute key="useDefaultConfigArea" value="true"/>

-<booleanAttribute key="useProduct" value="true"/>

-</launchConfiguration>

diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.tests/Papyrus Generated Diagram Tests.launch b/tests/junit/plugins/core/org.eclipse.papyrus.tests/Papyrus Generated Diagram Tests.launch
deleted file mode 100644
index da71e977a5b..00000000000
--- a/tests/junit/plugins/core/org.eclipse.papyrus.tests/Papyrus Generated Diagram Tests.launch
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig">
-<booleanAttribute key="askclear" value="false"/>
-<booleanAttribute key="automaticAdd" value="true"/>
-<booleanAttribute key="automaticValidate" value="false"/>
-<stringAttribute key="bootstrap" value=""/>
-<stringAttribute key="checked" value="[NONE]"/>
-<booleanAttribute key="clearConfig" value="true"/>
-<booleanAttribute key="clearws" value="true"/>
-<booleanAttribute key="clearwslog" value="false"/>
-<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/Papyrus Generated Diagram Tests"/>
-<booleanAttribute key="default" value="true"/>
-<booleanAttribute key="includeOptional" value="true"/>
-<stringAttribute key="location" value="${workspace_loc}/../junit-failures-workspace"/>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/org.eclipse.papyrus.tests/test/org/eclipse/papyrus/tests/AllGenTests.java"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="1"/>
-</listAttribute>
-<mapAttribute key="org.eclipse.debug.core.environmentVariables">
-<mapEntry key="skip.long.junit.tests" value="false"/>
-</mapAttribute>
-<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
-<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
-<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
-<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
-<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.papyrus.tests.AllGenTests"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog -testConfig=GENERATED_TESTS_CONFIG"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.papyrus.tests"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dosgi.requiredJavaVersion=1.6 -Xms512m -Xmx2048m -DsuppressRawWhenUnchecked=true -XX:MaxPermSize=512M&#13;&#10;-XX:SoftRefLRUPolicyMSPerMB=100"/>
-<stringAttribute key="pde.version" value="3.3"/>
-<stringAttribute key="product" value="org.eclipse.platform.ide"/>
-<booleanAttribute key="run_in_ui_thread" value="true"/>
-<booleanAttribute key="show_selected_only" value="false"/>
-<booleanAttribute key="tracing" value="true"/>
-<booleanAttribute key="useCustomFeatures" value="false"/>
-<booleanAttribute key="useDefaultConfig" value="true"/>
-<booleanAttribute key="useDefaultConfigArea" value="true"/>
-<booleanAttribute key="useProduct" value="true"/>
-<stringAttribute key="yk-options" value="&#10;additional-options2=onexit\=snapshot&#10;"/>
-</launchConfiguration>
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.tests/Papyrus SysML tests With Coverage.launch b/tests/junit/plugins/core/org.eclipse.papyrus.tests/Papyrus SysML tests With Coverage.launch
deleted file mode 100644
index ff63daad3d6..00000000000
--- a/tests/junit/plugins/core/org.eclipse.papyrus.tests/Papyrus SysML tests With Coverage.launch
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>

-<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig">

-<booleanAttribute key="askclear" value="false"/>

-<booleanAttribute key="automaticAdd" value="true"/>

-<booleanAttribute key="automaticValidate" value="false"/>

-<stringAttribute key="bootstrap" value=""/>

-<stringAttribute key="checked" value="[NONE]"/>

-<booleanAttribute key="clearConfig" value="true"/>

-<booleanAttribute key="clearws" value="true"/>

-<booleanAttribute key="clearwslog" value="false"/>

-<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/Papyrus SysML tests With Coverage"/>

-<booleanAttribute key="default" value="true"/>

-<booleanAttribute key="includeOptional" value="true"/>

-<stringAttribute key="location" value="${workspace_loc}/../junit-workspace-sysml-coverage"/>

-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">

-<listEntry value="/org.eclipse.papyrus.tests.extra/src/org/eclipse/papyrus/tests/extra/AllSysMLTests.java"/>

-</listAttribute>

-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">

-<listEntry value="1"/>

-</listAttribute>

-<mapAttribute key="org.eclipse.debug.core.environmentVariables">

-<mapEntry key="skip.long.junit.tests" value="false"/>

-</mapAttribute>

-<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>

-<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>

-<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>

-<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>

-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>

-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.papyrus.tests.extra.AllSysMLTests"/>

-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.papyrus.tests.extra"/>

-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>

-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dosgi.requiredJavaVersion=1.5 -Xms1024m -Xmx4096m -DsuppressRawWhenUnchecked=true -XX:MaxPermSize=712M"/>

-<stringAttribute key="pde.version" value="3.3"/>

-<stringAttribute key="product" value="org.eclipse.platform.ide"/>

-<booleanAttribute key="run_in_ui_thread" value="true"/>

-<booleanAttribute key="show_selected_only" value="false"/>

-<booleanAttribute key="tracing" value="true"/>

-<booleanAttribute key="useCustomFeatures" value="false"/>

-<booleanAttribute key="useDefaultConfig" value="true"/>

-<booleanAttribute key="useDefaultConfigArea" value="true"/>

-<booleanAttribute key="useProduct" value="true"/>

-</launchConfiguration>

diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.tests/Papyrus SysML tests.launch b/tests/junit/plugins/core/org.eclipse.papyrus.tests/Papyrus SysML tests.launch
deleted file mode 100644
index b7cf559b075..00000000000
--- a/tests/junit/plugins/core/org.eclipse.papyrus.tests/Papyrus SysML tests.launch
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>

-<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig">

-<booleanAttribute key="askclear" value="false"/>

-<booleanAttribute key="automaticAdd" value="true"/>

-<booleanAttribute key="automaticValidate" value="false"/>

-<stringAttribute key="bootstrap" value=""/>

-<stringAttribute key="checked" value="[NONE]"/>

-<booleanAttribute key="clearConfig" value="true"/>

-<booleanAttribute key="clearws" value="true"/>

-<booleanAttribute key="clearwslog" value="false"/>

-<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/Papyrus SysML tests"/>

-<booleanAttribute key="default" value="true"/>

-<booleanAttribute key="includeOptional" value="true"/>

-<stringAttribute key="location" value="${workspace_loc}/../junit-sysml-workspace"/>

-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">

-<listEntry value="/org.eclipse.papyrus.tests.extra/src/org/eclipse/papyrus/tests/extra/AllSysMLTests.java"/>

-</listAttribute>

-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">

-<listEntry value="1"/>

-</listAttribute>

-<mapAttribute key="org.eclipse.debug.core.environmentVariables">

-<mapEntry key="skip.long.junit.tests" value="false"/>

-</mapAttribute>

-<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>

-<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>

-<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>

-<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>

-<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>

-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>

-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.papyrus.tests.extra.AllSysMLTests"/>

-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>

-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.papyrus.tests.extra"/>

-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>

-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dosgi.requiredJavaVersion=1.6 -Xms512m -Xmx768m -DsuppressRawWhenUnchecked=true -XX:MaxPermSize=512M&#10;-XX:SoftRefLRUPolicyMSPerMB=100"/>

-<stringAttribute key="pde.version" value="3.3"/>

-<stringAttribute key="product" value="org.eclipse.platform.ide"/>

-<booleanAttribute key="run_in_ui_thread" value="true"/>

-<booleanAttribute key="show_selected_only" value="false"/>

-<booleanAttribute key="tracing" value="true"/>

-<booleanAttribute key="useCustomFeatures" value="false"/>

-<booleanAttribute key="useDefaultConfig" value="true"/>

-<booleanAttribute key="useDefaultConfigArea" value="true"/>

-<booleanAttribute key="useProduct" value="true"/>

-</launchConfiguration>

diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.tests/about.html b/tests/junit/plugins/core/org.eclipse.papyrus.tests/about.html
deleted file mode 100644
index 82d49bf5f81..00000000000
--- a/tests/junit/plugins/core/org.eclipse.papyrus.tests/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"

-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>

-<title>About</title>

-</head>

-<body lang="EN-US">

-<h2>About This Content</h2>

- 

-<p>June 5, 2007</p>	

-<h3>License</h3>

-

-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 

-indicated below, the Content is provided to you under the terms and conditions of the

-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 

-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

-

-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 

-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may

-apply to your use of any object code in the Content.  Check the Redistributor's license that was 

-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise

-indicated below, the terms and conditions of the EPL still apply to any source code in the Content

-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>

-

-</body>

-</html>

diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.tests/test/org/eclipse/papyrus/tests/AllGenTests.java b/tests/junit/plugins/core/org.eclipse.papyrus.tests/test/org/eclipse/papyrus/tests/AllGenTests.java
deleted file mode 100644
index 03199776f3c..00000000000
--- a/tests/junit/plugins/core/org.eclipse.papyrus.tests/test/org/eclipse/papyrus/tests/AllGenTests.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2010, 2015 CEA LIST; Christian W. Damus, and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Juan Cadavid - juan.cadavid@cea.fr
- *  Christian W. Damus - bug 464647
- *
- *****************************************************************************/
-package org.eclipse.papyrus.tests;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.papyrus.junit.framework.runner.AllTestsRunner;
-import org.eclipse.papyrus.junit.framework.runner.FragmentTestSuiteClass;
-import org.eclipse.papyrus.junit.framework.runner.ITestSuiteClass;
-import org.eclipse.papyrus.junit.framework.runner.SuiteSpot;
-import org.junit.runner.RunWith;
-
-import com.google.common.collect.ImmutableList;
-
-
-/**
- * Tests generated with the Papyrus Test Generation Framework
- */
-@RunWith(AllTestsRunner.class)
-public class AllGenTests {
-
-	@SuiteSpot
-	public static final List<ITestSuiteClass> suiteClasses;
-
-	/** list of classes to launch */
-	static {
-		suiteClasses = new ArrayList<ITestSuiteClass>();
-
-		/* **************** Dynamically loaded from the host plug-ins *********************** */
-
-		suiteClasses.add(new FragmentTestSuiteClass("org.eclipse.papyrus.uml.diagram.activity.tests", "org.eclipse.papyrus.uml.diagram.activity.test.AllGenTests"));
-		suiteClasses.add(new FragmentTestSuiteClass("org.eclipse.papyrus.uml.diagram.clazz.tests", "org.eclipse.papyrus.uml.diagram.clazz.test.AllGenTests"));
-		suiteClasses.add(new FragmentTestSuiteClass("org.eclipse.papyrus.uml.diagram.communication.tests", "org.eclipse.papyrus.uml.diagram.communication.test.AllGenTests"));
-		suiteClasses.add(new FragmentTestSuiteClass("org.eclipse.papyrus.uml.diagram.component.tests", "org.eclipse.papyrus.uml.diagram.component.test.AllGenTests"));
-		suiteClasses.add(new FragmentTestSuiteClass("org.eclipse.papyrus.uml.diagram.composite.tests", "org.eclipse.papyrus.uml.diagram.composite.test.AllGenTests"));
-		suiteClasses.add(new FragmentTestSuiteClass("org.eclipse.papyrus.uml.diagram.deployment.tests", "org.eclipse.papyrus.uml.diagram.deployment.test.AllGenTests"));
-		suiteClasses.add(new FragmentTestSuiteClass("org.eclipse.papyrus.uml.diagram.profile.tests", "org.eclipse.papyrus.uml.diagram.profile.tests.AllGenTests"));
-		suiteClasses.add(new FragmentTestSuiteClass("org.eclipse.papyrus.uml.diagram.statemachine.tests", "org.eclipse.papyrus.uml.diagram.statemachine.test.AllGenTests"));
-		suiteClasses.add(new FragmentTestSuiteClass("org.eclipse.papyrus.uml.diagram.sequence.tests", "org.eclipse.papyrus.uml.diagram.sequence.test.AllGenTests"));
-		suiteClasses.add(new FragmentTestSuiteClass("org.eclipse.papyrus.uml.diagram.timing.tests", "org.eclipse.papyrus.uml.diagram.timing.test.AllGenTests"));
-		suiteClasses.add(new FragmentTestSuiteClass("org.eclipse.papyrus.uml.diagram.usecase.tests", "org.eclipse.papyrus.uml.diagram.usecase.test.AllGenTests"));
-		// end
-	}
-
-	//
-	// The tests broken out into sub-suites for serial execution, to avoid OOMEs
-	//
-
-	@RunWith(AllTestsRunner.class)
-	public static class Suite1 {
-		@SuiteSpot
-		public static final List<? extends ITestSuiteClass> suiteClasses = ImmutableList.of( //
-				new FragmentTestSuiteClass("org.eclipse.papyrus.uml.diagram.clazz.tests", "org.eclipse.papyrus.uml.diagram.clazz.test.AllGenTests"),
-				new FragmentTestSuiteClass("org.eclipse.papyrus.uml.diagram.profile.tests", "org.eclipse.papyrus.uml.diagram.profile.tests.AllGenTests"),
-				new FragmentTestSuiteClass("org.eclipse.papyrus.uml.diagram.usecase.tests", "org.eclipse.papyrus.uml.diagram.usecase.test.AllGenTests"));
-	}
-
-	@RunWith(AllTestsRunner.class)
-	public static class Suite2 {
-		@SuiteSpot
-		public static final List<? extends ITestSuiteClass> suiteClasses = ImmutableList.of( //
-				new FragmentTestSuiteClass("org.eclipse.papyrus.uml.diagram.component.tests", "org.eclipse.papyrus.uml.diagram.component.test.AllGenTests"),
-				new FragmentTestSuiteClass("org.eclipse.papyrus.uml.diagram.composite.tests", "org.eclipse.papyrus.uml.diagram.composite.test.AllGenTests"),
-				new FragmentTestSuiteClass("org.eclipse.papyrus.uml.diagram.deployment.tests", "org.eclipse.papyrus.uml.diagram.deployment.test.AllGenTests"));
-	}
-
-	@RunWith(AllTestsRunner.class)
-	public static class Suite3 {
-		@SuiteSpot
-		public static final List<? extends ITestSuiteClass> suiteClasses = ImmutableList.of( //
-				new FragmentTestSuiteClass("org.eclipse.papyrus.uml.diagram.activity.tests", "org.eclipse.papyrus.uml.diagram.activity.test.AllGenTests"),
-				new FragmentTestSuiteClass("org.eclipse.papyrus.uml.diagram.statemachine.tests", "org.eclipse.papyrus.uml.diagram.statemachine.test.AllGenTests"));
-	}
-
-	@RunWith(AllTestsRunner.class)
-	public static class Suite4 {
-		@SuiteSpot
-		public static final List<? extends ITestSuiteClass> suiteClasses = ImmutableList.of( //
-				new FragmentTestSuiteClass("org.eclipse.papyrus.uml.diagram.communication.tests", "org.eclipse.papyrus.uml.diagram.communication.test.AllGenTests"),
-				new FragmentTestSuiteClass("org.eclipse.papyrus.uml.diagram.sequence.tests", "org.eclipse.papyrus.uml.diagram.sequence.test.AllGenTests"),
-				new FragmentTestSuiteClass("org.eclipse.papyrus.uml.diagram.timing.tests", "org.eclipse.papyrus.uml.diagram.timing.test.AllGenTests"));
-	}
-}
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.tests/test/org/eclipse/papyrus/tests/AllHeadlessTests.java b/tests/junit/plugins/core/org.eclipse.papyrus.tests/test/org/eclipse/papyrus/tests/AllHeadlessTests.java
deleted file mode 100644
index 22fb7e6ae1f..00000000000
--- a/tests/junit/plugins/core/org.eclipse.papyrus.tests/test/org/eclipse/papyrus/tests/AllHeadlessTests.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2016 Christian W. Damus and others.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *   Christian W. Damus - Initial API and implementation
- *   
- *****************************************************************************/
-
-package org.eclipse.papyrus.tests;
-
-import java.util.List;
-import java.util.stream.Collectors;
-
-import org.eclipse.papyrus.junit.framework.runner.AllTestsRunner;
-import org.eclipse.papyrus.junit.framework.runner.Headless;
-import org.eclipse.papyrus.junit.framework.runner.ITestSuiteClass;
-import org.eclipse.papyrus.junit.framework.runner.SuiteSpot;
-import org.junit.runner.RunWith;
-
-/**
- * A test suite that automatically selects all {@linkplain Headless headless tests}
- * from the {@link AllTests} suite.
- */
-@RunWith(AllTestsRunner.class)
-public class AllHeadlessTests {
-
-	@SuiteSpot
-	public static final List<ITestSuiteClass> suiteClasses;
-
-	static {
-		suiteClasses = AllTests.suiteClasses.stream()
-				.filter(ITestSuiteClass::isHeadless)
-				.collect(Collectors.toList());
-	}
-
-	public AllHeadlessTests() {
-		super();
-	}
-
-}
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.tests/test/org/eclipse/papyrus/tests/AllTests.java b/tests/junit/plugins/core/org.eclipse.papyrus.tests/test/org/eclipse/papyrus/tests/AllTests.java
deleted file mode 100644
index 46039d91691..00000000000
--- a/tests/junit/plugins/core/org.eclipse.papyrus.tests/test/org/eclipse/papyrus/tests/AllTests.java
+++ /dev/null
@@ -1,162 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2010, 2016 CEA LIST, Christian W. Damus, and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *  Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation
- *  Christian W. Damus (CEA) - bugs 402525, 323802, 431953, 433310, 434993
- *  Christian W. Damus - bugs 399859, 451230, 433206, 463156, 474610, 469188, 485220, 488791, 496598, 508629
- *
- *****************************************************************************/
-package org.eclipse.papyrus.tests;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.papyrus.junit.framework.runner.AllTestsRunner;
-import org.eclipse.papyrus.junit.framework.runner.ITestSuiteClass;
-import org.eclipse.papyrus.junit.framework.runner.PluginTestSuiteClass;
-import org.eclipse.papyrus.junit.framework.runner.SuiteSpot;
-import org.junit.runner.RunWith;
-
-
-/**
- * Test class for all tests for Papyrus
- */
-@RunWith(AllTestsRunner.class)
-public class AllTests {
-
-	@SuiteSpot
-	public static final List<ITestSuiteClass> suiteClasses;
-
-	/** list of classes to launch */
-	static {
-		suiteClasses = new ArrayList<>();
-
-		/* **************** plugins *********************** */
-		/* developper */
-		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.bundles.tests.AllTests.class));
-
-		/* core */
-		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.core.tests.AllTests.class));
-		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.core.clipboard.tests.AllTests.class));
-		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.core.sasheditor.tests.AllTests.class));
-		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.core.sasheditor.di.tests.AllTests.class));
-
-		/* infra */
-		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.tools.tests.AllTests.class));
-		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.ui.tests.AllTests.class));
-		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.services.edit.tests.suites.AllTests.class));
-		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.services.edit.ui.tests.AllTests.class));
-		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.services.labelprovider.tests.AllTests.class));
-		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.services.semantic.tests.AllTests.class));
-		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.emf.tests.AllTests.class));
-		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.emf.gmf.tests.AllTests.class));
-		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.ui.emf.tests.AllTests.class));
-		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.types.tests.AllTests.class));
-		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.types.ui.tests.AllTests.class));
-		// suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.services.openelement.tests.AllTests.class));
-		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.gmfdiag.commands.tests.AllTests.class));
-		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.gmfdiag.common.tests.AllTests.class));
-		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.gmfdiag.canonical.tests.AllTests.class));
-		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.emf.readonly.tests.AllTests.class));
-		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.viewpoints.configuration.tests.AllTests.class));
-		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.editor.welcome.tests.AllTests.class));
-		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.gmfdiag.welcome.tests.AllTests.class));
-		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.properties.ui.tests.AllTests.class));
-
-		/* customization */
-		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.eclipse.project.editors.tests.AllTests.class));
-
-		/* views */
-		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.views.modelexplorer.tests.AllTests.class));
-
-		/* integration */
-		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.editor.integration.tests.AllTests.class));
-
-		// FIXME: Workaround for Bug 441246: Move the ResourceLoading tests after EditorReloadTest, since they are currently conflicting
-		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.services.resourceloading.tests.AllTests.class));
-
-		/* search */
-		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.search.tests.suites.AllTests.class));
-
-		/* css */
-		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.gmfdiag.css.tests.tests.AllTests.class));
-
-		/* menu */
-		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.gmfdiag.menu.tests.tests.AllTests.class));
-
-		/* control mode */
-		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.services.controlmode.tests.AllTests.class));
-
-		/* Diagram Assistants test suite */
-		org.eclipse.papyrus.tests.diagramassistants.AllTests.appendTo(suiteClasses);
-
-		/* Profile Drafter */
-		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.profile.drafter.tests.AllTests.class));
-
-		/* uml */
-		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.service.types.tests.suites.AllTests.class));
-		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.service.types.ui.tests.suites.AllTests.class));
-		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.modelexplorer.tests.AllTests.class));
-		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.diagram.dnd.tests.tests.AllTests.class));
-		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.tools.tests.tests.AllTests.class));
-		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.tools.utils.tests.tests.AllTests.class));
-		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.diagram.stereotypeproperty.AllTests.class));
-		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.diagram.wizards.AllTests.class));
-		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.modelrepair.tests.AllTests.class));
-		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.profile.tests.AllTests.class));
-		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.decoratormodel.tests.AllTests.class));
-		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.decoratormodel.controlmode.tests.AllTests.class));
-		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.validation.tests.AllTests.class));
-
-		/* uml diagrams */
-		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.diagram.common.tests.tests.AllTests.class));
-		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.diagram.clazz.test.AllTests.class));
-		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.diagram.activity.tests.AllTests.class));
-		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.diagram.deployment.test.AllTests.class));
-		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.diagram.component.test.AllTests.class));
-		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.diagram.timing.tests.AllTests.class));
-		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.diagram.usecase.tests.AllTests.class));
-		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.diagram.composite.test.AllTests.class));
-		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.diagram.statemachine.tests.AllTests.class));
-		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.diagram.communication.tests.AllTests.class));
-		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.diagram.profile.tests.AllTests.class));
-		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.diagram.sequence.tests.AllTests.class));
-		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.diagram.interactionoverview.tests.AllTests.class));
-		//
-
-		// nattable tests
-		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.nattable.views.tests.tests.AllTests.class));
-		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.nattable.common.tests.AllTests.class));
-		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.nattable.model.editor.tests.tests.AllTests.class));
-		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.nattable.model.tests.tests.AllTests.class));
-		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.nattable.tests.tests.AllTests.class));
-
-		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.nattable.tests.tests.AllTests.class));
-		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.nattable.generic.tests.tests.AllTests.class));
-		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.nattable.clazz.config.tests.tests.AllTests.class));
-		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.nattable.stereotype.display.tests.tests.AllTests.class));
-
-		// uml textedit tests
-		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.textedit.port.tests.suites.AllTests.class));
-		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.textedit.property.tests.suites.AllTests.class));
-		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.textedit.parameter.tests.suites.AllTests.class));
-		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.textedit.valuespecification.tests.suites.AllTests.class));
-
-		// Alf
-		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.alf.tests.AllTests.class));
-		
-		// Internationalization
-		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.infra.internationalization.tests.tests.AllTests.class));
-		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.internationalization.tests.tests.AllTests.class));
-		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.uml.internationalization.controlmode.tests.tests.AllTests.class));
-
-		// end
-	}
-
-}
diff --git a/tests/junit/plugins/developer/org.eclipse.papyrus.bundles.tests/pom.xml b/tests/junit/plugins/developer/org.eclipse.papyrus.bundles.tests/pom.xml
index ea4673403dd..9fbbd9b4971 100644
--- a/tests/junit/plugins/developer/org.eclipse.papyrus.bundles.tests/pom.xml
+++ b/tests/junit/plugins/developer/org.eclipse.papyrus.bundles.tests/pom.xml
@@ -8,7 +8,7 @@
     <version>3.0.0-SNAPSHOT</version>
     <relativePath>../../../../../releng/dev</relativePath>
   </parent>
-  <groupId>org.eclipse.papyrus</groupId>
+  <groupId>org.eclipse.papyrus.tests</groupId>
   <artifactId>org.eclipse.papyrus.bundles.tests</artifactId>
   <version>1.2.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.tests/.classpath b/tests/junit/plugins/developer/org.eclipse.papyrus.developer.suite.tests/.classpath
index 83be1d9f78c..83be1d9f78c 100644..100755
--- a/tests/junit/plugins/core/org.eclipse.papyrus.tests/.classpath
+++ b/tests/junit/plugins/developer/org.eclipse.papyrus.developer.suite.tests/.classpath
diff --git a/tests/junit/plugins/suites/org.eclipse.papyrus.tests.diagramassistants/.project b/tests/junit/plugins/developer/org.eclipse.papyrus.developer.suite.tests/.project
index b09b5eeb546..ad10bda06c6 100644..100755
--- a/tests/junit/plugins/suites/org.eclipse.papyrus.tests.diagramassistants/.project
+++ b/tests/junit/plugins/developer/org.eclipse.papyrus.developer.suite.tests/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.eclipse.papyrus.tests.diagramassistants</name>
+	<name>org.eclipse.papyrus.developer.suite.tests</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.clipboard.tests/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/developer/org.eclipse.papyrus.developer.suite.tests/.settings/org.eclipse.jdt.core.prefs
index b3aa6d60f94..b3aa6d60f94 100755
--- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.clipboard.tests/.settings/org.eclipse.jdt.core.prefs
+++ b/tests/junit/plugins/developer/org.eclipse.papyrus.developer.suite.tests/.settings/org.eclipse.jdt.core.prefs
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/.settings/org.eclipse.jdt.ui.prefs b/tests/junit/plugins/developer/org.eclipse.papyrus.developer.suite.tests/.settings/org.eclipse.jdt.ui.prefs
index 954281dbc31..954281dbc31 100644..100755
--- a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/.settings/org.eclipse.jdt.ui.prefs
+++ b/tests/junit/plugins/developer/org.eclipse.papyrus.developer.suite.tests/.settings/org.eclipse.jdt.ui.prefs
diff --git a/tests/junit/plugins/developer/org.eclipse.papyrus.developer.suite.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/developer/org.eclipse.papyrus.developer.suite.tests/META-INF/MANIFEST.MF
new file mode 100755
index 00000000000..684ae63ac2b
--- /dev/null
+++ b/tests/junit/plugins/developer/org.eclipse.papyrus.developer.suite.tests/META-INF/MANIFEST.MF
@@ -0,0 +1,17 @@
+Bundle-Vendor: %providerName
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 0.0.1.qualifier
+Bundle-Name: %pluginName
+Bundle-Localization: plugin
+Bundle-ManifestVersion: 2
+Bundle-Activator: org.eclipse.papyrus.developer.suite.tests.Activator
+Bundle-SymbolicName: org.eclipse.papyrus.developer.suite.tests
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Manifest-Version: 1.0
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.junit;bundle-version="4.10.0",
+ org.eclipse.papyrus.junit.framework;bundle-version="1.2.0",
+ org.eclipse.papyrus.junit.utils;bundle-version="1.2.0",
+ org.eclipse.papyrus.bundles.tests;bundle-version="1.2.0"
+ 
diff --git a/tests/junit/plugins/developer/org.eclipse.papyrus.developer.suite.tests/Papyrus Developer ALL tests.launch b/tests/junit/plugins/developer/org.eclipse.papyrus.developer.suite.tests/Papyrus Developer ALL tests.launch
new file mode 100755
index 00000000000..93ff3712582
--- /dev/null
+++ b/tests/junit/plugins/developer/org.eclipse.papyrus.developer.suite.tests/Papyrus Developer ALL tests.launch
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig">
+<booleanAttribute key="askclear" value="false"/>
+<booleanAttribute key="automaticAdd" value="true"/>
+<booleanAttribute key="automaticValidate" value="false"/>
+<stringAttribute key="bootstrap" value=""/>
+<stringAttribute key="checked" value="[NONE]"/>
+<booleanAttribute key="clearConfig" value="true"/>
+<booleanAttribute key="clearws" value="true"/>
+<booleanAttribute key="clearwslog" value="false"/>
+<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/Papyrus Developer ALL tests"/>
+<booleanAttribute key="default" value="true"/>
+<booleanAttribute key="includeOptional" value="true"/>
+<stringAttribute key="location" value="${workspace_loc}/../junit-all-workspace"/>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/org.eclipse.papyrus.developer.suite.tests/test/org/eclipse/papyrus/developer/suite/tests/AllTests.java"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="1"/>
+</listAttribute>
+<mapAttribute key="org.eclipse.debug.core.environmentVariables">
+<mapEntry key="skip.long.junit.tests" value="false"/>
+</mapAttribute>
+<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
+<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
+<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
+<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
+<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
+<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/><stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.papyrus.developer.suite.tests.AllTests"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.papyrus.developer.suite.tests"/>
+<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dosgi.requiredJavaVersion=1.8 -Xms512m -Xmx1024m -DsuppressRawWhenUnchecked=true&#13;&#10;-XX:SoftRefLRUPolicyMSPerMB=100&#13;&#10;-Doomph.setup.skip=true&#13;&#10;-Doomph.setup.questionnaire.skip=true"/>
+<stringAttribute key="pde.version" value="3.3"/>
+<stringAttribute key="product" value="org.eclipse.platform.ide"/>
+<booleanAttribute key="run_in_ui_thread" value="true"/>
+<booleanAttribute key="show_selected_only" value="false"/>
+<booleanAttribute key="tracing" value="true"/>
+<booleanAttribute key="useCustomFeatures" value="false"/>
+<booleanAttribute key="useDefaultConfig" value="true"/>
+<booleanAttribute key="useDefaultConfigArea" value="true"/>
+<booleanAttribute key="useProduct" value="true"/>
+<stringAttribute key="yk-options" value="&#10;additional-options2=onexit\=snapshot&#10;"/>
+</launchConfiguration>
diff --git a/tests/junit/plugins/suites/org.eclipse.papyrus.tests.diagramassistants/about.html b/tests/junit/plugins/developer/org.eclipse.papyrus.developer.suite.tests/about.html
index d35d5aed64c..d35d5aed64c 100644..100755
--- a/tests/junit/plugins/suites/org.eclipse.papyrus.tests.diagramassistants/about.html
+++ b/tests/junit/plugins/developer/org.eclipse.papyrus.developer.suite.tests/about.html
diff --git a/tests/junit/plugins/developer/org.eclipse.papyrus.developer.suite.tests/build.properties b/tests/junit/plugins/developer/org.eclipse.papyrus.developer.suite.tests/build.properties
new file mode 100755
index 00000000000..9a313f187de
--- /dev/null
+++ b/tests/junit/plugins/developer/org.eclipse.papyrus.developer.suite.tests/build.properties
@@ -0,0 +1,7 @@
+source.. = test/
+output.. = bin/
+bin.includes = META-INF/,\
+               .,\
+               plugin.properties,\
+               about.html,\
+               Papyrus Developer ALL tests.launch
diff --git a/tests/junit/plugins/developer/org.eclipse.papyrus.developer.suite.tests/plugin.properties b/tests/junit/plugins/developer/org.eclipse.papyrus.developer.suite.tests/plugin.properties
new file mode 100755
index 00000000000..5375243083c
--- /dev/null
+++ b/tests/junit/plugins/developer/org.eclipse.papyrus.developer.suite.tests/plugin.properties
@@ -0,0 +1,12 @@
+#################################################################################
+# Copyright (c) 2008 CEA LIST.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#     Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - initial API and implementation
+##################################################################################
+pluginName=Developer tests for Papyrus
+providerName=Eclipse Modeling Project
diff --git a/tests/junit/plugins/developer/org.eclipse.papyrus.developer.suite.tests/pom.xml b/tests/junit/plugins/developer/org.eclipse.papyrus.developer.suite.tests/pom.xml
new file mode 100755
index 00000000000..f826205f6fe
--- /dev/null
+++ b/tests/junit/plugins/developer/org.eclipse.papyrus.developer.suite.tests/pom.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+	xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.eclipse.papyrus</groupId>
+		<artifactId>org.eclipse.papyrus.tests.releng</artifactId>
+		<version>1.2.0-SNAPSHOT</version>
+		<relativePath>../../../../../releng/main-tests/pom.xml</relativePath>
+	</parent>
+	<groupId>org.eclipse.papyrus.tests</groupId>
+	<artifactId>org.eclipse.papyrus.developer.suite.tests</artifactId>
+	<version>0.0.1-SNAPSHOT</version>
+	<packaging>eclipse-test-plugin</packaging>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-surefire-plugin</artifactId>
+				<version>${tycho-version}</version>
+				<configuration>
+					<useUIHarness>true</useUIHarness>
+					<useUIThread>true</useUIThread>
+					<testFailureIgnore>true</testFailureIgnore>
+					<product>org.eclipse.sdk.ide</product>
+					<!-- If a specific <argLine> is required here, make sure to include JaCoCo parameters (See parent pom, Bug 478170) -->
+					<skipTests>${skipAllTests}</skipTests>
+					<testClass>org.eclipse.papyrus.developer.suite.tests.AllTests</testClass>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>target-platform-configuration</artifactId>
+				<version>${tycho-version}</version>
+				<configuration>
+					<dependency-resolution>
+						<extraRequirements>
+							<requirement>
+								<type>p2-installable-unit</type>
+								<id>org.eclipse.sdk.feature.group</id>
+								<versionRange>0.0.0</versionRange>
+							</requirement>
+							<requirement>
+								<type>eclipse-feature</type>
+								<id>org.eclipse.papyrus.sdk.feature</id>
+								<versionRange>0.0.0</versionRange>
+							</requirement>
+						</extraRequirements>
+					</dependency-resolution>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+</project>
diff --git a/tests/junit/plugins/developer/org.eclipse.papyrus.developer.suite.tests/test/org/eclipse/papyrus/developer/suite/tests/Activator.java b/tests/junit/plugins/developer/org.eclipse.papyrus.developer.suite.tests/test/org/eclipse/papyrus/developer/suite/tests/Activator.java
new file mode 100755
index 00000000000..c6126df82bc
--- /dev/null
+++ b/tests/junit/plugins/developer/org.eclipse.papyrus.developer.suite.tests/test/org/eclipse/papyrus/developer/suite/tests/Activator.java
@@ -0,0 +1,54 @@
+package org.eclipse.papyrus.developer.suite.tests;
+
+import org.eclipse.ui.plugin.AbstractUIPlugin;
+import org.osgi.framework.BundleContext;
+
+/**
+ * The activator class controls the plug-in life cycle
+ */
+public class Activator extends AbstractUIPlugin {
+
+	// The plug-in ID
+	public static final String PLUGIN_ID = "org.eclipse.papyrus.developer.suite.tests"; //$NON-NLS-1$
+
+	// The shared instance
+	private static Activator plugin;
+
+	/**
+	 * The constructor
+	 */
+	public Activator() {
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
+	 */
+	@Override
+	public void start(BundleContext context) throws Exception {
+		super.start(context);
+		plugin = this;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
+	 */
+	@Override
+	public void stop(BundleContext context) throws Exception {
+		plugin = null;
+		super.stop(context);
+	}
+
+	/**
+	 * Returns the shared instance
+	 *
+	 * @return the shared instance
+	 */
+	public static Activator getDefault() {
+		return plugin;
+	}
+
+}
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.tests/test/org/eclipse/papyrus/tests/AllUITests.java b/tests/junit/plugins/developer/org.eclipse.papyrus.developer.suite.tests/test/org/eclipse/papyrus/developer/suite/tests/AllTests.java
index ed028a380e5..683a98ac26d 100644..100755
--- a/tests/junit/plugins/core/org.eclipse.papyrus.tests/test/org/eclipse/papyrus/tests/AllUITests.java
+++ b/tests/junit/plugins/developer/org.eclipse.papyrus.developer.suite.tests/test/org/eclipse/papyrus/developer/suite/tests/AllTests.java
@@ -1,45 +1,47 @@
 /*****************************************************************************
- * Copyright (c) 2016 Christian W. Damus and others.
- * 
+ * Copyright (c) 2010, 2016 CEA LIST, Christian W. Damus, and others.
+ *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *   Christian W. Damus - Initial API and implementation
- *   
+ *  Remi Schnekenburger (CEA LIST) remi.schnekenburger@cea.fr - Initial API and implementation
+ *  Christian W. Damus (CEA) - bugs 402525, 323802, 431953, 433310, 434993
+ *  Christian W. Damus - bugs 399859, 451230, 433206, 463156, 474610, 469188, 485220, 488791, 496598, 508629
+ *
  *****************************************************************************/
+package org.eclipse.papyrus.developer.suite.tests;
 
-package org.eclipse.papyrus.tests;
-
+import java.util.ArrayList;
 import java.util.List;
-import java.util.stream.Collectors;
 
 import org.eclipse.papyrus.junit.framework.runner.AllTestsRunner;
-import org.eclipse.papyrus.junit.framework.runner.Headless;
 import org.eclipse.papyrus.junit.framework.runner.ITestSuiteClass;
+import org.eclipse.papyrus.junit.framework.runner.PluginTestSuiteClass;
 import org.eclipse.papyrus.junit.framework.runner.SuiteSpot;
 import org.junit.runner.RunWith;
 
+
 /**
- * A test suite that automatically selects all non-{@linkplain Headless headless} tests
- * from the {@link AllTests} suite.
+ * Test class for all tests for Papyrus
  */
 @RunWith(AllTestsRunner.class)
-public class AllUITests {
+public class AllTests {
 
 	@SuiteSpot
 	public static final List<ITestSuiteClass> suiteClasses;
 
+	/** list of classes to launch */
 	static {
-		suiteClasses = AllTests.suiteClasses.stream()
-				.filter(ITestSuiteClass::isUI)
-				.collect(Collectors.toList());
-	}
+		suiteClasses = new ArrayList<>();
+
+		/* **************** plugins *********************** */
+		suiteClasses.add(new PluginTestSuiteClass(org.eclipse.papyrus.bundles.tests.AllTests.class));
+
 
-	public AllUITests() {
-		super();
+		// end
 	}
 
 }
diff --git a/tests/junit/plugins/developer/pom.xml b/tests/junit/plugins/developer/pom.xml
new file mode 100755
index 00000000000..9380df3f9de
--- /dev/null
+++ b/tests/junit/plugins/developer/pom.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+	xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.eclipse.papyrus.tests</groupId>
+    <artifactId>org.eclipse.papyrus.plugins.tests.releng</artifactId>
+    <version>0.0.1-SNAPSHOT</version>
+  </parent>
+  <groupId>org.eclipse.papyrus.tests</groupId>
+  <artifactId>org.eclipse.papyrus.developer.tests.releng</artifactId>
+  <version>0.0.1-SNAPSHOT</version>
+  <packaging>pom</packaging>
+	<description>Developer tests for Papyrus</description>
+  
+  <modules>
+  	<!-- Suites -->
+	<module>org.eclipse.papyrus.developer.suite.tests</module>  	
+  
+  	<!-- Plugins -->
+	<!-- <module>org.eclipse.papyrus.bundles.tests</module> -->
+			
+  </modules>
+  
+</project>
diff --git a/tests/junit/plugins/editor/org.eclipse.papyrus.eclipse.project.editors.tests/pom.xml b/tests/junit/plugins/editor/org.eclipse.papyrus.eclipse.project.editors.tests/pom.xml
index 1adc7c826d0..d8ea91e7494 100644
--- a/tests/junit/plugins/editor/org.eclipse.papyrus.eclipse.project.editors.tests/pom.xml
+++ b/tests/junit/plugins/editor/org.eclipse.papyrus.eclipse.project.editors.tests/pom.xml
@@ -8,7 +8,7 @@
     <version>1.2.0-SNAPSHOT</version>
     <relativePath>../../../../../releng/main-tests</relativePath>
   </parent>
-  <groupId>org.eclipse.papyrus</groupId>
+  <groupId>org.eclipse.papyrus.tests</groupId>
   <artifactId>org.eclipse.papyrus.eclipse.project.editors.tests</artifactId>
   <version>2.0.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/.classpath b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/.classpath
index 2d1a4302f04..64c5e31b7a2 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/.classpath
+++ b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/.classpath
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<classpath>

-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>

-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

-	<classpathentry kind="src" path="src"/>

-	<classpathentry kind="output" path="bin"/>

-</classpath>

+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/.project b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/.project
index 7c626a1bed6..b462121a6c6 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/.project
+++ b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/.project
@@ -1,28 +1,28 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.papyrus.editor.integration.tests</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>org.eclipse.jdt.core.javabuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.ManifestBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.SchemaBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.pde.PluginNature</nature>

-		<nature>org.eclipse.jdt.core.javanature</nature>

-	</natures>

-</projectDescription>

+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.papyrus.editor.integration.tests</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/tests/junit/plugins/suites/org.eclipse.papyrus.tests.diagramassistants/.settings/org.eclipse.jdt.core.prefs b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/.settings/org.eclipse.jdt.core.prefs
index f08be2b06c4..c585cc455ae 100644
--- a/tests/junit/plugins/suites/org.eclipse.papyrus.tests.diagramassistants/.settings/org.eclipse.jdt.core.prefs
+++ b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/.settings/org.eclipse.jdt.core.prefs
@@ -1,10 +1,10 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
 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.compiler.source=1.5
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.clipboard.tests/.settings/org.eclipse.jdt.ui.prefs b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/.settings/org.eclipse.jdt.ui.prefs
index 954281dbc31..954281dbc31 100755..100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.clipboard.tests/.settings/org.eclipse.jdt.ui.prefs
+++ b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/.settings/org.eclipse.jdt.ui.prefs
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/META-INF/MANIFEST.MF b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/META-INF/MANIFEST.MF
index b5cfb384cf8..b5cfb384cf8 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/META-INF/MANIFEST.MF
+++ b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/META-INF/MANIFEST.MF
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.tests/about.html b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/about.html
index 82d49bf5f81..d35d5aed64c 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.infra.core.tests/about.html
+++ b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/about.html
@@ -1,28 +1,28 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"

-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml">

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>

-<title>About</title>

-</head>

-<body lang="EN-US">

-<h2>About This Content</h2>

- 

-<p>June 5, 2007</p>	

-<h3>License</h3>

-

-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 

-indicated below, the Content is provided to you under the terms and conditions of the

-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 

-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.

-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>

-

-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 

-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may

-apply to your use of any object code in the Content.  Check the Redistributor's license that was 

-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise

-indicated below, the terms and conditions of the EPL still apply to any source code in the Content

-and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>

-

-</body>

-</html>

+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+ 
+<p>June 5, 2007</p>	
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content.  Check the Redistributor's license that was 
+provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+
+</body>
+</html>
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/build.properties b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/build.properties
index 946edb23c31..6b8634c222f 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/build.properties
+++ b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/build.properties
@@ -1,7 +1,7 @@
-source.. = src/

-output.. = bin/

-bin.includes = META-INF/,\

-               .,\

-               about.html,\

-               model/

-src.includes = about.html

+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .,\
+               about.html,\
+               model/
+src.includes = about.html
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/basic/complex_multipage_model.di b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/basic/complex_multipage_model.di
index c25cf0e5223..8148e9633e1 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/basic/complex_multipage_model.di
+++ b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/basic/complex_multipage_model.di
@@ -1,237 +1,237 @@
-<?xml version="1.0" encoding="ASCII"?>

-<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi" xmlns:org.eclipse.papyrus.infra.table.instance.papyrustableinstance="http://www.eclipse.org/Papyrus/Table/0.8.0/papyrustableinstance" xmlns:tableinstance="http://www.eclipse.org/EMF_Facet/ModelCellEditor/0.1.0/tableinstance" xmlns:tableinstance2="http://www.eclipse.org/EMF_Facet/Table/0.1.0/tableinstance2">

-  <di:SashWindowsMngr>

-    <pageList>

-      <availablePage>

-        <emfPageIdentifier href="complex_multipage_model.notation#_zyAt8XqTEeK9jI2Tc6HWsA"/>

-      </availablePage>

-      <availablePage>

-        <emfPageIdentifier href="complex_multipage_model.notation#_zyAt83qTEeK9jI2Tc6HWsA"/>

-      </availablePage>

-      <availablePage>

-        <emfPageIdentifier href="complex_multipage_model.notation#_1B5ogHqTEeK9jI2Tc6HWsA"/>

-      </availablePage>

-      <availablePage>

-        <emfPageIdentifier href="complex_multipage_model.notation#_1PIzQHqTEeK9jI2Tc6HWsA"/>

-      </availablePage>

-      <availablePage>

-        <emfPageIdentifier href="complex_multipage_model.notation#_1pLD4HqTEeK9jI2Tc6HWsA"/>

-      </availablePage>

-      <availablePage>

-        <emfPageIdentifier href="complex_multipage_model.notation#_12a1sHqTEeK9jI2Tc6HWsA"/>

-      </availablePage>

-      <availablePage>

-        <emfPageIdentifier href="complex_multipage_model.notation#_1_fSIHqTEeK9jI2Tc6HWsA"/>

-      </availablePage>

-      <availablePage>

-        <emfPageIdentifier href="complex_multipage_model.notation#_B_L-UHqUEeK9jI2Tc6HWsA"/>

-      </availablePage>

-      <availablePage emfPageIdentifier="/1"/>

-    </pageList>

-    <sashModel currentSelection="/0/@sashModel/@windows.0/@children.0/@children.0/@children.1">

-      <windows>

-        <children xsi:type="di:SashPanel" direction="256">

-          <children xsi:type="di:SashPanel" direction="512">

-            <children xsi:type="di:TabFolder">

-              <children>

-                <emfPageIdentifier href="complex_multipage_model.notation#_1B5ogHqTEeK9jI2Tc6HWsA"/>

-              </children>

-              <children>

-                <emfPageIdentifier href="complex_multipage_model.notation#_B_L-UHqUEeK9jI2Tc6HWsA"/>

-              </children>

-            </children>

-            <children xsi:type="di:TabFolder">

-              <children>

-                <emfPageIdentifier href="complex_multipage_model.notation#_1_fSIHqTEeK9jI2Tc6HWsA"/>

-              </children>

-              <children emfPageIdentifier="/1"/>

-              <children>

-                <emfPageIdentifier href="complex_multipage_model.notation#_zyAt8XqTEeK9jI2Tc6HWsA"/>

-              </children>

-            </children>

-          </children>

-          <children xsi:type="di:TabFolder">

-            <children>

-              <emfPageIdentifier href="complex_multipage_model.notation#_12a1sHqTEeK9jI2Tc6HWsA"/>

-            </children>

-          </children>

-        </children>

-      </windows>

-    </sashModel>

-  </di:SashWindowsMngr>

-  <org.eclipse.papyrus.infra.table.instance.papyrustableinstance:PapyrusTableInstance name="DefaultTable" table="/2"/>

-  <tableinstance2:TableInstance2 description="Table Description">

-    <tableConfiguration href="platform:/plugin/org.eclipse.papyrus.uml.table.default/resources/default.tableconfiguration2#/"/>

-    <customizations href="emffacet:/customization/UMLPapyrusDefaultBrowserCustomization#/"/>

-    <customizations href="#/2/@localCustomizations.1"/>

-    <customizations href="#/2/@localCustomizations.0"/>

-    <context href="complex_multipage_model.uml#_BYzTwHqUEeK9jI2Tc6HWsA"/>

-    <columns xsi:type="tableinstance:DefaultLabelColumn"/>

-    <columns xsi:type="tableinstance:MetaClassColumn"/>

-    <columns xsi:type="tableinstance:EContainerColumn"/>

-    <columns xsi:type="tableinstance:ReferenceColumn">

-      <reference href="http://www.eclipse.org/emf/2002/Ecore#//EModelElement/eAnnotations"/>

-    </columns>

-    <columns xsi:type="tableinstance:ReferenceColumn">

-      <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Element/ownedComment"/>

-    </columns>

-    <columns xsi:type="tableinstance:ReferenceColumn">

-      <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Element/ownedElement"/>

-    </columns>

-    <columns xsi:type="tableinstance:ReferenceColumn">

-      <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Element/owner"/>

-    </columns>

-    <columns xsi:type="tableinstance:ReferenceColumn">

-      <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/clientDependency"/>

-    </columns>

-    <columns xsi:type="tableinstance:AttributeColumn">

-      <attribute href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/name"/>

-    </columns>

-    <columns xsi:type="tableinstance:ReferenceColumn">

-      <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/nameExpression"/>

-    </columns>

-    <columns xsi:type="tableinstance:ReferenceColumn">

-      <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/namespace"/>

-    </columns>

-    <columns xsi:type="tableinstance:AttributeColumn">

-      <attribute href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/qualifiedName"/>

-    </columns>

-    <columns xsi:type="tableinstance:AttributeColumn">

-      <attribute href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/visibility"/>

-    </columns>

-    <columns xsi:type="tableinstance:ReferenceColumn">

-      <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Namespace/elementImport"/>

-    </columns>

-    <columns xsi:type="tableinstance:ReferenceColumn">

-      <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Namespace/packageImport"/>

-    </columns>

-    <columns xsi:type="tableinstance:ReferenceColumn">

-      <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Namespace/ownedRule"/>

-    </columns>

-    <columns xsi:type="tableinstance:ReferenceColumn">

-      <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Namespace/ownedMember"/>

-    </columns>

-    <columns xsi:type="tableinstance:ReferenceColumn">

-      <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Namespace/importedMember"/>

-    </columns>

-    <columns xsi:type="tableinstance:ReferenceColumn">

-      <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Namespace/member"/>

-    </columns>

-    <columns xsi:type="tableinstance:AttributeColumn">

-      <attribute href="http://www.eclipse.org/uml2/4.0.0/UML#//RedefinableElement/isLeaf"/>

-    </columns>

-    <columns xsi:type="tableinstance:ReferenceColumn">

-      <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//RedefinableElement/redefinedElement"/>

-    </columns>

-    <columns xsi:type="tableinstance:ReferenceColumn">

-      <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//RedefinableElement/redefinitionContext"/>

-    </columns>

-    <columns xsi:type="tableinstance:ReferenceColumn">

-      <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//ParameterableElement/owningTemplateParameter"/>

-    </columns>

-    <columns xsi:type="tableinstance:ReferenceColumn">

-      <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//ParameterableElement/templateParameter"/>

-    </columns>

-    <columns xsi:type="tableinstance:ReferenceColumn">

-      <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Type/package"/>

-    </columns>

-    <columns xsi:type="tableinstance:ReferenceColumn">

-      <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//TemplateableElement/ownedTemplateSignature"/>

-    </columns>

-    <columns xsi:type="tableinstance:ReferenceColumn">

-      <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//TemplateableElement/templateBinding"/>

-    </columns>

-    <columns xsi:type="tableinstance:ReferenceColumn">

-      <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/feature"/>

-    </columns>

-    <columns xsi:type="tableinstance:ReferenceColumn">

-      <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/attribute"/>

-    </columns>

-    <columns xsi:type="tableinstance:ReferenceColumn">

-      <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/collaborationUse"/>

-    </columns>

-    <columns xsi:type="tableinstance:ReferenceColumn">

-      <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/general"/>

-    </columns>

-    <columns xsi:type="tableinstance:ReferenceColumn">

-      <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/generalization"/>

-    </columns>

-    <columns xsi:type="tableinstance:ReferenceColumn">

-      <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/powertypeExtent"/>

-    </columns>

-    <columns xsi:type="tableinstance:ReferenceColumn">

-      <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/inheritedMember"/>

-    </columns>

-    <columns xsi:type="tableinstance:AttributeColumn">

-      <attribute href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/isAbstract"/>

-    </columns>

-    <columns xsi:type="tableinstance:AttributeColumn">

-      <attribute href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/isFinalSpecialization"/>

-    </columns>

-    <columns xsi:type="tableinstance:ReferenceColumn">

-      <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/ownedUseCase"/>

-    </columns>

-    <columns xsi:type="tableinstance:ReferenceColumn">

-      <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/useCase"/>

-    </columns>

-    <columns xsi:type="tableinstance:ReferenceColumn">

-      <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/redefinedClassifier"/>

-    </columns>

-    <columns xsi:type="tableinstance:ReferenceColumn">

-      <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/representation"/>

-    </columns>

-    <columns xsi:type="tableinstance:ReferenceColumn">

-      <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/substitution"/>

-    </columns>

-    <columns xsi:type="tableinstance:ReferenceColumn">

-      <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//StructuredClassifier/ownedAttribute"/>

-    </columns>

-    <columns xsi:type="tableinstance:ReferenceColumn">

-      <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//StructuredClassifier/ownedConnector"/>

-    </columns>

-    <columns xsi:type="tableinstance:ReferenceColumn">

-      <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//StructuredClassifier/part"/>

-    </columns>

-    <columns xsi:type="tableinstance:ReferenceColumn">

-      <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//StructuredClassifier/role"/>

-    </columns>

-    <columns xsi:type="tableinstance:ReferenceColumn">

-      <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//EncapsulatedClassifier/ownedPort"/>

-    </columns>

-    <columns xsi:type="tableinstance:ReferenceColumn">

-      <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//BehavioredClassifier/classifierBehavior"/>

-    </columns>

-    <columns xsi:type="tableinstance:ReferenceColumn">

-      <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//BehavioredClassifier/interfaceRealization"/>

-    </columns>

-    <columns xsi:type="tableinstance:ReferenceColumn">

-      <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//BehavioredClassifier/ownedBehavior"/>

-    </columns>

-    <columns xsi:type="tableinstance:ReferenceColumn">

-      <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Class/ownedOperation"/>

-    </columns>

-    <columns xsi:type="tableinstance:ReferenceColumn">

-      <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Class/extension"/>

-    </columns>

-    <columns xsi:type="tableinstance:AttributeColumn">

-      <attribute href="http://www.eclipse.org/uml2/4.0.0/UML#//Class/isActive"/>

-    </columns>

-    <columns xsi:type="tableinstance:ReferenceColumn">

-      <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Class/nestedClassifier"/>

-    </columns>

-    <columns xsi:type="tableinstance:ReferenceColumn">

-      <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Class/ownedReception"/>

-    </columns>

-    <columns xsi:type="tableinstance:ReferenceColumn">

-      <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Class/superClass"/>

-    </columns>

-    <rows>

-      <element href="complex_multipage_model.uml#_CeRuEHqUEeK9jI2Tc6HWsA"/>

-    </rows>

-    <rows>

-      <element href="complex_multipage_model.uml#_CkYWEHqUEeK9jI2Tc6HWsA"/>

-    </rows>

-    <localCustomizations metamodelURI="http://www.eclipse.org/emf/2002/Ecore"/>

-    <localCustomizations metamodelURI="http://www.eclipse.org/uml2/4.0.0/UML"/>

-  </tableinstance2:TableInstance2>

-</xmi:XMI>

+<?xml version="1.0" encoding="ASCII"?>
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi" xmlns:org.eclipse.papyrus.infra.table.instance.papyrustableinstance="http://www.eclipse.org/Papyrus/Table/0.8.0/papyrustableinstance" xmlns:tableinstance="http://www.eclipse.org/EMF_Facet/ModelCellEditor/0.1.0/tableinstance" xmlns:tableinstance2="http://www.eclipse.org/EMF_Facet/Table/0.1.0/tableinstance2">
+  <di:SashWindowsMngr>
+    <pageList>
+      <availablePage>
+        <emfPageIdentifier href="complex_multipage_model.notation#_zyAt8XqTEeK9jI2Tc6HWsA"/>
+      </availablePage>
+      <availablePage>
+        <emfPageIdentifier href="complex_multipage_model.notation#_zyAt83qTEeK9jI2Tc6HWsA"/>
+      </availablePage>
+      <availablePage>
+        <emfPageIdentifier href="complex_multipage_model.notation#_1B5ogHqTEeK9jI2Tc6HWsA"/>
+      </availablePage>
+      <availablePage>
+        <emfPageIdentifier href="complex_multipage_model.notation#_1PIzQHqTEeK9jI2Tc6HWsA"/>
+      </availablePage>
+      <availablePage>
+        <emfPageIdentifier href="complex_multipage_model.notation#_1pLD4HqTEeK9jI2Tc6HWsA"/>
+      </availablePage>
+      <availablePage>
+        <emfPageIdentifier href="complex_multipage_model.notation#_12a1sHqTEeK9jI2Tc6HWsA"/>
+      </availablePage>
+      <availablePage>
+        <emfPageIdentifier href="complex_multipage_model.notation#_1_fSIHqTEeK9jI2Tc6HWsA"/>
+      </availablePage>
+      <availablePage>
+        <emfPageIdentifier href="complex_multipage_model.notation#_B_L-UHqUEeK9jI2Tc6HWsA"/>
+      </availablePage>
+      <availablePage emfPageIdentifier="/1"/>
+    </pageList>
+    <sashModel currentSelection="/0/@sashModel/@windows.0/@children.0/@children.0/@children.1">
+      <windows>
+        <children xsi:type="di:SashPanel" direction="256">
+          <children xsi:type="di:SashPanel" direction="512">
+            <children xsi:type="di:TabFolder">
+              <children>
+                <emfPageIdentifier href="complex_multipage_model.notation#_1B5ogHqTEeK9jI2Tc6HWsA"/>
+              </children>
+              <children>
+                <emfPageIdentifier href="complex_multipage_model.notation#_B_L-UHqUEeK9jI2Tc6HWsA"/>
+              </children>
+            </children>
+            <children xsi:type="di:TabFolder">
+              <children>
+                <emfPageIdentifier href="complex_multipage_model.notation#_1_fSIHqTEeK9jI2Tc6HWsA"/>
+              </children>
+              <children emfPageIdentifier="/1"/>
+              <children>
+                <emfPageIdentifier href="complex_multipage_model.notation#_zyAt8XqTEeK9jI2Tc6HWsA"/>
+              </children>
+            </children>
+          </children>
+          <children xsi:type="di:TabFolder">
+            <children>
+              <emfPageIdentifier href="complex_multipage_model.notation#_12a1sHqTEeK9jI2Tc6HWsA"/>
+            </children>
+          </children>
+        </children>
+      </windows>
+    </sashModel>
+  </di:SashWindowsMngr>
+  <org.eclipse.papyrus.infra.table.instance.papyrustableinstance:PapyrusTableInstance name="DefaultTable" table="/2"/>
+  <tableinstance2:TableInstance2 description="Table Description">
+    <tableConfiguration href="platform:/plugin/org.eclipse.papyrus.uml.table.default/resources/default.tableconfiguration2#/"/>
+    <customizations href="emffacet:/customization/UMLPapyrusDefaultBrowserCustomization#/"/>
+    <customizations href="#/2/@localCustomizations.1"/>
+    <customizations href="#/2/@localCustomizations.0"/>
+    <context href="complex_multipage_model.uml#_BYzTwHqUEeK9jI2Tc6HWsA"/>
+    <columns xsi:type="tableinstance:DefaultLabelColumn"/>
+    <columns xsi:type="tableinstance:MetaClassColumn"/>
+    <columns xsi:type="tableinstance:EContainerColumn"/>
+    <columns xsi:type="tableinstance:ReferenceColumn">
+      <reference href="http://www.eclipse.org/emf/2002/Ecore#//EModelElement/eAnnotations"/>
+    </columns>
+    <columns xsi:type="tableinstance:ReferenceColumn">
+      <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Element/ownedComment"/>
+    </columns>
+    <columns xsi:type="tableinstance:ReferenceColumn">
+      <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Element/ownedElement"/>
+    </columns>
+    <columns xsi:type="tableinstance:ReferenceColumn">
+      <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Element/owner"/>
+    </columns>
+    <columns xsi:type="tableinstance:ReferenceColumn">
+      <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/clientDependency"/>
+    </columns>
+    <columns xsi:type="tableinstance:AttributeColumn">
+      <attribute href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/name"/>
+    </columns>
+    <columns xsi:type="tableinstance:ReferenceColumn">
+      <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/nameExpression"/>
+    </columns>
+    <columns xsi:type="tableinstance:ReferenceColumn">
+      <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/namespace"/>
+    </columns>
+    <columns xsi:type="tableinstance:AttributeColumn">
+      <attribute href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/qualifiedName"/>
+    </columns>
+    <columns xsi:type="tableinstance:AttributeColumn">
+      <attribute href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/visibility"/>
+    </columns>
+    <columns xsi:type="tableinstance:ReferenceColumn">
+      <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Namespace/elementImport"/>
+    </columns>
+    <columns xsi:type="tableinstance:ReferenceColumn">
+      <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Namespace/packageImport"/>
+    </columns>
+    <columns xsi:type="tableinstance:ReferenceColumn">
+      <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Namespace/ownedRule"/>
+    </columns>
+    <columns xsi:type="tableinstance:ReferenceColumn">
+      <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Namespace/ownedMember"/>
+    </columns>
+    <columns xsi:type="tableinstance:ReferenceColumn">
+      <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Namespace/importedMember"/>
+    </columns>
+    <columns xsi:type="tableinstance:ReferenceColumn">
+      <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Namespace/member"/>
+    </columns>
+    <columns xsi:type="tableinstance:AttributeColumn">
+      <attribute href="http://www.eclipse.org/uml2/4.0.0/UML#//RedefinableElement/isLeaf"/>
+    </columns>
+    <columns xsi:type="tableinstance:ReferenceColumn">
+      <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//RedefinableElement/redefinedElement"/>
+    </columns>
+    <columns xsi:type="tableinstance:ReferenceColumn">
+      <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//RedefinableElement/redefinitionContext"/>
+    </columns>
+    <columns xsi:type="tableinstance:ReferenceColumn">
+      <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//ParameterableElement/owningTemplateParameter"/>
+    </columns>
+    <columns xsi:type="tableinstance:ReferenceColumn">
+      <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//ParameterableElement/templateParameter"/>
+    </columns>
+    <columns xsi:type="tableinstance:ReferenceColumn">
+      <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Type/package"/>
+    </columns>
+    <columns xsi:type="tableinstance:ReferenceColumn">
+      <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//TemplateableElement/ownedTemplateSignature"/>
+    </columns>
+    <columns xsi:type="tableinstance:ReferenceColumn">
+      <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//TemplateableElement/templateBinding"/>
+    </columns>
+    <columns xsi:type="tableinstance:ReferenceColumn">
+      <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/feature"/>
+    </columns>
+    <columns xsi:type="tableinstance:ReferenceColumn">
+      <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/attribute"/>
+    </columns>
+    <columns xsi:type="tableinstance:ReferenceColumn">
+      <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/collaborationUse"/>
+    </columns>
+    <columns xsi:type="tableinstance:ReferenceColumn">
+      <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/general"/>
+    </columns>
+    <columns xsi:type="tableinstance:ReferenceColumn">
+      <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/generalization"/>
+    </columns>
+    <columns xsi:type="tableinstance:ReferenceColumn">
+      <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/powertypeExtent"/>
+    </columns>
+    <columns xsi:type="tableinstance:ReferenceColumn">
+      <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/inheritedMember"/>
+    </columns>
+    <columns xsi:type="tableinstance:AttributeColumn">
+      <attribute href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/isAbstract"/>
+    </columns>
+    <columns xsi:type="tableinstance:AttributeColumn">
+      <attribute href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/isFinalSpecialization"/>
+    </columns>
+    <columns xsi:type="tableinstance:ReferenceColumn">
+      <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/ownedUseCase"/>
+    </columns>
+    <columns xsi:type="tableinstance:ReferenceColumn">
+      <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/useCase"/>
+    </columns>
+    <columns xsi:type="tableinstance:ReferenceColumn">
+      <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/redefinedClassifier"/>
+    </columns>
+    <columns xsi:type="tableinstance:ReferenceColumn">
+      <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/representation"/>
+    </columns>
+    <columns xsi:type="tableinstance:ReferenceColumn">
+      <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/substitution"/>
+    </columns>
+    <columns xsi:type="tableinstance:ReferenceColumn">
+      <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//StructuredClassifier/ownedAttribute"/>
+    </columns>
+    <columns xsi:type="tableinstance:ReferenceColumn">
+      <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//StructuredClassifier/ownedConnector"/>
+    </columns>
+    <columns xsi:type="tableinstance:ReferenceColumn">
+      <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//StructuredClassifier/part"/>
+    </columns>
+    <columns xsi:type="tableinstance:ReferenceColumn">
+      <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//StructuredClassifier/role"/>
+    </columns>
+    <columns xsi:type="tableinstance:ReferenceColumn">
+      <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//EncapsulatedClassifier/ownedPort"/>
+    </columns>
+    <columns xsi:type="tableinstance:ReferenceColumn">
+      <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//BehavioredClassifier/classifierBehavior"/>
+    </columns>
+    <columns xsi:type="tableinstance:ReferenceColumn">
+      <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//BehavioredClassifier/interfaceRealization"/>
+    </columns>
+    <columns xsi:type="tableinstance:ReferenceColumn">
+      <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//BehavioredClassifier/ownedBehavior"/>
+    </columns>
+    <columns xsi:type="tableinstance:ReferenceColumn">
+      <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Class/ownedOperation"/>
+    </columns>
+    <columns xsi:type="tableinstance:ReferenceColumn">
+      <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Class/extension"/>
+    </columns>
+    <columns xsi:type="tableinstance:AttributeColumn">
+      <attribute href="http://www.eclipse.org/uml2/4.0.0/UML#//Class/isActive"/>
+    </columns>
+    <columns xsi:type="tableinstance:ReferenceColumn">
+      <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Class/nestedClassifier"/>
+    </columns>
+    <columns xsi:type="tableinstance:ReferenceColumn">
+      <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Class/ownedReception"/>
+    </columns>
+    <columns xsi:type="tableinstance:ReferenceColumn">
+      <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Class/superClass"/>
+    </columns>
+    <rows>
+      <element href="complex_multipage_model.uml#_CeRuEHqUEeK9jI2Tc6HWsA"/>
+    </rows>
+    <rows>
+      <element href="complex_multipage_model.uml#_CkYWEHqUEeK9jI2Tc6HWsA"/>
+    </rows>
+    <localCustomizations metamodelURI="http://www.eclipse.org/emf/2002/Ecore"/>
+    <localCustomizations metamodelURI="http://www.eclipse.org/uml2/4.0.0/UML"/>
+  </tableinstance2:TableInstance2>
+</xmi:XMI>
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/basic/complex_multipage_model.notation b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/basic/complex_multipage_model.notation
index 8a856b7d0aa..226c64a89fd 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/basic/complex_multipage_model.notation
+++ b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/basic/complex_multipage_model.notation
@@ -1,578 +1,578 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML">

-  <notation:Diagram xmi:id="_zyAt8XqTEeK9jI2Tc6HWsA" type="PapyrusUMLClassDiagram" name="NewDiagram" measurementUnit="Pixel">

-    <children xmi:type="notation:Shape" xmi:id="_D1nUcHqUEeK9jI2Tc6HWsA" type="2012">

-      <children xmi:type="notation:DecorationNode" xmi:id="_D1nUcnqUEeK9jI2Tc6HWsA" type="5038"/>

-      <element xmi:type="uml:Comment" href="complex_multipage_model.uml#_D1TycHqUEeK9jI2Tc6HWsA"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_D1nUcXqUEeK9jI2Tc6HWsA" x="60" y="65" width="291" height="131"/>

-    </children>

-    <styles xmi:type="notation:DiagramStyle" xmi:id="_zyAt8nqTEeK9jI2Tc6HWsA"/>

-    <element xmi:type="uml:Model" href="complex_multipage_model.uml#_zyAt8HqTEeK9jI2Tc6HWsA"/>

-  </notation:Diagram>

-  <notation:Diagram xmi:id="_zyAt83qTEeK9jI2Tc6HWsA" type="PapyrusUMLTimingDiagram" name="NewDiagram" measurementUnit="Pixel">

-    <styles xmi:type="notation:DiagramStyle" xmi:id="_zyAt9HqTEeK9jI2Tc6HWsA"/>

-    <element xmi:type="uml:Model" href="complex_multipage_model.uml#_zyAt8HqTEeK9jI2Tc6HWsA"/>

-  </notation:Diagram>

-  <notation:Diagram xmi:id="_1B5ogHqTEeK9jI2Tc6HWsA" type="PapyrusUMLClassDiagram" name="ClassDiagram" measurementUnit="Pixel">

-    <children xmi:type="notation:Shape" xmi:id="__d6UYHqTEeK9jI2Tc6HWsA" type="2008">

-      <children xmi:type="notation:DecorationNode" xmi:id="__eEFYHqTEeK9jI2Tc6HWsA" type="5029"/>

-      <children xmi:type="notation:BasicCompartment" xmi:id="__eEFYXqTEeK9jI2Tc6HWsA" type="7017">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="__eEFcHqTEeK9jI2Tc6HWsA" source="PapyrusCSSForceValue">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="__eEFcXqTEeK9jI2Tc6HWsA" key="showTitle" value="true"/>

-        </eAnnotations>

-        <styles xmi:type="notation:TitleStyle" xmi:id="__eEFYnqTEeK9jI2Tc6HWsA"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="__eEFY3qTEeK9jI2Tc6HWsA"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="__eEFZHqTEeK9jI2Tc6HWsA"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="__eEFZXqTEeK9jI2Tc6HWsA"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="__eEFZnqTEeK9jI2Tc6HWsA" type="7018">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="__eEFcnqTEeK9jI2Tc6HWsA" source="PapyrusCSSForceValue">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="__eEFc3qTEeK9jI2Tc6HWsA" key="showTitle" value="true"/>

-        </eAnnotations>

-        <styles xmi:type="notation:TitleStyle" xmi:id="__eEFZ3qTEeK9jI2Tc6HWsA"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="__eEFaHqTEeK9jI2Tc6HWsA"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="__eEFaXqTEeK9jI2Tc6HWsA"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="__eEFanqTEeK9jI2Tc6HWsA"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="__eEFa3qTEeK9jI2Tc6HWsA" type="7019">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="__eEFdHqTEeK9jI2Tc6HWsA" source="PapyrusCSSForceValue">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="__eEFdXqTEeK9jI2Tc6HWsA" key="showTitle" value="true"/>

-        </eAnnotations>

-        <styles xmi:type="notation:TitleStyle" xmi:id="__eEFbHqTEeK9jI2Tc6HWsA"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="__eEFbXqTEeK9jI2Tc6HWsA"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="__eEFbnqTEeK9jI2Tc6HWsA"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="__eEFb3qTEeK9jI2Tc6HWsA"/>

-      </children>

-      <element xmi:type="uml:Class" href="complex_multipage_model.uml#__dxKcHqTEeK9jI2Tc6HWsA"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="__d6UYXqTEeK9jI2Tc6HWsA" x="70" y="74"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="__pOMgHqTEeK9jI2Tc6HWsA" type="2008">

-      <children xmi:type="notation:DecorationNode" xmi:id="__pOMgnqTEeK9jI2Tc6HWsA" type="5029"/>

-      <children xmi:type="notation:BasicCompartment" xmi:id="__pOMg3qTEeK9jI2Tc6HWsA" type="7017">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="__pX9gHqTEeK9jI2Tc6HWsA" source="PapyrusCSSForceValue">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="__pX9gXqTEeK9jI2Tc6HWsA" key="showTitle" value="true"/>

-        </eAnnotations>

-        <styles xmi:type="notation:TitleStyle" xmi:id="__pOMhHqTEeK9jI2Tc6HWsA"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="__pOMhXqTEeK9jI2Tc6HWsA"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="__pOMhnqTEeK9jI2Tc6HWsA"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="__pOMh3qTEeK9jI2Tc6HWsA"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="__pOMiHqTEeK9jI2Tc6HWsA" type="7018">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="__pX9gnqTEeK9jI2Tc6HWsA" source="PapyrusCSSForceValue">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="__pX9g3qTEeK9jI2Tc6HWsA" key="showTitle" value="true"/>

-        </eAnnotations>

-        <styles xmi:type="notation:TitleStyle" xmi:id="__pOMiXqTEeK9jI2Tc6HWsA"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="__pOMinqTEeK9jI2Tc6HWsA"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="__pOMi3qTEeK9jI2Tc6HWsA"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="__pOMjHqTEeK9jI2Tc6HWsA"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="__pOMjXqTEeK9jI2Tc6HWsA" type="7019">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="__pX9hHqTEeK9jI2Tc6HWsA" source="PapyrusCSSForceValue">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="__pX9hXqTEeK9jI2Tc6HWsA" key="showTitle" value="true"/>

-        </eAnnotations>

-        <styles xmi:type="notation:TitleStyle" xmi:id="__pOMjnqTEeK9jI2Tc6HWsA"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="__pOMj3qTEeK9jI2Tc6HWsA"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="__pOMkHqTEeK9jI2Tc6HWsA"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="__pOMkXqTEeK9jI2Tc6HWsA"/>

-      </children>

-      <element xmi:type="uml:Class" href="complex_multipage_model.uml#__o7RkHqTEeK9jI2Tc6HWsA"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="__pOMgXqTEeK9jI2Tc6HWsA" x="445" y="74"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_BZP_sHqUEeK9jI2Tc6HWsA" type="2007">

-      <children xmi:type="notation:DecorationNode" xmi:id="_BZP_snqUEeK9jI2Tc6HWsA" type="5026"/>

-      <children xmi:type="notation:DecorationNode" xmi:id="_BZP_s3qUEeK9jI2Tc6HWsA" type="7016">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_BZ11kHqUEeK9jI2Tc6HWsA" source="PapyrusCSSForceValue">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_BZ11kXqUEeK9jI2Tc6HWsA" key="showTitle" value="true"/>

-        </eAnnotations>

-        <styles xmi:type="notation:TitleStyle" xmi:id="_BZP_tHqUEeK9jI2Tc6HWsA"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BZP_tXqUEeK9jI2Tc6HWsA"/>

-      </children>

-      <element xmi:type="uml:Package" href="complex_multipage_model.uml#_BYzTwHqUEeK9jI2Tc6HWsA"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BZP_sXqUEeK9jI2Tc6HWsA" x="215" y="215" width="246" height="126"/>

-    </children>

-    <styles xmi:type="notation:DiagramStyle" xmi:id="_1B5ogXqTEeK9jI2Tc6HWsA"/>

-    <element xmi:type="uml:Model" href="complex_multipage_model.uml#_zyAt8HqTEeK9jI2Tc6HWsA"/>

-    <edges xmi:type="notation:Connector" xmi:id="__8HTUHqTEeK9jI2Tc6HWsA" type="4001" source="__d6UYHqTEeK9jI2Tc6HWsA" target="__pOMgHqTEeK9jI2Tc6HWsA">

-      <children xmi:type="notation:DecorationNode" xmi:id="__8REUHqTEeK9jI2Tc6HWsA" type="6001">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="__8REUXqTEeK9jI2Tc6HWsA" y="-20"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="__8REUnqTEeK9jI2Tc6HWsA" type="6002">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="__8REU3qTEeK9jI2Tc6HWsA" y="20"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="__8REVHqTEeK9jI2Tc6HWsA" type="6003">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="__8REVXqTEeK9jI2Tc6HWsA" y="-20"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="__8REVnqTEeK9jI2Tc6HWsA" type="6005">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="__8REV3qTEeK9jI2Tc6HWsA" y="20"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="__8REWHqTEeK9jI2Tc6HWsA" type="6033">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="__8REWXqTEeK9jI2Tc6HWsA" y="20"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="__8REWnqTEeK9jI2Tc6HWsA" type="6034">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="__8REW3qTEeK9jI2Tc6HWsA" y="-20"/>

-      </children>

-      <styles xmi:type="notation:FontStyle" xmi:id="__8HTUXqTEeK9jI2Tc6HWsA"/>

-      <element xmi:type="uml:Association" href="complex_multipage_model.uml#__70YYHqTEeK9jI2Tc6HWsA"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="__8HTUnqTEeK9jI2Tc6HWsA" points="[50, 1, -325, 1]$[325, 46, -50, 46]"/>

-    </edges>

-  </notation:Diagram>

-  <notation:Diagram xmi:id="_1PIzQHqTEeK9jI2Tc6HWsA" type="PapyrusUMLClassDiagram" name="ClassDiagram" measurementUnit="Pixel">

-    <styles xmi:type="notation:DiagramStyle" xmi:id="_1PIzQXqTEeK9jI2Tc6HWsA"/>

-    <element xmi:type="uml:Model" href="complex_multipage_model.uml#_zyAt8HqTEeK9jI2Tc6HWsA"/>

-  </notation:Diagram>

-  <notation:Diagram xmi:id="_1pLD4HqTEeK9jI2Tc6HWsA" type="PapyrusUMLTimingDiagram" name="TimingDiagram" measurementUnit="Pixel">

-    <styles xmi:type="notation:DiagramStyle" xmi:id="_1pLD4XqTEeK9jI2Tc6HWsA"/>

-    <element xmi:type="uml:Model" href="complex_multipage_model.uml#_zyAt8HqTEeK9jI2Tc6HWsA"/>

-  </notation:Diagram>

-  <notation:Diagram xmi:id="_12a1sHqTEeK9jI2Tc6HWsA" type="PapyrusUMLTimingDiagram" name="TimingDiagram" measurementUnit="Pixel">

-    <children xmi:type="notation:Shape" xmi:id="_My-4EHqUEeK9jI2Tc6HWsA" type="2">

-      <children xmi:type="notation:DecorationNode" xmi:id="_My-4EnqUEeK9jI2Tc6HWsA" type="37"/>

-      <children xmi:type="notation:DecorationNode" xmi:id="_My-4E3qUEeK9jI2Tc6HWsA" type="5">

-        <children xmi:type="notation:Shape" xmi:id="_OjB5YHqUEeK9jI2Tc6HWsA" type="19">

-          <children xmi:type="notation:DecorationNode" xmi:id="_OjB5YnqUEeK9jI2Tc6HWsA" type="21"/>

-          <children xmi:type="notation:DecorationNode" xmi:id="_OjB5Y3qUEeK9jI2Tc6HWsA" type="7">

-            <children xmi:type="notation:Shape" xmi:id="_R3OOAHqUEeK9jI2Tc6HWsA" type="9">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_R5v9kXqUEeK9jI2Tc6HWsA" source="org.eclipse.papyrus.uml.diagram.timing.StateDefinitionView">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_R5v9knqUEeK9jI2Tc6HWsA" key="org.eclipse.papyrus.uml.diagram.timing.StateDefinitionViewID" value="_R5v9kHqUEeK9jI2Tc6HWsA"/>

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_R6C4gHqUEeK9jI2Tc6HWsA" key="org.eclipse.papyrus.uml.diagram.timing.StateDefinitionViewName" value="State 1"/>

-              </eAnnotations>

-              <children xmi:type="notation:DecorationNode" xmi:id="_R3OOAnqUEeK9jI2Tc6HWsA" type="38">

-                <styles xmi:type="notation:DescriptionStyle" xmi:id="_R3XX8HqUEeK9jI2Tc6HWsA"/>

-              </children>

-              <element xsi:nil="true"/>

-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_R3OOAXqUEeK9jI2Tc6HWsA"/>

-            </children>

-            <children xmi:type="notation:Shape" xmi:id="_SOvWIHqUEeK9jI2Tc6HWsA" type="9">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_SO4gEXqUEeK9jI2Tc6HWsA" source="org.eclipse.papyrus.uml.diagram.timing.StateDefinitionView">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_SO4gEnqUEeK9jI2Tc6HWsA" key="org.eclipse.papyrus.uml.diagram.timing.StateDefinitionViewID" value="_SO4gEHqUEeK9jI2Tc6HWsA"/>

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_SPCREHqUEeK9jI2Tc6HWsA" key="org.eclipse.papyrus.uml.diagram.timing.StateDefinitionViewName" value="State 2"/>

-              </eAnnotations>

-              <children xmi:type="notation:DecorationNode" xmi:id="_SOvWInqUEeK9jI2Tc6HWsA" type="38">

-                <styles xmi:type="notation:DescriptionStyle" xmi:id="_SOvWI3qUEeK9jI2Tc6HWsA"/>

-              </children>

-              <element xsi:nil="true"/>

-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SOvWIXqUEeK9jI2Tc6HWsA"/>

-            </children>

-            <styles xmi:type="notation:SortingStyle" xmi:id="_OjB5ZHqUEeK9jI2Tc6HWsA"/>

-            <styles xmi:type="notation:FilteringStyle" xmi:id="_OjB5ZXqUEeK9jI2Tc6HWsA"/>

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_OjB5ZnqUEeK9jI2Tc6HWsA"/>

-          </children>

-          <children xmi:type="notation:DecorationNode" xmi:id="_OjB5Z3qUEeK9jI2Tc6HWsA" type="8">

-            <children xmi:type="notation:Shape" xmi:id="_R6fkcHqUEeK9jI2Tc6HWsA" type="11">

-              <children xmi:type="notation:DecorationNode" xmi:id="_R6fkcnqUEeK9jI2Tc6HWsA" type="62">

-                <layoutConstraint xmi:type="notation:Location" xmi:id="_R6fkc3qUEeK9jI2Tc6HWsA" y="5"/>

-              </children>

-              <element xmi:type="uml:StateInvariant" href="complex_multipage_model.uml#_R6C4gXqUEeK9jI2Tc6HWsA"/>

-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_R6fkcXqUEeK9jI2Tc6HWsA"/>

-            </children>

-            <children xmi:type="notation:Shape" xmi:id="_TEAKMHqUEeK9jI2Tc6HWsA" type="12">

-              <children xmi:type="notation:DecorationNode" xmi:id="_TEAKNHqUEeK9jI2Tc6HWsA" type="10">

-                <layoutConstraint xmi:type="notation:Location" xmi:id="_TEAKNXqUEeK9jI2Tc6HWsA" y="18"/>

-              </children>

-              <children xmi:type="notation:DecorationNode" xmi:id="_TEAKNnqUEeK9jI2Tc6HWsA" type="58">

-                <layoutConstraint xmi:type="notation:Location" xmi:id="_TEAKN3qUEeK9jI2Tc6HWsA" y="5"/>

-              </children>

-              <styles xmi:type="notation:DescriptionStyle" xmi:id="_TEAKMXqUEeK9jI2Tc6HWsA"/>

-              <styles xmi:type="notation:FontStyle" xmi:id="_TEAKMnqUEeK9jI2Tc6HWsA"/>

-              <element xmi:type="uml:OccurrenceSpecification" href="complex_multipage_model.uml#_TDtPQHqUEeK9jI2Tc6HWsA"/>

-              <layoutConstraint xmi:type="notation:Location" xmi:id="_TaxrcHqUEeK9jI2Tc6HWsA" x="114" y="71"/>

-            </children>

-            <children xmi:type="notation:Shape" xmi:id="_TEAKOXqUEeK9jI2Tc6HWsA" type="39">

-              <element xsi:nil="true"/>

-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TEAKOnqUEeK9jI2Tc6HWsA"/>

-            </children>

-            <children xmi:type="notation:Shape" xmi:id="_TEmnIHqUEeK9jI2Tc6HWsA" type="11">

-              <children xmi:type="notation:DecorationNode" xmi:id="_TEmnInqUEeK9jI2Tc6HWsA" type="62">

-                <layoutConstraint xmi:type="notation:Location" xmi:id="_TEmnI3qUEeK9jI2Tc6HWsA" y="5"/>

-              </children>

-              <element xmi:type="uml:StateInvariant" href="complex_multipage_model.uml#_TEAKO3qUEeK9jI2Tc6HWsA"/>

-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TEmnIXqUEeK9jI2Tc6HWsA"/>

-            </children>

-            <children xmi:type="notation:Shape" xmi:id="_UCqK0HqUEeK9jI2Tc6HWsA" type="12">

-              <children xmi:type="notation:DecorationNode" xmi:id="_UCqK1HqUEeK9jI2Tc6HWsA" type="10">

-                <layoutConstraint xmi:type="notation:Location" xmi:id="_UCqK1XqUEeK9jI2Tc6HWsA" y="18"/>

-              </children>

-              <children xmi:type="notation:DecorationNode" xmi:id="_UCqK1nqUEeK9jI2Tc6HWsA" type="58">

-                <layoutConstraint xmi:type="notation:Location" xmi:id="_UCqK13qUEeK9jI2Tc6HWsA" y="5"/>

-              </children>

-              <styles xmi:type="notation:DescriptionStyle" xmi:id="_UCqK0XqUEeK9jI2Tc6HWsA"/>

-              <styles xmi:type="notation:FontStyle" xmi:id="_UCqK0nqUEeK9jI2Tc6HWsA"/>

-              <element xmi:type="uml:OccurrenceSpecification" href="complex_multipage_model.uml#_UCXP4HqUEeK9jI2Tc6HWsA"/>

-              <layoutConstraint xmi:type="notation:Location" xmi:id="_UCqK2HqUEeK9jI2Tc6HWsA" x="334" y="140"/>

-            </children>

-            <children xmi:type="notation:Shape" xmi:id="_UCqK2XqUEeK9jI2Tc6HWsA" type="39">

-              <element xsi:nil="true"/>

-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UCqK2nqUEeK9jI2Tc6HWsA"/>

-            </children>

-            <children xmi:type="notation:Shape" xmi:id="_UDQAsHqUEeK9jI2Tc6HWsA" type="11">

-              <children xmi:type="notation:DecorationNode" xmi:id="_UDQAsnqUEeK9jI2Tc6HWsA" type="62">

-                <layoutConstraint xmi:type="notation:Location" xmi:id="_UDQAs3qUEeK9jI2Tc6HWsA" y="5"/>

-              </children>

-              <element xmi:type="uml:StateInvariant" href="complex_multipage_model.uml#_UCqK23qUEeK9jI2Tc6HWsA"/>

-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UDQAsXqUEeK9jI2Tc6HWsA"/>

-            </children>

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_OjB5aHqUEeK9jI2Tc6HWsA"/>

-          </children>

-          <children xmi:type="notation:DecorationNode" xmi:id="_OjB5aXqUEeK9jI2Tc6HWsA" visible="false" type="82">

-            <children xmi:type="notation:Shape" xmi:id="_OqUNIHqUEeK9jI2Tc6HWsA" type="24">

-              <children xmi:type="notation:DecorationNode" xmi:id="_OqUNInqUEeK9jI2Tc6HWsA" type="80">

-                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_OqUNI3qUEeK9jI2Tc6HWsA"/>

-              </children>

-              <element xsi:nil="true"/>

-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_OqUNIXqUEeK9jI2Tc6HWsA"/>

-            </children>

-            <styles xmi:type="notation:SortingStyle" xmi:id="_OjB5anqUEeK9jI2Tc6HWsA"/>

-            <styles xmi:type="notation:FilteringStyle" xmi:id="_OjB5a3qUEeK9jI2Tc6HWsA"/>

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_OjB5bHqUEeK9jI2Tc6HWsA"/>

-          </children>

-          <element xmi:type="uml:Lifeline" href="complex_multipage_model.uml#_Of5s4HqUEeK9jI2Tc6HWsA"/>

-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_OjB5YXqUEeK9jI2Tc6HWsA"/>

-        </children>

-        <children xmi:type="notation:Shape" xmi:id="_PNl5UHqUEeK9jI2Tc6HWsA" type="20">

-          <children xmi:type="notation:DecorationNode" xmi:id="_PNl5UnqUEeK9jI2Tc6HWsA" type="22"/>

-          <children xmi:type="notation:DecorationNode" xmi:id="_PNl5U3qUEeK9jI2Tc6HWsA" type="23">

-            <children xmi:type="notation:Shape" xmi:id="_PSfncHqUEeK9jI2Tc6HWsA" type="28">

-              <children xmi:type="notation:DecorationNode" xmi:id="_PSfncnqUEeK9jI2Tc6HWsA" type="31"/>

-              <children xmi:type="notation:DecorationNode" xmi:id="_PSfnc3qUEeK9jI2Tc6HWsA" type="64">

-                <layoutConstraint xmi:type="notation:Location" xmi:id="_PSfndHqUEeK9jI2Tc6HWsA" y="5"/>

-              </children>

-              <element xmi:type="uml:StateInvariant" href="complex_multipage_model.uml#_PSMsgHqUEeK9jI2Tc6HWsA"/>

-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PSfncXqUEeK9jI2Tc6HWsA"/>

-            </children>

-            <children xmi:type="notation:Shape" xmi:id="_Ugum4HqUEeK9jI2Tc6HWsA" type="12">

-              <children xmi:type="notation:DecorationNode" xmi:id="_Ugum5HqUEeK9jI2Tc6HWsA" type="10">

-                <layoutConstraint xmi:type="notation:Location" xmi:id="_Ugum5XqUEeK9jI2Tc6HWsA" y="18"/>

-              </children>

-              <children xmi:type="notation:DecorationNode" xmi:id="_Ugum5nqUEeK9jI2Tc6HWsA" type="58">

-                <layoutConstraint xmi:type="notation:Location" xmi:id="_Ugum53qUEeK9jI2Tc6HWsA" y="5"/>

-              </children>

-              <styles xmi:type="notation:DescriptionStyle" xmi:id="_Ugum4XqUEeK9jI2Tc6HWsA"/>

-              <styles xmi:type="notation:FontStyle" xmi:id="_Ugum4nqUEeK9jI2Tc6HWsA"/>

-              <element xmi:type="uml:OccurrenceSpecification" href="complex_multipage_model.uml#_Uglc8HqUEeK9jI2Tc6HWsA"/>

-              <layoutConstraint xmi:type="notation:Location" xmi:id="_Ugum6HqUEeK9jI2Tc6HWsA" x="181" y="52"/>

-            </children>

-            <children xmi:type="notation:Shape" xmi:id="_UhBh0HqUEeK9jI2Tc6HWsA" type="28">

-              <children xmi:type="notation:DecorationNode" xmi:id="_UhBh0nqUEeK9jI2Tc6HWsA" type="31"/>

-              <children xmi:type="notation:DecorationNode" xmi:id="_UhBh03qUEeK9jI2Tc6HWsA" type="64">

-                <layoutConstraint xmi:type="notation:Location" xmi:id="_UhBh1HqUEeK9jI2Tc6HWsA" y="5"/>

-              </children>

-              <element xmi:type="uml:StateInvariant" href="complex_multipage_model.uml#_Ugum6XqUEeK9jI2Tc6HWsA"/>

-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UhBh0XqUEeK9jI2Tc6HWsA"/>

-            </children>

-            <children xmi:type="notation:Shape" xmi:id="_Z0BFcHqUEeK9jI2Tc6HWsA" type="12">

-              <children xmi:type="notation:DecorationNode" xmi:id="_Z0BFdHqUEeK9jI2Tc6HWsA" type="10">

-                <layoutConstraint xmi:type="notation:Location" xmi:id="_Z0BFdXqUEeK9jI2Tc6HWsA" y="18"/>

-              </children>

-              <children xmi:type="notation:DecorationNode" xmi:id="_Z0BFdnqUEeK9jI2Tc6HWsA" type="58">

-                <layoutConstraint xmi:type="notation:Location" xmi:id="_Z0BFd3qUEeK9jI2Tc6HWsA" y="5"/>

-              </children>

-              <styles xmi:type="notation:DescriptionStyle" xmi:id="_Z0BFcXqUEeK9jI2Tc6HWsA"/>

-              <styles xmi:type="notation:FontStyle" xmi:id="_Z0BFcnqUEeK9jI2Tc6HWsA"/>

-              <element xmi:type="uml:OccurrenceSpecification" href="complex_multipage_model.uml#_Zz37gHqUEeK9jI2Tc6HWsA"/>

-              <layoutConstraint xmi:type="notation:Location" xmi:id="_Z0BFeHqUEeK9jI2Tc6HWsA" x="294" y="46"/>

-            </children>

-            <children xmi:type="notation:Shape" xmi:id="_Z0UncHqUEeK9jI2Tc6HWsA" type="28">

-              <children xmi:type="notation:DecorationNode" xmi:id="_Z0UncnqUEeK9jI2Tc6HWsA" type="31"/>

-              <children xmi:type="notation:DecorationNode" xmi:id="_Z0Unc3qUEeK9jI2Tc6HWsA" type="64">

-                <layoutConstraint xmi:type="notation:Location" xmi:id="_Z0UndHqUEeK9jI2Tc6HWsA" y="5"/>

-              </children>

-              <element xmi:type="uml:StateInvariant" href="complex_multipage_model.uml#_Z0BFeXqUEeK9jI2Tc6HWsA"/>

-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Z0UncXqUEeK9jI2Tc6HWsA"/>

-            </children>

-            <children xmi:type="notation:Shape" xmi:id="_UuIJsHqUEeK9jI2Tc6HWsA" type="12">

-              <children xmi:type="notation:DecorationNode" xmi:id="_UuIJtHqUEeK9jI2Tc6HWsA" type="10">

-                <layoutConstraint xmi:type="notation:Location" xmi:id="_UuIJtXqUEeK9jI2Tc6HWsA" y="18"/>

-              </children>

-              <children xmi:type="notation:DecorationNode" xmi:id="_UuIJtnqUEeK9jI2Tc6HWsA" type="58">

-                <layoutConstraint xmi:type="notation:Location" xmi:id="_UuIJt3qUEeK9jI2Tc6HWsA" y="5"/>

-              </children>

-              <styles xmi:type="notation:DescriptionStyle" xmi:id="_UuIJsXqUEeK9jI2Tc6HWsA"/>

-              <styles xmi:type="notation:FontStyle" xmi:id="_UuIJsnqUEeK9jI2Tc6HWsA"/>

-              <element xmi:type="uml:OccurrenceSpecification" href="complex_multipage_model.uml#_Ut-_wHqUEeK9jI2Tc6HWsA"/>

-              <layoutConstraint xmi:type="notation:Location" xmi:id="_UuIJuHqUEeK9jI2Tc6HWsA" x="388" y="45"/>

-            </children>

-            <children xmi:type="notation:Shape" xmi:id="_UubEoHqUEeK9jI2Tc6HWsA" type="28">

-              <children xmi:type="notation:DecorationNode" xmi:id="_UubEonqUEeK9jI2Tc6HWsA" type="31"/>

-              <children xmi:type="notation:DecorationNode" xmi:id="_UubEo3qUEeK9jI2Tc6HWsA" type="64">

-                <layoutConstraint xmi:type="notation:Location" xmi:id="_UubEpHqUEeK9jI2Tc6HWsA" y="5"/>

-              </children>

-              <element xmi:type="uml:StateInvariant" href="complex_multipage_model.uml#_UuIJuXqUEeK9jI2Tc6HWsA"/>

-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UubEoXqUEeK9jI2Tc6HWsA"/>

-            </children>

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PNl5VHqUEeK9jI2Tc6HWsA"/>

-          </children>

-          <children xmi:type="notation:DecorationNode" xmi:id="_PNl5VXqUEeK9jI2Tc6HWsA" visible="false" type="83">

-            <children xmi:type="notation:Shape" xmi:id="_PXs3kHqUEeK9jI2Tc6HWsA" type="24">

-              <children xmi:type="notation:DecorationNode" xmi:id="_PXs3knqUEeK9jI2Tc6HWsA" type="80">

-                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PXs3k3qUEeK9jI2Tc6HWsA"/>

-              </children>

-              <element xsi:nil="true"/>

-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PXs3kXqUEeK9jI2Tc6HWsA"/>

-            </children>

-            <styles xmi:type="notation:SortingStyle" xmi:id="_PNl5VnqUEeK9jI2Tc6HWsA"/>

-            <styles xmi:type="notation:FilteringStyle" xmi:id="_PNl5V3qUEeK9jI2Tc6HWsA"/>

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PNl5WHqUEeK9jI2Tc6HWsA"/>

-          </children>

-          <element xmi:type="uml:Lifeline" href="complex_multipage_model.uml#_PM_cYHqUEeK9jI2Tc6HWsA"/>

-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PNl5UXqUEeK9jI2Tc6HWsA"/>

-        </children>

-        <children xmi:type="notation:Shape" xmi:id="_WUWgoHqUEeK9jI2Tc6HWsA" type="19">

-          <children xmi:type="notation:DecorationNode" xmi:id="_WUWgonqUEeK9jI2Tc6HWsA" type="21"/>

-          <children xmi:type="notation:DecorationNode" xmi:id="_WUWgo3qUEeK9jI2Tc6HWsA" type="7">

-            <children xmi:type="notation:Shape" xmi:id="_WtNFgHqUEeK9jI2Tc6HWsA" type="9">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_WtWPcXqUEeK9jI2Tc6HWsA" source="org.eclipse.papyrus.uml.diagram.timing.StateDefinitionView">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_WtWPcnqUEeK9jI2Tc6HWsA" key="org.eclipse.papyrus.uml.diagram.timing.StateDefinitionViewID" value="_WtWPcHqUEeK9jI2Tc6HWsA"/>

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_WtpxcHqUEeK9jI2Tc6HWsA" key="org.eclipse.papyrus.uml.diagram.timing.StateDefinitionViewName" value="State 1"/>

-              </eAnnotations>

-              <children xmi:type="notation:DecorationNode" xmi:id="_WtNFgnqUEeK9jI2Tc6HWsA" type="38">

-                <styles xmi:type="notation:DescriptionStyle" xmi:id="_WtNFg3qUEeK9jI2Tc6HWsA"/>

-              </children>

-              <element xsi:nil="true"/>

-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_WtNFgXqUEeK9jI2Tc6HWsA"/>

-            </children>

-            <children xmi:type="notation:Shape" xmi:id="_W1GdQHqUEeK9jI2Tc6HWsA" type="9">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_W1PnMXqUEeK9jI2Tc6HWsA" source="org.eclipse.papyrus.uml.diagram.timing.StateDefinitionView">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_W1PnMnqUEeK9jI2Tc6HWsA" key="org.eclipse.papyrus.uml.diagram.timing.StateDefinitionViewID" value="_W1PnMHqUEeK9jI2Tc6HWsA"/>

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_W1ZYMHqUEeK9jI2Tc6HWsA" key="org.eclipse.papyrus.uml.diagram.timing.StateDefinitionViewName" value="State 2"/>

-              </eAnnotations>

-              <children xmi:type="notation:DecorationNode" xmi:id="_W1GdQnqUEeK9jI2Tc6HWsA" type="38">

-                <styles xmi:type="notation:DescriptionStyle" xmi:id="_W1GdQ3qUEeK9jI2Tc6HWsA"/>

-              </children>

-              <element xsi:nil="true"/>

-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_W1GdQXqUEeK9jI2Tc6HWsA"/>

-            </children>

-            <children xmi:type="notation:Shape" xmi:id="_YUVbYHqUEeK9jI2Tc6HWsA" type="9">

-              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_YUelUXqUEeK9jI2Tc6HWsA" source="org.eclipse.papyrus.uml.diagram.timing.StateDefinitionView">

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_YUelUnqUEeK9jI2Tc6HWsA" key="org.eclipse.papyrus.uml.diagram.timing.StateDefinitionViewID" value="_YUelUHqUEeK9jI2Tc6HWsA"/>

-                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_YUoWUHqUEeK9jI2Tc6HWsA" key="org.eclipse.papyrus.uml.diagram.timing.StateDefinitionViewName" value="State 3"/>

-              </eAnnotations>

-              <children xmi:type="notation:DecorationNode" xmi:id="_YUVbYnqUEeK9jI2Tc6HWsA" type="38">

-                <styles xmi:type="notation:DescriptionStyle" xmi:id="_YUVbY3qUEeK9jI2Tc6HWsA"/>

-              </children>

-              <element xsi:nil="true"/>

-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_YUVbYXqUEeK9jI2Tc6HWsA"/>

-            </children>

-            <styles xmi:type="notation:SortingStyle" xmi:id="_WUWgpHqUEeK9jI2Tc6HWsA"/>

-            <styles xmi:type="notation:FilteringStyle" xmi:id="_WUWgpXqUEeK9jI2Tc6HWsA"/>

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_WUWgpnqUEeK9jI2Tc6HWsA"/>

-          </children>

-          <children xmi:type="notation:DecorationNode" xmi:id="_WUWgp3qUEeK9jI2Tc6HWsA" type="8">

-            <children xmi:type="notation:Shape" xmi:id="_WuF2UHqUEeK9jI2Tc6HWsA" type="11">

-              <children xmi:type="notation:DecorationNode" xmi:id="_WuF2UnqUEeK9jI2Tc6HWsA" type="62">

-                <layoutConstraint xmi:type="notation:Location" xmi:id="_WuF2U3qUEeK9jI2Tc6HWsA" y="5"/>

-              </children>

-              <element xmi:type="uml:StateInvariant" href="complex_multipage_model.uml#_WtpxcXqUEeK9jI2Tc6HWsA"/>

-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_WuF2UXqUEeK9jI2Tc6HWsA"/>

-            </children>

-            <children xmi:type="notation:Shape" xmi:id="_Xj9uYHqUEeK9jI2Tc6HWsA" type="12">

-              <children xmi:type="notation:DecorationNode" xmi:id="_Xj9uZHqUEeK9jI2Tc6HWsA" type="10">

-                <layoutConstraint xmi:type="notation:Location" xmi:id="_Xj9uZXqUEeK9jI2Tc6HWsA" y="18"/>

-              </children>

-              <children xmi:type="notation:DecorationNode" xmi:id="_Xj9uZnqUEeK9jI2Tc6HWsA" type="58">

-                <layoutConstraint xmi:type="notation:Location" xmi:id="_Xj9uZ3qUEeK9jI2Tc6HWsA" y="5"/>

-              </children>

-              <styles xmi:type="notation:DescriptionStyle" xmi:id="_Xj9uYXqUEeK9jI2Tc6HWsA"/>

-              <styles xmi:type="notation:FontStyle" xmi:id="_Xj9uYnqUEeK9jI2Tc6HWsA"/>

-              <element xmi:type="uml:OccurrenceSpecification" href="complex_multipage_model.uml#_Xjz9YHqUEeK9jI2Tc6HWsA"/>

-              <layoutConstraint xmi:type="notation:Location" xmi:id="_Xj9uaHqUEeK9jI2Tc6HWsA" x="83" y="67"/>

-            </children>

-            <children xmi:type="notation:Shape" xmi:id="_Xj9uaXqUEeK9jI2Tc6HWsA" type="39">

-              <element xsi:nil="true"/>

-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Xj9uanqUEeK9jI2Tc6HWsA"/>

-            </children>

-            <children xmi:type="notation:Shape" xmi:id="_XkjkQHqUEeK9jI2Tc6HWsA" type="11">

-              <children xmi:type="notation:DecorationNode" xmi:id="_XkjkQnqUEeK9jI2Tc6HWsA" type="62">

-                <layoutConstraint xmi:type="notation:Location" xmi:id="_XkjkQ3qUEeK9jI2Tc6HWsA" y="5"/>

-              </children>

-              <element xmi:type="uml:StateInvariant" href="complex_multipage_model.uml#_Xj9ua3qUEeK9jI2Tc6HWsA"/>

-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_XkjkQXqUEeK9jI2Tc6HWsA"/>

-            </children>

-            <children xmi:type="notation:Shape" xmi:id="_XraaMHqUEeK9jI2Tc6HWsA" type="12">

-              <children xmi:type="notation:DecorationNode" xmi:id="_XraaNHqUEeK9jI2Tc6HWsA" type="10">

-                <layoutConstraint xmi:type="notation:Location" xmi:id="_XraaNXqUEeK9jI2Tc6HWsA" y="18"/>

-              </children>

-              <children xmi:type="notation:DecorationNode" xmi:id="_XraaNnqUEeK9jI2Tc6HWsA" type="58">

-                <layoutConstraint xmi:type="notation:Location" xmi:id="_XraaN3qUEeK9jI2Tc6HWsA" y="5"/>

-              </children>

-              <styles xmi:type="notation:DescriptionStyle" xmi:id="_XraaMXqUEeK9jI2Tc6HWsA"/>

-              <styles xmi:type="notation:FontStyle" xmi:id="_XraaMnqUEeK9jI2Tc6HWsA"/>

-              <element xmi:type="uml:OccurrenceSpecification" href="complex_multipage_model.uml#_XrQpMHqUEeK9jI2Tc6HWsA"/>

-              <layoutConstraint xmi:type="notation:Location" xmi:id="_XraaOHqUEeK9jI2Tc6HWsA" x="152" y="70"/>

-            </children>

-            <children xmi:type="notation:Shape" xmi:id="_XraaOXqUEeK9jI2Tc6HWsA" type="39">

-              <element xsi:nil="true"/>

-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_XraaOnqUEeK9jI2Tc6HWsA"/>

-            </children>

-            <children xmi:type="notation:Shape" xmi:id="_XsAQEHqUEeK9jI2Tc6HWsA" type="11">

-              <children xmi:type="notation:DecorationNode" xmi:id="_XsAQEnqUEeK9jI2Tc6HWsA" type="62">

-                <layoutConstraint xmi:type="notation:Location" xmi:id="_XsAQE3qUEeK9jI2Tc6HWsA" y="5"/>

-              </children>

-              <element xmi:type="uml:StateInvariant" href="complex_multipage_model.uml#_XraaO3qUEeK9jI2Tc6HWsA"/>

-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_XsAQEXqUEeK9jI2Tc6HWsA"/>

-            </children>

-            <children xmi:type="notation:Shape" xmi:id="_XzJZ4HqUEeK9jI2Tc6HWsA" type="12">

-              <children xmi:type="notation:DecorationNode" xmi:id="_XzJZ5HqUEeK9jI2Tc6HWsA" type="10">

-                <layoutConstraint xmi:type="notation:Location" xmi:id="_XzJZ5XqUEeK9jI2Tc6HWsA" y="18"/>

-              </children>

-              <children xmi:type="notation:DecorationNode" xmi:id="_XzJZ5nqUEeK9jI2Tc6HWsA" type="58">

-                <layoutConstraint xmi:type="notation:Location" xmi:id="_XzJZ53qUEeK9jI2Tc6HWsA" y="5"/>

-              </children>

-              <styles xmi:type="notation:DescriptionStyle" xmi:id="_XzJZ4XqUEeK9jI2Tc6HWsA"/>

-              <styles xmi:type="notation:FontStyle" xmi:id="_XzJZ4nqUEeK9jI2Tc6HWsA"/>

-              <element xmi:type="uml:OccurrenceSpecification" href="complex_multipage_model.uml#_Xy_o4HqUEeK9jI2Tc6HWsA"/>

-              <layoutConstraint xmi:type="notation:Location" xmi:id="_XzJZ6HqUEeK9jI2Tc6HWsA" x="265" y="72"/>

-            </children>

-            <children xmi:type="notation:Shape" xmi:id="_XzJZ6XqUEeK9jI2Tc6HWsA" type="39">

-              <element xsi:nil="true"/>

-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_XzJZ6nqUEeK9jI2Tc6HWsA"/>

-            </children>

-            <children xmi:type="notation:Shape" xmi:id="_XzvPwHqUEeK9jI2Tc6HWsA" type="11">

-              <children xmi:type="notation:DecorationNode" xmi:id="_XzvPwnqUEeK9jI2Tc6HWsA" type="62">

-                <layoutConstraint xmi:type="notation:Location" xmi:id="_XzvPw3qUEeK9jI2Tc6HWsA" y="5"/>

-              </children>

-              <element xmi:type="uml:StateInvariant" href="complex_multipage_model.uml#_XzJZ63qUEeK9jI2Tc6HWsA"/>

-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_XzvPwXqUEeK9jI2Tc6HWsA"/>

-            </children>

-            <children xmi:type="notation:Shape" xmi:id="_X8FTcHqUEeK9jI2Tc6HWsA" type="12">

-              <children xmi:type="notation:DecorationNode" xmi:id="_X8FTdHqUEeK9jI2Tc6HWsA" type="10">

-                <layoutConstraint xmi:type="notation:Location" xmi:id="_X8FTdXqUEeK9jI2Tc6HWsA" y="18"/>

-              </children>

-              <children xmi:type="notation:DecorationNode" xmi:id="_X8FTdnqUEeK9jI2Tc6HWsA" type="58">

-                <layoutConstraint xmi:type="notation:Location" xmi:id="_X8FTd3qUEeK9jI2Tc6HWsA" y="5"/>

-              </children>

-              <styles xmi:type="notation:DescriptionStyle" xmi:id="_X8FTcXqUEeK9jI2Tc6HWsA"/>

-              <styles xmi:type="notation:FontStyle" xmi:id="_X8FTcnqUEeK9jI2Tc6HWsA"/>

-              <element xmi:type="uml:OccurrenceSpecification" href="complex_multipage_model.uml#_X7yYgHqUEeK9jI2Tc6HWsA"/>

-              <layoutConstraint xmi:type="notation:Location" xmi:id="_X8FTeHqUEeK9jI2Tc6HWsA" x="338" y="66"/>

-            </children>

-            <children xmi:type="notation:Shape" xmi:id="_X8FTeXqUEeK9jI2Tc6HWsA" type="39">

-              <element xsi:nil="true"/>

-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_X8FTenqUEeK9jI2Tc6HWsA"/>

-            </children>

-            <children xmi:type="notation:Shape" xmi:id="_X8h_YHqUEeK9jI2Tc6HWsA" type="11">

-              <children xmi:type="notation:DecorationNode" xmi:id="_X8rJUXqUEeK9jI2Tc6HWsA" type="62">

-                <layoutConstraint xmi:type="notation:Location" xmi:id="_X8rJUnqUEeK9jI2Tc6HWsA" y="5"/>

-              </children>

-              <element xmi:type="uml:StateInvariant" href="complex_multipage_model.uml#_X8FTe3qUEeK9jI2Tc6HWsA"/>

-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_X8rJUHqUEeK9jI2Tc6HWsA"/>

-            </children>

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_WUWgqHqUEeK9jI2Tc6HWsA"/>

-          </children>

-          <children xmi:type="notation:DecorationNode" xmi:id="_WUWgqXqUEeK9jI2Tc6HWsA" visible="false" type="82">

-            <children xmi:type="notation:Shape" xmi:id="_WUpbkHqUEeK9jI2Tc6HWsA" type="24">

-              <children xmi:type="notation:DecorationNode" xmi:id="_WUpbknqUEeK9jI2Tc6HWsA" type="80">

-                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_WUpbk3qUEeK9jI2Tc6HWsA"/>

-              </children>

-              <element xsi:nil="true"/>

-              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_WUpbkXqUEeK9jI2Tc6HWsA"/>

-            </children>

-            <styles xmi:type="notation:SortingStyle" xmi:id="_WUWgqnqUEeK9jI2Tc6HWsA"/>

-            <styles xmi:type="notation:FilteringStyle" xmi:id="_WUWgq3qUEeK9jI2Tc6HWsA"/>

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_WUWgrHqUEeK9jI2Tc6HWsA"/>

-          </children>

-          <element xmi:type="uml:Lifeline" href="complex_multipage_model.uml#_WT50sHqUEeK9jI2Tc6HWsA"/>

-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_WUWgoXqUEeK9jI2Tc6HWsA"/>

-        </children>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_My-4FHqUEeK9jI2Tc6HWsA"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_My-4FXqUEeK9jI2Tc6HWsA"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_My-4FnqUEeK9jI2Tc6HWsA"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_My-4F3qUEeK9jI2Tc6HWsA" type="29">

-        <children xmi:type="notation:Shape" xmi:id="_NFchEHqUEeK9jI2Tc6HWsA" type="24">

-          <children xmi:type="notation:DecorationNode" xmi:id="_NFchEnqUEeK9jI2Tc6HWsA" type="80">

-            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_NFchE3qUEeK9jI2Tc6HWsA"/>

-          </children>

-          <element xsi:nil="true"/>

-          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_NFchEXqUEeK9jI2Tc6HWsA"/>

-        </children>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_My-4GHqUEeK9jI2Tc6HWsA"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_My-4GXqUEeK9jI2Tc6HWsA"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_My-4GnqUEeK9jI2Tc6HWsA"/>

-      </children>

-      <element xmi:type="uml:Interaction" href="complex_multipage_model.uml#_MyiMIHqUEeK9jI2Tc6HWsA"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_My-4EXqUEeK9jI2Tc6HWsA" x="80" y="125" height="605"/>

-    </children>

-    <styles xmi:type="notation:DiagramStyle" xmi:id="_12a1sXqTEeK9jI2Tc6HWsA"/>

-    <element xmi:type="uml:Model" href="complex_multipage_model.uml#_zyAt8HqTEeK9jI2Tc6HWsA"/>

-  </notation:Diagram>

-  <notation:Diagram xmi:id="_1_fSIHqTEeK9jI2Tc6HWsA" type="PapyrusUMLTimingDiagram" name="TimingDiagram" measurementUnit="Pixel">

-    <styles xmi:type="notation:DiagramStyle" xmi:id="_1_fSIXqTEeK9jI2Tc6HWsA"/>

-    <element xmi:type="uml:Model" href="complex_multipage_model.uml#_zyAt8HqTEeK9jI2Tc6HWsA"/>

-  </notation:Diagram>

-  <notation:Diagram xmi:id="_B_L-UHqUEeK9jI2Tc6HWsA" type="PapyrusUMLClassDiagram" name="ClassDiagram" measurementUnit="Pixel">

-    <children xmi:type="notation:Shape" xmi:id="_CeuaAHqUEeK9jI2Tc6HWsA" type="2008">

-      <children xmi:type="notation:DecorationNode" xmi:id="_CeuaAnqUEeK9jI2Tc6HWsA" type="5029"/>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_CeuaA3qUEeK9jI2Tc6HWsA" type="7017">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_CeuaEnqUEeK9jI2Tc6HWsA" source="PapyrusCSSForceValue">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_CeuaE3qUEeK9jI2Tc6HWsA" key="showTitle" value="true"/>

-        </eAnnotations>

-        <styles xmi:type="notation:TitleStyle" xmi:id="_CeuaBHqUEeK9jI2Tc6HWsA"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_CeuaBXqUEeK9jI2Tc6HWsA"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_CeuaBnqUEeK9jI2Tc6HWsA"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_CeuaB3qUEeK9jI2Tc6HWsA"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_CeuaCHqUEeK9jI2Tc6HWsA" type="7018">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_CeuaFHqUEeK9jI2Tc6HWsA" source="PapyrusCSSForceValue">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_CeuaFXqUEeK9jI2Tc6HWsA" key="showTitle" value="true"/>

-        </eAnnotations>

-        <styles xmi:type="notation:TitleStyle" xmi:id="_CeuaCXqUEeK9jI2Tc6HWsA"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_CeuaCnqUEeK9jI2Tc6HWsA"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_CeuaC3qUEeK9jI2Tc6HWsA"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_CeuaDHqUEeK9jI2Tc6HWsA"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_CeuaDXqUEeK9jI2Tc6HWsA" type="7019">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_CeuaFnqUEeK9jI2Tc6HWsA" source="PapyrusCSSForceValue">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_CeuaF3qUEeK9jI2Tc6HWsA" key="showTitle" value="true"/>

-        </eAnnotations>

-        <styles xmi:type="notation:TitleStyle" xmi:id="_CeuaDnqUEeK9jI2Tc6HWsA"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_CeuaD3qUEeK9jI2Tc6HWsA"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_CeuaEHqUEeK9jI2Tc6HWsA"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_CeuaEXqUEeK9jI2Tc6HWsA"/>

-      </children>

-      <element xmi:type="uml:Class" href="complex_multipage_model.uml#_CeRuEHqUEeK9jI2Tc6HWsA"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_CeuaAXqUEeK9jI2Tc6HWsA" x="104" y="95"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_CkrRAHqUEeK9jI2Tc6HWsA" type="2008">

-      <children xmi:type="notation:DecorationNode" xmi:id="_CkrRAnqUEeK9jI2Tc6HWsA" type="5029"/>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_CkrRA3qUEeK9jI2Tc6HWsA" type="7017">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Ck1CCXqUEeK9jI2Tc6HWsA" source="PapyrusCSSForceValue">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Ck1CCnqUEeK9jI2Tc6HWsA" key="showTitle" value="true"/>

-        </eAnnotations>

-        <styles xmi:type="notation:TitleStyle" xmi:id="_CkrRBHqUEeK9jI2Tc6HWsA"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_CkrRBXqUEeK9jI2Tc6HWsA"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_CkrRBnqUEeK9jI2Tc6HWsA"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_CkrRB3qUEeK9jI2Tc6HWsA"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_CkrRCHqUEeK9jI2Tc6HWsA" type="7018">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Ck1CC3qUEeK9jI2Tc6HWsA" source="PapyrusCSSForceValue">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Ck1CDHqUEeK9jI2Tc6HWsA" key="showTitle" value="true"/>

-        </eAnnotations>

-        <styles xmi:type="notation:TitleStyle" xmi:id="_Ck1CAHqUEeK9jI2Tc6HWsA"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_Ck1CAXqUEeK9jI2Tc6HWsA"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_Ck1CAnqUEeK9jI2Tc6HWsA"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Ck1CA3qUEeK9jI2Tc6HWsA"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_Ck1CBHqUEeK9jI2Tc6HWsA" type="7019">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Ck1CDXqUEeK9jI2Tc6HWsA" source="PapyrusCSSForceValue">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Ck1CDnqUEeK9jI2Tc6HWsA" key="showTitle" value="true"/>

-        </eAnnotations>

-        <styles xmi:type="notation:TitleStyle" xmi:id="_Ck1CBXqUEeK9jI2Tc6HWsA"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_Ck1CBnqUEeK9jI2Tc6HWsA"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_Ck1CB3qUEeK9jI2Tc6HWsA"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Ck1CCHqUEeK9jI2Tc6HWsA"/>

-      </children>

-      <element xmi:type="uml:Class" href="complex_multipage_model.uml#_CkYWEHqUEeK9jI2Tc6HWsA"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_CkrRAXqUEeK9jI2Tc6HWsA" x="393" y="94"/>

-    </children>

-    <styles xmi:type="notation:DiagramStyle" xmi:id="_B_L-UXqUEeK9jI2Tc6HWsA"/>

-    <element xmi:type="uml:Package" href="complex_multipage_model.uml#_BYzTwHqUEeK9jI2Tc6HWsA"/>

-    <edges xmi:type="notation:Connector" xmi:id="_DTPnMHqUEeK9jI2Tc6HWsA" type="4002" source="_CeuaAHqUEeK9jI2Tc6HWsA" target="_CkrRAHqUEeK9jI2Tc6HWsA">

-      <children xmi:type="notation:DecorationNode" xmi:id="_DTPnM3qUEeK9jI2Tc6HWsA" type="6007">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_DTPnNHqUEeK9jI2Tc6HWsA" y="40"/>

-      </children>

-      <styles xmi:type="notation:FontStyle" xmi:id="_DTPnMXqUEeK9jI2Tc6HWsA"/>

-      <element xmi:type="uml:Generalization" href="complex_multipage_model.uml#_DS8sQHqUEeK9jI2Tc6HWsA"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_DTPnMnqUEeK9jI2Tc6HWsA" points="[50, 9, -239, 10]$[298, 49, 9, 50]"/>

-    </edges>

-  </notation:Diagram>

-</xmi:XMI>

+<?xml version="1.0" encoding="UTF-8"?>
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML">
+  <notation:Diagram xmi:id="_zyAt8XqTEeK9jI2Tc6HWsA" type="PapyrusUMLClassDiagram" name="NewDiagram" measurementUnit="Pixel">
+    <children xmi:type="notation:Shape" xmi:id="_D1nUcHqUEeK9jI2Tc6HWsA" type="2012">
+      <children xmi:type="notation:DecorationNode" xmi:id="_D1nUcnqUEeK9jI2Tc6HWsA" type="5038"/>
+      <element xmi:type="uml:Comment" href="complex_multipage_model.uml#_D1TycHqUEeK9jI2Tc6HWsA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_D1nUcXqUEeK9jI2Tc6HWsA" x="60" y="65" width="291" height="131"/>
+    </children>
+    <styles xmi:type="notation:DiagramStyle" xmi:id="_zyAt8nqTEeK9jI2Tc6HWsA"/>
+    <element xmi:type="uml:Model" href="complex_multipage_model.uml#_zyAt8HqTEeK9jI2Tc6HWsA"/>
+  </notation:Diagram>
+  <notation:Diagram xmi:id="_zyAt83qTEeK9jI2Tc6HWsA" type="PapyrusUMLTimingDiagram" name="NewDiagram" measurementUnit="Pixel">
+    <styles xmi:type="notation:DiagramStyle" xmi:id="_zyAt9HqTEeK9jI2Tc6HWsA"/>
+    <element xmi:type="uml:Model" href="complex_multipage_model.uml#_zyAt8HqTEeK9jI2Tc6HWsA"/>
+  </notation:Diagram>
+  <notation:Diagram xmi:id="_1B5ogHqTEeK9jI2Tc6HWsA" type="PapyrusUMLClassDiagram" name="ClassDiagram" measurementUnit="Pixel">
+    <children xmi:type="notation:Shape" xmi:id="__d6UYHqTEeK9jI2Tc6HWsA" type="2008">
+      <children xmi:type="notation:DecorationNode" xmi:id="__eEFYHqTEeK9jI2Tc6HWsA" type="5029"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="__eEFYXqTEeK9jI2Tc6HWsA" type="7017">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="__eEFcHqTEeK9jI2Tc6HWsA" source="PapyrusCSSForceValue">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="__eEFcXqTEeK9jI2Tc6HWsA" key="showTitle" value="true"/>
+        </eAnnotations>
+        <styles xmi:type="notation:TitleStyle" xmi:id="__eEFYnqTEeK9jI2Tc6HWsA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="__eEFY3qTEeK9jI2Tc6HWsA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="__eEFZHqTEeK9jI2Tc6HWsA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="__eEFZXqTEeK9jI2Tc6HWsA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="__eEFZnqTEeK9jI2Tc6HWsA" type="7018">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="__eEFcnqTEeK9jI2Tc6HWsA" source="PapyrusCSSForceValue">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="__eEFc3qTEeK9jI2Tc6HWsA" key="showTitle" value="true"/>
+        </eAnnotations>
+        <styles xmi:type="notation:TitleStyle" xmi:id="__eEFZ3qTEeK9jI2Tc6HWsA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="__eEFaHqTEeK9jI2Tc6HWsA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="__eEFaXqTEeK9jI2Tc6HWsA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="__eEFanqTEeK9jI2Tc6HWsA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="__eEFa3qTEeK9jI2Tc6HWsA" type="7019">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="__eEFdHqTEeK9jI2Tc6HWsA" source="PapyrusCSSForceValue">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="__eEFdXqTEeK9jI2Tc6HWsA" key="showTitle" value="true"/>
+        </eAnnotations>
+        <styles xmi:type="notation:TitleStyle" xmi:id="__eEFbHqTEeK9jI2Tc6HWsA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="__eEFbXqTEeK9jI2Tc6HWsA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="__eEFbnqTEeK9jI2Tc6HWsA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="__eEFb3qTEeK9jI2Tc6HWsA"/>
+      </children>
+      <element xmi:type="uml:Class" href="complex_multipage_model.uml#__dxKcHqTEeK9jI2Tc6HWsA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="__d6UYXqTEeK9jI2Tc6HWsA" x="70" y="74"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="__pOMgHqTEeK9jI2Tc6HWsA" type="2008">
+      <children xmi:type="notation:DecorationNode" xmi:id="__pOMgnqTEeK9jI2Tc6HWsA" type="5029"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="__pOMg3qTEeK9jI2Tc6HWsA" type="7017">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="__pX9gHqTEeK9jI2Tc6HWsA" source="PapyrusCSSForceValue">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="__pX9gXqTEeK9jI2Tc6HWsA" key="showTitle" value="true"/>
+        </eAnnotations>
+        <styles xmi:type="notation:TitleStyle" xmi:id="__pOMhHqTEeK9jI2Tc6HWsA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="__pOMhXqTEeK9jI2Tc6HWsA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="__pOMhnqTEeK9jI2Tc6HWsA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="__pOMh3qTEeK9jI2Tc6HWsA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="__pOMiHqTEeK9jI2Tc6HWsA" type="7018">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="__pX9gnqTEeK9jI2Tc6HWsA" source="PapyrusCSSForceValue">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="__pX9g3qTEeK9jI2Tc6HWsA" key="showTitle" value="true"/>
+        </eAnnotations>
+        <styles xmi:type="notation:TitleStyle" xmi:id="__pOMiXqTEeK9jI2Tc6HWsA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="__pOMinqTEeK9jI2Tc6HWsA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="__pOMi3qTEeK9jI2Tc6HWsA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="__pOMjHqTEeK9jI2Tc6HWsA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="__pOMjXqTEeK9jI2Tc6HWsA" type="7019">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="__pX9hHqTEeK9jI2Tc6HWsA" source="PapyrusCSSForceValue">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="__pX9hXqTEeK9jI2Tc6HWsA" key="showTitle" value="true"/>
+        </eAnnotations>
+        <styles xmi:type="notation:TitleStyle" xmi:id="__pOMjnqTEeK9jI2Tc6HWsA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="__pOMj3qTEeK9jI2Tc6HWsA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="__pOMkHqTEeK9jI2Tc6HWsA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="__pOMkXqTEeK9jI2Tc6HWsA"/>
+      </children>
+      <element xmi:type="uml:Class" href="complex_multipage_model.uml#__o7RkHqTEeK9jI2Tc6HWsA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="__pOMgXqTEeK9jI2Tc6HWsA" x="445" y="74"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_BZP_sHqUEeK9jI2Tc6HWsA" type="2007">
+      <children xmi:type="notation:DecorationNode" xmi:id="_BZP_snqUEeK9jI2Tc6HWsA" type="5026"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_BZP_s3qUEeK9jI2Tc6HWsA" type="7016">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_BZ11kHqUEeK9jI2Tc6HWsA" source="PapyrusCSSForceValue">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_BZ11kXqUEeK9jI2Tc6HWsA" key="showTitle" value="true"/>
+        </eAnnotations>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_BZP_tHqUEeK9jI2Tc6HWsA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BZP_tXqUEeK9jI2Tc6HWsA"/>
+      </children>
+      <element xmi:type="uml:Package" href="complex_multipage_model.uml#_BYzTwHqUEeK9jI2Tc6HWsA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BZP_sXqUEeK9jI2Tc6HWsA" x="215" y="215" width="246" height="126"/>
+    </children>
+    <styles xmi:type="notation:DiagramStyle" xmi:id="_1B5ogXqTEeK9jI2Tc6HWsA"/>
+    <element xmi:type="uml:Model" href="complex_multipage_model.uml#_zyAt8HqTEeK9jI2Tc6HWsA"/>
+    <edges xmi:type="notation:Connector" xmi:id="__8HTUHqTEeK9jI2Tc6HWsA" type="4001" source="__d6UYHqTEeK9jI2Tc6HWsA" target="__pOMgHqTEeK9jI2Tc6HWsA">
+      <children xmi:type="notation:DecorationNode" xmi:id="__8REUHqTEeK9jI2Tc6HWsA" type="6001">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="__8REUXqTEeK9jI2Tc6HWsA" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="__8REUnqTEeK9jI2Tc6HWsA" type="6002">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="__8REU3qTEeK9jI2Tc6HWsA" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="__8REVHqTEeK9jI2Tc6HWsA" type="6003">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="__8REVXqTEeK9jI2Tc6HWsA" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="__8REVnqTEeK9jI2Tc6HWsA" type="6005">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="__8REV3qTEeK9jI2Tc6HWsA" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="__8REWHqTEeK9jI2Tc6HWsA" type="6033">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="__8REWXqTEeK9jI2Tc6HWsA" y="20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="__8REWnqTEeK9jI2Tc6HWsA" type="6034">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="__8REW3qTEeK9jI2Tc6HWsA" y="-20"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="__8HTUXqTEeK9jI2Tc6HWsA"/>
+      <element xmi:type="uml:Association" href="complex_multipage_model.uml#__70YYHqTEeK9jI2Tc6HWsA"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="__8HTUnqTEeK9jI2Tc6HWsA" points="[50, 1, -325, 1]$[325, 46, -50, 46]"/>
+    </edges>
+  </notation:Diagram>
+  <notation:Diagram xmi:id="_1PIzQHqTEeK9jI2Tc6HWsA" type="PapyrusUMLClassDiagram" name="ClassDiagram" measurementUnit="Pixel">
+    <styles xmi:type="notation:DiagramStyle" xmi:id="_1PIzQXqTEeK9jI2Tc6HWsA"/>
+    <element xmi:type="uml:Model" href="complex_multipage_model.uml#_zyAt8HqTEeK9jI2Tc6HWsA"/>
+  </notation:Diagram>
+  <notation:Diagram xmi:id="_1pLD4HqTEeK9jI2Tc6HWsA" type="PapyrusUMLTimingDiagram" name="TimingDiagram" measurementUnit="Pixel">
+    <styles xmi:type="notation:DiagramStyle" xmi:id="_1pLD4XqTEeK9jI2Tc6HWsA"/>
+    <element xmi:type="uml:Model" href="complex_multipage_model.uml#_zyAt8HqTEeK9jI2Tc6HWsA"/>
+  </notation:Diagram>
+  <notation:Diagram xmi:id="_12a1sHqTEeK9jI2Tc6HWsA" type="PapyrusUMLTimingDiagram" name="TimingDiagram" measurementUnit="Pixel">
+    <children xmi:type="notation:Shape" xmi:id="_My-4EHqUEeK9jI2Tc6HWsA" type="2">
+      <children xmi:type="notation:DecorationNode" xmi:id="_My-4EnqUEeK9jI2Tc6HWsA" type="37"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_My-4E3qUEeK9jI2Tc6HWsA" type="5">
+        <children xmi:type="notation:Shape" xmi:id="_OjB5YHqUEeK9jI2Tc6HWsA" type="19">
+          <children xmi:type="notation:DecorationNode" xmi:id="_OjB5YnqUEeK9jI2Tc6HWsA" type="21"/>
+          <children xmi:type="notation:DecorationNode" xmi:id="_OjB5Y3qUEeK9jI2Tc6HWsA" type="7">
+            <children xmi:type="notation:Shape" xmi:id="_R3OOAHqUEeK9jI2Tc6HWsA" type="9">
+              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_R5v9kXqUEeK9jI2Tc6HWsA" source="org.eclipse.papyrus.uml.diagram.timing.StateDefinitionView">
+                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_R5v9knqUEeK9jI2Tc6HWsA" key="org.eclipse.papyrus.uml.diagram.timing.StateDefinitionViewID" value="_R5v9kHqUEeK9jI2Tc6HWsA"/>
+                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_R6C4gHqUEeK9jI2Tc6HWsA" key="org.eclipse.papyrus.uml.diagram.timing.StateDefinitionViewName" value="State 1"/>
+              </eAnnotations>
+              <children xmi:type="notation:DecorationNode" xmi:id="_R3OOAnqUEeK9jI2Tc6HWsA" type="38">
+                <styles xmi:type="notation:DescriptionStyle" xmi:id="_R3XX8HqUEeK9jI2Tc6HWsA"/>
+              </children>
+              <element xsi:nil="true"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_R3OOAXqUEeK9jI2Tc6HWsA"/>
+            </children>
+            <children xmi:type="notation:Shape" xmi:id="_SOvWIHqUEeK9jI2Tc6HWsA" type="9">
+              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_SO4gEXqUEeK9jI2Tc6HWsA" source="org.eclipse.papyrus.uml.diagram.timing.StateDefinitionView">
+                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_SO4gEnqUEeK9jI2Tc6HWsA" key="org.eclipse.papyrus.uml.diagram.timing.StateDefinitionViewID" value="_SO4gEHqUEeK9jI2Tc6HWsA"/>
+                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_SPCREHqUEeK9jI2Tc6HWsA" key="org.eclipse.papyrus.uml.diagram.timing.StateDefinitionViewName" value="State 2"/>
+              </eAnnotations>
+              <children xmi:type="notation:DecorationNode" xmi:id="_SOvWInqUEeK9jI2Tc6HWsA" type="38">
+                <styles xmi:type="notation:DescriptionStyle" xmi:id="_SOvWI3qUEeK9jI2Tc6HWsA"/>
+              </children>
+              <element xsi:nil="true"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SOvWIXqUEeK9jI2Tc6HWsA"/>
+            </children>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_OjB5ZHqUEeK9jI2Tc6HWsA"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_OjB5ZXqUEeK9jI2Tc6HWsA"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_OjB5ZnqUEeK9jI2Tc6HWsA"/>
+          </children>
+          <children xmi:type="notation:DecorationNode" xmi:id="_OjB5Z3qUEeK9jI2Tc6HWsA" type="8">
+            <children xmi:type="notation:Shape" xmi:id="_R6fkcHqUEeK9jI2Tc6HWsA" type="11">
+              <children xmi:type="notation:DecorationNode" xmi:id="_R6fkcnqUEeK9jI2Tc6HWsA" type="62">
+                <layoutConstraint xmi:type="notation:Location" xmi:id="_R6fkc3qUEeK9jI2Tc6HWsA" y="5"/>
+              </children>
+              <element xmi:type="uml:StateInvariant" href="complex_multipage_model.uml#_R6C4gXqUEeK9jI2Tc6HWsA"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_R6fkcXqUEeK9jI2Tc6HWsA"/>
+            </children>
+            <children xmi:type="notation:Shape" xmi:id="_TEAKMHqUEeK9jI2Tc6HWsA" type="12">
+              <children xmi:type="notation:DecorationNode" xmi:id="_TEAKNHqUEeK9jI2Tc6HWsA" type="10">
+                <layoutConstraint xmi:type="notation:Location" xmi:id="_TEAKNXqUEeK9jI2Tc6HWsA" y="18"/>
+              </children>
+              <children xmi:type="notation:DecorationNode" xmi:id="_TEAKNnqUEeK9jI2Tc6HWsA" type="58">
+                <layoutConstraint xmi:type="notation:Location" xmi:id="_TEAKN3qUEeK9jI2Tc6HWsA" y="5"/>
+              </children>
+              <styles xmi:type="notation:DescriptionStyle" xmi:id="_TEAKMXqUEeK9jI2Tc6HWsA"/>
+              <styles xmi:type="notation:FontStyle" xmi:id="_TEAKMnqUEeK9jI2Tc6HWsA"/>
+              <element xmi:type="uml:OccurrenceSpecification" href="complex_multipage_model.uml#_TDtPQHqUEeK9jI2Tc6HWsA"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_TaxrcHqUEeK9jI2Tc6HWsA" x="114" y="71"/>
+            </children>
+            <children xmi:type="notation:Shape" xmi:id="_TEAKOXqUEeK9jI2Tc6HWsA" type="39">
+              <element xsi:nil="true"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TEAKOnqUEeK9jI2Tc6HWsA"/>
+            </children>
+            <children xmi:type="notation:Shape" xmi:id="_TEmnIHqUEeK9jI2Tc6HWsA" type="11">
+              <children xmi:type="notation:DecorationNode" xmi:id="_TEmnInqUEeK9jI2Tc6HWsA" type="62">
+                <layoutConstraint xmi:type="notation:Location" xmi:id="_TEmnI3qUEeK9jI2Tc6HWsA" y="5"/>
+              </children>
+              <element xmi:type="uml:StateInvariant" href="complex_multipage_model.uml#_TEAKO3qUEeK9jI2Tc6HWsA"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TEmnIXqUEeK9jI2Tc6HWsA"/>
+            </children>
+            <children xmi:type="notation:Shape" xmi:id="_UCqK0HqUEeK9jI2Tc6HWsA" type="12">
+              <children xmi:type="notation:DecorationNode" xmi:id="_UCqK1HqUEeK9jI2Tc6HWsA" type="10">
+                <layoutConstraint xmi:type="notation:Location" xmi:id="_UCqK1XqUEeK9jI2Tc6HWsA" y="18"/>
+              </children>
+              <children xmi:type="notation:DecorationNode" xmi:id="_UCqK1nqUEeK9jI2Tc6HWsA" type="58">
+                <layoutConstraint xmi:type="notation:Location" xmi:id="_UCqK13qUEeK9jI2Tc6HWsA" y="5"/>
+              </children>
+              <styles xmi:type="notation:DescriptionStyle" xmi:id="_UCqK0XqUEeK9jI2Tc6HWsA"/>
+              <styles xmi:type="notation:FontStyle" xmi:id="_UCqK0nqUEeK9jI2Tc6HWsA"/>
+              <element xmi:type="uml:OccurrenceSpecification" href="complex_multipage_model.uml#_UCXP4HqUEeK9jI2Tc6HWsA"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_UCqK2HqUEeK9jI2Tc6HWsA" x="334" y="140"/>
+            </children>
+            <children xmi:type="notation:Shape" xmi:id="_UCqK2XqUEeK9jI2Tc6HWsA" type="39">
+              <element xsi:nil="true"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UCqK2nqUEeK9jI2Tc6HWsA"/>
+            </children>
+            <children xmi:type="notation:Shape" xmi:id="_UDQAsHqUEeK9jI2Tc6HWsA" type="11">
+              <children xmi:type="notation:DecorationNode" xmi:id="_UDQAsnqUEeK9jI2Tc6HWsA" type="62">
+                <layoutConstraint xmi:type="notation:Location" xmi:id="_UDQAs3qUEeK9jI2Tc6HWsA" y="5"/>
+              </children>
+              <element xmi:type="uml:StateInvariant" href="complex_multipage_model.uml#_UCqK23qUEeK9jI2Tc6HWsA"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UDQAsXqUEeK9jI2Tc6HWsA"/>
+            </children>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_OjB5aHqUEeK9jI2Tc6HWsA"/>
+          </children>
+          <children xmi:type="notation:DecorationNode" xmi:id="_OjB5aXqUEeK9jI2Tc6HWsA" visible="false" type="82">
+            <children xmi:type="notation:Shape" xmi:id="_OqUNIHqUEeK9jI2Tc6HWsA" type="24">
+              <children xmi:type="notation:DecorationNode" xmi:id="_OqUNInqUEeK9jI2Tc6HWsA" type="80">
+                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_OqUNI3qUEeK9jI2Tc6HWsA"/>
+              </children>
+              <element xsi:nil="true"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_OqUNIXqUEeK9jI2Tc6HWsA"/>
+            </children>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_OjB5anqUEeK9jI2Tc6HWsA"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_OjB5a3qUEeK9jI2Tc6HWsA"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_OjB5bHqUEeK9jI2Tc6HWsA"/>
+          </children>
+          <element xmi:type="uml:Lifeline" href="complex_multipage_model.uml#_Of5s4HqUEeK9jI2Tc6HWsA"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_OjB5YXqUEeK9jI2Tc6HWsA"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_PNl5UHqUEeK9jI2Tc6HWsA" type="20">
+          <children xmi:type="notation:DecorationNode" xmi:id="_PNl5UnqUEeK9jI2Tc6HWsA" type="22"/>
+          <children xmi:type="notation:DecorationNode" xmi:id="_PNl5U3qUEeK9jI2Tc6HWsA" type="23">
+            <children xmi:type="notation:Shape" xmi:id="_PSfncHqUEeK9jI2Tc6HWsA" type="28">
+              <children xmi:type="notation:DecorationNode" xmi:id="_PSfncnqUEeK9jI2Tc6HWsA" type="31"/>
+              <children xmi:type="notation:DecorationNode" xmi:id="_PSfnc3qUEeK9jI2Tc6HWsA" type="64">
+                <layoutConstraint xmi:type="notation:Location" xmi:id="_PSfndHqUEeK9jI2Tc6HWsA" y="5"/>
+              </children>
+              <element xmi:type="uml:StateInvariant" href="complex_multipage_model.uml#_PSMsgHqUEeK9jI2Tc6HWsA"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PSfncXqUEeK9jI2Tc6HWsA"/>
+            </children>
+            <children xmi:type="notation:Shape" xmi:id="_Ugum4HqUEeK9jI2Tc6HWsA" type="12">
+              <children xmi:type="notation:DecorationNode" xmi:id="_Ugum5HqUEeK9jI2Tc6HWsA" type="10">
+                <layoutConstraint xmi:type="notation:Location" xmi:id="_Ugum5XqUEeK9jI2Tc6HWsA" y="18"/>
+              </children>
+              <children xmi:type="notation:DecorationNode" xmi:id="_Ugum5nqUEeK9jI2Tc6HWsA" type="58">
+                <layoutConstraint xmi:type="notation:Location" xmi:id="_Ugum53qUEeK9jI2Tc6HWsA" y="5"/>
+              </children>
+              <styles xmi:type="notation:DescriptionStyle" xmi:id="_Ugum4XqUEeK9jI2Tc6HWsA"/>
+              <styles xmi:type="notation:FontStyle" xmi:id="_Ugum4nqUEeK9jI2Tc6HWsA"/>
+              <element xmi:type="uml:OccurrenceSpecification" href="complex_multipage_model.uml#_Uglc8HqUEeK9jI2Tc6HWsA"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_Ugum6HqUEeK9jI2Tc6HWsA" x="181" y="52"/>
+            </children>
+            <children xmi:type="notation:Shape" xmi:id="_UhBh0HqUEeK9jI2Tc6HWsA" type="28">
+              <children xmi:type="notation:DecorationNode" xmi:id="_UhBh0nqUEeK9jI2Tc6HWsA" type="31"/>
+              <children xmi:type="notation:DecorationNode" xmi:id="_UhBh03qUEeK9jI2Tc6HWsA" type="64">
+                <layoutConstraint xmi:type="notation:Location" xmi:id="_UhBh1HqUEeK9jI2Tc6HWsA" y="5"/>
+              </children>
+              <element xmi:type="uml:StateInvariant" href="complex_multipage_model.uml#_Ugum6XqUEeK9jI2Tc6HWsA"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UhBh0XqUEeK9jI2Tc6HWsA"/>
+            </children>
+            <children xmi:type="notation:Shape" xmi:id="_Z0BFcHqUEeK9jI2Tc6HWsA" type="12">
+              <children xmi:type="notation:DecorationNode" xmi:id="_Z0BFdHqUEeK9jI2Tc6HWsA" type="10">
+                <layoutConstraint xmi:type="notation:Location" xmi:id="_Z0BFdXqUEeK9jI2Tc6HWsA" y="18"/>
+              </children>
+              <children xmi:type="notation:DecorationNode" xmi:id="_Z0BFdnqUEeK9jI2Tc6HWsA" type="58">
+                <layoutConstraint xmi:type="notation:Location" xmi:id="_Z0BFd3qUEeK9jI2Tc6HWsA" y="5"/>
+              </children>
+              <styles xmi:type="notation:DescriptionStyle" xmi:id="_Z0BFcXqUEeK9jI2Tc6HWsA"/>
+              <styles xmi:type="notation:FontStyle" xmi:id="_Z0BFcnqUEeK9jI2Tc6HWsA"/>
+              <element xmi:type="uml:OccurrenceSpecification" href="complex_multipage_model.uml#_Zz37gHqUEeK9jI2Tc6HWsA"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_Z0BFeHqUEeK9jI2Tc6HWsA" x="294" y="46"/>
+            </children>
+            <children xmi:type="notation:Shape" xmi:id="_Z0UncHqUEeK9jI2Tc6HWsA" type="28">
+              <children xmi:type="notation:DecorationNode" xmi:id="_Z0UncnqUEeK9jI2Tc6HWsA" type="31"/>
+              <children xmi:type="notation:DecorationNode" xmi:id="_Z0Unc3qUEeK9jI2Tc6HWsA" type="64">
+                <layoutConstraint xmi:type="notation:Location" xmi:id="_Z0UndHqUEeK9jI2Tc6HWsA" y="5"/>
+              </children>
+              <element xmi:type="uml:StateInvariant" href="complex_multipage_model.uml#_Z0BFeXqUEeK9jI2Tc6HWsA"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Z0UncXqUEeK9jI2Tc6HWsA"/>
+            </children>
+            <children xmi:type="notation:Shape" xmi:id="_UuIJsHqUEeK9jI2Tc6HWsA" type="12">
+              <children xmi:type="notation:DecorationNode" xmi:id="_UuIJtHqUEeK9jI2Tc6HWsA" type="10">
+                <layoutConstraint xmi:type="notation:Location" xmi:id="_UuIJtXqUEeK9jI2Tc6HWsA" y="18"/>
+              </children>
+              <children xmi:type="notation:DecorationNode" xmi:id="_UuIJtnqUEeK9jI2Tc6HWsA" type="58">
+                <layoutConstraint xmi:type="notation:Location" xmi:id="_UuIJt3qUEeK9jI2Tc6HWsA" y="5"/>
+              </children>
+              <styles xmi:type="notation:DescriptionStyle" xmi:id="_UuIJsXqUEeK9jI2Tc6HWsA"/>
+              <styles xmi:type="notation:FontStyle" xmi:id="_UuIJsnqUEeK9jI2Tc6HWsA"/>
+              <element xmi:type="uml:OccurrenceSpecification" href="complex_multipage_model.uml#_Ut-_wHqUEeK9jI2Tc6HWsA"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_UuIJuHqUEeK9jI2Tc6HWsA" x="388" y="45"/>
+            </children>
+            <children xmi:type="notation:Shape" xmi:id="_UubEoHqUEeK9jI2Tc6HWsA" type="28">
+              <children xmi:type="notation:DecorationNode" xmi:id="_UubEonqUEeK9jI2Tc6HWsA" type="31"/>
+              <children xmi:type="notation:DecorationNode" xmi:id="_UubEo3qUEeK9jI2Tc6HWsA" type="64">
+                <layoutConstraint xmi:type="notation:Location" xmi:id="_UubEpHqUEeK9jI2Tc6HWsA" y="5"/>
+              </children>
+              <element xmi:type="uml:StateInvariant" href="complex_multipage_model.uml#_UuIJuXqUEeK9jI2Tc6HWsA"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_UubEoXqUEeK9jI2Tc6HWsA"/>
+            </children>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PNl5VHqUEeK9jI2Tc6HWsA"/>
+          </children>
+          <children xmi:type="notation:DecorationNode" xmi:id="_PNl5VXqUEeK9jI2Tc6HWsA" visible="false" type="83">
+            <children xmi:type="notation:Shape" xmi:id="_PXs3kHqUEeK9jI2Tc6HWsA" type="24">
+              <children xmi:type="notation:DecorationNode" xmi:id="_PXs3knqUEeK9jI2Tc6HWsA" type="80">
+                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PXs3k3qUEeK9jI2Tc6HWsA"/>
+              </children>
+              <element xsi:nil="true"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PXs3kXqUEeK9jI2Tc6HWsA"/>
+            </children>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_PNl5VnqUEeK9jI2Tc6HWsA"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_PNl5V3qUEeK9jI2Tc6HWsA"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PNl5WHqUEeK9jI2Tc6HWsA"/>
+          </children>
+          <element xmi:type="uml:Lifeline" href="complex_multipage_model.uml#_PM_cYHqUEeK9jI2Tc6HWsA"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_PNl5UXqUEeK9jI2Tc6HWsA"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_WUWgoHqUEeK9jI2Tc6HWsA" type="19">
+          <children xmi:type="notation:DecorationNode" xmi:id="_WUWgonqUEeK9jI2Tc6HWsA" type="21"/>
+          <children xmi:type="notation:DecorationNode" xmi:id="_WUWgo3qUEeK9jI2Tc6HWsA" type="7">
+            <children xmi:type="notation:Shape" xmi:id="_WtNFgHqUEeK9jI2Tc6HWsA" type="9">
+              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_WtWPcXqUEeK9jI2Tc6HWsA" source="org.eclipse.papyrus.uml.diagram.timing.StateDefinitionView">
+                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_WtWPcnqUEeK9jI2Tc6HWsA" key="org.eclipse.papyrus.uml.diagram.timing.StateDefinitionViewID" value="_WtWPcHqUEeK9jI2Tc6HWsA"/>
+                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_WtpxcHqUEeK9jI2Tc6HWsA" key="org.eclipse.papyrus.uml.diagram.timing.StateDefinitionViewName" value="State 1"/>
+              </eAnnotations>
+              <children xmi:type="notation:DecorationNode" xmi:id="_WtNFgnqUEeK9jI2Tc6HWsA" type="38">
+                <styles xmi:type="notation:DescriptionStyle" xmi:id="_WtNFg3qUEeK9jI2Tc6HWsA"/>
+              </children>
+              <element xsi:nil="true"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_WtNFgXqUEeK9jI2Tc6HWsA"/>
+            </children>
+            <children xmi:type="notation:Shape" xmi:id="_W1GdQHqUEeK9jI2Tc6HWsA" type="9">
+              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_W1PnMXqUEeK9jI2Tc6HWsA" source="org.eclipse.papyrus.uml.diagram.timing.StateDefinitionView">
+                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_W1PnMnqUEeK9jI2Tc6HWsA" key="org.eclipse.papyrus.uml.diagram.timing.StateDefinitionViewID" value="_W1PnMHqUEeK9jI2Tc6HWsA"/>
+                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_W1ZYMHqUEeK9jI2Tc6HWsA" key="org.eclipse.papyrus.uml.diagram.timing.StateDefinitionViewName" value="State 2"/>
+              </eAnnotations>
+              <children xmi:type="notation:DecorationNode" xmi:id="_W1GdQnqUEeK9jI2Tc6HWsA" type="38">
+                <styles xmi:type="notation:DescriptionStyle" xmi:id="_W1GdQ3qUEeK9jI2Tc6HWsA"/>
+              </children>
+              <element xsi:nil="true"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_W1GdQXqUEeK9jI2Tc6HWsA"/>
+            </children>
+            <children xmi:type="notation:Shape" xmi:id="_YUVbYHqUEeK9jI2Tc6HWsA" type="9">
+              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_YUelUXqUEeK9jI2Tc6HWsA" source="org.eclipse.papyrus.uml.diagram.timing.StateDefinitionView">
+                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_YUelUnqUEeK9jI2Tc6HWsA" key="org.eclipse.papyrus.uml.diagram.timing.StateDefinitionViewID" value="_YUelUHqUEeK9jI2Tc6HWsA"/>
+                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_YUoWUHqUEeK9jI2Tc6HWsA" key="org.eclipse.papyrus.uml.diagram.timing.StateDefinitionViewName" value="State 3"/>
+              </eAnnotations>
+              <children xmi:type="notation:DecorationNode" xmi:id="_YUVbYnqUEeK9jI2Tc6HWsA" type="38">
+                <styles xmi:type="notation:DescriptionStyle" xmi:id="_YUVbY3qUEeK9jI2Tc6HWsA"/>
+              </children>
+              <element xsi:nil="true"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_YUVbYXqUEeK9jI2Tc6HWsA"/>
+            </children>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_WUWgpHqUEeK9jI2Tc6HWsA"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_WUWgpXqUEeK9jI2Tc6HWsA"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_WUWgpnqUEeK9jI2Tc6HWsA"/>
+          </children>
+          <children xmi:type="notation:DecorationNode" xmi:id="_WUWgp3qUEeK9jI2Tc6HWsA" type="8">
+            <children xmi:type="notation:Shape" xmi:id="_WuF2UHqUEeK9jI2Tc6HWsA" type="11">
+              <children xmi:type="notation:DecorationNode" xmi:id="_WuF2UnqUEeK9jI2Tc6HWsA" type="62">
+                <layoutConstraint xmi:type="notation:Location" xmi:id="_WuF2U3qUEeK9jI2Tc6HWsA" y="5"/>
+              </children>
+              <element xmi:type="uml:StateInvariant" href="complex_multipage_model.uml#_WtpxcXqUEeK9jI2Tc6HWsA"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_WuF2UXqUEeK9jI2Tc6HWsA"/>
+            </children>
+            <children xmi:type="notation:Shape" xmi:id="_Xj9uYHqUEeK9jI2Tc6HWsA" type="12">
+              <children xmi:type="notation:DecorationNode" xmi:id="_Xj9uZHqUEeK9jI2Tc6HWsA" type="10">
+                <layoutConstraint xmi:type="notation:Location" xmi:id="_Xj9uZXqUEeK9jI2Tc6HWsA" y="18"/>
+              </children>
+              <children xmi:type="notation:DecorationNode" xmi:id="_Xj9uZnqUEeK9jI2Tc6HWsA" type="58">
+                <layoutConstraint xmi:type="notation:Location" xmi:id="_Xj9uZ3qUEeK9jI2Tc6HWsA" y="5"/>
+              </children>
+              <styles xmi:type="notation:DescriptionStyle" xmi:id="_Xj9uYXqUEeK9jI2Tc6HWsA"/>
+              <styles xmi:type="notation:FontStyle" xmi:id="_Xj9uYnqUEeK9jI2Tc6HWsA"/>
+              <element xmi:type="uml:OccurrenceSpecification" href="complex_multipage_model.uml#_Xjz9YHqUEeK9jI2Tc6HWsA"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_Xj9uaHqUEeK9jI2Tc6HWsA" x="83" y="67"/>
+            </children>
+            <children xmi:type="notation:Shape" xmi:id="_Xj9uaXqUEeK9jI2Tc6HWsA" type="39">
+              <element xsi:nil="true"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Xj9uanqUEeK9jI2Tc6HWsA"/>
+            </children>
+            <children xmi:type="notation:Shape" xmi:id="_XkjkQHqUEeK9jI2Tc6HWsA" type="11">
+              <children xmi:type="notation:DecorationNode" xmi:id="_XkjkQnqUEeK9jI2Tc6HWsA" type="62">
+                <layoutConstraint xmi:type="notation:Location" xmi:id="_XkjkQ3qUEeK9jI2Tc6HWsA" y="5"/>
+              </children>
+              <element xmi:type="uml:StateInvariant" href="complex_multipage_model.uml#_Xj9ua3qUEeK9jI2Tc6HWsA"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_XkjkQXqUEeK9jI2Tc6HWsA"/>
+            </children>
+            <children xmi:type="notation:Shape" xmi:id="_XraaMHqUEeK9jI2Tc6HWsA" type="12">
+              <children xmi:type="notation:DecorationNode" xmi:id="_XraaNHqUEeK9jI2Tc6HWsA" type="10">
+                <layoutConstraint xmi:type="notation:Location" xmi:id="_XraaNXqUEeK9jI2Tc6HWsA" y="18"/>
+              </children>
+              <children xmi:type="notation:DecorationNode" xmi:id="_XraaNnqUEeK9jI2Tc6HWsA" type="58">
+                <layoutConstraint xmi:type="notation:Location" xmi:id="_XraaN3qUEeK9jI2Tc6HWsA" y="5"/>
+              </children>
+              <styles xmi:type="notation:DescriptionStyle" xmi:id="_XraaMXqUEeK9jI2Tc6HWsA"/>
+              <styles xmi:type="notation:FontStyle" xmi:id="_XraaMnqUEeK9jI2Tc6HWsA"/>
+              <element xmi:type="uml:OccurrenceSpecification" href="complex_multipage_model.uml#_XrQpMHqUEeK9jI2Tc6HWsA"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_XraaOHqUEeK9jI2Tc6HWsA" x="152" y="70"/>
+            </children>
+            <children xmi:type="notation:Shape" xmi:id="_XraaOXqUEeK9jI2Tc6HWsA" type="39">
+              <element xsi:nil="true"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_XraaOnqUEeK9jI2Tc6HWsA"/>
+            </children>
+            <children xmi:type="notation:Shape" xmi:id="_XsAQEHqUEeK9jI2Tc6HWsA" type="11">
+              <children xmi:type="notation:DecorationNode" xmi:id="_XsAQEnqUEeK9jI2Tc6HWsA" type="62">
+                <layoutConstraint xmi:type="notation:Location" xmi:id="_XsAQE3qUEeK9jI2Tc6HWsA" y="5"/>
+              </children>
+              <element xmi:type="uml:StateInvariant" href="complex_multipage_model.uml#_XraaO3qUEeK9jI2Tc6HWsA"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_XsAQEXqUEeK9jI2Tc6HWsA"/>
+            </children>
+            <children xmi:type="notation:Shape" xmi:id="_XzJZ4HqUEeK9jI2Tc6HWsA" type="12">
+              <children xmi:type="notation:DecorationNode" xmi:id="_XzJZ5HqUEeK9jI2Tc6HWsA" type="10">
+                <layoutConstraint xmi:type="notation:Location" xmi:id="_XzJZ5XqUEeK9jI2Tc6HWsA" y="18"/>
+              </children>
+              <children xmi:type="notation:DecorationNode" xmi:id="_XzJZ5nqUEeK9jI2Tc6HWsA" type="58">
+                <layoutConstraint xmi:type="notation:Location" xmi:id="_XzJZ53qUEeK9jI2Tc6HWsA" y="5"/>
+              </children>
+              <styles xmi:type="notation:DescriptionStyle" xmi:id="_XzJZ4XqUEeK9jI2Tc6HWsA"/>
+              <styles xmi:type="notation:FontStyle" xmi:id="_XzJZ4nqUEeK9jI2Tc6HWsA"/>
+              <element xmi:type="uml:OccurrenceSpecification" href="complex_multipage_model.uml#_Xy_o4HqUEeK9jI2Tc6HWsA"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_XzJZ6HqUEeK9jI2Tc6HWsA" x="265" y="72"/>
+            </children>
+            <children xmi:type="notation:Shape" xmi:id="_XzJZ6XqUEeK9jI2Tc6HWsA" type="39">
+              <element xsi:nil="true"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_XzJZ6nqUEeK9jI2Tc6HWsA"/>
+            </children>
+            <children xmi:type="notation:Shape" xmi:id="_XzvPwHqUEeK9jI2Tc6HWsA" type="11">
+              <children xmi:type="notation:DecorationNode" xmi:id="_XzvPwnqUEeK9jI2Tc6HWsA" type="62">
+                <layoutConstraint xmi:type="notation:Location" xmi:id="_XzvPw3qUEeK9jI2Tc6HWsA" y="5"/>
+              </children>
+              <element xmi:type="uml:StateInvariant" href="complex_multipage_model.uml#_XzJZ63qUEeK9jI2Tc6HWsA"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_XzvPwXqUEeK9jI2Tc6HWsA"/>
+            </children>
+            <children xmi:type="notation:Shape" xmi:id="_X8FTcHqUEeK9jI2Tc6HWsA" type="12">
+              <children xmi:type="notation:DecorationNode" xmi:id="_X8FTdHqUEeK9jI2Tc6HWsA" type="10">
+                <layoutConstraint xmi:type="notation:Location" xmi:id="_X8FTdXqUEeK9jI2Tc6HWsA" y="18"/>
+              </children>
+              <children xmi:type="notation:DecorationNode" xmi:id="_X8FTdnqUEeK9jI2Tc6HWsA" type="58">
+                <layoutConstraint xmi:type="notation:Location" xmi:id="_X8FTd3qUEeK9jI2Tc6HWsA" y="5"/>
+              </children>
+              <styles xmi:type="notation:DescriptionStyle" xmi:id="_X8FTcXqUEeK9jI2Tc6HWsA"/>
+              <styles xmi:type="notation:FontStyle" xmi:id="_X8FTcnqUEeK9jI2Tc6HWsA"/>
+              <element xmi:type="uml:OccurrenceSpecification" href="complex_multipage_model.uml#_X7yYgHqUEeK9jI2Tc6HWsA"/>
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_X8FTeHqUEeK9jI2Tc6HWsA" x="338" y="66"/>
+            </children>
+            <children xmi:type="notation:Shape" xmi:id="_X8FTeXqUEeK9jI2Tc6HWsA" type="39">
+              <element xsi:nil="true"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_X8FTenqUEeK9jI2Tc6HWsA"/>
+            </children>
+            <children xmi:type="notation:Shape" xmi:id="_X8h_YHqUEeK9jI2Tc6HWsA" type="11">
+              <children xmi:type="notation:DecorationNode" xmi:id="_X8rJUXqUEeK9jI2Tc6HWsA" type="62">
+                <layoutConstraint xmi:type="notation:Location" xmi:id="_X8rJUnqUEeK9jI2Tc6HWsA" y="5"/>
+              </children>
+              <element xmi:type="uml:StateInvariant" href="complex_multipage_model.uml#_X8FTe3qUEeK9jI2Tc6HWsA"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_X8rJUHqUEeK9jI2Tc6HWsA"/>
+            </children>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_WUWgqHqUEeK9jI2Tc6HWsA"/>
+          </children>
+          <children xmi:type="notation:DecorationNode" xmi:id="_WUWgqXqUEeK9jI2Tc6HWsA" visible="false" type="82">
+            <children xmi:type="notation:Shape" xmi:id="_WUpbkHqUEeK9jI2Tc6HWsA" type="24">
+              <children xmi:type="notation:DecorationNode" xmi:id="_WUpbknqUEeK9jI2Tc6HWsA" type="80">
+                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_WUpbk3qUEeK9jI2Tc6HWsA"/>
+              </children>
+              <element xsi:nil="true"/>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_WUpbkXqUEeK9jI2Tc6HWsA"/>
+            </children>
+            <styles xmi:type="notation:SortingStyle" xmi:id="_WUWgqnqUEeK9jI2Tc6HWsA"/>
+            <styles xmi:type="notation:FilteringStyle" xmi:id="_WUWgq3qUEeK9jI2Tc6HWsA"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_WUWgrHqUEeK9jI2Tc6HWsA"/>
+          </children>
+          <element xmi:type="uml:Lifeline" href="complex_multipage_model.uml#_WT50sHqUEeK9jI2Tc6HWsA"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_WUWgoXqUEeK9jI2Tc6HWsA"/>
+        </children>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_My-4FHqUEeK9jI2Tc6HWsA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_My-4FXqUEeK9jI2Tc6HWsA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_My-4FnqUEeK9jI2Tc6HWsA"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_My-4F3qUEeK9jI2Tc6HWsA" type="29">
+        <children xmi:type="notation:Shape" xmi:id="_NFchEHqUEeK9jI2Tc6HWsA" type="24">
+          <children xmi:type="notation:DecorationNode" xmi:id="_NFchEnqUEeK9jI2Tc6HWsA" type="80">
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_NFchE3qUEeK9jI2Tc6HWsA"/>
+          </children>
+          <element xsi:nil="true"/>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_NFchEXqUEeK9jI2Tc6HWsA"/>
+        </children>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_My-4GHqUEeK9jI2Tc6HWsA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_My-4GXqUEeK9jI2Tc6HWsA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_My-4GnqUEeK9jI2Tc6HWsA"/>
+      </children>
+      <element xmi:type="uml:Interaction" href="complex_multipage_model.uml#_MyiMIHqUEeK9jI2Tc6HWsA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_My-4EXqUEeK9jI2Tc6HWsA" x="80" y="125" height="605"/>
+    </children>
+    <styles xmi:type="notation:DiagramStyle" xmi:id="_12a1sXqTEeK9jI2Tc6HWsA"/>
+    <element xmi:type="uml:Model" href="complex_multipage_model.uml#_zyAt8HqTEeK9jI2Tc6HWsA"/>
+  </notation:Diagram>
+  <notation:Diagram xmi:id="_1_fSIHqTEeK9jI2Tc6HWsA" type="PapyrusUMLTimingDiagram" name="TimingDiagram" measurementUnit="Pixel">
+    <styles xmi:type="notation:DiagramStyle" xmi:id="_1_fSIXqTEeK9jI2Tc6HWsA"/>
+    <element xmi:type="uml:Model" href="complex_multipage_model.uml#_zyAt8HqTEeK9jI2Tc6HWsA"/>
+  </notation:Diagram>
+  <notation:Diagram xmi:id="_B_L-UHqUEeK9jI2Tc6HWsA" type="PapyrusUMLClassDiagram" name="ClassDiagram" measurementUnit="Pixel">
+    <children xmi:type="notation:Shape" xmi:id="_CeuaAHqUEeK9jI2Tc6HWsA" type="2008">
+      <children xmi:type="notation:DecorationNode" xmi:id="_CeuaAnqUEeK9jI2Tc6HWsA" type="5029"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_CeuaA3qUEeK9jI2Tc6HWsA" type="7017">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_CeuaEnqUEeK9jI2Tc6HWsA" source="PapyrusCSSForceValue">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_CeuaE3qUEeK9jI2Tc6HWsA" key="showTitle" value="true"/>
+        </eAnnotations>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_CeuaBHqUEeK9jI2Tc6HWsA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_CeuaBXqUEeK9jI2Tc6HWsA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_CeuaBnqUEeK9jI2Tc6HWsA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_CeuaB3qUEeK9jI2Tc6HWsA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_CeuaCHqUEeK9jI2Tc6HWsA" type="7018">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_CeuaFHqUEeK9jI2Tc6HWsA" source="PapyrusCSSForceValue">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_CeuaFXqUEeK9jI2Tc6HWsA" key="showTitle" value="true"/>
+        </eAnnotations>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_CeuaCXqUEeK9jI2Tc6HWsA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_CeuaCnqUEeK9jI2Tc6HWsA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_CeuaC3qUEeK9jI2Tc6HWsA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_CeuaDHqUEeK9jI2Tc6HWsA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_CeuaDXqUEeK9jI2Tc6HWsA" type="7019">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_CeuaFnqUEeK9jI2Tc6HWsA" source="PapyrusCSSForceValue">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_CeuaF3qUEeK9jI2Tc6HWsA" key="showTitle" value="true"/>
+        </eAnnotations>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_CeuaDnqUEeK9jI2Tc6HWsA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_CeuaD3qUEeK9jI2Tc6HWsA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_CeuaEHqUEeK9jI2Tc6HWsA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_CeuaEXqUEeK9jI2Tc6HWsA"/>
+      </children>
+      <element xmi:type="uml:Class" href="complex_multipage_model.uml#_CeRuEHqUEeK9jI2Tc6HWsA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_CeuaAXqUEeK9jI2Tc6HWsA" x="104" y="95"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_CkrRAHqUEeK9jI2Tc6HWsA" type="2008">
+      <children xmi:type="notation:DecorationNode" xmi:id="_CkrRAnqUEeK9jI2Tc6HWsA" type="5029"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_CkrRA3qUEeK9jI2Tc6HWsA" type="7017">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Ck1CCXqUEeK9jI2Tc6HWsA" source="PapyrusCSSForceValue">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Ck1CCnqUEeK9jI2Tc6HWsA" key="showTitle" value="true"/>
+        </eAnnotations>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_CkrRBHqUEeK9jI2Tc6HWsA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_CkrRBXqUEeK9jI2Tc6HWsA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_CkrRBnqUEeK9jI2Tc6HWsA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_CkrRB3qUEeK9jI2Tc6HWsA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_CkrRCHqUEeK9jI2Tc6HWsA" type="7018">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Ck1CC3qUEeK9jI2Tc6HWsA" source="PapyrusCSSForceValue">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Ck1CDHqUEeK9jI2Tc6HWsA" key="showTitle" value="true"/>
+        </eAnnotations>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_Ck1CAHqUEeK9jI2Tc6HWsA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_Ck1CAXqUEeK9jI2Tc6HWsA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_Ck1CAnqUEeK9jI2Tc6HWsA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Ck1CA3qUEeK9jI2Tc6HWsA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_Ck1CBHqUEeK9jI2Tc6HWsA" type="7019">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Ck1CDXqUEeK9jI2Tc6HWsA" source="PapyrusCSSForceValue">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Ck1CDnqUEeK9jI2Tc6HWsA" key="showTitle" value="true"/>
+        </eAnnotations>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_Ck1CBXqUEeK9jI2Tc6HWsA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_Ck1CBnqUEeK9jI2Tc6HWsA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_Ck1CB3qUEeK9jI2Tc6HWsA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Ck1CCHqUEeK9jI2Tc6HWsA"/>
+      </children>
+      <element xmi:type="uml:Class" href="complex_multipage_model.uml#_CkYWEHqUEeK9jI2Tc6HWsA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_CkrRAXqUEeK9jI2Tc6HWsA" x="393" y="94"/>
+    </children>
+    <styles xmi:type="notation:DiagramStyle" xmi:id="_B_L-UXqUEeK9jI2Tc6HWsA"/>
+    <element xmi:type="uml:Package" href="complex_multipage_model.uml#_BYzTwHqUEeK9jI2Tc6HWsA"/>
+    <edges xmi:type="notation:Connector" xmi:id="_DTPnMHqUEeK9jI2Tc6HWsA" type="4002" source="_CeuaAHqUEeK9jI2Tc6HWsA" target="_CkrRAHqUEeK9jI2Tc6HWsA">
+      <children xmi:type="notation:DecorationNode" xmi:id="_DTPnM3qUEeK9jI2Tc6HWsA" type="6007">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_DTPnNHqUEeK9jI2Tc6HWsA" y="40"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_DTPnMXqUEeK9jI2Tc6HWsA"/>
+      <element xmi:type="uml:Generalization" href="complex_multipage_model.uml#_DS8sQHqUEeK9jI2Tc6HWsA"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_DTPnMnqUEeK9jI2Tc6HWsA" points="[50, 9, -239, 10]$[298, 49, 9, 50]"/>
+    </edges>
+  </notation:Diagram>
+</xmi:XMI>
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/basic/complex_multipage_model.uml b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/basic/complex_multipage_model.uml
index 0c842d67110..951eaa9cc2c 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/basic/complex_multipage_model.uml
+++ b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/basic/complex_multipage_model.uml
@@ -1,178 +1,178 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<uml:Model xmi:version="20110701" xmlns:xmi="http://www.omg.org/spec/XMI/20110701" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_zyAt8HqTEeK9jI2Tc6HWsA" name="model">

-  <ownedComment xmi:id="_D1TycHqUEeK9jI2Tc6HWsA">

-    <body>Complex model with many pages and a specific layout </body>

-  </ownedComment>

-  <packagedElement xmi:type="uml:Class" xmi:id="__dxKcHqTEeK9jI2Tc6HWsA" name="Class1">

-    <ownedAttribute xmi:id="__7qnYHqTEeK9jI2Tc6HWsA" name="class2" type="__o7RkHqTEeK9jI2Tc6HWsA" association="__70YYHqTEeK9jI2Tc6HWsA">

-      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="__7qnYXqTEeK9jI2Tc6HWsA" value="1"/>

-      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="__7qnYnqTEeK9jI2Tc6HWsA" value="1"/>

-    </ownedAttribute>

-  </packagedElement>

-  <packagedElement xmi:type="uml:Class" xmi:id="__o7RkHqTEeK9jI2Tc6HWsA" name="Class2"/>

-  <packagedElement xmi:type="uml:Association" xmi:id="__70YYHqTEeK9jI2Tc6HWsA" name="class1_class2_1" memberEnd="__70YYXqTEeK9jI2Tc6HWsA __7qnYHqTEeK9jI2Tc6HWsA">

-    <ownedEnd xmi:id="__70YYXqTEeK9jI2Tc6HWsA" name="class1" type="__dxKcHqTEeK9jI2Tc6HWsA" association="__70YYHqTEeK9jI2Tc6HWsA">

-      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="__70YYnqTEeK9jI2Tc6HWsA" value="1"/>

-      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="__70YY3qTEeK9jI2Tc6HWsA" value="1"/>

-    </ownedEnd>

-  </packagedElement>

-  <packagedElement xmi:type="uml:Package" xmi:id="_BYzTwHqUEeK9jI2Tc6HWsA" name="Package1">

-    <packagedElement xmi:type="uml:Class" xmi:id="_CeRuEHqUEeK9jI2Tc6HWsA" name="Class1">

-      <generalization xmi:id="_DS8sQHqUEeK9jI2Tc6HWsA" general="_CkYWEHqUEeK9jI2Tc6HWsA"/>

-    </packagedElement>

-    <packagedElement xmi:type="uml:Class" xmi:id="_CkYWEHqUEeK9jI2Tc6HWsA" name="Class2"/>

-  </packagedElement>

-  <packagedElement xmi:type="uml:Interaction" xmi:id="_MyiMIHqUEeK9jI2Tc6HWsA">

-    <fragment xmi:type="uml:StateInvariant" xmi:id="_PSMsgHqUEeK9jI2Tc6HWsA" name="S1" covered="_PM_cYHqUEeK9jI2Tc6HWsA">

-      <invariant xmi:id="_PSMsgXqUEeK9jI2Tc6HWsA">

-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PSMsgnqUEeK9jI2Tc6HWsA"/>

-      </invariant>

-    </fragment>

-    <fragment xmi:type="uml:StateInvariant" xmi:id="_R6C4gXqUEeK9jI2Tc6HWsA" name="State 1_1" covered="_Of5s4HqUEeK9jI2Tc6HWsA">

-      <eAnnotations xmi:id="_R6MpgHqUEeK9jI2Tc6HWsA" source="org.eclipse.papyrus.uml.diagram.timing.StateInvariant">

-        <details xmi:id="_R6VzcHqUEeK9jI2Tc6HWsA" key="org.eclipse.papyrus.uml.diagram.timing.StateInvariantStateDefinitionId" value="_R5v9kHqUEeK9jI2Tc6HWsA"/>

-      </eAnnotations>

-      <invariant xmi:id="_R6C4gnqUEeK9jI2Tc6HWsA" name="InState_State 1">

-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_R6C4g3qUEeK9jI2Tc6HWsA">

-          <body>State 1</body>

-        </specification>

-      </invariant>

-    </fragment>

-    <fragment xmi:type="uml:OccurrenceSpecification" xmi:id="_TDtPQHqUEeK9jI2Tc6HWsA" name="State 1_1_To_State 2_1" covered="_Of5s4HqUEeK9jI2Tc6HWsA">

-      <eAnnotations xmi:id="_TDtPQXqUEeK9jI2Tc6HWsA" source="org.eclipse.papyrus.uml.diagram.timing.autogeneratedOccurrenceSpecificationName"/>

-    </fragment>

-    <fragment xmi:type="uml:StateInvariant" xmi:id="_TEAKO3qUEeK9jI2Tc6HWsA" name="State 2_1" covered="_Of5s4HqUEeK9jI2Tc6HWsA">

-      <eAnnotations xmi:id="_TEJ7MHqUEeK9jI2Tc6HWsA" source="org.eclipse.papyrus.uml.diagram.timing.StateInvariant">

-        <details xmi:id="_TETsMHqUEeK9jI2Tc6HWsA" key="org.eclipse.papyrus.uml.diagram.timing.StateInvariantStateDefinitionId" value="_SO4gEHqUEeK9jI2Tc6HWsA"/>

-      </eAnnotations>

-      <invariant xmi:id="_TEAKPHqUEeK9jI2Tc6HWsA" name="InState_State 2">

-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_TEAKPXqUEeK9jI2Tc6HWsA">

-          <body>State 2</body>

-        </specification>

-      </invariant>

-    </fragment>

-    <fragment xmi:type="uml:OccurrenceSpecification" xmi:id="_UCXP4HqUEeK9jI2Tc6HWsA" name="State 2_1_To_State 1_2" covered="_Of5s4HqUEeK9jI2Tc6HWsA">

-      <eAnnotations xmi:id="_UCXP4XqUEeK9jI2Tc6HWsA" source="org.eclipse.papyrus.uml.diagram.timing.autogeneratedOccurrenceSpecificationName"/>

-    </fragment>

-    <fragment xmi:type="uml:StateInvariant" xmi:id="_UCqK23qUEeK9jI2Tc6HWsA" name="State 1_2" covered="_Of5s4HqUEeK9jI2Tc6HWsA">

-      <eAnnotations xmi:id="_UC9FwHqUEeK9jI2Tc6HWsA" source="org.eclipse.papyrus.uml.diagram.timing.StateInvariant">

-        <details xmi:id="_UC9FwXqUEeK9jI2Tc6HWsA" key="org.eclipse.papyrus.uml.diagram.timing.StateInvariantStateDefinitionId" value="_R5v9kHqUEeK9jI2Tc6HWsA"/>

-      </eAnnotations>

-      <invariant xmi:id="_UCqK3HqUEeK9jI2Tc6HWsA" name="InState_State 1">

-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_UCqK3XqUEeK9jI2Tc6HWsA">

-          <body>State 1</body>

-        </specification>

-      </invariant>

-    </fragment>

-    <fragment xmi:type="uml:OccurrenceSpecification" xmi:id="_Uglc8HqUEeK9jI2Tc6HWsA" name="&lt;unnamed>_To_&lt;unnamed>" covered="_PM_cYHqUEeK9jI2Tc6HWsA">

-      <eAnnotations xmi:id="_Uglc8XqUEeK9jI2Tc6HWsA" source="org.eclipse.papyrus.uml.diagram.timing.autogeneratedOccurrenceSpecificationName"/>

-    </fragment>

-    <fragment xmi:type="uml:StateInvariant" xmi:id="_Ugum6XqUEeK9jI2Tc6HWsA" name="S2" covered="_PM_cYHqUEeK9jI2Tc6HWsA">

-      <invariant xmi:id="_Ugum6nqUEeK9jI2Tc6HWsA">

-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Ugum63qUEeK9jI2Tc6HWsA"/>

-      </invariant>

-    </fragment>

-    <fragment xmi:type="uml:OccurrenceSpecification" xmi:id="_Zz37gHqUEeK9jI2Tc6HWsA" name="&lt;unnamed>_To_&lt;unnamed>" covered="_PM_cYHqUEeK9jI2Tc6HWsA">

-      <eAnnotations xmi:id="_Zz37gXqUEeK9jI2Tc6HWsA" source="org.eclipse.papyrus.uml.diagram.timing.autogeneratedOccurrenceSpecificationName"/>

-    </fragment>

-    <fragment xmi:type="uml:StateInvariant" xmi:id="_Z0BFeXqUEeK9jI2Tc6HWsA" name="S3" covered="_PM_cYHqUEeK9jI2Tc6HWsA">

-      <invariant xmi:id="_Z0BFenqUEeK9jI2Tc6HWsA">

-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Z0BFe3qUEeK9jI2Tc6HWsA"/>

-      </invariant>

-    </fragment>

-    <fragment xmi:type="uml:OccurrenceSpecification" xmi:id="_Ut-_wHqUEeK9jI2Tc6HWsA" name="&lt;unnamed>_To_&lt;unnamed>" covered="_PM_cYHqUEeK9jI2Tc6HWsA">

-      <eAnnotations xmi:id="_Ut-_wXqUEeK9jI2Tc6HWsA" source="org.eclipse.papyrus.uml.diagram.timing.autogeneratedOccurrenceSpecificationName"/>

-    </fragment>

-    <fragment xmi:type="uml:StateInvariant" xmi:id="_UuIJuXqUEeK9jI2Tc6HWsA" name="S4" covered="_PM_cYHqUEeK9jI2Tc6HWsA">

-      <invariant xmi:id="_UuIJunqUEeK9jI2Tc6HWsA">

-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_UuIJu3qUEeK9jI2Tc6HWsA"/>

-      </invariant>

-    </fragment>

-    <fragment xmi:type="uml:StateInvariant" xmi:id="_WtpxcXqUEeK9jI2Tc6HWsA" name="State 1_1" covered="_WT50sHqUEeK9jI2Tc6HWsA">

-      <eAnnotations xmi:id="_Wty7YHqUEeK9jI2Tc6HWsA" source="org.eclipse.papyrus.uml.diagram.timing.StateInvariant">

-        <details xmi:id="_Wt8sYHqUEeK9jI2Tc6HWsA" key="org.eclipse.papyrus.uml.diagram.timing.StateInvariantStateDefinitionId" value="_WtWPcHqUEeK9jI2Tc6HWsA"/>

-      </eAnnotations>

-      <invariant xmi:id="_WtpxcnqUEeK9jI2Tc6HWsA" name="InState_State 1">

-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Wtpxc3qUEeK9jI2Tc6HWsA">

-          <body>State 1</body>

-        </specification>

-      </invariant>

-    </fragment>

-    <fragment xmi:type="uml:OccurrenceSpecification" xmi:id="_Xjz9YHqUEeK9jI2Tc6HWsA" name="State 1_1_To_State 3_1" covered="_WT50sHqUEeK9jI2Tc6HWsA">

-      <eAnnotations xmi:id="_Xjz9YXqUEeK9jI2Tc6HWsA" source="org.eclipse.papyrus.uml.diagram.timing.autogeneratedOccurrenceSpecificationName"/>

-    </fragment>

-    <fragment xmi:type="uml:StateInvariant" xmi:id="_Xj9ua3qUEeK9jI2Tc6HWsA" name="State 3_1" covered="_WT50sHqUEeK9jI2Tc6HWsA">

-      <eAnnotations xmi:id="_XkQpUHqUEeK9jI2Tc6HWsA" source="org.eclipse.papyrus.uml.diagram.timing.StateInvariant">

-        <details xmi:id="_XkQpUXqUEeK9jI2Tc6HWsA" key="org.eclipse.papyrus.uml.diagram.timing.StateInvariantStateDefinitionId" value="_YUelUHqUEeK9jI2Tc6HWsA"/>

-      </eAnnotations>

-      <invariant xmi:id="_Xj9ubHqUEeK9jI2Tc6HWsA" name="InState_State 3">

-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Xj9ubXqUEeK9jI2Tc6HWsA">

-          <body>State 3</body>

-        </specification>

-      </invariant>

-    </fragment>

-    <fragment xmi:type="uml:OccurrenceSpecification" xmi:id="_XrQpMHqUEeK9jI2Tc6HWsA" name="State 3_1_To_State 2_1" covered="_WT50sHqUEeK9jI2Tc6HWsA">

-      <eAnnotations xmi:id="_XrQpMXqUEeK9jI2Tc6HWsA" source="org.eclipse.papyrus.uml.diagram.timing.autogeneratedOccurrenceSpecificationName"/>

-    </fragment>

-    <fragment xmi:type="uml:StateInvariant" xmi:id="_XraaO3qUEeK9jI2Tc6HWsA" name="State 2_1" covered="_WT50sHqUEeK9jI2Tc6HWsA">

-      <eAnnotations xmi:id="_XrtVIHqUEeK9jI2Tc6HWsA" source="org.eclipse.papyrus.uml.diagram.timing.StateInvariant">

-        <details xmi:id="_XrtVIXqUEeK9jI2Tc6HWsA" key="org.eclipse.papyrus.uml.diagram.timing.StateInvariantStateDefinitionId" value="_W1PnMHqUEeK9jI2Tc6HWsA"/>

-      </eAnnotations>

-      <invariant xmi:id="_XraaPHqUEeK9jI2Tc6HWsA" name="InState_State 2">

-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_XraaPXqUEeK9jI2Tc6HWsA">

-          <body>State 2</body>

-        </specification>

-      </invariant>

-    </fragment>

-    <fragment xmi:type="uml:OccurrenceSpecification" xmi:id="_Xy_o4HqUEeK9jI2Tc6HWsA" name="State 2_1_To_State 1_2" covered="_WT50sHqUEeK9jI2Tc6HWsA">

-      <eAnnotations xmi:id="_Xy_o4XqUEeK9jI2Tc6HWsA" source="org.eclipse.papyrus.uml.diagram.timing.autogeneratedOccurrenceSpecificationName"/>

-    </fragment>

-    <fragment xmi:type="uml:StateInvariant" xmi:id="_XzJZ63qUEeK9jI2Tc6HWsA" name="State 1_2" covered="_WT50sHqUEeK9jI2Tc6HWsA">

-      <eAnnotations xmi:id="_XzSj0HqUEeK9jI2Tc6HWsA" source="org.eclipse.papyrus.uml.diagram.timing.StateInvariant">

-        <details xmi:id="_XzcU0HqUEeK9jI2Tc6HWsA" key="org.eclipse.papyrus.uml.diagram.timing.StateInvariantStateDefinitionId" value="_WtWPcHqUEeK9jI2Tc6HWsA"/>

-      </eAnnotations>

-      <invariant xmi:id="_XzJZ7HqUEeK9jI2Tc6HWsA" name="InState_State 1">

-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_XzJZ7XqUEeK9jI2Tc6HWsA">

-          <body>State 1</body>

-        </specification>

-      </invariant>

-    </fragment>

-    <fragment xmi:type="uml:OccurrenceSpecification" xmi:id="_X7yYgHqUEeK9jI2Tc6HWsA" name="State 1_2_To_State 3_2" covered="_WT50sHqUEeK9jI2Tc6HWsA">

-      <eAnnotations xmi:id="_X7yYgXqUEeK9jI2Tc6HWsA" source="org.eclipse.papyrus.uml.diagram.timing.autogeneratedOccurrenceSpecificationName"/>

-    </fragment>

-    <fragment xmi:type="uml:StateInvariant" xmi:id="_X8FTe3qUEeK9jI2Tc6HWsA" name="State 3_2" covered="_WT50sHqUEeK9jI2Tc6HWsA">

-      <eAnnotations xmi:id="_X8OdYHqUEeK9jI2Tc6HWsA" source="org.eclipse.papyrus.uml.diagram.timing.StateInvariant">

-        <details xmi:id="_X8YOYHqUEeK9jI2Tc6HWsA" key="org.eclipse.papyrus.uml.diagram.timing.StateInvariantStateDefinitionId" value="_YUelUHqUEeK9jI2Tc6HWsA"/>

-      </eAnnotations>

-      <invariant xmi:id="_X8FTfHqUEeK9jI2Tc6HWsA" name="InState_State 3">

-        <specification xmi:type="uml:OpaqueExpression" xmi:id="_X8FTfXqUEeK9jI2Tc6HWsA">

-          <body>State 3</body>

-        </specification>

-      </invariant>

-    </fragment>

-    <lifeline xmi:id="_Of5s4HqUEeK9jI2Tc6HWsA" coveredBy="_R6C4gXqUEeK9jI2Tc6HWsA _TDtPQHqUEeK9jI2Tc6HWsA _TEAKO3qUEeK9jI2Tc6HWsA _UCXP4HqUEeK9jI2Tc6HWsA _UCqK23qUEeK9jI2Tc6HWsA">

-      <eAnnotations xmi:id="_OgWY0HqUEeK9jI2Tc6HWsA" source="org.eclipse.papyrus.uml.diagram.timing.lifeline">

-        <details xmi:id="_OggJ0HqUEeK9jI2Tc6HWsA" key="type" value="full"/>

-      </eAnnotations>

-      <eAnnotations xmi:id="_R5v9k3qUEeK9jI2Tc6HWsA" source="org.eclipse.papyrus.uml.diagram.timing.LifelineStateDefinitions">

-        <details xmi:id="_R55ukHqUEeK9jI2Tc6HWsA" key="_R5v9kHqUEeK9jI2Tc6HWsA" value="State 1"/>

-        <details xmi:id="_SO4gE3qUEeK9jI2Tc6HWsA" key="_SO4gEHqUEeK9jI2Tc6HWsA" value="State 2"/>

-      </eAnnotations>

-    </lifeline>

-    <lifeline xmi:id="_PM_cYHqUEeK9jI2Tc6HWsA" coveredBy="_PSMsgHqUEeK9jI2Tc6HWsA _Uglc8HqUEeK9jI2Tc6HWsA _Ugum6XqUEeK9jI2Tc6HWsA _Zz37gHqUEeK9jI2Tc6HWsA _Z0BFeXqUEeK9jI2Tc6HWsA _Ut-_wHqUEeK9jI2Tc6HWsA _UuIJuXqUEeK9jI2Tc6HWsA">

-      <eAnnotations xmi:id="_PNSXUHqUEeK9jI2Tc6HWsA" source="org.eclipse.papyrus.uml.diagram.timing.lifeline">

-        <details xmi:id="_PNSXUXqUEeK9jI2Tc6HWsA" key="type" value="compact"/>

-      </eAnnotations>

-    </lifeline>

-    <lifeline xmi:id="_WT50sHqUEeK9jI2Tc6HWsA" coveredBy="_WtpxcXqUEeK9jI2Tc6HWsA _Xjz9YHqUEeK9jI2Tc6HWsA _Xj9ua3qUEeK9jI2Tc6HWsA _XrQpMHqUEeK9jI2Tc6HWsA _XraaO3qUEeK9jI2Tc6HWsA _Xy_o4HqUEeK9jI2Tc6HWsA _XzJZ63qUEeK9jI2Tc6HWsA _X7yYgHqUEeK9jI2Tc6HWsA _X8FTe3qUEeK9jI2Tc6HWsA">

-      <eAnnotations xmi:id="_WUC-oHqUEeK9jI2Tc6HWsA" source="org.eclipse.papyrus.uml.diagram.timing.lifeline">

-        <details xmi:id="_WUMvoHqUEeK9jI2Tc6HWsA" key="type" value="full"/>

-      </eAnnotations>

-      <eAnnotations xmi:id="_WtWPc3qUEeK9jI2Tc6HWsA" source="org.eclipse.papyrus.uml.diagram.timing.LifelineStateDefinitions">

-        <details xmi:id="_WtgAcHqUEeK9jI2Tc6HWsA" key="_WtWPcHqUEeK9jI2Tc6HWsA" value="State 1"/>

-        <details xmi:id="_W1PnM3qUEeK9jI2Tc6HWsA" key="_W1PnMHqUEeK9jI2Tc6HWsA" value="State 2"/>

-        <details xmi:id="_YUelU3qUEeK9jI2Tc6HWsA" key="_YUelUHqUEeK9jI2Tc6HWsA" value="State 3"/>

-      </eAnnotations>

-    </lifeline>

-  </packagedElement>

-</uml:Model>

+<?xml version="1.0" encoding="UTF-8"?>
+<uml:Model xmi:version="20110701" xmlns:xmi="http://www.omg.org/spec/XMI/20110701" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_zyAt8HqTEeK9jI2Tc6HWsA" name="model">
+  <ownedComment xmi:id="_D1TycHqUEeK9jI2Tc6HWsA">
+    <body>Complex model with many pages and a specific layout </body>
+  </ownedComment>
+  <packagedElement xmi:type="uml:Class" xmi:id="__dxKcHqTEeK9jI2Tc6HWsA" name="Class1">
+    <ownedAttribute xmi:id="__7qnYHqTEeK9jI2Tc6HWsA" name="class2" type="__o7RkHqTEeK9jI2Tc6HWsA" association="__70YYHqTEeK9jI2Tc6HWsA">
+      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="__7qnYXqTEeK9jI2Tc6HWsA" value="1"/>
+      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="__7qnYnqTEeK9jI2Tc6HWsA" value="1"/>
+    </ownedAttribute>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Class" xmi:id="__o7RkHqTEeK9jI2Tc6HWsA" name="Class2"/>
+  <packagedElement xmi:type="uml:Association" xmi:id="__70YYHqTEeK9jI2Tc6HWsA" name="class1_class2_1" memberEnd="__70YYXqTEeK9jI2Tc6HWsA __7qnYHqTEeK9jI2Tc6HWsA">
+    <ownedEnd xmi:id="__70YYXqTEeK9jI2Tc6HWsA" name="class1" type="__dxKcHqTEeK9jI2Tc6HWsA" association="__70YYHqTEeK9jI2Tc6HWsA">
+      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="__70YYnqTEeK9jI2Tc6HWsA" value="1"/>
+      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="__70YY3qTEeK9jI2Tc6HWsA" value="1"/>
+    </ownedEnd>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Package" xmi:id="_BYzTwHqUEeK9jI2Tc6HWsA" name="Package1">
+    <packagedElement xmi:type="uml:Class" xmi:id="_CeRuEHqUEeK9jI2Tc6HWsA" name="Class1">
+      <generalization xmi:id="_DS8sQHqUEeK9jI2Tc6HWsA" general="_CkYWEHqUEeK9jI2Tc6HWsA"/>
+    </packagedElement>
+    <packagedElement xmi:type="uml:Class" xmi:id="_CkYWEHqUEeK9jI2Tc6HWsA" name="Class2"/>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Interaction" xmi:id="_MyiMIHqUEeK9jI2Tc6HWsA">
+    <fragment xmi:type="uml:StateInvariant" xmi:id="_PSMsgHqUEeK9jI2Tc6HWsA" name="S1" covered="_PM_cYHqUEeK9jI2Tc6HWsA">
+      <invariant xmi:id="_PSMsgXqUEeK9jI2Tc6HWsA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_PSMsgnqUEeK9jI2Tc6HWsA"/>
+      </invariant>
+    </fragment>
+    <fragment xmi:type="uml:StateInvariant" xmi:id="_R6C4gXqUEeK9jI2Tc6HWsA" name="State 1_1" covered="_Of5s4HqUEeK9jI2Tc6HWsA">
+      <eAnnotations xmi:id="_R6MpgHqUEeK9jI2Tc6HWsA" source="org.eclipse.papyrus.uml.diagram.timing.StateInvariant">
+        <details xmi:id="_R6VzcHqUEeK9jI2Tc6HWsA" key="org.eclipse.papyrus.uml.diagram.timing.StateInvariantStateDefinitionId" value="_R5v9kHqUEeK9jI2Tc6HWsA"/>
+      </eAnnotations>
+      <invariant xmi:id="_R6C4gnqUEeK9jI2Tc6HWsA" name="InState_State 1">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_R6C4g3qUEeK9jI2Tc6HWsA">
+          <body>State 1</body>
+        </specification>
+      </invariant>
+    </fragment>
+    <fragment xmi:type="uml:OccurrenceSpecification" xmi:id="_TDtPQHqUEeK9jI2Tc6HWsA" name="State 1_1_To_State 2_1" covered="_Of5s4HqUEeK9jI2Tc6HWsA">
+      <eAnnotations xmi:id="_TDtPQXqUEeK9jI2Tc6HWsA" source="org.eclipse.papyrus.uml.diagram.timing.autogeneratedOccurrenceSpecificationName"/>
+    </fragment>
+    <fragment xmi:type="uml:StateInvariant" xmi:id="_TEAKO3qUEeK9jI2Tc6HWsA" name="State 2_1" covered="_Of5s4HqUEeK9jI2Tc6HWsA">
+      <eAnnotations xmi:id="_TEJ7MHqUEeK9jI2Tc6HWsA" source="org.eclipse.papyrus.uml.diagram.timing.StateInvariant">
+        <details xmi:id="_TETsMHqUEeK9jI2Tc6HWsA" key="org.eclipse.papyrus.uml.diagram.timing.StateInvariantStateDefinitionId" value="_SO4gEHqUEeK9jI2Tc6HWsA"/>
+      </eAnnotations>
+      <invariant xmi:id="_TEAKPHqUEeK9jI2Tc6HWsA" name="InState_State 2">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_TEAKPXqUEeK9jI2Tc6HWsA">
+          <body>State 2</body>
+        </specification>
+      </invariant>
+    </fragment>
+    <fragment xmi:type="uml:OccurrenceSpecification" xmi:id="_UCXP4HqUEeK9jI2Tc6HWsA" name="State 2_1_To_State 1_2" covered="_Of5s4HqUEeK9jI2Tc6HWsA">
+      <eAnnotations xmi:id="_UCXP4XqUEeK9jI2Tc6HWsA" source="org.eclipse.papyrus.uml.diagram.timing.autogeneratedOccurrenceSpecificationName"/>
+    </fragment>
+    <fragment xmi:type="uml:StateInvariant" xmi:id="_UCqK23qUEeK9jI2Tc6HWsA" name="State 1_2" covered="_Of5s4HqUEeK9jI2Tc6HWsA">
+      <eAnnotations xmi:id="_UC9FwHqUEeK9jI2Tc6HWsA" source="org.eclipse.papyrus.uml.diagram.timing.StateInvariant">
+        <details xmi:id="_UC9FwXqUEeK9jI2Tc6HWsA" key="org.eclipse.papyrus.uml.diagram.timing.StateInvariantStateDefinitionId" value="_R5v9kHqUEeK9jI2Tc6HWsA"/>
+      </eAnnotations>
+      <invariant xmi:id="_UCqK3HqUEeK9jI2Tc6HWsA" name="InState_State 1">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_UCqK3XqUEeK9jI2Tc6HWsA">
+          <body>State 1</body>
+        </specification>
+      </invariant>
+    </fragment>
+    <fragment xmi:type="uml:OccurrenceSpecification" xmi:id="_Uglc8HqUEeK9jI2Tc6HWsA" name="&lt;unnamed>_To_&lt;unnamed>" covered="_PM_cYHqUEeK9jI2Tc6HWsA">
+      <eAnnotations xmi:id="_Uglc8XqUEeK9jI2Tc6HWsA" source="org.eclipse.papyrus.uml.diagram.timing.autogeneratedOccurrenceSpecificationName"/>
+    </fragment>
+    <fragment xmi:type="uml:StateInvariant" xmi:id="_Ugum6XqUEeK9jI2Tc6HWsA" name="S2" covered="_PM_cYHqUEeK9jI2Tc6HWsA">
+      <invariant xmi:id="_Ugum6nqUEeK9jI2Tc6HWsA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Ugum63qUEeK9jI2Tc6HWsA"/>
+      </invariant>
+    </fragment>
+    <fragment xmi:type="uml:OccurrenceSpecification" xmi:id="_Zz37gHqUEeK9jI2Tc6HWsA" name="&lt;unnamed>_To_&lt;unnamed>" covered="_PM_cYHqUEeK9jI2Tc6HWsA">
+      <eAnnotations xmi:id="_Zz37gXqUEeK9jI2Tc6HWsA" source="org.eclipse.papyrus.uml.diagram.timing.autogeneratedOccurrenceSpecificationName"/>
+    </fragment>
+    <fragment xmi:type="uml:StateInvariant" xmi:id="_Z0BFeXqUEeK9jI2Tc6HWsA" name="S3" covered="_PM_cYHqUEeK9jI2Tc6HWsA">
+      <invariant xmi:id="_Z0BFenqUEeK9jI2Tc6HWsA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Z0BFe3qUEeK9jI2Tc6HWsA"/>
+      </invariant>
+    </fragment>
+    <fragment xmi:type="uml:OccurrenceSpecification" xmi:id="_Ut-_wHqUEeK9jI2Tc6HWsA" name="&lt;unnamed>_To_&lt;unnamed>" covered="_PM_cYHqUEeK9jI2Tc6HWsA">
+      <eAnnotations xmi:id="_Ut-_wXqUEeK9jI2Tc6HWsA" source="org.eclipse.papyrus.uml.diagram.timing.autogeneratedOccurrenceSpecificationName"/>
+    </fragment>
+    <fragment xmi:type="uml:StateInvariant" xmi:id="_UuIJuXqUEeK9jI2Tc6HWsA" name="S4" covered="_PM_cYHqUEeK9jI2Tc6HWsA">
+      <invariant xmi:id="_UuIJunqUEeK9jI2Tc6HWsA">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_UuIJu3qUEeK9jI2Tc6HWsA"/>
+      </invariant>
+    </fragment>
+    <fragment xmi:type="uml:StateInvariant" xmi:id="_WtpxcXqUEeK9jI2Tc6HWsA" name="State 1_1" covered="_WT50sHqUEeK9jI2Tc6HWsA">
+      <eAnnotations xmi:id="_Wty7YHqUEeK9jI2Tc6HWsA" source="org.eclipse.papyrus.uml.diagram.timing.StateInvariant">
+        <details xmi:id="_Wt8sYHqUEeK9jI2Tc6HWsA" key="org.eclipse.papyrus.uml.diagram.timing.StateInvariantStateDefinitionId" value="_WtWPcHqUEeK9jI2Tc6HWsA"/>
+      </eAnnotations>
+      <invariant xmi:id="_WtpxcnqUEeK9jI2Tc6HWsA" name="InState_State 1">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Wtpxc3qUEeK9jI2Tc6HWsA">
+          <body>State 1</body>
+        </specification>
+      </invariant>
+    </fragment>
+    <fragment xmi:type="uml:OccurrenceSpecification" xmi:id="_Xjz9YHqUEeK9jI2Tc6HWsA" name="State 1_1_To_State 3_1" covered="_WT50sHqUEeK9jI2Tc6HWsA">
+      <eAnnotations xmi:id="_Xjz9YXqUEeK9jI2Tc6HWsA" source="org.eclipse.papyrus.uml.diagram.timing.autogeneratedOccurrenceSpecificationName"/>
+    </fragment>
+    <fragment xmi:type="uml:StateInvariant" xmi:id="_Xj9ua3qUEeK9jI2Tc6HWsA" name="State 3_1" covered="_WT50sHqUEeK9jI2Tc6HWsA">
+      <eAnnotations xmi:id="_XkQpUHqUEeK9jI2Tc6HWsA" source="org.eclipse.papyrus.uml.diagram.timing.StateInvariant">
+        <details xmi:id="_XkQpUXqUEeK9jI2Tc6HWsA" key="org.eclipse.papyrus.uml.diagram.timing.StateInvariantStateDefinitionId" value="_YUelUHqUEeK9jI2Tc6HWsA"/>
+      </eAnnotations>
+      <invariant xmi:id="_Xj9ubHqUEeK9jI2Tc6HWsA" name="InState_State 3">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_Xj9ubXqUEeK9jI2Tc6HWsA">
+          <body>State 3</body>
+        </specification>
+      </invariant>
+    </fragment>
+    <fragment xmi:type="uml:OccurrenceSpecification" xmi:id="_XrQpMHqUEeK9jI2Tc6HWsA" name="State 3_1_To_State 2_1" covered="_WT50sHqUEeK9jI2Tc6HWsA">
+      <eAnnotations xmi:id="_XrQpMXqUEeK9jI2Tc6HWsA" source="org.eclipse.papyrus.uml.diagram.timing.autogeneratedOccurrenceSpecificationName"/>
+    </fragment>
+    <fragment xmi:type="uml:StateInvariant" xmi:id="_XraaO3qUEeK9jI2Tc6HWsA" name="State 2_1" covered="_WT50sHqUEeK9jI2Tc6HWsA">
+      <eAnnotations xmi:id="_XrtVIHqUEeK9jI2Tc6HWsA" source="org.eclipse.papyrus.uml.diagram.timing.StateInvariant">
+        <details xmi:id="_XrtVIXqUEeK9jI2Tc6HWsA" key="org.eclipse.papyrus.uml.diagram.timing.StateInvariantStateDefinitionId" value="_W1PnMHqUEeK9jI2Tc6HWsA"/>
+      </eAnnotations>
+      <invariant xmi:id="_XraaPHqUEeK9jI2Tc6HWsA" name="InState_State 2">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_XraaPXqUEeK9jI2Tc6HWsA">
+          <body>State 2</body>
+        </specification>
+      </invariant>
+    </fragment>
+    <fragment xmi:type="uml:OccurrenceSpecification" xmi:id="_Xy_o4HqUEeK9jI2Tc6HWsA" name="State 2_1_To_State 1_2" covered="_WT50sHqUEeK9jI2Tc6HWsA">
+      <eAnnotations xmi:id="_Xy_o4XqUEeK9jI2Tc6HWsA" source="org.eclipse.papyrus.uml.diagram.timing.autogeneratedOccurrenceSpecificationName"/>
+    </fragment>
+    <fragment xmi:type="uml:StateInvariant" xmi:id="_XzJZ63qUEeK9jI2Tc6HWsA" name="State 1_2" covered="_WT50sHqUEeK9jI2Tc6HWsA">
+      <eAnnotations xmi:id="_XzSj0HqUEeK9jI2Tc6HWsA" source="org.eclipse.papyrus.uml.diagram.timing.StateInvariant">
+        <details xmi:id="_XzcU0HqUEeK9jI2Tc6HWsA" key="org.eclipse.papyrus.uml.diagram.timing.StateInvariantStateDefinitionId" value="_WtWPcHqUEeK9jI2Tc6HWsA"/>
+      </eAnnotations>
+      <invariant xmi:id="_XzJZ7HqUEeK9jI2Tc6HWsA" name="InState_State 1">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_XzJZ7XqUEeK9jI2Tc6HWsA">
+          <body>State 1</body>
+        </specification>
+      </invariant>
+    </fragment>
+    <fragment xmi:type="uml:OccurrenceSpecification" xmi:id="_X7yYgHqUEeK9jI2Tc6HWsA" name="State 1_2_To_State 3_2" covered="_WT50sHqUEeK9jI2Tc6HWsA">
+      <eAnnotations xmi:id="_X7yYgXqUEeK9jI2Tc6HWsA" source="org.eclipse.papyrus.uml.diagram.timing.autogeneratedOccurrenceSpecificationName"/>
+    </fragment>
+    <fragment xmi:type="uml:StateInvariant" xmi:id="_X8FTe3qUEeK9jI2Tc6HWsA" name="State 3_2" covered="_WT50sHqUEeK9jI2Tc6HWsA">
+      <eAnnotations xmi:id="_X8OdYHqUEeK9jI2Tc6HWsA" source="org.eclipse.papyrus.uml.diagram.timing.StateInvariant">
+        <details xmi:id="_X8YOYHqUEeK9jI2Tc6HWsA" key="org.eclipse.papyrus.uml.diagram.timing.StateInvariantStateDefinitionId" value="_YUelUHqUEeK9jI2Tc6HWsA"/>
+      </eAnnotations>
+      <invariant xmi:id="_X8FTfHqUEeK9jI2Tc6HWsA" name="InState_State 3">
+        <specification xmi:type="uml:OpaqueExpression" xmi:id="_X8FTfXqUEeK9jI2Tc6HWsA">
+          <body>State 3</body>
+        </specification>
+      </invariant>
+    </fragment>
+    <lifeline xmi:id="_Of5s4HqUEeK9jI2Tc6HWsA" coveredBy="_R6C4gXqUEeK9jI2Tc6HWsA _TDtPQHqUEeK9jI2Tc6HWsA _TEAKO3qUEeK9jI2Tc6HWsA _UCXP4HqUEeK9jI2Tc6HWsA _UCqK23qUEeK9jI2Tc6HWsA">
+      <eAnnotations xmi:id="_OgWY0HqUEeK9jI2Tc6HWsA" source="org.eclipse.papyrus.uml.diagram.timing.lifeline">
+        <details xmi:id="_OggJ0HqUEeK9jI2Tc6HWsA" key="type" value="full"/>
+      </eAnnotations>
+      <eAnnotations xmi:id="_R5v9k3qUEeK9jI2Tc6HWsA" source="org.eclipse.papyrus.uml.diagram.timing.LifelineStateDefinitions">
+        <details xmi:id="_R55ukHqUEeK9jI2Tc6HWsA" key="_R5v9kHqUEeK9jI2Tc6HWsA" value="State 1"/>
+        <details xmi:id="_SO4gE3qUEeK9jI2Tc6HWsA" key="_SO4gEHqUEeK9jI2Tc6HWsA" value="State 2"/>
+      </eAnnotations>
+    </lifeline>
+    <lifeline xmi:id="_PM_cYHqUEeK9jI2Tc6HWsA" coveredBy="_PSMsgHqUEeK9jI2Tc6HWsA _Uglc8HqUEeK9jI2Tc6HWsA _Ugum6XqUEeK9jI2Tc6HWsA _Zz37gHqUEeK9jI2Tc6HWsA _Z0BFeXqUEeK9jI2Tc6HWsA _Ut-_wHqUEeK9jI2Tc6HWsA _UuIJuXqUEeK9jI2Tc6HWsA">
+      <eAnnotations xmi:id="_PNSXUHqUEeK9jI2Tc6HWsA" source="org.eclipse.papyrus.uml.diagram.timing.lifeline">
+        <details xmi:id="_PNSXUXqUEeK9jI2Tc6HWsA" key="type" value="compact"/>
+      </eAnnotations>
+    </lifeline>
+    <lifeline xmi:id="_WT50sHqUEeK9jI2Tc6HWsA" coveredBy="_WtpxcXqUEeK9jI2Tc6HWsA _Xjz9YHqUEeK9jI2Tc6HWsA _Xj9ua3qUEeK9jI2Tc6HWsA _XrQpMHqUEeK9jI2Tc6HWsA _XraaO3qUEeK9jI2Tc6HWsA _Xy_o4HqUEeK9jI2Tc6HWsA _XzJZ63qUEeK9jI2Tc6HWsA _X7yYgHqUEeK9jI2Tc6HWsA _X8FTe3qUEeK9jI2Tc6HWsA">
+      <eAnnotations xmi:id="_WUC-oHqUEeK9jI2Tc6HWsA" source="org.eclipse.papyrus.uml.diagram.timing.lifeline">
+        <details xmi:id="_WUMvoHqUEeK9jI2Tc6HWsA" key="type" value="full"/>
+      </eAnnotations>
+      <eAnnotations xmi:id="_WtWPc3qUEeK9jI2Tc6HWsA" source="org.eclipse.papyrus.uml.diagram.timing.LifelineStateDefinitions">
+        <details xmi:id="_WtgAcHqUEeK9jI2Tc6HWsA" key="_WtWPcHqUEeK9jI2Tc6HWsA" value="State 1"/>
+        <details xmi:id="_W1PnM3qUEeK9jI2Tc6HWsA" key="_W1PnMHqUEeK9jI2Tc6HWsA" value="State 2"/>
+        <details xmi:id="_YUelU3qUEeK9jI2Tc6HWsA" key="_YUelUHqUEeK9jI2Tc6HWsA" value="State 3"/>
+      </eAnnotations>
+    </lifeline>
+  </packagedElement>
+</uml:Model>
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/basic/delete_contained_diagram.di b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/basic/delete_contained_diagram.di
index f1f92bb0083..8ae13a19f1e 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/basic/delete_contained_diagram.di
+++ b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/basic/delete_contained_diagram.di
@@ -1,35 +1,35 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<di:SashWindowsMngr xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi">

-  <pageList>

-    <availablePage>

-      <emfPageIdentifier href="delete_contained_diagram.notation#_7KiAcHxQEeKD0tnoPLkh-A"/>

-    </availablePage>

-    <availablePage>

-      <emfPageIdentifier href="delete_contained_diagram.notation#_45GUoH9WEeKg8Ob6i-v52w"/>

-    </availablePage>

-    <availablePage>

-      <emfPageIdentifier href="delete_contained_diagram.notation#_GeJbwH9cEeKUSOg4DHoPwA"/>

-    </availablePage>

-    <availablePage>

-      <emfPageIdentifier href="delete_contained_diagram.notation#_HGUPAH9cEeKUSOg4DHoPwA"/>

-    </availablePage>

-    <availablePage>

-      <emfPageIdentifier href="delete_contained_diagram.notation#_a0DxsH9sEeKFzdr7iEywzg"/>

-    </availablePage>

-  </pageList>

-  <sashModel currentSelection="//@sashModel/@windows.0/@children.0">

-    <windows>

-      <children xsi:type="di:TabFolder">

-        <children>

-          <emfPageIdentifier href="delete_contained_diagram.notation#_45GUoH9WEeKg8Ob6i-v52w"/>

-        </children>

-        <children>

-          <emfPageIdentifier href="delete_contained_diagram.notation#_GeJbwH9cEeKUSOg4DHoPwA"/>

-        </children>

-        <children>

-          <emfPageIdentifier href="delete_contained_diagram.notation#_7KiAcHxQEeKD0tnoPLkh-A"/>

-        </children>

-      </children>

-    </windows>

-  </sashModel>

-</di:SashWindowsMngr>

+<?xml version="1.0" encoding="UTF-8"?>
+<di:SashWindowsMngr xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi">
+  <pageList>
+    <availablePage>
+      <emfPageIdentifier href="delete_contained_diagram.notation#_7KiAcHxQEeKD0tnoPLkh-A"/>
+    </availablePage>
+    <availablePage>
+      <emfPageIdentifier href="delete_contained_diagram.notation#_45GUoH9WEeKg8Ob6i-v52w"/>
+    </availablePage>
+    <availablePage>
+      <emfPageIdentifier href="delete_contained_diagram.notation#_GeJbwH9cEeKUSOg4DHoPwA"/>
+    </availablePage>
+    <availablePage>
+      <emfPageIdentifier href="delete_contained_diagram.notation#_HGUPAH9cEeKUSOg4DHoPwA"/>
+    </availablePage>
+    <availablePage>
+      <emfPageIdentifier href="delete_contained_diagram.notation#_a0DxsH9sEeKFzdr7iEywzg"/>
+    </availablePage>
+  </pageList>
+  <sashModel currentSelection="//@sashModel/@windows.0/@children.0">
+    <windows>
+      <children xsi:type="di:TabFolder">
+        <children>
+          <emfPageIdentifier href="delete_contained_diagram.notation#_45GUoH9WEeKg8Ob6i-v52w"/>
+        </children>
+        <children>
+          <emfPageIdentifier href="delete_contained_diagram.notation#_GeJbwH9cEeKUSOg4DHoPwA"/>
+        </children>
+        <children>
+          <emfPageIdentifier href="delete_contained_diagram.notation#_7KiAcHxQEeKD0tnoPLkh-A"/>
+        </children>
+      </children>
+    </windows>
+  </sashModel>
+</di:SashWindowsMngr>
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/basic/delete_contained_diagram.notation b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/basic/delete_contained_diagram.notation
index 09c604d50e0..660b276d194 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/basic/delete_contained_diagram.notation
+++ b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/basic/delete_contained_diagram.notation
@@ -1,282 +1,282 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML">

-  <notation:Diagram xmi:id="_7KiAcHxQEeKD0tnoPLkh-A" type="PapyrusUMLActivityDiagram" name="ActivityDiagram" measurementUnit="Pixel">

-    <children xmi:type="notation:Shape" xmi:id="_7KiAcXxQEeKD0tnoPLkh-A" type="2001" fontName="Segoe UI" lineColor="0">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_7KiAcnxQEeKD0tnoPLkh-A" source="ShadowFigure">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_7KiAc3xQEeKD0tnoPLkh-A" key="ShadowFigure_Value" value="false"/>

-      </eAnnotations>

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_7KiAdHxQEeKD0tnoPLkh-A" source="displayNameLabelIcon">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_7KiAdXxQEeKD0tnoPLkh-A" key="displayNameLabelIcon_value" value="false"/>

-      </eAnnotations>

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_7KiAdnxQEeKD0tnoPLkh-A" source="QualifiedName">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_7KiAd3xQEeKD0tnoPLkh-A" key="QualifiedNameDepth" value="1000"/>

-      </eAnnotations>

-      <children xmi:type="notation:DecorationNode" xmi:id="_7KiAeHxQEeKD0tnoPLkh-A" type="5001"/>

-      <children xmi:type="notation:DecorationNode" xmi:id="_7KiAenxQEeKD0tnoPLkh-A" type="7001">

-        <styles xmi:type="notation:SortingStyle" xmi:id="_7KiAe3xQEeKD0tnoPLkh-A"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_7KiAfHxQEeKD0tnoPLkh-A"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7KiAfXxQEeKD0tnoPLkh-A"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_7KiAfnxQEeKD0tnoPLkh-A" type="7002">

-        <styles xmi:type="notation:SortingStyle" xmi:id="_7KiAf3xQEeKD0tnoPLkh-A"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_7KiAgHxQEeKD0tnoPLkh-A"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7KiAgXxQEeKD0tnoPLkh-A"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_7KiAgnxQEeKD0tnoPLkh-A" type="7003">

-        <styles xmi:type="notation:SortingStyle" xmi:id="_7KiAg3xQEeKD0tnoPLkh-A"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_7KiAhHxQEeKD0tnoPLkh-A"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7KiAhXxQEeKD0tnoPLkh-A"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_7KiAhnxQEeKD0tnoPLkh-A" type="7004">

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7KiAh3xQEeKD0tnoPLkh-A"/>

-      </children>

-      <element xmi:type="uml:Activity" href="delete_contained_diagram.uml#_7Hjk8HxQEeKD0tnoPLkh-A"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7KiAiHxQEeKD0tnoPLkh-A"/>

-    </children>

-    <styles xmi:type="notation:DiagramStyle" xmi:id="_7KiAiXxQEeKD0tnoPLkh-A"/>

-    <element xmi:type="uml:Activity" href="delete_contained_diagram.uml#_7Hjk8HxQEeKD0tnoPLkh-A"/>

-  </notation:Diagram>

-  <notation:Diagram xmi:id="_45GUoH9WEeKg8Ob6i-v52w" type="PapyrusUMLClassDiagram" name="ClassDiagram3" measurementUnit="Pixel">

-    <children xmi:type="notation:Shape" xmi:id="_Itj5oH9cEeKUSOg4DHoPwA" type="2008">

-      <children xmi:type="notation:DecorationNode" xmi:id="_IttqoH9cEeKUSOg4DHoPwA" type="5029"/>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_IttqoX9cEeKUSOg4DHoPwA" type="7017">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_IttqsH9cEeKUSOg4DHoPwA" source="PapyrusCSSForceValue">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_IttqsX9cEeKUSOg4DHoPwA" key="showTitle" value="true"/>

-        </eAnnotations>

-        <children xmi:type="notation:Shape" xmi:id="_nL9LIIAfEeKTe7ZOi8nJaA" type="3012">

-          <element xmi:type="uml:Property" href="delete_contained_diagram.uml#_nDxfgIAfEeKTe7ZOi8nJaA"/>

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_nL9LIYAfEeKTe7ZOi8nJaA"/>

-        </children>

-        <children xmi:type="notation:Shape" xmi:id="_nWEwcIAfEeKTe7ZOi8nJaA" type="3012">

-          <element xmi:type="uml:Property" href="delete_contained_diagram.uml#_nVx1gIAfEeKTe7ZOi8nJaA"/>

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_nWEwcYAfEeKTe7ZOi8nJaA"/>

-        </children>

-        <children xmi:type="notation:Shape" xmi:id="_ondf0IAfEeKTe7ZOi8nJaA" type="3012">

-          <element xmi:type="uml:Property" href="delete_contained_diagram.uml#_onKk4IAfEeKTe7ZOi8nJaA"/>

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_ondf0YAfEeKTe7ZOi8nJaA"/>

-        </children>

-        <children xmi:type="notation:Shape" xmi:id="_pUtAUIAfEeKTe7ZOi8nJaA" type="3012">

-          <element xmi:type="uml:Property" href="delete_contained_diagram.uml#_pUQUYIAfEeKTe7ZOi8nJaA"/>

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_pUtAUYAfEeKTe7ZOi8nJaA"/>

-        </children>

-        <children xmi:type="notation:Shape" xmi:id="_pcviAIAfEeKTe7ZOi8nJaA" type="3012">

-          <element xmi:type="uml:Property" href="delete_contained_diagram.uml#_pcmYEIAfEeKTe7ZOi8nJaA"/>

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_pcviAYAfEeKTe7ZOi8nJaA"/>

-        </children>

-        <children xmi:type="notation:Shape" xmi:id="_pozBAIAfEeKTe7ZOi8nJaA" type="3012">

-          <element xmi:type="uml:Property" href="delete_contained_diagram.uml#_poWVEIAfEeKTe7ZOi8nJaA"/>

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_pozBAYAfEeKTe7ZOi8nJaA"/>

-        </children>

-        <styles xmi:type="notation:TitleStyle" xmi:id="_Ittqon9cEeKUSOg4DHoPwA"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_Ittqo39cEeKUSOg4DHoPwA"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_IttqpH9cEeKUSOg4DHoPwA"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IttqpX9cEeKUSOg4DHoPwA"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_Ittqpn9cEeKUSOg4DHoPwA" type="7018">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Ittqsn9cEeKUSOg4DHoPwA" source="PapyrusCSSForceValue">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Ittqs39cEeKUSOg4DHoPwA" key="showTitle" value="true"/>

-        </eAnnotations>

-        <styles xmi:type="notation:TitleStyle" xmi:id="_Ittqp39cEeKUSOg4DHoPwA"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_IttqqH9cEeKUSOg4DHoPwA"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_IttqqX9cEeKUSOg4DHoPwA"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Ittqqn9cEeKUSOg4DHoPwA"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_Ittqq39cEeKUSOg4DHoPwA" type="7019">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_It3boH9cEeKUSOg4DHoPwA" source="PapyrusCSSForceValue">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_It3boX9cEeKUSOg4DHoPwA" key="showTitle" value="true"/>

-        </eAnnotations>

-        <styles xmi:type="notation:TitleStyle" xmi:id="_IttqrH9cEeKUSOg4DHoPwA"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_IttqrX9cEeKUSOg4DHoPwA"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_Ittqrn9cEeKUSOg4DHoPwA"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Ittqr39cEeKUSOg4DHoPwA"/>

-      </children>

-      <element xmi:type="uml:Class" href="delete_contained_diagram.uml#_8UYvwH9WEeKg8Ob6i-v52w"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Itj5oX9cEeKUSOg4DHoPwA" x="150" y="205"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_IuwMcH9cEeKUSOg4DHoPwA" type="2008">

-      <children xmi:type="notation:DecorationNode" xmi:id="_IuwMcn9cEeKUSOg4DHoPwA" type="5029"/>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_IuwMc39cEeKUSOg4DHoPwA" type="7017">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_IuwMgn9cEeKUSOg4DHoPwA" source="PapyrusCSSForceValue">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_IuwMg39cEeKUSOg4DHoPwA" key="showTitle" value="true"/>

-        </eAnnotations>

-        <children xmi:type="notation:Shape" xmi:id="_AfaMYIAgEeKTe7ZOi8nJaA" type="3012">

-          <element xmi:type="uml:Property" href="delete_contained_diagram.uml#_nDxfgIAfEeKTe7ZOi8nJaA"/>

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_AfaMYYAgEeKTe7ZOi8nJaA"/>

-        </children>

-        <children xmi:type="notation:Shape" xmi:id="_AfaMYoAgEeKTe7ZOi8nJaA" type="3012">

-          <element xmi:type="uml:Property" href="delete_contained_diagram.uml#_nVx1gIAfEeKTe7ZOi8nJaA"/>

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_AfaMY4AgEeKTe7ZOi8nJaA"/>

-        </children>

-        <children xmi:type="notation:Shape" xmi:id="_AfaMZIAgEeKTe7ZOi8nJaA" type="3012">

-          <element xmi:type="uml:Property" href="delete_contained_diagram.uml#_pcmYEIAfEeKTe7ZOi8nJaA"/>

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_AfaMZYAgEeKTe7ZOi8nJaA"/>

-        </children>

-        <styles xmi:type="notation:TitleStyle" xmi:id="_IuwMdH9cEeKUSOg4DHoPwA"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_IuwMdX9cEeKUSOg4DHoPwA"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_IuwMdn9cEeKUSOg4DHoPwA"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IuwMd39cEeKUSOg4DHoPwA"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_IuwMeH9cEeKUSOg4DHoPwA" type="7018">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_IuwMhH9cEeKUSOg4DHoPwA" source="PapyrusCSSForceValue">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_IuwMhX9cEeKUSOg4DHoPwA" key="showTitle" value="true"/>

-        </eAnnotations>

-        <children xmi:type="notation:Shape" xmi:id="_raBuEIAfEeKTe7ZOi8nJaA" type="3013">

-          <element xmi:type="uml:Operation" href="delete_contained_diagram.uml#_rZlCIIAfEeKTe7ZOi8nJaA"/>

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_raBuEYAfEeKTe7ZOi8nJaA"/>

-        </children>

-        <children xmi:type="notation:Shape" xmi:id="_reL1UIAfEeKTe7ZOi8nJaA" type="3013">

-          <element xmi:type="uml:Operation" href="delete_contained_diagram.uml#_rd46YIAfEeKTe7ZOi8nJaA"/>

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_reL1UYAfEeKTe7ZOi8nJaA"/>

-        </children>

-        <children xmi:type="notation:Shape" xmi:id="_rizPkIAfEeKTe7ZOi8nJaA" type="3013">

-          <element xmi:type="uml:Operation" href="delete_contained_diagram.uml#_rigUoIAfEeKTe7ZOi8nJaA"/>

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_rizPkYAfEeKTe7ZOi8nJaA"/>

-        </children>

-        <children xmi:type="notation:Shape" xmi:id="_roTaoIAfEeKTe7ZOi8nJaA" type="3013">

-          <element xmi:type="uml:Operation" href="delete_contained_diagram.uml#_roAfsIAfEeKTe7ZOi8nJaA"/>

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_roTaoYAfEeKTe7ZOi8nJaA"/>

-        </children>

-        <children xmi:type="notation:Shape" xmi:id="_rtNv0IAfEeKTe7ZOi8nJaA" type="3013">

-          <element xmi:type="uml:Operation" href="delete_contained_diagram.uml#_rs604IAfEeKTe7ZOi8nJaA"/>

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_rtNv0YAfEeKTe7ZOi8nJaA"/>

-        </children>

-        <styles xmi:type="notation:TitleStyle" xmi:id="_IuwMeX9cEeKUSOg4DHoPwA"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_IuwMen9cEeKUSOg4DHoPwA"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_IuwMe39cEeKUSOg4DHoPwA"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IuwMfH9cEeKUSOg4DHoPwA"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_IuwMfX9cEeKUSOg4DHoPwA" type="7019">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Iu59cH9cEeKUSOg4DHoPwA" source="PapyrusCSSForceValue">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Iu59cX9cEeKUSOg4DHoPwA" key="showTitle" value="true"/>

-        </eAnnotations>

-        <styles xmi:type="notation:TitleStyle" xmi:id="_IuwMfn9cEeKUSOg4DHoPwA"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_IuwMf39cEeKUSOg4DHoPwA"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_IuwMgH9cEeKUSOg4DHoPwA"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IuwMgX9cEeKUSOg4DHoPwA"/>

-      </children>

-      <element xmi:type="uml:Class" href="delete_contained_diagram.uml#_9c2MoH9WEeKg8Ob6i-v52w"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IuwMcX9cEeKUSOg4DHoPwA" x="490" y="530" width="336"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_IvWpYH9cEeKUSOg4DHoPwA" type="2008">

-      <children xmi:type="notation:DecorationNode" xmi:id="_IvWpYn9cEeKUSOg4DHoPwA" type="5029"/>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_IvWpY39cEeKUSOg4DHoPwA" type="7017">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_IvWpcn9cEeKUSOg4DHoPwA" source="PapyrusCSSForceValue">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_IvWpc39cEeKUSOg4DHoPwA" key="showTitle" value="true"/>

-        </eAnnotations>

-        <styles xmi:type="notation:TitleStyle" xmi:id="_IvWpZH9cEeKUSOg4DHoPwA"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_IvWpZX9cEeKUSOg4DHoPwA"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_IvWpZn9cEeKUSOg4DHoPwA"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IvWpZ39cEeKUSOg4DHoPwA"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_IvWpaH9cEeKUSOg4DHoPwA" type="7018">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_IvWpdH9cEeKUSOg4DHoPwA" source="PapyrusCSSForceValue">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_IvWpdX9cEeKUSOg4DHoPwA" key="showTitle" value="true"/>

-        </eAnnotations>

-        <children xmi:type="notation:Shape" xmi:id="_qycwsIAfEeKTe7ZOi8nJaA" type="3013">

-          <element xmi:type="uml:Operation" href="delete_contained_diagram.uml#_qyAEwIAfEeKTe7ZOi8nJaA"/>

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_qycwsYAfEeKTe7ZOi8nJaA"/>

-        </children>

-        <children xmi:type="notation:Shape" xmi:id="_rDHC4IAfEeKTe7ZOi8nJaA" type="3013">

-          <element xmi:type="uml:Operation" href="delete_contained_diagram.uml#_rC0H8IAfEeKTe7ZOi8nJaA"/>

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_rDHC4YAfEeKTe7ZOi8nJaA"/>

-        </children>

-        <children xmi:type="notation:Shape" xmi:id="_rILJEIAfEeKTe7ZOi8nJaA" type="3013">

-          <element xmi:type="uml:Operation" href="delete_contained_diagram.uml#_rHudIIAfEeKTe7ZOi8nJaA"/>

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_rILJEYAfEeKTe7ZOi8nJaA"/>

-        </children>

-        <children xmi:type="notation:Shape" xmi:id="_rNE3MIAfEeKTe7ZOi8nJaA" type="3013">

-          <element xmi:type="uml:Operation" href="delete_contained_diagram.uml#_rMx8QIAfEeKTe7ZOi8nJaA"/>

-          <layoutConstraint xmi:type="notation:Location" xmi:id="_rNE3MYAfEeKTe7ZOi8nJaA"/>

-        </children>

-        <styles xmi:type="notation:TitleStyle" xmi:id="_IvWpaX9cEeKUSOg4DHoPwA"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_IvWpan9cEeKUSOg4DHoPwA"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_IvWpa39cEeKUSOg4DHoPwA"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IvWpbH9cEeKUSOg4DHoPwA"/>

-      </children>

-      <children xmi:type="notation:BasicCompartment" xmi:id="_IvWpbX9cEeKUSOg4DHoPwA" type="7019">

-        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_IvWpdn9cEeKUSOg4DHoPwA" source="PapyrusCSSForceValue">

-          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_IvWpd39cEeKUSOg4DHoPwA" key="showTitle" value="true"/>

-        </eAnnotations>

-        <styles xmi:type="notation:TitleStyle" xmi:id="_IvWpbn9cEeKUSOg4DHoPwA"/>

-        <styles xmi:type="notation:SortingStyle" xmi:id="_IvWpb39cEeKUSOg4DHoPwA"/>

-        <styles xmi:type="notation:FilteringStyle" xmi:id="_IvWpcH9cEeKUSOg4DHoPwA"/>

-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IvWpcX9cEeKUSOg4DHoPwA"/>

-      </children>

-      <element xmi:type="uml:Class" href="delete_contained_diagram.uml#_9q0-QH9WEeKg8Ob6i-v52w"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IvWpYX9cEeKUSOg4DHoPwA" x="905" y="220"/>

-    </children>

-    <children xmi:type="notation:Shape" xmi:id="_njLtcIAhEeKTe7ZOi8nJaA" type="2015">

-      <styles xmi:type="notation:DescriptionStyle" xmi:id="_njLtcYAhEeKTe7ZOi8nJaA"/>

-      <styles xmi:type="notation:FontStyle" xmi:id="_njLtcoAhEeKTe7ZOi8nJaA"/>

-      <element xmi:type="uml:Association" href="delete_contained_diagram.uml#_mxWA04AhEeKTe7ZOi8nJaA"/>

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_njLtdIAhEeKTe7ZOi8nJaA" x="645" y="285"/>

-    </children>

-    <styles xmi:type="notation:DiagramStyle" xmi:id="_45GUoX9WEeKg8Ob6i-v52w"/>

-    <element xmi:type="uml:Package" href="delete_contained_diagram.uml#_4gjRwH9WEeKg8Ob6i-v52w"/>

-    <edges xmi:type="notation:Connector" xmi:id="_6tQAgIAfEeKTe7ZOi8nJaA" type="4002" source="_IuwMcH9cEeKUSOg4DHoPwA" target="_Itj5oH9cEeKUSOg4DHoPwA">

-      <children xmi:type="notation:DecorationNode" xmi:id="_6tQAg4AfEeKTe7ZOi8nJaA" type="6007">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_6tQAhIAfEeKTe7ZOi8nJaA" y="40"/>

-      </children>

-      <styles xmi:type="notation:FontStyle" xmi:id="_6tQAgYAfEeKTe7ZOi8nJaA"/>

-      <element xmi:type="uml:Generalization" href="delete_contained_diagram.uml#_6sgZoIAfEeKTe7ZOi8nJaA"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_6tQAgoAfEeKTe7ZOi8nJaA" points="[-131, 0, 271, 215]$[-402, 0, 0, 215]$[-402, -192, 0, 23]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_6wYNAIAfEeKTe7ZOi8nJaA" id="(0.3898809523809524,0.21875)"/>

-      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_6wYNAYAfEeKTe7ZOi8nJaA" id="(0.3894736842105263,0.8693181818181818)"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_nlQxEIAhEeKTe7ZOi8nJaA" type="4019" source="_njLtcIAhEeKTe7ZOi8nJaA" target="_Itj5oH9cEeKUSOg4DHoPwA">

-      <children xmi:type="notation:DecorationNode" xmi:id="_nlQxE4AhEeKTe7ZOi8nJaA" type="6024">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_nlQxFIAhEeKTe7ZOi8nJaA" y="-20"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_nlQxFYAhEeKTe7ZOi8nJaA" type="6035">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_nlQxFoAhEeKTe7ZOi8nJaA" y="20"/>

-      </children>

-      <styles xmi:type="notation:FontStyle" xmi:id="_nlQxEYAhEeKTe7ZOi8nJaA"/>

-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_nmv-0IAhEeKTe7ZOi8nJaA" name="Semantic_Branch_Style">

-        <eObjectValue xmi:type="uml:Property" href="delete_contained_diagram.uml#_mxWA1IAhEeKTe7ZOi8nJaA"/>

-      </styles>

-      <element xmi:type="uml:Association" href="delete_contained_diagram.uml#_mxWA04AhEeKTe7ZOi8nJaA"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_nlQxEoAhEeKTe7ZOi8nJaA" points="[0, 0, -245, -293]$[171, 205, -74, -88]"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_noY9kIAhEeKTe7ZOi8nJaA" type="4019" source="_njLtcIAhEeKTe7ZOi8nJaA" target="_IvWpYH9cEeKUSOg4DHoPwA">

-      <children xmi:type="notation:DecorationNode" xmi:id="_noY9k4AhEeKTe7ZOi8nJaA" type="6024">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_noY9lIAhEeKTe7ZOi8nJaA" y="-20"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_noY9lYAhEeKTe7ZOi8nJaA" type="6035">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_noY9loAhEeKTe7ZOi8nJaA" y="20"/>

-      </children>

-      <styles xmi:type="notation:FontStyle" xmi:id="_noY9kYAhEeKTe7ZOi8nJaA"/>

-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_noY9l4AhEeKTe7ZOi8nJaA" name="Semantic_Branch_Style">

-        <eObjectValue xmi:type="uml:Property" href="delete_contained_diagram.uml#_mxWA0IAhEeKTe7ZOi8nJaA"/>

-      </styles>

-      <element xmi:type="uml:Association" href="delete_contained_diagram.uml#_mxWA04AhEeKTe7ZOi8nJaA"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_noY9koAhEeKTe7ZOi8nJaA" points="[7, -3, -258, 85]$[210, -70, -55, 18]"/>

-    </edges>

-    <edges xmi:type="notation:Connector" xmi:id="_nor4gIAhEeKTe7ZOi8nJaA" type="4019" source="_njLtcIAhEeKTe7ZOi8nJaA" target="_IuwMcH9cEeKUSOg4DHoPwA">

-      <children xmi:type="notation:DecorationNode" xmi:id="_nor4g4AhEeKTe7ZOi8nJaA" type="6024">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_nor4hIAhEeKTe7ZOi8nJaA" x="-19" y="29"/>

-      </children>

-      <children xmi:type="notation:DecorationNode" xmi:id="_nor4hYAhEeKTe7ZOi8nJaA" type="6035">

-        <layoutConstraint xmi:type="notation:Location" xmi:id="_nor4hoAhEeKTe7ZOi8nJaA" x="-4" y="22"/>

-      </children>

-      <styles xmi:type="notation:FontStyle" xmi:id="_nor4gYAhEeKTe7ZOi8nJaA"/>

-      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_nor4h4AhEeKTe7ZOi8nJaA" name="Semantic_Branch_Style">

-        <eObjectValue xmi:type="uml:Property" href="delete_contained_diagram.uml#_nicGkIAhEeKTe7ZOi8nJaA"/>

-      </styles>

-      <element xmi:type="uml:Association" href="delete_contained_diagram.uml#_mxWA04AhEeKTe7ZOi8nJaA"/>

-      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_nor4goAhEeKTe7ZOi8nJaA" points="[0, 0, -663, -629]$[558, 530, -105, -99]"/>

-      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_4osc4IAhEeKTe7ZOi8nJaA" id="(0.35,0.8)"/>

-    </edges>

-  </notation:Diagram>

-  <notation:Diagram xmi:id="_GeJbwH9cEeKUSOg4DHoPwA" type="PapyrusUMLClassDiagram" name="ClassDiagram2" measurementUnit="Pixel">

-    <styles xmi:type="notation:DiagramStyle" xmi:id="_GeJbwX9cEeKUSOg4DHoPwA"/>

-    <element xmi:type="uml:Package" href="delete_contained_diagram.uml#_3wyowH9WEeKg8Ob6i-v52w"/>

-  </notation:Diagram>

-  <notation:Diagram xmi:id="_HGUPAH9cEeKUSOg4DHoPwA" type="PapyrusUMLClassDiagram" name="ClassDiagram1" measurementUnit="Pixel">

-    <styles xmi:type="notation:DiagramStyle" xmi:id="_HGUPAX9cEeKUSOg4DHoPwA"/>

-    <element xmi:type="uml:Package" href="delete_contained_diagram.uml#_3AS_8H9WEeKg8Ob6i-v52w"/>

-  </notation:Diagram>

-  <notation:Diagram xmi:id="_a0DxsH9sEeKFzdr7iEywzg" type="PapyrusUMLDeploymentDiagram" name="NewDeploymentDiagram" measurementUnit="Pixel">

-    <styles xmi:type="notation:DiagramStyle" xmi:id="_a0DxsX9sEeKFzdr7iEywzg"/>

-    <element xmi:type="uml:Package" href="delete_contained_diagram.uml#_3AS_8H9WEeKg8Ob6i-v52w"/>

-  </notation:Diagram>

-</xmi:XMI>

+<?xml version="1.0" encoding="UTF-8"?>
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML">
+  <notation:Diagram xmi:id="_7KiAcHxQEeKD0tnoPLkh-A" type="PapyrusUMLActivityDiagram" name="ActivityDiagram" measurementUnit="Pixel">
+    <children xmi:type="notation:Shape" xmi:id="_7KiAcXxQEeKD0tnoPLkh-A" type="2001" fontName="Segoe UI" lineColor="0">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_7KiAcnxQEeKD0tnoPLkh-A" source="ShadowFigure">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_7KiAc3xQEeKD0tnoPLkh-A" key="ShadowFigure_Value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_7KiAdHxQEeKD0tnoPLkh-A" source="displayNameLabelIcon">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_7KiAdXxQEeKD0tnoPLkh-A" key="displayNameLabelIcon_value" value="false"/>
+      </eAnnotations>
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_7KiAdnxQEeKD0tnoPLkh-A" source="QualifiedName">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_7KiAd3xQEeKD0tnoPLkh-A" key="QualifiedNameDepth" value="1000"/>
+      </eAnnotations>
+      <children xmi:type="notation:DecorationNode" xmi:id="_7KiAeHxQEeKD0tnoPLkh-A" type="5001"/>
+      <children xmi:type="notation:DecorationNode" xmi:id="_7KiAenxQEeKD0tnoPLkh-A" type="7001">
+        <styles xmi:type="notation:SortingStyle" xmi:id="_7KiAe3xQEeKD0tnoPLkh-A"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_7KiAfHxQEeKD0tnoPLkh-A"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7KiAfXxQEeKD0tnoPLkh-A"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_7KiAfnxQEeKD0tnoPLkh-A" type="7002">
+        <styles xmi:type="notation:SortingStyle" xmi:id="_7KiAf3xQEeKD0tnoPLkh-A"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_7KiAgHxQEeKD0tnoPLkh-A"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7KiAgXxQEeKD0tnoPLkh-A"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_7KiAgnxQEeKD0tnoPLkh-A" type="7003">
+        <styles xmi:type="notation:SortingStyle" xmi:id="_7KiAg3xQEeKD0tnoPLkh-A"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_7KiAhHxQEeKD0tnoPLkh-A"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7KiAhXxQEeKD0tnoPLkh-A"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_7KiAhnxQEeKD0tnoPLkh-A" type="7004">
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7KiAh3xQEeKD0tnoPLkh-A"/>
+      </children>
+      <element xmi:type="uml:Activity" href="delete_contained_diagram.uml#_7Hjk8HxQEeKD0tnoPLkh-A"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_7KiAiHxQEeKD0tnoPLkh-A"/>
+    </children>
+    <styles xmi:type="notation:DiagramStyle" xmi:id="_7KiAiXxQEeKD0tnoPLkh-A"/>
+    <element xmi:type="uml:Activity" href="delete_contained_diagram.uml#_7Hjk8HxQEeKD0tnoPLkh-A"/>
+  </notation:Diagram>
+  <notation:Diagram xmi:id="_45GUoH9WEeKg8Ob6i-v52w" type="PapyrusUMLClassDiagram" name="ClassDiagram3" measurementUnit="Pixel">
+    <children xmi:type="notation:Shape" xmi:id="_Itj5oH9cEeKUSOg4DHoPwA" type="2008">
+      <children xmi:type="notation:DecorationNode" xmi:id="_IttqoH9cEeKUSOg4DHoPwA" type="5029"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_IttqoX9cEeKUSOg4DHoPwA" type="7017">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_IttqsH9cEeKUSOg4DHoPwA" source="PapyrusCSSForceValue">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_IttqsX9cEeKUSOg4DHoPwA" key="showTitle" value="true"/>
+        </eAnnotations>
+        <children xmi:type="notation:Shape" xmi:id="_nL9LIIAfEeKTe7ZOi8nJaA" type="3012">
+          <element xmi:type="uml:Property" href="delete_contained_diagram.uml#_nDxfgIAfEeKTe7ZOi8nJaA"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_nL9LIYAfEeKTe7ZOi8nJaA"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_nWEwcIAfEeKTe7ZOi8nJaA" type="3012">
+          <element xmi:type="uml:Property" href="delete_contained_diagram.uml#_nVx1gIAfEeKTe7ZOi8nJaA"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_nWEwcYAfEeKTe7ZOi8nJaA"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_ondf0IAfEeKTe7ZOi8nJaA" type="3012">
+          <element xmi:type="uml:Property" href="delete_contained_diagram.uml#_onKk4IAfEeKTe7ZOi8nJaA"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_ondf0YAfEeKTe7ZOi8nJaA"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_pUtAUIAfEeKTe7ZOi8nJaA" type="3012">
+          <element xmi:type="uml:Property" href="delete_contained_diagram.uml#_pUQUYIAfEeKTe7ZOi8nJaA"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_pUtAUYAfEeKTe7ZOi8nJaA"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_pcviAIAfEeKTe7ZOi8nJaA" type="3012">
+          <element xmi:type="uml:Property" href="delete_contained_diagram.uml#_pcmYEIAfEeKTe7ZOi8nJaA"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_pcviAYAfEeKTe7ZOi8nJaA"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_pozBAIAfEeKTe7ZOi8nJaA" type="3012">
+          <element xmi:type="uml:Property" href="delete_contained_diagram.uml#_poWVEIAfEeKTe7ZOi8nJaA"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_pozBAYAfEeKTe7ZOi8nJaA"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_Ittqon9cEeKUSOg4DHoPwA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_Ittqo39cEeKUSOg4DHoPwA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_IttqpH9cEeKUSOg4DHoPwA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IttqpX9cEeKUSOg4DHoPwA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_Ittqpn9cEeKUSOg4DHoPwA" type="7018">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Ittqsn9cEeKUSOg4DHoPwA" source="PapyrusCSSForceValue">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Ittqs39cEeKUSOg4DHoPwA" key="showTitle" value="true"/>
+        </eAnnotations>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_Ittqp39cEeKUSOg4DHoPwA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_IttqqH9cEeKUSOg4DHoPwA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_IttqqX9cEeKUSOg4DHoPwA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Ittqqn9cEeKUSOg4DHoPwA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_Ittqq39cEeKUSOg4DHoPwA" type="7019">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_It3boH9cEeKUSOg4DHoPwA" source="PapyrusCSSForceValue">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_It3boX9cEeKUSOg4DHoPwA" key="showTitle" value="true"/>
+        </eAnnotations>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_IttqrH9cEeKUSOg4DHoPwA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_IttqrX9cEeKUSOg4DHoPwA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_Ittqrn9cEeKUSOg4DHoPwA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Ittqr39cEeKUSOg4DHoPwA"/>
+      </children>
+      <element xmi:type="uml:Class" href="delete_contained_diagram.uml#_8UYvwH9WEeKg8Ob6i-v52w"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Itj5oX9cEeKUSOg4DHoPwA" x="150" y="205"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_IuwMcH9cEeKUSOg4DHoPwA" type="2008">
+      <children xmi:type="notation:DecorationNode" xmi:id="_IuwMcn9cEeKUSOg4DHoPwA" type="5029"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_IuwMc39cEeKUSOg4DHoPwA" type="7017">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_IuwMgn9cEeKUSOg4DHoPwA" source="PapyrusCSSForceValue">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_IuwMg39cEeKUSOg4DHoPwA" key="showTitle" value="true"/>
+        </eAnnotations>
+        <children xmi:type="notation:Shape" xmi:id="_AfaMYIAgEeKTe7ZOi8nJaA" type="3012">
+          <element xmi:type="uml:Property" href="delete_contained_diagram.uml#_nDxfgIAfEeKTe7ZOi8nJaA"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_AfaMYYAgEeKTe7ZOi8nJaA"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_AfaMYoAgEeKTe7ZOi8nJaA" type="3012">
+          <element xmi:type="uml:Property" href="delete_contained_diagram.uml#_nVx1gIAfEeKTe7ZOi8nJaA"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_AfaMY4AgEeKTe7ZOi8nJaA"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_AfaMZIAgEeKTe7ZOi8nJaA" type="3012">
+          <element xmi:type="uml:Property" href="delete_contained_diagram.uml#_pcmYEIAfEeKTe7ZOi8nJaA"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_AfaMZYAgEeKTe7ZOi8nJaA"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_IuwMdH9cEeKUSOg4DHoPwA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_IuwMdX9cEeKUSOg4DHoPwA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_IuwMdn9cEeKUSOg4DHoPwA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IuwMd39cEeKUSOg4DHoPwA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_IuwMeH9cEeKUSOg4DHoPwA" type="7018">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_IuwMhH9cEeKUSOg4DHoPwA" source="PapyrusCSSForceValue">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_IuwMhX9cEeKUSOg4DHoPwA" key="showTitle" value="true"/>
+        </eAnnotations>
+        <children xmi:type="notation:Shape" xmi:id="_raBuEIAfEeKTe7ZOi8nJaA" type="3013">
+          <element xmi:type="uml:Operation" href="delete_contained_diagram.uml#_rZlCIIAfEeKTe7ZOi8nJaA"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_raBuEYAfEeKTe7ZOi8nJaA"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_reL1UIAfEeKTe7ZOi8nJaA" type="3013">
+          <element xmi:type="uml:Operation" href="delete_contained_diagram.uml#_rd46YIAfEeKTe7ZOi8nJaA"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_reL1UYAfEeKTe7ZOi8nJaA"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_rizPkIAfEeKTe7ZOi8nJaA" type="3013">
+          <element xmi:type="uml:Operation" href="delete_contained_diagram.uml#_rigUoIAfEeKTe7ZOi8nJaA"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_rizPkYAfEeKTe7ZOi8nJaA"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_roTaoIAfEeKTe7ZOi8nJaA" type="3013">
+          <element xmi:type="uml:Operation" href="delete_contained_diagram.uml#_roAfsIAfEeKTe7ZOi8nJaA"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_roTaoYAfEeKTe7ZOi8nJaA"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_rtNv0IAfEeKTe7ZOi8nJaA" type="3013">
+          <element xmi:type="uml:Operation" href="delete_contained_diagram.uml#_rs604IAfEeKTe7ZOi8nJaA"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_rtNv0YAfEeKTe7ZOi8nJaA"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_IuwMeX9cEeKUSOg4DHoPwA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_IuwMen9cEeKUSOg4DHoPwA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_IuwMe39cEeKUSOg4DHoPwA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IuwMfH9cEeKUSOg4DHoPwA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_IuwMfX9cEeKUSOg4DHoPwA" type="7019">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Iu59cH9cEeKUSOg4DHoPwA" source="PapyrusCSSForceValue">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Iu59cX9cEeKUSOg4DHoPwA" key="showTitle" value="true"/>
+        </eAnnotations>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_IuwMfn9cEeKUSOg4DHoPwA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_IuwMf39cEeKUSOg4DHoPwA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_IuwMgH9cEeKUSOg4DHoPwA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IuwMgX9cEeKUSOg4DHoPwA"/>
+      </children>
+      <element xmi:type="uml:Class" href="delete_contained_diagram.uml#_9c2MoH9WEeKg8Ob6i-v52w"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IuwMcX9cEeKUSOg4DHoPwA" x="490" y="530" width="336"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_IvWpYH9cEeKUSOg4DHoPwA" type="2008">
+      <children xmi:type="notation:DecorationNode" xmi:id="_IvWpYn9cEeKUSOg4DHoPwA" type="5029"/>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_IvWpY39cEeKUSOg4DHoPwA" type="7017">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_IvWpcn9cEeKUSOg4DHoPwA" source="PapyrusCSSForceValue">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_IvWpc39cEeKUSOg4DHoPwA" key="showTitle" value="true"/>
+        </eAnnotations>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_IvWpZH9cEeKUSOg4DHoPwA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_IvWpZX9cEeKUSOg4DHoPwA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_IvWpZn9cEeKUSOg4DHoPwA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IvWpZ39cEeKUSOg4DHoPwA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_IvWpaH9cEeKUSOg4DHoPwA" type="7018">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_IvWpdH9cEeKUSOg4DHoPwA" source="PapyrusCSSForceValue">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_IvWpdX9cEeKUSOg4DHoPwA" key="showTitle" value="true"/>
+        </eAnnotations>
+        <children xmi:type="notation:Shape" xmi:id="_qycwsIAfEeKTe7ZOi8nJaA" type="3013">
+          <element xmi:type="uml:Operation" href="delete_contained_diagram.uml#_qyAEwIAfEeKTe7ZOi8nJaA"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_qycwsYAfEeKTe7ZOi8nJaA"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_rDHC4IAfEeKTe7ZOi8nJaA" type="3013">
+          <element xmi:type="uml:Operation" href="delete_contained_diagram.uml#_rC0H8IAfEeKTe7ZOi8nJaA"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_rDHC4YAfEeKTe7ZOi8nJaA"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_rILJEIAfEeKTe7ZOi8nJaA" type="3013">
+          <element xmi:type="uml:Operation" href="delete_contained_diagram.uml#_rHudIIAfEeKTe7ZOi8nJaA"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_rILJEYAfEeKTe7ZOi8nJaA"/>
+        </children>
+        <children xmi:type="notation:Shape" xmi:id="_rNE3MIAfEeKTe7ZOi8nJaA" type="3013">
+          <element xmi:type="uml:Operation" href="delete_contained_diagram.uml#_rMx8QIAfEeKTe7ZOi8nJaA"/>
+          <layoutConstraint xmi:type="notation:Location" xmi:id="_rNE3MYAfEeKTe7ZOi8nJaA"/>
+        </children>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_IvWpaX9cEeKUSOg4DHoPwA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_IvWpan9cEeKUSOg4DHoPwA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_IvWpa39cEeKUSOg4DHoPwA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IvWpbH9cEeKUSOg4DHoPwA"/>
+      </children>
+      <children xmi:type="notation:BasicCompartment" xmi:id="_IvWpbX9cEeKUSOg4DHoPwA" type="7019">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_IvWpdn9cEeKUSOg4DHoPwA" source="PapyrusCSSForceValue">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_IvWpd39cEeKUSOg4DHoPwA" key="showTitle" value="true"/>
+        </eAnnotations>
+        <styles xmi:type="notation:TitleStyle" xmi:id="_IvWpbn9cEeKUSOg4DHoPwA"/>
+        <styles xmi:type="notation:SortingStyle" xmi:id="_IvWpb39cEeKUSOg4DHoPwA"/>
+        <styles xmi:type="notation:FilteringStyle" xmi:id="_IvWpcH9cEeKUSOg4DHoPwA"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IvWpcX9cEeKUSOg4DHoPwA"/>
+      </children>
+      <element xmi:type="uml:Class" href="delete_contained_diagram.uml#_9q0-QH9WEeKg8Ob6i-v52w"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IvWpYX9cEeKUSOg4DHoPwA" x="905" y="220"/>
+    </children>
+    <children xmi:type="notation:Shape" xmi:id="_njLtcIAhEeKTe7ZOi8nJaA" type="2015">
+      <styles xmi:type="notation:DescriptionStyle" xmi:id="_njLtcYAhEeKTe7ZOi8nJaA"/>
+      <styles xmi:type="notation:FontStyle" xmi:id="_njLtcoAhEeKTe7ZOi8nJaA"/>
+      <element xmi:type="uml:Association" href="delete_contained_diagram.uml#_mxWA04AhEeKTe7ZOi8nJaA"/>
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_njLtdIAhEeKTe7ZOi8nJaA" x="645" y="285"/>
+    </children>
+    <styles xmi:type="notation:DiagramStyle" xmi:id="_45GUoX9WEeKg8Ob6i-v52w"/>
+    <element xmi:type="uml:Package" href="delete_contained_diagram.uml#_4gjRwH9WEeKg8Ob6i-v52w"/>
+    <edges xmi:type="notation:Connector" xmi:id="_6tQAgIAfEeKTe7ZOi8nJaA" type="4002" source="_IuwMcH9cEeKUSOg4DHoPwA" target="_Itj5oH9cEeKUSOg4DHoPwA">
+      <children xmi:type="notation:DecorationNode" xmi:id="_6tQAg4AfEeKTe7ZOi8nJaA" type="6007">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_6tQAhIAfEeKTe7ZOi8nJaA" y="40"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_6tQAgYAfEeKTe7ZOi8nJaA"/>
+      <element xmi:type="uml:Generalization" href="delete_contained_diagram.uml#_6sgZoIAfEeKTe7ZOi8nJaA"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_6tQAgoAfEeKTe7ZOi8nJaA" points="[-131, 0, 271, 215]$[-402, 0, 0, 215]$[-402, -192, 0, 23]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_6wYNAIAfEeKTe7ZOi8nJaA" id="(0.3898809523809524,0.21875)"/>
+      <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_6wYNAYAfEeKTe7ZOi8nJaA" id="(0.3894736842105263,0.8693181818181818)"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_nlQxEIAhEeKTe7ZOi8nJaA" type="4019" source="_njLtcIAhEeKTe7ZOi8nJaA" target="_Itj5oH9cEeKUSOg4DHoPwA">
+      <children xmi:type="notation:DecorationNode" xmi:id="_nlQxE4AhEeKTe7ZOi8nJaA" type="6024">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_nlQxFIAhEeKTe7ZOi8nJaA" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_nlQxFYAhEeKTe7ZOi8nJaA" type="6035">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_nlQxFoAhEeKTe7ZOi8nJaA" y="20"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_nlQxEYAhEeKTe7ZOi8nJaA"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_nmv-0IAhEeKTe7ZOi8nJaA" name="Semantic_Branch_Style">
+        <eObjectValue xmi:type="uml:Property" href="delete_contained_diagram.uml#_mxWA1IAhEeKTe7ZOi8nJaA"/>
+      </styles>
+      <element xmi:type="uml:Association" href="delete_contained_diagram.uml#_mxWA04AhEeKTe7ZOi8nJaA"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_nlQxEoAhEeKTe7ZOi8nJaA" points="[0, 0, -245, -293]$[171, 205, -74, -88]"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_noY9kIAhEeKTe7ZOi8nJaA" type="4019" source="_njLtcIAhEeKTe7ZOi8nJaA" target="_IvWpYH9cEeKUSOg4DHoPwA">
+      <children xmi:type="notation:DecorationNode" xmi:id="_noY9k4AhEeKTe7ZOi8nJaA" type="6024">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_noY9lIAhEeKTe7ZOi8nJaA" y="-20"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_noY9lYAhEeKTe7ZOi8nJaA" type="6035">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_noY9loAhEeKTe7ZOi8nJaA" y="20"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_noY9kYAhEeKTe7ZOi8nJaA"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_noY9l4AhEeKTe7ZOi8nJaA" name="Semantic_Branch_Style">
+        <eObjectValue xmi:type="uml:Property" href="delete_contained_diagram.uml#_mxWA0IAhEeKTe7ZOi8nJaA"/>
+      </styles>
+      <element xmi:type="uml:Association" href="delete_contained_diagram.uml#_mxWA04AhEeKTe7ZOi8nJaA"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_noY9koAhEeKTe7ZOi8nJaA" points="[7, -3, -258, 85]$[210, -70, -55, 18]"/>
+    </edges>
+    <edges xmi:type="notation:Connector" xmi:id="_nor4gIAhEeKTe7ZOi8nJaA" type="4019" source="_njLtcIAhEeKTe7ZOi8nJaA" target="_IuwMcH9cEeKUSOg4DHoPwA">
+      <children xmi:type="notation:DecorationNode" xmi:id="_nor4g4AhEeKTe7ZOi8nJaA" type="6024">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_nor4hIAhEeKTe7ZOi8nJaA" x="-19" y="29"/>
+      </children>
+      <children xmi:type="notation:DecorationNode" xmi:id="_nor4hYAhEeKTe7ZOi8nJaA" type="6035">
+        <layoutConstraint xmi:type="notation:Location" xmi:id="_nor4hoAhEeKTe7ZOi8nJaA" x="-4" y="22"/>
+      </children>
+      <styles xmi:type="notation:FontStyle" xmi:id="_nor4gYAhEeKTe7ZOi8nJaA"/>
+      <styles xmi:type="notation:EObjectValueStyle" xmi:id="_nor4h4AhEeKTe7ZOi8nJaA" name="Semantic_Branch_Style">
+        <eObjectValue xmi:type="uml:Property" href="delete_contained_diagram.uml#_nicGkIAhEeKTe7ZOi8nJaA"/>
+      </styles>
+      <element xmi:type="uml:Association" href="delete_contained_diagram.uml#_mxWA04AhEeKTe7ZOi8nJaA"/>
+      <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_nor4goAhEeKTe7ZOi8nJaA" points="[0, 0, -663, -629]$[558, 530, -105, -99]"/>
+      <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_4osc4IAhEeKTe7ZOi8nJaA" id="(0.35,0.8)"/>
+    </edges>
+  </notation:Diagram>
+  <notation:Diagram xmi:id="_GeJbwH9cEeKUSOg4DHoPwA" type="PapyrusUMLClassDiagram" name="ClassDiagram2" measurementUnit="Pixel">
+    <styles xmi:type="notation:DiagramStyle" xmi:id="_GeJbwX9cEeKUSOg4DHoPwA"/>
+    <element xmi:type="uml:Package" href="delete_contained_diagram.uml#_3wyowH9WEeKg8Ob6i-v52w"/>
+  </notation:Diagram>
+  <notation:Diagram xmi:id="_HGUPAH9cEeKUSOg4DHoPwA" type="PapyrusUMLClassDiagram" name="ClassDiagram1" measurementUnit="Pixel">
+    <styles xmi:type="notation:DiagramStyle" xmi:id="_HGUPAX9cEeKUSOg4DHoPwA"/>
+    <element xmi:type="uml:Package" href="delete_contained_diagram.uml#_3AS_8H9WEeKg8Ob6i-v52w"/>
+  </notation:Diagram>
+  <notation:Diagram xmi:id="_a0DxsH9sEeKFzdr7iEywzg" type="PapyrusUMLDeploymentDiagram" name="NewDeploymentDiagram" measurementUnit="Pixel">
+    <styles xmi:type="notation:DiagramStyle" xmi:id="_a0DxsX9sEeKFzdr7iEywzg"/>
+    <element xmi:type="uml:Package" href="delete_contained_diagram.uml#_3AS_8H9WEeKg8Ob6i-v52w"/>
+  </notation:Diagram>
+</xmi:XMI>
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/basic/delete_contained_diagram.uml b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/basic/delete_contained_diagram.uml
index b535fe817da..41d2a331cba 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/basic/delete_contained_diagram.uml
+++ b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/basic/delete_contained_diagram.uml
@@ -1,49 +1,49 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<uml:Model xmi:version="20110701" xmlns:xmi="http://www.omg.org/spec/XMI/20110701" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_0VtdsHxQEeKD0tnoPLkh-A" name="model">

-  <packagedElement xmi:type="uml:Activity" xmi:id="_7Hjk8HxQEeKD0tnoPLkh-A" name="Activity1"/>

-  <packagedElement xmi:type="uml:Package" xmi:id="_3AS_8H9WEeKg8Ob6i-v52w" name="Package1">

-    <packagedElement xmi:type="uml:Package" xmi:id="_3wyowH9WEeKg8Ob6i-v52w" name="Package2">

-      <packagedElement xmi:type="uml:Package" xmi:id="_4gjRwH9WEeKg8Ob6i-v52w" name="Package3">

-        <packagedElement xmi:type="uml:Class" xmi:id="_8UYvwH9WEeKg8Ob6i-v52w" name="Class1">

-          <ownedAttribute xmi:type="uml:Property" xmi:id="_nDxfgIAfEeKTe7ZOi8nJaA" name="Attribute1"/>

-          <ownedAttribute xmi:type="uml:Property" xmi:id="_nVx1gIAfEeKTe7ZOi8nJaA" name="Attribute2"/>

-          <ownedAttribute xmi:type="uml:Property" xmi:id="_onKk4IAfEeKTe7ZOi8nJaA" name="Attribute3"/>

-          <ownedAttribute xmi:type="uml:Property" xmi:id="_pUQUYIAfEeKTe7ZOi8nJaA" name="Attribute4"/>

-          <ownedAttribute xmi:type="uml:Property" xmi:id="_pcmYEIAfEeKTe7ZOi8nJaA" name="Attribute5"/>

-          <ownedAttribute xmi:type="uml:Property" xmi:id="_poWVEIAfEeKTe7ZOi8nJaA" name="Attribute6"/>

-        </packagedElement>

-        <packagedElement xmi:type="uml:Class" xmi:id="_8cIWgH9WEeKg8Ob6i-v52w" name="Class2"/>

-        <packagedElement xmi:type="uml:Class" xmi:id="_9c2MoH9WEeKg8Ob6i-v52w" name="Class3">

-          <generalization xmi:type="uml:Generalization" xmi:id="_6sgZoIAfEeKTe7ZOi8nJaA" general="_8UYvwH9WEeKg8Ob6i-v52w"/>

-          <ownedOperation xmi:type="uml:Operation" xmi:id="_rZlCIIAfEeKTe7ZOi8nJaA" name="Operation1"/>

-          <ownedOperation xmi:type="uml:Operation" xmi:id="_rd46YIAfEeKTe7ZOi8nJaA" name="Operation2"/>

-          <ownedOperation xmi:type="uml:Operation" xmi:id="_rigUoIAfEeKTe7ZOi8nJaA" name="Operation3"/>

-          <ownedOperation xmi:type="uml:Operation" xmi:id="_roAfsIAfEeKTe7ZOi8nJaA" name="Operation4"/>

-          <ownedOperation xmi:type="uml:Operation" xmi:id="_rs604IAfEeKTe7ZOi8nJaA" name="Operation5"/>

-        </packagedElement>

-        <packagedElement xmi:type="uml:Class" xmi:id="_9d4ucH9WEeKg8Ob6i-v52w" name="Class4"/>

-        <packagedElement xmi:type="uml:Class" xmi:id="_9exfQH9WEeKg8Ob6i-v52w" name="Class5"/>

-        <packagedElement xmi:type="uml:Class" xmi:id="_9q0-QH9WEeKg8Ob6i-v52w" name="Class6">

-          <ownedOperation xmi:type="uml:Operation" xmi:id="_qyAEwIAfEeKTe7ZOi8nJaA" name="Operation1"/>

-          <ownedOperation xmi:type="uml:Operation" xmi:id="_rC0H8IAfEeKTe7ZOi8nJaA" name="Operation2"/>

-          <ownedOperation xmi:type="uml:Operation" xmi:id="_rHudIIAfEeKTe7ZOi8nJaA" name="Operation3"/>

-          <ownedOperation xmi:type="uml:Operation" xmi:id="_rMx8QIAfEeKTe7ZOi8nJaA" name="Operation4"/>

-        </packagedElement>

-        <packagedElement xmi:type="uml:Association" xmi:id="_mxWA04AhEeKTe7ZOi8nJaA" name="class1_class6_1" memberEnd="_mxWA1IAhEeKTe7ZOi8nJaA _mxWA0IAhEeKTe7ZOi8nJaA _nicGkIAhEeKTe7ZOi8nJaA">

-          <ownedEnd xmi:type="uml:Property" xmi:id="_mxWA1IAhEeKTe7ZOi8nJaA" name="class1" type="_8UYvwH9WEeKg8Ob6i-v52w" association="_mxWA04AhEeKTe7ZOi8nJaA">

-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_mxWA1YAhEeKTe7ZOi8nJaA" value="1"/>

-            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_mxWA1oAhEeKTe7ZOi8nJaA" value="1"/>

-          </ownedEnd>

-          <ownedEnd xmi:type="uml:Property" xmi:id="_mxWA0IAhEeKTe7ZOi8nJaA" name="class6" type="_9q0-QH9WEeKg8Ob6i-v52w" association="_mxWA04AhEeKTe7ZOi8nJaA">

-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_mxWA0YAhEeKTe7ZOi8nJaA" value="1"/>

-            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_mxWA0oAhEeKTe7ZOi8nJaA" value="1"/>

-          </ownedEnd>

-          <ownedEnd xmi:type="uml:Property" xmi:id="_nicGkIAhEeKTe7ZOi8nJaA" name="Class3" type="_9c2MoH9WEeKg8Ob6i-v52w" association="_mxWA04AhEeKTe7ZOi8nJaA">

-            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_nilQgIAhEeKTe7ZOi8nJaA"/>

-            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_nivBgIAhEeKTe7ZOi8nJaA" value="1"/>

-          </ownedEnd>

-        </packagedElement>

-      </packagedElement>

-    </packagedElement>

-  </packagedElement>

-</uml:Model>

+<?xml version="1.0" encoding="UTF-8"?>
+<uml:Model xmi:version="20110701" xmlns:xmi="http://www.omg.org/spec/XMI/20110701" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_0VtdsHxQEeKD0tnoPLkh-A" name="model">
+  <packagedElement xmi:type="uml:Activity" xmi:id="_7Hjk8HxQEeKD0tnoPLkh-A" name="Activity1"/>
+  <packagedElement xmi:type="uml:Package" xmi:id="_3AS_8H9WEeKg8Ob6i-v52w" name="Package1">
+    <packagedElement xmi:type="uml:Package" xmi:id="_3wyowH9WEeKg8Ob6i-v52w" name="Package2">
+      <packagedElement xmi:type="uml:Package" xmi:id="_4gjRwH9WEeKg8Ob6i-v52w" name="Package3">
+        <packagedElement xmi:type="uml:Class" xmi:id="_8UYvwH9WEeKg8Ob6i-v52w" name="Class1">
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_nDxfgIAfEeKTe7ZOi8nJaA" name="Attribute1"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_nVx1gIAfEeKTe7ZOi8nJaA" name="Attribute2"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_onKk4IAfEeKTe7ZOi8nJaA" name="Attribute3"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_pUQUYIAfEeKTe7ZOi8nJaA" name="Attribute4"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_pcmYEIAfEeKTe7ZOi8nJaA" name="Attribute5"/>
+          <ownedAttribute xmi:type="uml:Property" xmi:id="_poWVEIAfEeKTe7ZOi8nJaA" name="Attribute6"/>
+        </packagedElement>
+        <packagedElement xmi:type="uml:Class" xmi:id="_8cIWgH9WEeKg8Ob6i-v52w" name="Class2"/>
+        <packagedElement xmi:type="uml:Class" xmi:id="_9c2MoH9WEeKg8Ob6i-v52w" name="Class3">
+          <generalization xmi:type="uml:Generalization" xmi:id="_6sgZoIAfEeKTe7ZOi8nJaA" general="_8UYvwH9WEeKg8Ob6i-v52w"/>
+          <ownedOperation xmi:type="uml:Operation" xmi:id="_rZlCIIAfEeKTe7ZOi8nJaA" name="Operation1"/>
+          <ownedOperation xmi:type="uml:Operation" xmi:id="_rd46YIAfEeKTe7ZOi8nJaA" name="Operation2"/>
+          <ownedOperation xmi:type="uml:Operation" xmi:id="_rigUoIAfEeKTe7ZOi8nJaA" name="Operation3"/>
+          <ownedOperation xmi:type="uml:Operation" xmi:id="_roAfsIAfEeKTe7ZOi8nJaA" name="Operation4"/>
+          <ownedOperation xmi:type="uml:Operation" xmi:id="_rs604IAfEeKTe7ZOi8nJaA" name="Operation5"/>
+        </packagedElement>
+        <packagedElement xmi:type="uml:Class" xmi:id="_9d4ucH9WEeKg8Ob6i-v52w" name="Class4"/>
+        <packagedElement xmi:type="uml:Class" xmi:id="_9exfQH9WEeKg8Ob6i-v52w" name="Class5"/>
+        <packagedElement xmi:type="uml:Class" xmi:id="_9q0-QH9WEeKg8Ob6i-v52w" name="Class6">
+          <ownedOperation xmi:type="uml:Operation" xmi:id="_qyAEwIAfEeKTe7ZOi8nJaA" name="Operation1"/>
+          <ownedOperation xmi:type="uml:Operation" xmi:id="_rC0H8IAfEeKTe7ZOi8nJaA" name="Operation2"/>
+          <ownedOperation xmi:type="uml:Operation" xmi:id="_rHudIIAfEeKTe7ZOi8nJaA" name="Operation3"/>
+          <ownedOperation xmi:type="uml:Operation" xmi:id="_rMx8QIAfEeKTe7ZOi8nJaA" name="Operation4"/>
+        </packagedElement>
+        <packagedElement xmi:type="uml:Association" xmi:id="_mxWA04AhEeKTe7ZOi8nJaA" name="class1_class6_1" memberEnd="_mxWA1IAhEeKTe7ZOi8nJaA _mxWA0IAhEeKTe7ZOi8nJaA _nicGkIAhEeKTe7ZOi8nJaA">
+          <ownedEnd xmi:type="uml:Property" xmi:id="_mxWA1IAhEeKTe7ZOi8nJaA" name="class1" type="_8UYvwH9WEeKg8Ob6i-v52w" association="_mxWA04AhEeKTe7ZOi8nJaA">
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_mxWA1YAhEeKTe7ZOi8nJaA" value="1"/>
+            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_mxWA1oAhEeKTe7ZOi8nJaA" value="1"/>
+          </ownedEnd>
+          <ownedEnd xmi:type="uml:Property" xmi:id="_mxWA0IAhEeKTe7ZOi8nJaA" name="class6" type="_9q0-QH9WEeKg8Ob6i-v52w" association="_mxWA04AhEeKTe7ZOi8nJaA">
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_mxWA0YAhEeKTe7ZOi8nJaA" value="1"/>
+            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_mxWA0oAhEeKTe7ZOi8nJaA" value="1"/>
+          </ownedEnd>
+          <ownedEnd xmi:type="uml:Property" xmi:id="_nicGkIAhEeKTe7ZOi8nJaA" name="Class3" type="_9c2MoH9WEeKg8Ob6i-v52w" association="_mxWA04AhEeKTe7ZOi8nJaA">
+            <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_nilQgIAhEeKTe7ZOi8nJaA"/>
+            <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_nivBgIAhEeKTe7ZOi8nJaA" value="1"/>
+          </ownedEnd>
+        </packagedElement>
+      </packagedElement>
+    </packagedElement>
+  </packagedElement>
+</uml:Model>
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/basic/delete_contained_table.di b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/basic/delete_contained_table.di
index 2c53cfcf529..2c53cfcf529 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/basic/delete_contained_table.di
+++ b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/basic/delete_contained_table.di
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/basic/delete_contained_table.notation b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/basic/delete_contained_table.notation
index 8e19ab5e0ce..8e19ab5e0ce 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/basic/delete_contained_table.notation
+++ b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/basic/delete_contained_table.notation
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/basic/delete_contained_table.uml b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/basic/delete_contained_table.uml
index ca30b5e89de..ca30b5e89de 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/basic/delete_contained_table.uml
+++ b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/basic/delete_contained_table.uml
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/basic/delete_sash_page.di b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/basic/delete_sash_page.di
index 1fcb63b602c..ec515781fcd 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/basic/delete_sash_page.di
+++ b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/basic/delete_sash_page.di
@@ -1,15 +1,15 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<di:SashWindowsMngr xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi">

-  <sashModel>

-    <windows>

-      <children xsi:type="di:TabFolder">

-        <children>

-          <emfPageIdentifier href="delete_sash_page.notation#_simUYNVWEeOoXOFyw97Vng"/>

-        </children>

-        <children>

-          <emfPageIdentifier href="delete_sash_page.notation#_yjT5oNVWEeOoXOFyw97Vng"/>

-        </children>

-      </children>

-    </windows>

-  </sashModel>

-</di:SashWindowsMngr>

+<?xml version="1.0" encoding="UTF-8"?>
+<di:SashWindowsMngr xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi">
+  <sashModel>
+    <windows>
+      <children xsi:type="di:TabFolder">
+        <children>
+          <emfPageIdentifier href="delete_sash_page.notation#_simUYNVWEeOoXOFyw97Vng"/>
+        </children>
+        <children>
+          <emfPageIdentifier href="delete_sash_page.notation#_yjT5oNVWEeOoXOFyw97Vng"/>
+        </children>
+      </children>
+    </windows>
+  </sashModel>
+</di:SashWindowsMngr>
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/basic/delete_sash_page.notation b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/basic/delete_sash_page.notation
index f69e268e509..f69e268e509 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/basic/delete_sash_page.notation
+++ b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/basic/delete_sash_page.notation
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/basic/delete_sash_page.uml b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/basic/delete_sash_page.uml
index 7aa02902acd..7aa02902acd 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/basic/delete_sash_page.uml
+++ b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/basic/delete_sash_page.uml
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/basic/empty_model.di b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/basic/empty_model.di
index 67cd21c0e77..9bddb6f752a 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/basic/empty_model.di
+++ b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/basic/empty_model.di
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="ASCII"?>

-<di:SashWindowsMngr xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi">

-  <pageList/>

-  <sashModel currentSelection="//@sashModel/@windows.0/@children.0">

-    <windows>

-      <children xsi:type="di:TabFolder"/>

-    </windows>

-  </sashModel>

-</di:SashWindowsMngr>

+<?xml version="1.0" encoding="ASCII"?>
+<di:SashWindowsMngr xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi">
+  <pageList/>
+  <sashModel currentSelection="//@sashModel/@windows.0/@children.0">
+    <windows>
+      <children xsi:type="di:TabFolder"/>
+    </windows>
+  </sashModel>
+</di:SashWindowsMngr>
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/canonical/css_leaktest.di b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/basic/empty_model.notation
index bf9abab340f..bf9abab340f 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/canonical/css_leaktest.di
+++ b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/basic/empty_model.notation
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/basic/empty_model.uml b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/basic/empty_model.uml
index 5ec8003b419..9cda1ff90d3 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/basic/empty_model.uml
+++ b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/basic/empty_model.uml
@@ -1,2 +1,2 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<uml:Model xmi:version="20110701" xmlns:xmi="http://www.omg.org/spec/XMI/20110701" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_uTjBgHqQEeK9jI2Tc6HWsA" name="model"/>

+<?xml version="1.0" encoding="UTF-8"?>
+<uml:Model xmi:version="20110701" xmlns:xmi="http://www.omg.org/spec/XMI/20110701" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_uTjBgHqQEeK9jI2Tc6HWsA" name="model"/>
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/basic/simple_class_model.di b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/basic/simple_class_model.di
index f3567829b33..a0c464641d4 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/basic/simple_class_model.di
+++ b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/basic/simple_class_model.di
@@ -1,17 +1,17 @@
-<?xml version="1.0" encoding="ASCII"?>

-<di:SashWindowsMngr xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi">

-  <pageList>

-    <availablePage>

-      <emfPageIdentifier href="simple_class_model.notation#_1xkSQHqQEeK9jI2Tc6HWsA"/>

-    </availablePage>

-  </pageList>

-  <sashModel currentSelection="//@sashModel/@windows.0/@children.0">

-    <windows>

-      <children xsi:type="di:TabFolder">

-        <children>

-          <emfPageIdentifier href="simple_class_model.notation#_1xkSQHqQEeK9jI2Tc6HWsA"/>

-        </children>

-      </children>

-    </windows>

-  </sashModel>

-</di:SashWindowsMngr>

+<?xml version="1.0" encoding="ASCII"?>
+<di:SashWindowsMngr xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi">
+  <pageList>
+    <availablePage>
+      <emfPageIdentifier href="simple_class_model.notation#_1xkSQHqQEeK9jI2Tc6HWsA"/>
+    </availablePage>
+  </pageList>
+  <sashModel currentSelection="//@sashModel/@windows.0/@children.0">
+    <windows>
+      <children xsi:type="di:TabFolder">
+        <children>
+          <emfPageIdentifier href="simple_class_model.notation#_1xkSQHqQEeK9jI2Tc6HWsA"/>
+        </children>
+      </children>
+    </windows>
+  </sashModel>
+</di:SashWindowsMngr>
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/basic/simple_class_model.notation b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/basic/simple_class_model.notation
index ecef23e3362..e6d14315d3f 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/basic/simple_class_model.notation
+++ b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/basic/simple_class_model.notation
@@ -1,93 +1,93 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_1xkSQHqQEeK9jI2Tc6HWsA" type="PapyrusUMLClassDiagram" name="NewDiagram" measurementUnit="Pixel">

-  <children xmi:type="notation:Shape" xmi:id="_2WT-EHqQEeK9jI2Tc6HWsA" type="2008">

-    <children xmi:type="notation:DecorationNode" xmi:id="_2WdvEHqQEeK9jI2Tc6HWsA" type="5029"/>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_2WdvEXqQEeK9jI2Tc6HWsA" type="7017">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_2WdvIHqQEeK9jI2Tc6HWsA" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_2WdvIXqQEeK9jI2Tc6HWsA" key="showTitle" value="true"/>

-      </eAnnotations>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_2WdvEnqQEeK9jI2Tc6HWsA"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_2WdvE3qQEeK9jI2Tc6HWsA"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_2WdvFHqQEeK9jI2Tc6HWsA"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2WdvFXqQEeK9jI2Tc6HWsA"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_2WdvFnqQEeK9jI2Tc6HWsA" type="7018">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_2WdvInqQEeK9jI2Tc6HWsA" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_2WdvI3qQEeK9jI2Tc6HWsA" key="showTitle" value="true"/>

-      </eAnnotations>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_2WdvF3qQEeK9jI2Tc6HWsA"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_2WdvGHqQEeK9jI2Tc6HWsA"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_2WdvGXqQEeK9jI2Tc6HWsA"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2WdvGnqQEeK9jI2Tc6HWsA"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_2WdvG3qQEeK9jI2Tc6HWsA" type="7019">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_2WdvJHqQEeK9jI2Tc6HWsA" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_2WdvJXqQEeK9jI2Tc6HWsA" key="showTitle" value="true"/>

-      </eAnnotations>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_2WdvHHqQEeK9jI2Tc6HWsA"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_2WdvHXqQEeK9jI2Tc6HWsA"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_2WdvHnqQEeK9jI2Tc6HWsA"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2WdvH3qQEeK9jI2Tc6HWsA"/>

-    </children>

-    <element xmi:type="uml:Class" href="simple_class_model.uml#_2O35UHqQEeK9jI2Tc6HWsA"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2WT-EXqQEeK9jI2Tc6HWsA" x="290" y="270"/>

-  </children>

-  <children xmi:type="notation:Shape" xmi:id="_3N8wsHqQEeK9jI2Tc6HWsA" type="2008">

-    <children xmi:type="notation:DecorationNode" xmi:id="_3N8wsnqQEeK9jI2Tc6HWsA" type="5029"/>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_3N8ws3qQEeK9jI2Tc6HWsA" type="7017">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_3N8wwnqQEeK9jI2Tc6HWsA" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3N8ww3qQEeK9jI2Tc6HWsA" key="showTitle" value="true"/>

-      </eAnnotations>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_3N8wtHqQEeK9jI2Tc6HWsA"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_3N8wtXqQEeK9jI2Tc6HWsA"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_3N8wtnqQEeK9jI2Tc6HWsA"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3N8wt3qQEeK9jI2Tc6HWsA"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_3N8wuHqQEeK9jI2Tc6HWsA" type="7018">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_3N8wxHqQEeK9jI2Tc6HWsA" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3N8wxXqQEeK9jI2Tc6HWsA" key="showTitle" value="true"/>

-      </eAnnotations>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_3N8wuXqQEeK9jI2Tc6HWsA"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_3N8wunqQEeK9jI2Tc6HWsA"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_3N8wu3qQEeK9jI2Tc6HWsA"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3N8wvHqQEeK9jI2Tc6HWsA"/>

-    </children>

-    <children xmi:type="notation:BasicCompartment" xmi:id="_3N8wvXqQEeK9jI2Tc6HWsA" type="7019">

-      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_3N8wxnqQEeK9jI2Tc6HWsA" source="PapyrusCSSForceValue">

-        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3N8wx3qQEeK9jI2Tc6HWsA" key="showTitle" value="true"/>

-      </eAnnotations>

-      <styles xmi:type="notation:TitleStyle" xmi:id="_3N8wvnqQEeK9jI2Tc6HWsA"/>

-      <styles xmi:type="notation:SortingStyle" xmi:id="_3N8wv3qQEeK9jI2Tc6HWsA"/>

-      <styles xmi:type="notation:FilteringStyle" xmi:id="_3N8wwHqQEeK9jI2Tc6HWsA"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3N8wwXqQEeK9jI2Tc6HWsA"/>

-    </children>

-    <element xmi:type="uml:Class" href="simple_class_model.uml#_3Np1wHqQEeK9jI2Tc6HWsA"/>

-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3N8wsXqQEeK9jI2Tc6HWsA" x="840" y="270"/>

-  </children>

-  <styles xmi:type="notation:DiagramStyle" xmi:id="_1xkSQXqQEeK9jI2Tc6HWsA"/>

-  <element xmi:type="uml:Model" href="simple_class_model.uml#_1w91UHqQEeK9jI2Tc6HWsA"/>

-  <edges xmi:type="notation:Connector" xmi:id="_4hkUsHqQEeK9jI2Tc6HWsA" type="4001" source="_2WT-EHqQEeK9jI2Tc6HWsA" target="_3N8wsHqQEeK9jI2Tc6HWsA">

-    <children xmi:type="notation:DecorationNode" xmi:id="_4hkUs3qQEeK9jI2Tc6HWsA" type="6001">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_4hkUtHqQEeK9jI2Tc6HWsA" y="-20"/>

-    </children>

-    <children xmi:type="notation:DecorationNode" xmi:id="_4hkUtXqQEeK9jI2Tc6HWsA" type="6002">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_4hkUtnqQEeK9jI2Tc6HWsA" y="20"/>

-    </children>

-    <children xmi:type="notation:DecorationNode" xmi:id="_4hkUt3qQEeK9jI2Tc6HWsA" type="6003">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_4hkUuHqQEeK9jI2Tc6HWsA" y="-20"/>

-    </children>

-    <children xmi:type="notation:DecorationNode" xmi:id="_4hkUuXqQEeK9jI2Tc6HWsA" type="6005">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_4hkUunqQEeK9jI2Tc6HWsA" y="20"/>

-    </children>

-    <children xmi:type="notation:DecorationNode" xmi:id="_4hkUu3qQEeK9jI2Tc6HWsA" type="6033">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_4hkUvHqQEeK9jI2Tc6HWsA" y="20"/>

-    </children>

-    <children xmi:type="notation:DecorationNode" xmi:id="_4hkUvXqQEeK9jI2Tc6HWsA" type="6034">

-      <layoutConstraint xmi:type="notation:Location" xmi:id="_4hkUvnqQEeK9jI2Tc6HWsA" y="-20"/>

-    </children>

-    <styles xmi:type="notation:FontStyle" xmi:id="_4hkUsXqQEeK9jI2Tc6HWsA"/>

-    <element xmi:type="uml:Association" href="simple_class_model.uml#_4hHowHqQEeK9jI2Tc6HWsA"/>

-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_4hkUsnqQEeK9jI2Tc6HWsA" points="[77, -1, -567, -9]$[645, -42, 1, -50]"/>

-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_4nEfwHqQEeK9jI2Tc6HWsA" id="(0.23,0.45)"/>

-  </edges>

-</notation:Diagram>

+<?xml version="1.0" encoding="UTF-8"?>
+<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_1xkSQHqQEeK9jI2Tc6HWsA" type="PapyrusUMLClassDiagram" name="NewDiagram" measurementUnit="Pixel">
+  <children xmi:type="notation:Shape" xmi:id="_2WT-EHqQEeK9jI2Tc6HWsA" type="2008">
+    <children xmi:type="notation:DecorationNode" xmi:id="_2WdvEHqQEeK9jI2Tc6HWsA" type="5029"/>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_2WdvEXqQEeK9jI2Tc6HWsA" type="7017">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_2WdvIHqQEeK9jI2Tc6HWsA" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_2WdvIXqQEeK9jI2Tc6HWsA" key="showTitle" value="true"/>
+      </eAnnotations>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_2WdvEnqQEeK9jI2Tc6HWsA"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_2WdvE3qQEeK9jI2Tc6HWsA"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_2WdvFHqQEeK9jI2Tc6HWsA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2WdvFXqQEeK9jI2Tc6HWsA"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_2WdvFnqQEeK9jI2Tc6HWsA" type="7018">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_2WdvInqQEeK9jI2Tc6HWsA" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_2WdvI3qQEeK9jI2Tc6HWsA" key="showTitle" value="true"/>
+      </eAnnotations>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_2WdvF3qQEeK9jI2Tc6HWsA"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_2WdvGHqQEeK9jI2Tc6HWsA"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_2WdvGXqQEeK9jI2Tc6HWsA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2WdvGnqQEeK9jI2Tc6HWsA"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_2WdvG3qQEeK9jI2Tc6HWsA" type="7019">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_2WdvJHqQEeK9jI2Tc6HWsA" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_2WdvJXqQEeK9jI2Tc6HWsA" key="showTitle" value="true"/>
+      </eAnnotations>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_2WdvHHqQEeK9jI2Tc6HWsA"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_2WdvHXqQEeK9jI2Tc6HWsA"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_2WdvHnqQEeK9jI2Tc6HWsA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2WdvH3qQEeK9jI2Tc6HWsA"/>
+    </children>
+    <element xmi:type="uml:Class" href="simple_class_model.uml#_2O35UHqQEeK9jI2Tc6HWsA"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_2WT-EXqQEeK9jI2Tc6HWsA" x="290" y="270"/>
+  </children>
+  <children xmi:type="notation:Shape" xmi:id="_3N8wsHqQEeK9jI2Tc6HWsA" type="2008">
+    <children xmi:type="notation:DecorationNode" xmi:id="_3N8wsnqQEeK9jI2Tc6HWsA" type="5029"/>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_3N8ws3qQEeK9jI2Tc6HWsA" type="7017">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_3N8wwnqQEeK9jI2Tc6HWsA" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3N8ww3qQEeK9jI2Tc6HWsA" key="showTitle" value="true"/>
+      </eAnnotations>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_3N8wtHqQEeK9jI2Tc6HWsA"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_3N8wtXqQEeK9jI2Tc6HWsA"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_3N8wtnqQEeK9jI2Tc6HWsA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3N8wt3qQEeK9jI2Tc6HWsA"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_3N8wuHqQEeK9jI2Tc6HWsA" type="7018">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_3N8wxHqQEeK9jI2Tc6HWsA" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3N8wxXqQEeK9jI2Tc6HWsA" key="showTitle" value="true"/>
+      </eAnnotations>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_3N8wuXqQEeK9jI2Tc6HWsA"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_3N8wunqQEeK9jI2Tc6HWsA"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_3N8wu3qQEeK9jI2Tc6HWsA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3N8wvHqQEeK9jI2Tc6HWsA"/>
+    </children>
+    <children xmi:type="notation:BasicCompartment" xmi:id="_3N8wvXqQEeK9jI2Tc6HWsA" type="7019">
+      <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_3N8wxnqQEeK9jI2Tc6HWsA" source="PapyrusCSSForceValue">
+        <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_3N8wx3qQEeK9jI2Tc6HWsA" key="showTitle" value="true"/>
+      </eAnnotations>
+      <styles xmi:type="notation:TitleStyle" xmi:id="_3N8wvnqQEeK9jI2Tc6HWsA"/>
+      <styles xmi:type="notation:SortingStyle" xmi:id="_3N8wv3qQEeK9jI2Tc6HWsA"/>
+      <styles xmi:type="notation:FilteringStyle" xmi:id="_3N8wwHqQEeK9jI2Tc6HWsA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3N8wwXqQEeK9jI2Tc6HWsA"/>
+    </children>
+    <element xmi:type="uml:Class" href="simple_class_model.uml#_3Np1wHqQEeK9jI2Tc6HWsA"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_3N8wsXqQEeK9jI2Tc6HWsA" x="840" y="270"/>
+  </children>
+  <styles xmi:type="notation:DiagramStyle" xmi:id="_1xkSQXqQEeK9jI2Tc6HWsA"/>
+  <element xmi:type="uml:Model" href="simple_class_model.uml#_1w91UHqQEeK9jI2Tc6HWsA"/>
+  <edges xmi:type="notation:Connector" xmi:id="_4hkUsHqQEeK9jI2Tc6HWsA" type="4001" source="_2WT-EHqQEeK9jI2Tc6HWsA" target="_3N8wsHqQEeK9jI2Tc6HWsA">
+    <children xmi:type="notation:DecorationNode" xmi:id="_4hkUs3qQEeK9jI2Tc6HWsA" type="6001">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_4hkUtHqQEeK9jI2Tc6HWsA" y="-20"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_4hkUtXqQEeK9jI2Tc6HWsA" type="6002">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_4hkUtnqQEeK9jI2Tc6HWsA" y="20"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_4hkUt3qQEeK9jI2Tc6HWsA" type="6003">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_4hkUuHqQEeK9jI2Tc6HWsA" y="-20"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_4hkUuXqQEeK9jI2Tc6HWsA" type="6005">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_4hkUunqQEeK9jI2Tc6HWsA" y="20"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_4hkUu3qQEeK9jI2Tc6HWsA" type="6033">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_4hkUvHqQEeK9jI2Tc6HWsA" y="20"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_4hkUvXqQEeK9jI2Tc6HWsA" type="6034">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_4hkUvnqQEeK9jI2Tc6HWsA" y="-20"/>
+    </children>
+    <styles xmi:type="notation:FontStyle" xmi:id="_4hkUsXqQEeK9jI2Tc6HWsA"/>
+    <element xmi:type="uml:Association" href="simple_class_model.uml#_4hHowHqQEeK9jI2Tc6HWsA"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_4hkUsnqQEeK9jI2Tc6HWsA" points="[77, -1, -567, -9]$[645, -42, 1, -50]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_4nEfwHqQEeK9jI2Tc6HWsA" id="(0.23,0.45)"/>
+  </edges>
+</notation:Diagram>
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/basic/simple_class_model.uml b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/basic/simple_class_model.uml
index 6df52ae038f..dd30e382016 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/basic/simple_class_model.uml
+++ b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/basic/simple_class_model.uml
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<uml:Model xmi:version="20110701" xmlns:xmi="http://www.omg.org/spec/XMI/20110701" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_1w91UHqQEeK9jI2Tc6HWsA" name="Model">

-  <packagedElement xmi:type="uml:Class" xmi:id="_2O35UHqQEeK9jI2Tc6HWsA" name="Class1">

-    <ownedAttribute xmi:id="_4g93wHqQEeK9jI2Tc6HWsA" name="class2" type="_3Np1wHqQEeK9jI2Tc6HWsA" association="_4hHowHqQEeK9jI2Tc6HWsA">

-      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_4g93wXqQEeK9jI2Tc6HWsA" value="1"/>

-      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_4g93wnqQEeK9jI2Tc6HWsA" value="1"/>

-    </ownedAttribute>

-  </packagedElement>

-  <packagedElement xmi:type="uml:Class" xmi:id="_3Np1wHqQEeK9jI2Tc6HWsA" name="Class2"/>

-  <packagedElement xmi:type="uml:Association" xmi:id="_4hHowHqQEeK9jI2Tc6HWsA" name="class1_class2_1" memberEnd="_4hHowXqQEeK9jI2Tc6HWsA _4g93wHqQEeK9jI2Tc6HWsA">

-    <ownedEnd xmi:id="_4hHowXqQEeK9jI2Tc6HWsA" name="class1" type="_2O35UHqQEeK9jI2Tc6HWsA" association="_4hHowHqQEeK9jI2Tc6HWsA">

-      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_4hHownqQEeK9jI2Tc6HWsA" value="1"/>

-      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_4hHow3qQEeK9jI2Tc6HWsA" value="1"/>

-    </ownedEnd>

-  </packagedElement>

-</uml:Model>

+<?xml version="1.0" encoding="UTF-8"?>
+<uml:Model xmi:version="20110701" xmlns:xmi="http://www.omg.org/spec/XMI/20110701" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_1w91UHqQEeK9jI2Tc6HWsA" name="Model">
+  <packagedElement xmi:type="uml:Class" xmi:id="_2O35UHqQEeK9jI2Tc6HWsA" name="Class1">
+    <ownedAttribute xmi:id="_4g93wHqQEeK9jI2Tc6HWsA" name="class2" type="_3Np1wHqQEeK9jI2Tc6HWsA" association="_4hHowHqQEeK9jI2Tc6HWsA">
+      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_4g93wXqQEeK9jI2Tc6HWsA" value="1"/>
+      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_4g93wnqQEeK9jI2Tc6HWsA" value="1"/>
+    </ownedAttribute>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Class" xmi:id="_3Np1wHqQEeK9jI2Tc6HWsA" name="Class2"/>
+  <packagedElement xmi:type="uml:Association" xmi:id="_4hHowHqQEeK9jI2Tc6HWsA" name="class1_class2_1" memberEnd="_4hHowXqQEeK9jI2Tc6HWsA _4g93wHqQEeK9jI2Tc6HWsA">
+    <ownedEnd xmi:id="_4hHowXqQEeK9jI2Tc6HWsA" name="class1" type="_2O35UHqQEeK9jI2Tc6HWsA" association="_4hHowHqQEeK9jI2Tc6HWsA">
+      <lowerValue xmi:type="uml:LiteralInteger" xmi:id="_4hHownqQEeK9jI2Tc6HWsA" value="1"/>
+      <upperValue xmi:type="uml:LiteralUnlimitedNatural" xmi:id="_4hHow3qQEeK9jI2Tc6HWsA" value="1"/>
+    </ownedEnd>
+  </packagedElement>
+</uml:Model>
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/basic/simple_table_model.di b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/basic/simple_table_model.di
index 0dd660346e0..f984b86c331 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/basic/simple_table_model.di
+++ b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/basic/simple_table_model.di
@@ -1,193 +1,193 @@
-<?xml version="1.0" encoding="ASCII"?>

-<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi" xmlns:org.eclipse.papyrus.infra.table.instance.papyrustableinstance="http://www.eclipse.org/Papyrus/Table/0.8.0/papyrustableinstance" xmlns:tableinstance="http://www.eclipse.org/EMF_Facet/ModelCellEditor/0.1.0/tableinstance" xmlns:tableinstance2="http://www.eclipse.org/EMF_Facet/Table/0.1.0/tableinstance2">

-  <di:SashWindowsMngr>

-    <pageList>

-      <availablePage emfPageIdentifier="/1"/>

-    </pageList>

-    <sashModel currentSelection="/0/@sashModel/@windows.0/@children.0">

-      <windows>

-        <children xsi:type="di:TabFolder">

-          <children emfPageIdentifier="/1"/>

-        </children>

-      </windows>

-    </sashModel>

-  </di:SashWindowsMngr>

-  <org.eclipse.papyrus.infra.table.instance.papyrustableinstance:PapyrusTableInstance name="DefaultTable" table="/2"/>

-  <tableinstance2:TableInstance2 description="Table Description">

-    <tableConfiguration href="platform:/plugin/org.eclipse.papyrus.uml.table.default/resources/default.tableconfiguration2#/"/>

-    <customizations href="emffacet:/customization/UMLPapyrusDefaultBrowserCustomization#/"/>

-    <customizations href="#/2/@localCustomizations.1"/>

-    <customizations href="#/2/@localCustomizations.0"/>

-    <context href="simple_table_model.uml#_a4aMkHqSEeK9jI2Tc6HWsA"/>

-    <columns xsi:type="tableinstance:DefaultLabelColumn"/>

-    <columns xsi:type="tableinstance:MetaClassColumn"/>

-    <columns xsi:type="tableinstance:EContainerColumn"/>

-    <columns xsi:type="tableinstance:ReferenceColumn">

-      <reference href="http://www.eclipse.org/emf/2002/Ecore#//EModelElement/eAnnotations"/>

-    </columns>

-    <columns xsi:type="tableinstance:ReferenceColumn">

-      <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Element/ownedComment"/>

-    </columns>

-    <columns xsi:type="tableinstance:ReferenceColumn">

-      <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Element/ownedElement"/>

-    </columns>

-    <columns xsi:type="tableinstance:ReferenceColumn">

-      <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Element/owner"/>

-    </columns>

-    <columns xsi:type="tableinstance:ReferenceColumn">

-      <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/clientDependency"/>

-    </columns>

-    <columns xsi:type="tableinstance:AttributeColumn">

-      <attribute href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/name"/>

-    </columns>

-    <columns xsi:type="tableinstance:ReferenceColumn">

-      <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/nameExpression"/>

-    </columns>

-    <columns xsi:type="tableinstance:ReferenceColumn">

-      <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/namespace"/>

-    </columns>

-    <columns xsi:type="tableinstance:AttributeColumn">

-      <attribute href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/qualifiedName"/>

-    </columns>

-    <columns xsi:type="tableinstance:AttributeColumn">

-      <attribute href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/visibility"/>

-    </columns>

-    <columns xsi:type="tableinstance:ReferenceColumn">

-      <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Namespace/elementImport"/>

-    </columns>

-    <columns xsi:type="tableinstance:ReferenceColumn">

-      <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Namespace/packageImport"/>

-    </columns>

-    <columns xsi:type="tableinstance:ReferenceColumn">

-      <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Namespace/ownedRule"/>

-    </columns>

-    <columns xsi:type="tableinstance:ReferenceColumn">

-      <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Namespace/ownedMember"/>

-    </columns>

-    <columns xsi:type="tableinstance:ReferenceColumn">

-      <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Namespace/importedMember"/>

-    </columns>

-    <columns xsi:type="tableinstance:ReferenceColumn">

-      <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Namespace/member"/>

-    </columns>

-    <columns xsi:type="tableinstance:AttributeColumn">

-      <attribute href="http://www.eclipse.org/uml2/4.0.0/UML#//RedefinableElement/isLeaf"/>

-    </columns>

-    <columns xsi:type="tableinstance:ReferenceColumn">

-      <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//RedefinableElement/redefinedElement"/>

-    </columns>

-    <columns xsi:type="tableinstance:ReferenceColumn">

-      <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//RedefinableElement/redefinitionContext"/>

-    </columns>

-    <columns xsi:type="tableinstance:ReferenceColumn">

-      <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//ParameterableElement/owningTemplateParameter"/>

-    </columns>

-    <columns xsi:type="tableinstance:ReferenceColumn">

-      <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//ParameterableElement/templateParameter"/>

-    </columns>

-    <columns xsi:type="tableinstance:ReferenceColumn">

-      <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Type/package"/>

-    </columns>

-    <columns xsi:type="tableinstance:ReferenceColumn">

-      <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//TemplateableElement/ownedTemplateSignature"/>

-    </columns>

-    <columns xsi:type="tableinstance:ReferenceColumn">

-      <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//TemplateableElement/templateBinding"/>

-    </columns>

-    <columns xsi:type="tableinstance:ReferenceColumn">

-      <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/feature"/>

-    </columns>

-    <columns xsi:type="tableinstance:ReferenceColumn">

-      <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/attribute"/>

-    </columns>

-    <columns xsi:type="tableinstance:ReferenceColumn">

-      <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/collaborationUse"/>

-    </columns>

-    <columns xsi:type="tableinstance:ReferenceColumn">

-      <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/general"/>

-    </columns>

-    <columns xsi:type="tableinstance:ReferenceColumn">

-      <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/generalization"/>

-    </columns>

-    <columns xsi:type="tableinstance:ReferenceColumn">

-      <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/powertypeExtent"/>

-    </columns>

-    <columns xsi:type="tableinstance:ReferenceColumn">

-      <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/inheritedMember"/>

-    </columns>

-    <columns xsi:type="tableinstance:AttributeColumn">

-      <attribute href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/isAbstract"/>

-    </columns>

-    <columns xsi:type="tableinstance:AttributeColumn">

-      <attribute href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/isFinalSpecialization"/>

-    </columns>

-    <columns xsi:type="tableinstance:ReferenceColumn">

-      <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/ownedUseCase"/>

-    </columns>

-    <columns xsi:type="tableinstance:ReferenceColumn">

-      <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/useCase"/>

-    </columns>

-    <columns xsi:type="tableinstance:ReferenceColumn">

-      <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/redefinedClassifier"/>

-    </columns>

-    <columns xsi:type="tableinstance:ReferenceColumn">

-      <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/representation"/>

-    </columns>

-    <columns xsi:type="tableinstance:ReferenceColumn">

-      <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/substitution"/>

-    </columns>

-    <columns xsi:type="tableinstance:ReferenceColumn">

-      <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//StructuredClassifier/ownedAttribute"/>

-    </columns>

-    <columns xsi:type="tableinstance:ReferenceColumn">

-      <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//StructuredClassifier/ownedConnector"/>

-    </columns>

-    <columns xsi:type="tableinstance:ReferenceColumn">

-      <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//StructuredClassifier/part"/>

-    </columns>

-    <columns xsi:type="tableinstance:ReferenceColumn">

-      <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//StructuredClassifier/role"/>

-    </columns>

-    <columns xsi:type="tableinstance:ReferenceColumn">

-      <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//EncapsulatedClassifier/ownedPort"/>

-    </columns>

-    <columns xsi:type="tableinstance:ReferenceColumn">

-      <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//BehavioredClassifier/classifierBehavior"/>

-    </columns>

-    <columns xsi:type="tableinstance:ReferenceColumn">

-      <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//BehavioredClassifier/interfaceRealization"/>

-    </columns>

-    <columns xsi:type="tableinstance:ReferenceColumn">

-      <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//BehavioredClassifier/ownedBehavior"/>

-    </columns>

-    <columns xsi:type="tableinstance:ReferenceColumn">

-      <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Class/ownedOperation"/>

-    </columns>

-    <columns xsi:type="tableinstance:ReferenceColumn">

-      <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Class/extension"/>

-    </columns>

-    <columns xsi:type="tableinstance:AttributeColumn">

-      <attribute href="http://www.eclipse.org/uml2/4.0.0/UML#//Class/isActive"/>

-    </columns>

-    <columns xsi:type="tableinstance:ReferenceColumn">

-      <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Class/nestedClassifier"/>

-    </columns>

-    <columns xsi:type="tableinstance:ReferenceColumn">

-      <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Class/ownedReception"/>

-    </columns>

-    <columns xsi:type="tableinstance:ReferenceColumn">

-      <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Class/superClass"/>

-    </columns>

-    <rows>

-      <element href="simple_table_model.uml#_exmrsHqSEeK9jI2Tc6HWsA"/>

-    </rows>

-    <rows>

-      <element href="simple_table_model.uml#_f9eo8HqSEeK9jI2Tc6HWsA"/>

-    </rows>

-    <rows>

-      <element href="simple_table_model.uml#_ge8-UHqSEeK9jI2Tc6HWsA"/>

-    </rows>

-    <localCustomizations metamodelURI="http://www.eclipse.org/emf/2002/Ecore"/>

-    <localCustomizations metamodelURI="http://www.eclipse.org/uml2/4.0.0/UML"/>

-  </tableinstance2:TableInstance2>

-</xmi:XMI>

+<?xml version="1.0" encoding="ASCII"?>
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi" xmlns:org.eclipse.papyrus.infra.table.instance.papyrustableinstance="http://www.eclipse.org/Papyrus/Table/0.8.0/papyrustableinstance" xmlns:tableinstance="http://www.eclipse.org/EMF_Facet/ModelCellEditor/0.1.0/tableinstance" xmlns:tableinstance2="http://www.eclipse.org/EMF_Facet/Table/0.1.0/tableinstance2">
+  <di:SashWindowsMngr>
+    <pageList>
+      <availablePage emfPageIdentifier="/1"/>
+    </pageList>
+    <sashModel currentSelection="/0/@sashModel/@windows.0/@children.0">
+      <windows>
+        <children xsi:type="di:TabFolder">
+          <children emfPageIdentifier="/1"/>
+        </children>
+      </windows>
+    </sashModel>
+  </di:SashWindowsMngr>
+  <org.eclipse.papyrus.infra.table.instance.papyrustableinstance:PapyrusTableInstance name="DefaultTable" table="/2"/>
+  <tableinstance2:TableInstance2 description="Table Description">
+    <tableConfiguration href="platform:/plugin/org.eclipse.papyrus.uml.table.default/resources/default.tableconfiguration2#/"/>
+    <customizations href="emffacet:/customization/UMLPapyrusDefaultBrowserCustomization#/"/>
+    <customizations href="#/2/@localCustomizations.1"/>
+    <customizations href="#/2/@localCustomizations.0"/>
+    <context href="simple_table_model.uml#_a4aMkHqSEeK9jI2Tc6HWsA"/>
+    <columns xsi:type="tableinstance:DefaultLabelColumn"/>
+    <columns xsi:type="tableinstance:MetaClassColumn"/>
+    <columns xsi:type="tableinstance:EContainerColumn"/>
+    <columns xsi:type="tableinstance:ReferenceColumn">
+      <reference href="http://www.eclipse.org/emf/2002/Ecore#//EModelElement/eAnnotations"/>
+    </columns>
+    <columns xsi:type="tableinstance:ReferenceColumn">
+      <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Element/ownedComment"/>
+    </columns>
+    <columns xsi:type="tableinstance:ReferenceColumn">
+      <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Element/ownedElement"/>
+    </columns>
+    <columns xsi:type="tableinstance:ReferenceColumn">
+      <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Element/owner"/>
+    </columns>
+    <columns xsi:type="tableinstance:ReferenceColumn">
+      <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/clientDependency"/>
+    </columns>
+    <columns xsi:type="tableinstance:AttributeColumn">
+      <attribute href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/name"/>
+    </columns>
+    <columns xsi:type="tableinstance:ReferenceColumn">
+      <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/nameExpression"/>
+    </columns>
+    <columns xsi:type="tableinstance:ReferenceColumn">
+      <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/namespace"/>
+    </columns>
+    <columns xsi:type="tableinstance:AttributeColumn">
+      <attribute href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/qualifiedName"/>
+    </columns>
+    <columns xsi:type="tableinstance:AttributeColumn">
+      <attribute href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/visibility"/>
+    </columns>
+    <columns xsi:type="tableinstance:ReferenceColumn">
+      <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Namespace/elementImport"/>
+    </columns>
+    <columns xsi:type="tableinstance:ReferenceColumn">
+      <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Namespace/packageImport"/>
+    </columns>
+    <columns xsi:type="tableinstance:ReferenceColumn">
+      <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Namespace/ownedRule"/>
+    </columns>
+    <columns xsi:type="tableinstance:ReferenceColumn">
+      <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Namespace/ownedMember"/>
+    </columns>
+    <columns xsi:type="tableinstance:ReferenceColumn">
+      <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Namespace/importedMember"/>
+    </columns>
+    <columns xsi:type="tableinstance:ReferenceColumn">
+      <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Namespace/member"/>
+    </columns>
+    <columns xsi:type="tableinstance:AttributeColumn">
+      <attribute href="http://www.eclipse.org/uml2/4.0.0/UML#//RedefinableElement/isLeaf"/>
+    </columns>
+    <columns xsi:type="tableinstance:ReferenceColumn">
+      <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//RedefinableElement/redefinedElement"/>
+    </columns>
+    <columns xsi:type="tableinstance:ReferenceColumn">
+      <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//RedefinableElement/redefinitionContext"/>
+    </columns>
+    <columns xsi:type="tableinstance:ReferenceColumn">
+      <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//ParameterableElement/owningTemplateParameter"/>
+    </columns>
+    <columns xsi:type="tableinstance:ReferenceColumn">
+      <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//ParameterableElement/templateParameter"/>
+    </columns>
+    <columns xsi:type="tableinstance:ReferenceColumn">
+      <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Type/package"/>
+    </columns>
+    <columns xsi:type="tableinstance:ReferenceColumn">
+      <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//TemplateableElement/ownedTemplateSignature"/>
+    </columns>
+    <columns xsi:type="tableinstance:ReferenceColumn">
+      <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//TemplateableElement/templateBinding"/>
+    </columns>
+    <columns xsi:type="tableinstance:ReferenceColumn">
+      <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/feature"/>
+    </columns>
+    <columns xsi:type="tableinstance:ReferenceColumn">
+      <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/attribute"/>
+    </columns>
+    <columns xsi:type="tableinstance:ReferenceColumn">
+      <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/collaborationUse"/>
+    </columns>
+    <columns xsi:type="tableinstance:ReferenceColumn">
+      <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/general"/>
+    </columns>
+    <columns xsi:type="tableinstance:ReferenceColumn">
+      <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/generalization"/>
+    </columns>
+    <columns xsi:type="tableinstance:ReferenceColumn">
+      <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/powertypeExtent"/>
+    </columns>
+    <columns xsi:type="tableinstance:ReferenceColumn">
+      <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/inheritedMember"/>
+    </columns>
+    <columns xsi:type="tableinstance:AttributeColumn">
+      <attribute href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/isAbstract"/>
+    </columns>
+    <columns xsi:type="tableinstance:AttributeColumn">
+      <attribute href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/isFinalSpecialization"/>
+    </columns>
+    <columns xsi:type="tableinstance:ReferenceColumn">
+      <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/ownedUseCase"/>
+    </columns>
+    <columns xsi:type="tableinstance:ReferenceColumn">
+      <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/useCase"/>
+    </columns>
+    <columns xsi:type="tableinstance:ReferenceColumn">
+      <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/redefinedClassifier"/>
+    </columns>
+    <columns xsi:type="tableinstance:ReferenceColumn">
+      <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/representation"/>
+    </columns>
+    <columns xsi:type="tableinstance:ReferenceColumn">
+      <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Classifier/substitution"/>
+    </columns>
+    <columns xsi:type="tableinstance:ReferenceColumn">
+      <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//StructuredClassifier/ownedAttribute"/>
+    </columns>
+    <columns xsi:type="tableinstance:ReferenceColumn">
+      <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//StructuredClassifier/ownedConnector"/>
+    </columns>
+    <columns xsi:type="tableinstance:ReferenceColumn">
+      <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//StructuredClassifier/part"/>
+    </columns>
+    <columns xsi:type="tableinstance:ReferenceColumn">
+      <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//StructuredClassifier/role"/>
+    </columns>
+    <columns xsi:type="tableinstance:ReferenceColumn">
+      <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//EncapsulatedClassifier/ownedPort"/>
+    </columns>
+    <columns xsi:type="tableinstance:ReferenceColumn">
+      <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//BehavioredClassifier/classifierBehavior"/>
+    </columns>
+    <columns xsi:type="tableinstance:ReferenceColumn">
+      <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//BehavioredClassifier/interfaceRealization"/>
+    </columns>
+    <columns xsi:type="tableinstance:ReferenceColumn">
+      <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//BehavioredClassifier/ownedBehavior"/>
+    </columns>
+    <columns xsi:type="tableinstance:ReferenceColumn">
+      <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Class/ownedOperation"/>
+    </columns>
+    <columns xsi:type="tableinstance:ReferenceColumn">
+      <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Class/extension"/>
+    </columns>
+    <columns xsi:type="tableinstance:AttributeColumn">
+      <attribute href="http://www.eclipse.org/uml2/4.0.0/UML#//Class/isActive"/>
+    </columns>
+    <columns xsi:type="tableinstance:ReferenceColumn">
+      <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Class/nestedClassifier"/>
+    </columns>
+    <columns xsi:type="tableinstance:ReferenceColumn">
+      <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Class/ownedReception"/>
+    </columns>
+    <columns xsi:type="tableinstance:ReferenceColumn">
+      <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Class/superClass"/>
+    </columns>
+    <rows>
+      <element href="simple_table_model.uml#_exmrsHqSEeK9jI2Tc6HWsA"/>
+    </rows>
+    <rows>
+      <element href="simple_table_model.uml#_f9eo8HqSEeK9jI2Tc6HWsA"/>
+    </rows>
+    <rows>
+      <element href="simple_table_model.uml#_ge8-UHqSEeK9jI2Tc6HWsA"/>
+    </rows>
+    <localCustomizations metamodelURI="http://www.eclipse.org/emf/2002/Ecore"/>
+    <localCustomizations metamodelURI="http://www.eclipse.org/uml2/4.0.0/UML"/>
+  </tableinstance2:TableInstance2>
+</xmi:XMI>
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/basic/simple_table_model.notation b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/basic/simple_table_model.notation
index 8634d4c00e0..bf9abab340f 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/basic/simple_table_model.notation
+++ b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/basic/simple_table_model.notation
@@ -1,2 +1,2 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI"/>

+<?xml version="1.0" encoding="UTF-8"?>
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI"/>
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/basic/simple_table_model.uml b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/basic/simple_table_model.uml
index 81b5d6837d8..89a192bff5a 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/basic/simple_table_model.uml
+++ b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/basic/simple_table_model.uml
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<uml:Model xmi:version="20110701" xmlns:xmi="http://www.omg.org/spec/XMI/20110701" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_a4aMkHqSEeK9jI2Tc6HWsA" name="model">

-  <packagedElement xmi:type="uml:Class" xmi:id="_exmrsHqSEeK9jI2Tc6HWsA" name="Class1" visibility="private"/>

-  <packagedElement xmi:type="uml:Class" xmi:id="_f9eo8HqSEeK9jI2Tc6HWsA" name="Class2" isActive="true"/>

-  <packagedElement xmi:type="uml:Class" xmi:id="_ge8-UHqSEeK9jI2Tc6HWsA" name="Class3" isAbstract="true"/>

-</uml:Model>

+<?xml version="1.0" encoding="UTF-8"?>
+<uml:Model xmi:version="20110701" xmlns:xmi="http://www.omg.org/spec/XMI/20110701" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_a4aMkHqSEeK9jI2Tc6HWsA" name="model">
+  <packagedElement xmi:type="uml:Class" xmi:id="_exmrsHqSEeK9jI2Tc6HWsA" name="Class1" visibility="private"/>
+  <packagedElement xmi:type="uml:Class" xmi:id="_f9eo8HqSEeK9jI2Tc6HWsA" name="Class2" isActive="true"/>
+  <packagedElement xmi:type="uml:Class" xmi:id="_ge8-UHqSEeK9jI2Tc6HWsA" name="Class3" isAbstract="true"/>
+</uml:Model>
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/basic/simple_uml_generic_table_model.di b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/basic/simple_uml_generic_table_model.di
index 3db5ff676fa..4ce4e686639 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/basic/simple_uml_generic_table_model.di
+++ b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/basic/simple_uml_generic_table_model.di
@@ -1,17 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<di:SashWindowsMngr xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi">

-  <pageList>

-    <availablePage>

-      <emfPageIdentifier href="simple_uml_generic_table_model.notation#_5NSlgNm3EeKhMIaB2_NRKQ"/>

-    </availablePage>

-  </pageList>

-  <sashModel currentSelection="//@sashModel/@windows.0/@children.0">

-    <windows>

-      <children xsi:type="di:TabFolder">

-        <children>

-          <emfPageIdentifier href="simple_uml_generic_table_model.notation#_5NSlgNm3EeKhMIaB2_NRKQ"/>

-        </children>

-      </children>

-    </windows>

-  </sashModel>

-</di:SashWindowsMngr>

+<?xml version="1.0" encoding="UTF-8"?>
+<di:SashWindowsMngr xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi">
+  <pageList>
+    <availablePage>
+      <emfPageIdentifier href="simple_uml_generic_table_model.notation#_5NSlgNm3EeKhMIaB2_NRKQ"/>
+    </availablePage>
+  </pageList>
+  <sashModel currentSelection="//@sashModel/@windows.0/@children.0">
+    <windows>
+      <children xsi:type="di:TabFolder">
+        <children>
+          <emfPageIdentifier href="simple_uml_generic_table_model.notation#_5NSlgNm3EeKhMIaB2_NRKQ"/>
+        </children>
+      </children>
+    </windows>
+  </sashModel>
+</di:SashWindowsMngr>
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/basic/simple_uml_generic_table_model.notation b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/basic/simple_uml_generic_table_model.notation
index 2b17a5a95b8..f9ff8f7b201 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/basic/simple_uml_generic_table_model.notation
+++ b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/basic/simple_uml_generic_table_model.notation
@@ -1,125 +1,125 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<nattable:Table xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:nattable="http://www.eclipse.org/papyrus/nattable/model" xmlns:nattableaxis="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis" xmlns:nattableaxisconfiguration="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration" xmlns:nattableaxisprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider" xmlns:nattableconfiguration="http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis http://www.eclipse.org/papyrus/nattable/model#//nattableaxis http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration http://www.eclipse.org/papyrus/nattable/model#//nattableaxisconfiguration http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider http://www.eclipse.org/papyrus/nattable/model#//nattableaxisprovider http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration http://www.eclipse.org/papyrus/nattable/model#//nattableconfiguration" xmi:id="_5NSlgNm3EeKhMIaB2_NRKQ" name="GenericTable0" currentRowAxisProvider="_5NSlgtm3EeKhMIaB2_NRKQ" currentColumnAxisProvider="_5NSlgdm3EeKhMIaB2_NRKQ">

-  <context xmi:type="uml:Model" href="simple_uml_generic_table_model.uml#_4fBKQNm3EeKhMIaB2_NRKQ"/>

-  <tableConfiguration xmi:type="nattableconfiguration:TableConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#/"/>

-  <columnAxisProvidersHistory xmi:type="nattableaxisprovider:SlaveObjectAxisProvider" xmi:id="_5NSlgdm3EeKhMIaB2_NRKQ" description="This axis provider provides available columns according to the rows of the table (features of the object displayed on the other axis)" name="UML Feature axis provider">

-    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_5ohI8dm3EeKhMIaB2_NRKQ">

-      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-      <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/clientDependency"/>

-    </axis>

-    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_5ohI8tm3EeKhMIaB2_NRKQ">

-      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-      <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//Namespace/packageImport"/>

-    </axis>

-    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_5ohI89m3EeKhMIaB2_NRKQ">

-      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-      <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//Package/nestedPackage"/>

-    </axis>

-    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_5ohI9Nm3EeKhMIaB2_NRKQ">

-      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-      <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/namespace"/>

-    </axis>

-    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_5ohI9dm3EeKhMIaB2_NRKQ">

-      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-      <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//Package/packageMerge"/>

-    </axis>

-    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_5ohI9tm3EeKhMIaB2_NRKQ">

-      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-      <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/nameExpression"/>

-    </axis>

-    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_5ohI99m3EeKhMIaB2_NRKQ">

-      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-      <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/qualifiedName"/>

-    </axis>

-    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_5ohI-Nm3EeKhMIaB2_NRKQ">

-      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-      <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/visibility"/>

-    </axis>

-    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_5ohI-dm3EeKhMIaB2_NRKQ">

-      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-      <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//Package/ownedStereotype"/>

-    </axis>

-    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_5ohI-tm3EeKhMIaB2_NRKQ">

-      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-      <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//Element/owner"/>

-    </axis>

-    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_5ohI-9m3EeKhMIaB2_NRKQ">

-      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-      <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//TemplateableElement/ownedTemplateSignature"/>

-    </axis>

-    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_5ohI_Nm3EeKhMIaB2_NRKQ">

-      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-      <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//Namespace/ownedMember"/>

-    </axis>

-    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_5ohI_dm3EeKhMIaB2_NRKQ">

-      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-      <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Model/viewpoint"/>

-    </axis>

-    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_5ohI_tm3EeKhMIaB2_NRKQ">

-      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-      <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//Element/ownedComment"/>

-    </axis>

-    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_5ohI_9m3EeKhMIaB2_NRKQ">

-      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-      <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/name"/>

-    </axis>

-    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_5ohJANm3EeKhMIaB2_NRKQ">

-      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-      <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//TemplateableElement/templateBinding"/>

-    </axis>

-    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_5ohJAdm3EeKhMIaB2_NRKQ">

-      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-      <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//Package/profileApplication"/>

-    </axis>

-    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_5ohJAtm3EeKhMIaB2_NRKQ">

-      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-      <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//Package/nestingPackage"/>

-    </axis>

-    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_5ohJA9m3EeKhMIaB2_NRKQ">

-      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-      <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//Package/ownedType"/>

-    </axis>

-    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_5ohJBNm3EeKhMIaB2_NRKQ">

-      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-      <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//Namespace/ownedRule"/>

-    </axis>

-    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_5ohJBdm3EeKhMIaB2_NRKQ">

-      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-      <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//ParameterableElement/templateParameter"/>

-    </axis>

-    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_5ohJBtm3EeKhMIaB2_NRKQ">

-      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-      <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Package/URI"/>

-    </axis>

-    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_5ohJB9m3EeKhMIaB2_NRKQ">

-      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-      <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//Namespace/elementImport"/>

-    </axis>

-    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_5ohJCNm3EeKhMIaB2_NRKQ">

-      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-      <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//Element/ownedElement"/>

-    </axis>

-    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_5ohJCdm3EeKhMIaB2_NRKQ">

-      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-      <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//Namespace/member"/>

-    </axis>

-    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_5ohJCtm3EeKhMIaB2_NRKQ">

-      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-      <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//Package/packagedElement"/>

-    </axis>

-    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_5ohJC9m3EeKhMIaB2_NRKQ">

-      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-      <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//ParameterableElement/owningTemplateParameter"/>

-    </axis>

-    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_5ohJDNm3EeKhMIaB2_NRKQ">

-      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-      <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//Namespace/importedMember"/>

-    </axis>

-  </columnAxisProvidersHistory>

-  <rowAxisProvidersHistory xmi:type="nattableaxisprovider:MasterObjectAxisProvider" xmi:id="_5NSlgtm3EeKhMIaB2_NRKQ" description="This axis provider contains the object dropped by the user into the table" name="DroppedElementAxisProvider">

-    <axis xmi:type="nattableaxis:EObjectAxis" xmi:id="_5ohI8Nm3EeKhMIaB2_NRKQ">

-      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@rowHeaderAxisConfiguration/@axisManagers.0"/>

-      <element xmi:type="uml:Model" href="simple_uml_generic_table_model.uml#_4fBKQNm3EeKhMIaB2_NRKQ"/>

-    </axis>

-  </rowAxisProvidersHistory>

-</nattable:Table>

+<?xml version="1.0" encoding="UTF-8"?>
+<nattable:Table xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:nattable="http://www.eclipse.org/papyrus/nattable/model" xmlns:nattableaxis="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis" xmlns:nattableaxisconfiguration="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration" xmlns:nattableaxisprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider" xmlns:nattableconfiguration="http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis http://www.eclipse.org/papyrus/nattable/model#//nattableaxis http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration http://www.eclipse.org/papyrus/nattable/model#//nattableaxisconfiguration http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider http://www.eclipse.org/papyrus/nattable/model#//nattableaxisprovider http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration http://www.eclipse.org/papyrus/nattable/model#//nattableconfiguration" xmi:id="_5NSlgNm3EeKhMIaB2_NRKQ" name="GenericTable0" currentRowAxisProvider="_5NSlgtm3EeKhMIaB2_NRKQ" currentColumnAxisProvider="_5NSlgdm3EeKhMIaB2_NRKQ">
+  <context xmi:type="uml:Model" href="simple_uml_generic_table_model.uml#_4fBKQNm3EeKhMIaB2_NRKQ"/>
+  <tableConfiguration xmi:type="nattableconfiguration:TableConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#/"/>
+  <columnAxisProvidersHistory xmi:type="nattableaxisprovider:SlaveObjectAxisProvider" xmi:id="_5NSlgdm3EeKhMIaB2_NRKQ" description="This axis provider provides available columns according to the rows of the table (features of the object displayed on the other axis)" name="UML Feature axis provider">
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_5ohI8dm3EeKhMIaB2_NRKQ">
+      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+      <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/clientDependency"/>
+    </axis>
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_5ohI8tm3EeKhMIaB2_NRKQ">
+      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+      <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//Namespace/packageImport"/>
+    </axis>
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_5ohI89m3EeKhMIaB2_NRKQ">
+      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+      <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//Package/nestedPackage"/>
+    </axis>
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_5ohI9Nm3EeKhMIaB2_NRKQ">
+      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+      <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/namespace"/>
+    </axis>
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_5ohI9dm3EeKhMIaB2_NRKQ">
+      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+      <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//Package/packageMerge"/>
+    </axis>
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_5ohI9tm3EeKhMIaB2_NRKQ">
+      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+      <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/nameExpression"/>
+    </axis>
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_5ohI99m3EeKhMIaB2_NRKQ">
+      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+      <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/qualifiedName"/>
+    </axis>
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_5ohI-Nm3EeKhMIaB2_NRKQ">
+      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+      <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/visibility"/>
+    </axis>
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_5ohI-dm3EeKhMIaB2_NRKQ">
+      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+      <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//Package/ownedStereotype"/>
+    </axis>
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_5ohI-tm3EeKhMIaB2_NRKQ">
+      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+      <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//Element/owner"/>
+    </axis>
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_5ohI-9m3EeKhMIaB2_NRKQ">
+      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+      <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//TemplateableElement/ownedTemplateSignature"/>
+    </axis>
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_5ohI_Nm3EeKhMIaB2_NRKQ">
+      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+      <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//Namespace/ownedMember"/>
+    </axis>
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_5ohI_dm3EeKhMIaB2_NRKQ">
+      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+      <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Model/viewpoint"/>
+    </axis>
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_5ohI_tm3EeKhMIaB2_NRKQ">
+      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+      <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//Element/ownedComment"/>
+    </axis>
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_5ohI_9m3EeKhMIaB2_NRKQ">
+      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+      <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/name"/>
+    </axis>
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_5ohJANm3EeKhMIaB2_NRKQ">
+      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+      <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//TemplateableElement/templateBinding"/>
+    </axis>
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_5ohJAdm3EeKhMIaB2_NRKQ">
+      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+      <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//Package/profileApplication"/>
+    </axis>
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_5ohJAtm3EeKhMIaB2_NRKQ">
+      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+      <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//Package/nestingPackage"/>
+    </axis>
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_5ohJA9m3EeKhMIaB2_NRKQ">
+      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+      <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//Package/ownedType"/>
+    </axis>
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_5ohJBNm3EeKhMIaB2_NRKQ">
+      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+      <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//Namespace/ownedRule"/>
+    </axis>
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_5ohJBdm3EeKhMIaB2_NRKQ">
+      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+      <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//ParameterableElement/templateParameter"/>
+    </axis>
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_5ohJBtm3EeKhMIaB2_NRKQ">
+      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+      <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Package/URI"/>
+    </axis>
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_5ohJB9m3EeKhMIaB2_NRKQ">
+      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+      <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//Namespace/elementImport"/>
+    </axis>
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_5ohJCNm3EeKhMIaB2_NRKQ">
+      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+      <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//Element/ownedElement"/>
+    </axis>
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_5ohJCdm3EeKhMIaB2_NRKQ">
+      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+      <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//Namespace/member"/>
+    </axis>
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_5ohJCtm3EeKhMIaB2_NRKQ">
+      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+      <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//Package/packagedElement"/>
+    </axis>
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_5ohJC9m3EeKhMIaB2_NRKQ">
+      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+      <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//ParameterableElement/owningTemplateParameter"/>
+    </axis>
+    <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_5ohJDNm3EeKhMIaB2_NRKQ">
+      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+      <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//Namespace/importedMember"/>
+    </axis>
+  </columnAxisProvidersHistory>
+  <rowAxisProvidersHistory xmi:type="nattableaxisprovider:MasterObjectAxisProvider" xmi:id="_5NSlgtm3EeKhMIaB2_NRKQ" description="This axis provider contains the object dropped by the user into the table" name="DroppedElementAxisProvider">
+    <axis xmi:type="nattableaxis:EObjectAxis" xmi:id="_5ohI8Nm3EeKhMIaB2_NRKQ">
+      <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@rowHeaderAxisConfiguration/@axisManagers.0"/>
+      <element xmi:type="uml:Model" href="simple_uml_generic_table_model.uml#_4fBKQNm3EeKhMIaB2_NRKQ"/>
+    </axis>
+  </rowAxisProvidersHistory>
+</nattable:Table>
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/basic/simple_uml_generic_table_model.uml b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/basic/simple_uml_generic_table_model.uml
index 7e87e564867..195a0e80b5f 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/basic/simple_uml_generic_table_model.uml
+++ b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/basic/simple_uml_generic_table_model.uml
@@ -1,2 +1,2 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<uml:Model xmi:version="20110701" xmlns:xmi="http://www.omg.org/spec/XMI/20110701" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_4fBKQNm3EeKhMIaB2_NRKQ" name="model"/>

+<?xml version="1.0" encoding="UTF-8"?>
+<uml:Model xmi:version="20110701" xmlns:xmi="http://www.omg.org/spec/XMI/20110701" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_4fBKQNm3EeKhMIaB2_NRKQ" name="model"/>
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/basic/table.di b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/basic/table.di
index 0eab39cbb9c..0eab39cbb9c 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/basic/table.di
+++ b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/basic/table.di
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/basic/table.notation b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/basic/table.notation
index 8ce107d34ff..8ce107d34ff 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/basic/table.notation
+++ b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/basic/table.notation
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/basic/table.uml b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/basic/table.uml
index 715500c8abc..715500c8abc 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/basic/table.uml
+++ b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/basic/table.uml
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/basic/two_diagrams_model.di b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/basic/two_diagrams_model.di
index 9df9758558f..cf4c7e491ce 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/basic/two_diagrams_model.di
+++ b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/basic/two_diagrams_model.di
@@ -1,20 +1,20 @@
-<?xml version="1.0" encoding="ASCII"?>

-<di:SashWindowsMngr xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi">

-  <pageList>

-    <availablePage>

-      <emfPageIdentifier href="two_diagrams_model.notation#_-qtdMXqQEeK9jI2Tc6HWsA"/>

-    </availablePage>

-    <availablePage>

-      <emfPageIdentifier href="two_diagrams_model.notation#_-q3OMHqQEeK9jI2Tc6HWsA"/>

-    </availablePage>

-  </pageList>

-  <sashModel currentSelection="//@sashModel/@windows.0/@children.0">

-    <windows>

-      <children xsi:type="di:TabFolder">

-        <children>

-          <emfPageIdentifier href="two_diagrams_model.notation#_-qtdMXqQEeK9jI2Tc6HWsA"/>

-        </children>

-      </children>

-    </windows>

-  </sashModel>

-</di:SashWindowsMngr>

+<?xml version="1.0" encoding="ASCII"?>
+<di:SashWindowsMngr xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi">
+  <pageList>
+    <availablePage>
+      <emfPageIdentifier href="two_diagrams_model.notation#_-qtdMXqQEeK9jI2Tc6HWsA"/>
+    </availablePage>
+    <availablePage>
+      <emfPageIdentifier href="two_diagrams_model.notation#_-q3OMHqQEeK9jI2Tc6HWsA"/>
+    </availablePage>
+  </pageList>
+  <sashModel currentSelection="//@sashModel/@windows.0/@children.0">
+    <windows>
+      <children xsi:type="di:TabFolder">
+        <children>
+          <emfPageIdentifier href="two_diagrams_model.notation#_-qtdMXqQEeK9jI2Tc6HWsA"/>
+        </children>
+      </children>
+    </windows>
+  </sashModel>
+</di:SashWindowsMngr>
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/basic/two_diagrams_model.notation b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/basic/two_diagrams_model.notation
index bae83b041b3..447b1891da3 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/basic/two_diagrams_model.notation
+++ b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/basic/two_diagrams_model.notation
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML">

-  <notation:Diagram xmi:id="_-qtdMXqQEeK9jI2Tc6HWsA" type="PapyrusUMLClassDiagram" name="NewDiagram" measurementUnit="Pixel">

-    <children xmi:type="notation:Shape" xmi:id="_AR9H0HqREeK9jI2Tc6HWsA" type="2012">

-      <children xmi:type="notation:DecorationNode" xmi:id="_AR9H0nqREeK9jI2Tc6HWsA" type="5038"/>

-      <element xmi:type="uml:Comment" href="two_diagrams_model.uml#_ARNg8HqREeK9jI2Tc6HWsA"/>

-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_AR9H0XqREeK9jI2Tc6HWsA" x="200" y="105" width="446" height="141"/>

-    </children>

-    <styles xmi:type="notation:DiagramStyle" xmi:id="_-qtdMnqQEeK9jI2Tc6HWsA"/>

-    <element xmi:type="uml:Model" href="two_diagrams_model.uml#_-qtdMHqQEeK9jI2Tc6HWsA"/>

-  </notation:Diagram>

-  <notation:Diagram xmi:id="_-q3OMHqQEeK9jI2Tc6HWsA" type="PapyrusUMLTimingDiagram" name="NewDiagram" measurementUnit="Pixel">

-    <styles xmi:type="notation:DiagramStyle" xmi:id="_-q3OMXqQEeK9jI2Tc6HWsA"/>

-    <element xmi:type="uml:Model" href="two_diagrams_model.uml#_-qtdMHqQEeK9jI2Tc6HWsA"/>

-  </notation:Diagram>

-</xmi:XMI>

+<?xml version="1.0" encoding="UTF-8"?>
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML">
+  <notation:Diagram xmi:id="_-qtdMXqQEeK9jI2Tc6HWsA" type="PapyrusUMLClassDiagram" name="NewDiagram" measurementUnit="Pixel">
+    <children xmi:type="notation:Shape" xmi:id="_AR9H0HqREeK9jI2Tc6HWsA" type="2012">
+      <children xmi:type="notation:DecorationNode" xmi:id="_AR9H0nqREeK9jI2Tc6HWsA" type="5038"/>
+      <element xmi:type="uml:Comment" href="two_diagrams_model.uml#_ARNg8HqREeK9jI2Tc6HWsA"/>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_AR9H0XqREeK9jI2Tc6HWsA" x="200" y="105" width="446" height="141"/>
+    </children>
+    <styles xmi:type="notation:DiagramStyle" xmi:id="_-qtdMnqQEeK9jI2Tc6HWsA"/>
+    <element xmi:type="uml:Model" href="two_diagrams_model.uml#_-qtdMHqQEeK9jI2Tc6HWsA"/>
+  </notation:Diagram>
+  <notation:Diagram xmi:id="_-q3OMHqQEeK9jI2Tc6HWsA" type="PapyrusUMLTimingDiagram" name="NewDiagram" measurementUnit="Pixel">
+    <styles xmi:type="notation:DiagramStyle" xmi:id="_-q3OMXqQEeK9jI2Tc6HWsA"/>
+    <element xmi:type="uml:Model" href="two_diagrams_model.uml#_-qtdMHqQEeK9jI2Tc6HWsA"/>
+  </notation:Diagram>
+</xmi:XMI>
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/basic/two_diagrams_model.uml b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/basic/two_diagrams_model.uml
index bddffd2337e..7b08dbe5e96 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/basic/two_diagrams_model.uml
+++ b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/basic/two_diagrams_model.uml
@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<uml:Model xmi:version="20110701" xmlns:xmi="http://www.omg.org/spec/XMI/20110701" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_-qtdMHqQEeK9jI2Tc6HWsA" name="model">

-  <ownedComment xmi:id="_ARNg8HqREeK9jI2Tc6HWsA" annotatedElement="_-qtdMHqQEeK9jI2Tc6HWsA">

-    <body>This model contains two diagrams. The Class Diagram is opened, while the timing diagram is closed.&#xD;

-&#xD;

-Expected behavior:&#xD;

-&#xD;

-	- allPages() contains two entries&#xD;

-	- activeEditor is a UML Class Diagram Editor&#xD;

-	- activePage() is a Class Diagram</body>

-  </ownedComment>

-</uml:Model>

+<?xml version="1.0" encoding="UTF-8"?>
+<uml:Model xmi:version="20110701" xmlns:xmi="http://www.omg.org/spec/XMI/20110701" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_-qtdMHqQEeK9jI2Tc6HWsA" name="model">
+  <ownedComment xmi:id="_ARNg8HqREeK9jI2Tc6HWsA" annotatedElement="_-qtdMHqQEeK9jI2Tc6HWsA">
+    <body>This model contains two diagrams. The Class Diagram is opened, while the timing diagram is closed.&#xD;
+&#xD;
+Expected behavior:&#xD;
+&#xD;
+	- allPages() contains two entries&#xD;
+	- activeEditor is a UML Class Diagram Editor&#xD;
+	- activePage() is a Class Diagram</body>
+  </ownedComment>
+</uml:Model>
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/basic/two_tables_model.di b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/basic/two_tables_model.di
index 90a18ab0720..47afbb32acf 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/basic/two_tables_model.di
+++ b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/basic/two_tables_model.di
@@ -1,20 +1,20 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<di:SashWindowsMngr xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi">

-  <pageList>

-    <availablePage>

-      <emfPageIdentifier href="two_tables_model.notation#_uNjMYNm1EeKhMIaB2_NRKQ"/>

-    </availablePage>

-    <availablePage>

-      <emfPageIdentifier href="two_tables_model.notation#_usfyMNm1EeKhMIaB2_NRKQ"/>

-    </availablePage>

-  </pageList>

-  <sashModel currentSelection="//@sashModel/@windows.0/@children.0">

-    <windows>

-      <children xsi:type="di:TabFolder">

-        <children>

-          <emfPageIdentifier href="two_tables_model.notation#_uNjMYNm1EeKhMIaB2_NRKQ"/>

-        </children>

-      </children>

-    </windows>

-  </sashModel>

-</di:SashWindowsMngr>

+<?xml version="1.0" encoding="UTF-8"?>
+<di:SashWindowsMngr xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi">
+  <pageList>
+    <availablePage>
+      <emfPageIdentifier href="two_tables_model.notation#_uNjMYNm1EeKhMIaB2_NRKQ"/>
+    </availablePage>
+    <availablePage>
+      <emfPageIdentifier href="two_tables_model.notation#_usfyMNm1EeKhMIaB2_NRKQ"/>
+    </availablePage>
+  </pageList>
+  <sashModel currentSelection="//@sashModel/@windows.0/@children.0">
+    <windows>
+      <children xsi:type="di:TabFolder">
+        <children>
+          <emfPageIdentifier href="two_tables_model.notation#_uNjMYNm1EeKhMIaB2_NRKQ"/>
+        </children>
+      </children>
+    </windows>
+  </sashModel>
+</di:SashWindowsMngr>
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/basic/two_tables_model.notation b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/basic/two_tables_model.notation
index 1edb6f4bc90..044d61cfeaf 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/basic/two_tables_model.notation
+++ b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/basic/two_tables_model.notation
@@ -1,54 +1,54 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:nattable="http://www.eclipse.org/papyrus/nattable/model" xmlns:nattableaxis="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis" xmlns:nattableaxisconfiguration="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration" xmlns:nattableaxisprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider" xmlns:nattableconfiguration="http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis http://www.eclipse.org/papyrus/nattable/model#//nattableaxis http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration http://www.eclipse.org/papyrus/nattable/model#//nattableaxisconfiguration http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider http://www.eclipse.org/papyrus/nattable/model#//nattableaxisprovider http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration http://www.eclipse.org/papyrus/nattable/model#//nattableconfiguration">

-  <nattable:Table xmi:id="_uNjMYNm1EeKhMIaB2_NRKQ" name="GenericTable0" currentRowAxisProvider="_uNjMYtm1EeKhMIaB2_NRKQ" currentColumnAxisProvider="_uNjMYdm1EeKhMIaB2_NRKQ">

-    <context xmi:type="uml:Model" href="two_tables_model.uml#_WYKr5Nm1EeKhMIaB2_NRKQ"/>

-    <tableConfiguration xmi:type="nattableconfiguration:TableConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#/"/>

-    <columnAxisProvidersHistory xmi:type="nattableaxisprovider:SlaveObjectAxisProvider" xmi:id="_uNjMYdm1EeKhMIaB2_NRKQ" description="This axis provider provides available columns according to the rows of the table (features of the object displayed on the other axis)" name="UML Feature axis provider">

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_sU7BYdm2EeKhMIaB2_NRKQ">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//Element/ownedElement"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_sU7BYtm2EeKhMIaB2_NRKQ">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//Element/owner"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_sU7BY9m2EeKhMIaB2_NRKQ">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Comment/body"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_sU7BZNm2EeKhMIaB2_NRKQ">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//Comment/annotatedElement"/>

-      </axis>

-      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_sU7BZdm2EeKhMIaB2_NRKQ">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//Element/ownedComment"/>

-      </axis>

-    </columnAxisProvidersHistory>

-    <rowAxisProvidersHistory xmi:type="nattableaxisprovider:MasterObjectAxisProvider" xmi:id="_uNjMYtm1EeKhMIaB2_NRKQ" description="This axis provider contains the object dropped by the user into the table" name="DroppedElementAxisProvider">

-      <axis xmi:type="nattableaxis:EObjectAxis" xmi:id="_sU7BYNm2EeKhMIaB2_NRKQ">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@rowHeaderAxisConfiguration/@axisManagers.0"/>

-        <element xmi:type="uml:Comment" href="two_tables_model.uml#_YWxtYNm1EeKhMIaB2_NRKQ"/>

-      </axis>

-    </rowAxisProvidersHistory>

-  </nattable:Table>

-  <nattable:Table xmi:id="_usfyMNm1EeKhMIaB2_NRKQ" name="TableOfViews0" currentRowAxisProvider="_usfyNtm1EeKhMIaB2_NRKQ" currentColumnAxisProvider="_usfyMdm1EeKhMIaB2_NRKQ">

-    <context xmi:type="uml:Model" href="two_tables_model.uml#_WYKr5Nm1EeKhMIaB2_NRKQ"/>

-    <tableConfiguration xmi:type="nattableconfiguration:TableConfiguration" href="platform:/plugin/org.eclipse.papyrus.infra.nattable.views.config/resources/viewpage.nattableconfiguration#/"/>

-    <columnAxisProvidersHistory xmi:type="nattableaxisprovider:SlaveObjectAxisProvider" xmi:id="_usfyMdm1EeKhMIaB2_NRKQ" description="Provides the features of the views" name="Papyrus Views feature provider">

-      <axis xmi:type="nattableaxis:FeatureIdAxis" xmi:id="_usfyMtm1EeKhMIaB2_NRKQ" element="nattable_editor_pages:/name">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.infra.nattable.views.config/resources/viewpage.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-      </axis>

-      <axis xmi:type="nattableaxis:FeatureIdAxis" xmi:id="_usfyM9m1EeKhMIaB2_NRKQ" element="nattable_editor_pages:/context">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.infra.nattable.views.config/resources/viewpage.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-      </axis>

-      <axis xmi:type="nattableaxis:FeatureIdAxis" xmi:id="_usfyNNm1EeKhMIaB2_NRKQ" element="nattable_editor_pages:/isOpen">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.infra.nattable.views.config/resources/viewpage.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-      </axis>

-      <axis xmi:type="nattableaxis:FeatureIdAxis" xmi:id="_usfyNdm1EeKhMIaB2_NRKQ" element="nattable_editor_pages:/type">

-        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.infra.nattable.views.config/resources/viewpage.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>

-      </axis>

-    </columnAxisProvidersHistory>

-    <rowAxisProvidersHistory xmi:type="nattableaxisprovider:MasterObjectAxisProvider" xmi:id="_usfyNtm1EeKhMIaB2_NRKQ"/>

-  </nattable:Table>

-</xmi:XMI>

+<?xml version="1.0" encoding="UTF-8"?>
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:nattable="http://www.eclipse.org/papyrus/nattable/model" xmlns:nattableaxis="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis" xmlns:nattableaxisconfiguration="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration" xmlns:nattableaxisprovider="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider" xmlns:nattableconfiguration="http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xsi:schemaLocation="http://www.eclipse.org/papyrus/nattable/model/table/nattableaxis http://www.eclipse.org/papyrus/nattable/model#//nattableaxis http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisconfiguration http://www.eclipse.org/papyrus/nattable/model#//nattableaxisconfiguration http://www.eclipse.org/papyrus/nattable/model/table/nattableaxisprovider http://www.eclipse.org/papyrus/nattable/model#//nattableaxisprovider http://www.eclipse.org/papyrus/nattable/model/nattableconfiguration http://www.eclipse.org/papyrus/nattable/model#//nattableconfiguration">
+  <nattable:Table xmi:id="_uNjMYNm1EeKhMIaB2_NRKQ" name="GenericTable0" currentRowAxisProvider="_uNjMYtm1EeKhMIaB2_NRKQ" currentColumnAxisProvider="_uNjMYdm1EeKhMIaB2_NRKQ">
+    <context xmi:type="uml:Model" href="two_tables_model.uml#_WYKr5Nm1EeKhMIaB2_NRKQ"/>
+    <tableConfiguration xmi:type="nattableconfiguration:TableConfiguration" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#/"/>
+    <columnAxisProvidersHistory xmi:type="nattableaxisprovider:SlaveObjectAxisProvider" xmi:id="_uNjMYdm1EeKhMIaB2_NRKQ" description="This axis provider provides available columns according to the rows of the table (features of the object displayed on the other axis)" name="UML Feature axis provider">
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_sU7BYdm2EeKhMIaB2_NRKQ">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//Element/ownedElement"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_sU7BYtm2EeKhMIaB2_NRKQ">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//Element/owner"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_sU7BY9m2EeKhMIaB2_NRKQ">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EAttribute" href="http://www.eclipse.org/uml2/4.0.0/UML#//Comment/body"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_sU7BZNm2EeKhMIaB2_NRKQ">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//Comment/annotatedElement"/>
+      </axis>
+      <axis xmi:type="nattableaxis:EStructuralFeatureAxis" xmi:id="_sU7BZdm2EeKhMIaB2_NRKQ">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="ecore:EReference" href="http://www.eclipse.org/uml2/4.0.0/UML#//Element/ownedComment"/>
+      </axis>
+    </columnAxisProvidersHistory>
+    <rowAxisProvidersHistory xmi:type="nattableaxisprovider:MasterObjectAxisProvider" xmi:id="_uNjMYtm1EeKhMIaB2_NRKQ" description="This axis provider contains the object dropped by the user into the table" name="DroppedElementAxisProvider">
+      <axis xmi:type="nattableaxis:EObjectAxis" xmi:id="_sU7BYNm2EeKhMIaB2_NRKQ">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.uml.nattable.generic.config/configs/generic.nattableconfiguration#//@rowHeaderAxisConfiguration/@axisManagers.0"/>
+        <element xmi:type="uml:Comment" href="two_tables_model.uml#_YWxtYNm1EeKhMIaB2_NRKQ"/>
+      </axis>
+    </rowAxisProvidersHistory>
+  </nattable:Table>
+  <nattable:Table xmi:id="_usfyMNm1EeKhMIaB2_NRKQ" name="TableOfViews0" currentRowAxisProvider="_usfyNtm1EeKhMIaB2_NRKQ" currentColumnAxisProvider="_usfyMdm1EeKhMIaB2_NRKQ">
+    <context xmi:type="uml:Model" href="two_tables_model.uml#_WYKr5Nm1EeKhMIaB2_NRKQ"/>
+    <tableConfiguration xmi:type="nattableconfiguration:TableConfiguration" href="platform:/plugin/org.eclipse.papyrus.infra.nattable.views.config/resources/viewpage.nattableconfiguration#/"/>
+    <columnAxisProvidersHistory xmi:type="nattableaxisprovider:SlaveObjectAxisProvider" xmi:id="_usfyMdm1EeKhMIaB2_NRKQ" description="Provides the features of the views" name="Papyrus Views feature provider">
+      <axis xmi:type="nattableaxis:FeatureIdAxis" xmi:id="_usfyMtm1EeKhMIaB2_NRKQ" element="nattable_editor_pages:/name">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.infra.nattable.views.config/resources/viewpage.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+      </axis>
+      <axis xmi:type="nattableaxis:FeatureIdAxis" xmi:id="_usfyM9m1EeKhMIaB2_NRKQ" element="nattable_editor_pages:/context">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.infra.nattable.views.config/resources/viewpage.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+      </axis>
+      <axis xmi:type="nattableaxis:FeatureIdAxis" xmi:id="_usfyNNm1EeKhMIaB2_NRKQ" element="nattable_editor_pages:/isOpen">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.infra.nattable.views.config/resources/viewpage.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+      </axis>
+      <axis xmi:type="nattableaxis:FeatureIdAxis" xmi:id="_usfyNdm1EeKhMIaB2_NRKQ" element="nattable_editor_pages:/type">
+        <manager xmi:type="nattableaxisconfiguration:AxisManagerRepresentation" href="platform:/plugin/org.eclipse.papyrus.infra.nattable.views.config/resources/viewpage.nattableconfiguration#//@columnHeaderAxisConfiguration/@axisManagers.0"/>
+      </axis>
+    </columnAxisProvidersHistory>
+    <rowAxisProvidersHistory xmi:type="nattableaxisprovider:MasterObjectAxisProvider" xmi:id="_usfyNtm1EeKhMIaB2_NRKQ"/>
+  </nattable:Table>
+</xmi:XMI>
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/basic/two_tables_model.uml b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/basic/two_tables_model.uml
index 10dab39ad2c..182886efd40 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/basic/two_tables_model.uml
+++ b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/basic/two_tables_model.uml
@@ -1,13 +1,13 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<uml:Model xmi:version="20110701" xmlns:xmi="http://www.omg.org/spec/XMI/20110701" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_WYKr5Nm1EeKhMIaB2_NRKQ" name="model">

-  <ownedComment xmi:type="uml:Comment" xmi:id="_YWxtYNm1EeKhMIaB2_NRKQ">

-    <body>This model contains two tables. The Generic Table is opened, while the table of views is closed.&#xD;

-Expected behavior:&#xD;

-- allPages() contains two entries&#xD;

-- activeEditor is a UML Generic Table Editor Editor&#xD;

-- activePage() is a Generic Table</body>

-  </ownedComment>

-  <packageImport xmi:type="uml:PackageImport" xmi:id="_WYKr5dm1EeKhMIaB2_NRKQ">

-    <importedPackage xmi:type="uml:Model" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#_0"/>

-  </packageImport>

-</uml:Model>

+<?xml version="1.0" encoding="UTF-8"?>
+<uml:Model xmi:version="20110701" xmlns:xmi="http://www.omg.org/spec/XMI/20110701" xmlns:uml="http://www.eclipse.org/uml2/4.0.0/UML" xmi:id="_WYKr5Nm1EeKhMIaB2_NRKQ" name="model">
+  <ownedComment xmi:type="uml:Comment" xmi:id="_YWxtYNm1EeKhMIaB2_NRKQ">
+    <body>This model contains two tables. The Generic Table is opened, while the table of views is closed.&#xD;
+Expected behavior:&#xD;
+- allPages() contains two entries&#xD;
+- activeEditor is a UML Generic Table Editor Editor&#xD;
+- activePage() is a Generic Table</body>
+  </ownedComment>
+  <packageImport xmi:type="uml:PackageImport" xmi:id="_WYKr5dm1EeKhMIaB2_NRKQ">
+    <importedPackage xmi:type="uml:Model" href="pathmap://UML_LIBRARIES/UMLPrimitiveTypes.library.uml#_0"/>
+  </packageImport>
+</uml:Model>
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/basic/unnamed_diagram.di b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/basic/unnamed_diagram.di
index 6973c8a48a6..6973c8a48a6 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/basic/unnamed_diagram.di
+++ b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/basic/unnamed_diagram.di
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/basic/unnamed_diagram.notation b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/basic/unnamed_diagram.notation
index d8bec030baf..d8bec030baf 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/basic/unnamed_diagram.notation
+++ b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/basic/unnamed_diagram.notation
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/basic/unnamed_diagram.uml b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/basic/unnamed_diagram.uml
index cac8a57cf98..cac8a57cf98 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/basic/unnamed_diagram.uml
+++ b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/basic/unnamed_diagram.uml
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/basic/empty_model.notation b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/canonical/css_leaktest.di
index 8634d4c00e0..bf9abab340f 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/basic/empty_model.notation
+++ b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/canonical/css_leaktest.di
@@ -1,2 +1,2 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI"/>

+<?xml version="1.0" encoding="UTF-8"?>
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI"/>
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/canonical/css_leaktest.notation b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/canonical/css_leaktest.notation
index 50f74c0a930..50f74c0a930 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/canonical/css_leaktest.notation
+++ b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/canonical/css_leaktest.notation
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/canonical/css_leaktest.uml b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/canonical/css_leaktest.uml
index c4c95eda8ff..c4c95eda8ff 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/canonical/css_leaktest.uml
+++ b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/canonical/css_leaktest.uml
diff --git a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/model set/^&_&^.di b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/model set/^&_&^.di
index 7911915cf04..641e1446fd0 100644
--- a/tests/junit/plugins/core/org.eclipse.papyrus.editor.integration.tests/model/model set/^&_&^.di
+++ b/tests/junit/plugins/editor/org.eclipse.papyrus.editor.integration.tests/model/model set/^&_&^.di
@@ -1,205 +1,205 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:di="http://www.eclipse.org/papyrus/0.7.0/sashdi" xmlns:org.eclipse.papyrus.infra.table.instance.papyrustableinstance="http://www.eclipse.org/Papyrus/Table/0.8.0/papyrustableinstance" xmlns:tableinstance="http://www.eclipse.org/EMF_Facet/ModelCellEditor/0.1.0/tableinstance" xmlns:tableinstance2="http://www.eclipse.org/EMF_Facet/Table/0.1.0/tableinstance2">

-  <di:SashWindowsMngr>

-    <pageList>

-      <availablePage>

-        <emfPageIdentifier href="%5E&amp;_&amp;%5E.notation#_3Q0W8XzfEeKVBdbqCJSLPg"/>

-      </availablePage>

-      <availablePage>

-        <emfPageIdentifier href="%5E&amp;_&amp;%5E.notation#_3Q-H8HzfEeKVBdbqCJSLPg"/>

-      </availablePage>

-      <availablePage emfPageIdentifier="/1"/>

-    </pageList>

-    <sashModel currentSelection="/0/@sashModel/@windows.0/@children.0">

-      <windows>

-        <children xsi:type="di:TabFolder">

-          <children>

-            <emfPageIdentifier href="%5E&amp;_&amp;%5E.notation#_3Q0W8XzfEeKVBdbqCJSLPg"/>

-          </children>

-          <children>

-            <emfPageIdentifier href="%5E&amp;_&amp;%5E.notation#_3Q-H8HzfEeKVBdbqCJSLPg"/>

-          </children>

-          <children emfPageIdentifier="/1"/>

-        </children>

-      </windows>

-    </sashModel>

-  </di:SashWindowsMngr>

-  <org.eclipse.papyrus.infra.table.instance.papyrustableinstance:PapyrusTableInstance name="DefaultTable" table="/2"/>

-  <tableinstance2:TableInstance2 description="Table Description">

-    <tableConfiguration href="platform:/plugin/org.eclipse.papyrus.uml.table.default/resources/default.tableconfiguration2#/"/>

-    <customizations href="emffacet:/customization/UMLPapyrusDefaultBrowserCustomization#/"/>

-    <customizations href="#/2/@localCustomizations.1"/>

-    <customizations href="#/2/@localCustomizations.0"/>

-    <context href="%5E&amp;_&amp;%5E.uml#_3Q0W8HzfEeKVBdbqCJSLPg"/>

-    <columns xsi:type="tableinstance:DefaultLabelColumn"/>

-    <columns xsi:type="tableinstance:MetaClassColumn"/>

-    <columns xsi:type="tableinstance:EContainerColumn"/>

-    <columns xsi:type="tableinstance:ReferenceColumn">

-      <reference href="http://www.eclipse.org/emf/2002/Ecore#//EModelElement/eAnnotations"/>

-    </columns>

-    <columns xsi:type="tableinstance:ReferenceColumn">

-      <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Element/ownedComment"/>

-    </columns>

-    <columns xsi:type="tableinstance:ReferenceColumn">

-      <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Element/ownedElement"/>

-    </columns>

-    <columns xsi:type="tableinstance:ReferenceColumn">

-      <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Element/owner"/>

-    </columns>

-    <columns xsi:type="tableinstance:ReferenceColumn">

-      <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/clientDependency"/>

-    </columns>

-    <columns xsi:type="tableinstance:AttributeColumn">

-      <attribute href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/name"/>

-    </columns>

-    <columns xsi:type="tableinstance:ReferenceColumn">

-      <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/nameExpression"/>

-    </columns>

-    <columns xsi:type="tableinstance:ReferenceColumn">

-      <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/namespace"/>

-    </columns>

-    <columns xsi:type="tableinstance:AttributeColumn">

-      <attribute href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/qualifiedName"/>

-    </columns>

-    <columns xsi:type="tableinstance:AttributeColumn">

-      <attribute href="http://www.eclipse.org/uml2/4.0.0/UML#//NamedElement/visibility"/>

-    </columns>

-    <columns xsi:type="tableinstance:ReferenceColumn">

-      <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Namespace/elementImport"/>

-    </columns>

-    <columns xsi:type="tableinstance:ReferenceColumn">

-      <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Namespace/packageImport"/>

-    </columns>

-    <columns xsi:type="tableinstance:ReferenceColumn">

-      <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Namespace/ownedRule"/>

-    </columns>

-    <columns xsi:type="tableinstance:ReferenceColumn">

-      <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Namespace/ownedMember"/>

-    </columns>

-    <columns xsi:type="tableinstance:ReferenceColumn">

-      <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Namespace/importedMember"/>

-    </columns>

-    <columns xsi:type="tableinstance:ReferenceColumn">

-      <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//Namespace/member"/>

-    </columns>

-    <columns xsi:type="tableinstance:AttributeColumn">

-      <attribute href="http://www.eclipse.org/uml2/4.0.0/UML#//RedefinableElement/isLeaf"/>

-    </columns>

-    <columns xsi:type="tableinstance:ReferenceColumn">

-      <reference href="http://www.eclipse.org/uml2/4.0.0/UML#//RedefinableElement/redefinedElement"/>

-    </columns>

-    <columns xsi:type